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

[dobey]

Don't hard-code the font sizes

[lp:~dobey/ubuntuone-control-panel/system-font]

284. By dobey on 2012-03-13

Link #942025 as it is inadvertently fixed here as well

[Roberto Alsina (ralsina)]

+1 with a cherry on top

review: Approve

[Natalia Bidart (nataliabidart)]

* 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

[Roberto Alsina (ralsina)]

I will do screenshots and email to design.

[lp:~dobey/ubuntuone-control-panel/system-font]

285. By Roberto Alsina on 2012-03-14

Fix the welcome page sidebar to auto-resize with text

286. By Diego Sarmentero on 2012-03-14

Fix some default spacer sizes

287. By dobey on 2012-03-14

Scrap a couple more missed font settings

288. By dobey on 2012-03-14

Make the loading overlay text big again

289. By dobey on 2012-03-14

Make the _STYLE strings be unicode

[Roberto Alsina (ralsina)]

> * 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.

[Natalia Bidart (nataliabidart)]

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

[lp:~dobey/ubuntuone-control-panel/system-font]

290. By dobey on 2012-03-15

Make the welcome text xx-large as well

[Natalia Bidart (nataliabidart)]

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

[lp:~dobey/ubuntuone-control-panel/system-font]

291. By dobey on 2012-03-15

Fix the broken broken test

[dobey (dobey)]

Fixed.

[Natalia Bidart (nataliabidart)]

Looks good.

review: Approve

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2012-03-08 20:46:13 +0000
+++ data/qt/controlpanel.ui	2012-03-15 20:47:20 +0000
@@ -139,11 +139,6 @@
                   </item>
                   <item>
                    <widget class="QLabel" name="quota_usage_label">
-                    <property name="font">
-                     <font>
-                      <pointsize>8</pointsize>
-                     </font>
-                    </property>
                     <property name="text">
                      <string/>
                     </property>
@@ -309,11 +304,6 @@
       </item>
       <item>
        <widget class="QLabel" name="follow_us_label">
-        <property name="font">
-         <font>
-          <pointsize>11</pointsize>
-         </font>
-        </property>
         <property name="text">
          <string notr="true">Talk to us</string>
         </property>

=== modified file 'data/qt/loadingoverlay.ui'
--- data/qt/loadingoverlay.ui	2012-02-22 15:35:13 +0000
+++ data/qt/loadingoverlay.ui	2012-03-15 20:47:20 +0000
@@ -52,11 +52,6 @@
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="font">
-           <font>
-            <pointsize>14</pointsize>
-           </font>
-          </property>
           <property name="text">
            <string notr="true">Getting information, please wait...</string>
           </property>

=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2012-03-08 20:46:13 +0000
+++ data/qt/preferences.ui	2012-03-15 20:47:20 +0000
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>520</width>
-    <height>342</height>
+    <height>311</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -98,7 +98,7 @@
         <property name="sizeHint" stdset="0">
          <size>
           <width>40</width>
-          <height>20</height>
+          <height>10</height>
          </size>
         </property>
        </spacer>
@@ -180,7 +180,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>10</height>
       </size>
      </property>
     </spacer>

=== modified file 'data/qt/side_widget.ui'
--- data/qt/side_widget.ui	2012-03-01 22:05:51 +0000
+++ data/qt/side_widget.ui	2012-03-15 20:47:20 +0000
@@ -11,17 +11,11 @@
    </rect>
   </property>
   <property name="sizePolicy">
-   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>170</width>
-    <height>466</height>
-   </size>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>40</number>
@@ -80,6 +74,12 @@
           <property name="enabled">
            <bool>true</bool>
           </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string notr="true">Install</string>
           </property>
@@ -116,6 +116,12 @@
           <property name="enabled">
            <bool>true</bool>
           </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string notr="true">Sign In</string>
           </property>
@@ -149,6 +155,12 @@
           <property name="enabled">
            <bool>true</bool>
           </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string notr="true">Select sync folders</string>
           </property>
@@ -182,6 +194,12 @@
           <property name="enabled">
            <bool>true</bool>
           </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string notr="true">Sync, stream, share!</string>
           </property>

=== modified file 'data/qt/signin.ui'
--- data/qt/signin.ui	2012-03-02 17:13:04 +0000
+++ data/qt/signin.ui	2012-03-15 20:47:20 +0000
@@ -72,13 +72,6 @@
       </item>
       <item>
        <widget class="QLabel" name="welcome_label">
-        <property name="font">
-         <font>
-          <pointsize>11</pointsize>
-          <weight>50</weight>
-          <bold>false</bold>
-         </font>
-        </property>
         <property name="text">
          <string notr="true">Welcome to Ubuntu One</string>
         </property>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2012-03-08 21:10:21 +0000
+++ data/qt/ubuntuone.qss	2012-03-15 20:47:20 +0000
@@ -12,7 +12,6 @@
 
 QWidget {
     font-family: "Ubuntu";
-    font-size: 13px;
     color: #333333;
 }
 
@@ -63,10 +62,6 @@
     min-height: 100px;
 }
 
-QFrame#frm_box > QLabel {
-    font-size: 24px;
-}
-
 SideWidget {
     background-color: white;
     border-style: dotted;
@@ -273,7 +268,7 @@
     border: none;
     margin-top: 1ex;
     color: #333333;
-    font: bold 14px;
+    font-weight: bold;
 }
 
 QGroupBox#profile,
@@ -306,7 +301,7 @@
 }
 
 QLabel#other_devices_label {
-    font: bold 16px;
+    font-weight: bold;
 }
 
 QLabel#percentage_usage_label {
@@ -317,24 +312,11 @@
     color: white;
 }
 
-QLabel#sign_in_label {
-    font: 16px;
-}
-
-QLabel#email_label,
-QLabel#password_label {
-    font-size: 10px;
-}
-
 QLabel[OverQuota="true"],
 QLabel#warning_label {
     color: #df2d1f;
 }
 
-QLabel#welcome_label {
-    font-size: 20px;
-}
-
 QAbstractItemView {
     border-style: solid;
     border-color: #898989;

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-03-01 22:05:51 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-03-15 20:47:20 +0000
@@ -48,8 +48,8 @@
 
 logger = setup_logging('qt.controlpanel')
 
-NAME_STYLE = '<br><span style=" font-size:16pt;">%s!</span>'
-PERCENTAGE_STYLE = '<span style=" font-size:16pt;">%.0f%%</span>'
+NAME_STYLE = u'<br><span style=" font-size:xx-large;">%s!</span>'
+PERCENTAGE_STYLE = u'<span style=" font-size:x-large;">%.0f%%</span>'
 
 
 class ControlPanel(UbuntuOneBin):

=== modified file 'ubuntuone/controlpanel/gui/qt/loadingoverlay.py'
--- ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2012-03-08 20:46:13 +0000
+++ ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2012-03-15 20:47:20 +0000
@@ -23,6 +23,8 @@
 from ubuntuone.controlpanel.gui import LOADING_OVERLAY
 from ubuntuone.controlpanel.gui.qt.ui import loadingoverlay_ui
 
+LOADING_OVERLAY_MARKUP = u'<span style="font-size:xx-large;">{0}</span>'
+
 
 class LoadingOverlay(QtGui.QFrame):
     """The widget that shows a loading animation and disable the widget below.
@@ -45,7 +47,7 @@
         self.counter = 0
         self.orientation = False
 
-        self.ui.label.setText(LOADING_OVERLAY)
+        self.ui.label.setText(LOADING_OVERLAY_MARKUP.format(LOADING_OVERLAY))
 
     # Invalid name "paintEvent"
     # pylint: disable=C0103

=== modified file 'ubuntuone/controlpanel/gui/qt/signin.py'
--- ubuntuone/controlpanel/gui/qt/signin.py	2012-03-02 17:13:04 +0000
+++ ubuntuone/controlpanel/gui/qt/signin.py	2012-03-15 20:47:20 +0000
@@ -24,6 +24,8 @@
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import signin_ui
 
+WELCOME_MARKUP = u'<span style="font-size:xx-large;">{0}</span>'
+
 
 class SignInPanel(UbuntuOneBin):
     """The widget for signing in."""
@@ -33,6 +35,6 @@
     def _setup(self):
         """Do some extra setupping for the UI."""
         super(SignInPanel, self)._setup()
-        self.ui.welcome_label.setText(WELCOME_LABEL)
+        self.ui.welcome_label.setText(WELCOME_MARKUP.format(WELCOME_LABEL))
         self.ui.login_button.setText(EXISTING_ACCOUNT_CHOICE_BUTTON)
         self.ui.register_button.setText(SET_UP_ACCOUNT_CHOICE_BUTTON)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_signin.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_signin.py	2012-03-12 16:53:02 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_signin.py	2012-03-15 20:47:20 +0000
@@ -48,7 +48,7 @@
     def test_label_is_correct(self):
         """The welcome_label has the correct text."""
         self.assertEqual(unicode(self.ui.ui.welcome_label.text()),
-            gui.WELCOME_LABEL)
+            gui.WELCOME_MARKUP.format(gui.WELCOME_LABEL))
 
     def test_buttos_are_correct(self):
         """The buttos have the correct text."""