1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MergeForm</class>
<widget class="QWidget" name="MergeForm">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>448</width>
<height>248</height>
</rect>
</property>
<property name="windowTitle">
<string>Merge</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="margin">
<number>9</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Options</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>&Location:</string>
</property>
<property name="buddy">
<cstring>revision</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="location">
<property name="editable">
<bool>true</bool>
</property>
<property name="sizeAdjustPolicy">
<enum>QComboBox::AdjustToMinimumContentsLength</enum>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="location_picker">
<property name="text">
<string>Browse...</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>&Revision:</string>
</property>
<property name="buddy">
<cstring>revision</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="revision"/>
</item>
<item row="1" column="2" colspan="2">
<spacer name="spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>107</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="4">
<widget class="QCheckBox" name="remember">
<property name="text">
<string>Remember this location as a default</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="4">
<widget class="QCheckBox" name="force">
<property name="text">
<string>Merge even if the working tree has uncommitted changes</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="4">
<widget class="QCheckBox" name="uncommitted">
<property name="text">
<string>Merge uncommitted changes instead of committed ones</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
<connection>
<sender>MergeForm</sender>
<signal>disableUi(bool)</signal>
<receiver>groupBox</receiver>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>17</x>
<y>7</y>
</hint>
<hint type="destinationlabel">
<x>22</x>
<y>16</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<signal>disableUi(bool)</signal>
</slots>
</ui>
|