Merge lp:~dobey/ubuntuone-control-panel/system-font into lp:ubuntuone-control-panel
- system-font
- Merge into trunk
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Natalia Bidart | ||||||||
Approved revision: | 291 | ||||||||
Merged at revision: | 286 | ||||||||
Proposed branch: | lp:~dobey/ubuntuone-control-panel/system-font | ||||||||
Merge into: | lp:ubuntuone-control-panel | ||||||||
Diff against target: |
304 lines (+39/-57) 10 files modified
data/qt/controlpanel.ui (+0/-10) data/qt/loadingoverlay.ui (+0/-5) data/qt/preferences.ui (+3/-3) data/qt/side_widget.ui (+25/-7) data/qt/signin.ui (+0/-7) data/qt/ubuntuone.qss (+2/-20) ubuntuone/controlpanel/gui/qt/controlpanel.py (+2/-2) ubuntuone/controlpanel/gui/qt/loadingoverlay.py (+3/-1) ubuntuone/controlpanel/gui/qt/signin.py (+3/-1) ubuntuone/controlpanel/gui/qt/tests/test_signin.py (+1/-1) |
||||||||
To merge this branch: | bzr merge lp:~dobey/ubuntuone-control-panel/system-font | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email: mp+97094@code.launchpad.net |
Commit message
Don't hard-code the font sizes
Description of the change
Natalia Bidart (nataliabidart) wrote : | # |
* As you can see here http://
- The text in the "side widget" overlaps to the right with the side widget's dotted vertical line
- The welcome_label has to be bigger, perhaps x-large or xx-large
* As you can see here http://
- The window from this branch is bigger than the window from trunk, which is an issue since we need to fit small screens. So, we need the window's height not ot be higher than 525px.
- All the fonts looks a little bigger.
* The font for the "Getting info, please wait" is now much smaller than before.
* Since you're already modifying the NAME_STYLE and PERCENTAGE_STYLE constants, would you please make them unicode?
Roberto Alsina (ralsina) wrote : | # |
I will do screenshots and email to design.
- 285. By Roberto Alsina
-
Fix the welcome page sidebar to auto-resize with text
- 286. By Diego Sarmentero
-
Fix some default spacer sizes
- 287. By dobey
-
Scrap a couple more missed font settings
- 288. By dobey
-
Make the loading overlay text big again
- 289. By dobey
-
Make the _STYLE strings be unicode
Roberto Alsina (ralsina) wrote : | # |
> * As you can see here http://
> - The text in the "side widget" overlaps to the right with the side widget's
> dotted vertical line
> - The welcome_label has to be bigger, perhaps x-large or xx-large
>
> * As you can see here http://
> - The window from this branch is bigger than the window from trunk, which is
> an issue since we need to fit small screens. So, we need the window's height
> not ot be higher than 525px.
> - All the fonts looks a little bigger.
>
> * The font for the "Getting info, please wait" is now much smaller than
> before.
>
> * Since you're already modifying the NAME_STYLE and PERCENTAGE_STYLE
> constants, would you please make them unicode?
I think all these are now fixed.
Natalia Bidart (nataliabidart) wrote : | # |
Thanks for working on this!
The "welcome label" from the first screen (when the user has no credentials) is still very small compared to trunk.
Also, the text in the side widget is "touching" the dotted right separator... can we make the text wrap (this will benefit other languages that will have longer texts) and add a little padding to the right so the text does not reach the separator itself?
Natalia Bidart (nataliabidart) wrote : | # |
Got errors on test run:
[FAIL]
Traceback (most recent call last):
File "/home/
gui.
File "/usr/lib/
% (msg, pformat(first), pformat(second)))
twisted.
a = u'<span style="
b = u'Welcome to Ubuntu One!'
ubuntuone.
-------
Ran 859 tests in 7.101s
FAILED (skips=2, failures=1, successes=856)
dobey (dobey) wrote : | # |
Fixed.
Natalia Bidart (nataliabidart) wrote : | # |
Looks good.
Preview Diff
1 | === modified file 'data/qt/controlpanel.ui' | |||
2 | --- data/qt/controlpanel.ui 2012-03-08 20:46:13 +0000 | |||
3 | +++ data/qt/controlpanel.ui 2012-03-15 20:47:20 +0000 | |||
4 | @@ -139,11 +139,6 @@ | |||
5 | 139 | </item> | 139 | </item> |
6 | 140 | <item> | 140 | <item> |
7 | 141 | <widget class="QLabel" name="quota_usage_label"> | 141 | <widget class="QLabel" name="quota_usage_label"> |
8 | 142 | <property name="font"> | ||
9 | 143 | <font> | ||
10 | 144 | <pointsize>8</pointsize> | ||
11 | 145 | </font> | ||
12 | 146 | </property> | ||
13 | 147 | <property name="text"> | 142 | <property name="text"> |
14 | 148 | <string/> | 143 | <string/> |
15 | 149 | </property> | 144 | </property> |
16 | @@ -309,11 +304,6 @@ | |||
17 | 309 | </item> | 304 | </item> |
18 | 310 | <item> | 305 | <item> |
19 | 311 | <widget class="QLabel" name="follow_us_label"> | 306 | <widget class="QLabel" name="follow_us_label"> |
20 | 312 | <property name="font"> | ||
21 | 313 | <font> | ||
22 | 314 | <pointsize>11</pointsize> | ||
23 | 315 | </font> | ||
24 | 316 | </property> | ||
25 | 317 | <property name="text"> | 307 | <property name="text"> |
26 | 318 | <string notr="true">Talk to us</string> | 308 | <string notr="true">Talk to us</string> |
27 | 319 | </property> | 309 | </property> |
28 | 320 | 310 | ||
29 | === modified file 'data/qt/loadingoverlay.ui' | |||
30 | --- data/qt/loadingoverlay.ui 2012-02-22 15:35:13 +0000 | |||
31 | +++ data/qt/loadingoverlay.ui 2012-03-15 20:47:20 +0000 | |||
32 | @@ -52,11 +52,6 @@ | |||
33 | 52 | <verstretch>0</verstretch> | 52 | <verstretch>0</verstretch> |
34 | 53 | </sizepolicy> | 53 | </sizepolicy> |
35 | 54 | </property> | 54 | </property> |
36 | 55 | <property name="font"> | ||
37 | 56 | <font> | ||
38 | 57 | <pointsize>14</pointsize> | ||
39 | 58 | </font> | ||
40 | 59 | </property> | ||
41 | 60 | <property name="text"> | 55 | <property name="text"> |
42 | 61 | <string notr="true">Getting information, please wait...</string> | 56 | <string notr="true">Getting information, please wait...</string> |
43 | 62 | </property> | 57 | </property> |
44 | 63 | 58 | ||
45 | === modified file 'data/qt/preferences.ui' | |||
46 | --- data/qt/preferences.ui 2012-03-08 20:46:13 +0000 | |||
47 | +++ data/qt/preferences.ui 2012-03-15 20:47:20 +0000 | |||
48 | @@ -7,7 +7,7 @@ | |||
49 | 7 | <x>0</x> | 7 | <x>0</x> |
50 | 8 | <y>0</y> | 8 | <y>0</y> |
51 | 9 | <width>520</width> | 9 | <width>520</width> |
53 | 10 | <height>342</height> | 10 | <height>311</height> |
54 | 11 | </rect> | 11 | </rect> |
55 | 12 | </property> | 12 | </property> |
56 | 13 | <property name="windowTitle"> | 13 | <property name="windowTitle"> |
57 | @@ -98,7 +98,7 @@ | |||
58 | 98 | <property name="sizeHint" stdset="0"> | 98 | <property name="sizeHint" stdset="0"> |
59 | 99 | <size> | 99 | <size> |
60 | 100 | <width>40</width> | 100 | <width>40</width> |
62 | 101 | <height>20</height> | 101 | <height>10</height> |
63 | 102 | </size> | 102 | </size> |
64 | 103 | </property> | 103 | </property> |
65 | 104 | </spacer> | 104 | </spacer> |
66 | @@ -180,7 +180,7 @@ | |||
67 | 180 | <property name="sizeHint" stdset="0"> | 180 | <property name="sizeHint" stdset="0"> |
68 | 181 | <size> | 181 | <size> |
69 | 182 | <width>20</width> | 182 | <width>20</width> |
71 | 183 | <height>40</height> | 183 | <height>10</height> |
72 | 184 | </size> | 184 | </size> |
73 | 185 | </property> | 185 | </property> |
74 | 186 | </spacer> | 186 | </spacer> |
75 | 187 | 187 | ||
76 | === modified file 'data/qt/side_widget.ui' | |||
77 | --- data/qt/side_widget.ui 2012-03-01 22:05:51 +0000 | |||
78 | +++ data/qt/side_widget.ui 2012-03-15 20:47:20 +0000 | |||
79 | @@ -11,17 +11,11 @@ | |||
80 | 11 | </rect> | 11 | </rect> |
81 | 12 | </property> | 12 | </property> |
82 | 13 | <property name="sizePolicy"> | 13 | <property name="sizePolicy"> |
84 | 14 | <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> | 14 | <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> |
85 | 15 | <horstretch>0</horstretch> | 15 | <horstretch>0</horstretch> |
86 | 16 | <verstretch>0</verstretch> | 16 | <verstretch>0</verstretch> |
87 | 17 | </sizepolicy> | 17 | </sizepolicy> |
88 | 18 | </property> | 18 | </property> |
89 | 19 | <property name="minimumSize"> | ||
90 | 20 | <size> | ||
91 | 21 | <width>170</width> | ||
92 | 22 | <height>466</height> | ||
93 | 23 | </size> | ||
94 | 24 | </property> | ||
95 | 25 | <layout class="QVBoxLayout" name="verticalLayout"> | 19 | <layout class="QVBoxLayout" name="verticalLayout"> |
96 | 26 | <property name="spacing"> | 20 | <property name="spacing"> |
97 | 27 | <number>40</number> | 21 | <number>40</number> |
98 | @@ -80,6 +74,12 @@ | |||
99 | 80 | <property name="enabled"> | 74 | <property name="enabled"> |
100 | 81 | <bool>true</bool> | 75 | <bool>true</bool> |
101 | 82 | </property> | 76 | </property> |
102 | 77 | <property name="sizePolicy"> | ||
103 | 78 | <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> | ||
104 | 79 | <horstretch>0</horstretch> | ||
105 | 80 | <verstretch>0</verstretch> | ||
106 | 81 | </sizepolicy> | ||
107 | 82 | </property> | ||
108 | 83 | <property name="text"> | 83 | <property name="text"> |
109 | 84 | <string notr="true">Install</string> | 84 | <string notr="true">Install</string> |
110 | 85 | </property> | 85 | </property> |
111 | @@ -116,6 +116,12 @@ | |||
112 | 116 | <property name="enabled"> | 116 | <property name="enabled"> |
113 | 117 | <bool>true</bool> | 117 | <bool>true</bool> |
114 | 118 | </property> | 118 | </property> |
115 | 119 | <property name="sizePolicy"> | ||
116 | 120 | <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> | ||
117 | 121 | <horstretch>0</horstretch> | ||
118 | 122 | <verstretch>0</verstretch> | ||
119 | 123 | </sizepolicy> | ||
120 | 124 | </property> | ||
121 | 119 | <property name="text"> | 125 | <property name="text"> |
122 | 120 | <string notr="true">Sign In</string> | 126 | <string notr="true">Sign In</string> |
123 | 121 | </property> | 127 | </property> |
124 | @@ -149,6 +155,12 @@ | |||
125 | 149 | <property name="enabled"> | 155 | <property name="enabled"> |
126 | 150 | <bool>true</bool> | 156 | <bool>true</bool> |
127 | 151 | </property> | 157 | </property> |
128 | 158 | <property name="sizePolicy"> | ||
129 | 159 | <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> | ||
130 | 160 | <horstretch>0</horstretch> | ||
131 | 161 | <verstretch>0</verstretch> | ||
132 | 162 | </sizepolicy> | ||
133 | 163 | </property> | ||
134 | 152 | <property name="text"> | 164 | <property name="text"> |
135 | 153 | <string notr="true">Select sync folders</string> | 165 | <string notr="true">Select sync folders</string> |
136 | 154 | </property> | 166 | </property> |
137 | @@ -182,6 +194,12 @@ | |||
138 | 182 | <property name="enabled"> | 194 | <property name="enabled"> |
139 | 183 | <bool>true</bool> | 195 | <bool>true</bool> |
140 | 184 | </property> | 196 | </property> |
141 | 197 | <property name="sizePolicy"> | ||
142 | 198 | <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred"> | ||
143 | 199 | <horstretch>0</horstretch> | ||
144 | 200 | <verstretch>0</verstretch> | ||
145 | 201 | </sizepolicy> | ||
146 | 202 | </property> | ||
147 | 185 | <property name="text"> | 203 | <property name="text"> |
148 | 186 | <string notr="true">Sync, stream, share!</string> | 204 | <string notr="true">Sync, stream, share!</string> |
149 | 187 | </property> | 205 | </property> |
150 | 188 | 206 | ||
151 | === modified file 'data/qt/signin.ui' | |||
152 | --- data/qt/signin.ui 2012-03-02 17:13:04 +0000 | |||
153 | +++ data/qt/signin.ui 2012-03-15 20:47:20 +0000 | |||
154 | @@ -72,13 +72,6 @@ | |||
155 | 72 | </item> | 72 | </item> |
156 | 73 | <item> | 73 | <item> |
157 | 74 | <widget class="QLabel" name="welcome_label"> | 74 | <widget class="QLabel" name="welcome_label"> |
158 | 75 | <property name="font"> | ||
159 | 76 | <font> | ||
160 | 77 | <pointsize>11</pointsize> | ||
161 | 78 | <weight>50</weight> | ||
162 | 79 | <bold>false</bold> | ||
163 | 80 | </font> | ||
164 | 81 | </property> | ||
165 | 82 | <property name="text"> | 75 | <property name="text"> |
166 | 83 | <string notr="true">Welcome to Ubuntu One</string> | 76 | <string notr="true">Welcome to Ubuntu One</string> |
167 | 84 | </property> | 77 | </property> |
168 | 85 | 78 | ||
169 | === modified file 'data/qt/ubuntuone.qss' | |||
170 | --- data/qt/ubuntuone.qss 2012-03-08 21:10:21 +0000 | |||
171 | +++ data/qt/ubuntuone.qss 2012-03-15 20:47:20 +0000 | |||
172 | @@ -12,7 +12,6 @@ | |||
173 | 12 | 12 | ||
174 | 13 | QWidget { | 13 | QWidget { |
175 | 14 | font-family: "Ubuntu"; | 14 | font-family: "Ubuntu"; |
176 | 15 | font-size: 13px; | ||
177 | 16 | color: #333333; | 15 | color: #333333; |
178 | 17 | } | 16 | } |
179 | 18 | 17 | ||
180 | @@ -63,10 +62,6 @@ | |||
181 | 63 | min-height: 100px; | 62 | min-height: 100px; |
182 | 64 | } | 63 | } |
183 | 65 | 64 | ||
184 | 66 | QFrame#frm_box > QLabel { | ||
185 | 67 | font-size: 24px; | ||
186 | 68 | } | ||
187 | 69 | |||
188 | 70 | SideWidget { | 65 | SideWidget { |
189 | 71 | background-color: white; | 66 | background-color: white; |
190 | 72 | border-style: dotted; | 67 | border-style: dotted; |
191 | @@ -273,7 +268,7 @@ | |||
192 | 273 | border: none; | 268 | border: none; |
193 | 274 | margin-top: 1ex; | 269 | margin-top: 1ex; |
194 | 275 | color: #333333; | 270 | color: #333333; |
196 | 276 | font: bold 14px; | 271 | font-weight: bold; |
197 | 277 | } | 272 | } |
198 | 278 | 273 | ||
199 | 279 | QGroupBox#profile, | 274 | QGroupBox#profile, |
200 | @@ -306,7 +301,7 @@ | |||
201 | 306 | } | 301 | } |
202 | 307 | 302 | ||
203 | 308 | QLabel#other_devices_label { | 303 | QLabel#other_devices_label { |
205 | 309 | font: bold 16px; | 304 | font-weight: bold; |
206 | 310 | } | 305 | } |
207 | 311 | 306 | ||
208 | 312 | QLabel#percentage_usage_label { | 307 | QLabel#percentage_usage_label { |
209 | @@ -317,24 +312,11 @@ | |||
210 | 317 | color: white; | 312 | color: white; |
211 | 318 | } | 313 | } |
212 | 319 | 314 | ||
213 | 320 | QLabel#sign_in_label { | ||
214 | 321 | font: 16px; | ||
215 | 322 | } | ||
216 | 323 | |||
217 | 324 | QLabel#email_label, | ||
218 | 325 | QLabel#password_label { | ||
219 | 326 | font-size: 10px; | ||
220 | 327 | } | ||
221 | 328 | |||
222 | 329 | QLabel[OverQuota="true"], | 315 | QLabel[OverQuota="true"], |
223 | 330 | QLabel#warning_label { | 316 | QLabel#warning_label { |
224 | 331 | color: #df2d1f; | 317 | color: #df2d1f; |
225 | 332 | } | 318 | } |
226 | 333 | 319 | ||
227 | 334 | QLabel#welcome_label { | ||
228 | 335 | font-size: 20px; | ||
229 | 336 | } | ||
230 | 337 | |||
231 | 338 | QAbstractItemView { | 320 | QAbstractItemView { |
232 | 339 | border-style: solid; | 321 | border-style: solid; |
233 | 340 | border-color: #898989; | 322 | border-color: #898989; |
234 | 341 | 323 | ||
235 | === modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py' | |||
236 | --- ubuntuone/controlpanel/gui/qt/controlpanel.py 2012-03-01 22:05:51 +0000 | |||
237 | +++ ubuntuone/controlpanel/gui/qt/controlpanel.py 2012-03-15 20:47:20 +0000 | |||
238 | @@ -48,8 +48,8 @@ | |||
239 | 48 | 48 | ||
240 | 49 | logger = setup_logging('qt.controlpanel') | 49 | logger = setup_logging('qt.controlpanel') |
241 | 50 | 50 | ||
244 | 51 | NAME_STYLE = '<br><span style=" font-size:16pt;">%s!</span>' | 51 | NAME_STYLE = u'<br><span style=" font-size:xx-large;">%s!</span>' |
245 | 52 | PERCENTAGE_STYLE = '<span style=" font-size:16pt;">%.0f%%</span>' | 52 | PERCENTAGE_STYLE = u'<span style=" font-size:x-large;">%.0f%%</span>' |
246 | 53 | 53 | ||
247 | 54 | 54 | ||
248 | 55 | class ControlPanel(UbuntuOneBin): | 55 | class ControlPanel(UbuntuOneBin): |
249 | 56 | 56 | ||
250 | === modified file 'ubuntuone/controlpanel/gui/qt/loadingoverlay.py' | |||
251 | --- ubuntuone/controlpanel/gui/qt/loadingoverlay.py 2012-03-08 20:46:13 +0000 | |||
252 | +++ ubuntuone/controlpanel/gui/qt/loadingoverlay.py 2012-03-15 20:47:20 +0000 | |||
253 | @@ -23,6 +23,8 @@ | |||
254 | 23 | from ubuntuone.controlpanel.gui import LOADING_OVERLAY | 23 | from ubuntuone.controlpanel.gui import LOADING_OVERLAY |
255 | 24 | from ubuntuone.controlpanel.gui.qt.ui import loadingoverlay_ui | 24 | from ubuntuone.controlpanel.gui.qt.ui import loadingoverlay_ui |
256 | 25 | 25 | ||
257 | 26 | LOADING_OVERLAY_MARKUP = u'<span style="font-size:xx-large;">{0}</span>' | ||
258 | 27 | |||
259 | 26 | 28 | ||
260 | 27 | class LoadingOverlay(QtGui.QFrame): | 29 | class LoadingOverlay(QtGui.QFrame): |
261 | 28 | """The widget that shows a loading animation and disable the widget below. | 30 | """The widget that shows a loading animation and disable the widget below. |
262 | @@ -45,7 +47,7 @@ | |||
263 | 45 | self.counter = 0 | 47 | self.counter = 0 |
264 | 46 | self.orientation = False | 48 | self.orientation = False |
265 | 47 | 49 | ||
267 | 48 | self.ui.label.setText(LOADING_OVERLAY) | 50 | self.ui.label.setText(LOADING_OVERLAY_MARKUP.format(LOADING_OVERLAY)) |
268 | 49 | 51 | ||
269 | 50 | # Invalid name "paintEvent" | 52 | # Invalid name "paintEvent" |
270 | 51 | # pylint: disable=C0103 | 53 | # pylint: disable=C0103 |
271 | 52 | 54 | ||
272 | === modified file 'ubuntuone/controlpanel/gui/qt/signin.py' | |||
273 | --- ubuntuone/controlpanel/gui/qt/signin.py 2012-03-02 17:13:04 +0000 | |||
274 | +++ ubuntuone/controlpanel/gui/qt/signin.py 2012-03-15 20:47:20 +0000 | |||
275 | @@ -24,6 +24,8 @@ | |||
276 | 24 | from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin | 24 | from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin |
277 | 25 | from ubuntuone.controlpanel.gui.qt.ui import signin_ui | 25 | from ubuntuone.controlpanel.gui.qt.ui import signin_ui |
278 | 26 | 26 | ||
279 | 27 | WELCOME_MARKUP = u'<span style="font-size:xx-large;">{0}</span>' | ||
280 | 28 | |||
281 | 27 | 29 | ||
282 | 28 | class SignInPanel(UbuntuOneBin): | 30 | class SignInPanel(UbuntuOneBin): |
283 | 29 | """The widget for signing in.""" | 31 | """The widget for signing in.""" |
284 | @@ -33,6 +35,6 @@ | |||
285 | 33 | def _setup(self): | 35 | def _setup(self): |
286 | 34 | """Do some extra setupping for the UI.""" | 36 | """Do some extra setupping for the UI.""" |
287 | 35 | super(SignInPanel, self)._setup() | 37 | super(SignInPanel, self)._setup() |
289 | 36 | self.ui.welcome_label.setText(WELCOME_LABEL) | 38 | self.ui.welcome_label.setText(WELCOME_MARKUP.format(WELCOME_LABEL)) |
290 | 37 | self.ui.login_button.setText(EXISTING_ACCOUNT_CHOICE_BUTTON) | 39 | self.ui.login_button.setText(EXISTING_ACCOUNT_CHOICE_BUTTON) |
291 | 38 | self.ui.register_button.setText(SET_UP_ACCOUNT_CHOICE_BUTTON) | 40 | self.ui.register_button.setText(SET_UP_ACCOUNT_CHOICE_BUTTON) |
292 | 39 | 41 | ||
293 | === modified file 'ubuntuone/controlpanel/gui/qt/tests/test_signin.py' | |||
294 | --- ubuntuone/controlpanel/gui/qt/tests/test_signin.py 2012-03-12 16:53:02 +0000 | |||
295 | +++ ubuntuone/controlpanel/gui/qt/tests/test_signin.py 2012-03-15 20:47:20 +0000 | |||
296 | @@ -48,7 +48,7 @@ | |||
297 | 48 | def test_label_is_correct(self): | 48 | def test_label_is_correct(self): |
298 | 49 | """The welcome_label has the correct text.""" | 49 | """The welcome_label has the correct text.""" |
299 | 50 | self.assertEqual(unicode(self.ui.ui.welcome_label.text()), | 50 | self.assertEqual(unicode(self.ui.ui.welcome_label.text()), |
301 | 51 | gui.WELCOME_LABEL) | 51 | gui.WELCOME_MARKUP.format(gui.WELCOME_LABEL)) |
302 | 52 | 52 | ||
303 | 53 | def test_buttos_are_correct(self): | 53 | def test_buttos_are_correct(self): |
304 | 54 | """The buttos have the correct text.""" | 54 | """The buttos have the correct text.""" |
+1 with a cherry on top