Mercurial Repositories > eric / file comparison

comparison: Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui

Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui

branch
Py2 comp.
changeset 3484
645c12de6b0c
parent 3302
e92f0dd51979
child 5330
381665763704
equal deleted inserted replaced
3456:96232974dcdb 3484:645c12de6b0c
4 <widget class="QWidget" name="MercurialPage"> 4 <widget class="QWidget" name="MercurialPage">
5 <property name="geometry"> 5 <property name="geometry">
6 <rect> 6 <rect>
7 <x>0</x> 7 <x>0</x>
8 <y>0</y> 8 <y>0</y>
9 <width>406</width> 9 <width>609</width>
10 <height>582</height> 10 <height>751</height>
11 </rect> 11 </rect>
12 </property> 12 </property>
13 <layout class="QVBoxLayout" name="verticalLayout_4"> 13 <layout class="QVBoxLayout" name="verticalLayout_5">
14 <item> 14 <item>
15 <widget class="QLabel" name="headerLabel"> 15 <widget class="QLabel" name="headerLabel">
16 <property name="text"> 16 <property name="text">
17 <string>&lt;b&gt;Configure Mercurial Interface&lt;/b&gt;</string> 17 <string>&lt;b&gt;Configure Mercurial Interface&lt;/b&gt;</string>
18 </property> 18 </property>
27 <enum>QFrame::Sunken</enum> 27 <enum>QFrame::Sunken</enum>
28 </property> 28 </property>
29 <property name="orientation"> 29 <property name="orientation">
30 <enum>Qt::Horizontal</enum> 30 <enum>Qt::Horizontal</enum>
31 </property> 31 </property>
32 </widget>
33 </item>
34 <item>
35 <widget class="QGroupBox" name="groupBox_8">
36 <property name="title">
37 <string>Global Options</string>
38 </property>
39 <layout class="QGridLayout" name="gridLayout">
40 <item row="0" column="0">
41 <widget class="QLabel" name="label_4">
42 <property name="text">
43 <string>Encoding:</string>
44 </property>
45 </widget>
46 </item>
47 <item row="0" column="1">
48 <widget class="QComboBox" name="encodingComboBox">
49 <property name="sizePolicy">
50 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
51 <horstretch>0</horstretch>
52 <verstretch>0</verstretch>
53 </sizepolicy>
54 </property>
55 <property name="toolTip">
56 <string>Select the encoding to be used by Mercurial</string>
57 </property>
58 </widget>
59 </item>
60 <item row="0" column="2">
61 <widget class="QLabel" name="label_5">
62 <property name="text">
63 <string>Encoding Mode:</string>
64 </property>
65 </widget>
66 </item>
67 <item row="0" column="3">
68 <widget class="QComboBox" name="encodingModeComboBox">
69 <property name="sizePolicy">
70 <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
71 <horstretch>0</horstretch>
72 <verstretch>0</verstretch>
73 </sizepolicy>
74 </property>
75 <property name="toolTip">
76 <string>Select the encoding mode</string>
77 </property>
78 </widget>
79 </item>
80 <item row="1" column="0" colspan="2">
81 <widget class="QCheckBox" name="hiddenChangesetsCheckBox">
82 <property name="text">
83 <string>Consider hidden changesets</string>
84 </property>
85 </widget>
86 </item>
87 </layout>
32 </widget> 88 </widget>
33 </item> 89 </item>
34 <item> 90 <item>
35 <widget class="QGroupBox" name="groupBox"> 91 <widget class="QGroupBox" name="groupBox">
36 <property name="title"> 92 <property name="title">
169 </item> 225 </item>
170 </layout> 226 </layout>
171 </widget> 227 </widget>
172 </item> 228 </item>
173 <item> 229 <item>
230 <widget class="QGroupBox" name="groupBox_7">
231 <property name="title">
232 <string>Merge</string>
233 </property>
234 <layout class="QVBoxLayout" name="verticalLayout_4">
235 <item>
236 <widget class="QCheckBox" name="internalMergeCheckBox">
237 <property name="toolTip">
238 <string>Select to enforce usage of the Mercural internal merge tool</string>
239 </property>
240 <property name="whatsThis">
241 <string>&lt;b&gt;Internal Merge Tool&lt;/b&gt;
242 &lt;p&gt;Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.&lt;/p&gt;</string>
243 </property>
244 <property name="text">
245 <string>Use internal merge with conflict markers</string>
246 </property>
247 </widget>
248 </item>
249 </layout>
250 </widget>
251 </item>
252 <item>
174 <widget class="QGroupBox" name="groupBox_6"> 253 <widget class="QGroupBox" name="groupBox_6">
175 <property name="title"> 254 <property name="title">
176 <string>Revert</string> 255 <string>Revert</string>
177 </property> 256 </property>
178 <layout class="QVBoxLayout" name="verticalLayout_3"> 257 <layout class="QVBoxLayout" name="verticalLayout_3">
236 </spacer> 315 </spacer>
237 </item> 316 </item>
238 </layout> 317 </layout>
239 </widget> 318 </widget>
240 <tabstops> 319 <tabstops>
320 <tabstop>encodingComboBox</tabstop>
321 <tabstop>encodingModeComboBox</tabstop>
322 <tabstop>hiddenChangesetsCheckBox</tabstop>
241 <tabstop>logSpinBox</tabstop> 323 <tabstop>logSpinBox</tabstop>
242 <tabstop>commitSpinBox</tabstop> 324 <tabstop>commitSpinBox</tabstop>
243 <tabstop>logBrowserCheckBox</tabstop> 325 <tabstop>logBrowserCheckBox</tabstop>
244 <tabstop>pullUpdateCheckBox</tabstop> 326 <tabstop>pullUpdateCheckBox</tabstop>
245 <tabstop>preferUnbundleCheckBox</tabstop> 327 <tabstop>preferUnbundleCheckBox</tabstop>
328 <tabstop>internalMergeCheckBox</tabstop>
246 <tabstop>backupCheckBox</tabstop> 329 <tabstop>backupCheckBox</tabstop>
247 <tabstop>cleanupPatternEdit</tabstop> 330 <tabstop>cleanupPatternEdit</tabstop>
248 <tabstop>configButton</tabstop> 331 <tabstop>configButton</tabstop>
249 </tabstops> 332 </tabstops>
250 <resources/> 333 <resources/>

Mercurial Repository: eric

eric ide

mercurial