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

[Diego Sarmentero]

Fixed Installer Sizes to fit the specs.

Fixed Installer Sizes to fit the specs.

[Roberto Alsina (ralsina)]

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

review: Approve

[lp:~diegosarmentero/ubuntuone-windows-installer/wizard-sizes]

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)]

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

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/wizard-sizes]

48. By Diego Sarmentero on 2011-09-06

merge.
conflict resolved.

[Diego Sarmentero (diegosarmentero)]

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

Resolved

[Natalia Bidart (nataliabidart)]

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

[lp:~diegosarmentero/ubuntuone-windows-installer/wizard-sizes]

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)]

Looks good!

review: Approve

=== modified file 'data/qt/choose_sign_in.ui'
--- data/qt/choose_sign_in.ui	2011-08-05 19:34:29 +0000
+++ data/qt/choose_sign_in.ui	2011-09-07 11:54:54 +0000
@@ -17,6 +17,9 @@
    <property name="leftMargin">
     <number>0</number>
    </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
 
=== modified file 'data/qt/congratulations.ui'
--- data/qt/congratulations.ui	2011-08-29 01:35:26 +0000
+++ data/qt/congratulations.ui	2011-09-07 11:54:54 +0000
@@ -17,6 +17,9 @@
    <property name="spacing">
     <number>24</number>
    </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QLabel" name="label">
      <property name="font">
 
=== modified file 'data/qt/folders.ui'
--- data/qt/folders.ui	2011-08-10 21:06:46 +0000
+++ data/qt/folders.ui	2011-09-07 11:54:54 +0000
@@ -14,6 +14,9 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
 
=== modified file 'data/qt/license.ui'
--- data/qt/license.ui	2011-07-12 03:24:48 +0000
+++ data/qt/license.ui	2011-09-07 11:54:54 +0000
@@ -14,21 +14,11 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QTextBrowser" name="textBrowser">
-     <property name="html">
-      <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;
-&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;
-p, li { white-space: pre-wrap; }
-&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;
-&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;
-&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;
-&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;
-&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;
-&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;
-&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;
-&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>
-     </property>
      <property name="openExternalLinks">
       <bool>true</bool>
      </property>
 
=== modified file 'data/qt/local_folders.ui'
--- data/qt/local_folders.ui	2011-08-15 13:29:08 +0000
+++ data/qt/local_folders.ui	2011-09-07 11:54:54 +0000
@@ -14,6 +14,9 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
 
=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2011-08-10 21:06:46 +0000
+++ data/qt/preferences.ui	2011-09-07 11:54:54 +0000
@@ -13,7 +13,11 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout"/>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+  </layout>
  </widget>
  <resources/>
  <connections/>
 
=== modified file 'data/qt/setup_account.ui'
--- data/qt/setup_account.ui	2011-08-29 12:49:25 +0000
+++ data/qt/setup_account.ui	2011-09-07 11:54:54 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>583</width>
-    <height>538</height>
+    <width>543</width>
+    <height>523</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -29,11 +29,20 @@
    <property name="spacing">
     <number>0</number>
    </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
    <property name="rightMargin">
-    <number>6</number>
+    <number>3</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
    </property>
    <item>
-    <layout class="QGridLayout" name="gridLayout" columnminimumwidth="310,250">
+    <layout class="QGridLayout" name="gridLayout" columnminimumwidth="310,220">
      <item row="0" column="0">
       <widget class="QLabel" name="password_info_label">
        <property name="sizePolicy">
@@ -412,9 +421,15 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>220</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="maximumSize">
         <size>
-         <width>300</width>
+         <width>220</width>
          <height>16777215</height>
         </size>
        </property>
@@ -428,14 +443,17 @@
         <bool>true</bool>
        </property>
        <property name="indent">
-        <number>20</number>
+        <number>0</number>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <layout class="QVBoxLayout" name="verticalLayout_7">
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <property name="leftMargin">
-        <number>10</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QLabel" name="name_assistance">
@@ -445,9 +463,15 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="minimumSize">
+          <size>
+           <width>220</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="maximumSize">
           <size>
-           <width>300</width>
+           <width>220</width>
            <height>16777215</height>
           </size>
          </property>
@@ -457,14 +481,20 @@
          <property name="alignment">
           <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
          </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
      </item>
      <item row="3" column="1">
       <layout class="QVBoxLayout" name="verticalLayout_8">
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <property name="leftMargin">
-        <number>10</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QLabel" name="email_assistance">
@@ -474,9 +504,15 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="minimumSize">
+          <size>
+           <width>220</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="maximumSize">
           <size>
-           <width>300</width>
+           <width>220</width>
            <height>16777215</height>
           </size>
          </property>
@@ -486,14 +522,20 @@
          <property name="alignment">
           <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
          </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
       </layout>
      </item>
      <item row="4" column="1">
       <layout class="QVBoxLayout" name="verticalLayout_9">
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <property name="leftMargin">
-        <number>10</number>
+        <number>0</number>
        </property>
        <item>
         <widget class="QLabel" name="confirm_email_assistance">
@@ -503,9 +545,15 @@
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="minimumSize">
+          <size>
+           <width>220</width>
+           <height>0</height>
+          </size>
+         </property>
          <property name="maximumSize">
           <size>
-           <width>300</width>
+           <width>220</width>
            <height>16777215</height>
           </size>
          </property>
@@ -515,6 +563,12 @@
          <property name="alignment">
           <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
          </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+         <property name="indent">
+          <number>0</number>
+         </property>
         </widget>
        </item>
       </layout>
@@ -527,17 +581,26 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
+       <property name="minimumSize">
+        <size>
+         <width>220</width>
+         <height>0</height>
+        </size>
+       </property>
        <property name="maximumSize">
         <size>
-         <width>300</width>
+         <width>220</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="text">
         <string>password_assistance</string>
        </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
        <property name="indent">
-        <number>20</number>
+        <number>17</number>
        </property>
       </widget>
      </item>
@@ -552,7 +615,7 @@
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
-         <height>20</height>
+         <height>15</height>
         </size>
        </property>
       </spacer>
@@ -568,7 +631,7 @@
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
-         <height>20</height>
+         <height>15</height>
         </size>
        </property>
       </spacer>
@@ -584,7 +647,7 @@
        <property name="sizeHint" stdset="0">
         <size>
          <width>20</width>
-         <height>20</height>
+         <height>15</height>
         </size>
        </property>
       </spacer>
 
=== modified file 'data/qt/side_widget.ui'
--- data/qt/side_widget.ui	2011-07-14 10:53:49 +0000
+++ data/qt/side_widget.ui	2011-09-07 11:54:54 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>200</width>
-    <height>563</height>
+    <width>170</width>
+    <height>466</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -18,8 +18,8 @@
   </property>
   <property name="minimumSize">
    <size>
-    <width>200</width>
-    <height>0</height>
+    <width>170</width>
+    <height>466</height>
    </size>
   </property>
   <property name="windowTitle">
@@ -36,7 +36,7 @@
     <number>40</number>
    </property>
    <property name="margin">
-    <number>10</number>
+    <number>0</number>
    </property>
    <item>
     <widget class="QLabel" name="ubuntu_one_logo_label">
@@ -145,39 +145,6 @@
        </layout>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
-        <property name="spacing">
-         <number>7</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="choose_icon_label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="images.qrc">:/progress_arrow_grey.png</pixmap>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="choose_services_label">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="text">
-           <string>Choose services</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <property name="spacing">
          <number>7</number>
 
=== modified file 'data/qt/sign_in.ui'
--- data/qt/sign_in.ui	2011-07-27 14:53:56 +0000
+++ data/qt/sign_in.ui	2011-09-07 11:54:54 +0000
@@ -14,6 +14,9 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QLabel" name="label">
      <property name="font">
 
=== modified file 'data/qt/sync_now_or_later.ui'
--- data/qt/sync_now_or_later.ui	2011-06-28 19:18:35 +0000
+++ data/qt/sync_now_or_later.ui	2011-09-07 11:54:54 +0000
@@ -17,6 +17,9 @@
    <property name="spacing">
     <number>24</number>
    </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QLabel" name="label">
      <property name="font">
 
=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-08-24 18:08:14 +0000
+++ data/qt/ubuntuone.qss	2011-09-07 11:54:54 +0000
@@ -10,7 +10,6 @@
     border-right-width: 1px;
     color: white;
     min-height: 100px;
-    margin-left: 10px;
 }
 
 QWizard,
 
=== modified file 'ubuntuone_installer/gui/qt/__init__.py'
--- ubuntuone_installer/gui/qt/__init__.py	2011-06-22 10:47:08 +0000
+++ ubuntuone_installer/gui/qt/__init__.py	2011-09-07 11:54:54 +0000
@@ -17,3 +17,20 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """The Qt graphical interface for the Ubuntu One Installer."""
+
+
+LICENSE_CONTENT = """<html>
+    <body style="font-family:Ubuntu">
+        <h2>License Agreement</h2>
+        <p>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.</p>
+        <p>Ubuntu One Basic is free, while additional service add-ons may be
+        paid for services.</p>
+        <p>As free software, this programme is distributed without warranty.
+        See the GNU General Public License for more details at
+        <a href='http://www.gnu.org/licenses'
+        style="color:#dd4814;">http://www.gnu.org/licenses</a>
+        </p>
+    </body>
+<html>"""
 
=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-06 17:30:24 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-09-07 11:54:54 +0000
@@ -64,7 +64,7 @@
     setup_account_ui,
 )
 
-from ubuntuone_installer.gui.qt import utils
+from ubuntuone_installer.gui import qt
 from ubuntuone_installer.gui.qt.are_you_sure import AreYouSure
 from ubuntuone_installer.gui.qt.currentuser import CurrentUserController
 from ubuntuone_installer.gui.qt.folders import FoldersPage
@@ -98,6 +98,7 @@
         self._next_id = None
         super(LicensePage, self).__init__(license_ui.Ui_Form(), None, parent)
         self.header.setVisible(False)
+        self.ui.textBrowser.setHtml(qt.LICENSE_CONTENT)
 
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
@@ -285,8 +286,8 @@
         self.setWindowFlags(flags)
 
         self.setWindowTitle(APP_NAME)
-        self.setMinimumHeight(590)
-        self.setMinimumWidth(800)
+        self.setMinimumHeight(538)
+        self.setMinimumWidth(740)
         self.setWizardStyle(self.ModernStyle)
         self.close_callback = close_callback
 
@@ -426,10 +427,10 @@
         """The main window is being closed, call any custom callback."""
         # Finished, not cancelled
         if result == 1:  # Cancelled
-            utils.start_control_panel()
+            qt.utils.start_control_panel()
         elif self.currentId() == self.LICENSE_PAGE_ID:
-            if AreYouSure(self).exec_():
-                utils.uninstall_application()
+            if not AreYouSure(self).exec_():
+                qt.utils.uninstall_application()
             else:
                 return
         elif self.currentId() != self.CONGRATULATIONS_PAGE:
 
=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-09-01 11:15:49 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-09-07 11:54:54 +0000
@@ -47,7 +47,8 @@
     """Handle credentials success."""
     if creds:  # Have credentials already
         try:
-            gui.utils.start_control_panel()
+            from ubuntuone_installer.gui.qt import utils
+            utils.start_control_panel()
         except OSError:
             QtGui.QMessageBox.critical(
                 None, "Ubuntu One", gui.STARTING_CP_ERROR)
 
=== modified file 'ubuntuone_installer/gui/qt/side_widget.py'
--- ubuntuone_installer/gui/qt/side_widget.py	2011-07-14 03:55:39 +0000
+++ ubuntuone_installer/gui/qt/side_widget.py	2011-09-07 11:54:54 +0000
@@ -33,9 +33,8 @@
 
     install_stage = 0
     signin_stage = 1
-    choose_services_stage = 2
-    select_sync_folders_stage = 3
-    sync_stage = 4
+    select_sync_folders_stage = 2
+    sync_stage = 3
 
     def __init__(self, *args, **kwargs):
         super(SideWidget, self).__init__(*args, **kwargs)
@@ -48,13 +47,10 @@
         self.stage = stage
         self.ui.install_label.setEnabled(stage >= 0)
         self.ui.sign_in_label.setEnabled(stage >= 1)
-        self.ui.choose_services_label.setEnabled(stage >= 2)
-        self.ui.select_folders_label.setEnabled(stage >= 3)
-        self.ui.sync_label.setEnabled(stage >= 4)
+        self.ui.select_folders_label.setEnabled(stage >= 2)
+        self.ui.sync_label.setEnabled(stage >= 3)
         self.set_stage_icon(self.ui.install_icon_label, self.install_stage)
         self.set_stage_icon(self.ui.sign_icon_label, self.signin_stage)
-        self.set_stage_icon(self.ui.choose_icon_label,
-            self.choose_services_stage)
         self.set_stage_icon(self.ui.folders_icon_label,
             self.select_sync_folders_stage)
         self.set_stage_icon(self.ui.sync_icon_label, self.sync_stage)
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-06 16:25:25 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-07 11:54:54 +0000
@@ -175,7 +175,7 @@
         self.ui.restart()
         self.ui.show()
         self.addCleanup(self.ui.hide)
-        gui.AreYouSure.result = 1
+        gui.AreYouSure.result = 0
         self.patch(utils, "uninstall_application", self._set_called)
         self.ui.done(result=0)
         self.assertTrue(self._called)
@@ -186,7 +186,7 @@
         self.ui.restart()
         self.ui.show()
         self.addCleanup(self.ui.hide)
-        gui.AreYouSure.result = 1
+        gui.AreYouSure.result = 0
         self.patch(utils, "uninstall_application", self._set_called)
         self.ui.done(result=0)
         self.assertTrue(self._called)
@@ -419,7 +419,7 @@
 
     def test_continue_cancels_cancel(self):
         """Clicking 'Continue' cancels cancellation."""
-        gui.AreYouSure.result = 0
+        gui.AreYouSure.result = 1
         self.patch(subprocess, "Popen", self._set_called)
         self.ui.show()
         self.addCleanup(self.ui.hide)
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_side_widget.py'
--- ubuntuone_installer/gui/qt/tests/test_side_widget.py	2011-07-14 03:55:39 +0000
+++ ubuntuone_installer/gui/qt/tests/test_side_widget.py	2011-09-07 11:54:54 +0000
@@ -43,8 +43,6 @@
         self.assertEqual(
             self.ui.ui.sign_in_label.isEnabled(), False)
         self.assertEqual(
-            self.ui.ui.choose_services_label.isEnabled(), False)
-        self.assertEqual(
             self.ui.ui.select_folders_label.isEnabled(), False)
         self.assertEqual(
             self.ui.ui.sync_label.isEnabled(), False)
@@ -58,8 +56,6 @@
         self.assertEqual(
             self.ui.ui.sign_in_label.isEnabled(), True)
         self.assertEqual(
-            self.ui.ui.choose_services_label.isEnabled(), False)
-        self.assertEqual(
             self.ui.ui.select_folders_label.isEnabled(), False)
         self.assertEqual(
             self.ui.ui.sync_label.isEnabled(), False)
@@ -73,9 +69,7 @@
         self.assertEqual(
             self.ui.ui.sign_in_label.isEnabled(), True)
         self.assertEqual(
-            self.ui.ui.choose_services_label.isEnabled(), True)
-        self.assertEqual(
-            self.ui.ui.select_folders_label.isEnabled(), False)
+            self.ui.ui.select_folders_label.isEnabled(), True)
         self.assertEqual(
             self.ui.ui.sync_label.isEnabled(), False)
         self.check_state_pixmap(2)
@@ -88,28 +82,11 @@
         self.assertEqual(
             self.ui.ui.sign_in_label.isEnabled(), True)
         self.assertEqual(
-            self.ui.ui.choose_services_label.isEnabled(), True)
-        self.assertEqual(
             self.ui.ui.select_folders_label.isEnabled(), True)
         self.assertEqual(
-            self.ui.ui.sync_label.isEnabled(), False)
+            self.ui.ui.sync_label.isEnabled(), True)
         self.check_state_pixmap(3)
 
-    def test_stage_4(self):
-        """Check that each stage in the widget enables the right labels."""
-        self.ui.set_stage(4)
-        self.assertEqual(
-            self.ui.ui.install_label.isEnabled(), True)
-        self.assertEqual(
-            self.ui.ui.sign_in_label.isEnabled(), True)
-        self.assertEqual(
-            self.ui.ui.choose_services_label.isEnabled(), True)
-        self.assertEqual(
-            self.ui.ui.select_folders_label.isEnabled(), True)
-        self.assertEqual(
-            self.ui.ui.sync_label.isEnabled(), True)
-        self.check_state_pixmap(4)
-
     def get_pixmap_data(self, pixmap):
         """Get the raw data of a QPixmap."""
         byte_array = QtCore.QByteArray()
@@ -128,7 +105,6 @@
 
     def check_state_pixmap(self, stage):
         """Check if each label has the proper pixmap depending on the state."""
-        print stage
         active_pixmap = QtGui.QPixmap(":/progress_arrow_orange.png")
         no_active_pixmap = QtGui.QPixmap(":/progress_arrow_grey.png")
         complete_pixmap = QtGui.QPixmap(":/progress_tick.png")
@@ -137,19 +113,18 @@
         labels = (
             self.ui.ui.install_icon_label,
             self.ui.ui.sign_icon_label,
-            self.ui.ui.choose_icon_label,
             self.ui.ui.folders_icon_label,
             self.ui.ui.sync_icon_label)
 
         for item in labels[:stage]:
             self.assertEqualPixmaps(complete_pixmap, item.pixmap())
 
-        if stage != 4:
+        if stage != 3:
             self.assertEqualPixmaps(active_pixmap, labels[stage].pixmap())
         else:
-            self.assertEqualPixmaps(sync_active_pixmap, labels[4].pixmap())
+            self.assertEqualPixmaps(sync_active_pixmap, labels[3].pixmap())
 
-        if stage < 4:
+        if stage < 3:
             for item in labels[stage + 1:len(labels) - 1]:
                 self.assertEqualPixmaps(no_active_pixmap, item.pixmap())
-            self.assertEqualPixmaps(sync_no_active_pixmap, labels[4].pixmap())
+            self.assertEqualPixmaps(sync_no_active_pixmap, labels[3].pixmap())