Sat, 31 Aug 2019 12:18:44 +0200
HgStatusDialog: backed out the disabling of the status list for merges because it prevents to review the individual changes and to inspect the list for long lists of changed files.
5641
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | <?xml version="1.0" encoding="UTF-8"?> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | <ui version="4.0"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
3 | <class>HgUserConfigHostMinimumProtocolDialog</class> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | <widget class="QDialog" name="HgUserConfigHostMinimumProtocolDialog"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | <property name="geometry"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | <rect> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | <x>0</x> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | <y>0</y> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | <width>450</width> |
5856
712385ea1f75
Fixed some PyQt4 compatibility errors.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5641
diff
changeset
|
10 | <height>110</height> |
5641
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | </rect> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
12 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
13 | <property name="windowTitle"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | <string>Minimum Protocol</string> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | <property name="sizeGripEnabled"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | <bool>true</bool> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | <layout class="QGridLayout" name="gridLayout"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | <item row="0" column="0"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | <widget class="QLabel" name="label"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | <property name="text"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | <string>Host:</string> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | </widget> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | </item> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | <item row="0" column="1"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | <widget class="E5ClearableLineEdit" name="hostEdit"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | <property name="toolTip"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | <string>Enter the host name</string> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | <property name="placeholderText"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | <string>Enter Hostname</string> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | </widget> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | </item> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | <item row="1" column="0"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | <widget class="QLabel" name="hashLabel"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | <property name="text"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | <string>Minimum Protocol:</string> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | </widget> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | </item> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | <item row="1" column="1"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | <layout class="QHBoxLayout" name="horizontalLayout"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
46 | <item> |
5856
712385ea1f75
Fixed some PyQt4 compatibility errors.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5641
diff
changeset
|
47 | <widget class="QComboBox" name="minimumProtocolComboBox"/> |
5641
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | </item> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | <item> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | <spacer name="horizontalSpacer"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | <property name="orientation"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | <enum>Qt::Horizontal</enum> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | <property name="sizeHint" stdset="0"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | <size> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | <width>178</width> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | <height>20</height> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | </size> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | </spacer> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | </item> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | </layout> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | </item> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | <item row="2" column="0" colspan="2"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | <widget class="QDialogButtonBox" name="buttonBox"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | <property name="orientation"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | <enum>Qt::Horizontal</enum> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | <property name="standardButtons"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | </property> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | </widget> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
73 | </item> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
74 | </layout> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
75 | </widget> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
76 | <customwidgets> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | <customwidget> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
78 | <class>E5ClearableLineEdit</class> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
79 | <extends>QLineEdit</extends> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
80 | <header>E5Gui/E5LineEdit.h</header> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
81 | </customwidget> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
82 | </customwidgets> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
83 | <tabstops> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
84 | <tabstop>hostEdit</tabstop> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
85 | <tabstop>minimumProtocolComboBox</tabstop> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
86 | </tabstops> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
87 | <resources/> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
88 | <connections> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | <connection> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
90 | <sender>buttonBox</sender> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
91 | <signal>accepted()</signal> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | <receiver>HgUserConfigHostMinimumProtocolDialog</receiver> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | <slot>accept()</slot> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | <hints> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | <hint type="sourcelabel"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
96 | <x>248</x> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
97 | <y>254</y> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | </hint> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
99 | <hint type="destinationlabel"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
100 | <x>157</x> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
101 | <y>274</y> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | </hint> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
103 | </hints> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
104 | </connection> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
105 | <connection> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | <sender>buttonBox</sender> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | <signal>rejected()</signal> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | <receiver>HgUserConfigHostMinimumProtocolDialog</receiver> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
109 | <slot>reject()</slot> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | <hints> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
111 | <hint type="sourcelabel"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
112 | <x>316</x> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | <y>260</y> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | </hint> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | <hint type="destinationlabel"> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | <x>286</x> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | <y>274</y> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
118 | </hint> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | </hints> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | </connection> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
121 | </connections> |
3ced21e990eb
Extended the user configuration dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
122 | </ui> |