Ubuntu One Control Panel

Merge lp:~nataliabidart/ubuntuone-control-panel/add-widget-names into lp:ubuntuone-control-panel

  1. add-widget-names
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 69
Merged at revision: 66
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/add-widget-names
Merge into: lp:ubuntuone-control-panel
Diff against target: 190 lines (+22/-31)
4 files modified
data/device.ui (+1/-1)
data/management.ui (+3/-29)
ubuntuone/controlpanel/gtk/gui.py (+8/-1)
ubuntuone/controlpanel/gtk/tests/test_gui.py (+10/-0)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/add-widget-names
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Eric Casteleijn (community) Approve
Review via email: mp+49305@code.launchpad.net

Commit message

- Quota usage text is on top of progress bar (LP: #715713).
- Top-aligned 'remove' button in device widget (LP: #715804).
- Widgets for dashboard and account button have now a name to ease styling (LP: #716678).

To post a comment you must log in.
lp:~nataliabidart/ubuntuone-control-panel/add-widget-names updated
69. By Natalia Bidart

Less diff against trunk.

Revision history for this message
Eric Casteleijn (thisfred) :
review: Approve
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/device.ui'
2--- data/device.ui 2011-01-25 12:54:33 +0000
3+++ data/device.ui 2011-02-11 12:02:09 +0000
4@@ -154,7 +154,7 @@
5 <child>
6 <object class="GtkVButtonBox" id="vbuttonbox1">
7 <property name="visible">True</property>
8- <property name="layout_style">center</property>
9+ <property name="layout_style">start</property>
10 <child>
11 <object class="GtkButton" id="remove">
12 <property name="label">gtk-remove</property>
13
14=== modified file 'data/management.ui'
15--- data/management.ui 2011-01-25 16:31:07 +0000
16+++ data/management.ui 2011-02-11 12:02:09 +0000
17@@ -20,25 +20,14 @@
18 <property name="border_width">10</property>
19 <property name="spacing">10</property>
20 <child>
21- <object class="GtkHBox" id="quota_box">
22+ <object class="GtkVBox" id="quota_box">
23 <property name="visible">True</property>
24- <property name="can_focus">False</property>
25+ <property name="spacing">5</property>
26 <child>
27- <object class="GtkAlignment" id="alignment1">
28+ <object class="GtkProgressBar" id="quota_progressbar">
29 <property name="visible">True</property>
30- <property name="can_focus">False</property>
31- <property name="xscale">0</property>
32- <property name="yscale">0</property>
33- <child>
34- <object class="GtkProgressBar" id="quota_progressbar">
35- <property name="visible">True</property>
36- <property name="can_focus">False</property>
37- </object>
38- </child>
39 </object>
40 <packing>
41- <property name="expand">True</property>
42- <property name="fill">True</property>
43 <property name="position">0</property>
44 </packing>
45 </child>
46@@ -117,7 +106,6 @@
47 <property name="label" translatable="yes">Shares</property>
48 <property name="can_focus">True</property>
49 <property name="receives_default">False</property>
50- <property name="use_action_appearance">False</property>
51 <property name="draw_indicator">False</property>
52 <property name="group">dashboard_button</property>
53 </object>
54@@ -133,7 +121,6 @@
55 <property name="visible">True</property>
56 <property name="can_focus">True</property>
57 <property name="receives_default">False</property>
58- <property name="use_action_appearance">False</property>
59 <property name="draw_indicator">False</property>
60 <property name="group">dashboard_button</property>
61 </object>
62@@ -148,7 +135,6 @@
63 <property name="label" translatable="yes">Services</property>
64 <property name="can_focus">True</property>
65 <property name="receives_default">False</property>
66- <property name="use_action_appearance">False</property>
67 <property name="draw_indicator">False</property>
68 <property name="group">dashboard_button</property>
69 </object>
70@@ -161,44 +147,36 @@
71 </object>
72 <packing>
73 <property name="expand">False</property>
74- <property name="fill">True</property>
75 <property name="position">1</property>
76 </packing>
77 </child>
78 <child>
79 <object class="GtkHSeparator" id="hseparator2">
80 <property name="visible">True</property>
81- <property name="can_focus">False</property>
82 </object>
83 <packing>
84- <property name="expand">True</property>
85- <property name="fill">True</property>
86 <property name="position">2</property>
87 </packing>
88 </child>
89 </object>
90 <packing>
91 <property name="expand">False</property>
92- <property name="fill">True</property>
93 <property name="position">0</property>
94 </packing>
95 </child>
96 <child>
97 <object class="GtkImage" id="image1">
98 <property name="visible">True</property>
99- <property name="can_focus">False</property>
100 <property name="pixbuf">banner.png</property>
101 </object>
102 <packing>
103 <property name="expand">False</property>
104- <property name="fill">True</property>
105 <property name="position">1</property>
106 </packing>
107 </child>
108 </object>
109 <packing>
110 <property name="expand">False</property>
111- <property name="fill">True</property>
112 <property name="position">1</property>
113 </packing>
114 </child>
115@@ -207,21 +185,17 @@
116 </object>
117 <packing>
118 <property name="expand">False</property>
119- <property name="fill">True</property>
120 <property name="position">0</property>
121 </packing>
122 </child>
123 <child>
124 <object class="GtkNotebook" id="notebook">
125 <property name="visible">True</property>
126- <property name="can_focus">False</property>
127 <property name="show_tabs">False</property>
128 <property name="show_border">False</property>
129 <property name="homogeneous">True</property>
130 </object>
131 <packing>
132- <property name="expand">True</property>
133- <property name="fill">True</property>
134 <property name="position">1</property>
135 </packing>
136 </child>
137
138=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
139--- ubuntuone/controlpanel/gtk/gui.py 2011-02-10 17:35:23 +0000
140+++ ubuntuone/controlpanel/gtk/gui.py 2011-02-11 12:02:09 +0000
141@@ -1279,6 +1279,8 @@
142 }
143
144 QUOTA_LABEL = _('%(used)s used of %(total)s (%(percentage).1f%%)')
145+ DASHBOARD_BUTTON_NAME = 'Account'
146+ DEVICES_BUTTON_NAME = 'Devices'
147
148 def __init__(self, main_window=None):
149 gtk.VBox.__init__(self)
150@@ -1296,6 +1298,7 @@
151 self.quota_progressbar.set_sensitive(False)
152 self.quota_label = LabelLoading(LOADING, fg_color=DEFAULT_FG)
153 self.quota_box.pack_start(self.quota_label, expand=False)
154+ self.quota_box.reorder_child(self.quota_label, 0)
155
156 self.status_label = FileSyncStatus()
157 self.status_box.pack_end(self.status_label, expand=False)
158@@ -1318,9 +1321,13 @@
159 gtk.gdk.Color(DEFAULT_FG))
160 self.notebook.insert_page(getattr(self, tab), position=page_num)
161
162+ self.dashboard_button.set_name(self.DASHBOARD_BUTTON_NAME)
163+
164 self.volumes_button.connect('clicked', lambda b: self.volumes.load())
165+ self.services_button.connect('clicked', lambda b: self.services.load())
166+
167+ self.devices_button.set_name(self.DEVICES_BUTTON_NAME)
168 self.devices_button.connect('clicked', lambda b: self.devices.load())
169- self.services_button.connect('clicked', lambda b: self.services.load())
170 self.devices.connect('local-device-removed',
171 lambda widget: self.emit('local-device-removed'))
172
173
174=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
175--- ubuntuone/controlpanel/gtk/tests/test_gui.py 2011-02-10 17:35:23 +0000
176+++ ubuntuone/controlpanel/gtk/tests/test_gui.py 2011-02-11 12:02:09 +0000
177@@ -2374,3 +2374,13 @@
178 self.ui.devices.emit('local-device-removed')
179
180 self.assertEqual(self._called, ((self.ui,), {}))
181+
182+ def test_dashboard_button_name(self):
183+ """The dashboard_button widget has the proper name."""
184+ self.assertEqual(self.ui.dashboard_button.get_name(),
185+ self.ui.DASHBOARD_BUTTON_NAME)
186+
187+ def test_devices_button_name(self):
188+ """The devices_button widget has the proper name."""
189+ self.assertEqual(self.ui.devices_button.get_name(),
190+ self.ui.DEVICES_BUTTON_NAME)

Subscribers

People subscribed via source and target branches