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
=== modified file 'data/device.ui'
--- data/device.ui 2011-01-25 12:54:33 +0000
+++ data/device.ui 2011-02-11 12:02:09 +0000
@@ -154,7 +154,7 @@
154 <child>154 <child>
155 <object class="GtkVButtonBox" id="vbuttonbox1">155 <object class="GtkVButtonBox" id="vbuttonbox1">
156 <property name="visible">True</property>156 <property name="visible">True</property>
157 <property name="layout_style">center</property>157 <property name="layout_style">start</property>
158 <child>158 <child>
159 <object class="GtkButton" id="remove">159 <object class="GtkButton" id="remove">
160 <property name="label">gtk-remove</property>160 <property name="label">gtk-remove</property>
161161
=== modified file 'data/management.ui'
--- data/management.ui 2011-01-25 16:31:07 +0000
+++ data/management.ui 2011-02-11 12:02:09 +0000
@@ -20,25 +20,14 @@
20 <property name="border_width">10</property>20 <property name="border_width">10</property>
21 <property name="spacing">10</property>21 <property name="spacing">10</property>
22 <child>22 <child>
23 <object class="GtkHBox" id="quota_box">23 <object class="GtkVBox" id="quota_box">
24 <property name="visible">True</property>24 <property name="visible">True</property>
25 <property name="can_focus">False</property>25 <property name="spacing">5</property>
26 <child>26 <child>
27 <object class="GtkAlignment" id="alignment1">27 <object class="GtkProgressBar" id="quota_progressbar">
28 <property name="visible">True</property>28 <property name="visible">True</property>
29 <property name="can_focus">False</property>
30 <property name="xscale">0</property>
31 <property name="yscale">0</property>
32 <child>
33 <object class="GtkProgressBar" id="quota_progressbar">
34 <property name="visible">True</property>
35 <property name="can_focus">False</property>
36 </object>
37 </child>
38 </object>29 </object>
39 <packing>30 <packing>
40 <property name="expand">True</property>
41 <property name="fill">True</property>
42 <property name="position">0</property>31 <property name="position">0</property>
43 </packing>32 </packing>
44 </child>33 </child>
@@ -117,7 +106,6 @@
117 <property name="label" translatable="yes">Shares</property>106 <property name="label" translatable="yes">Shares</property>
118 <property name="can_focus">True</property>107 <property name="can_focus">True</property>
119 <property name="receives_default">False</property>108 <property name="receives_default">False</property>
120 <property name="use_action_appearance">False</property>
121 <property name="draw_indicator">False</property>109 <property name="draw_indicator">False</property>
122 <property name="group">dashboard_button</property>110 <property name="group">dashboard_button</property>
123 </object>111 </object>
@@ -133,7 +121,6 @@
133 <property name="visible">True</property>121 <property name="visible">True</property>
134 <property name="can_focus">True</property>122 <property name="can_focus">True</property>
135 <property name="receives_default">False</property>123 <property name="receives_default">False</property>
136 <property name="use_action_appearance">False</property>
137 <property name="draw_indicator">False</property>124 <property name="draw_indicator">False</property>
138 <property name="group">dashboard_button</property>125 <property name="group">dashboard_button</property>
139 </object>126 </object>
@@ -148,7 +135,6 @@
148 <property name="label" translatable="yes">Services</property>135 <property name="label" translatable="yes">Services</property>
149 <property name="can_focus">True</property>136 <property name="can_focus">True</property>
150 <property name="receives_default">False</property>137 <property name="receives_default">False</property>
151 <property name="use_action_appearance">False</property>
152 <property name="draw_indicator">False</property>138 <property name="draw_indicator">False</property>
153 <property name="group">dashboard_button</property>139 <property name="group">dashboard_button</property>
154 </object>140 </object>
@@ -161,44 +147,36 @@
161 </object>147 </object>
162 <packing>148 <packing>
163 <property name="expand">False</property>149 <property name="expand">False</property>
164 <property name="fill">True</property>
165 <property name="position">1</property>150 <property name="position">1</property>
166 </packing>151 </packing>
167 </child>152 </child>
168 <child>153 <child>
169 <object class="GtkHSeparator" id="hseparator2">154 <object class="GtkHSeparator" id="hseparator2">
170 <property name="visible">True</property>155 <property name="visible">True</property>
171 <property name="can_focus">False</property>
172 </object>156 </object>
173 <packing>157 <packing>
174 <property name="expand">True</property>
175 <property name="fill">True</property>
176 <property name="position">2</property>158 <property name="position">2</property>
177 </packing>159 </packing>
178 </child>160 </child>
179 </object>161 </object>
180 <packing>162 <packing>
181 <property name="expand">False</property>163 <property name="expand">False</property>
182 <property name="fill">True</property>
183 <property name="position">0</property>164 <property name="position">0</property>
184 </packing>165 </packing>
185 </child>166 </child>
186 <child>167 <child>
187 <object class="GtkImage" id="image1">168 <object class="GtkImage" id="image1">
188 <property name="visible">True</property>169 <property name="visible">True</property>
189 <property name="can_focus">False</property>
190 <property name="pixbuf">banner.png</property>170 <property name="pixbuf">banner.png</property>
191 </object>171 </object>
192 <packing>172 <packing>
193 <property name="expand">False</property>173 <property name="expand">False</property>
194 <property name="fill">True</property>
195 <property name="position">1</property>174 <property name="position">1</property>
196 </packing>175 </packing>
197 </child>176 </child>
198 </object>177 </object>
199 <packing>178 <packing>
200 <property name="expand">False</property>179 <property name="expand">False</property>
201 <property name="fill">True</property>
202 <property name="position">1</property>180 <property name="position">1</property>
203 </packing>181 </packing>
204 </child>182 </child>
@@ -207,21 +185,17 @@
207 </object>185 </object>
208 <packing>186 <packing>
209 <property name="expand">False</property>187 <property name="expand">False</property>
210 <property name="fill">True</property>
211 <property name="position">0</property>188 <property name="position">0</property>
212 </packing>189 </packing>
213 </child>190 </child>
214 <child>191 <child>
215 <object class="GtkNotebook" id="notebook">192 <object class="GtkNotebook" id="notebook">
216 <property name="visible">True</property>193 <property name="visible">True</property>
217 <property name="can_focus">False</property>
218 <property name="show_tabs">False</property>194 <property name="show_tabs">False</property>
219 <property name="show_border">False</property>195 <property name="show_border">False</property>
220 <property name="homogeneous">True</property>196 <property name="homogeneous">True</property>
221 </object>197 </object>
222 <packing>198 <packing>
223 <property name="expand">True</property>
224 <property name="fill">True</property>
225 <property name="position">1</property>199 <property name="position">1</property>
226 </packing>200 </packing>
227 </child>201 </child>
228202
=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py 2011-02-10 17:35:23 +0000
+++ ubuntuone/controlpanel/gtk/gui.py 2011-02-11 12:02:09 +0000
@@ -1279,6 +1279,8 @@
1279 }1279 }
12801280
1281 QUOTA_LABEL = _('%(used)s used of %(total)s (%(percentage).1f%%)')1281 QUOTA_LABEL = _('%(used)s used of %(total)s (%(percentage).1f%%)')
1282 DASHBOARD_BUTTON_NAME = 'Account'
1283 DEVICES_BUTTON_NAME = 'Devices'
12821284
1283 def __init__(self, main_window=None):1285 def __init__(self, main_window=None):
1284 gtk.VBox.__init__(self)1286 gtk.VBox.__init__(self)
@@ -1296,6 +1298,7 @@
1296 self.quota_progressbar.set_sensitive(False)1298 self.quota_progressbar.set_sensitive(False)
1297 self.quota_label = LabelLoading(LOADING, fg_color=DEFAULT_FG)1299 self.quota_label = LabelLoading(LOADING, fg_color=DEFAULT_FG)
1298 self.quota_box.pack_start(self.quota_label, expand=False)1300 self.quota_box.pack_start(self.quota_label, expand=False)
1301 self.quota_box.reorder_child(self.quota_label, 0)
12991302
1300 self.status_label = FileSyncStatus()1303 self.status_label = FileSyncStatus()
1301 self.status_box.pack_end(self.status_label, expand=False)1304 self.status_box.pack_end(self.status_label, expand=False)
@@ -1318,9 +1321,13 @@
1318 gtk.gdk.Color(DEFAULT_FG))1321 gtk.gdk.Color(DEFAULT_FG))
1319 self.notebook.insert_page(getattr(self, tab), position=page_num)1322 self.notebook.insert_page(getattr(self, tab), position=page_num)
13201323
1324 self.dashboard_button.set_name(self.DASHBOARD_BUTTON_NAME)
1325
1321 self.volumes_button.connect('clicked', lambda b: self.volumes.load())1326 self.volumes_button.connect('clicked', lambda b: self.volumes.load())
1327 self.services_button.connect('clicked', lambda b: self.services.load())
1328
1329 self.devices_button.set_name(self.DEVICES_BUTTON_NAME)
1322 self.devices_button.connect('clicked', lambda b: self.devices.load())1330 self.devices_button.connect('clicked', lambda b: self.devices.load())
1323 self.services_button.connect('clicked', lambda b: self.services.load())
1324 self.devices.connect('local-device-removed',1331 self.devices.connect('local-device-removed',
1325 lambda widget: self.emit('local-device-removed'))1332 lambda widget: self.emit('local-device-removed'))
13261333
13271334
=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py 2011-02-10 17:35:23 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py 2011-02-11 12:02:09 +0000
@@ -2374,3 +2374,13 @@
2374 self.ui.devices.emit('local-device-removed')2374 self.ui.devices.emit('local-device-removed')
23752375
2376 self.assertEqual(self._called, ((self.ui,), {}))2376 self.assertEqual(self._called, ((self.ui,), {}))
2377
2378 def test_dashboard_button_name(self):
2379 """The dashboard_button widget has the proper name."""
2380 self.assertEqual(self.ui.dashboard_button.get_name(),
2381 self.ui.DASHBOARD_BUTTON_NAME)
2382
2383 def test_devices_button_name(self):
2384 """The devices_button widget has the proper name."""
2385 self.assertEqual(self.ui.devices_button.get_name(),
2386 self.ui.DEVICES_BUTTON_NAME)

Subscribers

People subscribed via source and target branches