Merge lp:~ralsina/ubuntuone-windows-installer/fix_804600 into lp:ubuntuone-windows-installer

[Roberto Alsina]

Bring the "choose sign in" page up to spec:

* Title
* Extra widget for a big image
* "Close window and setup later" button inside the page
* Added missing "Ubuntu One has installed!" label

Bring the "choose sign in" page up to spec:

* Title
* Extra widget for a big image
* "Close window and setup later" button inside the page
* Added missing "Ubuntu One has installed!" label

Wireframe:

https://bugs.launchpad.net/ubuntuone-windows-installer/+bug/804600/+attachment/2187322/+files/choose_signin_wireframe.png

Implemented:

https://bugs.launchpad.net/ubuntuone-windows-installer/+bug/804600/+attachment/2189757/+files/choose_sign_in_implemented.png

To test IRL (Windows)

In one terminal run the SSO client

set PYTHONPATH=.
python bin\windows-ubuntu-sso-login

In another terminal:

PYTHONPATH=..\ubuntuone-client;..\ubuntuone-control-panel;..\ubuntu-sso-client;.
python bin\ubuntuone-installer-qt

[lp:~ralsina/ubuntuone-windows-installer/fix_804600]

20. By Roberto Alsina on 2011-07-04

Merged trunk

21. By Roberto Alsina on 2011-07-04

Style fix

22. By Roberto Alsina on 2011-07-05

imports in alphabetical order

23. By Roberto Alsina on 2011-07-05

Removed useless back button

[Natalia Bidart (nataliabidart)]

review: Approve

[lp:~ralsina/ubuntuone-windows-installer/fix_804600]

24. By Roberto Alsina on 2011-07-05

Move style checks to the top

[Roberto Alsina (ralsina)]

review: Approve

=== added file 'data/qt/choose_sign_in.ui'
--- data/qt/choose_sign_in.ui	1970-01-01 00:00:00 +0000
+++ data/qt/choose_sign_in.ui	2011-07-05 20:09:38 +0000
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ChooseSignInPage</class>
+ <widget class="QWizardPage" name="ChooseSignInPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>541</width>
+    <height>365</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WizardPage</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="image_label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>400</width>
+         <height>150</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>image
+
+[This will be the same image as appears on Ubuntu One Home page on the web - in production]</string>
+       </property>
+       <property name="textFormat">
+        <enum>Qt::PlainText</enum>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QLabel" name="message_label">
+     <property name="text">
+      <string>Ubuntu One has installed!</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QPushButton" name="existing_account_button">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="setup_account_button">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="cancel_button">
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>76</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-06-27 09:59:13 +0000
+++ run-tests.bat	2011-07-05 20:09:38 +0000
@@ -47,15 +47,7 @@
 ECHO Please ensure you have python installed
 GOTO :END
 
-
 :PYTHONPRESENT
-ECHO Python found, building auto-generated modules...
-:: call setup.py build so that the qt uic is called
-::START "Build code" /D%CD% /WAIT "%PYTHONEXEPATH%\python.exe" setup.py build
-"%PYTHONEXEPATH%\python.exe" setup.py build
-ECHO Running tests
-:: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" ubuntuone_installer --gui --reactor=qt4
 :: Clean the build from the setup.py
 ECHO Cleaning the generated code before running the style checks...
 "%PYTHONEXEPATH%\python.exe" setup.py clean
@@ -68,3 +60,10 @@
 RMDIR /s /q _trial_temp
 RMDIR /s /q .coverage
 :END
+ECHO Python found, building auto-generated modules...
+:: call setup.py build so that the qt uic is called
+::START "Build code" /D%CD% /WAIT "%PYTHONEXEPATH%\python.exe" setup.py build
+"%PYTHONEXEPATH%\python.exe" setup.py build
+ECHO Running tests
+:: execute the tests with a number of ignored linux only modules
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" ubuntuone_installer --gui --reactor=qt4

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-07-04 20:05:19 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-07-05 20:09:38 +0000
@@ -33,8 +33,6 @@
     ForgottenPasswordPage,
     ResetPasswordPage,
 )
-from ubuntu_sso.qt.choose_sign_in_ui import \
-    Ui_ChooseSignInPage
 from ubuntu_sso.qt.current_user_sign_in_ui import \
     Ui_CurrentUserSignInPage
 from ubuntu_sso.qt.email_verification_ui import \
@@ -66,8 +64,9 @@
 
 from ubuntuone_installer.logger import setup_logging
 from ubuntuone_installer.gui.qt.ui import (
+    choose_sign_in_ui,
+    congratulations_ui,
     license_ui,
-    congratulations_ui,
     setup_account_ui
 )
 from ubuntuone_installer.gui.qt.local_folders import LocalFoldersPage
@@ -156,14 +155,13 @@
 
     def initializePage(self):
         """Setup UI details."""
-        self.setButtonText(QtGui.QWizard.CancelButton,
-            _("Close window and setup later"))
+        self.ui.cancel_button.setText(_("Close window and setup later"))
+        self.ui.cancel_button.clicked.connect(self.wizard().reject)
         # Layout without custom button 1,
         # without finish button
+        # without cancel
         self.wizard().setButtonLayout([
-            QtGui.QWizard.CancelButton,
             QtGui.QWizard.Stretch,
-            QtGui.QWizard.BackButton,
             QtGui.QWizard.NextButton,
             ])
 
@@ -308,9 +306,10 @@
 
         #SSO Pages
         self.sign_in_controller = ChooseSignInController(title=SIGN_IN)
-        self.sign_in_page = SignInPage(ui=Ui_ChooseSignInPage(),
-                                       controller=self.sign_in_controller,
-                                       parent=self)
+        self.sign_in_page = SignInPage(
+            ui=choose_sign_in_ui.Ui_ChooseSignInPage(),
+            controller=self.sign_in_controller,
+            parent=self)
         self.setup_controller = SetUpAccountController()
         self.setup_account = SetupAccountPage(
             setup_account_ui.Ui_SetUpAccountPage(),

=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-07-01 21:37:58 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-07-05 20:09:38 +0000
@@ -78,7 +78,8 @@
             self.confirm_email_assistance)
         self.confirm_email_assistance()
         self.ui.password_edit.textEdited.connect(self.password_assistance)
-        self.ui.confirm_password_edit.textEdited.connect(self.password_assistance)
+        self.ui.confirm_password_edit.textEdited.connect(
+            self.password_assistance)
         self.password_assistance()
 
     def name_assistance(self):

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-07-01 21:08:26 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-07-05 20:09:38 +0000
@@ -170,6 +170,12 @@
         ((), {'title': gui.SIGN_IN,
               'subtitle': gui.SIGN_IN_SUBTITLE}))
 
+    def test_choose_signin_cancel(self):
+        """Test that the custom cancel button works."""
+        self.ui.sign_in_page.ui.cancel_button.click()
+        QtCore.QCoreApplication.instance().processEvents()
+        self.assertEqual(self.ui.result(), self.ui.Rejected)
+
 
 class SSOGuiTestCase(BaseTestCase):
     """Test the custom SSO GUI."""