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

Proposed by Diego Sarmentero
Status: Merged
Approved by: Natalia Bidart
Approved revision: 217
Merged at revision: 217
Proposed branch: lp:~diegosarmentero/ubuntuone-control-panel/prettify
Merge into: lp:ubuntuone-control-panel
Diff against target: 111 lines (+33/-9)
4 files modified
data/qt/account.ui (+23/-2)
data/qt/images.qrc (+1/-0)
data/qt/ubuntuone.qss (+6/-4)
ubuntuone/controlpanel/gui/qt/main/windows.py (+3/-3)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-control-panel/prettify
Reviewer Review Type Date Requested Status
Natalia Bidart Approve
Roberto Alsina (community) Approve
Review via email: mp+74219@code.launchpad.net

Commit message

Improved some minor details in control panel UI.

Description of the change

Improved some minor details in control panel UI.

To post a comment you must log in.
Roberto Alsina (ralsina) wrote :

+1

review: Approve
213. By Diego Sarmentero on 2011-09-06

Assigning bug.

Natalia Bidart (nataliabidart) wrote :

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
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) wrote :

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

Fixed!

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) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/Ubuntu-B.ttf'
2Binary 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
3=== modified file 'data/qt/account.ui'
4--- data/qt/account.ui 2011-08-16 00:27:29 +0000
5+++ data/qt/account.ui 2011-09-08 13:03:04 +0000
6@@ -35,7 +35,16 @@
7 <string>Your services</string>
8 </property>
9 <layout class="QVBoxLayout" name="verticalLayout_3">
10- <property name="margin">
11+ <property name="leftMargin">
12+ <number>10</number>
13+ </property>
14+ <property name="topMargin">
15+ <number>0</number>
16+ </property>
17+ <property name="rightMargin">
18+ <number>0</number>
19+ </property>
20+ <property name="bottomMargin">
21 <number>0</number>
22 </property>
23 <item>
24@@ -61,11 +70,23 @@
25 <string>Personal details</string>
26 </property>
27 <layout class="QVBoxLayout" name="verticalLayout_4">
28- <property name="margin">
29+ <property name="leftMargin">
30+ <number>10</number>
31+ </property>
32+ <property name="topMargin">
33+ <number>0</number>
34+ </property>
35+ <property name="rightMargin">
36+ <number>0</number>
37+ </property>
38+ <property name="bottomMargin">
39 <number>0</number>
40 </property>
41 <item>
42 <layout class="QVBoxLayout" name="verticalLayout_2">
43+ <property name="leftMargin">
44+ <number>6</number>
45+ </property>
46 <item>
47 <widget class="QLabel" name="name_label">
48 <property name="text">
49
50=== modified file 'data/qt/images.qrc'
51--- data/qt/images.qrc 2011-08-17 16:05:49 +0000
52+++ data/qt/images.qrc 2011-09-08 13:03:04 +0000
53@@ -15,6 +15,7 @@
54 <file>../facebook.png</file>
55 <file>../external_icon_white.png</file>
56 <file>../Ubuntu-R.ttf</file>
57+ <file>../Ubuntu-B.ttf</file>
58 <file>ubuntuone.qss</file>
59 </qresource>
60 </RCC>
61
62=== modified file 'data/qt/ubuntuone.qss'
63--- data/qt/ubuntuone.qss 2011-08-31 16:20:08 +0000
64+++ data/qt/ubuntuone.qss 2011-09-08 13:03:04 +0000
65@@ -218,11 +218,8 @@
66 padding-top: 30px;
67 border: none;
68 margin-top: 1ex;
69-}
70-
71-QGroupBox::title {
72 color: #333333;
73- font: bold 15px;
74+ font: bold 14px;
75 }
76
77 QGroupBox#profile,
78@@ -230,6 +227,11 @@
79 padding-left: 5px;
80 }
81
82+QGroupBox#bandwidth_settings,
83+QGroupBox#file_sync_settings {
84+ padding-left: 20px;
85+}
86+
87 QListWidget {
88 background: #f7f6f5;
89 alternate-background-color: #efedec;
90
91=== modified file 'ubuntuone/controlpanel/gui/qt/main/windows.py'
92--- ubuntuone/controlpanel/gui/qt/main/windows.py 2011-09-01 19:15:39 +0000
93+++ ubuntuone/controlpanel/gui/qt/main/windows.py 2011-09-08 13:03:04 +0000
94@@ -40,15 +40,15 @@
95 # The main loop MUST be initialized before importing the reactor
96 # pylint: disable=W0612
97 app = Qt.QApplication(sys.argv)
98+ # Apply font to the entire application
99+ QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
100+ QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
101 # Apply Style Sheet
102 qss_file = QtCore.QFile(":/ubuntuone.qss")
103 qss_file.open(QtCore.QFile.ReadOnly)
104 stylesheet = QtCore.QLatin1String(qss_file.readAll())
105 app.setStyleSheet(stylesheet)
106
107- # Apply font to the entire application
108- QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
109-
110 # pylint: disable=W0404, F0401
111 from twisted.internet import reactor
112

Subscribers

People subscribed via source and target branches