Merge lp:~diegosarmentero/ubuntu-sso-client/wizard-sizes into lp:ubuntu-sso-client

Proposed by Diego Sarmentero
Status: Merged
Approved by: Natalia Bidart
Approved revision: 772
Merged at revision: 775
Proposed branch: lp:~diegosarmentero/ubuntu-sso-client/wizard-sizes
Merge into: lp:ubuntu-sso-client
Diff against target: 81 lines (+16/-0)
6 files modified
data/qt/current_user_sign_in.ui (+3/-0)
data/qt/email_verification.ui (+3/-0)
data/qt/forgotten_password.ui (+3/-0)
data/qt/reset_password.ui (+3/-0)
data/qt/setup_account.ui (+3/-0)
ubuntu_sso/qt/gui.py (+1/-0)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntu-sso-client/wizard-sizes
Reviewer Review Type Date Requested Status
Natalia Bidart (community) Approve
Review via email: mp+73803@code.launchpad.net

Commit message

Fixed Installer Sizes to fit the specs.

Description of the change

Fixed Installer Sizes to fit the specs.

To post a comment you must log in.
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
1=== modified file 'data/qt/current_user_sign_in.ui'
2--- data/qt/current_user_sign_in.ui 2011-08-05 14:37:00 +0000
3+++ data/qt/current_user_sign_in.ui 2011-09-02 13:01:50 +0000
4@@ -14,6 +14,9 @@
5 <string>WizardPage</string>
6 </property>
7 <layout class="QVBoxLayout" name="verticalLayout_4">
8+ <property name="topMargin">
9+ <number>0</number>
10+ </property>
11 <item>
12 <layout class="QHBoxLayout" name="horizontalLayout_3">
13 <item>
14
15=== modified file 'data/qt/email_verification.ui'
16--- data/qt/email_verification.ui 2011-08-04 15:25:42 +0000
17+++ data/qt/email_verification.ui 2011-09-02 13:01:50 +0000
18@@ -14,6 +14,9 @@
19 <string>WizardPage</string>
20 </property>
21 <layout class="QVBoxLayout" name="verticalLayout_2">
22+ <property name="topMargin">
23+ <number>0</number>
24+ </property>
25 <item>
26 <layout class="QHBoxLayout" name="horizontalLayout_3">
27 <item>
28
29=== modified file 'data/qt/forgotten_password.ui'
30--- data/qt/forgotten_password.ui 2011-08-05 14:37:00 +0000
31+++ data/qt/forgotten_password.ui 2011-09-02 13:01:50 +0000
32@@ -14,6 +14,9 @@
33 <string>WizardPage</string>
34 </property>
35 <layout class="QVBoxLayout" name="verticalLayout_2">
36+ <property name="topMargin">
37+ <number>0</number>
38+ </property>
39 <item>
40 <widget class="QLabel" name="error_label">
41 <property name="text">
42
43=== modified file 'data/qt/reset_password.ui'
44--- data/qt/reset_password.ui 2011-09-02 11:37:13 +0000
45+++ data/qt/reset_password.ui 2011-09-02 13:01:50 +0000
46@@ -14,6 +14,9 @@
47 <string>WizardPage</string>
48 </property>
49 <layout class="QVBoxLayout" name="verticalLayout">
50+ <property name="topMargin">
51+ <number>0</number>
52+ </property>
53 <item>
54 <layout class="QHBoxLayout" name="horizontalLayout">
55 <item>
56
57=== modified file 'data/qt/setup_account.ui'
58--- data/qt/setup_account.ui 2011-08-04 15:25:42 +0000
59+++ data/qt/setup_account.ui 2011-09-02 13:01:50 +0000
60@@ -14,6 +14,9 @@
61 <string>WizardPage</string>
62 </property>
63 <layout class="QVBoxLayout" name="verticalLayout_5">
64+ <property name="topMargin">
65+ <number>0</number>
66+ </property>
67 <item>
68 <layout class="QVBoxLayout" name="verticalLayout">
69 <item>
70
71=== modified file 'ubuntu_sso/qt/gui.py'
72--- ubuntu_sso/qt/gui.py 2011-09-01 17:05:11 +0000
73+++ ubuntu_sso/qt/gui.py 2011-09-02 13:01:50 +0000
74@@ -63,6 +63,7 @@
75 """Create a new instance."""
76 QWidget.__init__(self)
77 vbox = QVBoxLayout(self)
78+ vbox.setContentsMargins(0, 0, 0, 10)
79 self.title_label = QLabel()
80 self.title_label.setWordWrap(True)
81 self.title_label.setObjectName('title_label')

Subscribers

People subscribed via source and target branches