Ubuntu One Control Panel

Merge lp:~chipaca/ubuntuone-control-panel/diego-sarmentero-delivers into lp:ubuntuone-control-panel

  1. diego-sarmentero-delivers
  2. Merge into trunk
Proposed by John Lenton
Status: Rejected
Rejected by: dobey
Proposed branch: lp:~chipaca/ubuntuone-control-panel/diego-sarmentero-delivers
Merge into: lp:ubuntuone-control-panel
Diff against target: 1281 lines (+908/-162)
10 files modified
data/qt/connectingwidget.ui (+123/-0)
data/qt/controlpanel.ui (+495/-148)
data/qt/images.qrc (+6/-0)
data/qt/mainwindow.ui (+13/-1)
data/qt/preferences.ui (+34/-9)
ubuntuone/controlpanel/gui/__init__.py (+4/-2)
ubuntuone/controlpanel/gui/qt/connectingwidget.py (+74/-0)
ubuntuone/controlpanel/gui/qt/controlpanel.py (+4/-2)
ubuntuone/controlpanel/gui/qt/main/ubuntuone.qss (+145/-0)
ubuntuone/controlpanel/gui/qt/main/windows.py (+10/-0)
To merge this branch: bzr merge lp:~chipaca/ubuntuone-control-panel/diego-sarmentero-delivers
Reviewer Review Type Date Requested Status
dobey (community) Needs Resubmitting
Roberto Alsina (community) Approve
John Lenton (community) Approve
Review via email: mp+66803@code.launchpad.net

Commit message

Diego Sarmentero’s initial styling work

Description of the change

Diego Sarmentero’s initial styling work

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) wrote :

I approve this branch.

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

+1 cute!

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (92.8 KiB)

The attempt to merge lp:~chipaca/ubuntuone-control-panel/diego-sarmentero-delivers into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

running build
Compiled data/qt/device.ui into ubuntuone/controlpanel/gui/qt/ui/device_ui.py
Compiled data/qt/mainwindow.ui into ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py
Compiled data/qt/filesyncstatus.ui into ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py
Compiled data/qt/folders.ui into ubuntuone/controlpanel/gui/qt/ui/folders_ui.py
Compiled data/qt/devices.ui into ubuntuone/controlpanel/gui/qt/ui/devices_ui.py
Compiled data/qt/preferences.ui into ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py
compiled data/qt/images.qrc into ubuntuone/controlpanel/gui/qt/ui/images_rc.py
Compiled data/qt/ubuntuonebin.ui into ubuntuone/controlpanel/gui/qt/ui/ubuntuonebin_ui.py
Compiled data/qt/connectingwidget.ui into ubuntuone/controlpanel/gui/qt/ui/connectingwidget_ui.py
Compiled data/qt/services.ui into ubuntuone/controlpanel/gui/qt/ui/services_ui.py
Compiled data/qt/controlpanel.ui into ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py
Compiled data/qt/profile.ui into ubuntuone/controlpanel/gui/qt/ui/profile_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone
copying ubuntuone/__init__.py -> build/lib.linux-i686-2.7/ubuntuone
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/replication_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/utils.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/login_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/dbus_service.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/backend.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/logger.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
copying ubuntuone/controlpanel/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/package_manager.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/widgets.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/connectingwidget.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/ubuntuonebin.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/co...

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (92.5 KiB)

The attempt to merge lp:~chipaca/ubuntuone-control-panel/diego-sarmentero-delivers into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

running build
Compiled data/qt/device.ui into ubuntuone/controlpanel/gui/qt/ui/device_ui.py
Compiled data/qt/mainwindow.ui into ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py
Compiled data/qt/filesyncstatus.ui into ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py
Compiled data/qt/folders.ui into ubuntuone/controlpanel/gui/qt/ui/folders_ui.py
Compiled data/qt/devices.ui into ubuntuone/controlpanel/gui/qt/ui/devices_ui.py
Compiled data/qt/preferences.ui into ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py
compiled data/qt/images.qrc into ubuntuone/controlpanel/gui/qt/ui/images_rc.py
Compiled data/qt/ubuntuonebin.ui into ubuntuone/controlpanel/gui/qt/ui/ubuntuonebin_ui.py
Compiled data/qt/connectingwidget.ui into ubuntuone/controlpanel/gui/qt/ui/connectingwidget_ui.py
Compiled data/qt/services.ui into ubuntuone/controlpanel/gui/qt/ui/services_ui.py
Compiled data/qt/controlpanel.ui into ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py
Compiled data/qt/profile.ui into ubuntuone/controlpanel/gui/qt/ui/profile_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone
copying ubuntuone/__init__.py -> build/lib.linux-i686-2.7/ubuntuone
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/replication_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/utils.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/login_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/dbus_service.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/backend.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/logger.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
copying ubuntuone/controlpanel/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/package_manager.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/widgets.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/connectingwidget.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/ubuntuonebin.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/co...

lp:~chipaca/ubuntuone-control-panel/diego-sarmentero-delivers updated
177. By John Lenton

couple of cleanups to diego’s work

Revision history for this message
dobey (dobey) wrote :

https://code.launchpad.net/~diego-sarmentero/ubuntuone-control-panel/ubuntuone-control-panel/+merge/67064 replaces this.

review: Needs Resubmitting

Unmerged revisions

177. By John Lenton

couple of cleanups to diego’s work

176. By John Lenton

DiegoSarmentero’s initial styling work (#2)

175. By John Lenton

DiegoSarmentero’s initial styling work (awesome).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/external_icon_orange.png'
2Binary files data/external_icon_orange.png 1970-01-01 00:00:00 +0000 and data/external_icon_orange.png 2011-07-05 10:27:59 +0000 differ
3=== added file 'data/external_icon_white.png'
4Binary files data/external_icon_white.png 1970-01-01 00:00:00 +0000 and data/external_icon_white.png 2011-07-05 10:27:59 +0000 differ
5=== added file 'data/qt/connectingwidget.ui'
6--- data/qt/connectingwidget.ui 1970-01-01 00:00:00 +0000
7+++ data/qt/connectingwidget.ui 2011-07-05 10:27:59 +0000
8@@ -0,0 +1,123 @@
9+<?xml version="1.0" encoding="UTF-8"?>
10+<ui version="4.0">
11+ <class>Frame</class>
12+ <widget class="QFrame" name="Frame">
13+ <property name="geometry">
14+ <rect>
15+ <x>0</x>
16+ <y>0</y>
17+ <width>702</width>
18+ <height>230</height>
19+ </rect>
20+ </property>
21+ <property name="windowTitle">
22+ <string>Frame</string>
23+ </property>
24+ <property name="frameShape">
25+ <enum>QFrame::StyledPanel</enum>
26+ </property>
27+ <property name="frameShadow">
28+ <enum>QFrame::Raised</enum>
29+ </property>
30+ <layout class="QVBoxLayout" name="verticalLayout">
31+ <item>
32+ <layout class="QHBoxLayout" name="horizontalLayout_2">
33+ <item>
34+ <spacer name="horizontalSpacer_2">
35+ <property name="orientation">
36+ <enum>Qt::Horizontal</enum>
37+ </property>
38+ <property name="sizeHint" stdset="0">
39+ <size>
40+ <width>40</width>
41+ <height>20</height>
42+ </size>
43+ </property>
44+ </spacer>
45+ </item>
46+ <item>
47+ <widget class="QFrame" name="frmBox">
48+ <property name="minimumSize">
49+ <size>
50+ <width>0</width>
51+ <height>102</height>
52+ </size>
53+ </property>
54+ <property name="styleSheet">
55+ <string notr="true">QFrame#frmBox {
56+ background: #ffffff;
57+ border-radius: 5px;
58+ border-style: solid;
59+ border-color: #939389;
60+ border-width: 1px;
61+ color: white;
62+ min-height: 100px;
63+}</string>
64+ </property>
65+ <property name="frameShape">
66+ <enum>QFrame::StyledPanel</enum>
67+ </property>
68+ <property name="frameShadow">
69+ <enum>QFrame::Raised</enum>
70+ </property>
71+ <layout class="QHBoxLayout" name="horizontalLayout">
72+ <property name="topMargin">
73+ <number>0</number>
74+ </property>
75+ <property name="bottomMargin">
76+ <number>30</number>
77+ </property>
78+ <item>
79+ <widget class="QLabel" name="label">
80+ <property name="sizePolicy">
81+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
82+ <horstretch>0</horstretch>
83+ <verstretch>0</verstretch>
84+ </sizepolicy>
85+ </property>
86+ <property name="font">
87+ <font>
88+ <pointsize>14</pointsize>
89+ </font>
90+ </property>
91+ <property name="text">
92+ <string>Please wait while we connect to the Ubuntu One server...</string>
93+ </property>
94+ </widget>
95+ </item>
96+ </layout>
97+ </widget>
98+ </item>
99+ <item>
100+ <spacer name="horizontalSpacer">
101+ <property name="orientation">
102+ <enum>Qt::Horizontal</enum>
103+ </property>
104+ <property name="sizeHint" stdset="0">
105+ <size>
106+ <width>40</width>
107+ <height>20</height>
108+ </size>
109+ </property>
110+ </spacer>
111+ </item>
112+ </layout>
113+ </item>
114+ <item>
115+ <spacer name="verticalSpacer">
116+ <property name="orientation">
117+ <enum>Qt::Vertical</enum>
118+ </property>
119+ <property name="sizeHint" stdset="0">
120+ <size>
121+ <width>20</width>
122+ <height>20</height>
123+ </size>
124+ </property>
125+ </spacer>
126+ </item>
127+ </layout>
128+ </widget>
129+ <resources/>
130+ <connections/>
131+</ui>
132
133=== modified file 'data/qt/controlpanel.ui'
134--- data/qt/controlpanel.ui 2011-06-21 22:46:08 +0000
135+++ data/qt/controlpanel.ui 2011-07-05 10:27:59 +0000
136@@ -6,8 +6,8 @@
137 <rect>
138 <x>0</x>
139 <y>0</y>
140- <width>374</width>
141- <height>172</height>
142+ <width>536</width>
143+ <height>284</height>
144 </rect>
145 </property>
146 <property name="sizePolicy">
147@@ -19,77 +19,365 @@
148 <property name="windowTitle">
149 <string notr="true">Form</string>
150 </property>
151+ <property name="styleSheet">
152+ <string notr="true"/>
153+ </property>
154 <layout class="QVBoxLayout" name="verticalLayout">
155- <item>
156- <layout class="QHBoxLayout" name="horizontalLayout">
157- <item>
158- <widget class="QLabel" name="greeting_label">
159- <property name="text">
160- <string notr="true"/>
161- </property>
162- </widget>
163- </item>
164- <item>
165- <spacer name="horizontalSpacer">
166- <property name="orientation">
167- <enum>Qt::Horizontal</enum>
168- </property>
169- <property name="sizeHint" stdset="0">
170- <size>
171- <width>40</width>
172- <height>20</height>
173- </size>
174- </property>
175- </spacer>
176- </item>
177- <item>
178- <widget class="QLabel" name="quota_usage_label">
179- <property name="text">
180- <string notr="true"/>
181- </property>
182- </widget>
183- </item>
184- <item>
185- <widget class="QPushButton" name="get_more_space_button">
186- <property name="text">
187- <string>Get more space!</string>
188- </property>
189- </widget>
190- </item>
191- </layout>
192- </item>
193- <item>
194- <layout class="QHBoxLayout" name="horizontalLayout_2">
195- <item>
196- <spacer name="horizontalSpacer_3">
197- <property name="orientation">
198- <enum>Qt::Horizontal</enum>
199- </property>
200- <property name="sizeHint" stdset="0">
201- <size>
202- <width>40</width>
203- <height>20</height>
204- </size>
205- </property>
206- </spacer>
207- </item>
208- <item>
209- <widget class="FileSyncStatus" name="file_sync_status" native="true"/>
210- </item>
211- <item>
212- <spacer name="horizontalSpacer_2">
213- <property name="orientation">
214- <enum>Qt::Horizontal</enum>
215- </property>
216- <property name="sizeHint" stdset="0">
217- <size>
218- <width>40</width>
219- <height>20</height>
220- </size>
221- </property>
222- </spacer>
223- </item>
224- </layout>
225+ <property name="spacing">
226+ <number>4</number>
227+ </property>
228+ <property name="margin">
229+ <number>0</number>
230+ </property>
231+ <item>
232+ <widget class="QFrame" name="frmHeader">
233+ <property name="frameShape">
234+ <enum>QFrame::StyledPanel</enum>
235+ </property>
236+ <property name="frameShadow">
237+ <enum>QFrame::Raised</enum>
238+ </property>
239+ <layout class="QHBoxLayout" name="horizontalLayout_4">
240+ <property name="spacing">
241+ <number>0</number>
242+ </property>
243+ <property name="leftMargin">
244+ <number>15</number>
245+ </property>
246+ <property name="topMargin">
247+ <number>10</number>
248+ </property>
249+ <property name="rightMargin">
250+ <number>10</number>
251+ </property>
252+ <property name="bottomMargin">
253+ <number>10</number>
254+ </property>
255+ <item>
256+ <layout class="QHBoxLayout" name="horizontalLayout">
257+ <property name="spacing">
258+ <number>0</number>
259+ </property>
260+ <item>
261+ <layout class="QVBoxLayout" name="vLayoutGreeting">
262+ <property name="spacing">
263+ <number>0</number>
264+ </property>
265+ <property name="sizeConstraint">
266+ <enum>QLayout::SetDefaultConstraint</enum>
267+ </property>
268+ <item>
269+ <widget class="QLabel" name="label">
270+ <property name="sizePolicy">
271+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
272+ <horstretch>0</horstretch>
273+ <verstretch>0</verstretch>
274+ </sizepolicy>
275+ </property>
276+ <property name="font">
277+ <font>
278+ <pointsize>10</pointsize>
279+ </font>
280+ </property>
281+ <property name="text">
282+ <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
283+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
284+p, li { white-space: pre-wrap; }
285+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
286+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Hi&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
287+ </property>
288+ </widget>
289+ </item>
290+ <item>
291+ <widget class="QLabel" name="greeting_label">
292+ <property name="font">
293+ <font>
294+ <pointsize>20</pointsize>
295+ </font>
296+ </property>
297+ <property name="layoutDirection">
298+ <enum>Qt::LeftToRight</enum>
299+ </property>
300+ <property name="autoFillBackground">
301+ <bool>false</bool>
302+ </property>
303+ <property name="text">
304+ <string notr="true"/>
305+ </property>
306+ <property name="alignment">
307+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
308+ </property>
309+ <property name="margin">
310+ <number>-2</number>
311+ </property>
312+ <property name="indent">
313+ <number>-1</number>
314+ </property>
315+ </widget>
316+ </item>
317+ </layout>
318+ </item>
319+ <item>
320+ <spacer name="horizontalSpacer">
321+ <property name="orientation">
322+ <enum>Qt::Horizontal</enum>
323+ </property>
324+ <property name="sizeType">
325+ <enum>QSizePolicy::Fixed</enum>
326+ </property>
327+ <property name="sizeHint" stdset="0">
328+ <size>
329+ <width>15</width>
330+ <height>20</height>
331+ </size>
332+ </property>
333+ </spacer>
334+ </item>
335+ <item>
336+ <widget class="QFrame" name="frameStorage">
337+ <property name="sizePolicy">
338+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
339+ <horstretch>0</horstretch>
340+ <verstretch>0</verstretch>
341+ </sizepolicy>
342+ </property>
343+ <property name="maximumSize">
344+ <size>
345+ <width>166</width>
346+ <height>16777215</height>
347+ </size>
348+ </property>
349+ <property name="frameShape">
350+ <enum>QFrame::StyledPanel</enum>
351+ </property>
352+ <property name="frameShadow">
353+ <enum>QFrame::Raised</enum>
354+ </property>
355+ <layout class="QHBoxLayout" name="horizontalLayout_7">
356+ <property name="spacing">
357+ <number>0</number>
358+ </property>
359+ <property name="leftMargin">
360+ <number>10</number>
361+ </property>
362+ <property name="topMargin">
363+ <number>0</number>
364+ </property>
365+ <property name="rightMargin">
366+ <number>10</number>
367+ </property>
368+ <property name="bottomMargin">
369+ <number>0</number>
370+ </property>
371+ <item>
372+ <layout class="QVBoxLayout" name="vLayoutStorage">
373+ <property name="sizeConstraint">
374+ <enum>QLayout::SetDefaultConstraint</enum>
375+ </property>
376+ <item>
377+ <widget class="QFrame" name="frmQuota">
378+ <property name="frameShape">
379+ <enum>QFrame::StyledPanel</enum>
380+ </property>
381+ <property name="frameShadow">
382+ <enum>QFrame::Raised</enum>
383+ </property>
384+ <layout class="QVBoxLayout" name="verticalLayout_3">
385+ <property name="spacing">
386+ <number>0</number>
387+ </property>
388+ <property name="leftMargin">
389+ <number>0</number>
390+ </property>
391+ <property name="topMargin">
392+ <number>0</number>
393+ </property>
394+ <property name="rightMargin">
395+ <number>0</number>
396+ </property>
397+ <property name="bottomMargin">
398+ <number>10</number>
399+ </property>
400+ <item>
401+ <widget class="QLabel" name="percentage_usage_label">
402+ <property name="sizePolicy">
403+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
404+ <horstretch>0</horstretch>
405+ <verstretch>0</verstretch>
406+ </sizepolicy>
407+ </property>
408+ <property name="text">
409+ <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
410+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
411+p, li { white-space: pre-wrap; }
412+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
413+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
414+ </property>
415+ </widget>
416+ </item>
417+ <item>
418+ <widget class="QLabel" name="quota_usage_label">
419+ <property name="font">
420+ <font>
421+ <pointsize>8</pointsize>
422+ </font>
423+ </property>
424+ <property name="text">
425+ <string/>
426+ </property>
427+ </widget>
428+ </item>
429+ </layout>
430+ <zorder>quota_usage_label</zorder>
431+ <zorder>percentage_usage_label</zorder>
432+ </widget>
433+ </item>
434+ <item>
435+ <widget class="QPushButton" name="get_more_space_button">
436+ <property name="enabled">
437+ <bool>true</bool>
438+ </property>
439+ <property name="sizePolicy">
440+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
441+ <horstretch>0</horstretch>
442+ <verstretch>0</verstretch>
443+ </sizepolicy>
444+ </property>
445+ <property name="layoutDirection">
446+ <enum>Qt::RightToLeft</enum>
447+ </property>
448+ <property name="autoFillBackground">
449+ <bool>false</bool>
450+ </property>
451+ <property name="text">
452+ <string>Get more storage!</string>
453+ </property>
454+ <property name="icon">
455+ <iconset resource="images.qrc">
456+ <normaloff>:/external_icon_white.png</normaloff>:/external_icon_white.png</iconset>
457+ </property>
458+ <property name="default">
459+ <bool>false</bool>
460+ </property>
461+ </widget>
462+ </item>
463+ </layout>
464+ </item>
465+ </layout>
466+ <zorder></zorder>
467+ </widget>
468+ </item>
469+ <item>
470+ <widget class="QFrame" name="frameStatus">
471+ <property name="sizePolicy">
472+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
473+ <horstretch>0</horstretch>
474+ <verstretch>0</verstretch>
475+ </sizepolicy>
476+ </property>
477+ <property name="maximumSize">
478+ <size>
479+ <width>166</width>
480+ <height>16777215</height>
481+ </size>
482+ </property>
483+ <property name="frameShape">
484+ <enum>QFrame::StyledPanel</enum>
485+ </property>
486+ <property name="frameShadow">
487+ <enum>QFrame::Raised</enum>
488+ </property>
489+ <layout class="QHBoxLayout" name="horizontalLayout_8">
490+ <property name="spacing">
491+ <number>0</number>
492+ </property>
493+ <property name="leftMargin">
494+ <number>10</number>
495+ </property>
496+ <property name="topMargin">
497+ <number>0</number>
498+ </property>
499+ <property name="rightMargin">
500+ <number>0</number>
501+ </property>
502+ <property name="bottomMargin">
503+ <number>0</number>
504+ </property>
505+ <item>
506+ <layout class="QVBoxLayout" name="vLayoutStatus">
507+ <property name="spacing">
508+ <number>10</number>
509+ </property>
510+ <item>
511+ <layout class="QHBoxLayout" name="horizontalLayout_6">
512+ <property name="sizeConstraint">
513+ <enum>QLayout::SetDefaultConstraint</enum>
514+ </property>
515+ <item>
516+ <widget class="QLabel" name="lblStatusIcon">
517+ <property name="sizePolicy">
518+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
519+ <horstretch>0</horstretch>
520+ <verstretch>0</verstretch>
521+ </sizepolicy>
522+ </property>
523+ <property name="text">
524+ <string/>
525+ </property>
526+ <property name="pixmap">
527+ <pixmap resource="images.qrc">:/sync_status_syncing.png</pixmap>
528+ </property>
529+ <property name="alignment">
530+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
531+ </property>
532+ </widget>
533+ </item>
534+ <item>
535+ <widget class="QLabel" name="lblStatus">
536+ <property name="font">
537+ <font>
538+ <family>MS Shell Dlg 2</family>
539+ <pointsize>14</pointsize>
540+ </font>
541+ </property>
542+ <property name="text">
543+ <string>Syncing...</string>
544+ </property>
545+ </widget>
546+ </item>
547+ </layout>
548+ </item>
549+ <item>
550+ <widget class="QPushButton" name="btnSyncing">
551+ <property name="enabled">
552+ <bool>false</bool>
553+ </property>
554+ <property name="sizePolicy">
555+ <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
556+ <horstretch>0</horstretch>
557+ <verstretch>0</verstretch>
558+ </sizepolicy>
559+ </property>
560+ <property name="maximumSize">
561+ <size>
562+ <width>16777215</width>
563+ <height>16777215</height>
564+ </size>
565+ </property>
566+ <property name="text">
567+ <string>Stop syncing</string>
568+ </property>
569+ </widget>
570+ </item>
571+ </layout>
572+ </item>
573+ </layout>
574+ </widget>
575+ </item>
576+ </layout>
577+ </item>
578+ </layout>
579+ </widget>
580 </item>
581 <item>
582 <widget class="QTabWidget" name="tab_widget">
583@@ -133,75 +421,141 @@
584 </widget>
585 </item>
586 <item>
587- <layout class="QHBoxLayout" name="horizontalLayout_3">
588- <item>
589- <widget class="QPushButton" name="help_button">
590- <property name="text">
591- <string>Help</string>
592- </property>
593- </widget>
594- </item>
595- <item>
596- <spacer name="horizontalSpacer_4">
597- <property name="orientation">
598- <enum>Qt::Horizontal</enum>
599- </property>
600- <property name="sizeHint" stdset="0">
601- <size>
602- <width>40</width>
603- <height>20</height>
604- </size>
605- </property>
606- </spacer>
607- </item>
608- <item>
609- <widget class="QLabel" name="follow_us_label">
610- <property name="text">
611- <string>Follow us:</string>
612- </property>
613- </widget>
614- </item>
615- <item>
616- <widget class="QToolButton" name="twitter_button">
617- <property name="styleSheet">
618- <string notr="true">border: 0;</string>
619- </property>
620- <property name="text">
621- <string/>
622- </property>
623- <property name="icon">
624- <iconset resource="images.qrc">
625- <normaloff>:/twitter.png</normaloff>:/twitter.png</iconset>
626- </property>
627- <property name="iconSize">
628- <size>
629- <width>32</width>
630- <height>32</height>
631- </size>
632- </property>
633- </widget>
634- </item>
635- <item>
636- <widget class="QToolButton" name="facebook_button">
637- <property name="styleSheet">
638- <string notr="true">border: 0;</string>
639- </property>
640- <property name="text">
641- <string/>
642- </property>
643- <property name="icon">
644- <iconset resource="images.qrc">
645- <normaloff>:/facebook.png</normaloff>:/facebook.png</iconset>
646- </property>
647- <property name="iconSize">
648- <size>
649- <width>32</width>
650- <height>32</height>
651- </size>
652- </property>
653- </widget>
654- </item>
655- </layout>
656+ <widget class="QFrame" name="frmFooter">
657+ <property name="maximumSize">
658+ <size>
659+ <width>16777215</width>
660+ <height>30</height>
661+ </size>
662+ </property>
663+ <property name="frameShape">
664+ <enum>QFrame::StyledPanel</enum>
665+ </property>
666+ <property name="frameShadow">
667+ <enum>QFrame::Raised</enum>
668+ </property>
669+ <layout class="QVBoxLayout" name="verticalLayout_2">
670+ <property name="spacing">
671+ <number>0</number>
672+ </property>
673+ <property name="margin">
674+ <number>0</number>
675+ </property>
676+ <item>
677+ <layout class="QHBoxLayout" name="hLayoutFooter">
678+ <property name="spacing">
679+ <number>5</number>
680+ </property>
681+ <property name="leftMargin">
682+ <number>0</number>
683+ </property>
684+ <property name="rightMargin">
685+ <number>0</number>
686+ </property>
687+ <item>
688+ <widget class="QPushButton" name="help_button">
689+ <property name="font">
690+ <font>
691+ <pointsize>10</pointsize>
692+ <underline>true</underline>
693+ </font>
694+ </property>
695+ <property name="cursor">
696+ <cursorShape>PointingHandCursor</cursorShape>
697+ </property>
698+ <property name="layoutDirection">
699+ <enum>Qt::RightToLeft</enum>
700+ </property>
701+ <property name="text">
702+ <string>Get help online</string>
703+ </property>
704+ <property name="icon">
705+ <iconset resource="images.qrc">
706+ <normaloff>:/external_icon_white.png</normaloff>:/external_icon_white.png</iconset>
707+ </property>
708+ <property name="flat">
709+ <bool>false</bool>
710+ </property>
711+ </widget>
712+ </item>
713+ <item>
714+ <spacer name="horizontalSpacer_4">
715+ <property name="orientation">
716+ <enum>Qt::Horizontal</enum>
717+ </property>
718+ <property name="sizeHint" stdset="0">
719+ <size>
720+ <width>40</width>
721+ <height>20</height>
722+ </size>
723+ </property>
724+ </spacer>
725+ </item>
726+ <item>
727+ <widget class="QLabel" name="follow_us_label">
728+ <property name="font">
729+ <font>
730+ <pointsize>11</pointsize>
731+ </font>
732+ </property>
733+ <property name="styleSheet">
734+ <string notr="true">color: white;</string>
735+ </property>
736+ <property name="text">
737+ <string>Talk to us</string>
738+ </property>
739+ </widget>
740+ </item>
741+ <item>
742+ <widget class="QToolButton" name="twitter_button">
743+ <property name="cursor">
744+ <cursorShape>PointingHandCursor</cursorShape>
745+ </property>
746+ <property name="styleSheet">
747+ <string notr="true">border: 0;</string>
748+ </property>
749+ <property name="text">
750+ <string/>
751+ </property>
752+ <property name="icon">
753+ <iconset resource="images.qrc">
754+ <normaloff>:/twitter.png</normaloff>:/twitter.png</iconset>
755+ </property>
756+ <property name="iconSize">
757+ <size>
758+ <width>22</width>
759+ <height>22</height>
760+ </size>
761+ </property>
762+ </widget>
763+ </item>
764+ <item>
765+ <widget class="QToolButton" name="facebook_button">
766+ <property name="cursor">
767+ <cursorShape>PointingHandCursor</cursorShape>
768+ </property>
769+ <property name="styleSheet">
770+ <string notr="true">border: 0;</string>
771+ </property>
772+ <property name="text">
773+ <string/>
774+ </property>
775+ <property name="icon">
776+ <iconset resource="images.qrc">
777+ <normaloff>:/facebook.png</normaloff>:/facebook.png</iconset>
778+ </property>
779+ <property name="iconSize">
780+ <size>
781+ <width>22</width>
782+ <height>22</height>
783+ </size>
784+ </property>
785+ </widget>
786+ </item>
787+ </layout>
788+ </item>
789+ </layout>
790+ </widget>
791 </item>
792 </layout>
793 </widget>
794@@ -236,19 +590,12 @@
795 <header>ubuntuone.controlpanel.gui.qt.profile</header>
796 <container>1</container>
797 </customwidget>
798- <customwidget>
799- <class>FileSyncStatus</class>
800- <extends>QWidget</extends>
801- <header>ubuntuone.controlpanel.gui.qt.filesyncstatus</header>
802- <container>1</container>
803- </customwidget>
804 </customwidgets>
805 <tabstops>
806 <tabstop>tab_widget</tabstop>
807 <tabstop>help_button</tabstop>
808 <tabstop>twitter_button</tabstop>
809 <tabstop>facebook_button</tabstop>
810- <tabstop>get_more_space_button</tabstop>
811 </tabstops>
812 <resources>
813 <include location="images.qrc"/>
814
815=== modified file 'data/qt/images.qrc'
816--- data/qt/images.qrc 2011-06-02 19:55:45 +0000
817+++ data/qt/images.qrc 2011-07-05 10:27:59 +0000
818@@ -1,8 +1,14 @@
819 <RCC>
820 <qresource prefix="/">
821+ <file>../u1icon.png</file>
822+ <file>../external_icon_orange.png</file>
823+ <file>../sync_status_disconnected.png</file>
824+ <file>../sync_status_sync_done.png</file>
825+ <file>../sync_status_syncing.png</file>
826 <file>../computer.png</file>
827 <file>../phone.png</file>
828 <file>../twitter.png</file>
829 <file>../facebook.png</file>
830+ <file>../external_icon_white.png</file>
831 </qresource>
832 </RCC>
833
834=== modified file 'data/qt/mainwindow.ui'
835--- data/qt/mainwindow.ui 2011-05-26 22:18:04 +0000
836+++ data/qt/mainwindow.ui 2011-07-05 10:27:59 +0000
837@@ -25,6 +25,10 @@
838 <property name="windowTitle">
839 <string>Ubuntu One Control Panel</string>
840 </property>
841+ <property name="windowIcon">
842+ <iconset resource="images.qrc">
843+ <normaloff>:/u1icon.png</normaloff>:/u1icon.png</iconset>
844+ </property>
845 <widget class="QWidget" name="centralwidget">
846 <property name="sizePolicy">
847 <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
848@@ -33,6 +37,12 @@
849 </sizepolicy>
850 </property>
851 <layout class="QVBoxLayout" name="verticalLayout">
852+ <property name="spacing">
853+ <number>0</number>
854+ </property>
855+ <property name="margin">
856+ <number>3</number>
857+ </property>
858 <item>
859 <widget class="ControlPanel" name="control_panel" native="true"/>
860 </item>
861@@ -47,6 +57,8 @@
862 <container>1</container>
863 </customwidget>
864 </customwidgets>
865- <resources/>
866+ <resources>
867+ <include location="images.qrc"/>
868+ </resources>
869 <connections/>
870 </ui>
871
872=== modified file 'data/qt/preferences.ui'
873--- data/qt/preferences.ui 2011-06-20 23:23:45 +0000
874+++ data/qt/preferences.ui 2011-07-05 10:27:59 +0000
875@@ -13,13 +13,22 @@
876 <property name="windowTitle">
877 <string notr="true">Form</string>
878 </property>
879+ <property name="styleSheet">
880+ <string notr="true"/>
881+ </property>
882 <layout class="QVBoxLayout" name="verticalLayout">
883+ <property name="margin">
884+ <number>0</number>
885+ </property>
886 <item>
887 <widget class="QGroupBox" name="verticalGroupBox">
888 <property name="title">
889 <string>Bandwidth settings</string>
890 </property>
891 <layout class="QGridLayout" name="gridLayout">
892+ <property name="verticalSpacing">
893+ <number>10</number>
894+ </property>
895 <item row="0" column="0">
896 <widget class="QCheckBox" name="limit_uploads_checkbox">
897 <property name="text">
898@@ -81,7 +90,7 @@
899 </property>
900 </spacer>
901 </item>
902- <item row="3" column="0" colspan="3">
903+ <item row="4" column="0" colspan="3">
904 <widget class="QLabel" name="label_2">
905 <property name="text">
906 <string>Please note that your files will not sync if you set bandwidth to 0</string>
907@@ -94,6 +103,19 @@
908 </property>
909 </widget>
910 </item>
911+ <item row="3" column="0">
912+ <spacer name="verticalSpacer_2">
913+ <property name="orientation">
914+ <enum>Qt::Vertical</enum>
915+ </property>
916+ <property name="sizeHint" stdset="0">
917+ <size>
918+ <width>40</width>
919+ <height>20</height>
920+ </size>
921+ </property>
922+ </spacer>
923+ </item>
924 </layout>
925 </widget>
926 </item>
927@@ -103,6 +125,9 @@
928 <string>File Sync Settings</string>
929 </property>
930 <layout class="QVBoxLayout" name="verticalLayout_1">
931+ <property name="spacing">
932+ <number>10</number>
933+ </property>
934 <item>
935 <widget class="QCheckBox" name="autoconnect_checkbox">
936 <property name="text">
937@@ -137,13 +162,6 @@
938 <item>
939 <layout class="QHBoxLayout" name="horizontalLayout">
940 <item>
941- <widget class="QPushButton" name="restore_defaults_button">
942- <property name="text">
943- <string>Restore default configuration</string>
944- </property>
945- </widget>
946- </item>
947- <item>
948 <spacer name="horizontalSpacer">
949 <property name="orientation">
950 <enum>Qt::Horizontal</enum>
951@@ -159,7 +177,14 @@
952 <item>
953 <widget class="QPushButton" name="apply_changes_button">
954 <property name="text">
955- <string>Apply changes</string>
956+ <string>Apply these settings</string>
957+ </property>
958+ </widget>
959+ </item>
960+ <item>
961+ <widget class="QPushButton" name="restore_defaults_button">
962+ <property name="text">
963+ <string>Default settings</string>
964 </property>
965 </widget>
966 </item>
967
968=== added file 'data/sync_status_disconnected.png'
969Binary files data/sync_status_disconnected.png 1970-01-01 00:00:00 +0000 and data/sync_status_disconnected.png 2011-07-05 10:27:59 +0000 differ
970=== added file 'data/sync_status_sync_done.png'
971Binary files data/sync_status_sync_done.png 1970-01-01 00:00:00 +0000 and data/sync_status_sync_done.png 2011-07-05 10:27:59 +0000 differ
972=== added file 'data/sync_status_syncing.png'
973Binary files data/sync_status_syncing.png 1970-01-01 00:00:00 +0000 and data/sync_status_syncing.png 2011-07-05 10:27:59 +0000 differ
974=== added file 'data/u1icon.png'
975Binary files data/u1icon.png 1970-01-01 00:00:00 +0000 and data/u1icon.png 2011-07-05 10:27:59 +0000 differ
976=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
977--- ubuntuone/controlpanel/gui/__init__.py 2011-07-04 10:57:17 +0000
978+++ ubuntuone/controlpanel/gui/__init__.py 2011-07-05 10:27:59 +0000
979@@ -126,7 +126,7 @@
980 FILE_SYNC_STOPPED = _('File Sync is stopped.')
981 FILE_SYNC_SYNCING = _('File Sync in progress...')
982 FREE_SPACE_TEXT = _('%(free_space)s available storage')
983-GREETING = _('Hello %(user_display_name)s!')
984+GREETING = _('%(user_display_name)s!')
985 INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s'
986 '</i> in order to enable more sync services.')
987 INSTALL_PLUGIN = _('Install the %(plugin_name)s for the sync service: '
988@@ -143,7 +143,9 @@
989 NO_DEVICES = _('No devices to show.')
990 NO_FOLDERS = _('No folders to show.')
991 NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
992-QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
993+PERCENTAGE_LABEL = _('<p><span style=" font-size:16pt;">(%(percentage).0f%%)' \
994+ '</span> used</p>')
995+QUOTA_LABEL = _('%(used)s of %(total)s')
996 SERVICES_BUTTON_TOOLTIP = _('Manage the sync services')
997 SERVICES_TITLE = _('Enable the sync services for this computer.')
998 SETTINGS_CHANGE_ERROR = _('The settings could not be changed,\n'
999
1000=== added file 'ubuntuone/controlpanel/gui/qt/connectingwidget.py'
1001--- ubuntuone/controlpanel/gui/qt/connectingwidget.py 1970-01-01 00:00:00 +0000
1002+++ ubuntuone/controlpanel/gui/qt/connectingwidget.py 2011-07-05 10:27:59 +0000
1003@@ -0,0 +1,74 @@
1004+# -*- coding: utf-8 -*-
1005+
1006+# Authors: Diego Sarmentero <diego.sarmentero@gmail.com>
1007+#
1008+# Copyright 2011 Canonical Ltd.
1009+#
1010+# This program is free software: you can redistribute it and/or modify it
1011+# under the terms of the GNU General Public License version 3, as published
1012+# by the Free Software Foundation.
1013+#
1014+# This program is distributed in the hope that it will be useful, but
1015+# WITHOUT ANY WARRANTY; without even the implied warranties of
1016+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
1017+# PURPOSE. See the GNU General Public License for more details.
1018+#
1019+# You should have received a copy of the GNU General Public License along
1020+# with this program. If not, see <http://www.gnu.org/licenses/>.
1021+
1022+"""Loading animation over a widget"""
1023+
1024+from PyQt4 import QtGui
1025+from PyQt4 import QtCore
1026+
1027+from ubuntuone.controlpanel.gui.qt.ui import connectingwidget_ui
1028+
1029+
1030+class ConnectingWidget(QtGui.QFrame):
1031+
1032+ def __init__(self, parent=None):
1033+ QtGui.QFrame.__init__(self, parent)
1034+ self.ui = connectingwidget_ui.Ui_Frame()
1035+ self.ui.setupUi(self)
1036+ self.ui.frmBox.installEventFilter(self)
1037+ palette = QtGui.QPalette(self.palette())
1038+ palette.setColor(palette.Background, QtCore.Qt.transparent)
1039+ self.setPalette(palette)
1040+
1041+ def paintEvent(self, event):
1042+ painter = QtGui.QPainter()
1043+ painter.begin(self)
1044+ painter.setRenderHint(QtGui.QPainter.Antialiasing)
1045+ painter.fillRect(event.rect(), QtGui.QBrush(
1046+ QtGui.QColor(255, 255, 255, 127)))
1047+ painter.setPen(QtGui.QPen(QtCore.Qt.NoPen))
1048+ painter.end()
1049+
1050+ def eventFilter(self, obj, event):
1051+ if obj == self.ui.frmBox and event.type() == QtCore.QEvent.Paint:
1052+ painter = QtGui.QPainter()
1053+ painter.begin(obj)
1054+ pos_x = self.ui.frmBox.width() / 3
1055+ x_padding = pos_x / 5
1056+ for i in xrange(5):
1057+ if (self.counter / 5) % 5 == i:
1058+ painter.setBrush(QtGui.QBrush(
1059+ QtGui.QColor(221, 72, 20, 50 + i * 50)))
1060+ else:
1061+ painter.setBrush(QtGui.QBrush(
1062+ QtGui.QColor(221, 72, 20, 255)))
1063+ painter.drawEllipse(
1064+ pos_x + (x_padding * i),
1065+ self.ui.frmBox.height() / 2 + 10,
1066+ 15, 15)
1067+
1068+ painter.end()
1069+ return False
1070+
1071+ def showEvent(self, event):
1072+ self.timer = self.startTimer(50)
1073+ self.counter = 0
1074+
1075+ def timerEvent(self, event):
1076+ self.counter += 1
1077+ self.update()
1078
1079=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
1080--- ubuntuone/controlpanel/gui/qt/controlpanel.py 2011-06-22 23:53:46 +0000
1081+++ ubuntuone/controlpanel/gui/qt/controlpanel.py 2011-07-05 10:27:59 +0000
1082@@ -30,6 +30,7 @@
1083 humanize,
1084 EDIT_ACCOUNT_LINK,
1085 GREETING,
1086+ PERCENTAGE_LABEL,
1087 QUOTA_LABEL,
1088 )
1089 from ubuntuone.controlpanel.gui.qt import uri_hook
1090@@ -73,8 +74,9 @@
1091
1092 used = int(info['quota_used'])
1093 total = int(info['quota_total'])
1094- data = {'used': humanize(used), 'total': humanize(total),
1095- 'percentage': (used / total) * 100}
1096+ percentage = {'percentage': (used / total) * 100}
1097+ data = {'used': humanize(used), 'total': humanize(total)}
1098+ self.ui.percentage_usage_label.setText(PERCENTAGE_LABEL % percentage)
1099 self.ui.quota_usage_label.setText(QUOTA_LABEL % data)
1100
1101 @QtCore.pyqtSlot()
1102
1103=== added file 'ubuntuone/controlpanel/gui/qt/main/ubuntuone.qss'
1104--- ubuntuone/controlpanel/gui/qt/main/ubuntuone.qss 1970-01-01 00:00:00 +0000
1105+++ ubuntuone/controlpanel/gui/qt/main/ubuntuone.qss 2011-07-05 10:27:59 +0000
1106@@ -0,0 +1,145 @@
1107+QMainWindow {
1108+ background-color: #dd4814;
1109+}
1110+
1111+QFrame#frmHeader {
1112+ background: #ffffff;
1113+ border-radius: 5px;
1114+ border-style: solid;
1115+ border-color: #939389;
1116+ border-width: 1px;
1117+ color: white;
1118+ min-height: 100px;
1119+}
1120+
1121+/*Change btnSyncing horizontal policy to Fixed to apply this
1122+QPushButton#btnSyncing{
1123+ margin-left: 20px;
1124+ padding-left: 25px;
1125+ padding-right: 25px;
1126+}*/
1127+
1128+QPushButton[enabled="true"] {
1129+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
1130+ stop: 0 #fecfc2,stop: 1.0 #e44e19);
1131+ border-radius: 5px;
1132+ border-style: solid;
1133+ padding: 6px;
1134+ color: white;
1135+ border-color: #939389;
1136+ border-width: 1px;
1137+ height: 12px;
1138+}
1139+
1140+QPushButton:hover[enabled="true"] {
1141+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
1142+ stop: 0 #fedad1,stop: 1.0 #e47a55);
1143+ border-radius: 5px;
1144+ border-style: solid;
1145+ padding: 6px;
1146+ color: white;
1147+ border-color: #939389;
1148+ border-width: 1px;
1149+ height: 12px;
1150+}
1151+
1152+QPushButton[enabled="false"] {
1153+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
1154+ stop: 0 #eaeaea, stop: 1.0 #cacaca);
1155+ border-radius: 5px;
1156+ border-style: solid;
1157+ padding: 6px;
1158+ color: #595959;
1159+ border-color: #939389;
1160+ border-width: 1px;
1161+ height: 12px;
1162+}
1163+
1164+QTabBar::tab{
1165+ height: 15px;
1166+ color: #333333;
1167+ background-color: #e4e0dd;
1168+ border-top-left-radius: 5px;
1169+ border-top-right-radius: 5px;
1170+ border-style: solid;
1171+ padding: 10px;
1172+ border-top-color: #939389;
1173+ border-right-color: #939389;
1174+ border-left-color: white;
1175+ border-bottom-color: #939389;
1176+ border-width: 1px;
1177+}
1178+
1179+QTabBar::tab:selected{
1180+ background-color: white;
1181+ border-top-left-radius: 5px;
1182+ border-top-right-radius: 5px;
1183+ border-style: solid;
1184+ padding: 10px;
1185+ border-top-color: #939389;
1186+ border-right-color: #939389;
1187+ border-left-color: white;
1188+ border-bottom-color: white;
1189+ border-width: 1px;
1190+}
1191+
1192+QTabBar::tab:first:!selected{
1193+ border-left-color: #939389;
1194+ border-left-color: #939389;
1195+}
1196+
1197+QTabBar::tab:first:selected{
1198+ border-left-color: #939389;
1199+}
1200+
1201+QTabBar::tab:middle:!selected{
1202+ border-left-color: #e4e0dd;
1203+}
1204+
1205+QTabBar::tab:last:!selected{
1206+ border-left-color: #e4e0dd;
1207+}
1208+
1209+QTabWidget{
1210+ border-bottom-left-radius: 5px;
1211+ border-bottom-right-radius: 5px;
1212+ border-style: solid;
1213+ padding: 10px;
1214+}
1215+
1216+QTabWidget::pane {
1217+ border-bottom-left-radius: 5px;
1218+ border-bottom-right-radius: 5px;
1219+ border-top-right-radius: 5px;
1220+ border-style: solid;
1221+ border-color: #939389;
1222+ border-width: 1px;
1223+ background: white;
1224+ border-top: 2px solid white;
1225+ }
1226+
1227+QTabBar::tab:hover {
1228+ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
1229+ stop: 0 #fafafa, stop: 0.4 #f4f4f4,
1230+ stop: 0.5 #e7e7e7, stop: 1.0 #fafafa);
1231+ }
1232+
1233+QPushButton#help_button{
1234+ background: transparent;
1235+ border: none;
1236+ color: white;
1237+ height: 20px;
1238+ text-decoration: underline;
1239+ padding: 0px;
1240+}
1241+
1242+QGroupBox {
1243+ padding-top: 30px;
1244+ border: 0px solid;
1245+ margin-top: 1ex;
1246+ font: bold 15px;
1247+}
1248+
1249+QGroupBox::title {
1250+ color: #333333;
1251+}
1252
1253=== modified file 'ubuntuone/controlpanel/gui/qt/main/windows.py'
1254--- ubuntuone/controlpanel/gui/qt/main/windows.py 2011-06-30 21:51:20 +0000
1255+++ ubuntuone/controlpanel/gui/qt/main/windows.py 2011-07-05 10:27:59 +0000
1256@@ -18,8 +18,11 @@
1257 """Reactor installation for windows."""
1258
1259 import sys
1260+import os
1261
1262 from PyQt4 import Qt
1263+from PyQt4.QtCore import QFile
1264+from PyQt4.QtCore import QString
1265
1266
1267 def main(switch_to='', alert=False):
1268@@ -34,6 +37,13 @@
1269 # The main loop MUST be initialized before importing the reactor
1270 # pylint: disable=W0612
1271 app = Qt.QApplication(sys.argv)
1272+ #Apply Style Sheet
1273+ filePath = os.path.join(os.path.abspath(os.path.dirname(__file__)),
1274+ 'ubuntuone.qss')
1275+ qss = open(filePath, 'r')
1276+ stylesheet = ''.join(qss.readlines())
1277+ qss.close()
1278+ app.setStyleSheet(stylesheet)
1279
1280 # pylint: disable=W0404, F0401
1281 from twisted.internet import reactor

Subscribers

People subscribed via source and target branches