Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui
src/eric7/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui
- branch
- eric7
- changeset 9209
- b99e7fd55fd3
- parent 9025
- 9fe8cfa14542
equal
deleted
inserted
replaced
| 9208:3fc8dfeb6ebe | 9209:b99e7fd55fd3 |
|---|---|
| 1 <?xml version="1.0" encoding="UTF-8"?> | |
| 2 <ui version="4.0"> | |
| 3 <class>HgMergeDialog</class> | |
| 4 <widget class="QDialog" name="HgMergeDialog"> | |
| 5 <property name="geometry"> | |
| 6 <rect> | |
| 7 <x>0</x> | |
| 8 <y>0</y> | |
| 9 <width>400</width> | |
| 10 <height>342</height> | |
| 11 </rect> | |
| 12 </property> | |
| 13 <property name="windowTitle"> | |
| 14 <string>Mercurial Merge</string> | |
| 15 </property> | |
| 16 <property name="sizeGripEnabled"> | |
| 17 <bool>true</bool> | |
| 18 </property> | |
| 19 <layout class="QVBoxLayout" name="verticalLayout"> | |
| 20 <item> | |
| 21 <widget class="QGroupBox" name="groupBox"> | |
| 22 <property name="title"> | |
| 23 <string>Revision</string> | |
| 24 </property> | |
| 25 <layout class="QGridLayout" name="gridLayout"> | |
| 26 <item row="0" column="0"> | |
| 27 <widget class="QRadioButton" name="numberButton"> | |
| 28 <property name="toolTip"> | |
| 29 <string>Select to specify a revision by number</string> | |
| 30 </property> | |
| 31 <property name="text"> | |
| 32 <string>Number</string> | |
| 33 </property> | |
| 34 </widget> | |
| 35 </item> | |
| 36 <item row="0" column="1"> | |
| 37 <widget class="QSpinBox" name="numberSpinBox"> | |
| 38 <property name="enabled"> | |
| 39 <bool>false</bool> | |
| 40 </property> | |
| 41 <property name="toolTip"> | |
| 42 <string>Enter a revision number</string> | |
| 43 </property> | |
| 44 <property name="alignment"> | |
| 45 <set>Qt::AlignRight</set> | |
| 46 </property> | |
| 47 <property name="maximum"> | |
| 48 <number>999999999</number> | |
| 49 </property> | |
| 50 </widget> | |
| 51 </item> | |
| 52 <item row="0" column="2"> | |
| 53 <spacer name="spacer"> | |
| 54 <property name="orientation"> | |
| 55 <enum>Qt::Horizontal</enum> | |
| 56 </property> | |
| 57 <property name="sizeHint" stdset="0"> | |
| 58 <size> | |
| 59 <width>158</width> | |
| 60 <height>20</height> | |
| 61 </size> | |
| 62 </property> | |
| 63 </spacer> | |
| 64 </item> | |
| 65 <item row="1" column="0"> | |
| 66 <widget class="QRadioButton" name="idButton"> | |
| 67 <property name="toolTip"> | |
| 68 <string>Select to specify a revision by changeset id</string> | |
| 69 </property> | |
| 70 <property name="text"> | |
| 71 <string>Id:</string> | |
| 72 </property> | |
| 73 </widget> | |
| 74 </item> | |
| 75 <item row="1" column="1" colspan="2"> | |
| 76 <widget class="QLineEdit" name="idEdit"> | |
| 77 <property name="enabled"> | |
| 78 <bool>false</bool> | |
| 79 </property> | |
| 80 <property name="toolTip"> | |
| 81 <string>Enter a changeset id</string> | |
| 82 </property> | |
| 83 </widget> | |
| 84 </item> | |
| 85 <item row="2" column="0"> | |
| 86 <widget class="QRadioButton" name="tagButton"> | |
| 87 <property name="toolTip"> | |
| 88 <string>Select to specify a revision by a tag</string> | |
| 89 </property> | |
| 90 <property name="text"> | |
| 91 <string>Tag:</string> | |
| 92 </property> | |
| 93 </widget> | |
| 94 </item> | |
| 95 <item row="2" column="1" colspan="2"> | |
| 96 <widget class="QComboBox" name="tagCombo"> | |
| 97 <property name="enabled"> | |
| 98 <bool>false</bool> | |
| 99 </property> | |
| 100 <property name="toolTip"> | |
| 101 <string>Enter a tag name</string> | |
| 102 </property> | |
| 103 <property name="editable"> | |
| 104 <bool>true</bool> | |
| 105 </property> | |
| 106 </widget> | |
| 107 </item> | |
| 108 <item row="3" column="0"> | |
| 109 <widget class="QRadioButton" name="branchButton"> | |
| 110 <property name="toolTip"> | |
| 111 <string>Select to specify a revision by a branch</string> | |
| 112 </property> | |
| 113 <property name="text"> | |
| 114 <string>Branch:</string> | |
| 115 </property> | |
| 116 </widget> | |
| 117 </item> | |
| 118 <item row="3" column="1" colspan="2"> | |
| 119 <widget class="QComboBox" name="branchCombo"> | |
| 120 <property name="enabled"> | |
| 121 <bool>false</bool> | |
| 122 </property> | |
| 123 <property name="toolTip"> | |
| 124 <string>Enter a branch name</string> | |
| 125 </property> | |
| 126 <property name="editable"> | |
| 127 <bool>true</bool> | |
| 128 </property> | |
| 129 </widget> | |
| 130 </item> | |
| 131 <item row="4" column="0"> | |
| 132 <widget class="QRadioButton" name="bookmarkButton"> | |
| 133 <property name="toolTip"> | |
| 134 <string>Select to specify a revision by a bookmark</string> | |
| 135 </property> | |
| 136 <property name="text"> | |
| 137 <string>Bookmark:</string> | |
| 138 </property> | |
| 139 </widget> | |
| 140 </item> | |
| 141 <item row="4" column="1" colspan="2"> | |
| 142 <widget class="QComboBox" name="bookmarkCombo"> | |
| 143 <property name="enabled"> | |
| 144 <bool>false</bool> | |
| 145 </property> | |
| 146 <property name="sizePolicy"> | |
| 147 <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> | |
| 148 <horstretch>0</horstretch> | |
| 149 <verstretch>0</verstretch> | |
| 150 </sizepolicy> | |
| 151 </property> | |
| 152 <property name="toolTip"> | |
| 153 <string>Enter a bookmark name</string> | |
| 154 </property> | |
| 155 <property name="editable"> | |
| 156 <bool>true</bool> | |
| 157 </property> | |
| 158 </widget> | |
| 159 </item> | |
| 160 <item row="5" column="0"> | |
| 161 <widget class="QRadioButton" name="expressionButton"> | |
| 162 <property name="text"> | |
| 163 <string>Expression:</string> | |
| 164 </property> | |
| 165 </widget> | |
| 166 </item> | |
| 167 <item row="5" column="1" colspan="2"> | |
| 168 <widget class="QLineEdit" name="expressionEdit"> | |
| 169 <property name="enabled"> | |
| 170 <bool>false</bool> | |
| 171 </property> | |
| 172 <property name="toolTip"> | |
| 173 <string>Enter a revision set expression</string> | |
| 174 </property> | |
| 175 <property name="clearButtonEnabled"> | |
| 176 <bool>true</bool> | |
| 177 </property> | |
| 178 </widget> | |
| 179 </item> | |
| 180 <item row="6" column="0" colspan="3"> | |
| 181 <widget class="QRadioButton" name="noneButton"> | |
| 182 <property name="toolTip"> | |
| 183 <string>Select to not specify a specific revision</string> | |
| 184 </property> | |
| 185 <property name="text"> | |
| 186 <string>No revision selected</string> | |
| 187 </property> | |
| 188 <property name="checked"> | |
| 189 <bool>true</bool> | |
| 190 </property> | |
| 191 </widget> | |
| 192 </item> | |
| 193 </layout> | |
| 194 </widget> | |
| 195 </item> | |
| 196 <item> | |
| 197 <widget class="QCheckBox" name="forceCheckBox"> | |
| 198 <property name="toolTip"> | |
| 199 <string>Select to force the merge operation</string> | |
| 200 </property> | |
| 201 <property name="text"> | |
| 202 <string>Enforce merge</string> | |
| 203 </property> | |
| 204 </widget> | |
| 205 </item> | |
| 206 <item> | |
| 207 <widget class="QDialogButtonBox" name="buttonBox"> | |
| 208 <property name="orientation"> | |
| 209 <enum>Qt::Horizontal</enum> | |
| 210 </property> | |
| 211 <property name="standardButtons"> | |
| 212 <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> | |
| 213 </property> | |
| 214 </widget> | |
| 215 </item> | |
| 216 </layout> | |
| 217 </widget> | |
| 218 <tabstops> | |
| 219 <tabstop>numberButton</tabstop> | |
| 220 <tabstop>numberSpinBox</tabstop> | |
| 221 <tabstop>idButton</tabstop> | |
| 222 <tabstop>idEdit</tabstop> | |
| 223 <tabstop>tagButton</tabstop> | |
| 224 <tabstop>tagCombo</tabstop> | |
| 225 <tabstop>branchButton</tabstop> | |
| 226 <tabstop>branchCombo</tabstop> | |
| 227 <tabstop>bookmarkButton</tabstop> | |
| 228 <tabstop>bookmarkCombo</tabstop> | |
| 229 <tabstop>expressionButton</tabstop> | |
| 230 <tabstop>expressionEdit</tabstop> | |
| 231 <tabstop>noneButton</tabstop> | |
| 232 <tabstop>forceCheckBox</tabstop> | |
| 233 </tabstops> | |
| 234 <resources/> | |
| 235 <connections> | |
| 236 <connection> | |
| 237 <sender>buttonBox</sender> | |
| 238 <signal>accepted()</signal> | |
| 239 <receiver>HgMergeDialog</receiver> | |
| 240 <slot>accept()</slot> | |
| 241 <hints> | |
| 242 <hint type="sourcelabel"> | |
| 243 <x>270</x> | |
| 244 <y>332</y> | |
| 245 </hint> | |
| 246 <hint type="destinationlabel"> | |
| 247 <x>157</x> | |
| 248 <y>229</y> | |
| 249 </hint> | |
| 250 </hints> | |
| 251 </connection> | |
| 252 <connection> | |
| 253 <sender>buttonBox</sender> | |
| 254 <signal>rejected()</signal> | |
| 255 <receiver>HgMergeDialog</receiver> | |
| 256 <slot>reject()</slot> | |
| 257 <hints> | |
| 258 <hint type="sourcelabel"> | |
| 259 <x>338</x> | |
| 260 <y>332</y> | |
| 261 </hint> | |
| 262 <hint type="destinationlabel"> | |
| 263 <x>286</x> | |
| 264 <y>229</y> | |
| 265 </hint> | |
| 266 </hints> | |
| 267 </connection> | |
| 268 <connection> | |
| 269 <sender>numberButton</sender> | |
| 270 <signal>toggled(bool)</signal> | |
| 271 <receiver>numberSpinBox</receiver> | |
| 272 <slot>setEnabled(bool)</slot> | |
| 273 <hints> | |
| 274 <hint type="sourcelabel"> | |
| 275 <x>69</x> | |
| 276 <y>66</y> | |
| 277 </hint> | |
| 278 <hint type="destinationlabel"> | |
| 279 <x>215</x> | |
| 280 <y>68</y> | |
| 281 </hint> | |
| 282 </hints> | |
| 283 </connection> | |
| 284 <connection> | |
| 285 <sender>idButton</sender> | |
| 286 <signal>toggled(bool)</signal> | |
| 287 <receiver>idEdit</receiver> | |
| 288 <slot>setEnabled(bool)</slot> | |
| 289 <hints> | |
| 290 <hint type="sourcelabel"> | |
| 291 <x>38</x> | |
| 292 <y>76</y> | |
| 293 </hint> | |
| 294 <hint type="destinationlabel"> | |
| 295 <x>125</x> | |
| 296 <y>75</y> | |
| 297 </hint> | |
| 298 </hints> | |
| 299 </connection> | |
| 300 <connection> | |
| 301 <sender>tagButton</sender> | |
| 302 <signal>toggled(bool)</signal> | |
| 303 <receiver>tagCombo</receiver> | |
| 304 <slot>setEnabled(bool)</slot> | |
| 305 <hints> | |
| 306 <hint type="sourcelabel"> | |
| 307 <x>73</x> | |
| 308 <y>131</y> | |
| 309 </hint> | |
| 310 <hint type="destinationlabel"> | |
| 311 <x>246</x> | |
| 312 <y>132</y> | |
| 313 </hint> | |
| 314 </hints> | |
| 315 </connection> | |
| 316 <connection> | |
| 317 <sender>branchButton</sender> | |
| 318 <signal>toggled(bool)</signal> | |
| 319 <receiver>branchCombo</receiver> | |
| 320 <slot>setEnabled(bool)</slot> | |
| 321 <hints> | |
| 322 <hint type="sourcelabel"> | |
| 323 <x>92</x> | |
| 324 <y>163</y> | |
| 325 </hint> | |
| 326 <hint type="destinationlabel"> | |
| 327 <x>245</x> | |
| 328 <y>164</y> | |
| 329 </hint> | |
| 330 </hints> | |
| 331 </connection> | |
| 332 <connection> | |
| 333 <sender>bookmarkButton</sender> | |
| 334 <signal>toggled(bool)</signal> | |
| 335 <receiver>bookmarkCombo</receiver> | |
| 336 <slot>setEnabled(bool)</slot> | |
| 337 <hints> | |
| 338 <hint type="sourcelabel"> | |
| 339 <x>92</x> | |
| 340 <y>195</y> | |
| 341 </hint> | |
| 342 <hint type="destinationlabel"> | |
| 343 <x>243</x> | |
| 344 <y>196</y> | |
| 345 </hint> | |
| 346 </hints> | |
| 347 </connection> | |
| 348 <connection> | |
| 349 <sender>expressionButton</sender> | |
| 350 <signal>toggled(bool)</signal> | |
| 351 <receiver>expressionEdit</receiver> | |
| 352 <slot>setEnabled(bool)</slot> | |
| 353 <hints> | |
| 354 <hint type="sourcelabel"> | |
| 355 <x>59</x> | |
| 356 <y>216</y> | |
| 357 </hint> | |
| 358 <hint type="destinationlabel"> | |
| 359 <x>195</x> | |
| 360 <y>216</y> | |
| 361 </hint> | |
| 362 </hints> | |
| 363 </connection> | |
| 364 </connections> | |
| 365 </ui> |
