Software Updater

Merge lp:~evfool/update-manager/fix150677 into lp:update-manager

  1. fix150677
  2. Merge into main
Proposed by Robert Roth
Status: Merged
Merged at revision: 2086
Proposed branch: lp:~evfool/update-manager/fix150677
Merge into: lp:update-manager
Diff against target: 186 lines (+17/-120)
1 file modified
data/glade/UpdateManager.ui (+17/-120)
To merge this branch: bzr merge lp:~evfool/update-manager/fix150677
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Barry Warsaw (community) Approve
Robert Roth Pending
Review via email: mp+55874@code.launchpad.net

This proposal supersedes a proposal from 2011-03-29.

Description of the change

Respect GTK setting for show images on buttons.

To post a comment you must log in.
Revision history for this message
Barry Warsaw (barry) wrote : Posted in a previous version of this proposal

I'm sure I'm doing this completely wrong, but I can't see that this makes any difference. Here's what I did:

$ gconf-editor
navigate to /desktop/gnome/interface/buttons_have_icons

it was already unchecked. Ran your branch, but still saw the icons on those buttons. Toggled the setting on, ran it again, still see icons. Toggled it off again, still see the icons.

Note though, that I was testing this with your branch on Maverick. Would natty have made a difference?

review: Needs Information
Revision history for this message
Robert Roth (evfool) wrote : Posted in a previous version of this proposal

I have checked on my Maverick computer, and you seem to be right, when running update-manager from my branch the icons are shown regardless of the setting, but that seems to be because the ui files are taken from /usr/share/update-manager/glade, and the fix changes the ui files only. So after running sudo cp data/glade/* /usr/share/update-manager/glade the fix takes effect. I would guess that the 'sudo ./setup.py install' command does copy the ui files to the directory, but I could not do that on Maverick, as there is a package required (apt-clone) that is only available in Natty.

review: Needs Resubmitting
Revision history for this message
Barry Warsaw (barry) wrote :

Nicely done! I built a test package and ran it on Natty and it worked perfectly. I can't upload this, but someone should do that soon.

review: Approve
Revision history for this message
Michael Vogt (mvo) wrote :

Thanks, looks fine!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/glade/UpdateManager.ui'
2--- data/glade/UpdateManager.ui 2011-03-01 10:46:44 +0000
3+++ data/glade/UpdateManager.ui 2011-04-01 07:52:31 +0000
4@@ -229,6 +229,14 @@
5 <action-widget response="-7">okbutton3</action-widget>
6 </action-widgets>
7 </object>
8+ <object class="GtkImage" id="image-apply">
9+ <property name="visible">True</property>
10+ <property name="stock">gtk-apply</property>
11+ </object>
12+ <object class="GtkImage" id="image-refresh">
13+ <property name="visible">True</property>
14+ <property name="stock">gtk-refresh</property>
15+ </object>
16 <object class="GtkDialog" id="dialog_manual_update">
17 <property name="can_focus">False</property>
18 <property name="border_width">6</property>
19@@ -250,51 +258,14 @@
20 <property name="layout_style">end</property>
21 <child>
22 <object class="GtkButton" id="cancelbutton1">
23+ <property name="label" translatable="yes">Chec_k</property>
24 <property name="visible">True</property>
25 <property name="can_focus">True</property>
26 <property name="can_default">True</property>
27 <property name="receives_default">False</property>
28 <property name="use_action_appearance">False</property>
29- <child>
30- <object class="GtkAlignment" id="alignment7">
31- <property name="visible">True</property>
32- <property name="can_focus">False</property>
33- <property name="xscale">0</property>
34- <property name="yscale">0</property>
35- <child>
36- <object class="GtkHBox" id="hbox17">
37- <property name="visible">True</property>
38- <property name="can_focus">False</property>
39- <property name="spacing">2</property>
40- <child>
41- <object class="GtkImage" id="image13">
42- <property name="visible">True</property>
43- <property name="can_focus">False</property>
44- <property name="stock">gtk-refresh</property>
45- </object>
46- <packing>
47- <property name="expand">False</property>
48- <property name="fill">False</property>
49- <property name="position">0</property>
50- </packing>
51- </child>
52- <child>
53- <object class="GtkLabel" id="label28">
54- <property name="visible">True</property>
55- <property name="can_focus">False</property>
56- <property name="label" translatable="yes">Chec_k</property>
57- <property name="use_underline">True</property>
58- </object>
59- <packing>
60- <property name="expand">False</property>
61- <property name="fill">False</property>
62- <property name="position">1</property>
63- </packing>
64- </child>
65- </object>
66- </child>
67- </object>
68- </child>
69+ <property name="use_underline">True</property>
70+ <property name="image">image-refresh</property>
71 </object>
72 <packing>
73 <property name="expand">False</property>
74@@ -1232,52 +1203,15 @@
75 <property name="homogeneous">True</property>
76 <child>
77 <object class="GtkButton" id="button_reload">
78+ <property name="label" translatable="yes">Chec_k</property>
79 <property name="visible">True</property>
80 <property name="can_focus">True</property>
81 <property name="can_default">True</property>
82 <property name="receives_default">False</property>
83+ <property name="image">image-refresh</property>
84+ <property name="use_underline">True</property>
85 <property name="use_action_appearance">False</property>
86 <signal name="clicked" handler="on_button_reload_clicked" swapped="no"/>
87- <child>
88- <object class="GtkAlignment" id="alignment8">
89- <property name="visible">True</property>
90- <property name="can_focus">False</property>
91- <property name="xscale">0</property>
92- <property name="yscale">0</property>
93- <child>
94- <object class="GtkHBox" id="hbox18">
95- <property name="visible">True</property>
96- <property name="can_focus">False</property>
97- <property name="spacing">2</property>
98- <child>
99- <object class="GtkImage" id="image14">
100- <property name="visible">True</property>
101- <property name="can_focus">False</property>
102- <property name="stock">gtk-refresh</property>
103- </object>
104- <packing>
105- <property name="expand">False</property>
106- <property name="fill">False</property>
107- <property name="position">0</property>
108- </packing>
109- </child>
110- <child>
111- <object class="GtkLabel" id="label29">
112- <property name="visible">True</property>
113- <property name="can_focus">False</property>
114- <property name="label" translatable="yes">Chec_k</property>
115- <property name="use_underline">True</property>
116- </object>
117- <packing>
118- <property name="expand">False</property>
119- <property name="fill">False</property>
120- <property name="position">1</property>
121- </packing>
122- </child>
123- </object>
124- </child>
125- </object>
126- </child>
127 </object>
128 <packing>
129 <property name="expand">False</property>
130@@ -1287,53 +1221,16 @@
131 </child>
132 <child>
133 <object class="GtkButton" id="button_install">
134+ <property name="label" translatable="yes">_Install Updates</property>
135 <property name="visible">True</property>
136 <property name="can_focus">True</property>
137 <property name="can_default">True</property>
138 <property name="has_default">True</property>
139 <property name="receives_default">False</property>
140+ <property name="image">image-apply</property>
141+ <property name="use_underline">True</property>
142 <property name="use_action_appearance">False</property>
143 <signal name="clicked" handler="on_button_install_clicked" swapped="no"/>
144- <child>
145- <object class="GtkAlignment" id="alignment4">
146- <property name="visible">True</property>
147- <property name="can_focus">False</property>
148- <property name="xscale">0</property>
149- <property name="yscale">0</property>
150- <child>
151- <object class="GtkHBox" id="hbox11">
152- <property name="visible">True</property>
153- <property name="can_focus">False</property>
154- <property name="spacing">2</property>
155- <child>
156- <object class="GtkImage" id="image9">
157- <property name="visible">True</property>
158- <property name="can_focus">False</property>
159- <property name="stock">gtk-apply</property>
160- </object>
161- <packing>
162- <property name="expand">False</property>
163- <property name="fill">False</property>
164- <property name="position">0</property>
165- </packing>
166- </child>
167- <child>
168- <object class="GtkLabel" id="label16">
169- <property name="visible">True</property>
170- <property name="can_focus">False</property>
171- <property name="label" translatable="yes">_Install Updates</property>
172- <property name="use_underline">True</property>
173- </object>
174- <packing>
175- <property name="expand">False</property>
176- <property name="fill">False</property>
177- <property name="position">1</property>
178- </packing>
179- </child>
180- </object>
181- </child>
182- </object>
183- </child>
184 </object>
185 <packing>
186 <property name="expand">False</property>

Subscribers

People subscribed via source and target branches

to status/vote changes: