Merge lp:~diegosarmentero/ubuntuone-windows-installer/wizard-sizes into lp:ubuntuone-windows-installer

Proposed by Diego Sarmentero
Status: Merged
Approved by: Natalia Bidart
Approved revision: 53
Merged at revision: 51
Proposed branch: lp:~diegosarmentero/ubuntuone-windows-installer/wizard-sizes
Merge into: lp:ubuntuone-windows-installer
Diff against target: 698 lines (+150/-119)
17 files modified
data/qt/choose_sign_in.ui (+3/-0)
data/qt/congratulations.ui (+3/-0)
data/qt/folders.ui (+3/-0)
data/qt/license.ui (+3/-13)
data/qt/local_folders.ui (+3/-0)
data/qt/preferences.ui (+5/-1)
data/qt/setup_account.ui (+80/-17)
data/qt/side_widget.ui (+5/-38)
data/qt/sign_in.ui (+3/-0)
data/qt/sync_now_or_later.ui (+3/-0)
data/qt/ubuntuone.qss (+0/-1)
ubuntuone_installer/gui/qt/__init__.py (+17/-0)
ubuntuone_installer/gui/qt/gui.py (+7/-6)
ubuntuone_installer/gui/qt/main/windows.py (+2/-1)
ubuntuone_installer/gui/qt/side_widget.py (+4/-8)
ubuntuone_installer/gui/qt/tests/test_gui.py (+3/-3)
ubuntuone_installer/gui/qt/tests/test_side_widget.py (+6/-31)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-windows-installer/wizard-sizes
Reviewer Review Type Date Requested Status
Natalia Bidart Approve
Roberto Alsina (community) Approve
Review via email: mp+73804@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.
Roberto Alsina (ralsina) wrote :

+1, ran tests on both platforms, looked at the running program's UI, everything looks good.

review: Approve
46. By Roberto Alsina on 2011-09-02

Fix import order to make tools happy.

47. By Diego Sarmentero on 2011-09-05

Improved Are You Sure Dialog to avoid closing the wizard on dialog reject.

Natalia Bidart (nataliabidart) wrote :

Has a conflict in ubuntuone_installer/gui/qt/gui.py.

review: Needs Fixing
48. By Diego Sarmentero on 2011-09-06

merge.
conflict resolved.

Diego Sarmentero (diegosarmentero) wrote :

> Has a conflict in ubuntuone_installer/gui/qt/gui.py.

Resolved

Natalia Bidart (nataliabidart) wrote :

I'm getting all these failures (confirmed they are not present in trunk):

[FAIL]
Traceback (most recent call last):
  File "/home/nessita/canonical/u1/windows-installer/review_wizard-sizes/ubuntuone_installer/gui/qt/tests/test_gui.py", line 421, in test_continue_cancels_cancel
    self.assertEqual(self.ui.isVisible(), True)
twisted.trial.unittest.FailTest: not equal:
a = False
b = True

ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_continue_cancels_cancel
===============================================================================
[FAIL]
Traceback (most recent call last):
  File "/home/nessita/canonical/u1/windows-installer/review_wizard-sizes/ubuntuone_installer/gui/qt/tests/test_gui.py", line 175, in test_execute_uninstall_on_licence_cancel
    self.assertTrue(self._called)
twisted.trial.unittest.FailTest: None

ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_execute_uninstall_on_licence_cancel
===============================================================================
[FAIL]
Traceback (most recent call last):
  File "/home/nessita/canonical/u1/windows-installer/review_wizard-sizes/ubuntuone_installer/gui/qt/tests/test_gui.py", line 186, in test_execute_uninstall_on_licence_cancel_frozen
    self.assertTrue(self._called)
twisted.trial.unittest.FailTest: None

ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_execute_uninstall_on_licence_cancel_frozen
-------------------------------------------------------------------------------
Ran 125 tests in 1.513s

FAILED (skips=1, failures=3, successes=121)

review: Needs Fixing
49. By Diego Sarmentero on 2011-09-06

Assigning Bug.

50. By Diego Sarmentero on 2011-09-07

Fixed issue on starting control panel.

51. By Diego Sarmentero on 2011-09-07

Fixed tests.

52. By Diego Sarmentero on 2011-09-07

Removed unnecessary html from license.ui

53. By Diego Sarmentero on 2011-09-07

Assigning bug.

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/choose_sign_in.ui'
2--- data/qt/choose_sign_in.ui 2011-08-05 19:34:29 +0000
3+++ data/qt/choose_sign_in.ui 2011-09-07 11:54:54 +0000
4@@ -17,6 +17,9 @@
5 <property name="leftMargin">
6 <number>0</number>
7 </property>
8+ <property name="topMargin">
9+ <number>0</number>
10+ </property>
11 <property name="rightMargin">
12 <number>0</number>
13 </property>
14
15=== modified file 'data/qt/congratulations.ui'
16--- data/qt/congratulations.ui 2011-08-29 01:35:26 +0000
17+++ data/qt/congratulations.ui 2011-09-07 11:54:54 +0000
18@@ -17,6 +17,9 @@
19 <property name="spacing">
20 <number>24</number>
21 </property>
22+ <property name="topMargin">
23+ <number>0</number>
24+ </property>
25 <item>
26 <widget class="QLabel" name="label">
27 <property name="font">
28
29=== modified file 'data/qt/folders.ui'
30--- data/qt/folders.ui 2011-08-10 21:06:46 +0000
31+++ data/qt/folders.ui 2011-09-07 11:54:54 +0000
32@@ -14,6 +14,9 @@
33 <string>Form</string>
34 </property>
35 <layout class="QVBoxLayout" name="verticalLayout">
36+ <property name="topMargin">
37+ <number>0</number>
38+ </property>
39 <item>
40 <layout class="QHBoxLayout" name="horizontalLayout">
41 <item>
42
43=== modified file 'data/qt/license.ui'
44--- data/qt/license.ui 2011-07-12 03:24:48 +0000
45+++ data/qt/license.ui 2011-09-07 11:54:54 +0000
46@@ -14,21 +14,11 @@
47 <string>Form</string>
48 </property>
49 <layout class="QVBoxLayout" name="verticalLayout">
50+ <property name="topMargin">
51+ <number>0</number>
52+ </property>
53 <item>
54 <widget class="QTextBrowser" name="textBrowser">
55- <property name="html">
56- <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
57-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
58-p, li { white-space: pre-wrap; }
59-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
60-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:14pt; font-weight:600;&quot;&gt;License Agreement&lt;/span&gt;&lt;/p&gt;
61-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
62-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3, as published by the Free Software Foundation.&lt;/span&gt;&lt;/p&gt;
63-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
64-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Ubuntu One Basic is free, while additional service add-ons may be paid for services.&lt;/span&gt;&lt;/p&gt;
65-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:8pt;&quot;&gt;&lt;/p&gt;
66-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;As free software, this programme is distributed without warranty. See the GNU General Public License for more details at &lt;/span&gt;&lt;a href=&quot;http://www.gnu.org/licenses&quot;&gt;&lt;span style=&quot; font-size:8pt; text-decoration: underline; color:#dd4814;&quot;&gt;http://www.gnu.org/licenses&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
67- </property>
68 <property name="openExternalLinks">
69 <bool>true</bool>
70 </property>
71
72=== modified file 'data/qt/local_folders.ui'
73--- data/qt/local_folders.ui 2011-08-15 13:29:08 +0000
74+++ data/qt/local_folders.ui 2011-09-07 11:54:54 +0000
75@@ -14,6 +14,9 @@
76 <string>Form</string>
77 </property>
78 <layout class="QVBoxLayout" name="verticalLayout_2">
79+ <property name="topMargin">
80+ <number>0</number>
81+ </property>
82 <item>
83 <widget class="QLabel" name="label">
84 <property name="text">
85
86=== modified file 'data/qt/preferences.ui'
87--- data/qt/preferences.ui 2011-08-10 21:06:46 +0000
88+++ data/qt/preferences.ui 2011-09-07 11:54:54 +0000
89@@ -13,7 +13,11 @@
90 <property name="windowTitle">
91 <string>Form</string>
92 </property>
93- <layout class="QVBoxLayout" name="verticalLayout"/>
94+ <layout class="QVBoxLayout" name="verticalLayout">
95+ <property name="topMargin">
96+ <number>0</number>
97+ </property>
98+ </layout>
99 </widget>
100 <resources/>
101 <connections/>
102
103=== modified file 'data/qt/setup_account.ui'
104--- data/qt/setup_account.ui 2011-08-29 12:49:25 +0000
105+++ data/qt/setup_account.ui 2011-09-07 11:54:54 +0000
106@@ -6,8 +6,8 @@
107 <rect>
108 <x>0</x>
109 <y>0</y>
110- <width>583</width>
111- <height>538</height>
112+ <width>543</width>
113+ <height>523</height>
114 </rect>
115 </property>
116 <property name="sizePolicy">
117@@ -29,11 +29,20 @@
118 <property name="spacing">
119 <number>0</number>
120 </property>
121+ <property name="leftMargin">
122+ <number>0</number>
123+ </property>
124+ <property name="topMargin">
125+ <number>0</number>
126+ </property>
127 <property name="rightMargin">
128- <number>6</number>
129+ <number>3</number>
130+ </property>
131+ <property name="bottomMargin">
132+ <number>0</number>
133 </property>
134 <item>
135- <layout class="QGridLayout" name="gridLayout" columnminimumwidth="310,250">
136+ <layout class="QGridLayout" name="gridLayout" columnminimumwidth="310,220">
137 <item row="0" column="0">
138 <widget class="QLabel" name="password_info_label">
139 <property name="sizePolicy">
140@@ -412,9 +421,15 @@
141 <verstretch>0</verstretch>
142 </sizepolicy>
143 </property>
144+ <property name="minimumSize">
145+ <size>
146+ <width>220</width>
147+ <height>0</height>
148+ </size>
149+ </property>
150 <property name="maximumSize">
151 <size>
152- <width>300</width>
153+ <width>220</width>
154 <height>16777215</height>
155 </size>
156 </property>
157@@ -428,14 +443,17 @@
158 <bool>true</bool>
159 </property>
160 <property name="indent">
161- <number>20</number>
162+ <number>0</number>
163 </property>
164 </widget>
165 </item>
166 <item row="1" column="1">
167 <layout class="QVBoxLayout" name="verticalLayout_7">
168+ <property name="spacing">
169+ <number>0</number>
170+ </property>
171 <property name="leftMargin">
172- <number>10</number>
173+ <number>0</number>
174 </property>
175 <item>
176 <widget class="QLabel" name="name_assistance">
177@@ -445,9 +463,15 @@
178 <verstretch>0</verstretch>
179 </sizepolicy>
180 </property>
181+ <property name="minimumSize">
182+ <size>
183+ <width>220</width>
184+ <height>0</height>
185+ </size>
186+ </property>
187 <property name="maximumSize">
188 <size>
189- <width>300</width>
190+ <width>220</width>
191 <height>16777215</height>
192 </size>
193 </property>
194@@ -457,14 +481,20 @@
195 <property name="alignment">
196 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
197 </property>
198+ <property name="wordWrap">
199+ <bool>true</bool>
200+ </property>
201 </widget>
202 </item>
203 </layout>
204 </item>
205 <item row="3" column="1">
206 <layout class="QVBoxLayout" name="verticalLayout_8">
207+ <property name="spacing">
208+ <number>0</number>
209+ </property>
210 <property name="leftMargin">
211- <number>10</number>
212+ <number>0</number>
213 </property>
214 <item>
215 <widget class="QLabel" name="email_assistance">
216@@ -474,9 +504,15 @@
217 <verstretch>0</verstretch>
218 </sizepolicy>
219 </property>
220+ <property name="minimumSize">
221+ <size>
222+ <width>220</width>
223+ <height>0</height>
224+ </size>
225+ </property>
226 <property name="maximumSize">
227 <size>
228- <width>300</width>
229+ <width>220</width>
230 <height>16777215</height>
231 </size>
232 </property>
233@@ -486,14 +522,20 @@
234 <property name="alignment">
235 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
236 </property>
237+ <property name="wordWrap">
238+ <bool>true</bool>
239+ </property>
240 </widget>
241 </item>
242 </layout>
243 </item>
244 <item row="4" column="1">
245 <layout class="QVBoxLayout" name="verticalLayout_9">
246+ <property name="spacing">
247+ <number>0</number>
248+ </property>
249 <property name="leftMargin">
250- <number>10</number>
251+ <number>0</number>
252 </property>
253 <item>
254 <widget class="QLabel" name="confirm_email_assistance">
255@@ -503,9 +545,15 @@
256 <verstretch>0</verstretch>
257 </sizepolicy>
258 </property>
259+ <property name="minimumSize">
260+ <size>
261+ <width>220</width>
262+ <height>0</height>
263+ </size>
264+ </property>
265 <property name="maximumSize">
266 <size>
267- <width>300</width>
268+ <width>220</width>
269 <height>16777215</height>
270 </size>
271 </property>
272@@ -515,6 +563,12 @@
273 <property name="alignment">
274 <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
275 </property>
276+ <property name="wordWrap">
277+ <bool>true</bool>
278+ </property>
279+ <property name="indent">
280+ <number>0</number>
281+ </property>
282 </widget>
283 </item>
284 </layout>
285@@ -527,17 +581,26 @@
286 <verstretch>0</verstretch>
287 </sizepolicy>
288 </property>
289+ <property name="minimumSize">
290+ <size>
291+ <width>220</width>
292+ <height>0</height>
293+ </size>
294+ </property>
295 <property name="maximumSize">
296 <size>
297- <width>300</width>
298+ <width>220</width>
299 <height>16777215</height>
300 </size>
301 </property>
302 <property name="text">
303 <string>password_assistance</string>
304 </property>
305+ <property name="wordWrap">
306+ <bool>true</bool>
307+ </property>
308 <property name="indent">
309- <number>20</number>
310+ <number>17</number>
311 </property>
312 </widget>
313 </item>
314@@ -552,7 +615,7 @@
315 <property name="sizeHint" stdset="0">
316 <size>
317 <width>20</width>
318- <height>20</height>
319+ <height>15</height>
320 </size>
321 </property>
322 </spacer>
323@@ -568,7 +631,7 @@
324 <property name="sizeHint" stdset="0">
325 <size>
326 <width>20</width>
327- <height>20</height>
328+ <height>15</height>
329 </size>
330 </property>
331 </spacer>
332@@ -584,7 +647,7 @@
333 <property name="sizeHint" stdset="0">
334 <size>
335 <width>20</width>
336- <height>20</height>
337+ <height>15</height>
338 </size>
339 </property>
340 </spacer>
341
342=== modified file 'data/qt/side_widget.ui'
343--- data/qt/side_widget.ui 2011-07-14 10:53:49 +0000
344+++ data/qt/side_widget.ui 2011-09-07 11:54:54 +0000
345@@ -6,8 +6,8 @@
346 <rect>
347 <x>0</x>
348 <y>0</y>
349- <width>200</width>
350- <height>563</height>
351+ <width>170</width>
352+ <height>466</height>
353 </rect>
354 </property>
355 <property name="sizePolicy">
356@@ -18,8 +18,8 @@
357 </property>
358 <property name="minimumSize">
359 <size>
360- <width>200</width>
361- <height>0</height>
362+ <width>170</width>
363+ <height>466</height>
364 </size>
365 </property>
366 <property name="windowTitle">
367@@ -36,7 +36,7 @@
368 <number>40</number>
369 </property>
370 <property name="margin">
371- <number>10</number>
372+ <number>0</number>
373 </property>
374 <item>
375 <widget class="QLabel" name="ubuntu_one_logo_label">
376@@ -145,39 +145,6 @@
377 </layout>
378 </item>
379 <item>
380- <layout class="QHBoxLayout" name="horizontalLayout_3">
381- <property name="spacing">
382- <number>7</number>
383- </property>
384- <item>
385- <widget class="QLabel" name="choose_icon_label">
386- <property name="sizePolicy">
387- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
388- <horstretch>0</horstretch>
389- <verstretch>0</verstretch>
390- </sizepolicy>
391- </property>
392- <property name="text">
393- <string/>
394- </property>
395- <property name="pixmap">
396- <pixmap resource="images.qrc">:/progress_arrow_grey.png</pixmap>
397- </property>
398- </widget>
399- </item>
400- <item>
401- <widget class="QLabel" name="choose_services_label">
402- <property name="enabled">
403- <bool>true</bool>
404- </property>
405- <property name="text">
406- <string>Choose services</string>
407- </property>
408- </widget>
409- </item>
410- </layout>
411- </item>
412- <item>
413 <layout class="QHBoxLayout" name="horizontalLayout_4">
414 <property name="spacing">
415 <number>7</number>
416
417=== modified file 'data/qt/sign_in.ui'
418--- data/qt/sign_in.ui 2011-07-27 14:53:56 +0000
419+++ data/qt/sign_in.ui 2011-09-07 11:54:54 +0000
420@@ -14,6 +14,9 @@
421 <string>Form</string>
422 </property>
423 <layout class="QVBoxLayout" name="verticalLayout">
424+ <property name="topMargin">
425+ <number>0</number>
426+ </property>
427 <item>
428 <widget class="QLabel" name="label">
429 <property name="font">
430
431=== modified file 'data/qt/sync_now_or_later.ui'
432--- data/qt/sync_now_or_later.ui 2011-06-28 19:18:35 +0000
433+++ data/qt/sync_now_or_later.ui 2011-09-07 11:54:54 +0000
434@@ -17,6 +17,9 @@
435 <property name="spacing">
436 <number>24</number>
437 </property>
438+ <property name="topMargin">
439+ <number>0</number>
440+ </property>
441 <item>
442 <widget class="QLabel" name="label">
443 <property name="font">
444
445=== modified file 'data/qt/ubuntuone.qss'
446--- data/qt/ubuntuone.qss 2011-08-24 18:08:14 +0000
447+++ data/qt/ubuntuone.qss 2011-09-07 11:54:54 +0000
448@@ -10,7 +10,6 @@
449 border-right-width: 1px;
450 color: white;
451 min-height: 100px;
452- margin-left: 10px;
453 }
454
455 QWizard,
456
457=== modified file 'ubuntuone_installer/gui/qt/__init__.py'
458--- ubuntuone_installer/gui/qt/__init__.py 2011-06-22 10:47:08 +0000
459+++ ubuntuone_installer/gui/qt/__init__.py 2011-09-07 11:54:54 +0000
460@@ -17,3 +17,20 @@
461 # with this program. If not, see <http://www.gnu.org/licenses/>.
462
463 """The Qt graphical interface for the Ubuntu One Installer."""
464+
465+
466+LICENSE_CONTENT = """<html>
467+ <body style="font-family:Ubuntu">
468+ <h2>License Agreement</h2>
469+ <p>This program is free software: you can redistribute it and/or modify
470+ it under the terms of the GNU General Public License version 3, as
471+ published by the Free Software Foundation.</p>
472+ <p>Ubuntu One Basic is free, while additional service add-ons may be
473+ paid for services.</p>
474+ <p>As free software, this programme is distributed without warranty.
475+ See the GNU General Public License for more details at
476+ <a href='http://www.gnu.org/licenses'
477+ style="color:#dd4814;">http://www.gnu.org/licenses</a>
478+ </p>
479+ </body>
480+<html>"""
481
482=== modified file 'ubuntuone_installer/gui/qt/gui.py'
483--- ubuntuone_installer/gui/qt/gui.py 2011-09-06 17:30:24 +0000
484+++ ubuntuone_installer/gui/qt/gui.py 2011-09-07 11:54:54 +0000
485@@ -64,7 +64,7 @@
486 setup_account_ui,
487 )
488
489-from ubuntuone_installer.gui.qt import utils
490+from ubuntuone_installer.gui import qt
491 from ubuntuone_installer.gui.qt.are_you_sure import AreYouSure
492 from ubuntuone_installer.gui.qt.currentuser import CurrentUserController
493 from ubuntuone_installer.gui.qt.folders import FoldersPage
494@@ -98,6 +98,7 @@
495 self._next_id = None
496 super(LicensePage, self).__init__(license_ui.Ui_Form(), None, parent)
497 self.header.setVisible(False)
498+ self.ui.textBrowser.setHtml(qt.LICENSE_CONTENT)
499
500 # Invalid names of Qt-inherited methods
501 # pylint: disable=C0103
502@@ -285,8 +286,8 @@
503 self.setWindowFlags(flags)
504
505 self.setWindowTitle(APP_NAME)
506- self.setMinimumHeight(590)
507- self.setMinimumWidth(800)
508+ self.setMinimumHeight(538)
509+ self.setMinimumWidth(740)
510 self.setWizardStyle(self.ModernStyle)
511 self.close_callback = close_callback
512
513@@ -426,10 +427,10 @@
514 """The main window is being closed, call any custom callback."""
515 # Finished, not cancelled
516 if result == 1: # Cancelled
517- utils.start_control_panel()
518+ qt.utils.start_control_panel()
519 elif self.currentId() == self.LICENSE_PAGE_ID:
520- if AreYouSure(self).exec_():
521- utils.uninstall_application()
522+ if not AreYouSure(self).exec_():
523+ qt.utils.uninstall_application()
524 else:
525 return
526 elif self.currentId() != self.CONGRATULATIONS_PAGE:
527
528=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
529--- ubuntuone_installer/gui/qt/main/windows.py 2011-09-01 11:15:49 +0000
530+++ ubuntuone_installer/gui/qt/main/windows.py 2011-09-07 11:54:54 +0000
531@@ -47,7 +47,8 @@
532 """Handle credentials success."""
533 if creds: # Have credentials already
534 try:
535- gui.utils.start_control_panel()
536+ from ubuntuone_installer.gui.qt import utils
537+ utils.start_control_panel()
538 except OSError:
539 QtGui.QMessageBox.critical(
540 None, "Ubuntu One", gui.STARTING_CP_ERROR)
541
542=== modified file 'ubuntuone_installer/gui/qt/side_widget.py'
543--- ubuntuone_installer/gui/qt/side_widget.py 2011-07-14 03:55:39 +0000
544+++ ubuntuone_installer/gui/qt/side_widget.py 2011-09-07 11:54:54 +0000
545@@ -33,9 +33,8 @@
546
547 install_stage = 0
548 signin_stage = 1
549- choose_services_stage = 2
550- select_sync_folders_stage = 3
551- sync_stage = 4
552+ select_sync_folders_stage = 2
553+ sync_stage = 3
554
555 def __init__(self, *args, **kwargs):
556 super(SideWidget, self).__init__(*args, **kwargs)
557@@ -48,13 +47,10 @@
558 self.stage = stage
559 self.ui.install_label.setEnabled(stage >= 0)
560 self.ui.sign_in_label.setEnabled(stage >= 1)
561- self.ui.choose_services_label.setEnabled(stage >= 2)
562- self.ui.select_folders_label.setEnabled(stage >= 3)
563- self.ui.sync_label.setEnabled(stage >= 4)
564+ self.ui.select_folders_label.setEnabled(stage >= 2)
565+ self.ui.sync_label.setEnabled(stage >= 3)
566 self.set_stage_icon(self.ui.install_icon_label, self.install_stage)
567 self.set_stage_icon(self.ui.sign_icon_label, self.signin_stage)
568- self.set_stage_icon(self.ui.choose_icon_label,
569- self.choose_services_stage)
570 self.set_stage_icon(self.ui.folders_icon_label,
571 self.select_sync_folders_stage)
572 self.set_stage_icon(self.ui.sync_icon_label, self.sync_stage)
573
574=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
575--- ubuntuone_installer/gui/qt/tests/test_gui.py 2011-09-06 16:25:25 +0000
576+++ ubuntuone_installer/gui/qt/tests/test_gui.py 2011-09-07 11:54:54 +0000
577@@ -175,7 +175,7 @@
578 self.ui.restart()
579 self.ui.show()
580 self.addCleanup(self.ui.hide)
581- gui.AreYouSure.result = 1
582+ gui.AreYouSure.result = 0
583 self.patch(utils, "uninstall_application", self._set_called)
584 self.ui.done(result=0)
585 self.assertTrue(self._called)
586@@ -186,7 +186,7 @@
587 self.ui.restart()
588 self.ui.show()
589 self.addCleanup(self.ui.hide)
590- gui.AreYouSure.result = 1
591+ gui.AreYouSure.result = 0
592 self.patch(utils, "uninstall_application", self._set_called)
593 self.ui.done(result=0)
594 self.assertTrue(self._called)
595@@ -419,7 +419,7 @@
596
597 def test_continue_cancels_cancel(self):
598 """Clicking 'Continue' cancels cancellation."""
599- gui.AreYouSure.result = 0
600+ gui.AreYouSure.result = 1
601 self.patch(subprocess, "Popen", self._set_called)
602 self.ui.show()
603 self.addCleanup(self.ui.hide)
604
605=== modified file 'ubuntuone_installer/gui/qt/tests/test_side_widget.py'
606--- ubuntuone_installer/gui/qt/tests/test_side_widget.py 2011-07-14 03:55:39 +0000
607+++ ubuntuone_installer/gui/qt/tests/test_side_widget.py 2011-09-07 11:54:54 +0000
608@@ -43,8 +43,6 @@
609 self.assertEqual(
610 self.ui.ui.sign_in_label.isEnabled(), False)
611 self.assertEqual(
612- self.ui.ui.choose_services_label.isEnabled(), False)
613- self.assertEqual(
614 self.ui.ui.select_folders_label.isEnabled(), False)
615 self.assertEqual(
616 self.ui.ui.sync_label.isEnabled(), False)
617@@ -58,8 +56,6 @@
618 self.assertEqual(
619 self.ui.ui.sign_in_label.isEnabled(), True)
620 self.assertEqual(
621- self.ui.ui.choose_services_label.isEnabled(), False)
622- self.assertEqual(
623 self.ui.ui.select_folders_label.isEnabled(), False)
624 self.assertEqual(
625 self.ui.ui.sync_label.isEnabled(), False)
626@@ -73,9 +69,7 @@
627 self.assertEqual(
628 self.ui.ui.sign_in_label.isEnabled(), True)
629 self.assertEqual(
630- self.ui.ui.choose_services_label.isEnabled(), True)
631- self.assertEqual(
632- self.ui.ui.select_folders_label.isEnabled(), False)
633+ self.ui.ui.select_folders_label.isEnabled(), True)
634 self.assertEqual(
635 self.ui.ui.sync_label.isEnabled(), False)
636 self.check_state_pixmap(2)
637@@ -88,28 +82,11 @@
638 self.assertEqual(
639 self.ui.ui.sign_in_label.isEnabled(), True)
640 self.assertEqual(
641- self.ui.ui.choose_services_label.isEnabled(), True)
642- self.assertEqual(
643 self.ui.ui.select_folders_label.isEnabled(), True)
644 self.assertEqual(
645- self.ui.ui.sync_label.isEnabled(), False)
646+ self.ui.ui.sync_label.isEnabled(), True)
647 self.check_state_pixmap(3)
648
649- def test_stage_4(self):
650- """Check that each stage in the widget enables the right labels."""
651- self.ui.set_stage(4)
652- self.assertEqual(
653- self.ui.ui.install_label.isEnabled(), True)
654- self.assertEqual(
655- self.ui.ui.sign_in_label.isEnabled(), True)
656- self.assertEqual(
657- self.ui.ui.choose_services_label.isEnabled(), True)
658- self.assertEqual(
659- self.ui.ui.select_folders_label.isEnabled(), True)
660- self.assertEqual(
661- self.ui.ui.sync_label.isEnabled(), True)
662- self.check_state_pixmap(4)
663-
664 def get_pixmap_data(self, pixmap):
665 """Get the raw data of a QPixmap."""
666 byte_array = QtCore.QByteArray()
667@@ -128,7 +105,6 @@
668
669 def check_state_pixmap(self, stage):
670 """Check if each label has the proper pixmap depending on the state."""
671- print stage
672 active_pixmap = QtGui.QPixmap(":/progress_arrow_orange.png")
673 no_active_pixmap = QtGui.QPixmap(":/progress_arrow_grey.png")
674 complete_pixmap = QtGui.QPixmap(":/progress_tick.png")
675@@ -137,19 +113,18 @@
676 labels = (
677 self.ui.ui.install_icon_label,
678 self.ui.ui.sign_icon_label,
679- self.ui.ui.choose_icon_label,
680 self.ui.ui.folders_icon_label,
681 self.ui.ui.sync_icon_label)
682
683 for item in labels[:stage]:
684 self.assertEqualPixmaps(complete_pixmap, item.pixmap())
685
686- if stage != 4:
687+ if stage != 3:
688 self.assertEqualPixmaps(active_pixmap, labels[stage].pixmap())
689 else:
690- self.assertEqualPixmaps(sync_active_pixmap, labels[4].pixmap())
691+ self.assertEqualPixmaps(sync_active_pixmap, labels[3].pixmap())
692
693- if stage < 4:
694+ if stage < 3:
695 for item in labels[stage + 1:len(labels) - 1]:
696 self.assertEqualPixmaps(no_active_pixmap, item.pixmap())
697- self.assertEqualPixmaps(sync_no_active_pixmap, labels[4].pixmap())
698+ self.assertEqualPixmaps(sync_no_active_pixmap, labels[3].pixmap())

Subscribers

People subscribed via source and target branches