compare: make the ok button work in the 'compare files...' selection dialog
[git-cola.git] / ui / merge.ui
blob3f80399b974f1b5879cbaf6f60a75d4f5844b932
1 <ui version="4.0" >
2  <class>merge</class>
3  <widget class="QDialog" name="merge" >
4   <property name="geometry" >
5    <rect>
6     <x>0</x>
7     <y>0</y>
8     <width>673</width>
9     <height>339</height>
10    </rect>
11   </property>
12   <property name="windowTitle" >
13    <string>Merge</string>
14   </property>
15   <layout class="QVBoxLayout" >
16    <item>
17     <widget class="QLabel" name="label" >
18      <property name="text" >
19       <string>Merge into %s</string>
20      </property>
21      <property name="alignment" >
22       <set>Qt::AlignCenter</set>
23      </property>
24     </widget>
25    </item>
26    <item>
27     <widget class="QGroupBox" name="groupBox" >
28      <property name="title" >
29       <string>Revision To Merge</string>
30      </property>
31      <layout class="QGridLayout" >
32       <property name="leftMargin" >
33        <number>5</number>
34       </property>
35       <property name="topMargin" >
36        <number>0</number>
37       </property>
38       <property name="rightMargin" >
39        <number>5</number>
40       </property>
41       <property name="bottomMargin" >
42        <number>5</number>
43       </property>
44       <property name="horizontalSpacing" >
45        <number>0</number>
46       </property>
47       <property name="verticalSpacing" >
48        <number>0</number>
49       </property>
50       <item row="0" column="0" >
51        <widget class="QLabel" name="label_2" >
52         <property name="text" >
53          <string>Revision Expression:</string>
54         </property>
55        </widget>
56       </item>
57       <item row="0" column="1" colspan="2" >
58        <widget class="QLineEdit" name="revision" />
59       </item>
60       <item row="1" column="0" >
61        <widget class="QRadioButton" name="radio_local" >
62         <property name="text" >
63          <string>Local Branch</string>
64         </property>
65        </widget>
66       </item>
67       <item row="1" column="1" >
68        <widget class="QRadioButton" name="radio_remote" >
69         <property name="text" >
70          <string>Tracking Branch</string>
71         </property>
72        </widget>
73       </item>
74       <item row="1" column="2" >
75        <widget class="QRadioButton" name="radio_tag" >
76         <property name="text" >
77          <string>Tag</string>
78         </property>
79        </widget>
80       </item>
81       <item row="2" column="0" colspan="3" >
82        <widget class="QListWidget" name="revision_list" >
83         <property name="alternatingRowColors" >
84          <bool>true</bool>
85         </property>
86        </widget>
87       </item>
88      </layout>
89     </widget>
90    </item>
91    <item>
92     <layout class="QHBoxLayout" >
93      <item>
94       <widget class="QPushButton" name="button_viz" >
95        <property name="text" >
96         <string>Visualize</string>
97        </property>
98       </widget>
99      </item>
100      <item>
101       <spacer>
102        <property name="orientation" >
103         <enum>Qt::Horizontal</enum>
104        </property>
105        <property name="sizeHint" >
106         <size>
107          <width>231</width>
108          <height>24</height>
109         </size>
110        </property>
111       </spacer>
112      </item>
113      <item>
114       <widget class="QCheckBox" name="checkbox_squash" >
115        <property name="text" >
116         <string>Squash</string>
117        </property>
118       </widget>
119      </item>
120      <item>
121       <widget class="QCheckBox" name="checkbox_commit" >
122        <property name="text" >
123         <string>Commit</string>
124        </property>
125        <property name="checked" >
126         <bool>true</bool>
127        </property>
128       </widget>
129      </item>
130      <item>
131       <widget class="QPushButton" name="button_cancel" >
132        <property name="text" >
133         <string>Cancel</string>
134        </property>
135       </widget>
136      </item>
137      <item>
138       <widget class="QPushButton" name="button_merge" >
139        <property name="text" >
140         <string>Merge</string>
141        </property>
142       </widget>
143      </item>
144     </layout>
145    </item>
146   </layout>
147  </widget>
148  <resources/>
149  <connections>
150   <connection>
151    <sender>button_cancel</sender>
152    <signal>clicked()</signal>
153    <receiver>merge</receiver>
154    <slot>reject()</slot>
155    <hints>
156     <hint type="sourcelabel" >
157      <x>540</x>
158      <y>316</y>
159     </hint>
160     <hint type="destinationlabel" >
161      <x>336</x>
162      <y>169</y>
163     </hint>
164    </hints>
165   </connection>
166  </connections>
167 </ui>