Mercurial Repositories > eric / file comparison
comparison: eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui
eric7/Plugins/VcsPlugins/vcsGit/GitMergeDialog.ui
- branch
- eric7
- changeset 8312
- 800c432b34c8
- parent 6942
- 2602857055c5
- child 8428
- 2deec2f8a9ab
equal
deleted
inserted
replaced
| 8311:4e8b98454baa | 8312:800c432b34c8 |
|---|---|
| 1 <?xml version="1.0" encoding="UTF-8"?> | |
| 2 <ui version="4.0"> | |
| 3 <class>GitMergeDialog</class> | |
| 4 <widget class="QDialog" name="GitMergeDialog"> | |
| 5 <property name="geometry"> | |
| 6 <rect> | |
| 7 <x>0</x> | |
| 8 <y>0</y> | |
| 9 <width>451</width> | |
| 10 <height>491</height> | |
| 11 </rect> | |
| 12 </property> | |
| 13 <property name="windowTitle"> | |
| 14 <string>Git Merge</string> | |
| 15 </property> | |
| 16 <property name="sizeGripEnabled"> | |
| 17 <bool>true</bool> | |
| 18 </property> | |
| 19 <layout class="QVBoxLayout" name="verticalLayout_2"> | |
| 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="idButton"> | |
| 28 <property name="toolTip"> | |
| 29 <string>Select to specify a revision by changeset id</string> | |
| 30 </property> | |
| 31 <property name="text"> | |
| 32 <string>Commit:</string> | |
| 33 </property> | |
| 34 </widget> | |
| 35 </item> | |
| 36 <item row="0" column="1"> | |
| 37 <widget class="QLineEdit" name="idEdit"> | |
| 38 <property name="enabled"> | |
| 39 <bool>false</bool> | |
| 40 </property> | |
| 41 <property name="toolTip"> | |
| 42 <string>Enter a commit id</string> | |
| 43 </property> | |
| 44 </widget> | |
| 45 </item> | |
| 46 <item row="1" column="0"> | |
| 47 <widget class="QRadioButton" name="tagButton"> | |
| 48 <property name="toolTip"> | |
| 49 <string>Select to specify a revision by a tag</string> | |
| 50 </property> | |
| 51 <property name="text"> | |
| 52 <string>Tag:</string> | |
| 53 </property> | |
| 54 </widget> | |
| 55 </item> | |
| 56 <item row="1" column="1"> | |
| 57 <widget class="QComboBox" name="tagCombo"> | |
| 58 <property name="enabled"> | |
| 59 <bool>false</bool> | |
| 60 </property> | |
| 61 <property name="toolTip"> | |
| 62 <string>Enter a tag name</string> | |
| 63 </property> | |
| 64 <property name="editable"> | |
| 65 <bool>true</bool> | |
| 66 </property> | |
| 67 </widget> | |
| 68 </item> | |
| 69 <item row="2" column="0"> | |
| 70 <widget class="QRadioButton" name="branchButton"> | |
| 71 <property name="toolTip"> | |
| 72 <string>Select to specify a revision by a local branch</string> | |
| 73 </property> | |
| 74 <property name="text"> | |
| 75 <string>Local Branch:</string> | |
| 76 </property> | |
| 77 </widget> | |
| 78 </item> | |
| 79 <item row="2" column="1"> | |
| 80 <widget class="QComboBox" name="branchCombo"> | |
| 81 <property name="enabled"> | |
| 82 <bool>false</bool> | |
| 83 </property> | |
| 84 <property name="toolTip"> | |
| 85 <string>Enter a local branch name</string> | |
| 86 </property> | |
| 87 <property name="editable"> | |
| 88 <bool>true</bool> | |
| 89 </property> | |
| 90 </widget> | |
| 91 </item> | |
| 92 <item row="3" column="0"> | |
| 93 <widget class="QRadioButton" name="remoteBranchButton"> | |
| 94 <property name="toolTip"> | |
| 95 <string>Select to specify a revision by a remote branch</string> | |
| 96 </property> | |
| 97 <property name="text"> | |
| 98 <string>Remote Branch:</string> | |
| 99 </property> | |
| 100 </widget> | |
| 101 </item> | |
| 102 <item row="3" column="1"> | |
| 103 <widget class="QComboBox" name="remoteBranchCombo"> | |
| 104 <property name="enabled"> | |
| 105 <bool>false</bool> | |
| 106 </property> | |
| 107 <property name="toolTip"> | |
| 108 <string>Enter a remote branch name</string> | |
| 109 </property> | |
| 110 <property name="editable"> | |
| 111 <bool>true</bool> | |
| 112 </property> | |
| 113 </widget> | |
| 114 </item> | |
| 115 <item row="4" column="0" colspan="2"> | |
| 116 <widget class="QRadioButton" name="noneButton"> | |
| 117 <property name="toolTip"> | |
| 118 <string>Select to not specify a specific revision</string> | |
| 119 </property> | |
| 120 <property name="text"> | |
| 121 <string>No commit selected</string> | |
| 122 </property> | |
| 123 <property name="checked"> | |
| 124 <bool>true</bool> | |
| 125 </property> | |
| 126 </widget> | |
| 127 </item> | |
| 128 </layout> | |
| 129 </widget> | |
| 130 </item> | |
| 131 <item> | |
| 132 <widget class="QGroupBox" name="commitGroupBox"> | |
| 133 <property name="toolTip"> | |
| 134 <string>Select to commit the merge</string> | |
| 135 </property> | |
| 136 <property name="title"> | |
| 137 <string>Commit Merge</string> | |
| 138 </property> | |
| 139 <property name="checkable"> | |
| 140 <bool>true</bool> | |
| 141 </property> | |
| 142 <layout class="QVBoxLayout" name="verticalLayout"> | |
| 143 <item> | |
| 144 <widget class="QLabel" name="label"> | |
| 145 <property name="text"> | |
| 146 <string>Commit Message:</string> | |
| 147 </property> | |
| 148 </widget> | |
| 149 </item> | |
| 150 <item> | |
| 151 <widget class="QPlainTextEdit" name="commitMessageEdit"> | |
| 152 <property name="toolTip"> | |
| 153 <string>Enter a message for the merge commit</string> | |
| 154 </property> | |
| 155 <property name="tabChangesFocus"> | |
| 156 <bool>true</bool> | |
| 157 </property> | |
| 158 </widget> | |
| 159 </item> | |
| 160 <item> | |
| 161 <widget class="QCheckBox" name="addLogCheckBox"> | |
| 162 <property name="toolTip"> | |
| 163 <string>Select to append the log summaries of merged commits</string> | |
| 164 </property> | |
| 165 <property name="text"> | |
| 166 <string>Add Log Message Summary</string> | |
| 167 </property> | |
| 168 </widget> | |
| 169 </item> | |
| 170 </layout> | |
| 171 </widget> | |
| 172 </item> | |
| 173 <item> | |
| 174 <widget class="QCheckBox" name="diffstatCheckBox"> | |
| 175 <property name="toolTip"> | |
| 176 <string>Select to show diff statistics at the end of the merge</string> | |
| 177 </property> | |
| 178 <property name="text"> | |
| 179 <string>Show diff statistics</string> | |
| 180 </property> | |
| 181 </widget> | |
| 182 </item> | |
| 183 <item> | |
| 184 <widget class="QDialogButtonBox" name="buttonBox"> | |
| 185 <property name="orientation"> | |
| 186 <enum>Qt::Horizontal</enum> | |
| 187 </property> | |
| 188 <property name="standardButtons"> | |
| 189 <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> | |
| 190 </property> | |
| 191 </widget> | |
| 192 </item> | |
| 193 </layout> | |
| 194 </widget> | |
| 195 <tabstops> | |
| 196 <tabstop>idButton</tabstop> | |
| 197 <tabstop>idEdit</tabstop> | |
| 198 <tabstop>tagButton</tabstop> | |
| 199 <tabstop>tagCombo</tabstop> | |
| 200 <tabstop>branchButton</tabstop> | |
| 201 <tabstop>branchCombo</tabstop> | |
| 202 <tabstop>remoteBranchButton</tabstop> | |
| 203 <tabstop>remoteBranchCombo</tabstop> | |
| 204 <tabstop>noneButton</tabstop> | |
| 205 <tabstop>commitGroupBox</tabstop> | |
| 206 <tabstop>commitMessageEdit</tabstop> | |
| 207 <tabstop>addLogCheckBox</tabstop> | |
| 208 <tabstop>diffstatCheckBox</tabstop> | |
| 209 </tabstops> | |
| 210 <resources/> | |
| 211 <connections> | |
| 212 <connection> | |
| 213 <sender>buttonBox</sender> | |
| 214 <signal>accepted()</signal> | |
| 215 <receiver>GitMergeDialog</receiver> | |
| 216 <slot>accept()</slot> | |
| 217 <hints> | |
| 218 <hint type="sourcelabel"> | |
| 219 <x>238</x> | |
| 220 <y>480</y> | |
| 221 </hint> | |
| 222 <hint type="destinationlabel"> | |
| 223 <x>157</x> | |
| 224 <y>274</y> | |
| 225 </hint> | |
| 226 </hints> | |
| 227 </connection> | |
| 228 <connection> | |
| 229 <sender>buttonBox</sender> | |
| 230 <signal>rejected()</signal> | |
| 231 <receiver>GitMergeDialog</receiver> | |
| 232 <slot>reject()</slot> | |
| 233 <hints> | |
| 234 <hint type="sourcelabel"> | |
| 235 <x>306</x> | |
| 236 <y>480</y> | |
| 237 </hint> | |
| 238 <hint type="destinationlabel"> | |
| 239 <x>286</x> | |
| 240 <y>274</y> | |
| 241 </hint> | |
| 242 </hints> | |
| 243 </connection> | |
| 244 <connection> | |
| 245 <sender>idButton</sender> | |
| 246 <signal>toggled(bool)</signal> | |
| 247 <receiver>idEdit</receiver> | |
| 248 <slot>setEnabled(bool)</slot> | |
| 249 <hints> | |
| 250 <hint type="sourcelabel"> | |
| 251 <x>80</x> | |
| 252 <y>58</y> | |
| 253 </hint> | |
| 254 <hint type="destinationlabel"> | |
| 255 <x>285</x> | |
| 256 <y>63</y> | |
| 257 </hint> | |
| 258 </hints> | |
| 259 </connection> | |
| 260 <connection> | |
| 261 <sender>tagButton</sender> | |
| 262 <signal>toggled(bool)</signal> | |
| 263 <receiver>tagCombo</receiver> | |
| 264 <slot>setEnabled(bool)</slot> | |
| 265 <hints> | |
| 266 <hint type="sourcelabel"> | |
| 267 <x>49</x> | |
| 268 <y>89</y> | |
| 269 </hint> | |
| 270 <hint type="destinationlabel"> | |
| 271 <x>281</x> | |
| 272 <y>92</y> | |
| 273 </hint> | |
| 274 </hints> | |
| 275 </connection> | |
| 276 <connection> | |
| 277 <sender>branchButton</sender> | |
| 278 <signal>toggled(bool)</signal> | |
| 279 <receiver>branchCombo</receiver> | |
| 280 <slot>setEnabled(bool)</slot> | |
| 281 <hints> | |
| 282 <hint type="sourcelabel"> | |
| 283 <x>101</x> | |
| 284 <y>120</y> | |
| 285 </hint> | |
| 286 <hint type="destinationlabel"> | |
| 287 <x>278</x> | |
| 288 <y>121</y> | |
| 289 </hint> | |
| 290 </hints> | |
| 291 </connection> | |
| 292 <connection> | |
| 293 <sender>remoteBranchButton</sender> | |
| 294 <signal>toggled(bool)</signal> | |
| 295 <receiver>remoteBranchCombo</receiver> | |
| 296 <slot>setEnabled(bool)</slot> | |
| 297 <hints> | |
| 298 <hint type="sourcelabel"> | |
| 299 <x>87</x> | |
| 300 <y>138</y> | |
| 301 </hint> | |
| 302 <hint type="destinationlabel"> | |
| 303 <x>174</x> | |
| 304 <y>139</y> | |
| 305 </hint> | |
| 306 </hints> | |
| 307 </connection> | |
| 308 </connections> | |
| 309 </ui> |
