Mercurial Repositories > eric / file comparison
comparison: eric6/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui
eric6/Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui
- branch
- maintenance
- changeset 6989
- 8b8cadf8d7e9
- parent 6942
- 2602857055c5
equal
deleted
inserted
replaced
| 6938:7926553b7509 | 6989:8b8cadf8d7e9 |
|---|---|
| 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>372</width> | |
| 10 <height>305</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" colspan="3"> | |
| 161 <widget class="QRadioButton" name="noneButton"> | |
| 162 <property name="toolTip"> | |
| 163 <string>Select to not specify a specific revision</string> | |
| 164 </property> | |
| 165 <property name="text"> | |
| 166 <string>No revision selected</string> | |
| 167 </property> | |
| 168 <property name="checked"> | |
| 169 <bool>true</bool> | |
| 170 </property> | |
| 171 </widget> | |
| 172 </item> | |
| 173 </layout> | |
| 174 </widget> | |
| 175 </item> | |
| 176 <item> | |
| 177 <widget class="QCheckBox" name="forceCheckBox"> | |
| 178 <property name="toolTip"> | |
| 179 <string>Select to force the merge operation</string> | |
| 180 </property> | |
| 181 <property name="text"> | |
| 182 <string>Enforce merge</string> | |
| 183 </property> | |
| 184 </widget> | |
| 185 </item> | |
| 186 <item> | |
| 187 <widget class="QDialogButtonBox" name="buttonBox"> | |
| 188 <property name="orientation"> | |
| 189 <enum>Qt::Horizontal</enum> | |
| 190 </property> | |
| 191 <property name="standardButtons"> | |
| 192 <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> | |
| 193 </property> | |
| 194 </widget> | |
| 195 </item> | |
| 196 </layout> | |
| 197 </widget> | |
| 198 <tabstops> | |
| 199 <tabstop>numberButton</tabstop> | |
| 200 <tabstop>numberSpinBox</tabstop> | |
| 201 <tabstop>idButton</tabstop> | |
| 202 <tabstop>idEdit</tabstop> | |
| 203 <tabstop>tagButton</tabstop> | |
| 204 <tabstop>tagCombo</tabstop> | |
| 205 <tabstop>branchButton</tabstop> | |
| 206 <tabstop>branchCombo</tabstop> | |
| 207 <tabstop>bookmarkButton</tabstop> | |
| 208 <tabstop>bookmarkCombo</tabstop> | |
| 209 <tabstop>noneButton</tabstop> | |
| 210 <tabstop>forceCheckBox</tabstop> | |
| 211 <tabstop>buttonBox</tabstop> | |
| 212 </tabstops> | |
| 213 <resources/> | |
| 214 <connections> | |
| 215 <connection> | |
| 216 <sender>buttonBox</sender> | |
| 217 <signal>accepted()</signal> | |
| 218 <receiver>HgMergeDialog</receiver> | |
| 219 <slot>accept()</slot> | |
| 220 <hints> | |
| 221 <hint type="sourcelabel"> | |
| 222 <x>261</x> | |
| 223 <y>244</y> | |
| 224 </hint> | |
| 225 <hint type="destinationlabel"> | |
| 226 <x>157</x> | |
| 227 <y>229</y> | |
| 228 </hint> | |
| 229 </hints> | |
| 230 </connection> | |
| 231 <connection> | |
| 232 <sender>buttonBox</sender> | |
| 233 <signal>rejected()</signal> | |
| 234 <receiver>HgMergeDialog</receiver> | |
| 235 <slot>reject()</slot> | |
| 236 <hints> | |
| 237 <hint type="sourcelabel"> | |
| 238 <x>329</x> | |
| 239 <y>244</y> | |
| 240 </hint> | |
| 241 <hint type="destinationlabel"> | |
| 242 <x>286</x> | |
| 243 <y>229</y> | |
| 244 </hint> | |
| 245 </hints> | |
| 246 </connection> | |
| 247 <connection> | |
| 248 <sender>numberButton</sender> | |
| 249 <signal>toggled(bool)</signal> | |
| 250 <receiver>numberSpinBox</receiver> | |
| 251 <slot>setEnabled(bool)</slot> | |
| 252 <hints> | |
| 253 <hint type="sourcelabel"> | |
| 254 <x>48</x> | |
| 255 <y>42</y> | |
| 256 </hint> | |
| 257 <hint type="destinationlabel"> | |
| 258 <x>113</x> | |
| 259 <y>43</y> | |
| 260 </hint> | |
| 261 </hints> | |
| 262 </connection> | |
| 263 <connection> | |
| 264 <sender>idButton</sender> | |
| 265 <signal>toggled(bool)</signal> | |
| 266 <receiver>idEdit</receiver> | |
| 267 <slot>setEnabled(bool)</slot> | |
| 268 <hints> | |
| 269 <hint type="sourcelabel"> | |
| 270 <x>38</x> | |
| 271 <y>76</y> | |
| 272 </hint> | |
| 273 <hint type="destinationlabel"> | |
| 274 <x>125</x> | |
| 275 <y>75</y> | |
| 276 </hint> | |
| 277 </hints> | |
| 278 </connection> | |
| 279 <connection> | |
| 280 <sender>tagButton</sender> | |
| 281 <signal>toggled(bool)</signal> | |
| 282 <receiver>tagCombo</receiver> | |
| 283 <slot>setEnabled(bool)</slot> | |
| 284 <hints> | |
| 285 <hint type="sourcelabel"> | |
| 286 <x>52</x> | |
| 287 <y>104</y> | |
| 288 </hint> | |
| 289 <hint type="destinationlabel"> | |
| 290 <x>124</x> | |
| 291 <y>99</y> | |
| 292 </hint> | |
| 293 </hints> | |
| 294 </connection> | |
| 295 <connection> | |
| 296 <sender>branchButton</sender> | |
| 297 <signal>toggled(bool)</signal> | |
| 298 <receiver>branchCombo</receiver> | |
| 299 <slot>setEnabled(bool)</slot> | |
| 300 <hints> | |
| 301 <hint type="sourcelabel"> | |
| 302 <x>71</x> | |
| 303 <y>127</y> | |
| 304 </hint> | |
| 305 <hint type="destinationlabel"> | |
| 306 <x>123</x> | |
| 307 <y>130</y> | |
| 308 </hint> | |
| 309 </hints> | |
| 310 </connection> | |
| 311 <connection> | |
| 312 <sender>bookmarkButton</sender> | |
| 313 <signal>toggled(bool)</signal> | |
| 314 <receiver>bookmarkCombo</receiver> | |
| 315 <slot>setEnabled(bool)</slot> | |
| 316 <hints> | |
| 317 <hint type="sourcelabel"> | |
| 318 <x>71</x> | |
| 319 <y>145</y> | |
| 320 </hint> | |
| 321 <hint type="destinationlabel"> | |
| 322 <x>121</x> | |
| 323 <y>149</y> | |
| 324 </hint> | |
| 325 </hints> | |
| 326 </connection> | |
| 327 </connections> | |
| 328 </ui> |
