Ubuntu
ubuntuone-control-panel package

Merge lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/release-1-1-1 into lp:ubuntu/oneiric/ubuntuone-control-panel

  1. Oneiric (11.10)
  2. release-1-1-1
  3. Merge into oneiric
Proposed by dobey
Status: Merged
Merged at revision: 26
Proposed branch: lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/release-1-1-1
Merge into: lp:ubuntu/oneiric/ubuntuone-control-panel
Diff against target: 53723 lines (+41173/-10648)
131 files modified
PKG-INFO (+1/-1)
bin/ubuntuone-control-panel-gtk (+2/-2)
bin/ubuntuone-control-panel-qt (+54/-0)
data/dashboard.ui (+0/-198)
data/device.ui (+0/-279)
data/devices.ui (+0/-44)
data/gtk/dashboard.ui (+198/-0)
data/gtk/device.ui (+279/-0)
data/gtk/devices.ui (+44/-0)
data/gtk/install.ui (+57/-0)
data/gtk/management.ui (+334/-0)
data/gtk/overview.ui (+333/-0)
data/gtk/services.ui (+387/-0)
data/gtk/volumes.ui (+98/-0)
data/install.ui (+0/-57)
data/management.ui (+0/-336)
data/overview.ui (+0/-338)
data/qt/account.ui (+153/-0)
data/qt/controlpanel.ui (+463/-0)
data/qt/device.ui (+57/-0)
data/qt/devices.ui (+135/-0)
data/qt/filesyncstatus.ui (+59/-0)
data/qt/folders.ui (+116/-0)
data/qt/images.qrc (+18/-0)
data/qt/loadingoverlay.ui (+118/-0)
data/qt/mainwindow.ui (+64/-0)
data/qt/preferences.ui (+210/-0)
data/qt/ubuntuone.qss (+191/-0)
data/services.ui (+0/-391)
data/volumes.ui (+0/-98)
debian/changelog (+7/-0)
debian/control (+7/-5)
debian/python-ubuntuone-control-panel.install (+3/-0)
debian/ubuntuone-control-panel-gtk.install (+2/-2)
po/POTFILES.in (+9/-9)
run-tests (+19/-3)
run-tests.bat (+36/-0)
setup.py (+153/-4)
ubuntuone-control-panel-gtk.desktop.in (+2/-1)
ubuntuone/controlpanel/__init__.py (+1/-0)
ubuntuone/controlpanel/backend.py (+308/-124)
ubuntuone/controlpanel/dbus_client.py (+0/-411)
ubuntuone/controlpanel/dbus_service.py (+48/-5)
ubuntuone/controlpanel/dbustests/__init__.py (+61/-0)
ubuntuone/controlpanel/dbustests/test_dbus_service.py (+823/-0)
ubuntuone/controlpanel/dbustests/test_gui_service.py (+98/-0)
ubuntuone/controlpanel/dbustests/test_sd_client/__init__.py (+19/-0)
ubuntuone/controlpanel/dbustests/test_sd_client/test_linux.py (+90/-0)
ubuntuone/controlpanel/gtk/__init__.py (+0/-24)
ubuntuone/controlpanel/gtk/gui.py (+0/-1784)
ubuntuone/controlpanel/gtk/package_manager.py (+0/-62)
ubuntuone/controlpanel/gtk/tests/__init__.py (+0/-324)
ubuntuone/controlpanel/gtk/tests/test_gui.py (+0/-2161)
ubuntuone/controlpanel/gtk/tests/test_gui_basic.py (+0/-716)
ubuntuone/controlpanel/gtk/tests/test_package_manager.py (+0/-177)
ubuntuone/controlpanel/gtk/tests/test_widgets.py (+0/-196)
ubuntuone/controlpanel/gtk/widgets.py (+0/-359)
ubuntuone/controlpanel/gui/__init__.py (+198/-0)
ubuntuone/controlpanel/gui/gtk/__init__.py (+28/-0)
ubuntuone/controlpanel/gui/gtk/gui.py (+1695/-0)
ubuntuone/controlpanel/gui/gtk/package_manager.py (+62/-0)
ubuntuone/controlpanel/gui/gtk/tests/__init__.py (+241/-0)
ubuntuone/controlpanel/gui/gtk/tests/test_gui.py (+2168/-0)
ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py (+723/-0)
ubuntuone/controlpanel/gui/gtk/tests/test_package_manager.py (+177/-0)
ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py (+196/-0)
ubuntuone/controlpanel/gui/gtk/widgets.py (+359/-0)
ubuntuone/controlpanel/gui/qt/__init__.py (+54/-0)
ubuntuone/controlpanel/gui/qt/account.py (+60/-0)
ubuntuone/controlpanel/gui/qt/addfolder.py (+75/-0)
ubuntuone/controlpanel/gui/qt/controlpanel.py (+102/-0)
ubuntuone/controlpanel/gui/qt/device.py (+94/-0)
ubuntuone/controlpanel/gui/qt/devices.py (+98/-0)
ubuntuone/controlpanel/gui/qt/filesyncstatus.py (+185/-0)
ubuntuone/controlpanel/gui/qt/folders.py (+237/-0)
ubuntuone/controlpanel/gui/qt/gotoweb.py (+41/-0)
ubuntuone/controlpanel/gui/qt/gui.py (+48/-0)
ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+122/-0)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+30/-0)
ubuntuone/controlpanel/gui/qt/main/linux.py (+59/-0)
ubuntuone/controlpanel/gui/qt/main/windows.py (+59/-0)
ubuntuone/controlpanel/gui/qt/preferences.py (+160/-0)
ubuntuone/controlpanel/gui/qt/tests/__init__.py (+221/-0)
ubuntuone/controlpanel/gui/qt/tests/test_account.py (+88/-0)
ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py (+169/-0)
ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py (+103/-0)
ubuntuone/controlpanel/gui/qt/tests/test_device.py (+161/-0)
ubuntuone/controlpanel/gui/qt/tests/test_devices.py (+112/-0)
ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py (+158/-0)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+534/-0)
ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py (+62/-0)
ubuntuone/controlpanel/gui/qt/tests/test_gui.py (+43/-0)
ubuntuone/controlpanel/gui/qt/tests/test_loadingoverlay.py (+36/-0)
ubuntuone/controlpanel/gui/qt/tests/test_preferences.py (+298/-0)
ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py (+67/-0)
ubuntuone/controlpanel/gui/qt/ubuntuonebin.py (+88/-0)
ubuntuone/controlpanel/gui/qt/ui/__init__.py (+19/-0)
ubuntuone/controlpanel/gui/qt/ui/account_ui.py (+77/-0)
ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py (+218/-0)
ubuntuone/controlpanel/gui/qt/ui/device_ui.py (+45/-0)
ubuntuone/controlpanel/gui/qt/ui/devices_ui.py (+74/-0)
ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py (+51/-0)
ubuntuone/controlpanel/gui/qt/ui/folders_ui.py (+62/-0)
ubuntuone/controlpanel/gui/qt/ui/images_rc.py (+23436/-0)
ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py (+64/-0)
ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py (+54/-0)
ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py (+113/-0)
ubuntuone/controlpanel/gui/tests/__init__.py (+150/-0)
ubuntuone/controlpanel/gui/tests/test_humanize.py (+47/-0)
ubuntuone/controlpanel/gui/tests/test_url_sign.py (+83/-0)
ubuntuone/controlpanel/integrationtests/__init__.py (+0/-61)
ubuntuone/controlpanel/integrationtests/test_dbus_client_sd.py (+0/-844)
ubuntuone/controlpanel/integrationtests/test_dbus_client_sso.py (+0/-207)
ubuntuone/controlpanel/integrationtests/test_dbus_service.py (+0/-793)
ubuntuone/controlpanel/integrationtests/test_gui_service.py (+0/-98)
ubuntuone/controlpanel/integrationtests/test_webclient.py (+0/-161)
ubuntuone/controlpanel/login_client.py (+40/-0)
ubuntuone/controlpanel/replication_client.py (+1/-1)
ubuntuone/controlpanel/sd_client/__init__.py (+241/-0)
ubuntuone/controlpanel/sd_client/linux.py (+46/-0)
ubuntuone/controlpanel/tests/__init__.py (+68/-30)
ubuntuone/controlpanel/tests/test_backend.py (+576/-186)
ubuntuone/controlpanel/tests/test_login_client.py (+100/-0)
ubuntuone/controlpanel/tests/test_sd_client.py (+741/-0)
ubuntuone/controlpanel/tests/test_utils.py (+1/-27)
ubuntuone/controlpanel/tests/test_web_client.py (+162/-0)
ubuntuone/controlpanel/utils.py (+0/-13)
ubuntuone/controlpanel/web_client/__init__.py (+68/-0)
ubuntuone/controlpanel/web_client/libsoup.py (+88/-0)
ubuntuone/controlpanel/web_client/txwebclient.py (+80/-0)
ubuntuone/controlpanel/webclient.py (+0/-116)
To merge this branch: bzr merge lp:~dobey/ubuntu/oneiric/ubuntuone-control-panel/release-1-1-1
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+68913@code.launchpad.net
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-04-19 21:09:50 +0000
3+++ PKG-INFO 2011-07-22 21:53:24 +0000
4@@ -1,6 +1,6 @@
5 Metadata-Version: 1.1
6 Name: ubuntuone-control-panel
7-Version: 1.0.0
8+Version: 1.1.1
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-04-08 16:07:22 +0000
15+++ bin/ubuntuone-control-panel-gtk 2011-07-22 21:53:24 +0000
16@@ -26,11 +26,11 @@
17
18 from optparse import OptionParser
19
20-from ubuntuone.controlpanel.gtk import TRANSLATION_DOMAIN
21+from ubuntuone.controlpanel import TRANSLATION_DOMAIN
22
23 gettext.textdomain(TRANSLATION_DOMAIN)
24 # import the GUI after the translation domain has been set
25-from ubuntuone.controlpanel.gtk.gui import main
26+from ubuntuone.controlpanel.gui.gtk import main
27
28
29 def parser_options():
30
31=== added file 'bin/ubuntuone-control-panel-qt'
32--- bin/ubuntuone-control-panel-qt 1970-01-01 00:00:00 +0000
33+++ bin/ubuntuone-control-panel-qt 2011-07-22 21:53:24 +0000
34@@ -0,0 +1,54 @@
35+#!/usr/bin/python
36+# -*- coding: utf-8 -*-
37+
38+# Authors: Natalia B Bidart <natalia.bidart@canonical.com>
39+# Eric Casteleijn <eric.casteleijn@canonical.com>
40+#
41+# Copyright 2010 Canonical Ltd.
42+#
43+# This program is free software: you can redistribute it and/or modify it
44+# under the terms of the GNU General Public License version 3, as published
45+# by the Free Software Foundation.
46+#
47+# This program is distributed in the hope that it will be useful, but
48+# WITHOUT ANY WARRANTY; without even the implied warranties of
49+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
50+# PURPOSE. See the GNU General Public License for more details.
51+#
52+# You should have received a copy of the GNU General Public License along
53+# with this program. If not, see <http://www.gnu.org/licenses/>.
54+"""Execute the graphical interface for the Ubuntu One control panel."""
55+
56+# Invalid name "ubuntuone-control-panel-qt", pylint: disable=C0103
57+
58+import gettext
59+import sys
60+
61+from optparse import OptionParser
62+
63+from ubuntuone.controlpanel import TRANSLATION_DOMAIN
64+
65+gettext.textdomain(TRANSLATION_DOMAIN)
66+# import the GUI after the translation domain has been set
67+from ubuntuone.controlpanel.gui.qt import main
68+
69+
70+def parser_options():
71+ """Parse command line parameters."""
72+ usage = "Usage: %prog [option]"
73+ result = OptionParser(usage=usage)
74+ result.add_option("", "--switch-to", dest="switch_to", type="string",
75+ metavar="PANEL_NAME", default="",
76+ help="Start the Ubuntu One Control Panel (QT) in the "
77+ "PANEL_NAME tab. Possible values are: "
78+ "dashboard, volumes, devices, applications")
79+ result.add_option("-a", "--alert", dest="alert", action="store_true",
80+ default=False, help="Start the Ubuntu One Control Panel "
81+ "(QT) alerting the user to its presence.")
82+ return result
83+
84+
85+if __name__ == "__main__":
86+ parser = parser_options()
87+ (options, args) = parser.parse_args(sys.argv)
88+ main.main(switch_to=options.switch_to, alert=options.alert)
89
90=== added file 'data/Ubuntu-R.ttf'
91Binary files data/Ubuntu-R.ttf 1970-01-01 00:00:00 +0000 and data/Ubuntu-R.ttf 2011-07-22 21:53:24 +0000 differ
92=== removed file 'data/ask-ubuntu-small.png'
93Binary files data/ask-ubuntu-small.png 2011-01-25 19:08:59 +0000 and data/ask-ubuntu-small.png 1970-01-01 00:00:00 +0000 differ
94=== removed file 'data/ask-ubuntu.png'
95Binary files data/ask-ubuntu.png 2011-01-25 19:08:59 +0000 and data/ask-ubuntu.png 1970-01-01 00:00:00 +0000 differ
96=== added file 'data/computer.png'
97Binary files data/computer.png 1970-01-01 00:00:00 +0000 and data/computer.png 2011-07-22 21:53:24 +0000 differ
98=== removed file 'data/dashboard.ui'
99--- data/dashboard.ui 2011-03-23 20:33:42 +0000
100+++ data/dashboard.ui 1970-01-01 00:00:00 +0000
101@@ -1,198 +0,0 @@
102-<?xml version="1.0" encoding="UTF-8"?>
103-<interface>
104- <requires lib="gtk+" version="2.22"/>
105- <!-- interface-naming-policy project-wide -->
106- <object class="GtkAlignment" id="itself">
107- <property name="visible">True</property>
108- <property name="can_focus">False</property>
109- <property name="yalign">0</property>
110- <property name="yscale">0</property>
111- <child>
112- <object class="GtkHBox" id="account">
113- <property name="visible">True</property>
114- <property name="can_focus">False</property>
115- <property name="border_width">12</property>
116- <property name="spacing">12</property>
117- <child>
118- <object class="GtkFrame" id="frame2">
119- <property name="visible">True</property>
120- <property name="can_focus">False</property>
121- <property name="label_xalign">0</property>
122- <property name="shadow_type">out</property>
123- <child>
124- <object class="GtkAlignment" id="alignment2">
125- <property name="visible">True</property>
126- <property name="can_focus">False</property>
127- <property name="top_padding">12</property>
128- <property name="bottom_padding">12</property>
129- <property name="left_padding">12</property>
130- <property name="right_padding">12</property>
131- <child>
132- <object class="GtkVBox" id="vbox5">
133- <property name="visible">True</property>
134- <property name="can_focus">False</property>
135- <property name="spacing">12</property>
136- <child>
137- <object class="GtkLabel" id="name_label">
138- <property name="visible">True</property>
139- <property name="can_focus">False</property>
140- <property name="xalign">0</property>
141- <property name="label">tester name</property>
142- <property name="use_markup">True</property>
143- </object>
144- <packing>
145- <property name="expand">False</property>
146- <property name="fill">True</property>
147- <property name="position">0</property>
148- </packing>
149- </child>
150- <child>
151- <object class="GtkLabel" id="email_label">
152- <property name="visible">True</property>
153- <property name="can_focus">False</property>
154- <property name="xalign">0</property>
155- <property name="label">a@example.com</property>
156- </object>
157- <packing>
158- <property name="expand">False</property>
159- <property name="fill">True</property>
160- <property name="position">1</property>
161- </packing>
162- </child>
163- <child>
164- <object class="GtkHButtonBox" id="hbuttonbox1">
165- <property name="visible">True</property>
166- <property name="can_focus">False</property>
167- <child>
168- <object class="GtkLinkButton" id="linkbutton3">
169- <property name="label" translatable="yes">Edit account details</property>
170- <property name="visible">True</property>
171- <property name="can_focus">True</property>
172- <property name="receives_default">True</property>
173- <property name="use_action_appearance">False</property>
174- <property name="relief">half</property>
175- <property name="uri">http://login.ubuntu.com</property>
176- </object>
177- <packing>
178- <property name="expand">False</property>
179- <property name="fill">False</property>
180- <property name="pack_type">end</property>
181- <property name="position">0</property>
182- </packing>
183- </child>
184- </object>
185- <packing>
186- <property name="expand">False</property>
187- <property name="fill">True</property>
188- <property name="pack_type">end</property>
189- <property name="position">2</property>
190- </packing>
191- </child>
192- </object>
193- </child>
194- </object>
195- </child>
196- <child type="label">
197- <object class="GtkLabel" id="label1">
198- <property name="visible">True</property>
199- <property name="can_focus">False</property>
200- <property name="label" translatable="yes">&lt;b&gt;Personal details&lt;/b&gt;</property>
201- <property name="use_markup">True</property>
202- </object>
203- </child>
204- </object>
205- <packing>
206- <property name="expand">True</property>
207- <property name="fill">True</property>
208- <property name="position">0</property>
209- </packing>
210- </child>
211- <child>
212- <object class="GtkFrame" id="frame1">
213- <property name="visible">True</property>
214- <property name="can_focus">False</property>
215- <property name="label_xalign">0</property>
216- <property name="shadow_type">out</property>
217- <child>
218- <object class="GtkAlignment" id="alignment3">
219- <property name="visible">True</property>
220- <property name="can_focus">False</property>
221- <property name="top_padding">12</property>
222- <property name="bottom_padding">12</property>
223- <property name="left_padding">12</property>
224- <property name="right_padding">12</property>
225- <child>
226- <object class="GtkVBox" id="vbox4">
227- <property name="visible">True</property>
228- <property name="can_focus">False</property>
229- <property name="spacing">12</property>
230- <child>
231- <object class="GtkLabel" id="type_label">
232- <property name="visible">True</property>
233- <property name="can_focus">False</property>
234- <property name="xalign">0</property>
235- <property name="label">Ubuntu One Basic (2 GB)
236-22GB of awesomeness
237-Total storage 22GB
238-You also have a mobile plan!
239-This is great!</property>
240- </object>
241- <packing>
242- <property name="expand">False</property>
243- <property name="fill">True</property>
244- <property name="position">0</property>
245- </packing>
246- </child>
247- <child>
248- <object class="GtkHButtonBox" id="hbuttonbox2">
249- <property name="visible">True</property>
250- <property name="can_focus">False</property>
251- <child>
252- <object class="GtkLinkButton" id="linkbutton1">
253- <property name="label" translatable="yes">Buy storage and plans</property>
254- <property name="visible">True</property>
255- <property name="can_focus">True</property>
256- <property name="receives_default">True</property>
257- <property name="use_action_appearance">False</property>
258- <property name="relief">half</property>
259- <property name="uri">https://one.ubuntu.com/plans/</property>
260- </object>
261- <packing>
262- <property name="expand">False</property>
263- <property name="fill">False</property>
264- <property name="pack_type">end</property>
265- <property name="position">0</property>
266- </packing>
267- </child>
268- </object>
269- <packing>
270- <property name="expand">False</property>
271- <property name="fill">True</property>
272- <property name="pack_type">end</property>
273- <property name="position">1</property>
274- </packing>
275- </child>
276- </object>
277- </child>
278- </object>
279- </child>
280- <child type="label">
281- <object class="GtkLabel" id="label3">
282- <property name="visible">True</property>
283- <property name="can_focus">False</property>
284- <property name="label" translatable="yes">&lt;b&gt;Your services&lt;/b&gt;</property>
285- <property name="use_markup">True</property>
286- </object>
287- </child>
288- </object>
289- <packing>
290- <property name="expand">True</property>
291- <property name="fill">True</property>
292- <property name="pack_type">end</property>
293- <property name="position">1</property>
294- </packing>
295- </child>
296- </object>
297- </child>
298- </object>
299-</interface>
300
301=== removed file 'data/device.ui'
302--- data/device.ui 2011-03-10 02:59:44 +0000
303+++ data/device.ui 1970-01-01 00:00:00 +0000
304@@ -1,279 +0,0 @@
305-<?xml version="1.0" encoding="UTF-8"?>
306-<interface>
307- <requires lib="gtk+" version="2.22"/>
308- <!-- interface-naming-policy project-wide -->
309- <object class="GtkAdjustment" id="adjustment1">
310- <property name="upper">10000</property>
311- <property name="step_increment">1</property>
312- </object>
313- <object class="GtkAdjustment" id="adjustment2">
314- <property name="upper">10000</property>
315- <property name="step_increment">1</property>
316- </object>
317- <object class="GtkVBox" id="itself">
318- <property name="visible">True</property>
319- <property name="can_focus">False</property>
320- <property name="border_width">10</property>
321- <property name="spacing">5</property>
322- <child>
323- <object class="GtkHBox" id="hbox1">
324- <property name="visible">True</property>
325- <property name="can_focus">False</property>
326- <property name="spacing">10</property>
327- <child>
328- <object class="GtkVBox" id="vbox1">
329- <property name="visible">True</property>
330- <property name="can_focus">False</property>
331- <property name="spacing">5</property>
332- <child>
333- <object class="GtkHBox" id="hbox2">
334- <property name="visible">True</property>
335- <property name="can_focus">False</property>
336- <child>
337- <object class="GtkImage" id="device_type">
338- <property name="visible">True</property>
339- <property name="can_focus">False</property>
340- <property name="icon_name">computer</property>
341- </object>
342- <packing>
343- <property name="expand">False</property>
344- <property name="fill">True</property>
345- <property name="position">0</property>
346- </packing>
347- </child>
348- <child>
349- <object class="GtkLabel" id="device_name">
350- <property name="visible">True</property>
351- <property name="can_focus">False</property>
352- <property name="xalign">0</property>
353- <property name="xpad">5</property>
354- <property name="label">My Laptop</property>
355- <property name="wrap">True</property>
356- </object>
357- <packing>
358- <property name="expand">True</property>
359- <property name="fill">True</property>
360- <property name="position">1</property>
361- </packing>
362- </child>
363- </object>
364- <packing>
365- <property name="expand">True</property>
366- <property name="fill">True</property>
367- <property name="position">0</property>
368- </packing>
369- </child>
370- <child>
371- <object class="GtkAlignment" id="alignment1">
372- <property name="visible">True</property>
373- <property name="can_focus">False</property>
374- <property name="left_padding">25</property>
375- <child>
376- <object class="GtkVBox" id="config_settings">
377- <property name="visible">True</property>
378- <property name="can_focus">False</property>
379- <child>
380- <object class="GtkCheckButton" id="show_all_notifications">
381- <property name="label" translatable="yes">Show activity notifications</property>
382- <property name="visible">True</property>
383- <property name="can_focus">True</property>
384- <property name="receives_default">False</property>
385- <property name="use_action_appearance">False</property>
386- <property name="draw_indicator">True</property>
387- <signal name="toggled" handler="on_show_all_notifications_toggled" swapped="no"/>
388- </object>
389- <packing>
390- <property name="expand">True</property>
391- <property name="fill">True</property>
392- <property name="position">0</property>
393- </packing>
394- </child>
395- <child>
396- <object class="GtkVBox" id="throttling">
397- <property name="visible">True</property>
398- <property name="can_focus">False</property>
399- <child>
400- <object class="GtkCheckButton" id="limit_bandwidth">
401- <property name="label" translatable="yes">Limit file sync bandwidth usage</property>
402- <property name="visible">True</property>
403- <property name="can_focus">True</property>
404- <property name="receives_default">False</property>
405- <property name="use_action_appearance">False</property>
406- <property name="draw_indicator">True</property>
407- <signal name="toggled" handler="on_limit_bandwidth_toggled" swapped="no"/>
408- </object>
409- <packing>
410- <property name="expand">True</property>
411- <property name="fill">True</property>
412- <property name="position">0</property>
413- </packing>
414- </child>
415- <child>
416- <object class="GtkTable" id="throttling_limits">
417- <property name="visible">True</property>
418- <property name="can_focus">False</property>
419- <property name="n_rows">2</property>
420- <property name="n_columns">3</property>
421- <property name="column_spacing">3</property>
422- <property name="row_spacing">3</property>
423- <child>
424- <object class="GtkLabel" id="max_upload_speed_label">
425- <property name="visible">True</property>
426- <property name="can_focus">False</property>
427- <property name="xalign">0</property>
428- <property name="xpad">22</property>
429- <property name="label" translatable="yes">Max upload speed:</property>
430- <property name="track_visited_links">False</property>
431- </object>
432- </child>
433- <child>
434- <object class="GtkLabel" id="max_download_speed_label">
435- <property name="visible">True</property>
436- <property name="can_focus">False</property>
437- <property name="xalign">0</property>
438- <property name="xpad">22</property>
439- <property name="label" translatable="yes">Max download speed:</property>
440- </object>
441- <packing>
442- <property name="top_attach">1</property>
443- <property name="bottom_attach">2</property>
444- </packing>
445- </child>
446- <child>
447- <object class="GtkSpinButton" id="max_upload_speed">
448- <property name="visible">True</property>
449- <property name="can_focus">True</property>
450- <property name="invisible_char">•</property>
451- <property name="activates_default">True</property>
452- <property name="invisible_char_set">True</property>
453- <property name="adjustment">adjustment1</property>
454- <signal name="value-changed" handler="on_max_upload_speed_value_changed" swapped="no"/>
455- </object>
456- <packing>
457- <property name="left_attach">1</property>
458- <property name="right_attach">2</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="GtkSpinButton" id="max_download_speed">
465- <property name="visible">True</property>
466- <property name="can_focus">True</property>
467- <property name="invisible_char">•</property>
468- <property name="activates_default">True</property>
469- <property name="invisible_char_set">True</property>
470- <property name="adjustment">adjustment2</property>
471- <signal name="value-changed" handler="on_max_download_speed_value_changed" swapped="no"/>
472- </object>
473- <packing>
474- <property name="left_attach">1</property>
475- <property name="right_attach">2</property>
476- <property name="top_attach">1</property>
477- <property name="bottom_attach">2</property>
478- </packing>
479- </child>
480- <child>
481- <object class="GtkLabel" id="label1">
482- <property name="visible">True</property>
483- <property name="can_focus">False</property>
484- <property name="label" translatable="yes">KiB/s</property>
485- </object>
486- <packing>
487- <property name="left_attach">2</property>
488- <property name="right_attach">3</property>
489- </packing>
490- </child>
491- <child>
492- <object class="GtkLabel" id="label2">
493- <property name="visible">True</property>
494- <property name="can_focus">False</property>
495- <property name="label" translatable="yes">KiB/s</property>
496- </object>
497- <packing>
498- <property name="left_attach">2</property>
499- <property name="right_attach">3</property>
500- <property name="top_attach">1</property>
501- <property name="bottom_attach">2</property>
502- </packing>
503- </child>
504- </object>
505- <packing>
506- <property name="expand">True</property>
507- <property name="fill">True</property>
508- <property name="position">1</property>
509- </packing>
510- </child>
511- </object>
512- <packing>
513- <property name="expand">True</property>
514- <property name="fill">True</property>
515- <property name="position">1</property>
516- </packing>
517- </child>
518- </object>
519- </child>
520- </object>
521- <packing>
522- <property name="expand">False</property>
523- <property name="fill">True</property>
524- <property name="position">1</property>
525- </packing>
526- </child>
527- </object>
528- <packing>
529- <property name="expand">False</property>
530- <property name="fill">True</property>
531- <property name="position">0</property>
532- </packing>
533- </child>
534- <child>
535- <object class="GtkVButtonBox" id="vbuttonbox1">
536- <property name="visible">True</property>
537- <property name="can_focus">False</property>
538- <property name="layout_style">start</property>
539- <child>
540- <object class="GtkButton" id="remove">
541- <property name="label">gtk-remove</property>
542- <property name="visible">True</property>
543- <property name="can_focus">True</property>
544- <property name="receives_default">True</property>
545- <property name="use_action_appearance">False</property>
546- <property name="use_stock">True</property>
547- <signal name="activate" handler="on_remove_clicked" swapped="no"/>
548- <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
549- </object>
550- <packing>
551- <property name="expand">False</property>
552- <property name="fill">False</property>
553- <property name="position">0</property>
554- </packing>
555- </child>
556- </object>
557- <packing>
558- <property name="expand">False</property>
559- <property name="fill">True</property>
560- <property name="pack_type">end</property>
561- <property name="position">1</property>
562- </packing>
563- </child>
564- </object>
565- <packing>
566- <property name="expand">False</property>
567- <property name="fill">True</property>
568- <property name="position">0</property>
569- </packing>
570- </child>
571- <child>
572- <object class="GtkLabel" id="warning_label">
573- <property name="visible">True</property>
574- <property name="can_focus">False</property>
575- </object>
576- <packing>
577- <property name="expand">True</property>
578- <property name="fill">True</property>
579- <property name="position">1</property>
580- </packing>
581- </child>
582- </object>
583-</interface>
584
585=== removed file 'data/devices.ui'
586--- data/devices.ui 2011-03-18 21:24:26 +0000
587+++ data/devices.ui 1970-01-01 00:00:00 +0000
588@@ -1,44 +0,0 @@
589-<?xml version="1.0" encoding="UTF-8"?>
590-<interface>
591- <requires lib="gtk+" version="2.22"/>
592- <!-- interface-naming-policy project-wide -->
593- <object class="GtkVBox" id="itself">
594- <property name="visible">True</property>
595- <property name="can_focus">False</property>
596- <child>
597- <object class="GtkScrolledWindow" id="scrolledwindow1">
598- <property name="visible">True</property>
599- <property name="can_focus">True</property>
600- <property name="hscrollbar_policy">automatic</property>
601- <property name="vscrollbar_policy">automatic</property>
602- <child>
603- <object class="GtkViewport" id="viewport1">
604- <property name="visible">True</property>
605- <property name="can_focus">False</property>
606- <property name="resize_mode">queue</property>
607- <child>
608- <object class="GtkAlignment" id="alignment1">
609- <property name="visible">True</property>
610- <property name="can_focus">False</property>
611- <child>
612- <object class="GtkVBox" id="devices">
613- <property name="visible">True</property>
614- <property name="can_focus">False</property>
615- <child>
616- <placeholder/>
617- </child>
618- </object>
619- </child>
620- </object>
621- </child>
622- </object>
623- </child>
624- </object>
625- <packing>
626- <property name="expand">True</property>
627- <property name="fill">True</property>
628- <property name="position">0</property>
629- </packing>
630- </child>
631- </object>
632-</interface>
633
634=== added file 'data/external_icon_orange.png'
635Binary files data/external_icon_orange.png 1970-01-01 00:00:00 +0000 and data/external_icon_orange.png 2011-07-22 21:53:24 +0000 differ
636=== added file 'data/external_icon_white.png'
637Binary files data/external_icon_white.png 1970-01-01 00:00:00 +0000 and data/external_icon_white.png 2011-07-22 21:53:24 +0000 differ
638=== added file 'data/folder.png'
639Binary files data/folder.png 1970-01-01 00:00:00 +0000 and data/folder.png 2011-07-22 21:53:24 +0000 differ
640=== added directory 'data/gtk'
641=== added file 'data/gtk/dashboard.ui'
642--- data/gtk/dashboard.ui 1970-01-01 00:00:00 +0000
643+++ data/gtk/dashboard.ui 2011-07-22 21:53:24 +0000
644@@ -0,0 +1,198 @@
645+<?xml version="1.0" encoding="UTF-8"?>
646+<interface>
647+ <requires lib="gtk+" version="2.22"/>
648+ <!-- interface-naming-policy project-wide -->
649+ <object class="GtkAlignment" id="itself">
650+ <property name="visible">True</property>
651+ <property name="can_focus">False</property>
652+ <property name="yalign">0</property>
653+ <property name="yscale">0</property>
654+ <child>
655+ <object class="GtkHBox" id="account">
656+ <property name="visible">True</property>
657+ <property name="can_focus">False</property>
658+ <property name="border_width">12</property>
659+ <property name="spacing">12</property>
660+ <child>
661+ <object class="GtkFrame" id="frame2">
662+ <property name="visible">True</property>
663+ <property name="can_focus">False</property>
664+ <property name="label_xalign">0</property>
665+ <property name="shadow_type">out</property>
666+ <child>
667+ <object class="GtkAlignment" id="alignment2">
668+ <property name="visible">True</property>
669+ <property name="can_focus">False</property>
670+ <property name="top_padding">12</property>
671+ <property name="bottom_padding">12</property>
672+ <property name="left_padding">12</property>
673+ <property name="right_padding">12</property>
674+ <child>
675+ <object class="GtkVBox" id="vbox5">
676+ <property name="visible">True</property>
677+ <property name="can_focus">False</property>
678+ <property name="spacing">12</property>
679+ <child>
680+ <object class="GtkLabel" id="name_label">
681+ <property name="visible">True</property>
682+ <property name="can_focus">False</property>
683+ <property name="xalign">0</property>
684+ <property name="label">tester name</property>
685+ <property name="use_markup">True</property>
686+ </object>
687+ <packing>
688+ <property name="expand">False</property>
689+ <property name="fill">True</property>
690+ <property name="position">0</property>
691+ </packing>
692+ </child>
693+ <child>
694+ <object class="GtkLabel" id="email_label">
695+ <property name="visible">True</property>
696+ <property name="can_focus">False</property>
697+ <property name="xalign">0</property>
698+ <property name="label">a@example.com</property>
699+ </object>
700+ <packing>
701+ <property name="expand">False</property>
702+ <property name="fill">True</property>
703+ <property name="position">1</property>
704+ </packing>
705+ </child>
706+ <child>
707+ <object class="GtkHButtonBox" id="hbuttonbox1">
708+ <property name="visible">True</property>
709+ <property name="can_focus">False</property>
710+ <child>
711+ <object class="GtkLinkButton" id="linkbutton3">
712+ <property name="label" translatable="yes">Edit account details</property>
713+ <property name="visible">True</property>
714+ <property name="can_focus">True</property>
715+ <property name="receives_default">True</property>
716+ <property name="use_action_appearance">False</property>
717+ <property name="relief">half</property>
718+ <property name="uri">http://login.ubuntu.com</property>
719+ </object>
720+ <packing>
721+ <property name="expand">False</property>
722+ <property name="fill">False</property>
723+ <property name="pack_type">end</property>
724+ <property name="position">0</property>
725+ </packing>
726+ </child>
727+ </object>
728+ <packing>
729+ <property name="expand">False</property>
730+ <property name="fill">True</property>
731+ <property name="pack_type">end</property>
732+ <property name="position">2</property>
733+ </packing>
734+ </child>
735+ </object>
736+ </child>
737+ </object>
738+ </child>
739+ <child type="label">
740+ <object class="GtkLabel" id="label1">
741+ <property name="visible">True</property>
742+ <property name="can_focus">False</property>
743+ <property name="label" translatable="yes">&lt;b&gt;Personal details&lt;/b&gt;</property>
744+ <property name="use_markup">True</property>
745+ </object>
746+ </child>
747+ </object>
748+ <packing>
749+ <property name="expand">True</property>
750+ <property name="fill">True</property>
751+ <property name="position">0</property>
752+ </packing>
753+ </child>
754+ <child>
755+ <object class="GtkFrame" id="frame1">
756+ <property name="visible">True</property>
757+ <property name="can_focus">False</property>
758+ <property name="label_xalign">0</property>
759+ <property name="shadow_type">out</property>
760+ <child>
761+ <object class="GtkAlignment" id="alignment3">
762+ <property name="visible">True</property>
763+ <property name="can_focus">False</property>
764+ <property name="top_padding">12</property>
765+ <property name="bottom_padding">12</property>
766+ <property name="left_padding">12</property>
767+ <property name="right_padding">12</property>
768+ <child>
769+ <object class="GtkVBox" id="vbox4">
770+ <property name="visible">True</property>
771+ <property name="can_focus">False</property>
772+ <property name="spacing">12</property>
773+ <child>
774+ <object class="GtkLabel" id="type_label">
775+ <property name="visible">True</property>
776+ <property name="can_focus">False</property>
777+ <property name="xalign">0</property>
778+ <property name="label">Ubuntu One Basic (2 GB)
779+22GB of awesomeness
780+Total storage 22GB
781+You also have a mobile plan!
782+This is great!</property>
783+ </object>
784+ <packing>
785+ <property name="expand">False</property>
786+ <property name="fill">True</property>
787+ <property name="position">0</property>
788+ </packing>
789+ </child>
790+ <child>
791+ <object class="GtkHButtonBox" id="hbuttonbox2">
792+ <property name="visible">True</property>
793+ <property name="can_focus">False</property>
794+ <child>
795+ <object class="GtkLinkButton" id="linkbutton1">
796+ <property name="label" translatable="yes">Buy storage and plans</property>
797+ <property name="visible">True</property>
798+ <property name="can_focus">True</property>
799+ <property name="receives_default">True</property>
800+ <property name="use_action_appearance">False</property>
801+ <property name="relief">half</property>
802+ <property name="uri">https://one.ubuntu.com/plans/</property>
803+ </object>
804+ <packing>
805+ <property name="expand">False</property>
806+ <property name="fill">False</property>
807+ <property name="pack_type">end</property>
808+ <property name="position">0</property>
809+ </packing>
810+ </child>
811+ </object>
812+ <packing>
813+ <property name="expand">False</property>
814+ <property name="fill">True</property>
815+ <property name="pack_type">end</property>
816+ <property name="position">1</property>
817+ </packing>
818+ </child>
819+ </object>
820+ </child>
821+ </object>
822+ </child>
823+ <child type="label">
824+ <object class="GtkLabel" id="label3">
825+ <property name="visible">True</property>
826+ <property name="can_focus">False</property>
827+ <property name="label" translatable="yes">&lt;b&gt;Your services&lt;/b&gt;</property>
828+ <property name="use_markup">True</property>
829+ </object>
830+ </child>
831+ </object>
832+ <packing>
833+ <property name="expand">True</property>
834+ <property name="fill">True</property>
835+ <property name="pack_type">end</property>
836+ <property name="position">1</property>
837+ </packing>
838+ </child>
839+ </object>
840+ </child>
841+ </object>
842+</interface>
843
844=== added file 'data/gtk/device.ui'
845--- data/gtk/device.ui 1970-01-01 00:00:00 +0000
846+++ data/gtk/device.ui 2011-07-22 21:53:24 +0000
847@@ -0,0 +1,279 @@
848+<?xml version="1.0" encoding="UTF-8"?>
849+<interface>
850+ <requires lib="gtk+" version="2.22"/>
851+ <!-- interface-naming-policy project-wide -->
852+ <object class="GtkAdjustment" id="adjustment1">
853+ <property name="upper">10000</property>
854+ <property name="step_increment">1</property>
855+ </object>
856+ <object class="GtkAdjustment" id="adjustment2">
857+ <property name="upper">10000</property>
858+ <property name="step_increment">1</property>
859+ </object>
860+ <object class="GtkVBox" id="itself">
861+ <property name="visible">True</property>
862+ <property name="can_focus">False</property>
863+ <property name="border_width">10</property>
864+ <property name="spacing">5</property>
865+ <child>
866+ <object class="GtkHBox" id="hbox1">
867+ <property name="visible">True</property>
868+ <property name="can_focus">False</property>
869+ <property name="spacing">10</property>
870+ <child>
871+ <object class="GtkVBox" id="vbox1">
872+ <property name="visible">True</property>
873+ <property name="can_focus">False</property>
874+ <property name="spacing">5</property>
875+ <child>
876+ <object class="GtkHBox" id="hbox2">
877+ <property name="visible">True</property>
878+ <property name="can_focus">False</property>
879+ <child>
880+ <object class="GtkImage" id="device_type">
881+ <property name="visible">True</property>
882+ <property name="can_focus">False</property>
883+ <property name="icon_name">computer</property>
884+ </object>
885+ <packing>
886+ <property name="expand">False</property>
887+ <property name="fill">True</property>
888+ <property name="position">0</property>
889+ </packing>
890+ </child>
891+ <child>
892+ <object class="GtkLabel" id="device_name">
893+ <property name="visible">True</property>
894+ <property name="can_focus">False</property>
895+ <property name="xalign">0</property>
896+ <property name="xpad">5</property>
897+ <property name="label">My Laptop</property>
898+ <property name="wrap">True</property>
899+ </object>
900+ <packing>
901+ <property name="expand">True</property>
902+ <property name="fill">True</property>
903+ <property name="position">1</property>
904+ </packing>
905+ </child>
906+ </object>
907+ <packing>
908+ <property name="expand">True</property>
909+ <property name="fill">True</property>
910+ <property name="position">0</property>
911+ </packing>
912+ </child>
913+ <child>
914+ <object class="GtkAlignment" id="alignment1">
915+ <property name="visible">True</property>
916+ <property name="can_focus">False</property>
917+ <property name="left_padding">25</property>
918+ <child>
919+ <object class="GtkVBox" id="config_settings">
920+ <property name="visible">True</property>
921+ <property name="can_focus">False</property>
922+ <child>
923+ <object class="GtkCheckButton" id="show_all_notifications">
924+ <property name="label" translatable="yes">Show activity notifications</property>
925+ <property name="visible">True</property>
926+ <property name="can_focus">True</property>
927+ <property name="receives_default">False</property>
928+ <property name="use_action_appearance">False</property>
929+ <property name="draw_indicator">True</property>
930+ <signal name="toggled" handler="on_show_all_notifications_toggled" swapped="no"/>
931+ </object>
932+ <packing>
933+ <property name="expand">True</property>
934+ <property name="fill">True</property>
935+ <property name="position">0</property>
936+ </packing>
937+ </child>
938+ <child>
939+ <object class="GtkVBox" id="throttling">
940+ <property name="visible">True</property>
941+ <property name="can_focus">False</property>
942+ <child>
943+ <object class="GtkCheckButton" id="limit_bandwidth">
944+ <property name="label" translatable="yes">Limit file sync bandwidth usage</property>
945+ <property name="visible">True</property>
946+ <property name="can_focus">True</property>
947+ <property name="receives_default">False</property>
948+ <property name="use_action_appearance">False</property>
949+ <property name="draw_indicator">True</property>
950+ <signal name="toggled" handler="on_limit_bandwidth_toggled" swapped="no"/>
951+ </object>
952+ <packing>
953+ <property name="expand">True</property>
954+ <property name="fill">True</property>
955+ <property name="position">0</property>
956+ </packing>
957+ </child>
958+ <child>
959+ <object class="GtkTable" id="throttling_limits">
960+ <property name="visible">True</property>
961+ <property name="can_focus">False</property>
962+ <property name="n_rows">2</property>
963+ <property name="n_columns">3</property>
964+ <property name="column_spacing">3</property>
965+ <property name="row_spacing">3</property>
966+ <child>
967+ <object class="GtkLabel" id="max_upload_speed_label">
968+ <property name="visible">True</property>
969+ <property name="can_focus">False</property>
970+ <property name="xalign">0</property>
971+ <property name="xpad">22</property>
972+ <property name="label" translatable="yes">Max upload speed:</property>
973+ <property name="track_visited_links">False</property>
974+ </object>
975+ </child>
976+ <child>
977+ <object class="GtkLabel" id="max_download_speed_label">
978+ <property name="visible">True</property>
979+ <property name="can_focus">False</property>
980+ <property name="xalign">0</property>
981+ <property name="xpad">22</property>
982+ <property name="label" translatable="yes">Max download speed:</property>
983+ </object>
984+ <packing>
985+ <property name="top_attach">1</property>
986+ <property name="bottom_attach">2</property>
987+ </packing>
988+ </child>
989+ <child>
990+ <object class="GtkSpinButton" id="max_upload_speed">
991+ <property name="visible">True</property>
992+ <property name="can_focus">True</property>
993+ <property name="invisible_char">•</property>
994+ <property name="activates_default">True</property>
995+ <property name="invisible_char_set">True</property>
996+ <property name="adjustment">adjustment1</property>
997+ <signal name="value-changed" handler="on_max_upload_speed_value_changed" swapped="no"/>
998+ </object>
999+ <packing>
1000+ <property name="left_attach">1</property>
1001+ <property name="right_attach">2</property>
1002+ <property name="x_options">GTK_FILL</property>
1003+ <property name="y_options">GTK_FILL</property>
1004+ </packing>
1005+ </child>
1006+ <child>
1007+ <object class="GtkSpinButton" id="max_download_speed">
1008+ <property name="visible">True</property>
1009+ <property name="can_focus">True</property>
1010+ <property name="invisible_char">•</property>
1011+ <property name="activates_default">True</property>
1012+ <property name="invisible_char_set">True</property>
1013+ <property name="adjustment">adjustment2</property>
1014+ <signal name="value-changed" handler="on_max_download_speed_value_changed" swapped="no"/>
1015+ </object>
1016+ <packing>
1017+ <property name="left_attach">1</property>
1018+ <property name="right_attach">2</property>
1019+ <property name="top_attach">1</property>
1020+ <property name="bottom_attach">2</property>
1021+ </packing>
1022+ </child>
1023+ <child>
1024+ <object class="GtkLabel" id="label1">
1025+ <property name="visible">True</property>
1026+ <property name="can_focus">False</property>
1027+ <property name="label" translatable="yes">KiB/s</property>
1028+ </object>
1029+ <packing>
1030+ <property name="left_attach">2</property>
1031+ <property name="right_attach">3</property>
1032+ </packing>
1033+ </child>
1034+ <child>
1035+ <object class="GtkLabel" id="label2">
1036+ <property name="visible">True</property>
1037+ <property name="can_focus">False</property>
1038+ <property name="label" translatable="yes">KiB/s</property>
1039+ </object>
1040+ <packing>
1041+ <property name="left_attach">2</property>
1042+ <property name="right_attach">3</property>
1043+ <property name="top_attach">1</property>
1044+ <property name="bottom_attach">2</property>
1045+ </packing>
1046+ </child>
1047+ </object>
1048+ <packing>
1049+ <property name="expand">True</property>
1050+ <property name="fill">True</property>
1051+ <property name="position">1</property>
1052+ </packing>
1053+ </child>
1054+ </object>
1055+ <packing>
1056+ <property name="expand">True</property>
1057+ <property name="fill">True</property>
1058+ <property name="position">1</property>
1059+ </packing>
1060+ </child>
1061+ </object>
1062+ </child>
1063+ </object>
1064+ <packing>
1065+ <property name="expand">False</property>
1066+ <property name="fill">True</property>
1067+ <property name="position">1</property>
1068+ </packing>
1069+ </child>
1070+ </object>
1071+ <packing>
1072+ <property name="expand">False</property>
1073+ <property name="fill">True</property>
1074+ <property name="position">0</property>
1075+ </packing>
1076+ </child>
1077+ <child>
1078+ <object class="GtkVButtonBox" id="vbuttonbox1">
1079+ <property name="visible">True</property>
1080+ <property name="can_focus">False</property>
1081+ <property name="layout_style">start</property>
1082+ <child>
1083+ <object class="GtkButton" id="remove">
1084+ <property name="label">gtk-remove</property>
1085+ <property name="visible">True</property>
1086+ <property name="can_focus">True</property>
1087+ <property name="receives_default">True</property>
1088+ <property name="use_action_appearance">False</property>
1089+ <property name="use_stock">True</property>
1090+ <signal name="activate" handler="on_remove_clicked" swapped="no"/>
1091+ <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
1092+ </object>
1093+ <packing>
1094+ <property name="expand">False</property>
1095+ <property name="fill">False</property>
1096+ <property name="position">0</property>
1097+ </packing>
1098+ </child>
1099+ </object>
1100+ <packing>
1101+ <property name="expand">False</property>
1102+ <property name="fill">True</property>
1103+ <property name="pack_type">end</property>
1104+ <property name="position">1</property>
1105+ </packing>
1106+ </child>
1107+ </object>
1108+ <packing>
1109+ <property name="expand">False</property>
1110+ <property name="fill">True</property>
1111+ <property name="position">0</property>
1112+ </packing>
1113+ </child>
1114+ <child>
1115+ <object class="GtkLabel" id="warning_label">
1116+ <property name="visible">True</property>
1117+ <property name="can_focus">False</property>
1118+ </object>
1119+ <packing>
1120+ <property name="expand">True</property>
1121+ <property name="fill">True</property>
1122+ <property name="position">1</property>
1123+ </packing>
1124+ </child>
1125+ </object>
1126+</interface>
1127
1128=== added file 'data/gtk/devices.ui'
1129--- data/gtk/devices.ui 1970-01-01 00:00:00 +0000
1130+++ data/gtk/devices.ui 2011-07-22 21:53:24 +0000
1131@@ -0,0 +1,44 @@
1132+<?xml version="1.0" encoding="UTF-8"?>
1133+<interface>
1134+ <requires lib="gtk+" version="2.22"/>
1135+ <!-- interface-naming-policy project-wide -->
1136+ <object class="GtkVBox" id="itself">
1137+ <property name="visible">True</property>
1138+ <property name="can_focus">False</property>
1139+ <child>
1140+ <object class="GtkScrolledWindow" id="scrolledwindow1">
1141+ <property name="visible">True</property>
1142+ <property name="can_focus">True</property>
1143+ <property name="hscrollbar_policy">automatic</property>
1144+ <property name="vscrollbar_policy">automatic</property>
1145+ <child>
1146+ <object class="GtkViewport" id="viewport1">
1147+ <property name="visible">True</property>
1148+ <property name="can_focus">False</property>
1149+ <property name="resize_mode">queue</property>
1150+ <child>
1151+ <object class="GtkAlignment" id="alignment1">
1152+ <property name="visible">True</property>
1153+ <property name="can_focus">False</property>
1154+ <child>
1155+ <object class="GtkVBox" id="devices">
1156+ <property name="visible">True</property>
1157+ <property name="can_focus">False</property>
1158+ <child>
1159+ <placeholder/>
1160+ </child>
1161+ </object>
1162+ </child>
1163+ </object>
1164+ </child>
1165+ </object>
1166+ </child>
1167+ </object>
1168+ <packing>
1169+ <property name="expand">True</property>
1170+ <property name="fill">True</property>
1171+ <property name="position">0</property>
1172+ </packing>
1173+ </child>
1174+ </object>
1175+</interface>
1176
1177=== added file 'data/gtk/install.ui'
1178--- data/gtk/install.ui 1970-01-01 00:00:00 +0000
1179+++ data/gtk/install.ui 2011-07-22 21:53:24 +0000
1180@@ -0,0 +1,57 @@
1181+<?xml version="1.0" encoding="UTF-8"?>
1182+<interface>
1183+ <requires lib="gtk+" version="2.22"/>
1184+ <!-- interface-naming-policy project-wide -->
1185+ <object class="GtkImage" id="image1">
1186+ <property name="visible">True</property>
1187+ <property name="can_focus">False</property>
1188+ <property name="stock">gtk-ok</property>
1189+ </object>
1190+ <object class="GtkVBox" id="itself">
1191+ <property name="visible">True</property>
1192+ <property name="can_focus">False</property>
1193+ <property name="border_width">10</property>
1194+ <property name="spacing">10</property>
1195+ <child>
1196+ <object class="GtkLabel" id="install_label">
1197+ <property name="visible">True</property>
1198+ <property name="can_focus">False</property>
1199+ <property name="label">label</property>
1200+ <property name="wrap">True</property>
1201+ </object>
1202+ <packing>
1203+ <property name="expand">True</property>
1204+ <property name="fill">True</property>
1205+ <property name="position">0</property>
1206+ </packing>
1207+ </child>
1208+ <child>
1209+ <object class="GtkHButtonBox" id="install_button_box">
1210+ <property name="visible">True</property>
1211+ <property name="can_focus">False</property>
1212+ <child>
1213+ <object class="GtkButton" id="install_button">
1214+ <property name="label" translatable="yes">_Install now</property>
1215+ <property name="visible">True</property>
1216+ <property name="can_focus">True</property>
1217+ <property name="receives_default">True</property>
1218+ <property name="use_action_appearance">False</property>
1219+ <property name="image">image1</property>
1220+ <property name="use_underline">True</property>
1221+ <signal name="clicked" handler="on_install_button_clicked" swapped="no"/>
1222+ </object>
1223+ <packing>
1224+ <property name="expand">False</property>
1225+ <property name="fill">False</property>
1226+ <property name="position">0</property>
1227+ </packing>
1228+ </child>
1229+ </object>
1230+ <packing>
1231+ <property name="expand">False</property>
1232+ <property name="fill">True</property>
1233+ <property name="position">1</property>
1234+ </packing>
1235+ </child>
1236+ </object>
1237+</interface>
1238
1239=== added file 'data/gtk/management.ui'
1240--- data/gtk/management.ui 1970-01-01 00:00:00 +0000
1241+++ data/gtk/management.ui 2011-07-22 21:53:24 +0000
1242@@ -0,0 +1,334 @@
1243+<?xml version="1.0" encoding="UTF-8"?>
1244+<interface>
1245+ <requires lib="gtk+" version="2.22"/>
1246+ <!-- interface-naming-policy project-wide -->
1247+ <object class="GtkVBox" id="itself">
1248+ <property name="visible">True</property>
1249+ <property name="can_focus">False</property>
1250+ <child>
1251+ <object class="GtkEventBox" id="header">
1252+ <property name="visible">True</property>
1253+ <property name="can_focus">False</property>
1254+ <child>
1255+ <object class="GtkVBox" id="vbox2">
1256+ <property name="visible">True</property>
1257+ <property name="can_focus">False</property>
1258+ <child>
1259+ <object class="GtkHBox" id="status_box">
1260+ <property name="visible">True</property>
1261+ <property name="can_focus">False</property>
1262+ <property name="border_width">10</property>
1263+ <property name="spacing">10</property>
1264+ <child>
1265+ <object class="GtkVBox" id="quota_box">
1266+ <property name="visible">True</property>
1267+ <property name="can_focus">False</property>
1268+ <property name="spacing">5</property>
1269+ <child>
1270+ <object class="GtkProgressBar" id="quota_progressbar">
1271+ <property name="visible">True</property>
1272+ <property name="can_focus">False</property>
1273+ </object>
1274+ <packing>
1275+ <property name="expand">True</property>
1276+ <property name="fill">True</property>
1277+ <property name="position">0</property>
1278+ </packing>
1279+ </child>
1280+ </object>
1281+ <packing>
1282+ <property name="expand">False</property>
1283+ <property name="fill">True</property>
1284+ <property name="position">0</property>
1285+ </packing>
1286+ </child>
1287+ </object>
1288+ <packing>
1289+ <property name="expand">False</property>
1290+ <property name="fill">True</property>
1291+ <property name="position">0</property>
1292+ </packing>
1293+ </child>
1294+ <child>
1295+ <object class="GtkHBox" id="hbox2">
1296+ <property name="visible">True</property>
1297+ <property name="can_focus">False</property>
1298+ <child>
1299+ <object class="GtkHSeparator" id="hseparator1">
1300+ <property name="visible">True</property>
1301+ <property name="can_focus">False</property>
1302+ </object>
1303+ <packing>
1304+ <property name="expand">True</property>
1305+ <property name="fill">True</property>
1306+ <property name="position">0</property>
1307+ </packing>
1308+ </child>
1309+ <child>
1310+ <object class="GtkHButtonBox" id="hbuttonbox1">
1311+ <property name="visible">True</property>
1312+ <property name="can_focus">False</property>
1313+ <property name="layout_style">center</property>
1314+ <child>
1315+ <object class="GtkRadioButton" id="dashboard_button">
1316+ <property name="label" translatable="yes">Account</property>
1317+ <property name="visible">True</property>
1318+ <property name="can_focus">True</property>
1319+ <property name="receives_default">False</property>
1320+ <property name="use_action_appearance">False</property>
1321+ <property name="active">True</property>
1322+ <property name="draw_indicator">False</property>
1323+ </object>
1324+ <packing>
1325+ <property name="expand">False</property>
1326+ <property name="fill">False</property>
1327+ <property name="position">0</property>
1328+ </packing>
1329+ </child>
1330+ <child>
1331+ <object class="GtkRadioButton" id="volumes_button">
1332+ <property name="label" translatable="yes">Cloud Folders</property>
1333+ <property name="visible">True</property>
1334+ <property name="can_focus">True</property>
1335+ <property name="receives_default">False</property>
1336+ <property name="use_action_appearance">False</property>
1337+ <property name="draw_indicator">False</property>
1338+ <property name="group">dashboard_button</property>
1339+ </object>
1340+ <packing>
1341+ <property name="expand">False</property>
1342+ <property name="fill">False</property>
1343+ <property name="position">1</property>
1344+ </packing>
1345+ </child>
1346+ <child>
1347+ <object class="GtkRadioButton" id="shares_button">
1348+ <property name="label" translatable="yes">Shares</property>
1349+ <property name="can_focus">True</property>
1350+ <property name="receives_default">False</property>
1351+ <property name="use_action_appearance">False</property>
1352+ <property name="draw_indicator">False</property>
1353+ <property name="group">dashboard_button</property>
1354+ </object>
1355+ <packing>
1356+ <property name="expand">False</property>
1357+ <property name="fill">False</property>
1358+ <property name="position">2</property>
1359+ </packing>
1360+ </child>
1361+ <child>
1362+ <object class="GtkRadioButton" id="devices_button">
1363+ <property name="label" translatable="yes">Devices</property>
1364+ <property name="visible">True</property>
1365+ <property name="can_focus">True</property>
1366+ <property name="receives_default">False</property>
1367+ <property name="use_action_appearance">False</property>
1368+ <property name="draw_indicator">False</property>
1369+ <property name="group">dashboard_button</property>
1370+ </object>
1371+ <packing>
1372+ <property name="expand">False</property>
1373+ <property name="fill">False</property>
1374+ <property name="position">3</property>
1375+ </packing>
1376+ </child>
1377+ <child>
1378+ <object class="GtkRadioButton" id="services_button">
1379+ <property name="label" translatable="yes">Services</property>
1380+ <property name="visible">True</property>
1381+ <property name="can_focus">True</property>
1382+ <property name="receives_default">False</property>
1383+ <property name="use_action_appearance">False</property>
1384+ <property name="draw_indicator">False</property>
1385+ <property name="group">dashboard_button</property>
1386+ </object>
1387+ <packing>
1388+ <property name="expand">False</property>
1389+ <property name="fill">False</property>
1390+ <property name="position">4</property>
1391+ </packing>
1392+ </child>
1393+ </object>
1394+ <packing>
1395+ <property name="expand">False</property>
1396+ <property name="fill">True</property>
1397+ <property name="position">1</property>
1398+ </packing>
1399+ </child>
1400+ <child>
1401+ <object class="GtkHSeparator" id="hseparator2">
1402+ <property name="visible">True</property>
1403+ <property name="can_focus">False</property>
1404+ </object>
1405+ <packing>
1406+ <property name="expand">True</property>
1407+ <property name="fill">True</property>
1408+ <property name="position">2</property>
1409+ </packing>
1410+ </child>
1411+ </object>
1412+ <packing>
1413+ <property name="expand">False</property>
1414+ <property name="fill">True</property>
1415+ <property name="position">1</property>
1416+ </packing>
1417+ </child>
1418+ </object>
1419+ </child>
1420+ </object>
1421+ <packing>
1422+ <property name="expand">False</property>
1423+ <property name="fill">True</property>
1424+ <property name="position">0</property>
1425+ </packing>
1426+ </child>
1427+ <child>
1428+ <object class="GtkNotebook" id="notebook">
1429+ <property name="visible">True</property>
1430+ <property name="can_focus">False</property>
1431+ <property name="show_tabs">False</property>
1432+ <property name="show_border">False</property>
1433+ <property name="homogeneous">True</property>
1434+ </object>
1435+ <packing>
1436+ <property name="expand">True</property>
1437+ <property name="fill">True</property>
1438+ <property name="position">1</property>
1439+ </packing>
1440+ </child>
1441+ <child>
1442+ <object class="GtkHBox" id="hbox1">
1443+ <property name="visible">True</property>
1444+ <property name="can_focus">False</property>
1445+ <property name="border_width">12</property>
1446+ <child>
1447+ <object class="GtkAlignment" id="alignment3">
1448+ <property name="visible">True</property>
1449+ <property name="can_focus">False</property>
1450+ <property name="yalign">1</property>
1451+ <property name="yscale">0</property>
1452+ <child>
1453+ <object class="GtkHButtonBox" id="hbuttonbox3">
1454+ <property name="visible">True</property>
1455+ <property name="can_focus">False</property>
1456+ <property name="spacing">5</property>
1457+ <property name="layout_style">start</property>
1458+ <child>
1459+ <object class="GtkLinkButton" id="linkbutton2">
1460+ <property name="label" translatable="yes">Official Support</property>
1461+ <property name="visible">True</property>
1462+ <property name="can_focus">True</property>
1463+ <property name="receives_default">True</property>
1464+ <property name="use_action_appearance">False</property>
1465+ <property name="relief">half</property>
1466+ <property name="uri">https://one.ubuntu.com/support/</property>
1467+ </object>
1468+ <packing>
1469+ <property name="expand">False</property>
1470+ <property name="fill">False</property>
1471+ <property name="position">0</property>
1472+ </packing>
1473+ </child>
1474+ <child>
1475+ <object class="GtkLinkButton" id="linkbutton4">
1476+ <property name="label" translatable="yes">Community Support</property>
1477+ <property name="visible">True</property>
1478+ <property name="can_focus">True</property>
1479+ <property name="receives_default">True</property>
1480+ <property name="use_action_appearance">False</property>
1481+ <property name="relief">half</property>
1482+ <property name="uri">http://askubuntu.com/questions/tagged/ubuntu-one</property>
1483+ </object>
1484+ <packing>
1485+ <property name="expand">False</property>
1486+ <property name="fill">False</property>
1487+ <property name="position">1</property>
1488+ </packing>
1489+ </child>
1490+ </object>
1491+ </child>
1492+ </object>
1493+ <packing>
1494+ <property name="expand">False</property>
1495+ <property name="fill">True</property>
1496+ <property name="position">0</property>
1497+ </packing>
1498+ </child>
1499+ <child>
1500+ <object class="GtkHBox" id="hbox3">
1501+ <property name="visible">True</property>
1502+ <property name="can_focus">False</property>
1503+ <child>
1504+ <object class="GtkLabel" id="label4">
1505+ <property name="visible">True</property>
1506+ <property name="can_focus">False</property>
1507+ <property name="label" translatable="yes">Talk to us on:</property>
1508+ </object>
1509+ <packing>
1510+ <property name="expand">True</property>
1511+ <property name="fill">True</property>
1512+ <property name="position">0</property>
1513+ </packing>
1514+ </child>
1515+ <child>
1516+ <object class="GtkLinkButton" id="linkbutton5">
1517+ <property name="visible">True</property>
1518+ <property name="can_focus">True</property>
1519+ <property name="receives_default">True</property>
1520+ <property name="use_action_appearance">False</property>
1521+ <property name="relief">none</property>
1522+ <property name="uri">http://twitter.com/ubuntuone</property>
1523+ <child>
1524+ <object class="GtkImage" id="twitter_logo">
1525+ <property name="visible">True</property>
1526+ <property name="can_focus">False</property>
1527+ <property name="tooltip_text" translatable="yes">http://twitter.com/ubuntuone</property>
1528+ </object>
1529+ </child>
1530+ </object>
1531+ <packing>
1532+ <property name="expand">False</property>
1533+ <property name="fill">False</property>
1534+ <property name="position">1</property>
1535+ </packing>
1536+ </child>
1537+ <child>
1538+ <object class="GtkLinkButton" id="linkbutton6">
1539+ <property name="visible">True</property>
1540+ <property name="can_focus">True</property>
1541+ <property name="receives_default">True</property>
1542+ <property name="use_action_appearance">False</property>
1543+ <property name="relief">none</property>
1544+ <property name="uri">http://www.facebook.com/ubuntuone</property>
1545+ <child>
1546+ <object class="GtkImage" id="facebook_logo">
1547+ <property name="visible">True</property>
1548+ <property name="can_focus">False</property>
1549+ <property name="tooltip_text" translatable="yes">http://www.facebook.com/ubuntuone</property>
1550+ </object>
1551+ </child>
1552+ </object>
1553+ <packing>
1554+ <property name="expand">True</property>
1555+ <property name="fill">True</property>
1556+ <property name="position">2</property>
1557+ </packing>
1558+ </child>
1559+ </object>
1560+ <packing>
1561+ <property name="expand">False</property>
1562+ <property name="fill">True</property>
1563+ <property name="pack_type">end</property>
1564+ <property name="position">1</property>
1565+ </packing>
1566+ </child>
1567+ </object>
1568+ <packing>
1569+ <property name="expand">False</property>
1570+ <property name="fill">True</property>
1571+ <property name="pack_type">end</property>
1572+ <property name="position">1</property>
1573+ </packing>
1574+ </child>
1575+ </object>
1576+</interface>
1577
1578=== added file 'data/gtk/overview.ui'
1579--- data/gtk/overview.ui 1970-01-01 00:00:00 +0000
1580+++ data/gtk/overview.ui 2011-07-22 21:53:24 +0000
1581@@ -0,0 +1,333 @@
1582+<?xml version="1.0" encoding="UTF-8"?>
1583+<interface>
1584+ <requires lib="gtk+" version="2.22"/>
1585+ <!-- interface-naming-policy project-wide -->
1586+ <object class="GtkVBox" id="itself">
1587+ <property name="visible">True</property>
1588+ <property name="can_focus">False</property>
1589+ <child>
1590+ <object class="GtkEventBox" id="eventbox1">
1591+ <property name="visible">True</property>
1592+ <property name="can_focus">False</property>
1593+ <child>
1594+ <object class="GtkImage" id="banner">
1595+ <property name="visible">True</property>
1596+ <property name="can_focus">False</property>
1597+ <property name="xpad">12</property>
1598+ <property name="ypad">12</property>
1599+ </object>
1600+ </child>
1601+ </object>
1602+ <packing>
1603+ <property name="expand">True</property>
1604+ <property name="fill">True</property>
1605+ <property name="position">0</property>
1606+ </packing>
1607+ </child>
1608+ <child>
1609+ <object class="GtkLabel" id="label7">
1610+ <property name="visible">True</property>
1611+ <property name="can_focus">False</property>
1612+ <property name="label" translatable="yes">&lt;span font="24" foreground="#4d4d4d"&gt;The Power of Your Personal Cloud&lt;/span&gt;</property>
1613+ <property name="use_markup">True</property>
1614+ </object>
1615+ <packing>
1616+ <property name="expand">True</property>
1617+ <property name="fill">True</property>
1618+ <property name="position">1</property>
1619+ </packing>
1620+ </child>
1621+ <child>
1622+ <object class="GtkHBox" id="hbox1">
1623+ <property name="visible">True</property>
1624+ <property name="can_focus">False</property>
1625+ <property name="border_width">12</property>
1626+ <child>
1627+ <object class="GtkTable" id="table1">
1628+ <property name="visible">True</property>
1629+ <property name="can_focus">False</property>
1630+ <property name="n_rows">4</property>
1631+ <property name="n_columns">2</property>
1632+ <property name="column_spacing">10</property>
1633+ <child>
1634+ <object class="GtkImage" id="files_icon">
1635+ <property name="visible">True</property>
1636+ <property name="can_focus">False</property>
1637+ </object>
1638+ <packing>
1639+ <property name="x_options">GTK_FILL</property>
1640+ <property name="y_options">GTK_FILL</property>
1641+ </packing>
1642+ </child>
1643+ <child>
1644+ <object class="GtkImage" id="music_stream_icon">
1645+ <property name="visible">True</property>
1646+ <property name="can_focus">False</property>
1647+ </object>
1648+ <packing>
1649+ <property name="top_attach">1</property>
1650+ <property name="bottom_attach">2</property>
1651+ <property name="x_options">GTK_FILL</property>
1652+ <property name="y_options">GTK_FILL</property>
1653+ </packing>
1654+ </child>
1655+ <child>
1656+ <object class="GtkImage" id="contacts_icon">
1657+ <property name="visible">True</property>
1658+ <property name="can_focus">False</property>
1659+ </object>
1660+ <packing>
1661+ <property name="top_attach">2</property>
1662+ <property name="bottom_attach">3</property>
1663+ <property name="x_options">GTK_FILL</property>
1664+ <property name="y_options">GTK_FILL</property>
1665+ </packing>
1666+ </child>
1667+ <child>
1668+ <object class="GtkImage" id="notes_icon">
1669+ <property name="visible">True</property>
1670+ <property name="can_focus">False</property>
1671+ </object>
1672+ <packing>
1673+ <property name="top_attach">3</property>
1674+ <property name="bottom_attach">4</property>
1675+ <property name="x_options">GTK_FILL</property>
1676+ <property name="y_options">GTK_FILL</property>
1677+ </packing>
1678+ </child>
1679+ <child>
1680+ <object class="GtkLabel" id="label3">
1681+ <property name="visible">True</property>
1682+ <property name="can_focus">False</property>
1683+ <property name="xalign">0</property>
1684+ <property name="label" translatable="yes">Files Anywhere
1685+&lt;span foreground="#909090"&gt;Back up and access your files from Ubuntu, Windows, Web or Mobile&lt;/span&gt;</property>
1686+ <property name="use_markup">True</property>
1687+ <property name="wrap">True</property>
1688+ </object>
1689+ <packing>
1690+ <property name="left_attach">1</property>
1691+ <property name="right_attach">2</property>
1692+ </packing>
1693+ </child>
1694+ <child>
1695+ <object class="GtkLabel" id="label4">
1696+ <property name="visible">True</property>
1697+ <property name="can_focus">False</property>
1698+ <property name="xalign">0</property>
1699+ <property name="label" translatable="yes">Keep Connected
1700+&lt;span foreground="#909090"&gt;Unify your contacts across Desktop, Mobile and Web&lt;/span&gt;</property>
1701+ <property name="use_markup">True</property>
1702+ <property name="wrap">True</property>
1703+ </object>
1704+ <packing>
1705+ <property name="left_attach">1</property>
1706+ <property name="right_attach">2</property>
1707+ <property name="top_attach">2</property>
1708+ <property name="bottom_attach">3</property>
1709+ </packing>
1710+ </child>
1711+ <child>
1712+ <object class="GtkLabel" id="label5">
1713+ <property name="visible">True</property>
1714+ <property name="can_focus">False</property>
1715+ <property name="xalign">0</property>
1716+ <property name="label" translatable="yes">Rock Out
1717+&lt;span foreground="#909090"&gt;Your entire collection follows you around with music streaming to Android and iPhone&lt;/span&gt;</property>
1718+ <property name="use_markup">True</property>
1719+ <property name="wrap">True</property>
1720+ </object>
1721+ <packing>
1722+ <property name="left_attach">1</property>
1723+ <property name="right_attach">2</property>
1724+ <property name="top_attach">1</property>
1725+ <property name="bottom_attach">2</property>
1726+ </packing>
1727+ </child>
1728+ <child>
1729+ <object class="GtkLabel" id="label6">
1730+ <property name="visible">True</property>
1731+ <property name="can_focus">False</property>
1732+ <property name="xalign">0</property>
1733+ <property name="label" translatable="yes">Stay Productive
1734+&lt;span foreground="#909090"&gt;Keep your Firefox bookmarks and Tomboy notes synced&lt;/span&gt;</property>
1735+ <property name="use_markup">True</property>
1736+ <property name="wrap">True</property>
1737+ </object>
1738+ <packing>
1739+ <property name="left_attach">1</property>
1740+ <property name="right_attach">2</property>
1741+ <property name="top_attach">3</property>
1742+ <property name="bottom_attach">4</property>
1743+ </packing>
1744+ </child>
1745+ </object>
1746+ <packing>
1747+ <property name="expand">True</property>
1748+ <property name="fill">True</property>
1749+ <property name="position">0</property>
1750+ </packing>
1751+ </child>
1752+ <child>
1753+ <object class="GtkVBox" id="vbox2">
1754+ <property name="visible">True</property>
1755+ <property name="can_focus">False</property>
1756+ <child>
1757+ <object class="GtkLabel" id="warning_label">
1758+ <property name="visible">True</property>
1759+ <property name="can_focus">False</property>
1760+ <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property>
1761+ <property name="wrap">True</property>
1762+ </object>
1763+ <packing>
1764+ <property name="expand">False</property>
1765+ <property name="fill">True</property>
1766+ <property name="position">0</property>
1767+ </packing>
1768+ </child>
1769+ <child>
1770+ <object class="GtkAlignment" id="alignment2">
1771+ <property name="visible">True</property>
1772+ <property name="can_focus">False</property>
1773+ <property name="xscale">0</property>
1774+ <property name="yscale">0</property>
1775+ <child>
1776+ <object class="GtkVBox" id="vbox3">
1777+ <property name="visible">True</property>
1778+ <property name="can_focus">False</property>
1779+ <property name="spacing">10</property>
1780+ <child>
1781+ <object class="GtkButton" id="learn_more_button">
1782+ <property name="visible">True</property>
1783+ <property name="can_focus">True</property>
1784+ <property name="receives_default">True</property>
1785+ <property name="use_action_appearance">False</property>
1786+ <signal name="clicked" handler="on_learn_more_button_clicked" swapped="no"/>
1787+ <child>
1788+ <object class="GtkVBox" id="vbox5">
1789+ <property name="visible">True</property>
1790+ <property name="can_focus">False</property>
1791+ <child>
1792+ <object class="GtkImage" id="image5">
1793+ <property name="visible">True</property>
1794+ <property name="can_focus">False</property>
1795+ <property name="pixel_size">55</property>
1796+ <property name="icon_name">ubuntuone</property>
1797+ </object>
1798+ <packing>
1799+ <property name="expand">True</property>
1800+ <property name="fill">True</property>
1801+ <property name="position">0</property>
1802+ </packing>
1803+ </child>
1804+ <child>
1805+ <object class="GtkLabel" id="label8">
1806+ <property name="visible">True</property>
1807+ <property name="can_focus">False</property>
1808+ <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;Learn More&lt;/span&gt;</property>
1809+ <property name="use_markup">True</property>
1810+ </object>
1811+ <packing>
1812+ <property name="expand">True</property>
1813+ <property name="fill">True</property>
1814+ <property name="position">1</property>
1815+ </packing>
1816+ </child>
1817+ </object>
1818+ </child>
1819+ </object>
1820+ <packing>
1821+ <property name="expand">True</property>
1822+ <property name="fill">True</property>
1823+ <property name="position">0</property>
1824+ </packing>
1825+ </child>
1826+ <child>
1827+ <object class="GtkButton" id="join_now_button">
1828+ <property name="visible">True</property>
1829+ <property name="can_focus">True</property>
1830+ <property name="can_default">True</property>
1831+ <property name="receives_default">True</property>
1832+ <property name="use_action_appearance">False</property>
1833+ <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/>
1834+ <child>
1835+ <object class="GtkVBox" id="vbox4">
1836+ <property name="visible">True</property>
1837+ <property name="can_focus">False</property>
1838+ <property name="spacing">5</property>
1839+ <child>
1840+ <object class="GtkLabel" id="label1">
1841+ <property name="visible">True</property>
1842+ <property name="can_focus">False</property>
1843+ <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;Join now&lt;/span&gt;</property>
1844+ <property name="use_markup">True</property>
1845+ </object>
1846+ <packing>
1847+ <property name="expand">True</property>
1848+ <property name="fill">True</property>
1849+ <property name="position">0</property>
1850+ </packing>
1851+ </child>
1852+ <child>
1853+ <object class="GtkLabel" id="label2">
1854+ <property name="visible">True</property>
1855+ <property name="can_focus">False</property>
1856+ <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;2GB of free storage&lt;/span&gt;</property>
1857+ <property name="use_markup">True</property>
1858+ </object>
1859+ <packing>
1860+ <property name="expand">True</property>
1861+ <property name="fill">True</property>
1862+ <property name="position">1</property>
1863+ </packing>
1864+ </child>
1865+ </object>
1866+ </child>
1867+ </object>
1868+ <packing>
1869+ <property name="expand">False</property>
1870+ <property name="fill">True</property>
1871+ <property name="position">1</property>
1872+ </packing>
1873+ </child>
1874+ <child>
1875+ <object class="GtkLinkButton" id="connect_button">
1876+ <property name="label" translatable="yes">I already have an account!</property>
1877+ <property name="visible">True</property>
1878+ <property name="can_focus">True</property>
1879+ <property name="receives_default">True</property>
1880+ <property name="use_action_appearance">False</property>
1881+ <property name="relief">none</property>
1882+ <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/>
1883+ </object>
1884+ <packing>
1885+ <property name="expand">False</property>
1886+ <property name="fill">False</property>
1887+ <property name="position">2</property>
1888+ </packing>
1889+ </child>
1890+ </object>
1891+ </child>
1892+ </object>
1893+ <packing>
1894+ <property name="expand">True</property>
1895+ <property name="fill">True</property>
1896+ <property name="position">1</property>
1897+ </packing>
1898+ </child>
1899+ </object>
1900+ <packing>
1901+ <property name="expand">True</property>
1902+ <property name="fill">True</property>
1903+ <property name="position">1</property>
1904+ </packing>
1905+ </child>
1906+ </object>
1907+ <packing>
1908+ <property name="expand">True</property>
1909+ <property name="fill">True</property>
1910+ <property name="position">2</property>
1911+ </packing>
1912+ </child>
1913+ </object>
1914+</interface>
1915
1916=== added file 'data/gtk/services.ui'
1917--- data/gtk/services.ui 1970-01-01 00:00:00 +0000
1918+++ data/gtk/services.ui 2011-07-22 21:53:24 +0000
1919@@ -0,0 +1,387 @@
1920+<?xml version="1.0" encoding="UTF-8"?>
1921+<interface>
1922+ <requires lib="gtk+" version="2.22"/>
1923+ <!-- interface-naming-policy project-wide -->
1924+ <object class="GtkVBox" id="itself">
1925+ <property name="visible">True</property>
1926+ <property name="can_focus">False</property>
1927+ <child>
1928+ <object class="GtkScrolledWindow" id="scrolledwindow1">
1929+ <property name="visible">True</property>
1930+ <property name="can_focus">True</property>
1931+ <property name="hscrollbar_policy">automatic</property>
1932+ <property name="vscrollbar_policy">automatic</property>
1933+ <child>
1934+ <object class="GtkViewport" id="viewport1">
1935+ <property name="visible">True</property>
1936+ <property name="can_focus">False</property>
1937+ <property name="resize_mode">queue</property>
1938+ <property name="shadow_type">none</property>
1939+ <child>
1940+ <object class="GtkAlignment" id="alignment1">
1941+ <property name="visible">True</property>
1942+ <property name="can_focus">False</property>
1943+ <property name="left_padding">5</property>
1944+ <property name="right_padding">5</property>
1945+ <child>
1946+ <object class="GtkVBox" id="vbox1">
1947+ <property name="visible">True</property>
1948+ <property name="can_focus">False</property>
1949+ <property name="spacing">5</property>
1950+ <child>
1951+ <object class="GtkFrame" id="files">
1952+ <property name="visible">True</property>
1953+ <property name="can_focus">False</property>
1954+ <property name="label_xalign">0</property>
1955+ <property name="shadow_type">out</property>
1956+ <child>
1957+ <object class="GtkAlignment" id="alignment2">
1958+ <property name="visible">True</property>
1959+ <property name="can_focus">False</property>
1960+ <child>
1961+ <object class="GtkHBox" id="hbox2">
1962+ <property name="visible">True</property>
1963+ <property name="can_focus">False</property>
1964+ <property name="border_width">5</property>
1965+ <child>
1966+ <object class="GtkTable" id="table1">
1967+ <property name="visible">True</property>
1968+ <property name="can_focus">False</property>
1969+ <property name="n_rows">3</property>
1970+ <property name="n_columns">3</property>
1971+ <property name="column_spacing">5</property>
1972+ <property name="row_spacing">5</property>
1973+ <child>
1974+ <object class="GtkCheckButton" id="file_sync_check">
1975+ <property name="visible">True</property>
1976+ <property name="can_focus">True</property>
1977+ <property name="receives_default">False</property>
1978+ <property name="use_action_appearance">False</property>
1979+ <property name="draw_indicator">True</property>
1980+ </object>
1981+ </child>
1982+ <child>
1983+ <object class="GtkImage" id="files_icon">
1984+ <property name="visible">True</property>
1985+ <property name="can_focus">False</property>
1986+ <property name="xpad">5</property>
1987+ </object>
1988+ <packing>
1989+ <property name="left_attach">1</property>
1990+ <property name="right_attach">2</property>
1991+ </packing>
1992+ </child>
1993+ <child>
1994+ <object class="GtkLabel" id="label1">
1995+ <property name="visible">True</property>
1996+ <property name="can_focus">False</property>
1997+ <property name="xalign">0</property>
1998+ <property name="label" translatable="yes">Enable File Sync</property>
1999+ </object>
2000+ <packing>
2001+ <property name="left_attach">2</property>
2002+ <property name="right_attach">3</property>
2003+ </packing>
2004+ </child>
2005+ <child>
2006+ <object class="GtkLabel" id="label2">
2007+ <property name="visible">True</property>
2008+ <property name="can_focus">False</property>
2009+ <property name="xalign">0</property>
2010+ <property name="yalign">0</property>
2011+ <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
2012+
2013+Simply drag and drop any file or folder to your Ubuntu One folder on this computer&lt;/span&gt;</property>
2014+ <property name="use_markup">True</property>
2015+ <property name="wrap">True</property>
2016+ <property name="width_chars">35</property>
2017+ </object>
2018+ <packing>
2019+ <property name="left_attach">2</property>
2020+ <property name="right_attach">3</property>
2021+ <property name="top_attach">1</property>
2022+ <property name="bottom_attach">2</property>
2023+ </packing>
2024+ </child>
2025+ <child>
2026+ <object class="GtkHButtonBox" id="hbuttonbox1">
2027+ <property name="visible">True</property>
2028+ <property name="can_focus">False</property>
2029+ <child>
2030+ <object class="GtkButton" id="file_sync_button">
2031+ <property name="label" translatable="yes">_Show me my Ubuntu One folder</property>
2032+ <property name="visible">True</property>
2033+ <property name="can_focus">True</property>
2034+ <property name="receives_default">True</property>
2035+ <property name="use_action_appearance">False</property>
2036+ <property name="use_underline">True</property>
2037+ <signal name="clicked" handler="on_file_sync_button_clicked" swapped="no"/>
2038+ </object>
2039+ <packing>
2040+ <property name="expand">False</property>
2041+ <property name="fill">False</property>
2042+ <property name="position">0</property>
2043+ </packing>
2044+ </child>
2045+ </object>
2046+ <packing>
2047+ <property name="left_attach">2</property>
2048+ <property name="right_attach">3</property>
2049+ <property name="top_attach">2</property>
2050+ <property name="bottom_attach">3</property>
2051+ </packing>
2052+ </child>
2053+ <child>
2054+ <placeholder/>
2055+ </child>
2056+ <child>
2057+ <placeholder/>
2058+ </child>
2059+ <child>
2060+ <placeholder/>
2061+ </child>
2062+ <child>
2063+ <placeholder/>
2064+ </child>
2065+ </object>
2066+ <packing>
2067+ <property name="expand">False</property>
2068+ <property name="fill">True</property>
2069+ <property name="position">0</property>
2070+ </packing>
2071+ </child>
2072+ <child>
2073+ <object class="GtkImage" id="files_example">
2074+ <property name="visible">True</property>
2075+ <property name="can_focus">False</property>
2076+ <property name="xpad">5</property>
2077+ <property name="ypad">5</property>
2078+ </object>
2079+ <packing>
2080+ <property name="expand">False</property>
2081+ <property name="fill">True</property>
2082+ <property name="pack_type">end</property>
2083+ <property name="position">1</property>
2084+ </packing>
2085+ </child>
2086+ </object>
2087+ </child>
2088+ </object>
2089+ </child>
2090+ <child type="label_item">
2091+ <placeholder/>
2092+ </child>
2093+ </object>
2094+ <packing>
2095+ <property name="expand">False</property>
2096+ <property name="fill">True</property>
2097+ <property name="position">0</property>
2098+ </packing>
2099+ </child>
2100+ <child>
2101+ <object class="GtkFrame" id="replications">
2102+ <property name="visible">True</property>
2103+ <property name="can_focus">False</property>
2104+ <property name="label_xalign">0</property>
2105+ <property name="shadow_type">out</property>
2106+ <child>
2107+ <object class="GtkAlignment" id="alignment3">
2108+ <property name="visible">True</property>
2109+ <property name="can_focus">False</property>
2110+ <child>
2111+ <object class="GtkHBox" id="hbox3">
2112+ <property name="visible">True</property>
2113+ <property name="can_focus">False</property>
2114+ <property name="border_width">5</property>
2115+ <child>
2116+ <object class="GtkVBox" id="contacts">
2117+ <property name="visible">True</property>
2118+ <property name="can_focus">False</property>
2119+ <child>
2120+ <object class="GtkTable" id="contacts_sync">
2121+ <property name="visible">True</property>
2122+ <property name="can_focus">False</property>
2123+ <property name="n_rows">2</property>
2124+ <property name="n_columns">3</property>
2125+ <property name="row_spacing">5</property>
2126+ <child>
2127+ <object class="GtkCheckButton" id="contacts_check">
2128+ <property name="visible">True</property>
2129+ <property name="can_focus">True</property>
2130+ <property name="receives_default">False</property>
2131+ <property name="use_action_appearance">False</property>
2132+ <property name="draw_indicator">True</property>
2133+ </object>
2134+ </child>
2135+ <child>
2136+ <object class="GtkImage" id="contacts_icon">
2137+ <property name="visible">True</property>
2138+ <property name="can_focus">False</property>
2139+ <property name="xpad">5</property>
2140+ </object>
2141+ <packing>
2142+ <property name="left_attach">1</property>
2143+ <property name="right_attach">2</property>
2144+ </packing>
2145+ </child>
2146+ <child>
2147+ <object class="GtkLabel" id="label4">
2148+ <property name="visible">True</property>
2149+ <property name="can_focus">False</property>
2150+ <property name="xalign">0</property>
2151+ <property name="label" translatable="yes">Enable Contacts Sync</property>
2152+ </object>
2153+ <packing>
2154+ <property name="left_attach">2</property>
2155+ <property name="right_attach">3</property>
2156+ </packing>
2157+ </child>
2158+ <child>
2159+ <object class="GtkLabel" id="label5">
2160+ <property name="visible">True</property>
2161+ <property name="can_focus">True</property>
2162+ <property name="xalign">0</property>
2163+ <property name="yalign">0</property>
2164+ <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>
2165+ <property name="use_markup">True</property>
2166+ <property name="wrap">True</property>
2167+ <property name="width_chars">35</property>
2168+ </object>
2169+ <packing>
2170+ <property name="left_attach">2</property>
2171+ <property name="right_attach">3</property>
2172+ <property name="top_attach">1</property>
2173+ <property name="bottom_attach">2</property>
2174+ </packing>
2175+ </child>
2176+ <child>
2177+ <placeholder/>
2178+ </child>
2179+ <child>
2180+ <placeholder/>
2181+ </child>
2182+ </object>
2183+ <packing>
2184+ <property name="expand">False</property>
2185+ <property name="fill">True</property>
2186+ <property name="position">0</property>
2187+ </packing>
2188+ </child>
2189+ </object>
2190+ <packing>
2191+ <property name="expand">False</property>
2192+ <property name="fill">True</property>
2193+ <property name="position">0</property>
2194+ </packing>
2195+ </child>
2196+ <child>
2197+ <object class="GtkVBox" id="bookmarks">
2198+ <property name="visible">True</property>
2199+ <property name="can_focus">False</property>
2200+ <child>
2201+ <object class="GtkTable" id="bookmarks_sync">
2202+ <property name="visible">True</property>
2203+ <property name="can_focus">False</property>
2204+ <property name="n_rows">2</property>
2205+ <property name="n_columns">3</property>
2206+ <property name="row_spacing">5</property>
2207+ <child>
2208+ <object class="GtkCheckButton" id="bookmarks_check">
2209+ <property name="visible">True</property>
2210+ <property name="can_focus">True</property>
2211+ <property name="receives_default">False</property>
2212+ <property name="use_action_appearance">False</property>
2213+ <property name="draw_indicator">True</property>
2214+ </object>
2215+ </child>
2216+ <child>
2217+ <object class="GtkImage" id="bookmarks_icon">
2218+ <property name="visible">True</property>
2219+ <property name="can_focus">False</property>
2220+ <property name="xpad">5</property>
2221+ </object>
2222+ <packing>
2223+ <property name="left_attach">1</property>
2224+ <property name="right_attach">2</property>
2225+ </packing>
2226+ </child>
2227+ <child>
2228+ <object class="GtkLabel" id="label6">
2229+ <property name="visible">True</property>
2230+ <property name="can_focus">False</property>
2231+ <property name="xalign">0</property>
2232+ <property name="label" translatable="yes">Enable Bookmarks Sync</property>
2233+ </object>
2234+ <packing>
2235+ <property name="left_attach">2</property>
2236+ <property name="right_attach">3</property>
2237+ </packing>
2238+ </child>
2239+ <child>
2240+ <object class="GtkLabel" id="label7">
2241+ <property name="visible">True</property>
2242+ <property name="can_focus">False</property>
2243+ <property name="xalign">0</property>
2244+ <property name="yalign">0</property>
2245+ <property name="label" translatable="yes">&lt;span font_size="small"&gt;Bookmarks sync works with Firefox&lt;/span&gt;</property>
2246+ <property name="use_markup">True</property>
2247+ <property name="wrap">True</property>
2248+ <property name="width_chars">30</property>
2249+ </object>
2250+ <packing>
2251+ <property name="left_attach">2</property>
2252+ <property name="right_attach">3</property>
2253+ <property name="top_attach">1</property>
2254+ <property name="bottom_attach">2</property>
2255+ </packing>
2256+ </child>
2257+ <child>
2258+ <placeholder/>
2259+ </child>
2260+ <child>
2261+ <placeholder/>
2262+ </child>
2263+ </object>
2264+ <packing>
2265+ <property name="expand">False</property>
2266+ <property name="fill">True</property>
2267+ <property name="position">0</property>
2268+ </packing>
2269+ </child>
2270+ </object>
2271+ <packing>
2272+ <property name="expand">False</property>
2273+ <property name="fill">True</property>
2274+ <property name="pack_type">end</property>
2275+ <property name="position">1</property>
2276+ </packing>
2277+ </child>
2278+ </object>
2279+ </child>
2280+ </object>
2281+ </child>
2282+ <child type="label_item">
2283+ <placeholder/>
2284+ </child>
2285+ </object>
2286+ <packing>
2287+ <property name="expand">False</property>
2288+ <property name="fill">True</property>
2289+ <property name="position">1</property>
2290+ </packing>
2291+ </child>
2292+ </object>
2293+ </child>
2294+ </object>
2295+ </child>
2296+ </object>
2297+ </child>
2298+ </object>
2299+ <packing>
2300+ <property name="expand">True</property>
2301+ <property name="fill">True</property>
2302+ <property name="position">0</property>
2303+ </packing>
2304+ </child>
2305+ </object>
2306+</interface>
2307
2308=== added file 'data/gtk/volumes.ui'
2309--- data/gtk/volumes.ui 1970-01-01 00:00:00 +0000
2310+++ data/gtk/volumes.ui 2011-07-22 21:53:24 +0000
2311@@ -0,0 +1,98 @@
2312+<?xml version="1.0" encoding="UTF-8"?>
2313+<interface>
2314+ <requires lib="gtk+" version="2.22"/>
2315+ <!-- interface-naming-policy project-wide -->
2316+ <object class="GtkAlignment" id="itself">
2317+ <property name="visible">True</property>
2318+ <property name="can_focus">False</property>
2319+ <child>
2320+ <object class="GtkScrolledWindow" id="scrolledwindow1">
2321+ <property name="visible">True</property>
2322+ <property name="can_focus">True</property>
2323+ <property name="hscrollbar_policy">automatic</property>
2324+ <property name="vscrollbar_policy">automatic</property>
2325+ <property name="shadow_type">in</property>
2326+ <child>
2327+ <object class="GtkTreeView" id="volumes_view">
2328+ <property name="visible">True</property>
2329+ <property name="can_focus">True</property>
2330+ <property name="model">volumes_store</property>
2331+ <property name="rules_hint">True</property>
2332+ <property name="tooltip_column">0</property>
2333+ <signal name="row-activated" handler="on_volumes_view_row_activated" swapped="no"/>
2334+ <child>
2335+ <object class="GtkTreeViewColumn" id="treeviewcolumn2">
2336+ <property name="resizable">True</property>
2337+ <property name="sizing">autosize</property>
2338+ <property name="expand">True</property>
2339+ <child>
2340+ <object class="GtkCellRendererPixbuf" id="cellrendererpixbuf1"/>
2341+ <attributes>
2342+ <attribute name="sensitive">1</attribute>
2343+ <attribute name="icon-name">2</attribute>
2344+ <attribute name="stock-size">5</attribute>
2345+ </attributes>
2346+ </child>
2347+ <child>
2348+ <object class="GtkCellRendererText" id="text_renderer">
2349+ <property name="ellipsize">end</property>
2350+ <property name="width_chars">80</property>
2351+ </object>
2352+ <attributes>
2353+ <attribute name="markup">0</attribute>
2354+ <attribute name="text">0</attribute>
2355+ </attributes>
2356+ </child>
2357+ </object>
2358+ </child>
2359+ <child>
2360+ <object class="GtkTreeViewColumn" id="treeviewcolumn3">
2361+ <property name="sizing">autosize</property>
2362+ <property name="title" translatable="yes">Sync locally?</property>
2363+ <child>
2364+ <object class="GtkCellRendererToggle" id="cellrenderertoggle1">
2365+ <property name="indicator_size">15</property>
2366+ <signal name="toggled" handler="on_subscribed_toggled" swapped="no"/>
2367+ </object>
2368+ <attributes>
2369+ <attribute name="sensitive">4</attribute>
2370+ <attribute name="visible">3</attribute>
2371+ <attribute name="active">1</attribute>
2372+ </attributes>
2373+ </child>
2374+ <child>
2375+ <object class="GtkCellRendererText" id="cellrenderertext1">
2376+ <property name="visible">False</property>
2377+ </object>
2378+ <attributes>
2379+ <attribute name="text">6</attribute>
2380+ </attributes>
2381+ </child>
2382+ </object>
2383+ </child>
2384+ </object>
2385+ </child>
2386+ </object>
2387+ </child>
2388+ </object>
2389+ <object class="GtkTreeStore" id="volumes_store">
2390+ <columns>
2391+ <!-- column-name description -->
2392+ <column type="gchararray"/>
2393+ <!-- column-name subscribed -->
2394+ <column type="gboolean"/>
2395+ <!-- column-name icon-name -->
2396+ <column type="gchararray"/>
2397+ <!-- column-name subscribed-visible -->
2398+ <column type="gboolean"/>
2399+ <!-- column-name subscribed-sensitive -->
2400+ <column type="gboolean"/>
2401+ <!-- column-name icon-size -->
2402+ <column type="gint"/>
2403+ <!-- column-name identifier -->
2404+ <column type="gchararray"/>
2405+ <!-- column-name path -->
2406+ <column type="gchararray"/>
2407+ </columns>
2408+ </object>
2409+</interface>
2410
2411=== removed file 'data/install.ui'
2412--- data/install.ui 2011-03-23 16:06:41 +0000
2413+++ data/install.ui 1970-01-01 00:00:00 +0000
2414@@ -1,57 +0,0 @@
2415-<?xml version="1.0" encoding="UTF-8"?>
2416-<interface>
2417- <requires lib="gtk+" version="2.22"/>
2418- <!-- interface-naming-policy project-wide -->
2419- <object class="GtkImage" id="image1">
2420- <property name="visible">True</property>
2421- <property name="can_focus">False</property>
2422- <property name="stock">gtk-ok</property>
2423- </object>
2424- <object class="GtkVBox" id="itself">
2425- <property name="visible">True</property>
2426- <property name="can_focus">False</property>
2427- <property name="border_width">10</property>
2428- <property name="spacing">10</property>
2429- <child>
2430- <object class="GtkLabel" id="install_label">
2431- <property name="visible">True</property>
2432- <property name="can_focus">False</property>
2433- <property name="label">label</property>
2434- <property name="wrap">True</property>
2435- </object>
2436- <packing>
2437- <property name="expand">True</property>
2438- <property name="fill">True</property>
2439- <property name="position">0</property>
2440- </packing>
2441- </child>
2442- <child>
2443- <object class="GtkHButtonBox" id="install_button_box">
2444- <property name="visible">True</property>
2445- <property name="can_focus">False</property>
2446- <child>
2447- <object class="GtkButton" id="install_button">
2448- <property name="label" translatable="yes">_Install now</property>
2449- <property name="visible">True</property>
2450- <property name="can_focus">True</property>
2451- <property name="receives_default">True</property>
2452- <property name="use_action_appearance">False</property>
2453- <property name="image">image1</property>
2454- <property name="use_underline">True</property>
2455- <signal name="clicked" handler="on_install_button_clicked" swapped="no"/>
2456- </object>
2457- <packing>
2458- <property name="expand">False</property>
2459- <property name="fill">False</property>
2460- <property name="position">0</property>
2461- </packing>
2462- </child>
2463- </object>
2464- <packing>
2465- <property name="expand">False</property>
2466- <property name="fill">True</property>
2467- <property name="position">1</property>
2468- </packing>
2469- </child>
2470- </object>
2471-</interface>
2472
2473=== removed file 'data/management.ui'
2474--- data/management.ui 2011-03-10 02:59:44 +0000
2475+++ data/management.ui 1970-01-01 00:00:00 +0000
2476@@ -1,336 +0,0 @@
2477-<?xml version="1.0" encoding="UTF-8"?>
2478-<interface>
2479- <requires lib="gtk+" version="2.22"/>
2480- <!-- interface-naming-policy project-wide -->
2481- <object class="GtkVBox" id="itself">
2482- <property name="visible">True</property>
2483- <property name="can_focus">False</property>
2484- <child>
2485- <object class="GtkEventBox" id="header">
2486- <property name="visible">True</property>
2487- <property name="can_focus">False</property>
2488- <child>
2489- <object class="GtkVBox" id="vbox2">
2490- <property name="visible">True</property>
2491- <property name="can_focus">False</property>
2492- <child>
2493- <object class="GtkHBox" id="status_box">
2494- <property name="visible">True</property>
2495- <property name="can_focus">False</property>
2496- <property name="border_width">10</property>
2497- <property name="spacing">10</property>
2498- <child>
2499- <object class="GtkVBox" id="quota_box">
2500- <property name="visible">True</property>
2501- <property name="can_focus">False</property>
2502- <property name="spacing">5</property>
2503- <child>
2504- <object class="GtkProgressBar" id="quota_progressbar">
2505- <property name="visible">True</property>
2506- <property name="can_focus">False</property>
2507- </object>
2508- <packing>
2509- <property name="expand">True</property>
2510- <property name="fill">True</property>
2511- <property name="position">0</property>
2512- </packing>
2513- </child>
2514- </object>
2515- <packing>
2516- <property name="expand">False</property>
2517- <property name="fill">True</property>
2518- <property name="position">0</property>
2519- </packing>
2520- </child>
2521- </object>
2522- <packing>
2523- <property name="expand">False</property>
2524- <property name="fill">True</property>
2525- <property name="position">0</property>
2526- </packing>
2527- </child>
2528- <child>
2529- <object class="GtkHBox" id="hbox2">
2530- <property name="visible">True</property>
2531- <property name="can_focus">False</property>
2532- <child>
2533- <object class="GtkHSeparator" id="hseparator1">
2534- <property name="visible">True</property>
2535- <property name="can_focus">False</property>
2536- </object>
2537- <packing>
2538- <property name="expand">True</property>
2539- <property name="fill">True</property>
2540- <property name="position">0</property>
2541- </packing>
2542- </child>
2543- <child>
2544- <object class="GtkHButtonBox" id="hbuttonbox1">
2545- <property name="visible">True</property>
2546- <property name="can_focus">False</property>
2547- <property name="layout_style">center</property>
2548- <child>
2549- <object class="GtkRadioButton" id="dashboard_button">
2550- <property name="label" translatable="yes">Account</property>
2551- <property name="visible">True</property>
2552- <property name="can_focus">True</property>
2553- <property name="receives_default">False</property>
2554- <property name="use_action_appearance">False</property>
2555- <property name="active">True</property>
2556- <property name="draw_indicator">False</property>
2557- </object>
2558- <packing>
2559- <property name="expand">False</property>
2560- <property name="fill">False</property>
2561- <property name="position">0</property>
2562- </packing>
2563- </child>
2564- <child>
2565- <object class="GtkRadioButton" id="volumes_button">
2566- <property name="label" translatable="yes">Cloud Folders</property>
2567- <property name="visible">True</property>
2568- <property name="can_focus">True</property>
2569- <property name="receives_default">False</property>
2570- <property name="use_action_appearance">False</property>
2571- <property name="draw_indicator">False</property>
2572- <property name="group">dashboard_button</property>
2573- </object>
2574- <packing>
2575- <property name="expand">False</property>
2576- <property name="fill">False</property>
2577- <property name="position">1</property>
2578- </packing>
2579- </child>
2580- <child>
2581- <object class="GtkRadioButton" id="shares_button">
2582- <property name="label" translatable="yes">Shares</property>
2583- <property name="can_focus">True</property>
2584- <property name="receives_default">False</property>
2585- <property name="use_action_appearance">False</property>
2586- <property name="draw_indicator">False</property>
2587- <property name="group">dashboard_button</property>
2588- </object>
2589- <packing>
2590- <property name="expand">False</property>
2591- <property name="fill">False</property>
2592- <property name="position">2</property>
2593- </packing>
2594- </child>
2595- <child>
2596- <object class="GtkRadioButton" id="devices_button">
2597- <property name="label" translatable="yes">Devices</property>
2598- <property name="visible">True</property>
2599- <property name="can_focus">True</property>
2600- <property name="receives_default">False</property>
2601- <property name="use_action_appearance">False</property>
2602- <property name="draw_indicator">False</property>
2603- <property name="group">dashboard_button</property>
2604- </object>
2605- <packing>
2606- <property name="expand">False</property>
2607- <property name="fill">False</property>
2608- <property name="position">3</property>
2609- </packing>
2610- </child>
2611- <child>
2612- <object class="GtkRadioButton" id="services_button">
2613- <property name="label" translatable="yes">Services</property>
2614- <property name="visible">True</property>
2615- <property name="can_focus">True</property>
2616- <property name="receives_default">False</property>
2617- <property name="use_action_appearance">False</property>
2618- <property name="draw_indicator">False</property>
2619- <property name="group">dashboard_button</property>
2620- </object>
2621- <packing>
2622- <property name="expand">False</property>
2623- <property name="fill">False</property>
2624- <property name="position">4</property>
2625- </packing>
2626- </child>
2627- </object>
2628- <packing>
2629- <property name="expand">False</property>
2630- <property name="fill">True</property>
2631- <property name="position">1</property>
2632- </packing>
2633- </child>
2634- <child>
2635- <object class="GtkHSeparator" id="hseparator2">
2636- <property name="visible">True</property>
2637- <property name="can_focus">False</property>
2638- </object>
2639- <packing>
2640- <property name="expand">True</property>
2641- <property name="fill">True</property>
2642- <property name="position">2</property>
2643- </packing>
2644- </child>
2645- </object>
2646- <packing>
2647- <property name="expand">False</property>
2648- <property name="fill">True</property>
2649- <property name="position">1</property>
2650- </packing>
2651- </child>
2652- </object>
2653- </child>
2654- </object>
2655- <packing>
2656- <property name="expand">False</property>
2657- <property name="fill">True</property>
2658- <property name="position">0</property>
2659- </packing>
2660- </child>
2661- <child>
2662- <object class="GtkNotebook" id="notebook">
2663- <property name="visible">True</property>
2664- <property name="can_focus">False</property>
2665- <property name="show_tabs">False</property>
2666- <property name="show_border">False</property>
2667- <property name="homogeneous">True</property>
2668- </object>
2669- <packing>
2670- <property name="expand">True</property>
2671- <property name="fill">True</property>
2672- <property name="position">1</property>
2673- </packing>
2674- </child>
2675- <child>
2676- <object class="GtkHBox" id="hbox1">
2677- <property name="visible">True</property>
2678- <property name="can_focus">False</property>
2679- <property name="border_width">12</property>
2680- <child>
2681- <object class="GtkAlignment" id="alignment3">
2682- <property name="visible">True</property>
2683- <property name="can_focus">False</property>
2684- <property name="yalign">1</property>
2685- <property name="yscale">0</property>
2686- <child>
2687- <object class="GtkHButtonBox" id="hbuttonbox3">
2688- <property name="visible">True</property>
2689- <property name="can_focus">False</property>
2690- <property name="spacing">5</property>
2691- <property name="layout_style">start</property>
2692- <child>
2693- <object class="GtkLinkButton" id="linkbutton2">
2694- <property name="label" translatable="yes">Official Support</property>
2695- <property name="visible">True</property>
2696- <property name="can_focus">True</property>
2697- <property name="receives_default">True</property>
2698- <property name="use_action_appearance">False</property>
2699- <property name="relief">half</property>
2700- <property name="uri">https://one.ubuntu.com/support/</property>
2701- </object>
2702- <packing>
2703- <property name="expand">False</property>
2704- <property name="fill">False</property>
2705- <property name="position">0</property>
2706- </packing>
2707- </child>
2708- <child>
2709- <object class="GtkLinkButton" id="linkbutton4">
2710- <property name="label" translatable="yes">Community Support</property>
2711- <property name="visible">True</property>
2712- <property name="can_focus">True</property>
2713- <property name="receives_default">True</property>
2714- <property name="use_action_appearance">False</property>
2715- <property name="relief">half</property>
2716- <property name="uri">http://askubuntu.com/questions/tagged/ubuntu-one</property>
2717- </object>
2718- <packing>
2719- <property name="expand">False</property>
2720- <property name="fill">False</property>
2721- <property name="position">1</property>
2722- </packing>
2723- </child>
2724- </object>
2725- </child>
2726- </object>
2727- <packing>
2728- <property name="expand">False</property>
2729- <property name="fill">True</property>
2730- <property name="position">0</property>
2731- </packing>
2732- </child>
2733- <child>
2734- <object class="GtkHBox" id="hbox3">
2735- <property name="visible">True</property>
2736- <property name="can_focus">False</property>
2737- <child>
2738- <object class="GtkLabel" id="label4">
2739- <property name="visible">True</property>
2740- <property name="can_focus">False</property>
2741- <property name="label" translatable="yes">Talk to us on:</property>
2742- </object>
2743- <packing>
2744- <property name="expand">True</property>
2745- <property name="fill">True</property>
2746- <property name="position">0</property>
2747- </packing>
2748- </child>
2749- <child>
2750- <object class="GtkLinkButton" id="linkbutton5">
2751- <property name="visible">True</property>
2752- <property name="can_focus">True</property>
2753- <property name="receives_default">True</property>
2754- <property name="use_action_appearance">False</property>
2755- <property name="relief">none</property>
2756- <property name="uri">http://twitter.com/ubuntuone</property>
2757- <child>
2758- <object class="GtkImage" id="twitter">
2759- <property name="visible">True</property>
2760- <property name="can_focus">False</property>
2761- <property name="tooltip_text" translatable="yes">http://twitter.com/ubuntuone</property>
2762- <property name="pixbuf">twitter.png</property>
2763- </object>
2764- </child>
2765- </object>
2766- <packing>
2767- <property name="expand">False</property>
2768- <property name="fill">False</property>
2769- <property name="position">1</property>
2770- </packing>
2771- </child>
2772- <child>
2773- <object class="GtkLinkButton" id="linkbutton6">
2774- <property name="visible">True</property>
2775- <property name="can_focus">True</property>
2776- <property name="receives_default">True</property>
2777- <property name="use_action_appearance">False</property>
2778- <property name="relief">none</property>
2779- <property name="uri">http://www.facebook.com/ubuntuone</property>
2780- <child>
2781- <object class="GtkImage" id="facebook">
2782- <property name="visible">True</property>
2783- <property name="can_focus">False</property>
2784- <property name="tooltip_text" translatable="yes">http://www.facebook.com/ubuntuone</property>
2785- <property name="pixbuf">facebook.png</property>
2786- </object>
2787- </child>
2788- </object>
2789- <packing>
2790- <property name="expand">True</property>
2791- <property name="fill">True</property>
2792- <property name="position">2</property>
2793- </packing>
2794- </child>
2795- </object>
2796- <packing>
2797- <property name="expand">False</property>
2798- <property name="fill">True</property>
2799- <property name="pack_type">end</property>
2800- <property name="position">1</property>
2801- </packing>
2802- </child>
2803- </object>
2804- <packing>
2805- <property name="expand">False</property>
2806- <property name="fill">True</property>
2807- <property name="pack_type">end</property>
2808- <property name="position">1</property>
2809- </packing>
2810- </child>
2811- </object>
2812-</interface>
2813
2814=== removed file 'data/overview.ui'
2815--- data/overview.ui 2011-03-23 16:06:41 +0000
2816+++ data/overview.ui 1970-01-01 00:00:00 +0000
2817@@ -1,338 +0,0 @@
2818-<?xml version="1.0" encoding="UTF-8"?>
2819-<interface>
2820- <requires lib="gtk+" version="2.22"/>
2821- <!-- interface-naming-policy project-wide -->
2822- <object class="GtkVBox" id="itself">
2823- <property name="visible">True</property>
2824- <property name="can_focus">False</property>
2825- <child>
2826- <object class="GtkEventBox" id="eventbox1">
2827- <property name="visible">True</property>
2828- <property name="can_focus">False</property>
2829- <child>
2830- <object class="GtkImage" id="banner">
2831- <property name="visible">True</property>
2832- <property name="can_focus">False</property>
2833- <property name="xpad">12</property>
2834- <property name="ypad">12</property>
2835- <property name="pixbuf">overview.png</property>
2836- </object>
2837- </child>
2838- </object>
2839- <packing>
2840- <property name="expand">True</property>
2841- <property name="fill">True</property>
2842- <property name="position">0</property>
2843- </packing>
2844- </child>
2845- <child>
2846- <object class="GtkLabel" id="label7">
2847- <property name="visible">True</property>
2848- <property name="can_focus">False</property>
2849- <property name="label" translatable="yes">&lt;span font="24" foreground="#4d4d4d"&gt;The Power of Your Personal Cloud&lt;/span&gt;</property>
2850- <property name="use_markup">True</property>
2851- </object>
2852- <packing>
2853- <property name="expand">True</property>
2854- <property name="fill">True</property>
2855- <property name="position">1</property>
2856- </packing>
2857- </child>
2858- <child>
2859- <object class="GtkHBox" id="hbox1">
2860- <property name="visible">True</property>
2861- <property name="can_focus">False</property>
2862- <property name="border_width">12</property>
2863- <child>
2864- <object class="GtkTable" id="table1">
2865- <property name="visible">True</property>
2866- <property name="can_focus">False</property>
2867- <property name="n_rows">4</property>
2868- <property name="n_columns">2</property>
2869- <property name="column_spacing">10</property>
2870- <child>
2871- <object class="GtkImage" id="image1">
2872- <property name="visible">True</property>
2873- <property name="can_focus">False</property>
2874- <property name="pixbuf">files.png</property>
2875- </object>
2876- <packing>
2877- <property name="x_options">GTK_FILL</property>
2878- <property name="y_options">GTK_FILL</property>
2879- </packing>
2880- </child>
2881- <child>
2882- <object class="GtkImage" id="image2">
2883- <property name="visible">True</property>
2884- <property name="can_focus">False</property>
2885- <property name="pixbuf">music-stream.png</property>
2886- </object>
2887- <packing>
2888- <property name="top_attach">1</property>
2889- <property name="bottom_attach">2</property>
2890- <property name="x_options">GTK_FILL</property>
2891- <property name="y_options">GTK_FILL</property>
2892- </packing>
2893- </child>
2894- <child>
2895- <object class="GtkImage" id="image3">
2896- <property name="visible">True</property>
2897- <property name="can_focus">False</property>
2898- <property name="pixbuf">contacts.png</property>
2899- </object>
2900- <packing>
2901- <property name="top_attach">2</property>
2902- <property name="bottom_attach">3</property>
2903- <property name="x_options">GTK_FILL</property>
2904- <property name="y_options">GTK_FILL</property>
2905- </packing>
2906- </child>
2907- <child>
2908- <object class="GtkImage" id="image4">
2909- <property name="visible">True</property>
2910- <property name="can_focus">False</property>
2911- <property name="pixbuf">notes.png</property>
2912- </object>
2913- <packing>
2914- <property name="top_attach">3</property>
2915- <property name="bottom_attach">4</property>
2916- <property name="x_options">GTK_FILL</property>
2917- <property name="y_options">GTK_FILL</property>
2918- </packing>
2919- </child>
2920- <child>
2921- <object class="GtkLabel" id="label3">
2922- <property name="visible">True</property>
2923- <property name="can_focus">False</property>
2924- <property name="xalign">0</property>
2925- <property name="label" translatable="yes">Files Anywhere
2926-&lt;span foreground="#909090"&gt;Backup and access your files from Ubuntu, Windows, Web or Mobile&lt;/span&gt;</property>
2927- <property name="use_markup">True</property>
2928- <property name="wrap">True</property>
2929- </object>
2930- <packing>
2931- <property name="left_attach">1</property>
2932- <property name="right_attach">2</property>
2933- </packing>
2934- </child>
2935- <child>
2936- <object class="GtkLabel" id="label4">
2937- <property name="visible">True</property>
2938- <property name="can_focus">False</property>
2939- <property name="xalign">0</property>
2940- <property name="label" translatable="yes">Keep Connected
2941-&lt;span foreground="#909090"&gt;Unify your contacts across Desktop, Mobile and Web&lt;/span&gt;</property>
2942- <property name="use_markup">True</property>
2943- <property name="wrap">True</property>
2944- </object>
2945- <packing>
2946- <property name="left_attach">1</property>
2947- <property name="right_attach">2</property>
2948- <property name="top_attach">2</property>
2949- <property name="bottom_attach">3</property>
2950- </packing>
2951- </child>
2952- <child>
2953- <object class="GtkLabel" id="label5">
2954- <property name="visible">True</property>
2955- <property name="can_focus">False</property>
2956- <property name="xalign">0</property>
2957- <property name="label" translatable="yes">Rock Out
2958-&lt;span foreground="#909090"&gt;Your entire collection follows you around with music streaming to Android and iPhone&lt;/span&gt;</property>
2959- <property name="use_markup">True</property>
2960- <property name="wrap">True</property>
2961- </object>
2962- <packing>
2963- <property name="left_attach">1</property>
2964- <property name="right_attach">2</property>
2965- <property name="top_attach">1</property>
2966- <property name="bottom_attach">2</property>
2967- </packing>
2968- </child>
2969- <child>
2970- <object class="GtkLabel" id="label6">
2971- <property name="visible">True</property>
2972- <property name="can_focus">False</property>
2973- <property name="xalign">0</property>
2974- <property name="label" translatable="yes">Stay Productive
2975-&lt;span foreground="#909090"&gt;Keep your Firefox bookmarks and Tomboy notes synced&lt;/span&gt;</property>
2976- <property name="use_markup">True</property>
2977- <property name="wrap">True</property>
2978- </object>
2979- <packing>
2980- <property name="left_attach">1</property>
2981- <property name="right_attach">2</property>
2982- <property name="top_attach">3</property>
2983- <property name="bottom_attach">4</property>
2984- </packing>
2985- </child>
2986- </object>
2987- <packing>
2988- <property name="expand">True</property>
2989- <property name="fill">True</property>
2990- <property name="position">0</property>
2991- </packing>
2992- </child>
2993- <child>
2994- <object class="GtkVBox" id="vbox2">
2995- <property name="visible">True</property>
2996- <property name="can_focus">False</property>
2997- <child>
2998- <object class="GtkLabel" id="warning_label">
2999- <property name="visible">True</property>
3000- <property name="can_focus">False</property>
3001- <property name="label">A warning label that can be long. Possible really long, let's see how it behaves.</property>
3002- <property name="wrap">True</property>
3003- </object>
3004- <packing>
3005- <property name="expand">False</property>
3006- <property name="fill">True</property>
3007- <property name="position">0</property>
3008- </packing>
3009- </child>
3010- <child>
3011- <object class="GtkAlignment" id="alignment2">
3012- <property name="visible">True</property>
3013- <property name="can_focus">False</property>
3014- <property name="xscale">0</property>
3015- <property name="yscale">0</property>
3016- <child>
3017- <object class="GtkVBox" id="vbox3">
3018- <property name="visible">True</property>
3019- <property name="can_focus">False</property>
3020- <property name="spacing">10</property>
3021- <child>
3022- <object class="GtkButton" id="learn_more_button">
3023- <property name="visible">True</property>
3024- <property name="can_focus">True</property>
3025- <property name="receives_default">True</property>
3026- <property name="use_action_appearance">False</property>
3027- <signal name="clicked" handler="on_learn_more_button_clicked" swapped="no"/>
3028- <child>
3029- <object class="GtkVBox" id="vbox5">
3030- <property name="visible">True</property>
3031- <property name="can_focus">False</property>
3032- <child>
3033- <object class="GtkImage" id="image5">
3034- <property name="visible">True</property>
3035- <property name="can_focus">False</property>
3036- <property name="pixel_size">55</property>
3037- <property name="icon_name">ubuntuone</property>
3038- </object>
3039- <packing>
3040- <property name="expand">True</property>
3041- <property name="fill">True</property>
3042- <property name="position">0</property>
3043- </packing>
3044- </child>
3045- <child>
3046- <object class="GtkLabel" id="label8">
3047- <property name="visible">True</property>
3048- <property name="can_focus">False</property>
3049- <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;Learn More&lt;/span&gt;</property>
3050- <property name="use_markup">True</property>
3051- </object>
3052- <packing>
3053- <property name="expand">True</property>
3054- <property name="fill">True</property>
3055- <property name="position">1</property>
3056- </packing>
3057- </child>
3058- </object>
3059- </child>
3060- </object>
3061- <packing>
3062- <property name="expand">True</property>
3063- <property name="fill">True</property>
3064- <property name="position">0</property>
3065- </packing>
3066- </child>
3067- <child>
3068- <object class="GtkButton" id="join_now_button">
3069- <property name="visible">True</property>
3070- <property name="can_focus">True</property>
3071- <property name="can_default">True</property>
3072- <property name="receives_default">True</property>
3073- <property name="use_action_appearance">False</property>
3074- <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/>
3075- <child>
3076- <object class="GtkVBox" id="vbox4">
3077- <property name="visible">True</property>
3078- <property name="can_focus">False</property>
3079- <property name="spacing">5</property>
3080- <child>
3081- <object class="GtkLabel" id="label1">
3082- <property name="visible">True</property>
3083- <property name="can_focus">False</property>
3084- <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;Join now&lt;/span&gt;</property>
3085- <property name="use_markup">True</property>
3086- </object>
3087- <packing>
3088- <property name="expand">True</property>
3089- <property name="fill">True</property>
3090- <property name="position">0</property>
3091- </packing>
3092- </child>
3093- <child>
3094- <object class="GtkLabel" id="label2">
3095- <property name="visible">True</property>
3096- <property name="can_focus">False</property>
3097- <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;2GB of free storage&lt;/span&gt;</property>
3098- <property name="use_markup">True</property>
3099- </object>
3100- <packing>
3101- <property name="expand">True</property>
3102- <property name="fill">True</property>
3103- <property name="position">1</property>
3104- </packing>
3105- </child>
3106- </object>
3107- </child>
3108- </object>
3109- <packing>
3110- <property name="expand">False</property>
3111- <property name="fill">True</property>
3112- <property name="position">1</property>
3113- </packing>
3114- </child>
3115- <child>
3116- <object class="GtkLinkButton" id="connect_button">
3117- <property name="label" translatable="yes">I already have an account!</property>
3118- <property name="visible">True</property>
3119- <property name="can_focus">True</property>
3120- <property name="receives_default">True</property>
3121- <property name="use_action_appearance">False</property>
3122- <property name="relief">none</property>
3123- <signal name="clicked" handler="on_connect_button_clicked" swapped="no"/>
3124- </object>
3125- <packing>
3126- <property name="expand">False</property>
3127- <property name="fill">False</property>
3128- <property name="position">2</property>
3129- </packing>
3130- </child>
3131- </object>
3132- </child>
3133- </object>
3134- <packing>
3135- <property name="expand">True</property>
3136- <property name="fill">True</property>
3137- <property name="position">1</property>
3138- </packing>
3139- </child>
3140- </object>
3141- <packing>
3142- <property name="expand">True</property>
3143- <property name="fill">True</property>
3144- <property name="position">1</property>
3145- </packing>
3146- </child>
3147- </object>
3148- <packing>
3149- <property name="expand">True</property>
3150- <property name="fill">True</property>
3151- <property name="position">2</property>
3152- </packing>
3153- </child>
3154- </object>
3155-</interface>
3156
3157=== added file 'data/phone.png'
3158Binary files data/phone.png 1970-01-01 00:00:00 +0000 and data/phone.png 2011-07-22 21:53:24 +0000 differ
3159=== added directory 'data/qt'
3160=== added file 'data/qt/account.ui'
3161--- data/qt/account.ui 1970-01-01 00:00:00 +0000
3162+++ data/qt/account.ui 2011-07-22 21:53:24 +0000
3163@@ -0,0 +1,153 @@
3164+<?xml version="1.0" encoding="UTF-8"?>
3165+<ui version="4.0">
3166+ <class>Form</class>
3167+ <widget class="QWidget" name="Form">
3168+ <property name="geometry">
3169+ <rect>
3170+ <x>0</x>
3171+ <y>0</y>
3172+ <width>321</width>
3173+ <height>205</height>
3174+ </rect>
3175+ </property>
3176+ <property name="windowTitle">
3177+ <string>Form</string>
3178+ </property>
3179+ <layout class="QVBoxLayout" name="verticalLayout">
3180+ <property name="margin">
3181+ <number>0</number>
3182+ </property>
3183+ <item>
3184+ <widget class="QGroupBox" name="horizontalGroupBox">
3185+ <property name="title">
3186+ <string>Personal details</string>
3187+ </property>
3188+ <layout class="QHBoxLayout" name="horizontalLayout">
3189+ <item>
3190+ <layout class="QVBoxLayout" name="verticalLayout_2">
3191+ <item>
3192+ <widget class="QLabel" name="name_label">
3193+ <property name="text">
3194+ <string/>
3195+ </property>
3196+ </widget>
3197+ </item>
3198+ <item>
3199+ <widget class="QLabel" name="email_label">
3200+ <property name="text">
3201+ <string/>
3202+ </property>
3203+ </widget>
3204+ </item>
3205+ </layout>
3206+ </item>
3207+ <item>
3208+ <spacer name="horizontalSpacer_3">
3209+ <property name="orientation">
3210+ <enum>Qt::Horizontal</enum>
3211+ </property>
3212+ <property name="sizeHint" stdset="0">
3213+ <size>
3214+ <width>40</width>
3215+ <height>20</height>
3216+ </size>
3217+ </property>
3218+ </spacer>
3219+ </item>
3220+ <item>
3221+ <widget class="GoToWebButton" name="edit_profile_button">
3222+ <property name="text">
3223+ <string>Edit personal details online</string>
3224+ </property>
3225+ </widget>
3226+ </item>
3227+ <item>
3228+ <spacer name="horizontalSpacer_4">
3229+ <property name="orientation">
3230+ <enum>Qt::Horizontal</enum>
3231+ </property>
3232+ <property name="sizeHint" stdset="0">
3233+ <size>
3234+ <width>40</width>
3235+ <height>20</height>
3236+ </size>
3237+ </property>
3238+ </spacer>
3239+ </item>
3240+ </layout>
3241+ </widget>
3242+ </item>
3243+ <item>
3244+ <widget class="QGroupBox" name="horizontalGroupBox_2">
3245+ <property name="title">
3246+ <string>Your services</string>
3247+ </property>
3248+ <layout class="QHBoxLayout" name="horizontalLayout_2">
3249+ <item>
3250+ <widget class="QLabel" name="services_description_label">
3251+ <property name="text">
3252+ <string/>
3253+ </property>
3254+ </widget>
3255+ </item>
3256+ <item>
3257+ <spacer name="horizontalSpacer">
3258+ <property name="orientation">
3259+ <enum>Qt::Horizontal</enum>
3260+ </property>
3261+ <property name="sizeHint" stdset="0">
3262+ <size>
3263+ <width>40</width>
3264+ <height>20</height>
3265+ </size>
3266+ </property>
3267+ </spacer>
3268+ </item>
3269+ <item>
3270+ <widget class="GoToWebButton" name="edit_services_button">
3271+ <property name="text">
3272+ <string>Edit your services online</string>
3273+ </property>
3274+ </widget>
3275+ </item>
3276+ <item>
3277+ <spacer name="horizontalSpacer_2">
3278+ <property name="orientation">
3279+ <enum>Qt::Horizontal</enum>
3280+ </property>
3281+ <property name="sizeHint" stdset="0">
3282+ <size>
3283+ <width>40</width>
3284+ <height>20</height>
3285+ </size>
3286+ </property>
3287+ </spacer>
3288+ </item>
3289+ </layout>
3290+ </widget>
3291+ </item>
3292+ <item>
3293+ <spacer name="verticalSpacer">
3294+ <property name="orientation">
3295+ <enum>Qt::Vertical</enum>
3296+ </property>
3297+ <property name="sizeHint" stdset="0">
3298+ <size>
3299+ <width>20</width>
3300+ <height>40</height>
3301+ </size>
3302+ </property>
3303+ </spacer>
3304+ </item>
3305+ </layout>
3306+ </widget>
3307+ <customwidgets>
3308+ <customwidget>
3309+ <class>GoToWebButton</class>
3310+ <extends>QPushButton</extends>
3311+ <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
3312+ </customwidget>
3313+ </customwidgets>
3314+ <resources/>
3315+ <connections/>
3316+</ui>
3317
3318=== added file 'data/qt/controlpanel.ui'
3319--- data/qt/controlpanel.ui 1970-01-01 00:00:00 +0000
3320+++ data/qt/controlpanel.ui 2011-07-22 21:53:24 +0000
3321@@ -0,0 +1,463 @@
3322+<?xml version="1.0" encoding="UTF-8"?>
3323+<ui version="4.0">
3324+ <class>Form</class>
3325+ <widget class="QWidget" name="Form">
3326+ <property name="geometry">
3327+ <rect>
3328+ <x>0</x>
3329+ <y>0</y>
3330+ <width>536</width>
3331+ <height>389</height>
3332+ </rect>
3333+ </property>
3334+ <property name="sizePolicy">
3335+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
3336+ <horstretch>0</horstretch>
3337+ <verstretch>0</verstretch>
3338+ </sizepolicy>
3339+ </property>
3340+ <property name="windowTitle">
3341+ <string notr="true">Form</string>
3342+ </property>
3343+ <layout class="QVBoxLayout" name="verticalLayout">
3344+ <property name="spacing">
3345+ <number>4</number>
3346+ </property>
3347+ <property name="margin">
3348+ <number>0</number>
3349+ </property>
3350+ <item>
3351+ <widget class="QFrame" name="frmHeader">
3352+ <property name="frameShape">
3353+ <enum>QFrame::StyledPanel</enum>
3354+ </property>
3355+ <property name="frameShadow">
3356+ <enum>QFrame::Raised</enum>
3357+ </property>
3358+ <layout class="QHBoxLayout" name="horizontalLayout_4">
3359+ <property name="spacing">
3360+ <number>0</number>
3361+ </property>
3362+ <property name="leftMargin">
3363+ <number>15</number>
3364+ </property>
3365+ <property name="topMargin">
3366+ <number>10</number>
3367+ </property>
3368+ <property name="rightMargin">
3369+ <number>10</number>
3370+ </property>
3371+ <property name="bottomMargin">
3372+ <number>10</number>
3373+ </property>
3374+ <item>
3375+ <layout class="QHBoxLayout" name="horizontalLayout">
3376+ <property name="spacing">
3377+ <number>0</number>
3378+ </property>
3379+ <item>
3380+ <layout class="QVBoxLayout" name="vLayoutGreeting">
3381+ <property name="spacing">
3382+ <number>0</number>
3383+ </property>
3384+ <property name="sizeConstraint">
3385+ <enum>QLayout::SetDefaultConstraint</enum>
3386+ </property>
3387+ <item>
3388+ <widget class="QLabel" name="greeting_label">
3389+ <property name="font">
3390+ <font>
3391+ <pointsize>10</pointsize>
3392+ </font>
3393+ </property>
3394+ <property name="layoutDirection">
3395+ <enum>Qt::LeftToRight</enum>
3396+ </property>
3397+ <property name="autoFillBackground">
3398+ <bool>false</bool>
3399+ </property>
3400+ <property name="text">
3401+ <string notr="true"/>
3402+ </property>
3403+ <property name="alignment">
3404+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
3405+ </property>
3406+ <property name="margin">
3407+ <number>0</number>
3408+ </property>
3409+ <property name="indent">
3410+ <number>-1</number>
3411+ </property>
3412+ </widget>
3413+ </item>
3414+ </layout>
3415+ </item>
3416+ <item>
3417+ <spacer name="horizontalSpacer">
3418+ <property name="orientation">
3419+ <enum>Qt::Horizontal</enum>
3420+ </property>
3421+ <property name="sizeType">
3422+ <enum>QSizePolicy::Fixed</enum>
3423+ </property>
3424+ <property name="sizeHint" stdset="0">
3425+ <size>
3426+ <width>15</width>
3427+ <height>20</height>
3428+ </size>
3429+ </property>
3430+ </spacer>
3431+ </item>
3432+ <item>
3433+ <widget class="QFrame" name="frameStorage">
3434+ <property name="sizePolicy">
3435+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
3436+ <horstretch>0</horstretch>
3437+ <verstretch>0</verstretch>
3438+ </sizepolicy>
3439+ </property>
3440+ <property name="maximumSize">
3441+ <size>
3442+ <width>166</width>
3443+ <height>16777215</height>
3444+ </size>
3445+ </property>
3446+ <property name="frameShape">
3447+ <enum>QFrame::StyledPanel</enum>
3448+ </property>
3449+ <property name="frameShadow">
3450+ <enum>QFrame::Raised</enum>
3451+ </property>
3452+ <layout class="QHBoxLayout" name="horizontalLayout_7">
3453+ <property name="spacing">
3454+ <number>0</number>
3455+ </property>
3456+ <property name="leftMargin">
3457+ <number>10</number>
3458+ </property>
3459+ <property name="topMargin">
3460+ <number>0</number>
3461+ </property>
3462+ <property name="rightMargin">
3463+ <number>10</number>
3464+ </property>
3465+ <property name="bottomMargin">
3466+ <number>0</number>
3467+ </property>
3468+ <item>
3469+ <layout class="QVBoxLayout" name="vLayoutStorage">
3470+ <property name="sizeConstraint">
3471+ <enum>QLayout::SetDefaultConstraint</enum>
3472+ </property>
3473+ <item>
3474+ <widget class="QFrame" name="frmQuota">
3475+ <property name="frameShape">
3476+ <enum>QFrame::StyledPanel</enum>
3477+ </property>
3478+ <property name="frameShadow">
3479+ <enum>QFrame::Raised</enum>
3480+ </property>
3481+ <layout class="QVBoxLayout" name="verticalLayout_3">
3482+ <property name="spacing">
3483+ <number>2</number>
3484+ </property>
3485+ <property name="leftMargin">
3486+ <number>0</number>
3487+ </property>
3488+ <property name="topMargin">
3489+ <number>0</number>
3490+ </property>
3491+ <property name="rightMargin">
3492+ <number>0</number>
3493+ </property>
3494+ <property name="bottomMargin">
3495+ <number>10</number>
3496+ </property>
3497+ <item>
3498+ <widget class="QLabel" name="percentage_usage_label">
3499+ <property name="sizePolicy">
3500+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
3501+ <horstretch>0</horstretch>
3502+ <verstretch>0</verstretch>
3503+ </sizepolicy>
3504+ </property>
3505+ <property name="text">
3506+ <string notr="true"/>
3507+ </property>
3508+ </widget>
3509+ </item>
3510+ <item>
3511+ <widget class="QLabel" name="quota_usage_label">
3512+ <property name="font">
3513+ <font>
3514+ <pointsize>8</pointsize>
3515+ </font>
3516+ </property>
3517+ <property name="text">
3518+ <string/>
3519+ </property>
3520+ </widget>
3521+ </item>
3522+ </layout>
3523+ <zorder>quota_usage_label</zorder>
3524+ <zorder>percentage_usage_label</zorder>
3525+ </widget>
3526+ </item>
3527+ <item>
3528+ <widget class="GoToWebButton" name="get_more_space_button">
3529+ <property name="text">
3530+ <string>Get more storage!</string>
3531+ </property>
3532+ </widget>
3533+ </item>
3534+ </layout>
3535+ </item>
3536+ </layout>
3537+ <zorder></zorder>
3538+ </widget>
3539+ </item>
3540+ <item>
3541+ <widget class="QFrame" name="frameStatus">
3542+ <property name="sizePolicy">
3543+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
3544+ <horstretch>0</horstretch>
3545+ <verstretch>0</verstretch>
3546+ </sizepolicy>
3547+ </property>
3548+ <property name="maximumSize">
3549+ <size>
3550+ <width>166</width>
3551+ <height>16777215</height>
3552+ </size>
3553+ </property>
3554+ <property name="frameShape">
3555+ <enum>QFrame::StyledPanel</enum>
3556+ </property>
3557+ <property name="frameShadow">
3558+ <enum>QFrame::Raised</enum>
3559+ </property>
3560+ <layout class="QHBoxLayout" name="horizontalLayout_8">
3561+ <property name="spacing">
3562+ <number>0</number>
3563+ </property>
3564+ <property name="leftMargin">
3565+ <number>10</number>
3566+ </property>
3567+ <property name="topMargin">
3568+ <number>0</number>
3569+ </property>
3570+ <property name="rightMargin">
3571+ <number>0</number>
3572+ </property>
3573+ <property name="bottomMargin">
3574+ <number>0</number>
3575+ </property>
3576+ <item>
3577+ <widget class="FileSyncStatus" name="file_sync_status" native="true"/>
3578+ </item>
3579+ </layout>
3580+ </widget>
3581+ </item>
3582+ </layout>
3583+ </item>
3584+ </layout>
3585+ </widget>
3586+ </item>
3587+ <item>
3588+ <widget class="QTabWidget" name="tab_widget">
3589+ <property name="sizePolicy">
3590+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
3591+ <horstretch>0</horstretch>
3592+ <verstretch>0</verstretch>
3593+ </sizepolicy>
3594+ </property>
3595+ <property name="currentIndex">
3596+ <number>0</number>
3597+ </property>
3598+ <widget class="FoldersPanel" name="folders_tab">
3599+ <attribute name="title">
3600+ <string>Folders</string>
3601+ </attribute>
3602+ </widget>
3603+ <widget class="DevicesPanel" name="devices_tab">
3604+ <attribute name="title">
3605+ <string>Devices</string>
3606+ </attribute>
3607+ </widget>
3608+ <widget class="PreferencesPanel" name="preferences_tab">
3609+ <attribute name="title">
3610+ <string>Preferences</string>
3611+ </attribute>
3612+ </widget>
3613+ <widget class="AccountPanel" name="account_tab">
3614+ <attribute name="title">
3615+ <string>Account information</string>
3616+ </attribute>
3617+ </widget>
3618+ </widget>
3619+ </item>
3620+ <item>
3621+ <widget class="QFrame" name="frmFooter">
3622+ <property name="maximumSize">
3623+ <size>
3624+ <width>16777215</width>
3625+ <height>30</height>
3626+ </size>
3627+ </property>
3628+ <property name="frameShape">
3629+ <enum>QFrame::StyledPanel</enum>
3630+ </property>
3631+ <property name="frameShadow">
3632+ <enum>QFrame::Raised</enum>
3633+ </property>
3634+ <layout class="QVBoxLayout" name="verticalLayout_2">
3635+ <property name="spacing">
3636+ <number>0</number>
3637+ </property>
3638+ <property name="margin">
3639+ <number>0</number>
3640+ </property>
3641+ <item>
3642+ <layout class="QHBoxLayout" name="hLayoutFooter">
3643+ <property name="spacing">
3644+ <number>5</number>
3645+ </property>
3646+ <property name="leftMargin">
3647+ <number>3</number>
3648+ </property>
3649+ <property name="rightMargin">
3650+ <number>3</number>
3651+ </property>
3652+ <item>
3653+ <widget class="GoToWebButton" name="help_button">
3654+ <property name="text">
3655+ <string>Get help online</string>
3656+ </property>
3657+ </widget>
3658+ </item>
3659+ <item>
3660+ <spacer name="horizontalSpacer_4">
3661+ <property name="orientation">
3662+ <enum>Qt::Horizontal</enum>
3663+ </property>
3664+ <property name="sizeHint" stdset="0">
3665+ <size>
3666+ <width>40</width>
3667+ <height>20</height>
3668+ </size>
3669+ </property>
3670+ </spacer>
3671+ </item>
3672+ <item>
3673+ <widget class="QLabel" name="follow_us_label">
3674+ <property name="font">
3675+ <font>
3676+ <pointsize>11</pointsize>
3677+ </font>
3678+ </property>
3679+ <property name="text">
3680+ <string>Talk to us</string>
3681+ </property>
3682+ </widget>
3683+ </item>
3684+ <item>
3685+ <widget class="QToolButton" name="twitter_button">
3686+ <property name="cursor">
3687+ <cursorShape>PointingHandCursor</cursorShape>
3688+ </property>
3689+ <property name="styleSheet">
3690+ <string notr="true">border: 0;</string>
3691+ </property>
3692+ <property name="text">
3693+ <string/>
3694+ </property>
3695+ <property name="icon">
3696+ <iconset resource="images.qrc">
3697+ <normaloff>:/twitter.png</normaloff>:/twitter.png</iconset>
3698+ </property>
3699+ <property name="iconSize">
3700+ <size>
3701+ <width>22</width>
3702+ <height>22</height>
3703+ </size>
3704+ </property>
3705+ </widget>
3706+ </item>
3707+ <item>
3708+ <widget class="QToolButton" name="facebook_button">
3709+ <property name="cursor">
3710+ <cursorShape>PointingHandCursor</cursorShape>
3711+ </property>
3712+ <property name="styleSheet">
3713+ <string notr="true">border: 0;</string>
3714+ </property>
3715+ <property name="text">
3716+ <string/>
3717+ </property>
3718+ <property name="icon">
3719+ <iconset resource="images.qrc">
3720+ <normaloff>:/facebook.png</normaloff>:/facebook.png</iconset>
3721+ </property>
3722+ <property name="iconSize">
3723+ <size>
3724+ <width>22</width>
3725+ <height>22</height>
3726+ </size>
3727+ </property>
3728+ </widget>
3729+ </item>
3730+ </layout>
3731+ </item>
3732+ </layout>
3733+ </widget>
3734+ </item>
3735+ </layout>
3736+ </widget>
3737+ <customwidgets>
3738+ <customwidget>
3739+ <class>FoldersPanel</class>
3740+ <extends>QWidget</extends>
3741+ <header>ubuntuone.controlpanel.gui.qt.folders</header>
3742+ <container>1</container>
3743+ </customwidget>
3744+ <customwidget>
3745+ <class>DevicesPanel</class>
3746+ <extends>QWidget</extends>
3747+ <header>ubuntuone.controlpanel.gui.qt.devices</header>
3748+ <container>1</container>
3749+ </customwidget>
3750+ <customwidget>
3751+ <class>PreferencesPanel</class>
3752+ <extends>QWidget</extends>
3753+ <header>ubuntuone.controlpanel.gui.qt.preferences</header>
3754+ <container>1</container>
3755+ </customwidget>
3756+ <customwidget>
3757+ <class>FileSyncStatus</class>
3758+ <extends>QWidget</extends>
3759+ <header>ubuntuone.controlpanel.gui.qt.filesyncstatus</header>
3760+ <container>1</container>
3761+ </customwidget>
3762+ <customwidget>
3763+ <class>GoToWebButton</class>
3764+ <extends>QPushButton</extends>
3765+ <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
3766+ </customwidget>
3767+ <customwidget>
3768+ <class>AccountPanel</class>
3769+ <extends>QWidget</extends>
3770+ <header>ubuntuone.controlpanel.gui.qt.account</header>
3771+ <container>1</container>
3772+ </customwidget>
3773+ </customwidgets>
3774+ <tabstops>
3775+ <tabstop>tab_widget</tabstop>
3776+ <tabstop>help_button</tabstop>
3777+ <tabstop>twitter_button</tabstop>
3778+ <tabstop>facebook_button</tabstop>
3779+ </tabstops>
3780+ <resources>
3781+ <include location="images.qrc"/>
3782+ </resources>
3783+ <connections/>
3784+</ui>
3785
3786=== added file 'data/qt/device.ui'
3787--- data/qt/device.ui 1970-01-01 00:00:00 +0000
3788+++ data/qt/device.ui 2011-07-22 21:53:24 +0000
3789@@ -0,0 +1,57 @@
3790+<?xml version="1.0" encoding="UTF-8"?>
3791+<ui version="4.0">
3792+ <class>Form</class>
3793+ <widget class="QWidget" name="Form">
3794+ <property name="geometry">
3795+ <rect>
3796+ <x>0</x>
3797+ <y>0</y>
3798+ <width>400</width>
3799+ <height>63</height>
3800+ </rect>
3801+ </property>
3802+ <property name="windowTitle">
3803+ <string notr="true">Form</string>
3804+ </property>
3805+ <layout class="QHBoxLayout" name="horizontalLayout">
3806+ <item>
3807+ <widget class="QLabel" name="device_icon_label">
3808+ <property name="pixmap">
3809+ <pixmap resource="images.qrc">:/computer.png</pixmap>
3810+ </property>
3811+ </widget>
3812+ </item>
3813+ <item>
3814+ <widget class="QLabel" name="device_name_label">
3815+ <property name="text">
3816+ <string>Local device</string>
3817+ </property>
3818+ </widget>
3819+ </item>
3820+ <item>
3821+ <spacer name="horizontalSpacer">
3822+ <property name="orientation">
3823+ <enum>Qt::Horizontal</enum>
3824+ </property>
3825+ <property name="sizeHint" stdset="0">
3826+ <size>
3827+ <width>217</width>
3828+ <height>20</height>
3829+ </size>
3830+ </property>
3831+ </spacer>
3832+ </item>
3833+ <item>
3834+ <widget class="QPushButton" name="remove_device_button">
3835+ <property name="text">
3836+ <string>Delete device</string>
3837+ </property>
3838+ </widget>
3839+ </item>
3840+ </layout>
3841+ </widget>
3842+ <resources>
3843+ <include location="images.qrc"/>
3844+ </resources>
3845+ <connections/>
3846+</ui>
3847
3848=== added file 'data/qt/devices.ui'
3849--- data/qt/devices.ui 1970-01-01 00:00:00 +0000
3850+++ data/qt/devices.ui 2011-07-22 21:53:24 +0000
3851@@ -0,0 +1,135 @@
3852+<?xml version="1.0" encoding="UTF-8"?>
3853+<ui version="4.0">
3854+ <class>Form</class>
3855+ <widget class="QWidget" name="Form">
3856+ <property name="geometry">
3857+ <rect>
3858+ <x>0</x>
3859+ <y>0</y>
3860+ <width>409</width>
3861+ <height>310</height>
3862+ </rect>
3863+ </property>
3864+ <property name="windowTitle">
3865+ <string notr="true">Form</string>
3866+ </property>
3867+ <layout class="QVBoxLayout" name="verticalLayout">
3868+ <property name="spacing">
3869+ <number>0</number>
3870+ </property>
3871+ <property name="margin">
3872+ <number>0</number>
3873+ </property>
3874+ <item>
3875+ <widget class="QFrame" name="frame">
3876+ <property name="frameShape">
3877+ <enum>QFrame::StyledPanel</enum>
3878+ </property>
3879+ <property name="frameShadow">
3880+ <enum>QFrame::Raised</enum>
3881+ </property>
3882+ <layout class="QVBoxLayout" name="verticalLayout_2">
3883+ <item>
3884+ <layout class="QHBoxLayout" name="horizontalLayout_2">
3885+ <item>
3886+ <layout class="QVBoxLayout" name="local_device_box"/>
3887+ </item>
3888+ </layout>
3889+ </item>
3890+ <item>
3891+ <layout class="QHBoxLayout" name="horizontalLayout">
3892+ <item>
3893+ <widget class="QLabel" name="other_devices_label">
3894+ <property name="text">
3895+ <string>Other devices</string>
3896+ </property>
3897+ </widget>
3898+ </item>
3899+ <item>
3900+ <spacer name="horizontalSpacer">
3901+ <property name="orientation">
3902+ <enum>Qt::Horizontal</enum>
3903+ </property>
3904+ <property name="sizeHint" stdset="0">
3905+ <size>
3906+ <width>40</width>
3907+ <height>20</height>
3908+ </size>
3909+ </property>
3910+ </spacer>
3911+ </item>
3912+ </layout>
3913+ </item>
3914+ <item>
3915+ <widget class="QListWidget" name="list_devices">
3916+ <property name="alternatingRowColors">
3917+ <bool>true</bool>
3918+ </property>
3919+ <property name="iconSize">
3920+ <size>
3921+ <width>32</width>
3922+ <height>32</height>
3923+ </size>
3924+ </property>
3925+ <property name="spacing">
3926+ <number>0</number>
3927+ </property>
3928+ <property name="selectionRectVisible">
3929+ <bool>false</bool>
3930+ </property>
3931+ </widget>
3932+ </item>
3933+ <item>
3934+ <layout class="QHBoxLayout" name="horizontalLayout_3">
3935+ <item>
3936+ <spacer name="horizontalSpacer_3">
3937+ <property name="orientation">
3938+ <enum>Qt::Horizontal</enum>
3939+ </property>
3940+ <property name="sizeHint" stdset="0">
3941+ <size>
3942+ <width>40</width>
3943+ <height>20</height>
3944+ </size>
3945+ </property>
3946+ </spacer>
3947+ </item>
3948+ <item>
3949+ <widget class="GoToWebButton" name="manage_devices_button">
3950+ <property name="text">
3951+ <string>Go to the web page to manage your other devices</string>
3952+ </property>
3953+ </widget>
3954+ </item>
3955+ <item>
3956+ <spacer name="horizontalSpacer_4">
3957+ <property name="orientation">
3958+ <enum>Qt::Horizontal</enum>
3959+ </property>
3960+ <property name="sizeHint" stdset="0">
3961+ <size>
3962+ <width>40</width>
3963+ <height>20</height>
3964+ </size>
3965+ </property>
3966+ </spacer>
3967+ </item>
3968+ </layout>
3969+ </item>
3970+ </layout>
3971+ </widget>
3972+ </item>
3973+ </layout>
3974+ </widget>
3975+ <customwidgets>
3976+ <customwidget>
3977+ <class>GoToWebButton</class>
3978+ <extends>QPushButton</extends>
3979+ <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
3980+ </customwidget>
3981+ </customwidgets>
3982+ <resources>
3983+ <include location="images.qrc"/>
3984+ </resources>
3985+ <connections/>
3986+</ui>
3987
3988=== added file 'data/qt/filesyncstatus.ui'
3989--- data/qt/filesyncstatus.ui 1970-01-01 00:00:00 +0000
3990+++ data/qt/filesyncstatus.ui 2011-07-22 21:53:24 +0000
3991@@ -0,0 +1,59 @@
3992+<?xml version="1.0" encoding="UTF-8"?>
3993+<ui version="4.0">
3994+ <class>Form</class>
3995+ <widget class="QWidget" name="Form">
3996+ <property name="geometry">
3997+ <rect>
3998+ <x>0</x>
3999+ <y>0</y>
4000+ <width>310</width>
4001+ <height>211</height>
4002+ </rect>
4003+ </property>
4004+ <property name="windowTitle">
4005+ <string notr="true">Form</string>
4006+ </property>
4007+ <layout class="QHBoxLayout" name="horizontalLayout_2">
4008+ <item>
4009+ <layout class="QVBoxLayout" name="verticalLayout">
4010+ <item>
4011+ <layout class="QHBoxLayout" name="horizontalLayout">
4012+ <item>
4013+ <widget class="QLabel" name="sync_status_icon">
4014+ <property name="text">
4015+ <string/>
4016+ </property>
4017+ </widget>
4018+ </item>
4019+ <item>
4020+ <widget class="QLabel" name="sync_status_label">
4021+ <property name="text">
4022+ <string notr="true"/>
4023+ </property>
4024+ <property name="wordWrap">
4025+ <bool>true</bool>
4026+ </property>
4027+ <property name="buddy">
4028+ <cstring>sync_status_button</cstring>
4029+ </property>
4030+ </widget>
4031+ </item>
4032+ </layout>
4033+ </item>
4034+ <item>
4035+ <widget class="QPushButton" name="sync_status_button">
4036+ <property name="toolTip">
4037+ <string>test</string>
4038+ </property>
4039+ <property name="text">
4040+ <string notr="true"/>
4041+ </property>
4042+ </widget>
4043+ </item>
4044+ </layout>
4045+ </item>
4046+ </layout>
4047+ </widget>
4048+ <resources/>
4049+ <connections/>
4050+</ui>
4051
4052=== added file 'data/qt/folders.ui'
4053--- data/qt/folders.ui 1970-01-01 00:00:00 +0000
4054+++ data/qt/folders.ui 2011-07-22 21:53:24 +0000
4055@@ -0,0 +1,116 @@
4056+<?xml version="1.0" encoding="UTF-8"?>
4057+<ui version="4.0">
4058+ <class>Form</class>
4059+ <widget class="QWidget" name="Form">
4060+ <property name="geometry">
4061+ <rect>
4062+ <x>0</x>
4063+ <y>0</y>
4064+ <width>607</width>
4065+ <height>435</height>
4066+ </rect>
4067+ </property>
4068+ <property name="windowTitle">
4069+ <string notr="true">Form</string>
4070+ </property>
4071+ <property name="styleSheet">
4072+ <string notr="true"/>
4073+ </property>
4074+ <layout class="QVBoxLayout" name="verticalLayout">
4075+ <item>
4076+ <widget class="QTreeWidget" name="folders">
4077+ <property name="alternatingRowColors">
4078+ <bool>true</bool>
4079+ </property>
4080+ <property name="uniformRowHeights">
4081+ <bool>false</bool>
4082+ </property>
4083+ <property name="itemsExpandable">
4084+ <bool>true</bool>
4085+ </property>
4086+ <property name="headerHidden">
4087+ <bool>false</bool>
4088+ </property>
4089+ <attribute name="headerVisible">
4090+ <bool>true</bool>
4091+ </attribute>
4092+ <attribute name="headerCascadingSectionResizes">
4093+ <bool>false</bool>
4094+ </attribute>
4095+ <attribute name="headerDefaultSectionSize">
4096+ <number>300</number>
4097+ </attribute>
4098+ <attribute name="headerHighlightSections">
4099+ <bool>false</bool>
4100+ </attribute>
4101+ <attribute name="headerShowSortIndicator" stdset="0">
4102+ <bool>false</bool>
4103+ </attribute>
4104+ <attribute name="headerStretchLastSection">
4105+ <bool>true</bool>
4106+ </attribute>
4107+ <column>
4108+ <property name="text">
4109+ <string>Name</string>
4110+ </property>
4111+ </column>
4112+ <column>
4113+ <property name="text">
4114+ <string>Sync Locally?</string>
4115+ </property>
4116+ </column>
4117+ <column>
4118+ <property name="text">
4119+ <string> </string>
4120+ </property>
4121+ </column>
4122+ </widget>
4123+ </item>
4124+ <item>
4125+ <layout class="QHBoxLayout" name="horizontalLayout_3">
4126+ <item>
4127+ <widget class="GoToWebButton" name="share_publish_button">
4128+ <property name="text">
4129+ <string>Go to the web to share folders and publish files</string>
4130+ </property>
4131+ </widget>
4132+ </item>
4133+ <item>
4134+ <spacer name="horizontalSpacer_3">
4135+ <property name="orientation">
4136+ <enum>Qt::Horizontal</enum>
4137+ </property>
4138+ <property name="sizeHint" stdset="0">
4139+ <size>
4140+ <width>40</width>
4141+ <height>20</height>
4142+ </size>
4143+ </property>
4144+ </spacer>
4145+ </item>
4146+ <item>
4147+ <widget class="AddFolderButton" name="add_folder_button">
4148+ <property name="text">
4149+ <string>Sync another folder with your cloud</string>
4150+ </property>
4151+ </widget>
4152+ </item>
4153+ </layout>
4154+ </item>
4155+ </layout>
4156+ </widget>
4157+ <customwidgets>
4158+ <customwidget>
4159+ <class>GoToWebButton</class>
4160+ <extends>QPushButton</extends>
4161+ <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
4162+ </customwidget>
4163+ <customwidget>
4164+ <class>AddFolderButton</class>
4165+ <extends>QPushButton</extends>
4166+ <header>ubuntuone.controlpanel.gui.qt.addfolder</header>
4167+ </customwidget>
4168+ </customwidgets>
4169+ <resources/>
4170+ <connections/>
4171+</ui>
4172
4173=== added file 'data/qt/images.qrc'
4174--- data/qt/images.qrc 1970-01-01 00:00:00 +0000
4175+++ data/qt/images.qrc 2011-07-22 21:53:24 +0000
4176@@ -0,0 +1,18 @@
4177+<RCC>
4178+ <qresource prefix="/">
4179+ <file>../u1icon.png</file>
4180+ <file>../external_icon_orange.png</file>
4181+ <file>../sync_status_disconnected.png</file>
4182+ <file>../sync_status_alert.png</file>
4183+ <file>../sync_status_sync_done.png</file>
4184+ <file>../sync_status_syncing.png</file>
4185+ <file>../folder.png</file>
4186+ <file>../computer.png</file>
4187+ <file>../phone.png</file>
4188+ <file>../twitter.png</file>
4189+ <file>../facebook.png</file>
4190+ <file>../external_icon_white.png</file>
4191+ <file>../Ubuntu-R.ttf</file>
4192+ <file>ubuntuone.qss</file>
4193+ </qresource>
4194+</RCC>
4195
4196=== added file 'data/qt/loadingoverlay.ui'
4197--- data/qt/loadingoverlay.ui 1970-01-01 00:00:00 +0000
4198+++ data/qt/loadingoverlay.ui 2011-07-22 21:53:24 +0000
4199@@ -0,0 +1,118 @@
4200+<?xml version="1.0" encoding="UTF-8"?>
4201+<ui version="4.0">
4202+ <class>Form</class>
4203+ <widget class="QFrame" name="Form">
4204+ <property name="geometry">
4205+ <rect>
4206+ <x>0</x>
4207+ <y>0</y>
4208+ <width>702</width>
4209+ <height>230</height>
4210+ </rect>
4211+ </property>
4212+ <property name="windowTitle">
4213+ <string>Frame</string>
4214+ </property>
4215+ <property name="frameShape">
4216+ <enum>QFrame::StyledPanel</enum>
4217+ </property>
4218+ <property name="frameShadow">
4219+ <enum>QFrame::Raised</enum>
4220+ </property>
4221+ <layout class="QVBoxLayout" name="verticalLayout">
4222+ <property name="topMargin">
4223+ <number>30</number>
4224+ </property>
4225+ <item>
4226+ <layout class="QHBoxLayout" name="horizontalLayout_2">
4227+ <item>
4228+ <spacer name="horizontalSpacer_2">
4229+ <property name="orientation">
4230+ <enum>Qt::Horizontal</enum>
4231+ </property>
4232+ <property name="sizeHint" stdset="0">
4233+ <size>
4234+ <width>40</width>
4235+ <height>20</height>
4236+ </size>
4237+ </property>
4238+ </spacer>
4239+ </item>
4240+ <item>
4241+ <widget class="QFrame" name="frm_box">
4242+ <property name="minimumSize">
4243+ <size>
4244+ <width>0</width>
4245+ <height>102</height>
4246+ </size>
4247+ </property>
4248+ <property name="styleSheet">
4249+ <string notr="true"/>
4250+ </property>
4251+ <property name="frameShape">
4252+ <enum>QFrame::StyledPanel</enum>
4253+ </property>
4254+ <property name="frameShadow">
4255+ <enum>QFrame::Raised</enum>
4256+ </property>
4257+ <layout class="QHBoxLayout" name="horizontalLayout">
4258+ <property name="topMargin">
4259+ <number>0</number>
4260+ </property>
4261+ <property name="bottomMargin">
4262+ <number>30</number>
4263+ </property>
4264+ <item>
4265+ <widget class="QLabel" name="label">
4266+ <property name="sizePolicy">
4267+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
4268+ <horstretch>0</horstretch>
4269+ <verstretch>0</verstretch>
4270+ </sizepolicy>
4271+ </property>
4272+ <property name="font">
4273+ <font>
4274+ <pointsize>14</pointsize>
4275+ </font>
4276+ </property>
4277+ <property name="text">
4278+ <string>Please wait while we retrieve the information...</string>
4279+ </property>
4280+ </widget>
4281+ </item>
4282+ </layout>
4283+ </widget>
4284+ </item>
4285+ <item>
4286+ <spacer name="horizontalSpacer">
4287+ <property name="orientation">
4288+ <enum>Qt::Horizontal</enum>
4289+ </property>
4290+ <property name="sizeHint" stdset="0">
4291+ <size>
4292+ <width>40</width>
4293+ <height>20</height>
4294+ </size>
4295+ </property>
4296+ </spacer>
4297+ </item>
4298+ </layout>
4299+ </item>
4300+ <item>
4301+ <spacer name="verticalSpacer">
4302+ <property name="orientation">
4303+ <enum>Qt::Vertical</enum>
4304+ </property>
4305+ <property name="sizeHint" stdset="0">
4306+ <size>
4307+ <width>20</width>
4308+ <height>20</height>
4309+ </size>
4310+ </property>
4311+ </spacer>
4312+ </item>
4313+ </layout>
4314+ </widget>
4315+ <resources/>
4316+ <connections/>
4317+</ui>
4318
4319=== added file 'data/qt/mainwindow.ui'
4320--- data/qt/mainwindow.ui 1970-01-01 00:00:00 +0000
4321+++ data/qt/mainwindow.ui 2011-07-22 21:53:24 +0000
4322@@ -0,0 +1,64 @@
4323+<?xml version="1.0" encoding="UTF-8"?>
4324+<ui version="4.0">
4325+ <class>MainWindow</class>
4326+ <widget class="QMainWindow" name="MainWindow">
4327+ <property name="geometry">
4328+ <rect>
4329+ <x>0</x>
4330+ <y>0</y>
4331+ <width>736</width>
4332+ <height>525</height>
4333+ </rect>
4334+ </property>
4335+ <property name="sizePolicy">
4336+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
4337+ <horstretch>0</horstretch>
4338+ <verstretch>0</verstretch>
4339+ </sizepolicy>
4340+ </property>
4341+ <property name="baseSize">
4342+ <size>
4343+ <width>0</width>
4344+ <height>0</height>
4345+ </size>
4346+ </property>
4347+ <property name="windowTitle">
4348+ <string>Ubuntu One Control Panel</string>
4349+ </property>
4350+ <property name="windowIcon">
4351+ <iconset resource="images.qrc">
4352+ <normaloff>:/u1icon.png</normaloff>:/u1icon.png</iconset>
4353+ </property>
4354+ <widget class="QWidget" name="centralwidget">
4355+ <property name="sizePolicy">
4356+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
4357+ <horstretch>0</horstretch>
4358+ <verstretch>0</verstretch>
4359+ </sizepolicy>
4360+ </property>
4361+ <layout class="QVBoxLayout" name="verticalLayout">
4362+ <property name="spacing">
4363+ <number>0</number>
4364+ </property>
4365+ <property name="margin">
4366+ <number>3</number>
4367+ </property>
4368+ <item>
4369+ <widget class="ControlPanel" name="control_panel" native="true"/>
4370+ </item>
4371+ </layout>
4372+ </widget>
4373+ </widget>
4374+ <customwidgets>
4375+ <customwidget>
4376+ <class>ControlPanel</class>
4377+ <extends>QWidget</extends>
4378+ <header>ubuntuone.controlpanel.gui.qt.controlpanel</header>
4379+ <container>1</container>
4380+ </customwidget>
4381+ </customwidgets>
4382+ <resources>
4383+ <include location="images.qrc"/>
4384+ </resources>
4385+ <connections/>
4386+</ui>
4387
4388=== added file 'data/qt/preferences.ui'
4389--- data/qt/preferences.ui 1970-01-01 00:00:00 +0000
4390+++ data/qt/preferences.ui 2011-07-22 21:53:24 +0000
4391@@ -0,0 +1,210 @@
4392+<?xml version="1.0" encoding="UTF-8"?>
4393+<ui version="4.0">
4394+ <class>Form</class>
4395+ <widget class="QWidget" name="Form">
4396+ <property name="geometry">
4397+ <rect>
4398+ <x>0</x>
4399+ <y>0</y>
4400+ <width>469</width>
4401+ <height>352</height>
4402+ </rect>
4403+ </property>
4404+ <property name="windowTitle">
4405+ <string notr="true">Form</string>
4406+ </property>
4407+ <property name="styleSheet">
4408+ <string notr="true"/>
4409+ </property>
4410+ <layout class="QVBoxLayout" name="verticalLayout">
4411+ <property name="margin">
4412+ <number>0</number>
4413+ </property>
4414+ <item>
4415+ <widget class="QGroupBox" name="verticalGroupBox">
4416+ <property name="title">
4417+ <string>Bandwidth settings</string>
4418+ </property>
4419+ <layout class="QGridLayout" name="gridLayout">
4420+ <property name="verticalSpacing">
4421+ <number>10</number>
4422+ </property>
4423+ <item row="0" column="0">
4424+ <widget class="QCheckBox" name="limit_uploads_checkbox">
4425+ <property name="text">
4426+ <string>Limit upload speed to</string>
4427+ </property>
4428+ </widget>
4429+ </item>
4430+ <item row="0" column="1">
4431+ <widget class="QSpinBox" name="upload_speed_spinbox">
4432+ <property name="minimum">
4433+ <number>-1</number>
4434+ </property>
4435+ <property name="maximum">
4436+ <number>999999999</number>
4437+ </property>
4438+ </widget>
4439+ </item>
4440+ <item row="0" column="2">
4441+ <widget class="QLabel" name="kbps_label_1">
4442+ <property name="text">
4443+ <string>Kilobits per second</string>
4444+ </property>
4445+ </widget>
4446+ </item>
4447+ <item row="2" column="0">
4448+ <widget class="QCheckBox" name="limit_downloads_checkbox">
4449+ <property name="text">
4450+ <string>Limit download speed to</string>
4451+ </property>
4452+ </widget>
4453+ </item>
4454+ <item row="2" column="1">
4455+ <widget class="QSpinBox" name="download_speed_spinbox">
4456+ <property name="minimum">
4457+ <number>-1</number>
4458+ </property>
4459+ <property name="maximum">
4460+ <number>999999999</number>
4461+ </property>
4462+ </widget>
4463+ </item>
4464+ <item row="2" column="2">
4465+ <widget class="QLabel" name="kbps_label_2">
4466+ <property name="text">
4467+ <string>Kilobits per second</string>
4468+ </property>
4469+ </widget>
4470+ </item>
4471+ <item row="0" column="3">
4472+ <spacer name="horizontalSpacer_2">
4473+ <property name="orientation">
4474+ <enum>Qt::Horizontal</enum>
4475+ </property>
4476+ <property name="sizeHint" stdset="0">
4477+ <size>
4478+ <width>40</width>
4479+ <height>20</height>
4480+ </size>
4481+ </property>
4482+ </spacer>
4483+ </item>
4484+ <item row="4" column="0" colspan="3">
4485+ <widget class="QLabel" name="label_2">
4486+ <property name="text">
4487+ <string>Please note that your files will not sync if you set bandwidth to 0</string>
4488+ </property>
4489+ <property name="scaledContents">
4490+ <bool>false</bool>
4491+ </property>
4492+ <property name="wordWrap">
4493+ <bool>false</bool>
4494+ </property>
4495+ </widget>
4496+ </item>
4497+ <item row="3" column="0">
4498+ <spacer name="verticalSpacer_2">
4499+ <property name="orientation">
4500+ <enum>Qt::Vertical</enum>
4501+ </property>
4502+ <property name="sizeHint" stdset="0">
4503+ <size>
4504+ <width>40</width>
4505+ <height>20</height>
4506+ </size>
4507+ </property>
4508+ </spacer>
4509+ </item>
4510+ </layout>
4511+ </widget>
4512+ </item>
4513+ <item>
4514+ <widget class="QGroupBox" name="groupBox_2">
4515+ <property name="title">
4516+ <string>File Sync Settings</string>
4517+ </property>
4518+ <layout class="QVBoxLayout" name="verticalLayout_1">
4519+ <property name="spacing">
4520+ <number>10</number>
4521+ </property>
4522+ <item>
4523+ <widget class="QCheckBox" name="autoconnect_checkbox">
4524+ <property name="text">
4525+ <string>Connect automatically when computer starts</string>
4526+ </property>
4527+ </widget>
4528+ </item>
4529+ <item>
4530+ <widget class="QCheckBox" name="udf_autosubscribe_checkbox">
4531+ <property name="text">
4532+ <string>Automatically sync all selected folders on this computer to the cloud</string>
4533+ </property>
4534+ </widget>
4535+ </item>
4536+ <item>
4537+ <widget class="QCheckBox" name="share_autosubscribe_checkbox">
4538+ <property name="text">
4539+ <string>Automatically sync all folders shared with me by other to this computer</string>
4540+ </property>
4541+ </widget>
4542+ </item>
4543+ <item>
4544+ <widget class="QCheckBox" name="show_all_notifications_checkbox">
4545+ <property name="text">
4546+ <string>Allow all notifications to this device</string>
4547+ </property>
4548+ </widget>
4549+ </item>
4550+ </layout>
4551+ </widget>
4552+ </item>
4553+ <item>
4554+ <layout class="QHBoxLayout" name="horizontalLayout">
4555+ <item>
4556+ <spacer name="horizontalSpacer">
4557+ <property name="orientation">
4558+ <enum>Qt::Horizontal</enum>
4559+ </property>
4560+ <property name="sizeHint" stdset="0">
4561+ <size>
4562+ <width>40</width>
4563+ <height>20</height>
4564+ </size>
4565+ </property>
4566+ </spacer>
4567+ </item>
4568+ <item>
4569+ <widget class="QPushButton" name="apply_changes_button">
4570+ <property name="text">
4571+ <string>Apply these settings</string>
4572+ </property>
4573+ </widget>
4574+ </item>
4575+ <item>
4576+ <widget class="QPushButton" name="restore_defaults_button">
4577+ <property name="text">
4578+ <string>Default settings</string>
4579+ </property>
4580+ </widget>
4581+ </item>
4582+ </layout>
4583+ </item>
4584+ <item>
4585+ <spacer name="verticalSpacer">
4586+ <property name="orientation">
4587+ <enum>Qt::Vertical</enum>
4588+ </property>
4589+ <property name="sizeHint" stdset="0">
4590+ <size>
4591+ <width>20</width>
4592+ <height>40</height>
4593+ </size>
4594+ </property>
4595+ </spacer>
4596+ </item>
4597+ </layout>
4598+ </widget>
4599+ <resources/>
4600+ <connections/>
4601+</ui>
4602
4603=== added file 'data/qt/ubuntuone.qss'
4604--- data/qt/ubuntuone.qss 1970-01-01 00:00:00 +0000
4605+++ data/qt/ubuntuone.qss 2011-07-22 21:53:24 +0000
4606@@ -0,0 +1,191 @@
4607+QMainWindow {
4608+ background-color: #dd4814;
4609+}
4610+
4611+QFrame#frmHeader {
4612+ background: #ffffff;
4613+ border-radius: 5px;
4614+ border-style: solid;
4615+ border-color: #939389;
4616+ border-width: 1px;
4617+ color: white;
4618+ min-height: 100px;
4619+}
4620+
4621+QPushButton[enabled="true"] {
4622+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
4623+ stop: 0 #fecfc2,stop: 1.0 #e44e19);
4624+ border-radius: 5px;
4625+ border-style: solid;
4626+ padding: 6px;
4627+ color: white;
4628+ border-color: #939389;
4629+ border-width: 1px;
4630+ height: 14px;
4631+}
4632+
4633+QPushButton:hover[enabled="true"] {
4634+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
4635+ stop: 0 #fedad1,stop: 1.0 #e47a55);
4636+ border-radius: 5px;
4637+ border-style: solid;
4638+ padding: 6px;
4639+ color: white;
4640+ border-color: #939389;
4641+ border-width: 1px;
4642+ height: 12px;
4643+}
4644+
4645+QPushButton:pressed[enabled="true"] {
4646+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
4647+ stop: 0 #e44e19,stop: 1.0 #fecfc2);
4648+ border-radius: 5px;
4649+ border-style: solid;
4650+ padding: 6px;
4651+ color: white;
4652+ border-color: #939389;
4653+ border-width: 1px;
4654+ height: 12px;
4655+}
4656+
4657+QPushButton[enabled="false"] {
4658+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
4659+ stop: 0 #eaeaea, stop: 1.0 #cacaca);
4660+ border-radius: 5px;
4661+ border-style: solid;
4662+ padding: 6px;
4663+ color: #595959;
4664+ border-color: #939389;
4665+ border-width: 1px;
4666+ height: 12px;
4667+}
4668+
4669+QTabBar::tab {
4670+ height: 15px;
4671+ color: #333333;
4672+ background-color: #e4e0dd;
4673+ border-top-left-radius: 5px;
4674+ border-top-right-radius: 5px;
4675+ border-style: solid;
4676+ padding: 12px;
4677+ border-top-color: #939389;
4678+ border-right-color: #939389;
4679+ border-left-color: white;
4680+ border-bottom-color: #939389;
4681+ border-width: 1px;
4682+}
4683+
4684+QTabBar::tab:selected {
4685+ background-color: white;
4686+ border-top-left-radius: 5px;
4687+ border-top-right-radius: 5px;
4688+ border-style: solid;
4689+ padding: 12px;
4690+ border-top-color: #939389;
4691+ border-right-color: #939389;
4692+ border-left-color: white;
4693+ border-bottom-color: white;
4694+ border-width: 1px;
4695+}
4696+
4697+QTabBar::tab:first:!selected {
4698+ border-left-color: #939389;
4699+ border-left-color: #939389;
4700+}
4701+
4702+QTabBar::tab:first:selected {
4703+ border-left-color: #939389;
4704+}
4705+
4706+QTabBar::tab:middle:!selected {
4707+ border-left-color: #e4e0dd;
4708+}
4709+
4710+QTabBar::tab:last:!selected {
4711+ border-left-color: #e4e0dd;
4712+}
4713+
4714+QTabWidget {
4715+ border-bottom-left-radius: 5px;
4716+ border-bottom-right-radius: 5px;
4717+ border-style: solid;
4718+ padding: 10px;
4719+}
4720+
4721+QTabWidget::pane {
4722+ border-bottom-left-radius: 5px;
4723+ border-bottom-right-radius: 5px;
4724+ border-top-right-radius: 5px;
4725+ border-style: solid;
4726+ border-color: #939389;
4727+ border-width: 1px;
4728+ background: white;
4729+ border-top: 2px solid white;
4730+ }
4731+
4732+QTabBar::tab:hover {
4733+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
4734+ stop: 0 #fafafa, stop: 0.4 #f4f4f4,
4735+ stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
4736+ }
4737+
4738+QPushButton#help_button {
4739+ background: transparent;
4740+ border: none;
4741+ color: white;
4742+ height: 20px;
4743+ text-decoration: underline;
4744+ padding: 0px;
4745+}
4746+
4747+QPushButton#explore_folder_button {
4748+ border: none;
4749+ background: none;
4750+}
4751+
4752+QGroupBox {
4753+ padding-top: 30px;
4754+ border: 0px solid;
4755+ margin-top: 1ex;
4756+ font: bold 15px;
4757+}
4758+
4759+QGroupBox::title {
4760+ color: #333333;
4761+}
4762+
4763+QListWidget {
4764+ background: #f7f6f5;
4765+ alternate-background-color: #efedec;
4766+}
4767+
4768+QListWidget#listDevices::item {
4769+ min-height: 48px;
4770+}
4771+
4772+QLabel#other_devices_label,
4773+QLabel#title_label {
4774+ font: bold 16px;
4775+}
4776+
4777+QLabel#percentage_usage_label {
4778+ margin-top: -4px;
4779+}
4780+
4781+QLabel#follow_us_label {
4782+ color: white;
4783+}
4784+
4785+QFrame#frm_box {
4786+ background: #ffffff;
4787+ border-radius: 5px;
4788+ border-style: solid;
4789+ border-color: #939389;
4790+ border-width: 1px;
4791+ color: white;
4792+ min-height: 100px;
4793+}
4794+
4795+QWidget {
4796+ font-family: "Ubuntu";
4797+}
4798
4799=== removed file 'data/services.ui'
4800--- data/services.ui 2011-03-23 16:06:41 +0000
4801+++ data/services.ui 1970-01-01 00:00:00 +0000
4802@@ -1,391 +0,0 @@
4803-<?xml version="1.0" encoding="UTF-8"?>
4804-<interface>
4805- <requires lib="gtk+" version="2.22"/>
4806- <!-- interface-naming-policy project-wide -->
4807- <object class="GtkVBox" id="itself">
4808- <property name="visible">True</property>
4809- <property name="can_focus">False</property>
4810- <child>
4811- <object class="GtkScrolledWindow" id="scrolledwindow1">
4812- <property name="visible">True</property>
4813- <property name="can_focus">True</property>
4814- <property name="hscrollbar_policy">automatic</property>
4815- <property name="vscrollbar_policy">automatic</property>
4816- <child>
4817- <object class="GtkViewport" id="viewport1">
4818- <property name="visible">True</property>
4819- <property name="can_focus">False</property>
4820- <property name="resize_mode">queue</property>
4821- <property name="shadow_type">none</property>
4822- <child>
4823- <object class="GtkAlignment" id="alignment1">
4824- <property name="visible">True</property>
4825- <property name="can_focus">False</property>
4826- <property name="left_padding">5</property>
4827- <property name="right_padding">5</property>
4828- <child>
4829- <object class="GtkVBox" id="vbox1">
4830- <property name="visible">True</property>
4831- <property name="can_focus">False</property>
4832- <property name="spacing">5</property>
4833- <child>
4834- <object class="GtkFrame" id="files">
4835- <property name="visible">True</property>
4836- <property name="can_focus">False</property>
4837- <property name="label_xalign">0</property>
4838- <property name="shadow_type">out</property>
4839- <child>
4840- <object class="GtkAlignment" id="alignment2">
4841- <property name="visible">True</property>
4842- <property name="can_focus">False</property>
4843- <child>
4844- <object class="GtkHBox" id="hbox2">
4845- <property name="visible">True</property>
4846- <property name="can_focus">False</property>
4847- <property name="border_width">5</property>
4848- <child>
4849- <object class="GtkTable" id="table1">
4850- <property name="visible">True</property>
4851- <property name="can_focus">False</property>
4852- <property name="n_rows">3</property>
4853- <property name="n_columns">3</property>
4854- <property name="column_spacing">5</property>
4855- <property name="row_spacing">5</property>
4856- <child>
4857- <object class="GtkCheckButton" id="file_sync_check">
4858- <property name="visible">True</property>
4859- <property name="can_focus">True</property>
4860- <property name="receives_default">False</property>
4861- <property name="use_action_appearance">False</property>
4862- <property name="draw_indicator">True</property>
4863- </object>
4864- </child>
4865- <child>
4866- <object class="GtkImage" id="image2">
4867- <property name="visible">True</property>
4868- <property name="can_focus">False</property>
4869- <property name="xpad">5</property>
4870- <property name="pixbuf">services-files.png</property>
4871- </object>
4872- <packing>
4873- <property name="left_attach">1</property>
4874- <property name="right_attach">2</property>
4875- </packing>
4876- </child>
4877- <child>
4878- <object class="GtkLabel" id="label1">
4879- <property name="visible">True</property>
4880- <property name="can_focus">False</property>
4881- <property name="xalign">0</property>
4882- <property name="label" translatable="yes">Enable File Sync</property>
4883- </object>
4884- <packing>
4885- <property name="left_attach">2</property>
4886- <property name="right_attach">3</property>
4887- </packing>
4888- </child>
4889- <child>
4890- <object class="GtkLabel" id="label2">
4891- <property name="visible">True</property>
4892- <property name="can_focus">False</property>
4893- <property name="xalign">0</property>
4894- <property name="yalign">0</property>
4895- <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
4896-
4897-Simply drag and drop any file or folder to your Ubuntu One folder on this computer&lt;/span&gt;</property>
4898- <property name="use_markup">True</property>
4899- <property name="wrap">True</property>
4900- <property name="width_chars">35</property>
4901- </object>
4902- <packing>
4903- <property name="left_attach">2</property>
4904- <property name="right_attach">3</property>
4905- <property name="top_attach">1</property>
4906- <property name="bottom_attach">2</property>
4907- </packing>
4908- </child>
4909- <child>
4910- <object class="GtkHButtonBox" id="hbuttonbox1">
4911- <property name="visible">True</property>
4912- <property name="can_focus">False</property>
4913- <child>
4914- <object class="GtkButton" id="file_sync_button">
4915- <property name="label" translatable="yes">_Show me my Ubuntu One folder</property>
4916- <property name="visible">True</property>
4917- <property name="can_focus">True</property>
4918- <property name="receives_default">True</property>
4919- <property name="use_action_appearance">False</property>
4920- <property name="use_underline">True</property>
4921- <signal name="clicked" handler="on_file_sync_button_clicked" swapped="no"/>
4922- </object>
4923- <packing>
4924- <property name="expand">False</property>
4925- <property name="fill">False</property>
4926- <property name="position">0</property>
4927- </packing>
4928- </child>
4929- </object>
4930- <packing>
4931- <property name="left_attach">2</property>
4932- <property name="right_attach">3</property>
4933- <property name="top_attach">2</property>
4934- <property name="bottom_attach">3</property>
4935- </packing>
4936- </child>
4937- <child>
4938- <placeholder/>
4939- </child>
4940- <child>
4941- <placeholder/>
4942- </child>
4943- <child>
4944- <placeholder/>
4945- </child>
4946- <child>
4947- <placeholder/>
4948- </child>
4949- </object>
4950- <packing>
4951- <property name="expand">False</property>
4952- <property name="fill">True</property>
4953- <property name="position">0</property>
4954- </packing>
4955- </child>
4956- <child>
4957- <object class="GtkImage" id="image1">
4958- <property name="visible">True</property>
4959- <property name="can_focus">False</property>
4960- <property name="xpad">5</property>
4961- <property name="ypad">5</property>
4962- <property name="pixbuf">services-files-example.png</property>
4963- </object>
4964- <packing>
4965- <property name="expand">False</property>
4966- <property name="fill">True</property>
4967- <property name="pack_type">end</property>
4968- <property name="position">1</property>
4969- </packing>
4970- </child>
4971- </object>
4972- </child>
4973- </object>
4974- </child>
4975- <child type="label_item">
4976- <placeholder/>
4977- </child>
4978- </object>
4979- <packing>
4980- <property name="expand">False</property>
4981- <property name="fill">True</property>
4982- <property name="position">0</property>
4983- </packing>
4984- </child>
4985- <child>
4986- <object class="GtkFrame" id="replications">
4987- <property name="visible">True</property>
4988- <property name="can_focus">False</property>
4989- <property name="label_xalign">0</property>
4990- <property name="shadow_type">out</property>
4991- <child>
4992- <object class="GtkAlignment" id="alignment3">
4993- <property name="visible">True</property>
4994- <property name="can_focus">False</property>
4995- <child>
4996- <object class="GtkHBox" id="hbox3">
4997- <property name="visible">True</property>
4998- <property name="can_focus">False</property>
4999- <property name="border_width">5</property>
5000- <child>
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: