Ubuntu Single Sign On Client

Merge lp:~dobey/ubuntu-sso-client/system-font into lp:ubuntu-sso-client

  1. system-font
  2. Merge into trunk
Proposed by dobey on 2012-03-13
Status: Merged
Approved by: dobey on 2012-03-16
Approved revision: 913
Merged at revision: 921
Proposed branch: lp:~dobey/ubuntu-sso-client/system-font
Merge into: lp:ubuntu-sso-client
Diff against target: 263 lines (+7/-60)
9 files modified
data/qt/loadingoverlay.ui (+0/-5)
data/qt/proxy_credentials_dialog.ui (+0/-2)
data/qt/reset_password.ui (+0/-3)
data/qt/setup_account.ui (+0/-35)
data/qt/ssl_dialog.ui (+0/-5)
data/qt/stylesheet.qss (+0/-5)
ubuntu_sso/qt/__init__.py (+1/-1)
ubuntu_sso/qt/common.py (+3/-3)
ubuntu_sso/qt/loadingoverlay.py (+3/-1)
To merge this branch: bzr merge lp:~dobey/ubuntu-sso-client/system-font
Reviewer Review Type Date Requested Status
Natalia Bidart 2012-03-13 Approve on 2012-03-16
Eric Casteleijn (community) 2012-03-13 Approve on 2012-03-15
Review via email: mp+97264@code.launchpad.net

Commit Message

Don't hard-code font sizes
Remove usage of weight property as a numeric; just use bold property instead

To post a comment you must log in.
lp:~dobey/ubuntu-sso-client/system-font updated on 2012-03-13
910. By dobey on 2012-03-13

Need this font to be xx-large and bold

Eric Casteleijn (thisfred) wrote :

Excellent!

review: Approve
Natalia Bidart (nataliabidart) wrote :

Got conflicts:

Text conflict in data/qt/stylesheet.qss
Text conflict in ubuntu_sso/qt/__init__.py
2 conflicts encountered.

review: Needs Fixing
lp:~dobey/ubuntu-sso-client/system-font updated on 2012-03-16
911. By dobey on 2012-03-16

Merged with trunk

912. By dobey on 2012-03-16

Merged with trunk

dobey (dobey) wrote :

The conflicts are fixed now.

Natalia Bidart (nataliabidart) wrote :

* This branch has the same issue as the u1cp one regarding the font size for the 'loading' overlay. Please set it to be x-large (not xx-large, that's too big).

* As you can see from these screenshoots:

trunk: http://ubuntuone.com/1SWSazWQ2xDJ8PMPqig9Fj
this branch: http://ubuntuone.com/0CvHlCsnbvd7ECdbDSgSU0

the font for the password assistance text is too big, please set it to the same size as the one in ERROR_STYLE.

Thanks!

review: Needs Fixing
lp:~dobey/ubuntu-sso-client/system-font updated on 2012-03-16
913. By dobey on 2012-03-16

Fix issues from review

Natalia Bidart (nataliabidart) wrote :

Looks good, thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/qt/loadingoverlay.ui'
2--- data/qt/loadingoverlay.ui 2012-02-22 16:58:08 +0000
3+++ data/qt/loadingoverlay.ui 2012-03-16 18:34:24 +0000
4@@ -52,11 +52,6 @@
5 <verstretch>0</verstretch>
6 </sizepolicy>
7 </property>
8- <property name="font">
9- <font>
10- <pointsize>14</pointsize>
11- </font>
12- </property>
13 <property name="text">
14 <string notr="true">Getting information, please wait...</string>
15 </property>
16
17=== modified file 'data/qt/proxy_credentials_dialog.ui'
18--- data/qt/proxy_credentials_dialog.ui 2012-02-23 11:47:00 +0000
19+++ data/qt/proxy_credentials_dialog.ui 2012-03-16 18:34:24 +0000
20@@ -113,8 +113,6 @@
21 </property>
22 <property name="font">
23 <font>
24- <pointsize>14</pointsize>
25- <weight>75</weight>
26 <bold>true</bold>
27 </font>
28 </property>
29
30=== modified file 'data/qt/reset_password.ui'
31--- data/qt/reset_password.ui 2012-03-16 17:37:06 +0000
32+++ data/qt/reset_password.ui 2012-03-16 18:34:24 +0000
33@@ -49,7 +49,6 @@
34 </property>
35 <property name="font">
36 <font>
37- <weight>75</weight>
38 <bold>true</bold>
39 </font>
40 </property>
41@@ -109,7 +108,6 @@
42 </property>
43 <property name="font">
44 <font>
45- <weight>75</weight>
46 <bold>true</bold>
47 </font>
48 </property>
49@@ -166,7 +164,6 @@
50 </property>
51 <property name="font">
52 <font>
53- <weight>75</weight>
54 <bold>true</bold>
55 </font>
56 </property>
57
58=== modified file 'data/qt/setup_account.ui'
59--- data/qt/setup_account.ui 2012-03-05 21:52:45 +0000
60+++ data/qt/setup_account.ui 2012-03-16 18:34:24 +0000
61@@ -85,7 +85,6 @@
62 <widget class="QLabel" name="name_label">
63 <property name="font">
64 <font>
65- <weight>75</weight>
66 <bold>true</bold>
67 </font>
68 </property>
69@@ -114,11 +113,6 @@
70 <height>16777215</height>
71 </size>
72 </property>
73- <property name="font">
74- <font>
75- <pointsize>11</pointsize>
76- </font>
77- </property>
78 <property name="formError" stdset="0">
79 <bool>false</bool>
80 </property>
81@@ -135,7 +129,6 @@
82 <widget class="QLabel" name="email_label">
83 <property name="font">
84 <font>
85- <weight>75</weight>
86 <bold>true</bold>
87 </font>
88 </property>
89@@ -164,11 +157,6 @@
90 <height>16777215</height>
91 </size>
92 </property>
93- <property name="font">
94- <font>
95- <pointsize>11</pointsize>
96- </font>
97- </property>
98 <property name="placeholderText">
99 <string/>
100 </property>
101@@ -229,7 +217,6 @@
102 <widget class="QLabel" name="confirm_email_label">
103 <property name="font">
104 <font>
105- <weight>75</weight>
106 <bold>true</bold>
107 </font>
108 </property>
109@@ -258,11 +245,6 @@
110 <height>16777215</height>
111 </size>
112 </property>
113- <property name="font">
114- <font>
115- <pointsize>11</pointsize>
116- </font>
117- </property>
118 <property name="placeholderText">
119 <string/>
120 </property>
121@@ -377,7 +359,6 @@
122 <widget class="QLabel" name="password_label">
123 <property name="font">
124 <font>
125- <weight>75</weight>
126 <bold>true</bold>
127 </font>
128 </property>
129@@ -406,11 +387,6 @@
130 <height>16777215</height>
131 </size>
132 </property>
133- <property name="font">
134- <font>
135- <pointsize>11</pointsize>
136- </font>
137- </property>
138 <property name="toolTip">
139 <string notr="true">Your password must be at least 8 characters long and at least contain one number and one upper later.</string>
140 </property>
141@@ -477,7 +453,6 @@
142 <widget class="QLabel" name="confirm_password_label">
143 <property name="font">
144 <font>
145- <weight>75</weight>
146 <bold>true</bold>
147 </font>
148 </property>
149@@ -506,11 +481,6 @@
150 <height>16777215</height>
151 </size>
152 </property>
153- <property name="font">
154- <font>
155- <pointsize>11</pointsize>
156- </font>
157- </property>
158 <property name="echoMode">
159 <enum>QLineEdit::Password</enum>
160 </property>
161@@ -580,11 +550,6 @@
162 <height>16777215</height>
163 </size>
164 </property>
165- <property name="font">
166- <font>
167- <pointsize>11</pointsize>
168- </font>
169- </property>
170 <property name="locale">
171 <locale language="English" country="UnitedStates"/>
172 </property>
173
174=== modified file 'data/qt/ssl_dialog.ui'
175--- data/qt/ssl_dialog.ui 2012-02-24 15:22:26 +0000
176+++ data/qt/ssl_dialog.ui 2012-03-16 18:34:24 +0000
177@@ -95,11 +95,6 @@
178 </property>
179 <item>
180 <widget class="QLabel" name="title_label">
181- <property name="font">
182- <font>
183- <pointsize>14</pointsize>
184- </font>
185- </property>
186 <property name="text">
187 <string notr="true">Do you want to connect to this server</string>
188 </property>
189
190=== modified file 'data/qt/stylesheet.qss'
191--- data/qt/stylesheet.qss 2012-03-13 02:14:03 +0000
192+++ data/qt/stylesheet.qss 2012-03-16 18:34:24 +0000
193@@ -16,7 +16,6 @@
194
195 QLabel#password_assistance {
196 border-image: url(":/balloon_shape.png");
197- font-size: 12px;
198 }
199
200 QLineEdit {
201@@ -91,10 +90,6 @@
202 min-height: 100px;
203 }
204
205-QFrame#frm_box > QLabel {
206- font-size: 20px;
207-}
208-
209 WizardHeader {
210 padding-top: 1px;
211 padding-bottom: 1px;
212
213=== modified file 'ubuntu_sso/qt/__init__.py'
214--- ubuntu_sso/qt/__init__.py 2012-03-15 20:23:33 +0000
215+++ ubuntu_sso/qt/__init__.py 2012-03-16 18:34:24 +0000
216@@ -31,7 +31,7 @@
217 ERROR_STYLE = u'<font color="#df2d1f" style="font-size:small"><b>%s</b></font>'
218 ERROR_MESSAGE = 'message'
219 PREFERED_UI_SIZE = {'width': 550, 'height': 525}
220-TITLE_STYLE = u'<span style="font-size:xx-large">%s</span>'
221+TITLE_STYLE = u'<span style="font-size:xx-large;font-weight:bold;">%s</span>'
222 WINDOW_TITLE = 'Ubuntu Single Sign On'
223
224
225
226=== modified file 'ubuntu_sso/qt/common.py'
227--- ubuntu_sso/qt/common.py 2012-03-13 02:23:27 +0000
228+++ ubuntu_sso/qt/common.py 2012-03-16 18:34:24 +0000
229@@ -28,9 +28,9 @@
230 )
231
232 # all the text + styles that are used in the gui
233-BAD = u'<img src=":/password_hint_warning.png" /><font> %s </font>'
234-GOOD = u'<img src=":/password_hint_ok.png" /><font> %s </font>'
235-NORMAL = u'<font> %s </font>'
236+BAD = u'<img src=":/password_hint_warning.png" /><small> %s </small>'
237+GOOD = u'<img src=":/password_hint_ok.png" /><small> %s </small>'
238+NORMAL = u'<small> %s </small>'
239
240
241 def password_assistance(line_edit, assistance, icon_type=BAD):
242
243=== modified file 'ubuntu_sso/qt/loadingoverlay.py'
244--- ubuntu_sso/qt/loadingoverlay.py 2012-02-27 19:00:59 +0000
245+++ ubuntu_sso/qt/loadingoverlay.py 2012-03-16 18:34:24 +0000
246@@ -21,6 +21,8 @@
247 from ubuntu_sso.qt.ui import loadingoverlay_ui
248 from ubuntu_sso.utils.ui import LOADING_OVERLAY
249
250+LOADING_STYLE = u'<span style="font-size:x-large;">{0}</span>'
251+
252
253 class LoadingOverlay(QtGui.QFrame):
254 """The widget that shows a loading animation and disable the widget below.
255@@ -43,7 +45,7 @@
256 self.counter = 0
257 self.orientation = False
258
259- self.ui.label.setText(LOADING_OVERLAY)
260+ self.ui.label.setText(LOADING_STYLE.format(LOADING_OVERLAY))
261
262 # Invalid name "paintEvent", "eventFilter", "showEvent", "timerEvent"
263 # pylint: disable=C0103

Subscribers

People subscribed via source and target branches