Merge lp:~diegosarmentero/ubuntuone-control-panel/prettify into lp:ubuntuone-control-panel

[Diego Sarmentero]

Improved some minor details in control panel UI.

Improved some minor details in control panel UI.

[Diego Sarmentero (diegosarmentero)]

Adding screenshots:

Sign In:
before: https://files.one.ubuntu.com/UhJGIabxQ6S4_uqNv30Rcw
after: https://files.one.ubuntu.com/znERCIvER4SmYVlMi1a2gQ

Devices:
(Group Box title)
before: https://files.one.ubuntu.com/eNFnx_ivTvOmKEqj9MHO0A
after: https://files.one.ubuntu.com/N-9XrSCTSiyQTPGUJkAamQ

Settings:
(Group Box title and alignments)
before: https://files.one.ubuntu.com/BqqZ59JiR3-qrRTWEHA--g
after: https://files.one.ubuntu.com/kOzmjghRTGWRSFkS5uZj1Q

Account:
(Alignments)
before: https://files.one.ubuntu.com/rXytSZRFQhGVX2mSjqWBoQ
after: https://files.one.ubuntu.com/-J6aGnZQQUK-0vJXFqfegw

[Diego Sarmentero (diegosarmentero)]

Wrong links before.

Adding screenshots:

Sign In:
before: http://ubuntuone.com/4fEzb54KBtVR0f5OO8Aasj
after: http://ubuntuone.com/0hfFe2naIBGOPsG1fszzrs

Devices:
(Group Box title)
before: http://ubuntuone.com/3byyn0hde8QV3PiJ4lcAbP
after: http://ubuntuone.com/0dvU7pAgx9LFPLewu4neGP

Settings:
(Group Box title and alignments)
before: http://ubuntuone.com/6yEahAM0B3xG513DdLNInz
after: http://ubuntuone.com/6gERFk82BmmDNRE7VlS4Tx

Account:
(Alignments)
before: http://ubuntuone.com/30LhsmImORRxj2uIDUKhJh
after: http://ubuntuone.com/6ir3wbM73L2najNySasl7O

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~diegosarmentero/ubuntuone-control-panel/prettify]

213. By Diego Sarmentero on 2011-09-06

Assigning bug.

[Natalia Bidart (nataliabidart)]

You're duplicating the qss for the QGroupBox:

QGroupBox {
    padding-top: 30px;
    border: none;
    margin-top: 1ex;
}

QGroupBox {
    color: #333333;
    font: bold 14px;
}

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-control-panel/prettify]

214. By Diego Sarmentero on 2011-09-07

Join duplicated QGroupBox.

215. By Diego Sarmentero on 2011-09-07

merge.
Group together QGroupBox style

[Diego Sarmentero (diegosarmentero)]

> You're duplicating the qss for the QGroupBox:
>
>
> QGroupBox {
> padding-top: 30px;
> border: none;
> margin-top: 1ex;
> }
>
> QGroupBox {
> color: #333333;
> font: bold 14px;
> }

Fixed!

[lp:~diegosarmentero/ubuntuone-control-panel/prettify]

216. By Diego Sarmentero on 2011-09-08

Align signin to the left.

217. By Diego Sarmentero on 2011-09-08

Reverted signin.ui

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== added file 'data/Ubuntu-B.ttf'
Binary files data/Ubuntu-B.ttf	1970-01-01 00:00:00 +0000 and data/Ubuntu-B.ttf	2011-09-08 13:03:04 +0000 differ
=== modified file 'data/qt/account.ui'
--- data/qt/account.ui	2011-08-16 00:27:29 +0000
+++ data/qt/account.ui	2011-09-08 13:03:04 +0000
@@ -35,7 +35,16 @@
         <string>Your services</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_3">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>10</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
@@ -61,11 +70,23 @@
         <string>Personal details</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_4">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>10</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_2">
+          <property name="leftMargin">
+           <number>6</number>
+          </property>
           <item>
            <widget class="QLabel" name="name_label">
             <property name="text">

=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2011-08-17 16:05:49 +0000
+++ data/qt/images.qrc	2011-09-08 13:03:04 +0000
@@ -15,6 +15,7 @@
     <file>../facebook.png</file>
     <file>../external_icon_white.png</file>
     <file>../Ubuntu-R.ttf</file>
+    <file>../Ubuntu-B.ttf</file>
     <file>ubuntuone.qss</file>
   </qresource>
 </RCC>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-08-31 16:20:08 +0000
+++ data/qt/ubuntuone.qss	2011-09-08 13:03:04 +0000
@@ -218,11 +218,8 @@
     padding-top: 30px;
     border: none;
     margin-top: 1ex;
-}
-
-QGroupBox::title {
     color: #333333;
-    font: bold 15px;
+    font: bold 14px;
 }
 
 QGroupBox#profile,
@@ -230,6 +227,11 @@
     padding-left: 5px;
 }
 
+QGroupBox#bandwidth_settings,
+QGroupBox#file_sync_settings {
+    padding-left: 20px;
+}
+
 QListWidget {
     background: #f7f6f5;
     alternate-background-color: #efedec;

=== modified file 'ubuntuone/controlpanel/gui/qt/main/windows.py'
--- ubuntuone/controlpanel/gui/qt/main/windows.py	2011-09-01 19:15:39 +0000
+++ ubuntuone/controlpanel/gui/qt/main/windows.py	2011-09-08 13:03:04 +0000
@@ -40,15 +40,15 @@
     # The main loop MUST be initialized before importing the reactor
     # pylint: disable=W0612
     app = Qt.QApplication(sys.argv)
+    # Apply font to the entire application
+    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
+    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
     # Apply Style Sheet
     qss_file = QtCore.QFile(":/ubuntuone.qss")
     qss_file.open(QtCore.QFile.ReadOnly)
     stylesheet = QtCore.QLatin1String(qss_file.readAll())
     app.setStyleSheet(stylesheet)
 
-    # Apply font to the entire application
-    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
-
     # pylint: disable=W0404, F0401
     from twisted.internet import reactor