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

[Roberto Alsina]

* Add labels for the fields in the "Existing user sign in" page.
* Add the required strings for those labels.
* Add the subtitle to the page.

* Add labels for the fields in the "Existing user sign in" page.
* Add the required strings for those labels.
* Add the subtitle to the page.

Requires lp:~ralsina/ubuntu-sso-client/fix_803661 on ubuntu-sso-client

This is a UI change, you need to see it IRL:

On one terminal, start the ubuntu-sso-client:

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

On a second terminal, start the wizard:

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

Follow the wizard, and you should see this:

https://launchpadlibrarian.net/74361741/implemented_bug_803677.png

Compare to the current wireframe:

https://launchpadlibrarian.net/74317058/existing_user.png

Consider that the texts are not final, because there is no signed off copy for the SSO pages, and review accordingly.

[Alejandro J. Cura (alecu)]

works for me!
Please just remove the space between the app_name and the text "username"

review: Approve

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-06-29 14:46:21 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-06-30 20:31:26 +0000
@@ -76,7 +76,9 @@
 from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
 
 _ = gettext.gettext
-SIGN_IN = _("Sign In")
+SIGN_IN = _("Sign in to Ubuntu One")
+SIGN_IN_SUBTITLE = _("Sign in with your existing Ubuntu One"
+    " username and password.")
 
 # Invalid name logger
 # pylint: disable=C0103
@@ -91,7 +93,6 @@
         super(LicensePage, self).__init__(parent)
         self.ui = license_ui.Ui_Form()
         self.ui.setupUi(self)
-        self.setCommitPage(False)
 
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
@@ -118,6 +119,7 @@
             QtGui.QWizard.CustomButton1,
             QtGui.QWizard.Stretch,
             QtGui.QWizard.CancelButton,
+            QtGui.QWizard.BackButton,
             QtGui.QWizard.NextButton,
             QtGui.QWizard.FinishButton,
             ])
@@ -161,6 +163,7 @@
         self.wizard().setButtonLayout([
             QtGui.QWizard.CancelButton,
             QtGui.QWizard.Stretch,
+            QtGui.QWizard.BackButton,
             QtGui.QWizard.NextButton,
             ])
 
@@ -187,6 +190,18 @@
         """Provide the next id."""
         return self.next
 
+    def initializePage(self):
+        """Setup UI details."""
+        self.setButtonText(QtGui.QWizard.CancelButton,
+            _("Cancel"))
+        # Layout without custom button 1,
+        # without finish button
+        self.wizard().setButtonLayout([
+            QtGui.QWizard.Stretch,
+            QtGui.QWizard.BackButton,
+            QtGui.QWizard.CancelButton,
+            ])
+
 
 class SuccessPage(QtGui.QWizardPage):
     """Shown after SSO login, before setup."""
@@ -246,6 +261,7 @@
 
 
 class MainWindow(QtGui.QWizard):
+
     """The Main Window of the Installer wizard."""
 
     # Invalid constant names and Qt-inherited methods
@@ -273,6 +289,7 @@
         self.ping_url = PING_URL
 
         super(MainWindow, self).__init__()
+        self.setWizardStyle(self.ModernStyle)
         self.close_callback = close_callback
 
         self.creds = Credentials(
@@ -283,15 +300,13 @@
             )
 
         self.setOption(self.NoBackButtonOnStartPage, True)
-        self.setOption(self.DisabledBackButtonOnLastPage, True)
-        # PyQt doesn't support the (int, page) version of addPage
+
+        # PyQt doesn't support the (int, page) version of addPage, so
         # Add the pages in the right order
-
         # pylint: disable=C0103
         self.LICENSE_PAGE = self.addPage(LicensePage())
 
         #SSO Pages
-
         self.sign_in_controller = ChooseSignInController(title=SIGN_IN)
         self.sign_in_page = SignInPage(ui=Ui_ChooseSignInPage(),
                                        controller=self.sign_in_controller,
@@ -306,7 +321,8 @@
         self.email_verification = EmailVerificationPage(
                                                 Ui_EmailVerificationPage(),
                                                 EmailVerificationController())
-        self.current_user_controller = CurrentUserController(SIGN_IN)
+        self.current_user_controller = CurrentUserController(
+            title=SIGN_IN, subtitle=SIGN_IN_SUBTITLE)
         self.current_user = CurrentUserSignInPage(Ui_CurrentUserSignInPage(),
                                                   self.current_user_controller,
                                                   parent=self)

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-06-29 15:10:54 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-06-30 20:31:26 +0000
@@ -58,7 +58,7 @@
     """A fake controller for the tests."""
 
     def __init__(self, *args, **kwargs):
-        pass
+        self.args = (args, kwargs)
 
     # pylint: disable=C0103
     def setupUi(self, view):
@@ -159,6 +159,12 @@
             'ping_url': PING_URL,
         })
 
+    def test_current_user_controller_parameters(self):
+        """Compare controller parameters with expected values."""
+        self.assertEqual(self.ui.current_user_controller.args,
+        ((), {'title': gui.SIGN_IN,
+              'subtitle': gui.SIGN_IN_SUBTITLE}))
+
 
 class SSOGuiTestCase(BaseTestCase):
     """Test the custom SSO GUI."""