Merge lp:~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.9.3 into lp:ubuntu/natty/ubuntuone-control-panel

Proposed by Natalia Bidart
Status: Merged
Merged at revision: 17
Proposed branch: lp:~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.9.3
Merge into: lp:ubuntu/natty/ubuntuone-control-panel
Diff against target: 1743 lines (+697/-640)
15 files modified
PKG-INFO (+1/-1)
bin/ubuntuone-control-panel-gtk (+16/-3)
com.ubuntuone.controlpanel.gui.service.in (+3/-0)
data/dashboard.ui (+2/-1)
data/install.ui (+13/-7)
data/overview.ui (+276/-302)
data/services.ui (+312/-285)
debian/changelog (+32/-0)
debian/ubuntuone-control-panel-gtk.install (+1/-0)
setup.py (+9/-5)
ubuntuone/controlpanel/gtk/__init__.py (+3/-0)
ubuntuone/controlpanel/gtk/gui.py (+11/-10)
ubuntuone/controlpanel/gtk/tests/test_gui_basic.py (+5/-5)
ubuntuone/controlpanel/gtk/tests/test_widgets.py (+6/-12)
ubuntuone/controlpanel/gtk/widgets.py (+7/-9)
To merge this branch: bzr merge lp:~nataliabidart/ubuntu/natty/ubuntuone-control-panel/ubuntuone-control-panel-0.9.3
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team Pending
Review via email: mp+54576@code.launchpad.net

Description of the change

  * New upstream release:
    [ Natalia B. Bidart <email address hidden> ]
      - Restoring some EventBoxes to play along with the theming
        (LP: #738017).
      - Added proper domain setting to the GTK UI (LP: #735957).
      - Added border to the overview panel (LP: #739538).
      - Removed the event box behing the banner image to avoid different
        background colors.
      - Name for notebook's tab-buttons have now a more realistic name, and
        also match those from the theme ("ModeLeft" and "ModeRight").
      - After initial computer adding, the user is redirected to the Services
        tab (LP: #739576).
      - Replaced the AspectFrame for a plain Frame to fix the different width
        issue (LP: #729382).
      - Changed the legend for plugin/extension installs (LP: #732820).
    [ <email address hidden> ]
      - Use the new service.in file in setup.py
      - Added service file template (will need a packaging branch to actually
        install it) (LP: #728722).
      - Make bin/ubuntuone-control-panel-gtk not open a new panel if one is
        already open.
    [ Alejandro J. Cura <email address hidden> ]
      - Simplify the PanelTitle; instead of a Label within an EventBox, it
        will just be a Label (LP: #737336).

  * debian/ubuntuone-control-panel-gtk.install:
    - Added dbus gui service file path so ise installed (LP: #739714).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'PKG-INFO'
2--- PKG-INFO 2011-03-18 21:24:26 +0000
3+++ PKG-INFO 2011-03-23 18:10:48 +0000
4@@ -1,6 +1,6 @@
5 Metadata-Version: 1.1
6 Name: ubuntuone-control-panel
7-Version: 0.9.2
8+Version: 0.9.3
9 Summary: Ubuntu One Control Panel
10 Home-page: https://launchpad.net/ubuntuone-control-panel
11 Author: Natalia Bidart
12
13=== modified file 'bin/ubuntuone-control-panel-gtk'
14--- bin/ubuntuone-control-panel-gtk 2011-03-10 02:59:44 +0000
15+++ bin/ubuntuone-control-panel-gtk 2011-03-23 18:10:48 +0000
16@@ -23,13 +23,18 @@
17 import sys
18
19 import dbus.mainloop.glib
20+import gettext
21
22 from optparse import OptionParser
23
24+from ubuntuone.controlpanel.gtk import DBUS_BUS_NAME, TRANSLATION_DOMAIN
25+
26+dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
27+gettext.textdomain(TRANSLATION_DOMAIN)
28+
29+# import the GUI after the translation domain has been set
30 from ubuntuone.controlpanel.gtk.gui import ControlPanelWindow
31
32-dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
33-
34
35 def parser_options():
36 """Parse command line parameters."""
37@@ -47,7 +52,15 @@
38
39
40 if __name__ == "__main__":
41+ bus = dbus.SessionBus()
42+ name = bus.request_name(DBUS_BUS_NAME,
43+ dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
44+ if name == dbus.bus.REQUEST_NAME_REPLY_EXISTS:
45+ sys.exit(0)
46+
47+ bus_name = dbus.service.BusName(DBUS_BUS_NAME, bus=dbus.SessionBus())
48 parser = parser_options()
49 (options, args) = parser.parse_args(sys.argv)
50- gui = ControlPanelWindow(switch_to=options.switch_to, alert=options.alert)
51+ gui = ControlPanelWindow(
52+ switch_to=options.switch_to, alert=options.alert)
53 gui.main()
54
55=== added file 'com.ubuntuone.controlpanel.gui.service.in'
56--- com.ubuntuone.controlpanel.gui.service.in 1970-01-01 00:00:00 +0000
57+++ com.ubuntuone.controlpanel.gui.service.in 2011-03-23 18:10:48 +0000
58@@ -0,0 +1,3 @@
59+[D-BUS Service]
60+Name=com.ubuntuone.controlpanel.gui
61+Exec=@prefix@/bin/ubuntuone-control-panel-gtk
62
63=== modified file 'data/dashboard.ui'
64--- data/dashboard.ui 2011-03-10 02:59:44 +0000
65+++ data/dashboard.ui 2011-03-23 18:10:48 +0000
66@@ -9,7 +9,8 @@
67 <object class="GtkHBox" id="account">
68 <property name="visible">True</property>
69 <property name="can_focus">False</property>
70- <property name="spacing">10</property>
71+ <property name="border_width">12</property>
72+ <property name="spacing">20</property>
73 <property name="homogeneous">True</property>
74 <child>
75 <object class="GtkFrame" id="frame2">
76
77=== modified file 'data/install.ui'
78--- data/install.ui 2011-01-25 19:08:59 +0000
79+++ data/install.ui 2011-03-23 18:10:48 +0000
80@@ -2,34 +2,43 @@
81 <interface>
82 <requires lib="gtk+" version="2.22"/>
83 <!-- interface-naming-policy project-wide -->
84+ <object class="GtkImage" id="image1">
85+ <property name="visible">True</property>
86+ <property name="can_focus">False</property>
87+ <property name="stock">gtk-ok</property>
88+ </object>
89 <object class="GtkVBox" id="itself">
90 <property name="visible">True</property>
91+ <property name="can_focus">False</property>
92 <property name="border_width">10</property>
93 <property name="spacing">10</property>
94 <child>
95 <object class="GtkLabel" id="install_label">
96 <property name="visible">True</property>
97- <property name="xalign">0</property>
98+ <property name="can_focus">False</property>
99 <property name="label">label</property>
100 <property name="wrap">True</property>
101 </object>
102 <packing>
103- <property name="expand">False</property>
104+ <property name="expand">True</property>
105+ <property name="fill">True</property>
106 <property name="position">0</property>
107 </packing>
108 </child>
109 <child>
110 <object class="GtkHButtonBox" id="install_button_box">
111 <property name="visible">True</property>
112+ <property name="can_focus">False</property>
113 <child>
114 <object class="GtkButton" id="install_button">
115 <property name="label" translatable="yes">_Install now</property>
116 <property name="visible">True</property>
117 <property name="can_focus">True</property>
118 <property name="receives_default">True</property>
119+ <property name="use_action_appearance">False</property>
120 <property name="image">image1</property>
121 <property name="use_underline">True</property>
122- <signal name="clicked" handler="on_install_button_clicked"/>
123+ <signal name="clicked" handler="on_install_button_clicked" swapped="no"/>
124 </object>
125 <packing>
126 <property name="expand">False</property>
127@@ -40,12 +49,9 @@
128 </object>
129 <packing>
130 <property name="expand">False</property>
131+ <property name="fill">True</property>
132 <property name="position">1</property>
133 </packing>
134 </child>
135 </object>
136- <object class="GtkImage" id="image1">
137- <property name="visible">True</property>
138- <property name="stock">gtk-ok</property>
139- </object>
140 </interface>
141
142=== modified file 'data/overview.ui'
143--- data/overview.ui 2011-03-10 02:59:44 +0000
144+++ data/overview.ui 2011-03-23 18:10:48 +0000
145@@ -6,180 +6,239 @@
146 <property name="visible">True</property>
147 <property name="can_focus">False</property>
148 <child>
149- <object class="GtkEventBox" id="banner">
150+ <object class="GtkEventBox" id="eventbox1">
151 <property name="visible">True</property>
152 <property name="can_focus">False</property>
153 <child>
154- <object class="GtkImage" id="image">
155+ <object class="GtkImage" id="banner">
156 <property name="visible">True</property>
157 <property name="can_focus">False</property>
158+ <property name="xpad">12</property>
159+ <property name="ypad">12</property>
160 <property name="pixbuf">overview.png</property>
161 </object>
162 </child>
163 </object>
164 <packing>
165- <property name="expand">False</property>
166+ <property name="expand">True</property>
167 <property name="fill">True</property>
168 <property name="position">0</property>
169 </packing>
170 </child>
171 <child>
172- <object class="GtkScrolledWindow" id="scrolledwindow1">
173- <property name="visible">True</property>
174- <property name="can_focus">True</property>
175- <property name="hscrollbar_policy">automatic</property>
176- <property name="vscrollbar_policy">automatic</property>
177+ <object class="GtkLabel" id="label7">
178+ <property name="visible">True</property>
179+ <property name="can_focus">False</property>
180+ <property name="label" translatable="yes">&lt;span font="24" foreground="#4d4d4d"&gt;The Power of Your Personal Cloud&lt;/span&gt;</property>
181+ <property name="use_markup">True</property>
182+ </object>
183+ <packing>
184+ <property name="expand">True</property>
185+ <property name="fill">True</property>
186+ <property name="position">1</property>
187+ </packing>
188+ </child>
189+ <child>
190+ <object class="GtkHBox" id="hbox1">
191+ <property name="visible">True</property>
192+ <property name="can_focus">False</property>
193+ <property name="border_width">12</property>
194 <child>
195- <object class="GtkViewport" id="viewport1">
196+ <object class="GtkTable" id="table1">
197 <property name="visible">True</property>
198 <property name="can_focus">False</property>
199- <property name="shadow_type">none</property>
200- <child>
201- <object class="GtkVBox" id="vbox1">
202- <property name="visible">True</property>
203- <property name="can_focus">False</property>
204- <child>
205- <object class="GtkLabel" id="label7">
206- <property name="visible">True</property>
207- <property name="can_focus">False</property>
208- <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;The Power of Your Personal Cloud&lt;/span&gt;</property>
209- <property name="use_markup">True</property>
210- </object>
211- <packing>
212- <property name="expand">False</property>
213- <property name="fill">True</property>
214- <property name="padding">12</property>
215- <property name="position">0</property>
216- </packing>
217- </child>
218- <child>
219- <object class="GtkHBox" id="hbox1">
220- <property name="visible">True</property>
221- <property name="can_focus">False</property>
222- <property name="border_width">20</property>
223- <property name="spacing">5</property>
224- <child>
225- <object class="GtkTable" id="table1">
226- <property name="visible">True</property>
227- <property name="can_focus">False</property>
228- <property name="n_rows">4</property>
229- <property name="n_columns">2</property>
230- <property name="column_spacing">10</property>
231- <child>
232- <object class="GtkImage" id="image1">
233- <property name="visible">True</property>
234- <property name="can_focus">False</property>
235- <property name="pixbuf">files.png</property>
236- </object>
237- <packing>
238- <property name="x_options">GTK_FILL</property>
239- <property name="y_options">GTK_FILL</property>
240- </packing>
241- </child>
242- <child>
243- <object class="GtkImage" id="image2">
244- <property name="visible">True</property>
245- <property name="can_focus">False</property>
246- <property name="pixbuf">music-stream.png</property>
247- </object>
248- <packing>
249- <property name="top_attach">1</property>
250- <property name="bottom_attach">2</property>
251- <property name="x_options">GTK_FILL</property>
252- <property name="y_options">GTK_FILL</property>
253- </packing>
254- </child>
255- <child>
256- <object class="GtkImage" id="image3">
257- <property name="visible">True</property>
258- <property name="can_focus">False</property>
259- <property name="pixbuf">contacts.png</property>
260- </object>
261- <packing>
262- <property name="top_attach">2</property>
263- <property name="bottom_attach">3</property>
264- <property name="x_options">GTK_FILL</property>
265- <property name="y_options">GTK_FILL</property>
266- </packing>
267- </child>
268- <child>
269- <object class="GtkImage" id="image4">
270- <property name="visible">True</property>
271- <property name="can_focus">False</property>
272- <property name="pixbuf">notes.png</property>
273- </object>
274- <packing>
275- <property name="top_attach">3</property>
276- <property name="bottom_attach">4</property>
277- <property name="x_options">GTK_FILL</property>
278- <property name="y_options">GTK_FILL</property>
279- </packing>
280- </child>
281- <child>
282- <object class="GtkLabel" id="label3">
283- <property name="visible">True</property>
284- <property name="can_focus">False</property>
285- <property name="xalign">0</property>
286- <property name="label" translatable="yes">Files Anywhere
287-&lt;span foreground="#909090"&gt;Backup and access your files from Ubuntu, Windows or Mobile&lt;/span&gt;</property>
288- <property name="use_markup">True</property>
289- <property name="wrap">True</property>
290- </object>
291- <packing>
292- <property name="left_attach">1</property>
293- <property name="right_attach">2</property>
294- </packing>
295- </child>
296- <child>
297- <object class="GtkLabel" id="label4">
298- <property name="visible">True</property>
299- <property name="can_focus">False</property>
300- <property name="xalign">0</property>
301- <property name="label" translatable="yes">Keep Connected
302+ <property name="n_rows">4</property>
303+ <property name="n_columns">2</property>
304+ <property name="column_spacing">10</property>
305+ <child>
306+ <object class="GtkImage" id="image1">
307+ <property name="visible">True</property>
308+ <property name="can_focus">False</property>
309+ <property name="pixbuf">files.png</property>
310+ </object>
311+ <packing>
312+ <property name="x_options">GTK_FILL</property>
313+ <property name="y_options">GTK_FILL</property>
314+ </packing>
315+ </child>
316+ <child>
317+ <object class="GtkImage" id="image2">
318+ <property name="visible">True</property>
319+ <property name="can_focus">False</property>
320+ <property name="pixbuf">music-stream.png</property>
321+ </object>
322+ <packing>
323+ <property name="top_attach">1</property>
324+ <property name="bottom_attach">2</property>
325+ <property name="x_options">GTK_FILL</property>
326+ <property name="y_options">GTK_FILL</property>
327+ </packing>
328+ </child>
329+ <child>
330+ <object class="GtkImage" id="image3">
331+ <property name="visible">True</property>
332+ <property name="can_focus">False</property>
333+ <property name="pixbuf">contacts.png</property>
334+ </object>
335+ <packing>
336+ <property name="top_attach">2</property>
337+ <property name="bottom_attach">3</property>
338+ <property name="x_options">GTK_FILL</property>
339+ <property name="y_options">GTK_FILL</property>
340+ </packing>
341+ </child>
342+ <child>
343+ <object class="GtkImage" id="image4">
344+ <property name="visible">True</property>
345+ <property name="can_focus">False</property>
346+ <property name="pixbuf">notes.png</property>
347+ </object>
348+ <packing>
349+ <property name="top_attach">3</property>
350+ <property name="bottom_attach">4</property>
351+ <property name="x_options">GTK_FILL</property>
352+ <property name="y_options">GTK_FILL</property>
353+ </packing>
354+ </child>
355+ <child>
356+ <object class="GtkLabel" id="label3">
357+ <property name="visible">True</property>
358+ <property name="can_focus">False</property>
359+ <property name="xalign">0</property>
360+ <property name="label" translatable="yes">Files Anywhere
361+&lt;span foreground="#909090"&gt;Backup and access your files from Ubuntu, Windows, Web or Mobile&lt;/span&gt;</property>
362+ <property name="use_markup">True</property>
363+ <property name="wrap">True</property>
364+ </object>
365+ <packing>
366+ <property name="left_attach">1</property>
367+ <property name="right_attach">2</property>
368+ </packing>
369+ </child>
370+ <child>
371+ <object class="GtkLabel" id="label4">
372+ <property name="visible">True</property>
373+ <property name="can_focus">False</property>
374+ <property name="xalign">0</property>
375+ <property name="label" translatable="yes">Keep Connected
376 &lt;span foreground="#909090"&gt;Unify your contacts across Desktop, Mobile and Web&lt;/span&gt;</property>
377- <property name="use_markup">True</property>
378- <property name="wrap">True</property>
379- </object>
380- <packing>
381- <property name="left_attach">1</property>
382- <property name="right_attach">2</property>
383- <property name="top_attach">2</property>
384- <property name="bottom_attach">3</property>
385- </packing>
386- </child>
387- <child>
388- <object class="GtkLabel" id="label5">
389- <property name="visible">True</property>
390- <property name="can_focus">False</property>
391- <property name="xalign">0</property>
392- <property name="label" translatable="yes">Rock Out
393+ <property name="use_markup">True</property>
394+ <property name="wrap">True</property>
395+ </object>
396+ <packing>
397+ <property name="left_attach">1</property>
398+ <property name="right_attach">2</property>
399+ <property name="top_attach">2</property>
400+ <property name="bottom_attach">3</property>
401+ </packing>
402+ </child>
403+ <child>
404+ <object class="GtkLabel" id="label5">
405+ <property name="visible">True</property>
406+ <property name="can_focus">False</property>
407+ <property name="xalign">0</property>
408+ <property name="label" translatable="yes">Rock Out
409 &lt;span foreground="#909090"&gt;Your entire collection follows you around with music streaming to Android and iPhone&lt;/span&gt;</property>
410- <property name="use_markup">True</property>
411- <property name="wrap">True</property>
412- </object>
413- <packing>
414- <property name="left_attach">1</property>
415- <property name="right_attach">2</property>
416- <property name="top_attach">1</property>
417- <property name="bottom_attach">2</property>
418- </packing>
419- </child>
420- <child>
421- <object class="GtkLabel" id="label6">
422- <property name="visible">True</property>
423- <property name="can_focus">False</property>
424- <property name="xalign">0</property>
425- <property name="label" translatable="yes">Stay Productive
426+ <property name="use_markup">True</property>
427+ <property name="wrap">True</property>
428+ </object>
429+ <packing>
430+ <property name="left_attach">1</property>
431+ <property name="right_attach">2</property>
432+ <property name="top_attach">1</property>
433+ <property name="bottom_attach">2</property>
434+ </packing>
435+ </child>
436+ <child>
437+ <object class="GtkLabel" id="label6">
438+ <property name="visible">True</property>
439+ <property name="can_focus">False</property>
440+ <property name="xalign">0</property>
441+ <property name="label" translatable="yes">Stay Productive
442 &lt;span foreground="#909090"&gt;Keep your Firefox bookmarks and Tomboy notes synced&lt;/span&gt;</property>
443- <property name="use_markup">True</property>
444- <property name="wrap">True</property>
445+ <property name="use_markup">True</property>
446+ <property name="wrap">True</property>
447+ </object>
448+ <packing>
449+ <property name="left_attach">1</property>
450+ <property name="right_attach">2</property>
451+ <property name="top_attach">3</property>
452+ <property name="bottom_attach">4</property>
453+ </packing>
454+ </child>
455+ </object>
456+ <packing>
457+ <property name="expand">True</property>
458+ <property name="fill">True</property>
459+ <property name="position">0</property>
460+ </packing>
461+ </child>
462+ <child>
463+ <object class="GtkVBox" id="vbox2">
464+ <property name="visible">True</property>
465+ <property name="can_focus">False</property>
466+ <child>
467+ <object class="GtkLabel" id="warning_label">
468+ <property name="visible">True</property>
469+ <property name="can_focus">False</property>
470+ <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property>
471+ <property name="wrap">True</property>
472+ </object>
473+ <packing>
474+ <property name="expand">False</property>
475+ <property name="fill">True</property>
476+ <property name="position">0</property>
477+ </packing>
478+ </child>
479+ <child>
480+ <object class="GtkAlignment" id="alignment2">
481+ <property name="visible">True</property>
482+ <property name="can_focus">False</property>
483+ <property name="xscale">0</property>
484+ <property name="yscale">0</property>
485+ <child>
486+ <object class="GtkVBox" id="vbox3">
487+ <property name="visible">True</property>
488+ <property name="can_focus">False</property>
489+ <property name="spacing">10</property>
490+ <child>
491+ <object class="GtkButton" id="learn_more_button">
492+ <property name="visible">True</property>
493+ <property name="can_focus">True</property>
494+ <property name="receives_default">True</property>
495+ <property name="use_action_appearance">False</property>
496+ <signal name="clicked" handler="on_learn_more_button_clicked" swapped="no"/>
497+ <child>
498+ <object class="GtkVBox" id="vbox5">
499+ <property name="visible">True</property>
500+ <property name="can_focus">False</property>
501+ <child>
502+ <object class="GtkImage" id="image5">
503+ <property name="visible">True</property>
504+ <property name="can_focus">False</property>
505+ <property name="pixel_size">55</property>
506+ <property name="icon_name">ubuntuone</property>
507+ </object>
508+ <packing>
509+ <property name="expand">True</property>
510+ <property name="fill">True</property>
511+ <property name="position">0</property>
512+ </packing>
513+ </child>
514+ <child>
515+ <object class="GtkLabel" id="label8">
516+ <property name="visible">True</property>
517+ <property name="can_focus">False</property>
518+ <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;Learn More&lt;/span&gt;</property>
519+ <property name="use_markup">True</property>
520+ </object>
521+ <packing>
522+ <property name="expand">True</property>
523+ <property name="fill">True</property>
524+ <property name="position">1</property>
525+ </packing>
526+ </child>
527 </object>
528- <packing>
529- <property name="left_attach">1</property>
530- <property name="right_attach">2</property>
531- <property name="top_attach">3</property>
532- <property name="bottom_attach">4</property>
533- </packing>
534 </child>
535 </object>
536 <packing>
537@@ -189,151 +248,45 @@
538 </packing>
539 </child>
540 <child>
541- <object class="GtkVBox" id="vbox2">
542+ <object class="GtkButton" id="join_now_button">
543 <property name="visible">True</property>
544- <property name="can_focus">False</property>
545- <child>
546- <object class="GtkLabel" id="warning_label">
547- <property name="visible">True</property>
548- <property name="can_focus">False</property>
549- <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property>
550- <property name="wrap">True</property>
551- </object>
552- <packing>
553- <property name="expand">False</property>
554- <property name="fill">True</property>
555- <property name="position">0</property>
556- </packing>
557- </child>
558- <child>
559- <object class="GtkAlignment" id="alignment2">
560- <property name="visible">True</property>
561- <property name="can_focus">False</property>
562- <property name="xscale">0</property>
563- <property name="yscale">0</property>
564- <child>
565- <object class="GtkVBox" id="vbox3">
566- <property name="visible">True</property>
567- <property name="can_focus">False</property>
568- <property name="spacing">10</property>
569- <child>
570- <object class="GtkButton" id="learn_more_button">
571- <property name="visible">True</property>
572- <property name="can_focus">True</property>
573- <property name="receives_default">True</property>
574- <property name="use_action_appearance">False</property>
575- <signal name="clicked" handler="on_learn_more_button_clicked" swapped="no"/>
576- <child>
577- <object class="GtkVBox" id="vbox5">
578- <property name="visible">True</property>
579- <property name="can_focus">False</property>
580- <child>
581- <object class="GtkImage" id="image5">
582- <property name="visible">True</property>
583- <property name="can_focus">False</property>
584- <property name="pixel_size">45</property>
585- <property name="icon_name">ubuntuone</property>
586- </object>
587- <packing>
588- <property name="expand">True</property>
589- <property name="fill">True</property>
590- <property name="position">0</property>
591- </packing>
592- </child>
593- <child>
594- <object class="GtkLabel" id="label8">
595- <property name="visible">True</property>
596- <property name="can_focus">False</property>
597- <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;Learn More&lt;/span&gt;</property>
598- <property name="use_markup">True</property>
599- </object>
600- <packing>
601- <property name="expand">True</property>
602- <property name="fill">True</property>
603- <property name="position">1</property>
604- </packing>
605- </child>
606- </object>
607- </child>
608- </object>
609- <packing>
610- <property name="expand">True</property>
611- <property name="fill">True</property>
612- <property name="position">0</property>
613- </packing>
614- </child>
615- <child>
616- <object class="GtkButton" id="join_now_button">
617- <property name="visible">True</property>
618- <property name="can_focus">True</property>
619- <property name="can_default">True</property>
620- <property name="receives_default">True</property>
621- <property name="use_action_appearance">False</property>
622- <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/>
623- <child>
624- <object class="GtkVBox" id="vbox4">
625- <property name="visible">True</property>
626- <property name="can_focus">False</property>
627- <property name="spacing">5</property>
628- <child>
629- <object class="GtkLabel" id="label1">
630- <property name="visible">True</property>
631- <property name="can_focus">False</property>
632- <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;Join now&lt;/span&gt;</property>
633- <property name="use_markup">True</property>
634- </object>
635- <packing>
636- <property name="expand">True</property>
637- <property name="fill">True</property>
638- <property name="position">0</property>
639- </packing>
640- </child>
641- <child>
642- <object class="GtkLabel" id="label2">
643- <property name="visible">True</property>
644- <property name="can_focus">False</property>
645- <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;2GB of free storage&lt;/span&gt;</property>
646- <property name="use_markup">True</property>
647- </object>
648- <packing>
649- <property name="expand">True</property>
650- <property name="fill">True</property>
651- <property name="position">1</property>
652- </packing>
653- </child>
654- </object>
655- </child>
656- </object>
657- <packing>
658- <property name="expand">False</property>
659- <property name="fill">True</property>
660- <property name="position">1</property>
661- </packing>
662- </child>
663- <child>
664- <object class="GtkLinkButton" id="connect_button">
665- <property name="label" translatable="yes">I already have an account!</property>
666- <property name="visible">True</property>
667- <property name="can_focus">True</property>
668- <property name="receives_default">True</property>
669- <property name="use_action_appearance">False</property>
670- <property name="relief">none</property>
671- <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/>
672- </object>
673- <packing>
674- <property name="expand">False</property>
675- <property name="fill">False</property>
676- <property name="position">2</property>
677- </packing>
678- </child>
679- </object>
680- </child>
681- </object>
682- <packing>
683- <property name="expand">True</property>
684- <property name="fill">True</property>
685- <property name="position">1</property>
686- </packing>
687+ <property name="can_focus">True</property>
688+ <property name="can_default">True</property>
689+ <property name="receives_default">True</property>
690+ <property name="use_action_appearance">False</property>
691+ <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/>
692+ <child>
693+ <object class="GtkVBox" id="vbox4">
694+ <property name="visible">True</property>
695+ <property name="can_focus">False</property>
696+ <property name="spacing">5</property>
697+ <child>
698+ <object class="GtkLabel" id="label1">
699+ <property name="visible">True</property>
700+ <property name="can_focus">False</property>
701+ <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;Join now&lt;/span&gt;</property>
702+ <property name="use_markup">True</property>
703+ </object>
704+ <packing>
705+ <property name="expand">True</property>
706+ <property name="fill">True</property>
707+ <property name="position">0</property>
708+ </packing>
709+ </child>
710+ <child>
711+ <object class="GtkLabel" id="label2">
712+ <property name="visible">True</property>
713+ <property name="can_focus">False</property>
714+ <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;2GB of free storage&lt;/span&gt;</property>
715+ <property name="use_markup">True</property>
716+ </object>
717+ <packing>
718+ <property name="expand">True</property>
719+ <property name="fill">True</property>
720+ <property name="position">1</property>
721+ </packing>
722+ </child>
723+ </object>
724 </child>
725 </object>
726 <packing>
727@@ -342,22 +295,43 @@
728 <property name="position">1</property>
729 </packing>
730 </child>
731+ <child>
732+ <object class="GtkLinkButton" id="connect_button">
733+ <property name="label" translatable="yes">I already have an account!</property>
734+ <property name="visible">True</property>
735+ <property name="can_focus">True</property>
736+ <property name="receives_default">True</property>
737+ <property name="use_action_appearance">False</property>
738+ <property name="relief">none</property>
739+ <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/>
740+ </object>
741+ <packing>
742+ <property name="expand">False</property>
743+ <property name="fill">False</property>
744+ <property name="position">2</property>
745+ </packing>
746+ </child>
747 </object>
748- <packing>
749- <property name="expand">True</property>
750- <property name="fill">True</property>
751- <property name="position">1</property>
752- </packing>
753 </child>
754 </object>
755+ <packing>
756+ <property name="expand">True</property>
757+ <property name="fill">True</property>
758+ <property name="position">1</property>
759+ </packing>
760 </child>
761 </object>
762+ <packing>
763+ <property name="expand">True</property>
764+ <property name="fill">True</property>
765+ <property name="position">1</property>
766+ </packing>
767 </child>
768 </object>
769 <packing>
770 <property name="expand">True</property>
771 <property name="fill">True</property>
772- <property name="position">1</property>
773+ <property name="position">2</property>
774 </packing>
775 </child>
776 </object>
777
778=== modified file 'data/services.ui'
779--- data/services.ui 2011-03-10 02:59:44 +0000
780+++ data/services.ui 2011-03-23 18:10:48 +0000
781@@ -18,336 +18,363 @@
782 <property name="resize_mode">queue</property>
783 <property name="shadow_type">none</property>
784 <child>
785- <object class="GtkVBox" id="vbox1">
786+ <object class="GtkAlignment" id="alignment1">
787 <property name="visible">True</property>
788 <property name="can_focus">False</property>
789- <property name="spacing">5</property>
790+ <property name="left_padding">5</property>
791+ <property name="right_padding">5</property>
792 <child>
793- <object class="GtkAspectFrame" id="files">
794+ <object class="GtkVBox" id="vbox1">
795 <property name="visible">True</property>
796 <property name="can_focus">False</property>
797- <property name="label_xalign">0</property>
798- <property name="shadow_type">out</property>
799+ <property name="spacing">5</property>
800 <child>
801- <object class="GtkHBox" id="hbox2">
802+ <object class="GtkFrame" id="files">
803 <property name="visible">True</property>
804 <property name="can_focus">False</property>
805- <property name="border_width">5</property>
806+ <property name="label_xalign">0</property>
807+ <property name="shadow_type">out</property>
808 <child>
809- <object class="GtkTable" id="table1">
810+ <object class="GtkAlignment" id="alignment2">
811 <property name="visible">True</property>
812 <property name="can_focus">False</property>
813- <property name="n_rows">3</property>
814- <property name="n_columns">3</property>
815- <property name="row_spacing">5</property>
816- <child>
817- <object class="GtkCheckButton" id="file_sync_check">
818- <property name="visible">True</property>
819- <property name="can_focus">True</property>
820- <property name="receives_default">False</property>
821- <property name="use_action_appearance">False</property>
822- <property name="draw_indicator">True</property>
823- </object>
824- </child>
825- <child>
826- <object class="GtkImage" id="image2">
827- <property name="visible">True</property>
828- <property name="can_focus">False</property>
829- <property name="xpad">5</property>
830- <property name="pixbuf">services-files.png</property>
831- </object>
832- <packing>
833- <property name="left_attach">1</property>
834- <property name="right_attach">2</property>
835- </packing>
836- </child>
837- <child>
838- <object class="GtkLabel" id="label1">
839- <property name="visible">True</property>
840- <property name="can_focus">False</property>
841- <property name="xalign">0</property>
842- <property name="label" translatable="yes">Enable File Sync</property>
843- </object>
844- <packing>
845- <property name="left_attach">2</property>
846- <property name="right_attach">3</property>
847- </packing>
848- </child>
849- <child>
850- <object class="GtkLabel" id="label2">
851- <property name="visible">True</property>
852- <property name="can_focus">False</property>
853- <property name="xalign">0</property>
854- <property name="yalign">0</property>
855- <property name="label" translatable="yes">&lt;span font_size="small"&gt;Enable and then choose which folders you want to access from the Web or any device you connected to Ubuntu One
856+ <child>
857+ <object class="GtkHBox" id="hbox2">
858+ <property name="visible">True</property>
859+ <property name="can_focus">False</property>
860+ <property name="border_width">5</property>
861+ <child>
862+ <object class="GtkTable" id="table1">
863+ <property name="visible">True</property>
864+ <property name="can_focus">False</property>
865+ <property name="n_rows">3</property>
866+ <property name="n_columns">3</property>
867+ <property name="column_spacing">5</property>
868+ <property name="row_spacing">5</property>
869+ <child>
870+ <object class="GtkCheckButton" id="file_sync_check">
871+ <property name="visible">True</property>
872+ <property name="can_focus">True</property>
873+ <property name="receives_default">False</property>
874+ <property name="use_action_appearance">False</property>
875+ <property name="draw_indicator">True</property>
876+ </object>
877+ </child>
878+ <child>
879+ <object class="GtkImage" id="image2">
880+ <property name="visible">True</property>
881+ <property name="can_focus">False</property>
882+ <property name="xpad">5</property>
883+ <property name="pixbuf">services-files.png</property>
884+ </object>
885+ <packing>
886+ <property name="left_attach">1</property>
887+ <property name="right_attach">2</property>
888+ </packing>
889+ </child>
890+ <child>
891+ <object class="GtkLabel" id="label1">
892+ <property name="visible">True</property>
893+ <property name="can_focus">False</property>
894+ <property name="xalign">0</property>
895+ <property name="label" translatable="yes">Enable File Sync</property>
896+ </object>
897+ <packing>
898+ <property name="left_attach">2</property>
899+ <property name="right_attach">3</property>
900+ </packing>
901+ </child>
902+ <child>
903+ <object class="GtkLabel" id="label2">
904+ <property name="visible">True</property>
905+ <property name="can_focus">False</property>
906+ <property name="xalign">0</property>
907+ <property name="yalign">0</property>
908+ <property name="label" translatable="yes">&lt;span font_size="small"&gt;Enable and then choose which folders you want to access from the Web or any device you connected to Ubuntu One
909
910 Simply drag and drop any file or folder to your Ubuntu One folder on this computer&lt;/span&gt;</property>
911- <property name="use_markup">True</property>
912- <property name="wrap">True</property>
913- <property name="width_chars">30</property>
914- </object>
915- <packing>
916- <property name="left_attach">2</property>
917- <property name="right_attach">3</property>
918- <property name="top_attach">1</property>
919- <property name="bottom_attach">2</property>
920- </packing>
921- </child>
922- <child>
923- <object class="GtkHButtonBox" id="hbuttonbox1">
924- <property name="visible">True</property>
925- <property name="can_focus">False</property>
926+ <property name="use_markup">True</property>
927+ <property name="wrap">True</property>
928+ <property name="width_chars">35</property>
929+ </object>
930+ <packing>
931+ <property name="left_attach">2</property>
932+ <property name="right_attach">3</property>
933+ <property name="top_attach">1</property>
934+ <property name="bottom_attach">2</property>
935+ </packing>
936+ </child>
937+ <child>
938+ <object class="GtkHButtonBox" id="hbuttonbox1">
939+ <property name="visible">True</property>
940+ <property name="can_focus">False</property>
941+ <child>
942+ <object class="GtkButton" id="file_sync_button">
943+ <property name="label" translatable="yes">_Show me my Ubuntu One folder</property>
944+ <property name="visible">True</property>
945+ <property name="can_focus">True</property>
946+ <property name="receives_default">True</property>
947+ <property name="use_action_appearance">False</property>
948+ <property name="use_underline">True</property>
949+ <signal name="clicked" handler="on_file_sync_button_clicked" swapped="no"/>
950+ </object>
951+ <packing>
952+ <property name="expand">False</property>
953+ <property name="fill">False</property>
954+ <property name="position">0</property>
955+ </packing>
956+ </child>
957+ </object>
958+ <packing>
959+ <property name="left_attach">2</property>
960+ <property name="right_attach">3</property>
961+ <property name="top_attach">2</property>
962+ <property name="bottom_attach">3</property>
963+ </packing>
964+ </child>
965+ <child>
966+ <placeholder/>
967+ </child>
968+ <child>
969+ <placeholder/>
970+ </child>
971+ <child>
972+ <placeholder/>
973+ </child>
974+ <child>
975+ <placeholder/>
976+ </child>
977+ </object>
978+ <packing>
979+ <property name="expand">False</property>
980+ <property name="fill">True</property>
981+ <property name="position">0</property>
982+ </packing>
983+ </child>
984 <child>
985- <object class="GtkButton" id="file_sync_button">
986- <property name="label" translatable="yes">_Show me my Ubuntu One folder</property>
987+ <object class="GtkImage" id="image1">
988 <property name="visible">True</property>
989- <property name="can_focus">True</property>
990- <property name="receives_default">True</property>
991- <property name="use_action_appearance">False</property>
992- <property name="use_underline">True</property>
993- <signal name="clicked" handler="on_file_sync_button_clicked" swapped="no"/>
994+ <property name="can_focus">False</property>
995+ <property name="xpad">5</property>
996+ <property name="ypad">5</property>
997+ <property name="pixbuf">services-files-example.png</property>
998 </object>
999 <packing>
1000 <property name="expand">False</property>
1001- <property name="fill">False</property>
1002- <property name="position">0</property>
1003+ <property name="fill">True</property>
1004+ <property name="pack_type">end</property>
1005+ <property name="position">1</property>
1006 </packing>
1007 </child>
1008 </object>
1009- <packing>
1010- <property name="left_attach">2</property>
1011- <property name="right_attach">3</property>
1012- <property name="top_attach">2</property>
1013- <property name="bottom_attach">3</property>
1014- </packing>
1015- </child>
1016- <child>
1017- <placeholder/>
1018- </child>
1019- <child>
1020- <placeholder/>
1021- </child>
1022- <child>
1023- <placeholder/>
1024- </child>
1025- <child>
1026- <placeholder/>
1027 </child>
1028 </object>
1029- <packing>
1030- <property name="expand">False</property>
1031- <property name="fill">True</property>
1032- <property name="position">0</property>
1033- </packing>
1034 </child>
1035- <child>
1036- <object class="GtkImage" id="image1">
1037- <property name="visible">True</property>
1038- <property name="can_focus">False</property>
1039- <property name="xpad">5</property>
1040- <property name="ypad">5</property>
1041- <property name="pixbuf">services-files-example.png</property>
1042- </object>
1043- <packing>
1044- <property name="expand">False</property>
1045- <property name="fill">True</property>
1046- <property name="pack_type">end</property>
1047- <property name="position">1</property>
1048- </packing>
1049+ <child type="label_item">
1050+ <placeholder/>
1051 </child>
1052 </object>
1053+ <packing>
1054+ <property name="expand">False</property>
1055+ <property name="fill">True</property>
1056+ <property name="position">0</property>
1057+ </packing>
1058 </child>
1059- </object>
1060- <packing>
1061- <property name="expand">True</property>
1062- <property name="fill">True</property>
1063- <property name="position">0</property>
1064- </packing>
1065- </child>
1066- <child>
1067- <object class="GtkAspectFrame" id="replications">
1068- <property name="visible">True</property>
1069- <property name="can_focus">False</property>
1070- <property name="label_xalign">0</property>
1071- <property name="shadow_type">out</property>
1072 <child>
1073- <object class="GtkHBox" id="hbox3">
1074+ <object class="GtkFrame" id="replications">
1075 <property name="visible">True</property>
1076 <property name="can_focus">False</property>
1077- <property name="border_width">5</property>
1078+ <property name="label_xalign">0</property>
1079+ <property name="shadow_type">out</property>
1080 <child>
1081- <object class="GtkVBox" id="contacts">
1082+ <object class="GtkAlignment" id="alignment3">
1083 <property name="visible">True</property>
1084 <property name="can_focus">False</property>
1085 <child>
1086- <object class="GtkTable" id="contacts_sync">
1087+ <object class="GtkHBox" id="hbox3">
1088 <property name="visible">True</property>
1089 <property name="can_focus">False</property>
1090- <property name="n_rows">2</property>
1091- <property name="n_columns">3</property>
1092- <property name="row_spacing">5</property>
1093- <child>
1094- <object class="GtkCheckButton" id="contacts_check">
1095- <property name="visible">True</property>
1096- <property name="can_focus">True</property>
1097- <property name="receives_default">False</property>
1098- <property name="use_action_appearance">False</property>
1099- <property name="draw_indicator">True</property>
1100- </object>
1101- </child>
1102- <child>
1103- <object class="GtkImage" id="image3">
1104- <property name="visible">True</property>
1105- <property name="can_focus">False</property>
1106- <property name="xpad">5</property>
1107- <property name="pixbuf">services-contacts.png</property>
1108- </object>
1109- <packing>
1110- <property name="left_attach">1</property>
1111- <property name="right_attach">2</property>
1112- </packing>
1113- </child>
1114- <child>
1115- <object class="GtkLabel" id="label4">
1116- <property name="visible">True</property>
1117- <property name="can_focus">False</property>
1118- <property name="xalign">0</property>
1119- <property name="label" translatable="yes">Enable Contacts Sync</property>
1120- </object>
1121- <packing>
1122- <property name="left_attach">2</property>
1123- <property name="right_attach">3</property>
1124- </packing>
1125- </child>
1126- <child>
1127- <object class="GtkLabel" id="label5">
1128- <property name="visible">True</property>
1129- <property name="can_focus">True</property>
1130- <property name="xalign">0</property>
1131- <property name="yalign">0</property>
1132- <property name="label" translatable="yes">&lt;span font_size="small"&gt;Once enabled, visit the &lt;a href="https://one.ubuntu.com"&gt;Ubuntu One website&lt;/a&gt; to manage your contacts, including Gmail and Facebook import&lt;/span&gt;</property>
1133- <property name="use_markup">True</property>
1134- <property name="wrap">True</property>
1135- <property name="width_chars">30</property>
1136- </object>
1137- <packing>
1138- <property name="left_attach">2</property>
1139- <property name="right_attach">3</property>
1140- <property name="top_attach">1</property>
1141- <property name="bottom_attach">2</property>
1142- </packing>
1143- </child>
1144- <child>
1145- <placeholder/>
1146- </child>
1147- <child>
1148- <placeholder/>
1149+ <property name="border_width">5</property>
1150+ <child>
1151+ <object class="GtkVBox" id="contacts">
1152+ <property name="visible">True</property>
1153+ <property name="can_focus">False</property>
1154+ <child>
1155+ <object class="GtkTable" id="contacts_sync">
1156+ <property name="visible">True</property>
1157+ <property name="can_focus">False</property>
1158+ <property name="n_rows">2</property>
1159+ <property name="n_columns">3</property>
1160+ <property name="row_spacing">5</property>
1161+ <child>
1162+ <object class="GtkCheckButton" id="contacts_check">
1163+ <property name="visible">True</property>
1164+ <property name="can_focus">True</property>
1165+ <property name="receives_default">False</property>
1166+ <property name="use_action_appearance">False</property>
1167+ <property name="draw_indicator">True</property>
1168+ </object>
1169+ </child>
1170+ <child>
1171+ <object class="GtkImage" id="image3">
1172+ <property name="visible">True</property>
1173+ <property name="can_focus">False</property>
1174+ <property name="xpad">5</property>
1175+ <property name="pixbuf">services-contacts.png</property>
1176+ </object>
1177+ <packing>
1178+ <property name="left_attach">1</property>
1179+ <property name="right_attach">2</property>
1180+ </packing>
1181+ </child>
1182+ <child>
1183+ <object class="GtkLabel" id="label4">
1184+ <property name="visible">True</property>
1185+ <property name="can_focus">False</property>
1186+ <property name="xalign">0</property>
1187+ <property name="label" translatable="yes">Enable Contacts Sync</property>
1188+ </object>
1189+ <packing>
1190+ <property name="left_attach">2</property>
1191+ <property name="right_attach">3</property>
1192+ </packing>
1193+ </child>
1194+ <child>
1195+ <object class="GtkLabel" id="label5">
1196+ <property name="visible">True</property>
1197+ <property name="can_focus">True</property>
1198+ <property name="xalign">0</property>
1199+ <property name="yalign">0</property>
1200+ <property name="label" translatable="yes">&lt;span font_size="small"&gt;Once enabled, visit the &lt;a href="https://one.ubuntu.com"&gt;Ubuntu One website&lt;/a&gt; to manage your contacts, including Gmail and Facebook import&lt;/span&gt;</property>
1201+ <property name="use_markup">True</property>
1202+ <property name="wrap">True</property>
1203+ <property name="width_chars">35</property>
1204+ </object>
1205+ <packing>
1206+ <property name="left_attach">2</property>
1207+ <property name="right_attach">3</property>
1208+ <property name="top_attach">1</property>
1209+ <property name="bottom_attach">2</property>
1210+ </packing>
1211+ </child>
1212+ <child>
1213+ <placeholder/>
1214+ </child>
1215+ <child>
1216+ <placeholder/>
1217+ </child>
1218+ </object>
1219+ <packing>
1220+ <property name="expand">False</property>
1221+ <property name="fill">True</property>
1222+ <property name="position">0</property>
1223+ </packing>
1224+ </child>
1225+ </object>
1226+ <packing>
1227+ <property name="expand">False</property>
1228+ <property name="fill">True</property>
1229+ <property name="position">0</property>
1230+ </packing>
1231+ </child>
1232+ <child>
1233+ <object class="GtkVBox" id="bookmarks">
1234+ <property name="visible">True</property>
1235+ <property name="can_focus">False</property>
1236+ <child>
1237+ <object class="GtkTable" id="bookmarks_sync">
1238+ <property name="visible">True</property>
1239+ <property name="can_focus">False</property>
1240+ <property name="n_rows">2</property>
1241+ <property name="n_columns">3</property>
1242+ <property name="row_spacing">5</property>
1243+ <child>
1244+ <object class="GtkCheckButton" id="bookmarks_check">
1245+ <property name="visible">True</property>
1246+ <property name="can_focus">True</property>
1247+ <property name="receives_default">False</property>
1248+ <property name="use_action_appearance">False</property>
1249+ <property name="draw_indicator">True</property>
1250+ </object>
1251+ </child>
1252+ <child>
1253+ <object class="GtkImage" id="image4">
1254+ <property name="visible">True</property>
1255+ <property name="can_focus">False</property>
1256+ <property name="xpad">5</property>
1257+ <property name="pixbuf">services-bookmarks.png</property>
1258+ </object>
1259+ <packing>
1260+ <property name="left_attach">1</property>
1261+ <property name="right_attach">2</property>
1262+ </packing>
1263+ </child>
1264+ <child>
1265+ <object class="GtkLabel" id="label6">
1266+ <property name="visible">True</property>
1267+ <property name="can_focus">False</property>
1268+ <property name="xalign">0</property>
1269+ <property name="label" translatable="yes">Enable Bookmarks Sync</property>
1270+ </object>
1271+ <packing>
1272+ <property name="left_attach">2</property>
1273+ <property name="right_attach">3</property>
1274+ </packing>
1275+ </child>
1276+ <child>
1277+ <object class="GtkLabel" id="label7">
1278+ <property name="visible">True</property>
1279+ <property name="can_focus">False</property>
1280+ <property name="xalign">0</property>
1281+ <property name="yalign">0</property>
1282+ <property name="label" translatable="yes">&lt;span font_size="small"&gt;Bookmarks sync works with Firefox&lt;/span&gt;</property>
1283+ <property name="use_markup">True</property>
1284+ <property name="wrap">True</property>
1285+ <property name="width_chars">30</property>
1286+ </object>
1287+ <packing>
1288+ <property name="left_attach">2</property>
1289+ <property name="right_attach">3</property>
1290+ <property name="top_attach">1</property>
1291+ <property name="bottom_attach">2</property>
1292+ </packing>
1293+ </child>
1294+ <child>
1295+ <placeholder/>
1296+ </child>
1297+ <child>
1298+ <placeholder/>
1299+ </child>
1300+ </object>
1301+ <packing>
1302+ <property name="expand">False</property>
1303+ <property name="fill">True</property>
1304+ <property name="position">0</property>
1305+ </packing>
1306+ </child>
1307+ </object>
1308+ <packing>
1309+ <property name="expand">False</property>
1310+ <property name="fill">True</property>
1311+ <property name="pack_type">end</property>
1312+ <property name="position">1</property>
1313+ </packing>
1314 </child>
1315 </object>
1316- <packing>
1317- <property name="expand">False</property>
1318- <property name="fill">True</property>
1319- <property name="position">0</property>
1320- </packing>
1321 </child>
1322 </object>
1323- <packing>
1324- <property name="expand">False</property>
1325- <property name="fill">True</property>
1326- <property name="position">0</property>
1327- </packing>
1328 </child>
1329- <child>
1330- <object class="GtkVBox" id="bookmarks">
1331- <property name="visible">True</property>
1332- <property name="can_focus">False</property>
1333- <child>
1334- <object class="GtkTable" id="bookmarks_sync">
1335- <property name="visible">True</property>
1336- <property name="can_focus">False</property>
1337- <property name="n_rows">2</property>
1338- <property name="n_columns">3</property>
1339- <property name="row_spacing">5</property>
1340- <child>
1341- <object class="GtkCheckButton" id="bookmarks_check">
1342- <property name="visible">True</property>
1343- <property name="can_focus">True</property>
1344- <property name="receives_default">False</property>
1345- <property name="use_action_appearance">False</property>
1346- <property name="draw_indicator">True</property>
1347- </object>
1348- </child>
1349- <child>
1350- <object class="GtkImage" id="image4">
1351- <property name="visible">True</property>
1352- <property name="can_focus">False</property>
1353- <property name="xpad">5</property>
1354- <property name="pixbuf">services-bookmarks.png</property>
1355- </object>
1356- <packing>
1357- <property name="left_attach">1</property>
1358- <property name="right_attach">2</property>
1359- </packing>
1360- </child>
1361- <child>
1362- <object class="GtkLabel" id="label6">
1363- <property name="visible">True</property>
1364- <property name="can_focus">False</property>
1365- <property name="xalign">0</property>
1366- <property name="label" translatable="yes">Enable Bookmarks Sync</property>
1367- </object>
1368- <packing>
1369- <property name="left_attach">2</property>
1370- <property name="right_attach">3</property>
1371- </packing>
1372- </child>
1373- <child>
1374- <object class="GtkLabel" id="label7">
1375- <property name="visible">True</property>
1376- <property name="can_focus">False</property>
1377- <property name="xalign">0</property>
1378- <property name="yalign">0</property>
1379- <property name="label" translatable="yes">&lt;span font_size="small"&gt;Bookmarks sync works with Firefox. Once enabled, you will need to install a plugin&lt;/span&gt;</property>
1380- <property name="use_markup">True</property>
1381- <property name="wrap">True</property>
1382- <property name="width_chars">30</property>
1383- </object>
1384- <packing>
1385- <property name="left_attach">2</property>
1386- <property name="right_attach">3</property>
1387- <property name="top_attach">1</property>
1388- <property name="bottom_attach">2</property>
1389- </packing>
1390- </child>
1391- <child>
1392- <placeholder/>
1393- </child>
1394- <child>
1395- <placeholder/>
1396- </child>
1397- </object>
1398- <packing>
1399- <property name="expand">False</property>
1400- <property name="fill">True</property>
1401- <property name="position">0</property>
1402- </packing>
1403- </child>
1404- </object>
1405- <packing>
1406- <property name="expand">False</property>
1407- <property name="fill">True</property>
1408- <property name="pack_type">end</property>
1409- <property name="position">1</property>
1410- </packing>
1411+ <child type="label_item">
1412+ <placeholder/>
1413 </child>
1414 </object>
1415+ <packing>
1416+ <property name="expand">False</property>
1417+ <property name="fill">True</property>
1418+ <property name="position">1</property>
1419+ </packing>
1420 </child>
1421 </object>
1422- <packing>
1423- <property name="expand">True</property>
1424- <property name="fill">True</property>
1425- <property name="position">1</property>
1426- </packing>
1427 </child>
1428 </object>
1429 </child>
1430
1431=== modified file 'debian/changelog'
1432--- debian/changelog 2011-03-18 21:26:36 +0000
1433+++ debian/changelog 2011-03-23 18:10:48 +0000
1434@@ -1,3 +1,35 @@
1435+ubuntuone-control-panel (0.9.3-0ubuntu1) UNRELEASED; urgency=low
1436+
1437+ * New upstream release:
1438+
1439+ [ Natalia B. Bidart <natalia.bidart@canonical.com> ]
1440+ - Restoring some EventBoxes to play along with the theming (LP: #738017).
1441+ - Added proper domain setting to the GTK UI (LP: #735957).
1442+ - Added border to the overview panel (LP: #739538).
1443+ - Removed the event box behing the banner image to avoid different
1444+ background colors.
1445+ - Name for notebook's tab-buttons have now a more realistic name, and
1446+ also match those from the theme ("ModeLeft" and "ModeRight").
1447+ - After initial computer adding, the user is redirected to the Services
1448+ tab (LP: #739576).
1449+ - Replaced the AspectFrame for a plain Frame to fix the different width
1450+ issue (LP: #729382).
1451+ - Changed the legend for plugin/extension installs (LP: #732820).
1452+ [ eric.casteleijn@canonical.com ]
1453+ - Use the new service.in file in setup.py
1454+ - Added service file template (will need a packaging branch to actually
1455+ install it) (LP: #728722).
1456+ - Make bin/ubuntuone-control-panel-gtk not open a new panel if one is
1457+ already open.
1458+ [ Alejandro J. Cura <alecu@canonical.com> ]
1459+ - Simplify the PanelTitle; instead of a Label within an EventBox, it will
1460+ just be a Label (LP: #737336).
1461+
1462+ * debian/ubuntuone-control-panel-gtk.install:
1463+ - Added dbus gui service file path so ise installed (LP: #739714).
1464+
1465+ -- Natalia Bidart (nessita) <nataliabidart@gmail.com> Wed, 23 Mar 2011 13:39:40 -0300
1466+
1467 ubuntuone-control-panel (0.9.2-0ubuntu1) natty; urgency=low
1468
1469 * New upstream release.
1470
1471=== modified file 'debian/ubuntuone-control-panel-gtk.install'
1472--- debian/ubuntuone-control-panel-gtk.install 2011-02-12 03:18:15 +0000
1473+++ debian/ubuntuone-control-panel-gtk.install 2011-03-23 18:10:48 +0000
1474@@ -1,4 +1,5 @@
1475 debian/tmp/usr/bin/ubuntuone-control-panel-gtk
1476+debian/tmp/usr/share/dbus-1/services/com.ubuntuone.controlpanel.gui.service
1477 debian/tmp/usr/share/indicators/messages/applications/ubuntuone-control-panel
1478 debian/tmp/usr/share/applications/ubuntuone-control-panel-gtk.desktop
1479 debian/tmp/usr/share/ubuntuone-control-panel/*.ui
1480
1481=== modified file 'setup.py'
1482--- setup.py 2011-03-18 21:24:26 +0000
1483+++ setup.py 2011-03-23 18:10:48 +0000
1484@@ -32,16 +32,19 @@
1485
1486 POT_FILE = 'po/ubuntuone-control-panel.pot'
1487 SERVICE_FILE = 'com.ubuntuone.controlpanel.service'
1488+GUI_SERVICE_FILE = 'com.ubuntuone.controlpanel.gui.service'
1489 MESSAGE_ENTRY = 'ubuntuone-control-panel'
1490 CONSTANTS = 'ubuntuone/controlpanel/constants.py'
1491
1492-CLEANFILES = [SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE, 'MANIFEST']
1493+CLEANFILES = [
1494+ SERVICE_FILE, GUI_SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS, POT_FILE,
1495+ 'MANIFEST']
1496
1497
1498 def replace_prefix(prefix):
1499 """Replace every '@prefix@' with prefix within 'filename' content."""
1500 # replace .service file, DATA_DIR constant
1501- for filename in (SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS):
1502+ for filename in (SERVICE_FILE, GUI_SERVICE_FILE, MESSAGE_ENTRY, CONSTANTS):
1503 with open(filename + '.in') as in_file:
1504 content = in_file.read()
1505 with open(filename, 'w') as out_file:
1506@@ -76,7 +79,7 @@
1507
1508 DistUtilsExtra.auto.setup(
1509 name='ubuntuone-control-panel',
1510- version='0.9.2',
1511+ version='0.9.3',
1512 license='GPL v3',
1513 author='Natalia Bidart',
1514 author_email='natalia.bidart@canonical.com',
1515@@ -84,12 +87,13 @@
1516 long_description='Application to manage a Ubuntu One account. Provides a'\
1517 'DBus service to query/modify all the Ubuntu One bits.',
1518 url='https://launchpad.net/ubuntuone-control-panel',
1519- packages=['ubuntuone', 'ubuntuone.controlpanel', 'ubuntuone.controlpanel.gtk'],
1520+ packages=[
1521+ 'ubuntuone', 'ubuntuone.controlpanel', 'ubuntuone.controlpanel.gtk'],
1522 extra_path='ubuntuone-control-panel',
1523 data_files=[
1524 ('lib/ubuntuone-control-panel',
1525 ['bin/ubuntuone-control-panel-backend']),
1526- ('share/dbus-1/services/', [SERVICE_FILE]),
1527+ ('share/dbus-1/services/', [SERVICE_FILE, GUI_SERVICE_FILE]),
1528 ('share/indicators/messages/applications/', [MESSAGE_ENTRY]),
1529 ],
1530 cmdclass={
1531
1532=== modified file 'ubuntuone/controlpanel/gtk/__init__.py'
1533--- ubuntuone/controlpanel/gtk/__init__.py 2010-12-06 12:27:11 +0000
1534+++ ubuntuone/controlpanel/gtk/__init__.py 2011-03-23 18:10:48 +0000
1535@@ -17,3 +17,6 @@
1536 # with this program. If not, see <http://www.gnu.org/licenses/>.
1537
1538 """The GTK graphical interface for the control panel for Ubuntu One."""
1539+
1540+DBUS_BUS_NAME = "com.ubuntuone.controlpanel.gui"
1541+TRANSLATION_DOMAIN = "ubuntuone-control-panel"
1542
1543=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
1544--- ubuntuone/controlpanel/gtk/gui.py 2011-03-18 21:24:26 +0000
1545+++ ubuntuone/controlpanel/gtk/gui.py 2011-03-23 18:10:48 +0000
1546@@ -52,7 +52,7 @@
1547 from ubuntuone.controlpanel.logger import setup_logging, log_call
1548 from ubuntuone.controlpanel.utils import get_data_file
1549
1550-from ubuntuone.controlpanel.gtk import package_manager
1551+from ubuntuone.controlpanel.gtk import package_manager, TRANSLATION_DOMAIN
1552
1553 logger = setup_logging('gtk.gui')
1554 _ = gettext.gettext
1555@@ -119,6 +119,7 @@
1556
1557 if filename is not None:
1558 builder = gtk.Builder()
1559+ builder.set_translation_domain(TRANSLATION_DOMAIN)
1560 builder.add_from_file(get_data_file(filename))
1561 builder.connect_signals(self)
1562
1563@@ -164,7 +165,7 @@
1564 self.message = LabelLoading(LOADING)
1565 self.pack_start(self.message, expand=False)
1566
1567- self.connect('size-allocate', on_size_allocate, self.title.label)
1568+ self.connect('size-allocate', on_size_allocate, self.title)
1569 self.show_all()
1570
1571 def _get_is_processing(self):
1572@@ -855,7 +856,7 @@
1573
1574 INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s'
1575 '</i> in order to enable more sync services.')
1576- INSTALLING = _('installation of <i>%(package_name)s</i> in progress')
1577+ INSTALLING = _('Installation of <i>%(package_name)s</i> in progress')
1578 FAILED_INSTALL = _('<i>%(package_name)s</i> could not be installed')
1579 SUCCESS_INSTALL = _('<i>%(package_name)s</i> was successfully installed')
1580
1581@@ -1024,7 +1025,7 @@
1582 class DesktopcouchService(Service):
1583 """A desktopcouch service."""
1584
1585- INSTALL_PACKAGE = _('Install <i>%(plugin_name)s</i> plugin '
1586+ INSTALL_PACKAGE = _('Install the %(plugin_name)s '
1587 'for %(service_name)s sync')
1588
1589 def __init__(self, service_id, name, enabled,
1590@@ -1092,8 +1093,8 @@
1591
1592 TITLE = _('Enable the sync services for this computer.')
1593 DESKTOPCOUCH_PKG = 'desktopcouch-ubuntuone'
1594- BOOKMARKS = 'Firefox'
1595- CONTACTS = 'Evolution'
1596+ BOOKMARKS = _('Firefox extension')
1597+ CONTACTS = _('Evolution plug-in')
1598 NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
1599 CONTACTS_LINK = 'https://one.ubuntu.com/'
1600
1601@@ -1399,8 +1400,8 @@
1602
1603 QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
1604 QUOTA_THRESHOLD = 0.95
1605- DASHBOARD_BUTTON_NAME = 'Account'
1606- SERVICES_BUTTON_NAME = 'Devices' # Intentional until the theme is fixed
1607+ DASHBOARD_BUTTON_NAME = 'ModeLeft'
1608+ SERVICES_BUTTON_NAME = 'ModeRight'
1609
1610 DASHBOARD_BUTTON_TOOLTIP = _('View your personal details and service '
1611 'summary')
1612@@ -1547,8 +1548,8 @@
1613 if self.get_current_page() == 0:
1614 self.management.load()
1615 if credentials_are_new:
1616- # redirect user to volumes page to review subscription
1617- self.management.volumes_button.clicked()
1618+ # redirect user to services page to start using Ubuntu One
1619+ self.management.services_button.clicked()
1620
1621 self.next_page()
1622
1623
1624=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
1625--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py 2011-03-10 02:59:44 +0000
1626+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py 2011-03-23 18:10:48 +0000
1627@@ -196,7 +196,7 @@
1628 def test_credentials_found_shows_volumes_management_panel(self):
1629 """On 'credentials-found' signal, the management panel is shown.
1630
1631- If first signal parameter is True, visible tab should be volumes.
1632+ If first signal parameter is True, visible tab should be services.
1633
1634 """
1635 a_token = object()
1636@@ -204,7 +204,7 @@
1637
1638 self.assert_current_tab_correct(self.ui.management)
1639 self.assertEqual(self.ui.management.notebook.get_current_page(),
1640- self.ui.management.VOLUMES_PAGE)
1641+ self.ui.management.SERVICES_PAGE)
1642
1643 def test_local_device_removed_shows_overview_panel(self):
1644 """On 'local-device-removed' signal, the overview panel is shown."""
1645@@ -238,12 +238,12 @@
1646
1647 def test_title_markup_is_correct(self):
1648 """The title markup is correctly set when passed as argument."""
1649- self.assertEqual(self.ui.title.label.get_text(), self.kwargs['title'])
1650+ self.assertEqual(self.ui.title.get_text(), self.kwargs['title'])
1651
1652 def test_title_is_correct(self):
1653 """The title markup is correctly set when defined at class level."""
1654 ui = self.klass() # no title given
1655- self.assertEqual(ui.title.label.get_text(), '')
1656+ self.assertEqual(ui.title.get_text(), '')
1657
1658 def test_message_is_a_label_loading(self):
1659 """Message is the correct widget."""
1660@@ -487,7 +487,7 @@
1661
1662 def test_image_is_correct(self):
1663 """There is an image attribute and is correct."""
1664- self.assert_image_equal(self.ui.image, 'overview.png')
1665+ self.assert_image_equal(self.ui.banner, 'overview.png')
1666
1667 def test_join_now_is_default_widget(self):
1668 """The join now button is the default widget."""
1669
1670=== modified file 'ubuntuone/controlpanel/gtk/tests/test_widgets.py'
1671--- ubuntuone/controlpanel/gtk/tests/test_widgets.py 2011-02-28 15:38:15 +0000
1672+++ ubuntuone/controlpanel/gtk/tests/test_widgets.py 2011-03-23 18:10:48 +0000
1673@@ -158,7 +158,7 @@
1674
1675 def setUp(self):
1676 super(PanelTitleTestCase, self).setUp()
1677- self.widget = widgets.PanelTitle(markup=self.TITLE, change_bg=True)
1678+ self.widget = widgets.PanelTitle(markup=self.TITLE)
1679
1680 win = widgets.gtk.Window()
1681 win.add(self.widget)
1682@@ -167,28 +167,22 @@
1683 def test_visibility(self):
1684 """The widget and children visibility is correct."""
1685 self.assertTrue(self.widget.get_visible())
1686- for child in self.widget.get_children():
1687- self.assertTrue(child.get_visible())
1688-
1689- def test_label_is_packed(self):
1690- """The label is packed in the widget."""
1691- self.assertIn(self.widget.label, self.widget.get_children())
1692
1693 def test_label_markup(self):
1694 """The label markup is correct."""
1695- self.assertEqual(self.widget.label.get_label(), self.TITLE)
1696+ self.assertEqual(self.widget.get_label(), self.TITLE)
1697
1698 def test_label_xalign(self):
1699 """The label is left aligned."""
1700- self.assertEqual(self.widget.label.get_property('xalign'), 0.0)
1701+ self.assertEqual(self.widget.get_property('xalign'), 0.0)
1702
1703 def test_label_line_wrap(self):
1704 """The label is left aligned."""
1705- self.assertTrue(self.widget.label.get_line_wrap())
1706- self.assertEqual(self.widget.label.get_line_wrap_mode(),
1707+ self.assertTrue(self.widget.get_line_wrap())
1708+ self.assertEqual(self.widget.get_line_wrap_mode(),
1709 widgets.pango.WRAP_WORD)
1710
1711 def test_label_padding(self):
1712 """The label padding is correct."""
1713- self.assertEqual(self.widget.label.get_padding(),
1714+ self.assertEqual(self.widget.get_padding(),
1715 widgets.DEFAULT_PADDING)
1716
1717=== modified file 'ubuntuone/controlpanel/gtk/widgets.py'
1718--- ubuntuone/controlpanel/gtk/widgets.py 2011-02-28 15:38:15 +0000
1719+++ ubuntuone/controlpanel/gtk/widgets.py 2011-03-23 18:10:48 +0000
1720@@ -103,18 +103,16 @@
1721 return self.label.get_label()
1722
1723
1724-class PanelTitle(gtk.EventBox):
1725+class PanelTitle(gtk.Label):
1726 """A box with a given color and text."""
1727
1728- def __init__(self, markup='', change_bg=False, *args, **kwargs):
1729+ def __init__(self, markup='', *args, **kwargs):
1730 super(PanelTitle, self).__init__(*args, **kwargs)
1731- self.label = gtk.Label()
1732- self.label.set_markup(markup)
1733- self.label.set_padding(*DEFAULT_PADDING)
1734- self.label.set_property('xalign', 0.0)
1735- self.label.set_line_wrap(True)
1736- self.label.set_line_wrap_mode(pango.WRAP_WORD)
1737- self.add(self.label)
1738+ self.set_markup(markup)
1739+ self.set_padding(*DEFAULT_PADDING)
1740+ self.set_property('xalign', 0.0)
1741+ self.set_line_wrap(True)
1742+ self.set_line_wrap_mode(pango.WRAP_WORD)
1743 self.show_all()
1744
1745

Subscribers

People subscribed via source and target branches