2
<class>SvnMergeDialog</class>
3
<widget class="QDialog" name="SvnMergeDialog" >
4
<property name="geometry" >
12
<property name="windowTitle" >
13
<string>Subversion Merge</string>
15
<property name="sizeGripEnabled" >
18
<layout class="QGridLayout" >
19
<property name="margin" >
22
<property name="spacing" >
25
<item row="3" column="0" colspan="2" >
26
<widget class="QCheckBox" name="forceCheckBox" >
27
<property name="toolTip" >
28
<string>Select to force the merge operation</string>
30
<property name="text" >
31
<string>Enforce merge</string>
35
<item row="4" column="0" colspan="2" >
36
<widget class="QDialogButtonBox" name="buttonBox" >
37
<property name="orientation" >
38
<enum>Qt::Horizontal</enum>
40
<property name="standardButtons" >
41
<set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
45
<item row="2" column="0" >
46
<widget class="QLabel" name="textLabel1" >
47
<property name="text" >
48
<string>Target:</string>
52
<item row="2" column="1" >
53
<widget class="QComboBox" name="targetCombo" >
54
<property name="toolTip" >
55
<string>Enter the target</string>
57
<property name="whatsThis" >
58
<string><b>Target</b>
59
<p>Enter the target for the merge operation into this field. Leave it empty to
60
get the target URL from the working copy.</p>
61
<p><b>Note:</b> This entry is only needed, if you enter revision numbers above.</p></string>
63
<property name="editable" >
66
<property name="insertPolicy" >
67
<enum>QComboBox::InsertAtTop</enum>
69
<property name="autoCompletion" >
72
<property name="duplicatesEnabled" >
77
<item row="0" column="0" >
78
<widget class="QLabel" name="TextLabel1" >
79
<property name="text" >
80
<string>1. URL/Revision:</string>
84
<item row="1" column="1" >
85
<widget class="QComboBox" name="tag2Combo" >
86
<property name="sizePolicy" >
88
<hsizetype>7</hsizetype>
89
<vsizetype>0</vsizetype>
90
<horstretch>0</horstretch>
91
<verstretch>0</verstretch>
94
<property name="toolTip" >
95
<string>Enter an URL or a revision number</string>
97
<property name="whatsThis" >
98
<string><b>URL/Revision</b>
99
<p>Enter an URL or a revision number to be merged into
100
the working copy.</p></string>
102
<property name="editable" >
105
<property name="autoCompletion" >
108
<property name="duplicatesEnabled" >
113
<item row="0" column="1" >
114
<widget class="QComboBox" name="tag1Combo" >
115
<property name="sizePolicy" >
117
<hsizetype>7</hsizetype>
118
<vsizetype>0</vsizetype>
119
<horstretch>0</horstretch>
120
<verstretch>0</verstretch>
123
<property name="toolTip" >
124
<string>Enter an URL or a revision number</string>
126
<property name="whatsThis" >
127
<string><b>URL/Revision</b>
128
<p>Enter an URL or a revision number to be merged into
129
the working copy.</p></string>
131
<property name="editable" >
134
<property name="autoCompletion" >
137
<property name="duplicatesEnabled" >
142
<item row="1" column="0" >
143
<widget class="QLabel" name="TextLabel1_2" >
144
<property name="text" >
145
<string>2. URL/Revision:</string>
151
<layoutdefault spacing="6" margin="11" />
152
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
154
<tabstop>tag1Combo</tabstop>
155
<tabstop>tag2Combo</tabstop>
156
<tabstop>targetCombo</tabstop>
157
<tabstop>forceCheckBox</tabstop>
158
<tabstop>buttonBox</tabstop>
163
<sender>buttonBox</sender>
164
<signal>accepted()</signal>
165
<receiver>SvnMergeDialog</receiver>
166
<slot>accept()</slot>
168
<hint type="sourcelabel" >
172
<hint type="destinationlabel" >
179
<sender>buttonBox</sender>
180
<signal>rejected()</signal>
181
<receiver>SvnMergeDialog</receiver>
182
<slot>reject()</slot>
184
<hint type="sourcelabel" >
188
<hint type="destinationlabel" >
added
removed
eric/VCS/vcsSubversion/SvnMergeDialog.ui
