Merge lp://qastaging/~dobey/ubuntuone-control-panel/system-font into lp://qastaging/ubuntuone-control-panel

Proposed by dobey
Status: Merged
Approved by: Natalia Bidart
Approved revision: 291
Merged at revision: 286
Proposed branch: lp://qastaging/~dobey/ubuntuone-control-panel/system-font
Merge into: lp://qastaging/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://qastaging/~dobey/ubuntuone-control-panel/system-font
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+97094@code.qastaging.launchpad.net

Commit message

Don't hard-code the font sizes

To post a comment you must log in.
284. By dobey

Link #942025 as it is inadvertently fixed here as well

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

+1 with a cherry on top

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

* As you can see here http://ubuntuone.com/2yQosMCmbymXDbMANMRXvR:
  - 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://ubuntuone.com/2FtOqlLeQnivda6BHeh9tE:
  - 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?

review: Needs Fixing
Revision history for this message
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

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

> * As you can see here http://ubuntuone.com/2yQosMCmbymXDbMANMRXvR:
> - 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://ubuntuone.com/2FtOqlLeQnivda6BHeh9tE:
> - 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.

Revision history for this message
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?

review: Needs Fixing
290. By dobey

Make the welcome text xx-large as well

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

Got errors on test run:

[FAIL]
Traceback (most recent call last):
  File "/home/nessita/canonical/controlpanel/review_system-font/ubuntuone/controlpanel/gui/qt/tests/test_signin.py", line 51, in test_label_is_correct
    gui.WELCOME_LABEL)
  File "/usr/lib/python2.7/dist-packages/twisted/trial/unittest.py", line 270, in assertEqual
    % (msg, pformat(first), pformat(second)))
twisted.trial.unittest.FailTest: not equal:
a = u'<span style="font-size:xx-large;">Welcome to Ubuntu One!</span>'
b = u'Welcome to Ubuntu One!'

ubuntuone.controlpanel.gui.qt.tests.test_signin.SignInPanelTestCase.test_label_is_correct
-------------------------------------------------------------------------------
Ran 859 tests in 7.101s

FAILED (skips=2, failures=1, successes=856)

review: Needs Fixing
291. By dobey

Fix the broken broken test

Revision history for this message
dobey (dobey) wrote :

Fixed.

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

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: