Merge lp:~ralsina/ubuntuone-windows-installer/ui-come-back-to-installer into lp:ubuntuone-windows-installer

[Roberto Alsina]

Moved the wizard UI from ussoc's process, back into the installer process.

Added one u1cp widget (the add folder button) to test that this fixes the problems embedding u1cp UI into the installer.

Added check to skip pages if there are credentials in the system.

Moved the wizard UI from ussoc's process, back into the installer process.

Added one u1cp widget (the add folder button) to test that this fixes the problems embedding u1cp UI into the installer.

Added check to skip pages if there are credentials in the system.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

There are no test for the new module currentuser.

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/ui-come-back-to-installer]

37. By Roberto Alsina on 2011-08-02

added tests for the currentuser module.

38. By Roberto Alsina on 2011-08-02

better docstrings.

39. By Roberto Alsina on 2011-08-02

merge

40. By Roberto Alsina on 2011-08-02

 test fix

41. By Roberto Alsina on 2011-08-02

merge

42. By Roberto Alsina on 2011-08-02

no need for embedded_sso anymore

[Roberto Alsina (ralsina)]

> There are no test for the new module currentuser.

Tests added.

[Natalia Bidart (nataliabidart)]

* Can you please unify these two imports into one?

from ubuntuone.platform.credentials import (
    APP_NAME,
    TC_URL,
)
from ubuntuone.platform.credentials import CredentialsManagementTool

* We need a blank line between these two:

import sys
from PyQt4 import QtGui

* The code inside the try-except in currentuser.py should not be this:

+ print e, type(e), repr(e)

but a call to logger.exception.

* Four double quotes instead of 3:

""""Fake the wizard() method of QWizardPage.""

* The faked credentialsmanagementtool should return a fired deferred with an empty dict, to simulate the absence of credentials.

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/ui-come-back-to-installer]

43. By Roberto Alsina on 2011-08-02

Use a successful deferred

[Natalia Bidart (nataliabidart)]

Seems like a test is not passing:

Traceback (most recent call last):
  File "E:\u1\windows-installer\review_ui-come-back-to-installer\ubuntuone_installer\gui\qt\tests\test_gui.py", line 464, in test_total_size
    u"Space (1337)")
twisted.trial.unittest.FailTest: not equal:
a = u'Space (1.3 KiB)'
b = u'Space (1337)'

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/ui-come-back-to-installer]

44. By Roberto Alsina on 2011-08-02

fixes

45. By Roberto Alsina on 2011-08-02

fixes

46. By Roberto Alsina on 2011-08-02

fix race condition in test

47. By Roberto Alsina on 2011-08-02

fixes

48. By Roberto Alsina on 2011-08-02

log credential exceptions

[Natalia Bidart (nataliabidart)]

I'm getting these lint issues:

ubuntuone_installer/gui/qt/gui.py:
    28: [W0611] Unused import returnValue
    28: [W0611] Unused import inlineCallbacks

ubuntuone_installer/gui/qt/tests/test_gui.py:
    382: [E0102, MainWindowTestCase.test_license_next] method already defined line 378
    395: [W0201, FakeSignal.connect] Attribute 'target' defined outside __init__
    27: [W0611] Unused import reactor
    36: [W0611] Unused import ubuntu_sso
    31: [W0611] Unused import TC_URL

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/ui-come-back-to-installer]

49. By Roberto Alsina on 2011-08-02

lint fixes

50. By Roberto Alsina on 2011-08-02

fixes

[Natalia Bidart (nataliabidart)]

Looks great now!

review: Approve

=== modified file 'bin/ubuntuone-installer-qt'
--- bin/ubuntuone-installer-qt	2011-07-13 20:21:48 +0000
+++ bin/ubuntuone-installer-qt	2011-08-02 20:49:39 +0000
@@ -27,8 +27,6 @@
 
 from optparse import OptionParser
 
-from twisted.internet import reactor
-
 from ubuntuone_installer import TRANSLATION_DOMAIN
 
 gettext.textdomain(TRANSLATION_DOMAIN)
@@ -48,4 +46,3 @@
     parser = parser_options()
     (options, args) = parser.parse_args(sys.argv)
     main.main()
-    reactor.run()

=== modified file 'data/qt/local_folders.ui'
--- data/qt/local_folders.ui	2011-06-28 15:46:02 +0000
+++ data/qt/local_folders.ui	2011-08-02 20:49:39 +0000
@@ -17,11 +17,11 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>Ok! Now it's time to choose wich folder sync to the cloud from this computer.
-We started by suggesting a few</string>
+      <string>Let's get started! First choose which folder you want to sync to your Ubuntu One personal cloud from this computer.
+To help you get going we have suggested a few.</string>
      </property>
      <property name="textFormat">
-      <enum>Qt::RichText</enum>
+      <enum>Qt::PlainText</enum>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -50,23 +50,28 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QPushButton" name="pushButton_2">
-       <property name="text">
-        <string>Add a folder</string>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
    <item>
     <widget class="QTreeWidget" name="folder_list">
+     <property name="indentation">
+      <number>0</number>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
+     <property name="allColumnsShowFocus">
+      <bool>true</bool>
+     </property>
      <attribute name="headerStretchLastSection">
       <bool>false</bool>
      </attribute>
      <column>
       <property name="text">
-       <string>My Folders</string>
+       <string>Sync these folders on my computer</string>
       </property>
      </column>
      <column>
@@ -74,26 +79,44 @@
        <string>Space (Total)</string>
       </property>
      </column>
-     <column>
-      <property name="text">
-       <string>Remove</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="checkBox">
-     <property name="text">
-      <string>Connect automatically when computer starts</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="checkBox_2">
-     <property name="text">
-      <string>Automatically sync all selected folders from this computer to the cloud</string>
-     </property>
-    </widget>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <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>
+     <item>
+      <widget class="AddFolderButton" name="add_folder_button">
+       <property name="text">
+        <string>Add a folder</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <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="QFrame" name="offer_frame">
@@ -113,7 +136,7 @@
       <item>
        <widget class="QLabel" name="offer_label">
         <property name="text">
-         <string>The folders you have selected to sync take over your 2GB space. You can remove some folders or add some extra space</string>
+         <string>The folders you have selected to sync take over your 5GB storage space by 6.5GB. You can remove some folders or add some extra storage now.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
@@ -138,7 +161,7 @@
         <item>
          <widget class="QPushButton" name="pushButton">
           <property name="text">
-           <string>add more space</string>
+           <string>Add more storage</string>
           </property>
          </widget>
         </item>
@@ -162,6 +185,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AddFolderButton</class>
+   <extends>QPushButton</extends>
+   <header>ubuntuone.controlpanel.gui.qt.addfolder</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>

=== added file 'ubuntuone_installer/gui/qt/currentuser.py'
--- ubuntuone_installer/gui/qt/currentuser.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/currentuser.py	2011-08-02 20:49:39 +0000
@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Custom controller for current user page."""
+
+from twisted.internet.defer import inlineCallbacks
+
+from ubuntu_sso.qt import controllers
+
+from ubuntuone.platform.credentials import (
+     CredentialsManagementTool,
+     CredentialsError,
+)
+
+from ubuntuone_installer.logger import setup_logging
+
+# Invalid name logger
+# pylint: disable=C0103
+logger = setup_logging('qt.currentuser')
+# pylint: enable=C0103
+
+
+class CurrentUserController(controllers.CurrentUserController):
+    """Custom controller for current user page."""
+
+    @inlineCallbacks
+    def login(self, *args):
+        """Perform the login using the self.backend."""
+        email = unicode(self.view.ui.email_edit.text())
+        password = unicode(self.view.ui.password_edit.text())
+        credtool = CredentialsManagementTool()
+        try:
+            d = yield credtool.login_email_password(
+                email=email,
+                password=password,
+            )
+            self.on_logged_in(self.view.wizard().app_name, d)
+        except CredentialsError, e:
+            logger.exception("Error getting credentials:")
+            self.on_login_error(e.args[0])

=== removed file 'ubuntuone_installer/gui/qt/embedded_sso.py'
--- ubuntuone_installer/gui/qt/embedded_sso.py	2011-07-27 14:53:56 +0000
+++ ubuntuone_installer/gui/qt/embedded_sso.py	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
-#
-# 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.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""The user interface for the Ubuntu One Installer's SSO client."""
-
-import ubuntu_sso.qt.gui as sso_gui
-
-from ubuntuone_installer.gui.qt.gui import MainWindow
-
-
-class UbuntuSSOClientGUI(object):
-    """A custom Client GUI for SSO."""
-
-    def __init__(self, app_name, tc_url, help_text,
-                 window_id=0, login_only=False):
-        """Create a new instance."""
-
-        # create the controller and the ui, then set the cb and call the show
-        # method so that we can work
-        self.controller = sso_gui.UbuntuSSOWizardController(
-            app_name,
-            user_cancellation_callback=self._user_cancellation_callback)
-        self.view = MainWindow()
-
-        self.login_success_callback = lambda x, y: None
-        self.registration_success_callback = lambda x, y: None
-        self.user_cancellation_callback = lambda x: None
-
-        self.view.loginSuccess.connect(self._login_success_callback)
-        self.view.registrationSuccess.connect(
-            self._registration_success_callback)
-        self.view.userCancellation.connect(self._user_cancellation_callback)
-
-        self.view.show()
-
-    def _login_success_callback(self, app_name, email):
-        """Call the real callback, set by the Credentials object"""
-        self.login_success_callback(str(app_name), str(email))
-
-    def _registration_success_callback(self, app_name, email):
-        """Call the real callback, set by the Credentials object"""
-        self.registration_success_callback(str(app_name), str(email))
-
-    def _user_cancellation_callback(self, app_name):
-        """Call the real callback, set by the Credentials object"""
-        self.user_cancellation_callback(str(app_name))

=== modified file 'ubuntuone_installer/gui/qt/forgotten.py'
--- ubuntuone_installer/gui/qt/forgotten.py	2011-07-19 21:06:06 +0000
+++ ubuntuone_installer/gui/qt/forgotten.py	2011-08-02 20:49:39 +0000
@@ -1,34 +1,34 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
-#
-# 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.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Custom forgotten password controller."""
-
-from ubuntu_sso.qt import controllers
-
-
-class ForgottenPasswordController(controllers.ForgottenPasswordController):
-    """A custom forgotten password controller.
-
-    This controller hides the overlay as needed.
-    """
-
-    def on_password_reset_error(self, app_name, error):
-        """Hide the overlay, then do as the default controller does."""
-        self.view.wizard().overlay.hide()
-        super(ForgottenPasswordController,
-            self).on_password_reset_error(app_name, error)
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Custom forgotten password controller."""
+
+from ubuntu_sso.qt import controllers
+
+
+class ForgottenPasswordController(controllers.ForgottenPasswordController):
+    """A custom forgotten password controller.
+
+    This controller hides the overlay as needed.
+    """
+
+    def on_password_reset_error(self, app_name, error):
+        """Hide the overlay, then do as the default controller does."""
+        self.view.wizard().overlay.hide()
+        super(ForgottenPasswordController,
+            self).on_password_reset_error(app_name, error)

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-08-02 14:12:22 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-08-02 20:49:39 +0000
@@ -45,7 +45,6 @@
 from ubuntu_sso.qt.reset_password_ui import Ui_ResetPasswordPage
 from ubuntu_sso.qt.controllers import (
     ChooseSignInController,
-    CurrentUserController,
     EmailVerificationController,
     ErrorController,
     ResetPasswordController,
@@ -58,6 +57,7 @@
 
 from ubuntuone.platform.credentials import (
     APP_NAME,
+    CredentialsManagementTool,
     TC_URL,
 )
 
@@ -75,6 +75,7 @@
 # pylint: enable=W0611
 
 from ubuntuone_installer.gui.qt.are_you_sure import AreYouSure
+from ubuntuone_installer.gui.qt.currentuser import CurrentUserController
 from ubuntuone_installer.gui.qt.forgotten import ForgottenPasswordController
 from ubuntuone_installer.gui.qt.local_folders import LocalFoldersPage
 from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
@@ -101,6 +102,7 @@
         super(LicensePage, self).__init__(parent)
         self.ui = license_ui.Ui_Form()
         self.ui.setupUi(self)
+        self._next_id = None
 
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
@@ -146,6 +148,12 @@
             printer.setPageSize(QtGui.QPrinter.A4)
             document.print_(printer)
 
+    def nextId(self):
+        """Return next page's ID."""
+        if self._next_id is None:
+            return super(LicensePage, self).nextId()
+        return self._next_id
+
 
 class SignInPage(QtGui.QWizardPage):
     """Wizard Page that lets the user Sign into Ubuntu One."""
@@ -330,7 +338,9 @@
         # 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())
+
+        self.LICENSE_PAGE = LicensePage()
+        self.LICENSE_PAGE_ID = self.addPage(self.LICENSE_PAGE)
 
         #SSO Pages
         title_page = TITLE_STYLE % SIGN_IN
@@ -424,10 +434,22 @@
         # Apply font to the entire application
         QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
         QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
+        credtool = CredentialsManagementTool()
+        d = credtool.find_credentials()
+        d.addCallback(self.creds_cb)
+        d.addErrback(lambda exc: logger.error(
+            'Error while getting the credentials: %r', exc))
 
     # Invalid name "closeEvent"
     # pylint: disable=C0103
 
+    def creds_cb(self, token):
+        """Change wizard flow if we have credentials."""
+        if not token:
+            self.LICENSE_PAGE._next_id = self.SIGNIN_PAGE
+        else:
+            self.LICENSE_PAGE._next_id = self.local_folders_page_id
+
     def critical(self, *args, **kwargs):
         """Wrapper for QMessageBox.critical that hides the overlay."""
         self.overlay.hide()

=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-07-22 16:32:35 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-08-02 20:49:39 +0000
@@ -103,8 +103,13 @@
             # Special Folder "My Documents"
             dll = ctypes.windll.shell32
             buf = ctypes.create_string_buffer(300)
-            dll.SHGetSpecialFolderPathA(None, buf, 0x0005, False)
-            result = [buf.value, ]
+            dll.SHGetSpecialFolderPathA(None, buf, 5, False)
+            docs = buf.value
+            dll.SHGetSpecialFolderPathA(None, buf, 13, False)
+            music = buf.value
+            dll.SHGetSpecialFolderPathA(None, buf, 39, False)
+            pictures = buf.value
+            return [docs, music, pictures]
         else:
             result = ['To be implemented']
         return result

=== removed file 'ubuntuone_installer/gui/qt/main/tests/test_main.py'
--- ubuntuone_installer/gui/qt/main/tests/test_main.py	2011-07-27 15:09:28 +0000
+++ ubuntuone_installer/gui/qt/main/tests/test_main.py	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
-#
-# 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.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""The test suite for the Qt UI of the Ubuntu One Installer."""
-
-from ubuntuone_installer.tests import TestCase
-
-import ubuntuone_installer.gui.qt.main.windows as main_module
-
-# pylint: disable=W0212
-
-from ubuntuone.platform.credentials import (
-    APP_NAME,
-    DESCRIPTION,
-    TC_URL,
-)
-
-
-class FakeSSOCred(object):
-    """A fake sso_cred."""
-
-    _registered_to_signal = False
-    _login_args = ()
-    on_credentials_found = None
-
-    def register_to_signals(self):
-        """Fake method."""
-        self._registered_to_signal = True
-
-    def login_or_register_to_get_credentials(self, *args, **kwargs):
-        """Fake method."""
-        self._login_args = (args, kwargs)
-
-
-class FakeSSOClient(object):
-
-    """Fake UbuntuSSOClient."""
-
-    sso_cred = FakeSSOCred()
-    testcase = None
-
-    def connect(self):
-        """Fake method."""
-        self.testcase._connected = True
-        return self
-
-
-class MainTestCase(TestCase):
-
-    """Tests for the main() function."""
-
-    _connected = False
-
-    def setUp(self):
-        """Prepare tests."""
-        self.patch(main_module, "UbuntuSSOClient", FakeSSOClient)
-        main_module.UbuntuSSOClient.testcase = self
-
-    def test_connect(self):
-        """Test that we instantiate the SSO Client and connect."""
-        main_module.main()
-        self.assertEqual(FakeSSOClient.testcase._connected, True)
-
-    def test_credentials_found_cb(self):
-        """Test that the credentials found signal is connected."""
-        main_module.main()
-        self.assertEqual(
-            FakeSSOClient.sso_cred.on_credentials_found_cb.__name__,
-            "stop")
-
-    def test_registered(self):
-        """Test that the credentials registers to signals."""
-        main_module.main()
-        self.assertEqual(FakeSSOClient.sso_cred._registered_to_signal,
-            True)
-
-    def test_check_register_args(self):
-        """Test that the credentials registers to signals."""
-        main_module.main()
-        self.assertEqual(FakeSSOClient.sso_cred._login_args,
-            ((APP_NAME, TC_URL, DESCRIPTION, 0),
-            {'ui_module': 'ubuntuone_installer.gui.qt.embedded_sso'}))

=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-07-27 14:53:56 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-08-02 20:49:39 +0000
@@ -19,34 +19,26 @@
 
 # pylint: disable=E1101, F0401, W0404
 
-from twisted.internet.defer import inlineCallbacks
-from ubuntu_sso.main.windows import UbuntuSSOClient
-
-from ubuntuone.platform.credentials import (
-    APP_NAME,
-    DESCRIPTION,
-    TC_URL,
-)
-
-
-@inlineCallbacks
+import sys
+
+from PyQt4 import QtGui
+
+
+def stop(*args):
+    """End the process."""
+    from twisted.internet import reactor
+    reactor.stop()
+
+
 def main():
     """Perform a client request to be logged in."""
-    client = UbuntuSSOClient()
-    client = yield client.connect()
-
-    @inlineCallbacks
-    def stop(*args):
-        """End the process."""
-        from twisted.internet import reactor
-        yield client.sso_cred.unregister_to_signals()
-        reactor.stop()
-
-    client.sso_cred.on_credentials_found_cb = stop
-    client.sso_cred.on_authorization_denied_cb = stop
-    client.sso_cred.on_credentials_error_cb = stop
-    yield client.sso_cred.register_to_signals()
-    yield client.sso_cred.login_or_register_to_get_credentials(APP_NAME,
-        TC_URL,
-        DESCRIPTION, 0,
-        ui_module="ubuntuone_installer.gui.qt.embedded_sso")
+
+    app = QtGui.QApplication(sys.argv)
+    import qtreactor.qt4reactor
+    qtreactor.qt4reactor.install()
+    from ubuntuone_installer.gui.qt.gui import MainWindow
+    from twisted.internet import reactor
+    window = MainWindow(close_callback=stop)
+    app.window = window
+    window.show()
+    reactor.run()

=== modified file 'ubuntuone_installer/gui/qt/sync_now_or_later.py'
--- ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-06-29 11:44:23 +0000
+++ ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-08-02 20:49:39 +0000
@@ -1,44 +1,44 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
-#
-# 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.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""The user interface for the Ubuntu One Installer."""
-
-from PyQt4 import QtGui
-
-from ubuntuone_installer.gui.qt.ui import sync_now_or_later_ui
-
-
-class SyncNowOrLaterPage(QtGui.QWizardPage):
-    """User can choose whether to sync now, later, or selectively"""
-
-    def __init__(self, parent=None):
-        QtGui.QWizardPage.__init__(self, parent)
-        self.ui = sync_now_or_later_ui.Ui_Form()
-        self.ui.setupUi(self)
-        self.registerField("sync_now", self.ui.sync_now)
-        self.registerField("sync_later", self.ui.sync_later)
-        self.registerField("sync_custom", self.ui.sync_custom)
-
-    # Invalid names of Qt-inherited methods
-    # pylint: disable=C0103
-
-    def initializePage(self):
-        """Setup UI details"""
-        self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
-        self.wizard().setOption(QtGui.QWizard.NoCancelButton, True)
-        self.wizard()._next_id = None
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""The user interface for the Ubuntu One Installer."""
+
+from PyQt4 import QtGui
+
+from ubuntuone_installer.gui.qt.ui import sync_now_or_later_ui
+
+
+class SyncNowOrLaterPage(QtGui.QWizardPage):
+    """User can choose whether to sync now, later, or selectively"""
+
+    def __init__(self, parent=None):
+        QtGui.QWizardPage.__init__(self, parent)
+        self.ui = sync_now_or_later_ui.Ui_Form()
+        self.ui.setupUi(self)
+        self.registerField("sync_now", self.ui.sync_now)
+        self.registerField("sync_later", self.ui.sync_later)
+        self.registerField("sync_custom", self.ui.sync_custom)
+
+    # Invalid names of Qt-inherited methods
+    # pylint: disable=C0103
+
+    def initializePage(self):
+        """Setup UI details"""
+        self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
+        self.wizard().setOption(QtGui.QWizard.NoCancelButton, True)
+        self.wizard()._next_id = None

=== added file 'ubuntuone_installer/gui/qt/tests/test_currentuser.py'
--- ubuntuone_installer/gui/qt/tests/test_currentuser.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/tests/test_currentuser.py	2011-08-02 20:49:39 +0000
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# 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.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the CurrentUserController."""
+
+from ubuntuone_installer.gui.qt import currentuser
+from ubuntuone_installer.gui.qt.tests import BaseTestCase
+
+
+class FakeView(object):
+
+    """A Fake view for the controller."""
+
+    def __init__(self):
+        """Setup."""
+        self.view = self
+        self.ui = self
+        self.email_edit = self
+        self.password_edit = self
+        self.app_name = "APP"
+
+    def text(self):
+        """Return some text."""
+        return "text"
+
+    def wizard(self):
+        """Fake the wizard() method of QWizardPage."""
+        return self
+
+
+class FakeCredentialsManagementToolSuccess(object):
+
+    """A fake CredentialsManagementTool where login succeeds."""
+
+    def login_email_password(self, *args, **kwargs):
+        """Fake credentials."""
+        return {"x": "y"}
+
+
+class FakeCredentialsManagementToolFailure(object):
+
+    """A fake CredentialsManagementTool where login fails."""
+
+    def login_email_password(self, *args, **kwargs):
+        """Raises a credentials exception."""
+        raise currentuser.CredentialsError("Failure")
+
+
+class CurrentUserTestCase(BaseTestCase):
+
+    """Test the CurrentUserController."""
+
+    class_ui = FakeView
+
+    def setUp(self):
+        """Initialize this test instance."""
+        self.controller = currentuser.CurrentUserController()
+        self.controller.view = FakeView()
+        super(CurrentUserTestCase, self).setUp()
+
+    def test_login_success(self):
+        """Check that login works correctly."""
+        self.patch(currentuser, 'CredentialsManagementTool',
+            FakeCredentialsManagementToolSuccess)
+        self.patch(self.controller, 'on_logged_in', self._set_called)
+        self.controller.login()
+        self.assertEqual(self._called, (('APP', {'x': 'y'}), {}))
+
+    def test_login_failure(self):
+        """Check that login fails correctly."""
+        self.patch(currentuser, 'CredentialsManagementTool',
+            FakeCredentialsManagementToolFailure)
+        self.patch(self.controller, 'on_login_error', self._set_called)
+        self.controller.login()
+        self.assertEqual(self._called, (('Failure',), {}))

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-02 14:12:22 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-02 20:49:39 +0000
@@ -24,18 +24,14 @@
 import shutil
 import tempfile
 
+from twisted.internet import defer
+
 from PyQt4 import QtCore
 
-from ubuntuone.platform.credentials import (
-    APP_NAME,
-    TC_URL,
-)
-
-import ubuntu_sso
+from ubuntuone.platform.credentials import APP_NAME
 
 from ubuntuone_installer.gui.qt import gui
 from ubuntuone_installer.gui.qt.tests import BaseTestCase
-from ubuntuone_installer.gui.qt import embedded_sso
 from ubuntuone_installer.gui.qt import forgotten
 from ubuntuone_installer.gui.qt import local_folders
 from ubuntuone_installer.gui.qt import setup_account
@@ -51,6 +47,15 @@
          u'token_secret': u'qFYImEtlczPbsCnYyuwLoPDlPEnvNcIktZphPQklAWrvyfFMV'}
 
 
+class FakeFailureCredentialsManagementTool(object):
+
+    """A fake CredentialsManagementTool that fails."""
+
+    def find_credentials(self):
+        """Return a deferred that never triggers callback."""
+        return defer.succeed({})
+
+
 class FakeController(object):
 
     """A fake controller for the tests."""
@@ -99,6 +104,9 @@
         """Fake hide."""
         self.hide_counter += 1
 
+    def resize(self, *args):
+        """Fake resize."""
+
 
 class MainWindowTestCase(BaseTestCase):
     """Test the qt main window."""
@@ -118,6 +126,8 @@
         self.patch(gui, "ResetPasswordController", FakeController)
         self.patch(gui, "AreYouSure", FakeAreYouSure)
         self.patch(gui, "LoadingOverlay", FakeOverlay)
+        self.patch(gui, "CredentialsManagementTool",
+            FakeFailureCredentialsManagementTool)
         super(MainWindowTestCase, self).setUp()
 
     def test_critical(self):
@@ -291,7 +301,7 @@
 
     def test_stage_progression_1(self):
         """Check that each page in the wizard sets the correct stage."""
-        self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE)
+        self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE_ID)
         self.assertEqual(self.ui.sideWidget().stage, 0)
 
     def test_stage_progression_2(self):
@@ -360,11 +370,25 @@
         QtCore.QCoreApplication.instance().processEvents()
         self.assertEqual(self.ui.result(), self.ui.Rejected)
 
+    def test_license_next(self):
+        """Test what's the license page's nextID."""
+        self.assertEqual(self.ui.LICENSE_PAGE.nextId(), self.ui.SIGNIN_PAGE)
+
+    def test_license_next_with_creds(self):
+        """Test what's the license page's nextID."""
+        self.ui.creds_cb("fakecreds")
+        self.assertEqual(self.ui.LICENSE_PAGE.nextId(),
+            self.ui.local_folders_page_id)
+
 
 class FakeSignal(object):
 
     """A fake PyQt signal."""
 
+    def __init__(self, *args, **kwargs):
+        """Initialize."""
+        self.target = lambda *args: None
+
     def connect(self, target):
         """Fake connect."""
         self.target = target
@@ -388,51 +412,6 @@
         self.shown = True
 
 
-class SSOGuiTestCase(BaseTestCase):
-    """Test the custom SSO GUI."""
-
-    class_ui = embedded_sso.UbuntuSSOClientGUI
-
-    def setUp(self):
-        """Initialize this test instance."""
-        self.kwargs = {
-            'app_name': APP_NAME,
-            'tc_url': TC_URL,
-            'help_text': '',
-        }
-        self.patch(embedded_sso, "MainWindow", FakeMainWindow)
-        super(SSOGuiTestCase, self).setUp()
-
-    def test_sso_client_gui(self):
-        """Ensure the class instantiates correctly."""
-        self.assertIsInstance(
-            self.ui.controller,
-            ubuntu_sso.qt.controllers.UbuntuSSOWizardController)
-        self.assertIsInstance(self.ui.view, FakeMainWindow)
-
-    def test_login_callback(self):
-        """Test that the login success callback is correctly handled."""
-        self.ui.login_success_callback = self._set_called
-        self.ui.view.loginSuccess.emit("app", "email")
-        self.assertEqual(self._called, (('app', 'email'), {}))
-
-    def test_registration_callback(self):
-        """Test that the registration success callback is correctly handled."""
-        self.ui.registration_success_callback = self._set_called
-        self.ui.view.registrationSuccess.emit("app", "email")
-        self.assertEqual(self._called, (('app', 'email'), {}))
-
-    def test_cancellation_callback(self):
-        """Test that the cancellation callback is called right."""
-        self.ui.user_cancellation_callback = self._set_called
-        self.ui.view.userCancellation.emit("app")
-        self.assertEqual(self._called, (('app',), {}))
-
-    def test_view_is_shown(self):
-        """Test that the view is actually shown."""
-        self.assertTrue(self.ui.view.shown)
-
-
 class LocalFoldersTestCase(BaseTestCase):
     """Test the LocalFoldersPage code."""
 
@@ -465,16 +444,10 @@
         self.assertEqual(path, self.tmpdir)
         self.assertEqual(size, 1337)
 
-    def test_item_addition_removal(self):
+    def test_item_addition(self):
         """Add an item (plus the default one), then remove them."""
         self.ui.add_folder(self.tmpdir)
-        self.assertEqual(2, self.ui.ui.folder_list.topLevelItemCount())
-        self.ui.on_folder_list_itemClicked(
-            self.ui.ui.folder_list.topLevelItem(0), 2)
-        self.ui.on_folder_list_itemClicked(
-            self.ui.ui.folder_list.topLevelItem(0), 2)
-        self.assertEqual(0, self.ui.ui.folder_list.topLevelItemCount())
-        self.assertEqual({}, self.ui.items)
+        self.assertEqual(4, self.ui.ui.folder_list.topLevelItemCount())
 
     def test_total_size(self):
         """Test that the header reflects the change in item sizes."""
@@ -484,6 +457,8 @@
         self.assertEqual(0, self.ui.ui.folder_list.topLevelItemCount())
         item = self.ui.add_folder(self.tmpdir)
         item.size = 1337
+        item.thread.run()
+        item.thread.join()
         self.ui.update_sizes()
         self.assertEqual(unicode(self.ui.ui.folder_list.headerItem().text(1)),
             u"Space (1337)")
@@ -515,6 +490,7 @@
         item = self.ui.add_folder(os.path.join("xyzzy", "xyzzy", "xyzzy"))
         self.assertEqual(1, self.ui.ui.folder_list.topLevelItemCount())
         item.thread.run()
+        item.thread.join()
         self.ui.update_sizes()
         self.assertEqual(0, item.size)
         # world did not explode
@@ -758,16 +734,16 @@
         self.ui.on_currentIdChanged(self.ui.LICENSE_PAGE)
         self.assertEqual(
             True,
-            sideWidget().ui.states_frame.isVisible())
+            self.ui.sideWidget().ui.states_frame.isVisible())
         self.ui.on_currentIdChanged(self.ui.SIGNIN_PAGE)
         self.assertEqual(
             True,
-            sideWidget().ui.states_frame.isVisible())
+            self.ui.sideWidget().ui.states_frame.isVisible())
         self.ui.on_currentIdChanged(self.ui.local_folders_page_id)
         self.assertEqual(
             True,
-            sideWidget().ui.states_frame.isVisible())
+            self.ui.sideWidget().ui.states_frame.isVisible())
         self.ui.on_currentIdChanged(self.ui.CONGRATULATIONS_PAGE)
         self.assertEqual(
             True,
-            sideWidget().ui.states_frame.isVisible())
+            self.ui.sideWidget().ui.states_frame.isVisible())