Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui
Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui
- changeset 178
- dd9f0bca5e2f
- child 1017
- 919147f2b518
equal
deleted
inserted
replaced
| 177:c822ccc4d138 | 178:dd9f0bca5e2f |
|---|---|
| 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>256</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="minimum"> | |
| 48 <number>1</number> | |
| 49 </property> | |
| 50 <property name="maximum"> | |
| 51 <number>999999999</number> | |
| 52 </property> | |
| 53 </widget> | |
| 54 </item> | |
| 55 <item row="0" column="2"> | |
| 56 <spacer name="spacer"> | |
| 57 <property name="orientation"> | |
| 58 <enum>Qt::Horizontal</enum> | |
| 59 </property> | |
| 60 <property name="sizeHint" stdset="0"> | |
| 61 <size> | |
| 62 <width>158</width> | |
| 63 <height>20</height> | |
| 64 </size> | |
| 65 </property> | |
| 66 </spacer> | |
| 67 </item> | |
| 68 <item row="1" column="0"> | |
| 69 <widget class="QRadioButton" name="idButton"> | |
| 70 <property name="toolTip"> | |
| 71 <string>Select to specify a revision by changeset id</string> | |
| 72 </property> | |
| 73 <property name="text"> | |
| 74 <string>Id:</string> | |
| 75 </property> | |
| 76 </widget> | |
| 77 </item> | |
| 78 <item row="1" column="1" colspan="2"> | |
| 79 <widget class="QLineEdit" name="idEdit"> | |
| 80 <property name="enabled"> | |
| 81 <bool>false</bool> | |
| 82 </property> | |
| 83 <property name="toolTip"> | |
| 84 <string>Enter a changeset id</string> | |
| 85 </property> | |
| 86 </widget> | |
| 87 </item> | |
| 88 <item row="2" column="0"> | |
| 89 <widget class="QRadioButton" name="tagButton"> | |
| 90 <property name="toolTip"> | |
| 91 <string>Select to specify a revision by a tag</string> | |
| 92 </property> | |
| 93 <property name="text"> | |
| 94 <string>Tag:</string> | |
| 95 </property> | |
| 96 </widget> | |
| 97 </item> | |
| 98 <item row="2" column="1" colspan="2"> | |
| 99 <widget class="QComboBox" name="tagCombo"> | |
| 100 <property name="enabled"> | |
| 101 <bool>false</bool> | |
| 102 </property> | |
| 103 <property name="toolTip"> | |
| 104 <string>Enter a tag name</string> | |
| 105 </property> | |
| 106 <property name="editable"> | |
| 107 <bool>true</bool> | |
| 108 </property> | |
| 109 </widget> | |
| 110 </item> | |
| 111 <item row="3" column="0"> | |
| 112 <widget class="QRadioButton" name="branchButton"> | |
| 113 <property name="toolTip"> | |
| 114 <string>Select to specify a revision by a branch</string> | |
| 115 </property> | |
| 116 <property name="text"> | |
| 117 <string>Branch:</string> | |
| 118 </property> | |
| 119 </widget> | |
| 120 </item> | |
| 121 <item row="3" column="1" colspan="2"> | |
| 122 <widget class="QComboBox" name="branchCombo"> | |
| 123 <property name="enabled"> | |
| 124 <bool>false</bool> | |
| 125 </property> | |
| 126 <property name="toolTip"> | |
| 127 <string>Enter a branch name</string> | |
| 128 </property> | |
| 129 <property name="editable"> | |
| 130 <bool>true</bool> | |
| 131 </property> | |
| 132 </widget> | |
| 133 </item> | |
| 134 <item row="4" column="0" colspan="3"> | |
| 135 <widget class="QRadioButton" name="noneButton"> | |
| 136 <property name="toolTip"> | |
| 137 <string>Select to not specify a specific revision</string> | |
| 138 </property> | |
| 139 <property name="text"> | |
| 140 <string>No revision selected</string> | |
| 141 </property> | |
| 142 <property name="checked"> | |
| 143 <bool>true</bool> | |
| 144 </property> | |
| 145 </widget> | |
| 146 </item> | |
| 147 </layout> | |
| 148 </widget> | |
| 149 </item> | |
| 150 <item> | |
| 151 <widget class="QCheckBox" name="forceCheckBox"> | |
| 152 <property name="toolTip"> | |
| 153 <string>Select to force the merge operation</string> | |
| 154 </property> | |
| 155 <property name="text"> | |
| 156 <string>Enforce merge</string> | |
| 157 </property> | |
| 158 </widget> | |
| 159 </item> | |
| 160 <item> | |
| 161 <widget class="QDialogButtonBox" name="buttonBox"> | |
| 162 <property name="orientation"> | |
| 163 <enum>Qt::Horizontal</enum> | |
| 164 </property> | |
| 165 <property name="standardButtons"> | |
| 166 <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> | |
| 167 </property> | |
| 168 </widget> | |
| 169 </item> | |
| 170 </layout> | |
| 171 </widget> | |
| 172 <tabstops> | |
| 173 <tabstop>numberButton</tabstop> | |
| 174 <tabstop>numberSpinBox</tabstop> | |
| 175 <tabstop>idButton</tabstop> | |
| 176 <tabstop>idEdit</tabstop> | |
| 177 <tabstop>tagButton</tabstop> | |
| 178 <tabstop>tagCombo</tabstop> | |
| 179 <tabstop>branchButton</tabstop> | |
| 180 <tabstop>branchCombo</tabstop> | |
| 181 <tabstop>noneButton</tabstop> | |
| 182 <tabstop>forceCheckBox</tabstop> | |
| 183 <tabstop>buttonBox</tabstop> | |
| 184 </tabstops> | |
| 185 <resources/> | |
| 186 <connections> | |
| 187 <connection> | |
| 188 <sender>buttonBox</sender> | |
| 189 <signal>accepted()</signal> | |
| 190 <receiver>HgMergeDialog</receiver> | |
| 191 <slot>accept()</slot> | |
| 192 <hints> | |
| 193 <hint type="sourcelabel"> | |
| 194 <x>257</x> | |
| 195 <y>246</y> | |
| 196 </hint> | |
| 197 <hint type="destinationlabel"> | |
| 198 <x>157</x> | |
| 199 <y>229</y> | |
| 200 </hint> | |
| 201 </hints> | |
| 202 </connection> | |
| 203 <connection> | |
| 204 <sender>buttonBox</sender> | |
| 205 <signal>rejected()</signal> | |
| 206 <receiver>HgMergeDialog</receiver> | |
| 207 <slot>reject()</slot> | |
| 208 <hints> | |
| 209 <hint type="sourcelabel"> | |
| 210 <x>325</x> | |
| 211 <y>246</y> | |
| 212 </hint> | |
| 213 <hint type="destinationlabel"> | |
| 214 <x>286</x> | |
| 215 <y>229</y> | |
| 216 </hint> | |
| 217 </hints> | |
| 218 </connection> | |
| 219 <connection> | |
| 220 <sender>numberButton</sender> | |
| 221 <signal>toggled(bool)</signal> | |
| 222 <receiver>numberSpinBox</receiver> | |
| 223 <slot>setEnabled(bool)</slot> | |
| 224 <hints> | |
| 225 <hint type="sourcelabel"> | |
| 226 <x>48</x> | |
| 227 <y>42</y> | |
| 228 </hint> | |
| 229 <hint type="destinationlabel"> | |
| 230 <x>113</x> | |
| 231 <y>43</y> | |
| 232 </hint> | |
| 233 </hints> | |
| 234 </connection> | |
| 235 <connection> | |
| 236 <sender>idButton</sender> | |
| 237 <signal>toggled(bool)</signal> | |
| 238 <receiver>idEdit</receiver> | |
| 239 <slot>setEnabled(bool)</slot> | |
| 240 <hints> | |
| 241 <hint type="sourcelabel"> | |
| 242 <x>38</x> | |
| 243 <y>76</y> | |
| 244 </hint> | |
| 245 <hint type="destinationlabel"> | |
| 246 <x>125</x> | |
| 247 <y>75</y> | |
| 248 </hint> | |
| 249 </hints> | |
| 250 </connection> | |
| 251 <connection> | |
| 252 <sender>tagButton</sender> | |
| 253 <signal>toggled(bool)</signal> | |
| 254 <receiver>tagCombo</receiver> | |
| 255 <slot>setEnabled(bool)</slot> | |
| 256 <hints> | |
| 257 <hint type="sourcelabel"> | |
| 258 <x>52</x> | |
| 259 <y>104</y> | |
| 260 </hint> | |
| 261 <hint type="destinationlabel"> | |
| 262 <x>124</x> | |
| 263 <y>99</y> | |
| 264 </hint> | |
| 265 </hints> | |
| 266 </connection> | |
| 267 <connection> | |
| 268 <sender>branchButton</sender> | |
| 269 <signal>toggled(bool)</signal> | |
| 270 <receiver>branchCombo</receiver> | |
| 271 <slot>setEnabled(bool)</slot> | |
| 272 <hints> | |
| 273 <hint type="sourcelabel"> | |
| 274 <x>71</x> | |
| 275 <y>127</y> | |
| 276 </hint> | |
| 277 <hint type="destinationlabel"> | |
| 278 <x>123</x> | |
| 279 <y>130</y> | |
| 280 </hint> | |
| 281 </hints> | |
| 282 </connection> | |
| 283 </connections> | |
| 284 </ui> |
