Merge lp:~druke/software-properties/button_fix into lp:software-properties

Proposed by BrandonTomlinson on 2010-04-16
Status: Merged
Merge reported by: Michael Vogt
Merged at revision: not available
Proposed branch: lp:~druke/software-properties/button_fix
Merge into: lp:software-properties
Diff against target: 131 lines (+67/-54)
1 file modified
data/glade/main.glade (+67/-54)
To merge this branch: bzr merge lp:~druke/software-properties/button_fix
Reviewer Review Type Date Requested Status
Michael Vogt 2010-04-16 Approve on 2010-08-13
Review via email: mp+23533@code.launchpad.net

Description of the change

fixes #515990 by adding an hbutton box widget around the bottom buttons to data/glade/main.glade .

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Looks great, thanks for this fix!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/glade/main.glade'
2--- data/glade/main.glade 2009-08-28 17:57:47 +0000
3+++ data/glade/main.glade 2010-04-16 09:14:18 +0000
4@@ -1579,60 +1579,73 @@
5 <property name="spacing">6</property>
6
7 <child>
8- <widget class="GtkButton" id="button_help">
9- <property name="can_default">True</property>
10- <property name="can_focus">True</property>
11- <property name="label">gtk-help</property>
12- <property name="use_stock">True</property>
13- <property name="relief">GTK_RELIEF_NORMAL</property>
14- <property name="focus_on_click">True</property>
15- <signal name="clicked" handler="on_help_button" last_modification_time="Mon, 04 Jul 2005 21:19:04 GMT"/>
16- </widget>
17- <packing>
18- <property name="padding">0</property>
19- <property name="expand">False</property>
20- <property name="fill">False</property>
21- </packing>
22- </child>
23-
24- <child>
25- <widget class="GtkButton" id="button_close">
26- <property name="visible">True</property>
27- <property name="can_default">True</property>
28- <property name="can_focus">True</property>
29- <property name="label">gtk-close</property>
30- <property name="use_stock">True</property>
31- <property name="relief">GTK_RELIEF_NORMAL</property>
32- <property name="focus_on_click">True</property>
33- <signal name="clicked" handler="on_close_button" last_modification_time="Mon, 04 Jul 2005 21:18:56 GMT"/>
34- </widget>
35- <packing>
36- <property name="padding">0</property>
37- <property name="expand">False</property>
38- <property name="fill">False</property>
39- <property name="pack_type">GTK_PACK_END</property>
40- </packing>
41- </child>
42-
43- <child>
44- <widget class="GtkButton" id="button_revert">
45- <property name="visible">True</property>
46- <property name="sensitive">False</property>
47- <property name="can_default">True</property>
48- <property name="can_focus">True</property>
49- <property name="label">gtk-revert-to-saved</property>
50- <property name="use_stock">True</property>
51- <property name="relief">GTK_RELIEF_NORMAL</property>
52- <property name="focus_on_click">True</property>
53- <signal name="clicked" handler="on_button_revert_clicked" last_modification_time="Thu, 27 Jul 2006 21:47:47 GMT"/>
54- </widget>
55- <packing>
56- <property name="padding">0</property>
57- <property name="expand">False</property>
58- <property name="fill">False</property>
59- <property name="pack_type">GTK_PACK_END</property>
60- </packing>
61- </child>
62+ <widget class="GtkHButtonBox" id="utilitybuttons">
63+ <property name="visible">True</property>
64+ <property name="layout_style">end</property>
65+ <property name="spacing">6</property>
66+
67+ <child>
68+ <widget class="GtkButton" id="button_help">
69+ <property name="can_default">True</property>
70+ <property name="can_focus">True</property>
71+ <property name="label">gtk-help</property>
72+ <property name="use_stock">True</property>
73+ <property name="relief">GTK_RELIEF_NORMAL</property>
74+ <property name="focus_on_click">True</property>
75+ <signal name="clicked" handler="on_help_button" last_modification_time="Mon, 04 Jul 2005 21:19:04 GMT"/>
76+ </widget>
77+ <packing>
78+ <property name="padding">0</property>
79+ <property name="expand">False</property>
80+ <property name="fill">False</property>
81+ </packing>
82+ </child>
83+
84+ <child>
85+ <widget class="GtkButton" id="button_close">
86+ <property name="visible">True</property>
87+ <property name="can_default">True</property>
88+ <property name="can_focus">True</property>
89+ <property name="label">gtk-close</property>
90+ <property name="use_stock">True</property>
91+ <property name="relief">GTK_RELIEF_NORMAL</property>
92+ <property name="focus_on_click">True</property>
93+ <signal name="clicked" handler="on_close_button" last_modification_time="Mon, 04 Jul 2005 21:18:56 GMT"/>
94+ </widget>
95+ <packing>
96+ <property name="padding">0</property>
97+ <property name="expand">False</property>
98+ <property name="fill">False</property>
99+ <property name="pack_type">GTK_PACK_END</property>
100+ </packing>
101+ </child>
102+
103+ <child>
104+ <widget class="GtkButton" id="button_revert">
105+ <property name="visible">True</property>
106+ <property name="sensitive">False</property>
107+ <property name="can_default">True</property>
108+ <property name="can_focus">True</property>
109+ <property name="label">gtk-revert-to-saved</property>
110+ <property name="use_stock">True</property>
111+ <property name="relief">GTK_RELIEF_NORMAL</property>
112+ <property name="focus_on_click">True</property>
113+ <signal name="clicked" handler="on_button_revert_clicked" last_modification_time="Thu, 27 Jul 2006 21:47:47 GMT"/>
114+ </widget>
115+ <packing>
116+ <property name="padding">0</property>
117+ <property name="expand">False</property>
118+ <property name="fill">False</property>
119+ <property name="pack_type">GTK_PACK_END</property>
120+ </packing>
121+ </child>
122+
123+ </widget>
124+ <packing>
125+ <property name="position">0</property>
126+ </packing>
127+ </child>
128+
129 </widget>
130 <packing>
131 <property name="padding">0</property>

Subscribers

People subscribed via source and target branches

to status/vote changes: