Skip to content

Commit 6628d80

Browse files
kaiwkaiw
committed
patchdialog: Update to new Glade and fix sourceview expand (bgo#738120)
1 parent 98bdf00 commit 6628d80

2 files changed

Lines changed: 110 additions & 106 deletions

File tree

‎data/ui/patch-dialog.ui‎

Lines changed: 108 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,163 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Generated with glade 3.18.1 -->
23
<interface>
3-
<requires lib="gtk+" version="2.16"/>
4-
<!-- interface-naming-policy toplevel-contextual -->
4+
<requires lib="gtk+" version="3.6"/>
55
<object class="GtkDialog" id="patchdialog">
66
<property name="visible">True</property>
7+
<property name="can_focus">False</property>
78
<property name="border_width">12</property>
89
<property name="title" translatable="yes">Format as Patch</property>
910
<property name="type_hint">dialog</property>
1011
<property name="skip_taskbar_hint">True</property>
1112
<property name="skip_pager_hint">True</property>
1213
<child internal-child="vbox">
13-
<object class="GtkVBox" id="dialog-vbox3">
14+
<object class="GtkBox" id="dialog-vbox3">
1415
<property name="visible">True</property>
16+
<property name="can_focus">False</property>
17+
<property name="orientation">vertical</property>
1518
<property name="spacing">6</property>
19+
<child internal-child="action_area">
20+
<object class="GtkButtonBox" id="dialog-action_area">
21+
<property name="visible">True</property>
22+
<property name="can_focus">False</property>
23+
<property name="layout_style">end</property>
24+
<child>
25+
<object class="GtkButton" id="button1">
26+
<property name="label" translatable="yes">Copy to Clipboard</property>
27+
<property name="use_action_appearance">False</property>
28+
<property name="visible">True</property>
29+
<property name="can_focus">True</property>
30+
<property name="can_default">True</property>
31+
<property name="receives_default">False</property>
32+
</object>
33+
<packing>
34+
<property name="expand">False</property>
35+
<property name="fill">False</property>
36+
<property name="position">0</property>
37+
</packing>
38+
</child>
39+
<child>
40+
<object class="GtkButton" id="button9">
41+
<property name="label">gtk-cancel</property>
42+
<property name="visible">True</property>
43+
<property name="can_focus">True</property>
44+
<property name="can_default">True</property>
45+
<property name="receives_default">False</property>
46+
<property name="use_stock">True</property>
47+
<accelerator key="Escape" signal="activate"/>
48+
</object>
49+
<packing>
50+
<property name="expand">False</property>
51+
<property name="fill">False</property>
52+
<property name="position">1</property>
53+
</packing>
54+
</child>
55+
<child>
56+
<object class="GtkButton" id="button7">
57+
<property name="label" translatable="yes">Save Patch</property>
58+
<property name="use_action_appearance">False</property>
59+
<property name="visible">True</property>
60+
<property name="can_focus">True</property>
61+
<property name="can_default">True</property>
62+
<property name="receives_default">True</property>
63+
</object>
64+
<packing>
65+
<property name="expand">False</property>
66+
<property name="fill">False</property>
67+
<property name="position">2</property>
68+
</packing>
69+
</child>
70+
</object>
71+
<packing>
72+
<property name="expand">False</property>
73+
<property name="fill">False</property>
74+
<property name="pack_type">end</property>
75+
<property name="position">0</property>
76+
</packing>
77+
</child>
1678
<child>
17-
<object class="GtkVBox" id="vbox1">
79+
<object class="GtkBox" id="vbox1">
1880
<property name="visible">True</property>
81+
<property name="can_focus">False</property>
82+
<property name="orientation">vertical</property>
1983
<property name="spacing">6</property>
2084
<child>
21-
<object class="GtkLabel" id="label3">
85+
<object class="GtkLabel" id="side_selection_label">
2286
<property name="visible">True</property>
23-
<property name="xalign">0</property>
87+
<property name="can_focus">False</property>
2488
<property name="label" translatable="yes">Use differences between:</property>
89+
<property name="xalign">0</property>
2590
</object>
2691
<packing>
2792
<property name="expand">False</property>
93+
<property name="fill">True</property>
2894
<property name="position">0</property>
2995
</packing>
3096
</child>
3197
<child>
32-
<object class="GtkHBox" id="hbox2">
98+
<object class="GtkBox" id="side_selection_box">
3399
<property name="visible">True</property>
100+
<property name="can_focus">False</property>
101+
<property name="margin_left">18</property>
102+
<property name="orientation">vertical</property>
34103
<child>
35-
<object class="GtkLabel" id="label4">
104+
<object class="GtkRadioButton" id="left_radiobutton">
105+
<property name="label" translatable="yes">Left and middle panes</property>
106+
<property name="use_action_appearance">False</property>
36107
<property name="visible">True</property>
108+
<property name="can_focus">True</property>
109+
<property name="receives_default">False</property>
110+
<property name="xalign">0</property>
111+
<property name="active">True</property>
112+
<property name="draw_indicator">True</property>
113+
<signal name="toggled" handler="on_buffer_selection_changed" swapped="no"/>
37114
</object>
38115
<packing>
39116
<property name="expand">False</property>
40-
<property name="fill">False</property>
41-
<property name="padding">12</property>
117+
<property name="fill">True</property>
42118
<property name="position">0</property>
43119
</packing>
44120
</child>
45121
<child>
46-
<object class="GtkVBox" id="vbox2">
122+
<object class="GtkRadioButton" id="right_radiobutton">
123+
<property name="label" translatable="yes">Middle and right panes</property>
124+
<property name="use_action_appearance">False</property>
47125
<property name="visible">True</property>
48-
<property name="spacing">6</property>
49-
<child>
50-
<object class="GtkRadioButton" id="left_radiobutton">
51-
<property name="label" translatable="yes">Left and middle panes</property>
52-
<property name="visible">True</property>
53-
<property name="can_focus">True</property>
54-
<property name="receives_default">False</property>
55-
<property name="use_action_appearance">False</property>
56-
<property name="active">True</property>
57-
<property name="draw_indicator">True</property>
58-
<signal name="toggled" handler="on_buffer_selection_changed" swapped="no"/>
59-
</object>
60-
<packing>
61-
<property name="expand">False</property>
62-
<property name="position">0</property>
63-
</packing>
64-
</child>
65-
<child>
66-
<object class="GtkRadioButton" id="right_radiobutton">
67-
<property name="label" translatable="yes">Middle and right panes</property>
68-
<property name="visible">True</property>
69-
<property name="can_focus">True</property>
70-
<property name="receives_default">False</property>
71-
<property name="use_action_appearance">False</property>
72-
<property name="active">True</property>
73-
<property name="draw_indicator">True</property>
74-
<property name="group">left_radiobutton</property>
75-
<signal name="toggled" handler="on_buffer_selection_changed" swapped="no"/>
76-
</object>
77-
<packing>
78-
<property name="expand">False</property>
79-
<property name="position">1</property>
80-
</packing>
81-
</child>
126+
<property name="can_focus">True</property>
127+
<property name="receives_default">False</property>
128+
<property name="xalign">0</property>
129+
<property name="active">True</property>
130+
<property name="draw_indicator">True</property>
131+
<signal name="toggled" handler="on_buffer_selection_changed" swapped="no"/>
82132
</object>
83133
<packing>
134+
<property name="expand">False</property>
135+
<property name="fill">True</property>
84136
<property name="position">1</property>
85137
</packing>
86138
</child>
87139
</object>
88140
<packing>
89-
<property name="expand">False</property>
141+
<property name="expand">True</property>
142+
<property name="fill">True</property>
90143
<property name="position">1</property>
91144
</packing>
92145
</child>
93146
<child>
94147
<object class="GtkCheckButton" id="reverse_checkbutton">
95148
<property name="label" translatable="yes">_Reverse patch direction</property>
149+
<property name="use_action_appearance">False</property>
96150
<property name="visible">True</property>
97151
<property name="can_focus">True</property>
98152
<property name="receives_default">False</property>
99-
<property name="use_action_appearance">False</property>
100153
<property name="use_underline">True</property>
154+
<property name="xalign">0</property>
101155
<property name="draw_indicator">True</property>
102156
<signal name="toggled" handler="on_reverse_checkbutton_toggled" swapped="no"/>
103157
</object>
104158
<packing>
105159
<property name="expand">False</property>
160+
<property name="fill">True</property>
106161
<property name="position">2</property>
107162
</packing>
108163
</child>
@@ -112,8 +167,6 @@
112167
<property name="height_request">400</property>
113168
<property name="visible">True</property>
114169
<property name="can_focus">True</property>
115-
<property name="hscrollbar_policy">automatic</property>
116-
<property name="vscrollbar_policy">automatic</property>
117170
<property name="shadow_type">in</property>
118171
<child>
119172
<object class="MeldSourceView" id="textview">
@@ -124,74 +177,25 @@
124177
</child>
125178
</object>
126179
<packing>
180+
<property name="expand">True</property>
181+
<property name="fill">True</property>
127182
<property name="padding">6</property>
128183
<property name="position">3</property>
129184
</packing>
130185
</child>
131186
</object>
132-
</child>
133-
<child internal-child="action_area">
134-
<object class="GtkHButtonBox" id="dialog-action_area">
135-
<property name="visible">True</property>
136-
<property name="layout_style">end</property>
137-
<child>
138-
<object class="GtkButton" id="button1">
139-
<property name="label" translatable="yes">Copy to Clipboard</property>
140-
<property name="visible">True</property>
141-
<property name="can_focus">True</property>
142-
<property name="can_default">True</property>
143-
<property name="use_action_appearance">False</property>
144-
</object>
145-
<packing>
146-
<property name="expand">False</property>
147-
<property name="fill">False</property>
148-
<property name="position">0</property>
149-
</packing>
150-
</child>
151-
<child>
152-
<object class="GtkButton" id="button9">
153-
<property name="label">gtk-cancel</property>
154-
<property name="visible">True</property>
155-
<property name="can_focus">True</property>
156-
<property name="can_default">True</property>
157-
<property name="receives_default">False</property>
158-
<property name="use_stock">True</property>
159-
<accelerator key="Escape" signal="activate"/>
160-
</object>
161-
<packing>
162-
<property name="expand">False</property>
163-
<property name="fill">False</property>
164-
<property name="position">1</property>
165-
</packing>
166-
</child>
167-
<child>
168-
<object class="GtkButton" id="button7">
169-
<property name="label" translatable="yes">Save Patch</property>
170-
<property name="visible">True</property>
171-
<property name="can_focus">True</property>
172-
<property name="can_default">True</property>
173-
<property name="receives_default">True</property>
174-
<property name="use_action_appearance">False</property>
175-
</object>
176-
<packing>
177-
<property name="expand">False</property>
178-
<property name="fill">False</property>
179-
<property name="position">2</property>
180-
</packing>
181-
</child>
182-
</object>
183187
<packing>
184-
<property name="expand">False</property>
185-
<property name="pack_type">end</property>
186-
<property name="position">0</property>
188+
<property name="expand">True</property>
189+
<property name="fill">True</property>
190+
<property name="position">1</property>
187191
</packing>
188192
</child>
189193
</object>
190194
</child>
191195
<action-widgets>
192196
<action-widget response="1">button1</action-widget>
193-
<action-widget response="0">button7</action-widget>
194197
<action-widget response="-6">button9</action-widget>
198+
<action-widget response="0">button7</action-widget>
195199
</action-widgets>
196200
</object>
197201
</interface>

‎meld/patchdialog.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ def __init__(self, filediff):
5151
self.reverse_patch = self.reverse_checkbutton.get_active()
5252

5353
if self.filediff.num_panes < 3:
54-
self.label3.hide()
55-
self.hbox2.hide()
54+
self.side_selection_label.hide()
55+
self.side_selection_box.hide()
5656

5757
meldsettings.connect('changed', self.on_setting_changed)
5858

0 commit comments

Comments
 (0)