Ubuntu One Control Panel

Merge lp:~nataliabidart/ubuntuone-control-panel/tweak-overview into lp:ubuntuone-control-panel

  1. tweak-overview
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 98
Merged at revision: 92
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/tweak-overview
Merge into: lp:ubuntuone-control-panel
Diff against target: 867 lines (+392/-337)
4 files modified
data/management.ui (+85/-108)
data/overview.ui (+292/-225)
ubuntuone/controlpanel/gtk/gui.py (+5/-2)
ubuntuone/controlpanel/gtk/tests/test_gui_basic.py (+10/-2)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/tweak-overview
Reviewer Review Type Date Requested Status
Martin Albisetti (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+52124@code.launchpad.net

Commit message

- Added new layout and text to overview screen (LP: #728663).
- Removed banner from management panel (LP: #728663).
- Fixed typo on splash screen (LP: #725802).

Description of the change

Screenshot for overview screen is: http://ubuntuone.com/p/fys/

To post a comment you must log in.
lp:~nataliabidart/ubuntuone-control-panel/tweak-overview updated
95. By Natalia Bidart

Proper logo to music streaming.

96. By Natalia Bidart

Using latest icons.

97. By Natalia Bidart

Merged trunk in.

Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve
Revision history for this message
Martin Albisetti (beuno) wrote :

815 + LEARN_MORE_LINK = 'http://one.ubuntu.com/'

I'd change that to https://one.ubuntu.com/, since we redirect http.

Other than that, looks great!

review: Approve
lp:~nataliabidart/ubuntuone-control-panel/tweak-overview updated
98. By Natalia Bidart

s/http/https

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Fixed!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'data/banner.png'
2Binary files data/banner.png 2011-02-23 21:23:30 +0000 and data/banner.png 1970-01-01 00:00:00 +0000 differ
3=== modified file 'data/contacts.png'
4Binary files data/contacts.png 2011-02-11 16:57:09 +0000 and data/contacts.png 2011-03-04 13:50:22 +0000 differ
5=== modified file 'data/files.png'
6Binary files data/files.png 2011-02-11 16:57:09 +0000 and data/files.png 2011-03-04 13:50:22 +0000 differ
7=== modified file 'data/management.ui'
8--- data/management.ui 2011-02-22 19:28:14 +0000
9+++ data/management.ui 2011-03-04 13:50:22 +0000
10@@ -50,138 +50,104 @@
11 </packing>
12 </child>
13 <child>
14- <object class="GtkVBox" id="vbox1">
15+ <object class="GtkHBox" id="hbox2">
16 <property name="visible">True</property>
17 <property name="can_focus">False</property>
18 <child>
19- <object class="GtkHBox" id="hbox2">
20- <property name="visible">True</property>
21- <property name="can_focus">False</property>
22+ <object class="GtkHSeparator" id="hseparator1">
23+ <property name="visible">True</property>
24+ <property name="can_focus">False</property>
25+ </object>
26+ <packing>
27+ <property name="expand">True</property>
28+ <property name="fill">True</property>
29+ <property name="position">0</property>
30+ </packing>
31+ </child>
32+ <child>
33+ <object class="GtkHButtonBox" id="hbuttonbox1">
34+ <property name="visible">True</property>
35+ <property name="can_focus">False</property>
36+ <property name="layout_style">center</property>
37 <child>
38- <object class="GtkHSeparator" id="hseparator1">
39+ <object class="GtkRadioButton" id="dashboard_button">
40+ <property name="label" translatable="yes">Account</property>
41 <property name="visible">True</property>
42- <property name="can_focus">False</property>
43+ <property name="can_focus">True</property>
44+ <property name="receives_default">False</property>
45+ <property name="use_action_appearance">False</property>
46+ <property name="active">True</property>
47+ <property name="draw_indicator">False</property>
48 </object>
49 <packing>
50- <property name="expand">True</property>
51- <property name="fill">True</property>
52+ <property name="expand">False</property>
53+ <property name="fill">False</property>
54 <property name="position">0</property>
55 </packing>
56 </child>
57 <child>
58- <object class="GtkHButtonBox" id="hbuttonbox1">
59+ <object class="GtkRadioButton" id="volumes_button">
60+ <property name="label" translatable="yes">Cloud Folders</property>
61 <property name="visible">True</property>
62- <property name="can_focus">False</property>
63- <property name="layout_style">center</property>
64- <child>
65- <object class="GtkRadioButton" id="dashboard_button">
66- <property name="label" translatable="yes">Account</property>
67- <property name="visible">True</property>
68- <property name="can_focus">True</property>
69- <property name="receives_default">False</property>
70- <property name="use_action_appearance">False</property>
71- <property name="active">True</property>
72- <property name="draw_indicator">False</property>
73- </object>
74- <packing>
75- <property name="expand">False</property>
76- <property name="fill">False</property>
77- <property name="position">0</property>
78- </packing>
79- </child>
80- <child>
81- <object class="GtkRadioButton" id="volumes_button">
82- <property name="label" translatable="yes">Cloud Folders</property>
83- <property name="visible">True</property>
84- <property name="can_focus">True</property>
85- <property name="receives_default">False</property>
86- <property name="use_action_appearance">False</property>
87- <property name="draw_indicator">False</property>
88- <property name="group">dashboard_button</property>
89- </object>
90- <packing>
91- <property name="expand">False</property>
92- <property name="fill">False</property>
93- <property name="position">1</property>
94- </packing>
95- </child>
96- <child>
97- <object class="GtkRadioButton" id="shares_button">
98- <property name="label" translatable="yes">Shares</property>
99- <property name="can_focus">True</property>
100- <property name="receives_default">False</property>
101- <property name="use_action_appearance">False</property>
102- <property name="draw_indicator">False</property>
103- <property name="group">dashboard_button</property>
104- </object>
105- <packing>
106- <property name="expand">False</property>
107- <property name="fill">False</property>
108- <property name="position">2</property>
109- </packing>
110- </child>
111- <child>
112- <object class="GtkRadioButton" id="devices_button">
113- <property name="label" translatable="yes">Devices</property>
114- <property name="visible">True</property>
115- <property name="can_focus">True</property>
116- <property name="receives_default">False</property>
117- <property name="use_action_appearance">False</property>
118- <property name="draw_indicator">False</property>
119- <property name="group">dashboard_button</property>
120- </object>
121- <packing>
122- <property name="expand">False</property>
123- <property name="fill">False</property>
124- <property name="position">3</property>
125- </packing>
126- </child>
127- <child>
128- <object class="GtkRadioButton" id="services_button">
129- <property name="label" translatable="yes">Services</property>
130- <property name="visible">True</property>
131- <property name="can_focus">True</property>
132- <property name="receives_default">False</property>
133- <property name="use_action_appearance">False</property>
134- <property name="draw_indicator">False</property>
135- <property name="group">dashboard_button</property>
136- </object>
137- <packing>
138- <property name="expand">False</property>
139- <property name="fill">False</property>
140- <property name="position">4</property>
141- </packing>
142- </child>
143+ <property name="can_focus">True</property>
144+ <property name="receives_default">False</property>
145+ <property name="use_action_appearance">False</property>
146+ <property name="draw_indicator">False</property>
147+ <property name="group">dashboard_button</property>
148 </object>
149 <packing>
150 <property name="expand">False</property>
151- <property name="fill">True</property>
152+ <property name="fill">False</property>
153 <property name="position">1</property>
154 </packing>
155 </child>
156 <child>
157- <object class="GtkHSeparator" id="hseparator2">
158- <property name="visible">True</property>
159- <property name="can_focus">False</property>
160+ <object class="GtkRadioButton" id="shares_button">
161+ <property name="label" translatable="yes">Shares</property>
162+ <property name="can_focus">True</property>
163+ <property name="receives_default">False</property>
164+ <property name="use_action_appearance">False</property>
165+ <property name="draw_indicator">False</property>
166+ <property name="group">dashboard_button</property>
167 </object>
168 <packing>
169- <property name="expand">True</property>
170- <property name="fill">True</property>
171+ <property name="expand">False</property>
172+ <property name="fill">False</property>
173 <property name="position">2</property>
174 </packing>
175 </child>
176- </object>
177- <packing>
178- <property name="expand">False</property>
179- <property name="fill">True</property>
180- <property name="position">0</property>
181- </packing>
182- </child>
183- <child>
184- <object class="GtkImage" id="image1">
185- <property name="visible">True</property>
186- <property name="can_focus">False</property>
187- <property name="pixbuf">banner.png</property>
188+ <child>
189+ <object class="GtkRadioButton" id="devices_button">
190+ <property name="label" translatable="yes">Devices</property>
191+ <property name="visible">True</property>
192+ <property name="can_focus">True</property>
193+ <property name="receives_default">False</property>
194+ <property name="use_action_appearance">False</property>
195+ <property name="draw_indicator">False</property>
196+ <property name="group">dashboard_button</property>
197+ </object>
198+ <packing>
199+ <property name="expand">False</property>
200+ <property name="fill">False</property>
201+ <property name="position">3</property>
202+ </packing>
203+ </child>
204+ <child>
205+ <object class="GtkRadioButton" id="services_button">
206+ <property name="label" translatable="yes">Services</property>
207+ <property name="visible">True</property>
208+ <property name="can_focus">True</property>
209+ <property name="receives_default">False</property>
210+ <property name="use_action_appearance">False</property>
211+ <property name="draw_indicator">False</property>
212+ <property name="group">dashboard_button</property>
213+ </object>
214+ <packing>
215+ <property name="expand">False</property>
216+ <property name="fill">False</property>
217+ <property name="position">4</property>
218+ </packing>
219+ </child>
220 </object>
221 <packing>
222 <property name="expand">False</property>
223@@ -189,6 +155,17 @@
224 <property name="position">1</property>
225 </packing>
226 </child>
227+ <child>
228+ <object class="GtkHSeparator" id="hseparator2">
229+ <property name="visible">True</property>
230+ <property name="can_focus">False</property>
231+ </object>
232+ <packing>
233+ <property name="expand">True</property>
234+ <property name="fill">True</property>
235+ <property name="position">2</property>
236+ </packing>
237+ </child>
238 </object>
239 <packing>
240 <property name="expand">False</property>
241
242=== renamed file 'data/music.png' => 'data/music-store.png'
243Binary files data/music.png 2011-02-11 16:57:09 +0000 and data/music-store.png 2011-03-04 13:50:22 +0000 differ
244=== added file 'data/music-stream.png'
245Binary files data/music-stream.png 1970-01-01 00:00:00 +0000 and data/music-stream.png 2011-03-04 13:50:22 +0000 differ
246=== modified file 'data/notes.png'
247Binary files data/notes.png 2011-02-11 16:57:09 +0000 and data/notes.png 2011-03-04 13:50:22 +0000 differ
248=== modified file 'data/overview.png'
249Binary files data/overview.png 2010-11-30 17:21:15 +0000 and data/overview.png 2011-03-04 13:50:22 +0000 differ
250=== modified file 'data/overview.ui'
251--- data/overview.ui 2011-03-03 13:29:13 +0000
252+++ data/overview.ui 2011-03-04 13:50:22 +0000
253@@ -6,7 +6,7 @@
254 <property name="visible">True</property>
255 <property name="can_focus">False</property>
256 <child>
257- <object class="GtkEventBox" id="header">
258+ <object class="GtkEventBox" id="banner">
259 <property name="visible">True</property>
260 <property name="can_focus">False</property>
261 <child>
262@@ -35,249 +35,316 @@
263 <property name="can_focus">False</property>
264 <property name="shadow_type">none</property>
265 <child>
266- <object class="GtkHBox" id="hbox1">
267+ <object class="GtkVBox" id="vbox1">
268 <property name="visible">True</property>
269 <property name="can_focus">False</property>
270- <property name="border_width">20</property>
271- <property name="spacing">5</property>
272- <child>
273- <object class="GtkTable" id="table1">
274- <property name="visible">True</property>
275- <property name="can_focus">False</property>
276- <property name="n_rows">4</property>
277- <property name="n_columns">2</property>
278- <property name="column_spacing">10</property>
279- <property name="row_spacing">10</property>
280- <child>
281- <object class="GtkImage" id="image1">
282- <property name="visible">True</property>
283- <property name="can_focus">False</property>
284- <property name="pixbuf">files.png</property>
285- </object>
286- <packing>
287- <property name="x_options">GTK_FILL</property>
288- <property name="y_options">GTK_FILL</property>
289- </packing>
290- </child>
291- <child>
292- <object class="GtkImage" id="image2">
293- <property name="visible">True</property>
294- <property name="can_focus">False</property>
295- <property name="pixbuf">contacts.png</property>
296- </object>
297- <packing>
298- <property name="top_attach">1</property>
299- <property name="bottom_attach">2</property>
300- <property name="x_options">GTK_FILL</property>
301- <property name="y_options">GTK_FILL</property>
302- </packing>
303- </child>
304- <child>
305- <object class="GtkImage" id="image3">
306- <property name="visible">True</property>
307- <property name="can_focus">False</property>
308- <property name="pixbuf">music.png</property>
309- </object>
310- <packing>
311- <property name="top_attach">2</property>
312- <property name="bottom_attach">3</property>
313- <property name="x_options">GTK_FILL</property>
314- <property name="y_options">GTK_FILL</property>
315- </packing>
316- </child>
317- <child>
318- <object class="GtkImage" id="image4">
319- <property name="visible">True</property>
320- <property name="can_focus">False</property>
321- <property name="pixbuf">notes.png</property>
322- </object>
323- <packing>
324- <property name="top_attach">3</property>
325- <property name="bottom_attach">4</property>
326- <property name="x_options">GTK_FILL</property>
327- <property name="y_options">GTK_FILL</property>
328- </packing>
329- </child>
330- <child>
331- <object class="GtkLabel" id="label3">
332- <property name="visible">True</property>
333- <property name="can_focus">False</property>
334- <property name="xalign">0</property>
335- <property name="label" translatable="yes">Files Anywhere
336-&lt;span foreground="#909090"&gt;Backup and access your files from Windows, Ubuntu, or Mobile&lt;/span&gt;</property>
337- <property name="use_markup">True</property>
338- <property name="wrap">True</property>
339- </object>
340- <packing>
341- <property name="left_attach">1</property>
342- <property name="right_attach">2</property>
343- </packing>
344- </child>
345- <child>
346- <object class="GtkLabel" id="label4">
347- <property name="visible">True</property>
348- <property name="can_focus">False</property>
349- <property name="xalign">0</property>
350- <property name="label" translatable="yes">Keep connected
351-&lt;span foreground="#909090"&gt;Unify your contacts accress Desktop, Mobile and Web&lt;/span&gt;</property>
352- <property name="use_markup">True</property>
353- <property name="wrap">True</property>
354- </object>
355- <packing>
356- <property name="left_attach">1</property>
357- <property name="right_attach">2</property>
358- <property name="top_attach">1</property>
359- <property name="bottom_attach">2</property>
360- </packing>
361- </child>
362- <child>
363- <object class="GtkLabel" id="label5">
364- <property name="visible">True</property>
365- <property name="can_focus">False</property>
366- <property name="xalign">0</property>
367- <property name="label" translatable="yes">Rock Out
368-&lt;span foreground="#909090"&gt;Your library at your fingertips with Android, iPhone, and AirPlay
369-Plus the Ubuntu One Music store to grow your collection&lt;/span&gt;</property>
370- <property name="use_markup">True</property>
371- <property name="wrap">True</property>
372- </object>
373- <packing>
374- <property name="left_attach">1</property>
375- <property name="right_attach">2</property>
376- <property name="top_attach">2</property>
377- <property name="bottom_attach">3</property>
378- </packing>
379- </child>
380- <child>
381- <object class="GtkLabel" id="label6">
382- <property name="visible">True</property>
383- <property name="can_focus">False</property>
384- <property name="xalign">0</property>
385- <property name="label" translatable="yes">Stay Productive
386+ <child>
387+ <object class="GtkLabel" id="label7">
388+ <property name="visible">True</property>
389+ <property name="can_focus">False</property>
390+ <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;The Power of Your Personal Cloud&lt;/span&gt;</property>
391+ <property name="use_markup">True</property>
392+ </object>
393+ <packing>
394+ <property name="expand">False</property>
395+ <property name="fill">True</property>
396+ <property name="padding">12</property>
397+ <property name="position">0</property>
398+ </packing>
399+ </child>
400+ <child>
401+ <object class="GtkHBox" id="hbox1">
402+ <property name="visible">True</property>
403+ <property name="can_focus">False</property>
404+ <property name="border_width">20</property>
405+ <property name="spacing">5</property>
406+ <child>
407+ <object class="GtkTable" id="table1">
408+ <property name="visible">True</property>
409+ <property name="can_focus">False</property>
410+ <property name="n_rows">4</property>
411+ <property name="n_columns">2</property>
412+ <property name="column_spacing">10</property>
413+ <child>
414+ <object class="GtkImage" id="image1">
415+ <property name="visible">True</property>
416+ <property name="can_focus">False</property>
417+ <property name="pixbuf">files.png</property>
418+ </object>
419+ <packing>
420+ <property name="x_options">GTK_FILL</property>
421+ <property name="y_options">GTK_FILL</property>
422+ </packing>
423+ </child>
424+ <child>
425+ <object class="GtkImage" id="image2">
426+ <property name="visible">True</property>
427+ <property name="can_focus">False</property>
428+ <property name="pixbuf">music-stream.png</property>
429+ </object>
430+ <packing>
431+ <property name="top_attach">1</property>
432+ <property name="bottom_attach">2</property>
433+ <property name="x_options">GTK_FILL</property>
434+ <property name="y_options">GTK_FILL</property>
435+ </packing>
436+ </child>
437+ <child>
438+ <object class="GtkImage" id="image3">
439+ <property name="visible">True</property>
440+ <property name="can_focus">False</property>
441+ <property name="pixbuf">contacts.png</property>
442+ </object>
443+ <packing>
444+ <property name="top_attach">2</property>
445+ <property name="bottom_attach">3</property>
446+ <property name="x_options">GTK_FILL</property>
447+ <property name="y_options">GTK_FILL</property>
448+ </packing>
449+ </child>
450+ <child>
451+ <object class="GtkImage" id="image4">
452+ <property name="visible">True</property>
453+ <property name="can_focus">False</property>
454+ <property name="pixbuf">notes.png</property>
455+ </object>
456+ <packing>
457+ <property name="top_attach">3</property>
458+ <property name="bottom_attach">4</property>
459+ <property name="x_options">GTK_FILL</property>
460+ <property name="y_options">GTK_FILL</property>
461+ </packing>
462+ </child>
463+ <child>
464+ <object class="GtkLabel" id="label3">
465+ <property name="visible">True</property>
466+ <property name="can_focus">False</property>
467+ <property name="xalign">0</property>
468+ <property name="label" translatable="yes">Files Anywhere
469+&lt;span foreground="#909090"&gt;Backup and access your files from Ubuntu, Windows or Mobile&lt;/span&gt;</property>
470+ <property name="use_markup">True</property>
471+ <property name="wrap">True</property>
472+ </object>
473+ <packing>
474+ <property name="left_attach">1</property>
475+ <property name="right_attach">2</property>
476+ </packing>
477+ </child>
478+ <child>
479+ <object class="GtkLabel" id="label4">
480+ <property name="visible">True</property>
481+ <property name="can_focus">False</property>
482+ <property name="xalign">0</property>
483+ <property name="label" translatable="yes">Keep Connected
484+&lt;span foreground="#909090"&gt;Unify your contacts across Desktop, Mobile and Web&lt;/span&gt;</property>
485+ <property name="use_markup">True</property>
486+ <property name="wrap">True</property>
487+ </object>
488+ <packing>
489+ <property name="left_attach">1</property>
490+ <property name="right_attach">2</property>
491+ <property name="top_attach">2</property>
492+ <property name="bottom_attach">3</property>
493+ </packing>
494+ </child>
495+ <child>
496+ <object class="GtkLabel" id="label5">
497+ <property name="visible">True</property>
498+ <property name="can_focus">False</property>
499+ <property name="xalign">0</property>
500+ <property name="label" translatable="yes">Rock Out
501+&lt;span foreground="#909090"&gt;Your entire collection follows you around with music streaming to Android and iPhone&lt;/span&gt;</property>
502+ <property name="use_markup">True</property>
503+ <property name="wrap">True</property>
504+ </object>
505+ <packing>
506+ <property name="left_attach">1</property>
507+ <property name="right_attach">2</property>
508+ <property name="top_attach">1</property>
509+ <property name="bottom_attach">2</property>
510+ </packing>
511+ </child>
512+ <child>
513+ <object class="GtkLabel" id="label6">
514+ <property name="visible">True</property>
515+ <property name="can_focus">False</property>
516+ <property name="xalign">0</property>
517+ <property name="label" translatable="yes">Stay Productive
518 &lt;span foreground="#909090"&gt;Keep your Firefox bookmarks and Tomboy notes synced&lt;/span&gt;</property>
519- <property name="use_markup">True</property>
520- <property name="wrap">True</property>
521+ <property name="use_markup">True</property>
522+ <property name="wrap">True</property>
523+ </object>
524+ <packing>
525+ <property name="left_attach">1</property>
526+ <property name="right_attach">2</property>
527+ <property name="top_attach">3</property>
528+ <property name="bottom_attach">4</property>
529+ </packing>
530+ </child>
531 </object>
532 <packing>
533- <property name="left_attach">1</property>
534- <property name="right_attach">2</property>
535- <property name="top_attach">3</property>
536- <property name="bottom_attach">4</property>
537+ <property name="expand">True</property>
538+ <property name="fill">True</property>
539+ <property name="position">0</property>
540 </packing>
541 </child>
542- </object>
543- <packing>
544- <property name="expand">True</property>
545- <property name="fill">True</property>
546- <property name="position">0</property>
547- </packing>
548- </child>
549- <child>
550- <object class="GtkVBox" id="vbox1">
551- <property name="visible">True</property>
552- <property name="can_focus">False</property>
553 <child>
554- <object class="GtkLabel" id="warning_label">
555+ <object class="GtkVBox" id="vbox2">
556 <property name="visible">True</property>
557 <property name="can_focus">False</property>
558- <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property>
559- <property name="use_markup">True</property>
560- <property name="wrap">True</property>
561- <property name="width_chars">30</property>
562+ <child>
563+ <object class="GtkLabel" id="warning_label">
564+ <property name="visible">True</property>
565+ <property name="can_focus">False</property>
566+ <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property>
567+ <property name="wrap">True</property>
568+ </object>
569+ <packing>
570+ <property name="expand">False</property>
571+ <property name="fill">True</property>
572+ <property name="position">0</property>
573+ </packing>
574+ </child>
575+ <child>
576+ <object class="GtkAlignment" id="alignment2">
577+ <property name="visible">True</property>
578+ <property name="can_focus">False</property>
579+ <property name="xscale">0</property>
580+ <property name="yscale">0</property>
581+ <child>
582+ <object class="GtkVBox" id="vbox3">
583+ <property name="visible">True</property>
584+ <property name="can_focus">False</property>
585+ <property name="spacing">10</property>
586+ <child>
587+ <object class="GtkButton" id="learn_more_button">
588+ <property name="visible">True</property>
589+ <property name="can_focus">True</property>
590+ <property name="receives_default">True</property>
591+ <property name="use_action_appearance">False</property>
592+ <signal name="clicked" handler="on_learn_more_button_clicked" swapped="no"/>
593+ <child>
594+ <object class="GtkVBox" id="vbox5">
595+ <property name="visible">True</property>
596+ <property name="can_focus">False</property>
597+ <child>
598+ <object class="GtkImage" id="image5">
599+ <property name="visible">True</property>
600+ <property name="can_focus">False</property>
601+ <property name="pixel_size">45</property>
602+ <property name="icon_name">ubuntuone</property>
603+ </object>
604+ <packing>
605+ <property name="expand">True</property>
606+ <property name="fill">True</property>
607+ <property name="position">0</property>
608+ </packing>
609+ </child>
610+ <child>
611+ <object class="GtkLabel" id="label8">
612+ <property name="visible">True</property>
613+ <property name="can_focus">False</property>
614+ <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;Learn More&lt;/span&gt;</property>
615+ <property name="use_markup">True</property>
616+ </object>
617+ <packing>
618+ <property name="expand">True</property>
619+ <property name="fill">True</property>
620+ <property name="position">1</property>
621+ </packing>
622+ </child>
623+ </object>
624+ </child>
625+ </object>
626+ <packing>
627+ <property name="expand">True</property>
628+ <property name="fill">True</property>
629+ <property name="position">0</property>
630+ </packing>
631+ </child>
632+ <child>
633+ <object class="GtkButton" id="join_now_button">
634+ <property name="visible">True</property>
635+ <property name="can_focus">True</property>
636+ <property name="can_default">True</property>
637+ <property name="receives_default">True</property>
638+ <property name="use_action_appearance">False</property>
639+ <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/>
640+ <child>
641+ <object class="GtkVBox" id="vbox4">
642+ <property name="visible">True</property>
643+ <property name="can_focus">False</property>
644+ <property name="spacing">5</property>
645+ <child>
646+ <object class="GtkLabel" id="label1">
647+ <property name="visible">True</property>
648+ <property name="can_focus">False</property>
649+ <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;Join now&lt;/span&gt;</property>
650+ <property name="use_markup">True</property>
651+ </object>
652+ <packing>
653+ <property name="expand">True</property>
654+ <property name="fill">True</property>
655+ <property name="position">0</property>
656+ </packing>
657+ </child>
658+ <child>
659+ <object class="GtkLabel" id="label2">
660+ <property name="visible">True</property>
661+ <property name="can_focus">False</property>
662+ <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;2GB of free storage&lt;/span&gt;</property>
663+ <property name="use_markup">True</property>
664+ </object>
665+ <packing>
666+ <property name="expand">True</property>
667+ <property name="fill">True</property>
668+ <property name="position">1</property>
669+ </packing>
670+ </child>
671+ </object>
672+ </child>
673+ </object>
674+ <packing>
675+ <property name="expand">False</property>
676+ <property name="fill">True</property>
677+ <property name="position">1</property>
678+ </packing>
679+ </child>
680+ <child>
681+ <object class="GtkLinkButton" id="connect_button">
682+ <property name="label" translatable="yes">I already have an account!</property>
683+ <property name="visible">True</property>
684+ <property name="can_focus">True</property>
685+ <property name="receives_default">True</property>
686+ <property name="use_action_appearance">False</property>
687+ <property name="relief">none</property>
688+ <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/>
689+ </object>
690+ <packing>
691+ <property name="expand">False</property>
692+ <property name="fill">False</property>
693+ <property name="position">2</property>
694+ </packing>
695+ </child>
696+ </object>
697+ </child>
698+ </object>
699+ <packing>
700+ <property name="expand">True</property>
701+ <property name="fill">True</property>
702+ <property name="position">1</property>
703+ </packing>
704+ </child>
705 </object>
706 <packing>
707 <property name="expand">False</property>
708 <property name="fill">True</property>
709- <property name="position">0</property>
710- </packing>
711- </child>
712- <child>
713- <object class="GtkAlignment" id="alignment2">
714- <property name="visible">True</property>
715- <property name="can_focus">False</property>
716- <property name="xscale">0</property>
717- <property name="yscale">0</property>
718- <child>
719- <object class="GtkVBox" id="vbox2">
720- <property name="visible">True</property>
721- <property name="can_focus">False</property>
722- <property name="spacing">10</property>
723- <child>
724- <object class="GtkButton" id="join_now_button">
725- <property name="visible">True</property>
726- <property name="can_focus">True</property>
727- <property name="can_default">True</property>
728- <property name="receives_default">True</property>
729- <property name="use_action_appearance">False</property>
730- <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/>
731- <child>
732- <object class="GtkVBox" id="vbox3">
733- <property name="visible">True</property>
734- <property name="can_focus">False</property>
735- <property name="spacing">5</property>
736- <child>
737- <object class="GtkLabel" id="label1">
738- <property name="visible">True</property>
739- <property name="can_focus">False</property>
740- <property name="label" translatable="yes">&lt;span font_size="xx-large"&gt;Join now&lt;/span&gt;</property>
741- <property name="use_markup">True</property>
742- </object>
743- <packing>
744- <property name="expand">True</property>
745- <property name="fill">True</property>
746- <property name="position">0</property>
747- </packing>
748- </child>
749- <child>
750- <object class="GtkLabel" id="label2">
751- <property name="visible">True</property>
752- <property name="can_focus">False</property>
753- <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;2GB of free storage&lt;/span&gt;</property>
754- <property name="use_markup">True</property>
755- </object>
756- <packing>
757- <property name="expand">True</property>
758- <property name="fill">True</property>
759- <property name="position">1</property>
760- </packing>
761- </child>
762- </object>
763- </child>
764- </object>
765- <packing>
766- <property name="expand">False</property>
767- <property name="fill">True</property>
768- <property name="position">0</property>
769- </packing>
770- </child>
771- <child>
772- <object class="GtkLinkButton" id="connect_button">
773- <property name="label" translatable="yes">I already have an account!</property>
774- <property name="visible">True</property>
775- <property name="can_focus">True</property>
776- <property name="receives_default">True</property>
777- <property name="use_action_appearance">False</property>
778- <property name="relief">none</property>
779- <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/>
780- </object>
781- <packing>
782- <property name="expand">False</property>
783- <property name="fill">False</property>
784- <property name="position">1</property>
785- </packing>
786- </child>
787- </object>
788- </child>
789- </object>
790- <packing>
791- <property name="expand">True</property>
792- <property name="fill">True</property>
793 <property name="position">1</property>
794 </packing>
795 </child>
796 </object>
797 <packing>
798- <property name="expand">False</property>
799+ <property name="expand">True</property>
800 <property name="fill">True</property>
801 <property name="position">1</property>
802 </packing>
803
804=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
805--- ubuntuone/controlpanel/gtk/gui.py 2011-03-03 18:14:30 +0000
806+++ ubuntuone/controlpanel/gtk/gui.py 2011-03-04 13:50:22 +0000
807@@ -210,10 +210,10 @@
808
809 CREDENTIALS_ERROR = _('There was a problem while retrieving the '
810 'credentials.')
811- AUTHORIZATION_DENIED = _('The authentication was cancelled.')
812 NETWORK_OFFLINE = _('An internet connection is required to join or sign '
813 'in to %(app_name)s.')
814 CONNECT = _('Connect to Ubuntu One')
815+ LEARN_MORE_LINK = 'https://one.ubuntu.com/'
816
817 def __init__(self, main_window):
818 GreyableBin.__init__(self)
819@@ -296,6 +296,10 @@
820 self.set_property('greyed', True)
821 self.warning_label.set_text('')
822
823+ def on_learn_more_button_clicked(self, *a, **kw):
824+ """User wants to learn more."""
825+ uri_hook(self.learn_more_button, self.LEARN_MORE_LINK)
826+
827 @filter_by_app_name
828 @log_call(logger.info, with_args=False)
829 def on_credentials_found(self, app_name, credentials):
830@@ -322,7 +326,6 @@
831 def on_authorization_denied(self, app_name):
832 """SSO backend notifies that user refused auth for 'app_name'."""
833 self.set_property('greyed', False)
834- self._set_warning(self.AUTHORIZATION_DENIED)
835
836 @log_call(logger.info)
837 def on_network_state_changed(self, state):
838
839=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
840--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py 2011-03-03 18:12:33 +0000
841+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py 2011-03-04 13:50:22 +0000
842@@ -426,8 +426,8 @@
843 """Callback 'on_authorization_denied' is correct."""
844 self.ui.on_authorization_denied(gui.U1_APP_NAME)
845 self.assertTrue(self.ui.get_visible())
846- self.assert_warning_correct(self.ui.warning_label,
847- self.ui.AUTHORIZATION_DENIED)
848+ self.assertFalse(self.ui.get_property('greyed'), 'Must not be greyed.')
849+ self.assertEqual(self.ui.warning_label.get_text(), '')
850
851
852 class OverwiewPanelAppNameMismatchTestCase(OverwiewPanelTestCase):
853@@ -549,6 +549,14 @@
854
855 self.assertEqual(self.ui.warning_label.get_text(), '')
856
857+ def test_learn_more_button_clicked(self):
858+ """Test the 'learn more' button callback."""
859+ self.patch(gui, 'uri_hook', self._set_called)
860+ self.ui.learn_more_button.clicked()
861+
862+ expected = (self.ui.learn_more_button, self.ui.LEARN_MORE_LINK)
863+ self.assertEqual(self._called, (expected, {}))
864+
865 def test_on_credentials_not_found_unset_greyed(self):
866 """Callback 'on_credentials_not_found' unsets the 'greyed' prop."""
867 self.ui.connect_button.clicked()

Subscribers

People subscribed via source and target branches