Merge lp:~nataliabidart/ubuntuone-control-panel/fix-933576 into lp:ubuntuone-control-panel

[Natalia Bidart]

- Changed the initial signin page so both login and register options are shown,
  and when clicked, the user is presented with either the Qt login dialog,
  or the Qt registration dialog (LP: #933576).

To test IRL, please have all our U1 nightlies installed and updated.

Inside this branch, run:

./setup.py clean build; U1_DEBUG=True PYTHONPATH=. bin/ubuntuone-control-panel-qt

Remove your current device and you should be taken to the 'choose sign in' page where you can either register or login.

[lp:~nataliabidart/ubuntuone-control-panel/fix-933576]

282. By Natalia Bidart on 2012-03-02

Removed unnecessary styles.

283. By Natalia Bidart on 2012-03-02

- No more 2 default buttons in the device remove confirmation dialog
  (LP: #933577).

284. By Natalia Bidart on 2012-03-02

Merged trunk in.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Eric Casteleijn (thisfred)]

Code looks good, and even better, it works! ;)

review: Approve

=== added file 'data/banner.png'
Binary files data/banner.png	1970-01-01 00:00:00 +0000 and data/banner.png	2012-03-02 19:56:20 +0000 differ
=== added file 'data/logo.png'
Binary files data/logo.png	1970-01-01 00:00:00 +0000 and data/logo.png	2012-03-02 19:56:20 +0000 differ
=== added file 'data/progress_arrow_grey.png'
Binary files data/progress_arrow_grey.png	1970-01-01 00:00:00 +0000 and data/progress_arrow_grey.png	2012-03-02 19:56:20 +0000 differ
=== added file 'data/progress_arrow_orange.png'
Binary files data/progress_arrow_orange.png	1970-01-01 00:00:00 +0000 and data/progress_arrow_orange.png	2012-03-02 19:56:20 +0000 differ
=== added file 'data/progress_finish_grey.png'
Binary files data/progress_finish_grey.png	1970-01-01 00:00:00 +0000 and data/progress_finish_grey.png	2012-03-02 19:56:20 +0000 differ
=== added file 'data/progress_finish_orange.png'
Binary files data/progress_finish_orange.png	1970-01-01 00:00:00 +0000 and data/progress_finish_orange.png	2012-03-02 19:56:20 +0000 differ
=== added file 'data/progress_tick.png'
Binary files data/progress_tick.png	1970-01-01 00:00:00 +0000 and data/progress_tick.png	2012-03-02 19:56:20 +0000 differ
=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2012-03-02 13:37:00 +0000
+++ data/qt/controlpanel.ui	2012-03-02 19:56:20 +0000
@@ -263,7 +263,7 @@
       </layout>
      </widget>
      <widget class="QWidget" name="empty"/>
-     <widget class="SignInPanel" name="signin"/>
+     <widget class="UbuntuOneWizard" name="wizard"/>
     </widget>
    </item>
    <item>
@@ -407,9 +407,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>SignInPanel</class>
-   <extends>QWidget</extends>
-   <header>ubuntuone.controlpanel.gui.qt.signin</header>
+   <class>UbuntuOneWizard</class>
+   <extends>QWizard</extends>
+   <header>ubuntuone.controlpanel.gui.qt.wizard</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2012-03-02 13:37:00 +0000
+++ data/qt/images.qrc	2012-03-02 19:56:20 +0000
@@ -1,11 +1,18 @@
 <RCC>
   <qresource prefix="/">
+    <file>../banner.png</file>
     <file>../computer.png</file>
     <file>../external_icon_orange.png</file>
     <file>../external_icon_white.png</file>
     <file>../icon.png</file>
     <file>../folder.png</file>
+    <file>../logo.png</file>
     <file>../phone.png</file>
+    <file>../progress_arrow_grey.png</file>
+    <file>../progress_arrow_orange.png</file>
+    <file>../progress_finish_grey.png</file>
+    <file>../progress_finish_orange.png</file>
+    <file>../progress_tick.png</file>
     <file>../sync_status_alert.png</file>
     <file>../sync_status_disconnected.png</file>
     <file>../sync_status_loading.png</file>

=== added file 'data/qt/side_widget.ui'
--- data/qt/side_widget.ui	1970-01-01 00:00:00 +0000
+++ data/qt/side_widget.ui	2012-03-02 19:56:20 +0000
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SideWidget</class>
+ <widget class="QFrame" name="SideWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>170</width>
+    <height>466</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>170</width>
+    <height>466</height>
+   </size>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>40</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="ubuntu_one_logo_label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="pixmap">
+      <pixmap resource="images.qrc">:/logo.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QFrame" name="states_frame">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <property name="spacing">
+       <number>20</number>
+      </property>
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <property name="spacing">
+         <number>7</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="install_icon">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="pixmap">
+           <pixmap resource="images.qrc">:/progress_arrow_grey.png</pixmap>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="install_label">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="text">
+           <string notr="true">Install</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <property name="spacing">
+         <number>7</number>
+        </property>
+        <property name="sizeConstraint">
+         <enum>QLayout::SetDefaultConstraint</enum>
+        </property>
+        <item>
+         <widget class="QLabel" name="signin_icon">
+          <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="signin_label">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="text">
+           <string notr="true">Sign In</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_4">
+        <property name="spacing">
+         <number>7</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="folders_icon">
+          <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="folders_label">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="text">
+           <string notr="true">Select sync folders</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_5">
+        <property name="spacing">
+         <number>7</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="sync_icon">
+          <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_finish_grey.png</pixmap>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="sync_label">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="text">
+           <string notr="true">Sync, stream, share!</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="images.qrc"/>
+ </resources>
+ <connections/>
+</ui>

=== modified file 'data/qt/signin.ui'
--- data/qt/signin.ui	2012-02-22 15:41:33 +0000
+++ data/qt/signin.ui	2012-03-02 19:56:20 +0000
@@ -6,152 +6,133 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>344</width>
-    <height>312</height>
+    <width>370</width>
+    <height>447</height>
    </rect>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="QFrame" name="signin">
      <layout class="QVBoxLayout" name="sign_in">
-      <property name="spacing">
-       <number>15</number>
-      </property>
       <property name="margin">
-       <number>3</number>
+       <number>0</number>
       </property>
       <item>
-       <widget class="QLabel" name="sign_in_label">
-        <property name="text">
-         <string notr="true">Sign in to Ubuntu One</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="description_label">
-        <property name="text">
-         <string notr="true">Sign in with your existing Ubuntu One username and password.</string>
-        </property>
-       </widget>
+       <widget class="QFrame" name="frame">
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <property name="leftMargin">
+          <number>0</number>
+         </property>
+         <property name="topMargin">
+          <number>22</number>
+         </property>
+         <property name="rightMargin">
+          <number>0</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="banner">
+           <property name="text">
+            <string/>
+           </property>
+           <property name="textFormat">
+            <enum>Qt::PlainText</enum>
+           </property>
+           <property name="pixmap">
+            <pixmap resource="images.qrc">:/banner.png</pixmap>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="welcome_label">
+        <property name="font">
+         <font>
+          <pointsize>11</pointsize>
+          <weight>50</weight>
+          <bold>false</bold>
+         </font>
+        </property>
+        <property name="text">
+         <string notr="true">Welcome to Ubuntu One</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter|Qt::AlignHCenter|Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
-         <layout class="QVBoxLayout" name="verticalLayout_2">
-          <property name="spacing">
-           <number>15</number>
-          </property>
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_4">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="email_label">
-              <property name="text">
-               <string notr="true">Email address</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="email_entry">
-              <property name="text">
-               <string/>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QVBoxLayout" name="verticalLayout_3">
-            <property name="spacing">
-             <number>0</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="password_label">
-              <property name="text">
-               <string notr="true">Password</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="password_entry">
-              <property name="echoMode">
-               <enum>QLineEdit::Password</enum>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <item>
-             <widget class="QPushButton" name="signin_button">
-              <property name="text">
-               <string notr="true">Sign in</string>
-              </property>
-              <property name="default">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QPushButton" name="cancel_button">
-              <property name="text">
-               <string notr="true">Cancel</string>
-              </property>
-              <property name="secondary" stdset="0">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </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>
-           <layout class="QHBoxLayout" name="horizontalLayout_4">
-            <item>
-             <widget class="GoToWebButton" name="forgot_password_button">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string notr="true">Forgot your password?</string>
-              </property>
-             </widget>
-            </item>
-            <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>
-           </layout>
+         <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>
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QPushButton" name="login_button">
+            <property name="text">
+             <string notr="true">Existing account</string>
+            </property>
+            <property name="default">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QPushButton" name="register_button">
+            <property name="text">
+             <string notr="true">Setup new account</string>
+            </property>
+           </widget>
           </item>
          </layout>
         </item>
@@ -170,31 +151,13 @@
         </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>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>GoToWebButton</class>
-   <extends>QPushButton</extends>
-   <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
-  </customwidget>
- </customwidgets>
- <resources/>
+ <resources>
+  <include location="images.qrc"/>
+ </resources>
  <connections/>
 </ui>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2012-03-02 13:37:00 +0000
+++ data/qt/ubuntuone.qss	2012-03-02 19:56:20 +0000
@@ -12,9 +12,9 @@
     border: none;
 }
 
-QFrame#signin,
+UbuntuOneWizard,
 QFrame#frame_header {
-    background: #ffffff;
+    background: white;
     border-radius: 5px;
     border-style: solid;
     border-color: #939389;
@@ -59,6 +59,15 @@
     font-size: 24px;
 }
 
+SideWidget {
+    background-color: white;
+    border-style: dotted;
+    border-color: #939389;
+    border-right-width: 1px;
+    color: white;
+    min-height: 100px;
+}
+
 QPushButton {
     border-radius: 5px;
     border-style: solid;
@@ -280,6 +289,10 @@
     color: #df2d1f;
 }
 
+QLabel#welcome_label {
+    font-size: 20px;
+}
+
 QAbstractItemView {
     border-style: solid;
     border-color: #898989;

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2012-02-06 15:23:27 +0000
+++ ubuntuone/controlpanel/backend.py	2012-03-02 19:56:20 +0000
@@ -343,10 +343,23 @@
 
     @log_call(logger.debug, with_args=False)
     @inlineCallbacks
-    def login(self, email, password):
-        """Login using 'email' and 'password'."""
-        result = yield self.login_client.login_email_password(
-                    email=email, password=password)
+    def login(self, email=None, password=None):
+        """Login using 'email' and 'password' if not None, else prompt user."""
+        result = None
+        if email is not None and password is not None:
+            result = yield self.login_client.login_email_password(
+                        email=email, password=password)
+        else:
+            result = yield self.login_client.login()
+        # cache credentils
+        self._credentials = result
+        returnValue(result)
+
+    @log_call(logger.debug)
+    @inlineCallbacks
+    def register(self):
+        """Register a new user."""
+        result = yield self.login_client.register()
         # cache credentils
         self._credentials = result
         returnValue(result)

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-02-22 16:31:41 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-03-02 19:56:20 +0000
@@ -83,7 +83,7 @@
 CREDENTIALS_ERROR = _('There was a problem while retrieving the credentials.')
 DASHBOARD_BUTTON_TOOLTIP = _('View your personal details and service '
                              'summary')
-DASHBOARD_TITLE = _('Welcome to Ubuntu One!')
+DASHBOARD_TITLE = WELCOME_LABEL = _('Welcome to Ubuntu One!')
 DASHBOARD_VALUE_ERROR = _('The information could not be retrieved. '
                           'Maybe your internet connection is down?')
 DESKTOPCOUCH_PKG = 'desktopcouch-ubuntuone'
@@ -154,6 +154,7 @@
 GET_HELP_ONLINE = _('Get help online')
 GET_MORE_STORAGE = _('Get more storage')
 GREETING = _('Hi %(user_display_name)s')
+INSTALL = _('Install')
 INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s'
                     '</i> in order to enable more sync services.')
 INSTALL_PLUGIN = _('Install the %(plugin_name)s for the sync service: '
@@ -181,6 +182,7 @@
 QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
 REMOVE_BUTTON = _('Remove')
 RESTORE_LABEL = _('Restore')
+SELECT_FOLDERS = _('Select sync folders')
 SERVICES_BUTTON_TOOLTIP = _('Manage the sync services')
 SERVICES_TITLE = _('Enable the sync services for this computer.')
 SETTINGS_ALLOW_NOTIFICATIONS = _('Allow all notifications to this device')
@@ -202,15 +204,9 @@
     'to this computer')
 SHARES_BUTTON_TOOLTIP = _('Manage the shares offered to others')
 SHARES_TITLE = _('Manage permissions for shares made to other users.')
-SIGNIN_BUTTON = _('Sign in')
-SIGNIN_CANCEL = _('Cancel')
-SIGNIN_DESCRIPTION = _('Sign in with your existing Ubuntu One '
-    'username and password.')
-SIGNIN_EMAIL = _('Email address')
-SIGNIN_FORGOT_PASSWORD = _('Forgot your password?')
-SIGNIN_PASSWORD = _('Password')
-SIGNIN_TITLE = _('Sign in to Ubuntu One')
+SIGN_IN = _('Sign in')
 SUCCESS_INSTALL = _('<i>%(package_name)s</i> was successfully installed')
+SYNC_STREAM_SHARE = _('Sync, stream, share')
 TALK_TO_US = _('Talk to us')
 VALUE_ERROR = _('Value could not be retrieved.')
 UNKNOWN_ERROR = _('Unknown error')

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-02-28 21:29:16 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-03-02 19:56:20 +0000
@@ -58,6 +58,8 @@
     ui_class = controlpanel_ui
     logger = logger
 
+    finished = QtCore.pyqtSignal()
+
     def _setup(self):
         """Do some extra setupping for the UI."""
         self.ui.get_more_space_button.setText(GET_MORE_STORAGE)
@@ -70,7 +72,6 @@
 
         self.ui.devices_tab.localDeviceRemoved.connect(
             self.on_credentials_not_found)
-        self.ui.signin.credentialsFound.connect(lambda creds: self.load())
 
         self.ui.tab_widget.setTabText(
             self.ui.tab_widget.indexOf(self.ui.folders_tab), MAIN_FOLDERS_TAB)
@@ -86,15 +87,16 @@
     def connect_file_sync(self):
         """Connect file sync service if the setting autoconnect is enabled."""
         settings = yield self.backend.file_sync_settings_info()
-        if AUTOCONNECT_KEY in settings and settings[AUTOCONNECT_KEY]:
+        if settings.get(AUTOCONNECT_KEY, False):
             yield self.backend.connect_files()
 
     @log_call(logger.debug)
     def on_credentials_not_found(self):
         """Credentials are not found or were removed."""
-        self.ui.switcher.setCurrentWidget(self.ui.signin)
+        self.ui.switcher.setCurrentWidget(self.ui.wizard)
         self.is_processing = False
 
+    @defer.inlineCallbacks
     @log_call(logger.debug)
     def on_credentials_found(self):
         """Credentials are not found or were removed."""
@@ -102,6 +104,9 @@
         self.connect_file_sync()
         self.is_processing = False
 
+        info = yield self.backend.account_info()
+        self.process_info(info)
+
     # pylint: disable=E0202
     @defer.inlineCallbacks
     def load(self):
@@ -112,8 +117,6 @@
             self.on_credentials_not_found()
         else:
             self.on_credentials_found()
-            info = yield self.backend.account_info()
-            self.process_info(info)
 
     @log_call(logger.debug)
     def process_info(self, info):
@@ -155,3 +158,11 @@
     def on_facebook_button_clicked(self):
         """The facebook button was clicked."""
         qt.uri_hook(FACEBOOK_LINK)
+
+    def on_wizard_rejected(self):
+        """Let clients know that we're done."""
+        self.finished.emit()
+
+    def on_wizard_finished(self, status):
+        """Move to controlpanel if wizar ended successfully."""
+        self.on_credentials_found()

=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-02-28 20:26:13 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-03-02 19:56:20 +0000
@@ -39,7 +39,7 @@
 
     def _setup(self):
         """Do some extra setupping for the UI."""
-        self.ui.control_panel.ui.signin.signinCanceled.connect(self.close)
+        self.ui.control_panel.finished.connect(self.close)
 
     # Invalid name "closeEvent"
     # pylint: disable=C0103

=== added file 'ubuntuone/controlpanel/gui/qt/side_widget.py'
--- ubuntuone/controlpanel/gui/qt/side_widget.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/side_widget.py	2012-03-02 19:56:20 +0000
@@ -0,0 +1,81 @@
+# -*- 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/>.
+
+"""Wizard's side widget."""
+
+from PyQt4 import QtGui
+
+from ubuntuone.controlpanel.gui import (
+    INSTALL,
+    SIGN_IN,
+    SELECT_FOLDERS,
+    SYNC_STREAM_SHARE,
+)
+from ubuntuone.controlpanel.gui.qt.ui import side_widget_ui
+
+
+class SideWidget(QtGui.QFrame):
+
+    """Wizard's side widget."""
+
+    install_stage = 0
+    signin_stage = 1
+    folders_stage = 2
+    sync_stage = 3
+
+    def __init__(self, *args, **kwargs):
+        super(SideWidget, self).__init__(*args, **kwargs)
+        self.ui = side_widget_ui.Ui_SideWidget()
+        self.ui.setupUi(self)
+
+        self.ui.install_label.setText(INSTALL)
+        self.ui.signin_label.setText(SIGN_IN)
+        self.ui.folders_label.setText(SELECT_FOLDERS)
+        self.ui.sync_label.setText(SYNC_STREAM_SHARE)
+
+        self._stage = 0
+
+    def _get_stage(self):
+        """Return the current stage."""
+        return self._stage
+
+    def _set_stage(self, stage):
+        """Switch to the desired stage."""
+        self._stage = stage
+
+        self.set_stage_icon(self.ui.install_icon, self.install_stage)
+        self.set_stage_icon(self.ui.signin_icon, self.signin_stage)
+        self.set_stage_icon(self.ui.folders_icon, self.folders_stage)
+        self.set_stage_icon(self.ui.sync_icon, self.sync_stage)
+
+    stage = property(fget=_get_stage, fset=_set_stage)
+
+    def set_stage_icon(self, icon, target_stage):
+        """Set the icon depending on the proper state."""
+        icon.setEnabled(self.stage >= target_stage)
+
+        if self.stage == target_stage and icon == self.ui.sync_icon:
+            icon.setPixmap(QtGui.QPixmap(":/progress_finish_orange.png"))
+        elif self.stage == target_stage:
+            icon.setPixmap(QtGui.QPixmap(":/progress_arrow_orange.png"))
+        elif self.stage > target_stage:
+            icon.setPixmap(QtGui.QPixmap(":/progress_tick.png"))
+        elif icon == self.ui.sync_icon:
+            icon.setPixmap(QtGui.QPixmap(":/progress_finish_grey.png"))
+        else:
+            icon.setPixmap(QtGui.QPixmap(":/progress_arrow_grey.png"))

=== modified file 'ubuntuone/controlpanel/gui/qt/signin.py'
--- ubuntuone/controlpanel/gui/qt/signin.py	2012-02-22 14:58:25 +0000
+++ ubuntuone/controlpanel/gui/qt/signin.py	2012-03-02 19:56:20 +0000
@@ -16,88 +16,23 @@
 
 """The signin page."""
 
-from PyQt4 import QtCore
-from twisted.internet import defer
-
-from ubuntuone.controlpanel.gui import (
-    RESET_PASSWORD_LINK,
-    SIGNIN_BUTTON,
-    SIGNIN_CANCEL,
-    SIGNIN_DESCRIPTION,
-    SIGNIN_EMAIL,
-    SIGNIN_FORGOT_PASSWORD,
-    SIGNIN_PASSWORD,
-    SIGNIN_TITLE,
+from ubuntu_sso.utils.ui import (
+    EXISTING_ACCOUNT_CHOICE_BUTTON,
+    SET_UP_ACCOUNT_CHOICE_BUTTON,
 )
-from ubuntuone.controlpanel.gui.qt import icon_from_name, handle_errors
+from ubuntuone.controlpanel.gui import WELCOME_LABEL
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import signin_ui
-from ubuntuone.controlpanel.logger import setup_logging, log_call
-
-
-logger = setup_logging('qt.signin')
 
 
 class SignInPanel(UbuntuOneBin):
     """The widget for signing in."""
 
     ui_class = signin_ui
-    logger = logger
-
-    signinCanceled = QtCore.pyqtSignal()
-    credentialsFound = QtCore.pyqtSignal(dict)
 
     def _setup(self):
         """Do some extra setupping for the UI."""
         super(SignInPanel, self)._setup()
-        self.ui.cancel_button.setText(SIGNIN_CANCEL)
-        self.ui.description_label.setText(SIGNIN_DESCRIPTION)
-        self.ui.email_label.setText(SIGNIN_EMAIL)
-        self.ui.sign_in_label.setText(SIGNIN_TITLE)
-        self.ui.password_label.setText(SIGNIN_PASSWORD)
-
-        self.ui.forgot_password_button.setText(SIGNIN_FORGOT_PASSWORD)
-        self.ui.forgot_password_button.uri = RESET_PASSWORD_LINK
-        icon = icon_from_name('external_icon_orange')
-        self.ui.forgot_password_button.setIcon(icon)
-
-        self.ui.signin_button.setText(SIGNIN_BUTTON)
-        self.ui.signin_button.setEnabled(False)
-        for entry in (self.ui.email_entry, self.ui.password_entry):
-            entry.textChanged.connect(self.validate)
-            entry.returnPressed.connect(self.ui.signin_button.click)
-
-    def validate(self, *a, **kw):
-        """Enable sign in button only if email and password are non empty."""
-        email = unicode(self.ui.email_entry.text())
-        password = unicode(self.ui.password_entry.text())
-        self.ui.signin_button.setEnabled(bool(email and password))
-        self.ui.signin_button.style().unpolish(self.ui.signin_button)
-        self.ui.signin_button.style().polish(self.ui.signin_button)
-
-    # pylint: disable=E0202
-    @defer.inlineCallbacks
-    def load(self):
-        """Load specific tab info."""
-        yield self.backend.get_credentials()
-
-    @QtCore.pyqtSlot()
-    @handle_errors(logger=logger)
-    @log_call(logger.debug)
-    @defer.inlineCallbacks
-    def on_signin_button_clicked(self):
-        """The 'Sign in' button was clicked."""
-        email = unicode(self.ui.email_entry.text())
-        password = unicode(self.ui.password_entry.text())
-        self.is_processing = True
-        try:
-            result = yield self.backend.login(email=email, password=password)
-            logger.info('Emitting credentialsFound for email %r.', email)
-            self.credentialsFound.emit(result)
-        finally:
-            self.is_processing = False
-
-    @QtCore.pyqtSlot()
-    def on_cancel_button_clicked(self):
-        """The 'Cancel' button was clicked."""
-        self.signinCanceled.emit()
+        self.ui.welcome_label.setText(WELCOME_LABEL)
+        self.ui.login_button.setText(EXISTING_ACCOUNT_CHOICE_BUTTON)
+        self.ui.register_button.setText(SET_UP_ACCOUNT_CHOICE_BUTTON)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-03-02 13:40:05 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-03-02 19:56:20 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 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
@@ -28,7 +26,11 @@
 from ubuntuone.controlpanel import backend, cache
 from ubuntuone.controlpanel.tests import TestCase, EXPECTED_ACCOUNT_INFO, TOKEN
 from ubuntuone.controlpanel.gui import qt
-from ubuntuone.controlpanel.gui.tests import FakedObject, USER_HOME
+from ubuntuone.controlpanel.gui.tests import (
+    FakedObject,
+    FAKE_VOLUMES_INFO,
+    USER_HOME,
+)
 
 # Attribute 'yyy' defined outside __init__, access to a protected member
 # pylint: disable=W0201, W0212
@@ -66,6 +68,16 @@
     SAMPLE_COMPUTER_INFO,
     SAMPLE_PHONE_INFO,
 ]
+
+SAMPLE_SETTINGS = {
+    backend.AUTOCONNECT_KEY: True,
+    backend.SHOW_ALL_NOTIFICATIONS_KEY: True,
+    backend.SHARE_AUTOSUBSCRIBE_KEY: True,
+    backend.UDF_AUTOSUBSCRIBE_KEY: True,
+    backend.DOWNLOAD_KEY: 20480,
+    backend.UPLOAD_KEY: 2048,
+}
+
 NO_OP = lambda *args: None
 
 
@@ -121,6 +133,7 @@
         'file_sync_settings_info',
         'file_sync_status',
         'login',
+        'register',
         'remove_device',
         'replications_info',
         'restart_files',
@@ -131,6 +144,12 @@
         'validate_path_for_folder',
         'volumes_info',
     ]
+    exposed_results = {
+        'account_info': SAMPLE_ACCOUNT_INFO,
+        'devices_info': SAMPLE_DEVICES_INFO,
+        'volumes_info': FAKE_VOLUMES_INFO,
+        'file_sync_settings_info': SAMPLE_SETTINGS,
+    }
 
     def get_credentials(self):
         """Fake credentials retrieval."""
@@ -254,6 +273,7 @@
             # pylint: disable=E1102
             self.ui = self.class_ui(**self.kwargs)
             # pylint: enable=E1102
+            self.ui.show()
             self.addCleanup(self.ui.destroy)
 
         if getattr(self.ui, 'backend', None) is not None:

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_account.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_account.py	2011-09-01 17:11:16 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_account.py	2012-03-02 19:56:20 +0000
@@ -36,11 +36,6 @@
     innerclass_name = "Ui_Form"
     class_ui = gui.AccountPanel
 
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(AccountPanelTestCase, self).setUp()
-        self.ui.backend.next_result = SAMPLE_ACCOUNT_INFO
-
     def test_is_processing_while_asking_info(self):
         """The ui is processing while the contents are loaded."""
         def check():

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2012-01-18 19:52:25 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2012-03-02 19:56:20 +0000
@@ -23,7 +23,6 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.tests import (
-    FAKE_VOLUMES_INFO,
     USER_HOME,
 )
 from ubuntuone.controlpanel.gui.qt import addfolder as gui
@@ -51,7 +50,6 @@
         yield super(AddFolderButtonTestCase, self).setUp()
         self.patch(FakedFileDialog, 'response', gui.QtCore.QString(''))
         self.patch(self.ui.backend, 'validate_path_for_folder', lambda p: True)
-        self.ui.backend.next_result = FAKE_VOLUMES_INFO
         old_home = os.environ['HOME']
         os.environ['HOME'] = USER_HOME
         self.addCleanup(lambda: os.environ.__setitem__('HOME', old_home))

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-02-28 20:26:13 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-03-02 19:56:20 +0000
@@ -24,12 +24,14 @@
 
 from ubuntuone.controlpanel.gui.qt import controlpanel as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
-    SAMPLE_ACCOUNT_INFO, SAMPLE_NAME, TOKEN,
+    SAMPLE_ACCOUNT_INFO, SAMPLE_NAME,
 )
 from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
     UbuntuOneBinTestCase,
 )
 
+# pylint: disable=W0212
+
 
 class ControlPanelTestCase(UbuntuOneBinTestCase):
     """Test the qt control panel."""
@@ -39,12 +41,6 @@
     class_ui = gui.ControlPanel
 
     @defer.inlineCallbacks
-    def setUp(self):
-        yield super(ControlPanelTestCase, self).setUp()
-        self.patch(self.ui.ui.folders_tab, 'process_info', lambda info: None)
-        self.ui.backend.next_result = SAMPLE_ACCOUNT_INFO
-
-    @defer.inlineCallbacks
     def test_is_processing_while_asking_info(self):
         """The ui is processing while the contents are loaded."""
         def check():
@@ -73,10 +69,10 @@
         self.assertEqual(self._called, ((), {}))
 
     def test_on_credentials_not_found(self):
-        """The signin panel is shown."""
+        """The wizard panel is shown."""
         self.ui.on_credentials_found()
         self.ui.on_credentials_not_found()
-        self.assertIs(self.ui.ui.switcher.currentWidget(), self.ui.ui.signin)
+        self.assertIs(self.ui.ui.switcher.currentWidget(), self.ui.ui.wizard)
 
     @defer.inlineCallbacks
     def test_on_credentials_found_called(self):
@@ -126,9 +122,7 @@
 
     def test_update_over_quota(self):
         """Check the labels state when the user exceed the quota."""
-        # pylint: disable=W0212
         self.ui._update_quota(True)
-        # pylint: enable=W0212
 
         self.assertTrue(
             self.ui.ui.percentage_usage_label.property("OverQuota").toBool())
@@ -137,9 +131,7 @@
 
     def test_update_quota_in_range(self):
         """Check the labels state when the quota is under the threshold."""
-        # pylint: disable=W0212
         self.ui._update_quota(False)
-        # pylint: enable=W0212
 
         self.assertFalse(
             self.ui.ui.percentage_usage_label.property("OverQuota").toBool())
@@ -149,12 +141,19 @@
     def test_on_local_device_removed(self):
         """On DeviesPanel's localDeviceRemoved, emit credentialsNotFound."""
         self.ui.ui.devices_tab.localDeviceRemoved.emit()
-        self.assertIs(self.ui.ui.switcher.currentWidget(), self.ui.ui.signin)
-
-    def test_on_signin_credentials_found(self):
-        """On SignInPanel's credentialsFound, the management panel is shown."""
-        self.patch(self.ui, 'load', self._set_called)
-        self.ui.ui.signin.credentialsFound.emit(TOKEN)
+        self.assertIs(self.ui.ui.switcher.currentWidget(), self.ui.ui.wizard)
+
+    def test_on_wizard_finished(self):
+        """When the wizard is finished, the management panel is shown."""
+        self.patch(self.ui, 'on_credentials_found', self._set_called)
+        self.ui.ui.wizard.finished.emit(1)
+
+        self.assertEqual(self._called, ((), {}))
+
+    def test_on_wizard_rejected(self):
+        """When the wizard is cancelled, the finished signal is emitted."""
+        self.ui.finished.connect(self._set_called)
+        self.ui.ui.wizard.rejected.emit()
 
         self.assertEqual(self._called, ((), {}))
 
@@ -172,13 +171,13 @@
     @defer.inlineCallbacks
     def test_connect_file_sync_without_autoconnect(self):
         """Connect is called if autoconnect is disabled."""
+        self.ui.backend._called.clear()
         settings = {gui.AUTOCONNECT_KEY: False}
         self.patch(self.ui.backend, 'file_sync_settings_info',
                    lambda: defer.succeed(settings))
 
         yield self.ui.connect_file_sync()
 
-        # pylint: disable=W0212
         self.assertNotIn('connect_files', self.ui.backend._called)
 
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_devices.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2012-01-05 15:20:21 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2012-03-02 19:56:20 +0000
@@ -37,11 +37,6 @@
     class_ui = gui.DevicesPanel
     executed = False
 
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(DevicesPanelTestCase, self).setUp()
-        self.ui.backend.next_result = SAMPLE_DEVICES_INFO
-
     def test_is_processing_while_asking_info(self):
         """The ui is processing while the contents are loaded."""
         def check():

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-02-28 17:48:23 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-02 19:56:20 +0000
@@ -64,7 +64,8 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(FoldersPanelTestCase, self).setUp()
-        self.ui.backend.next_result = FAKE_VOLUMES_MINIMAL_INFO
+        self.patch(self.ui.backend, 'volumes_info',
+                   lambda *a, **kw: defer.succeed(FAKE_VOLUMES_MINIMAL_INFO))
 
         self.memento = MementoHandler()
         self.memento.setLevel(logging.DEBUG)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-02-28 20:26:13 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-03-02 19:56:20 +0000
@@ -45,7 +45,7 @@
     def test_on_signin_canceled(self):
         """On SigninPanel's signinCanceled, close."""
         self.patch(self.ui, 'closeEvent', self._set_called)
-        self.ui.ui.control_panel.ui.signin.signinCanceled.emit()
+        self.ui.ui.control_panel.finished.emit()
         self.assertEqual(len(self._called[0]), 1)
         self.assertIsInstance(self._called[0][0], gui.QtGui.QCloseEvent)
 

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_preferences.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_preferences.py	2011-07-18 17:53:32 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_preferences.py	2012-03-02 19:56:20 +0000
@@ -23,6 +23,7 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.qt import preferences as gui
+from ubuntuone.controlpanel.gui.qt.tests import SAMPLE_SETTINGS
 from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
     UbuntuOneBinTestCase,
 )
@@ -30,15 +31,6 @@
 # Access to a protected member
 # pylint: disable=W0212
 
-SAMPLE_SETTINGS = {
-    gui.backend.AUTOCONNECT_KEY: True,
-    gui.backend.SHOW_ALL_NOTIFICATIONS_KEY: True,
-    gui.backend.SHARE_AUTOSUBSCRIBE_KEY: True,
-    gui.backend.UDF_AUTOSUBSCRIBE_KEY: True,
-    gui.backend.DOWNLOAD_KEY: 20480,
-    gui.backend.UPLOAD_KEY: 2048,
-}
-
 
 class PreferencesPanelTestCase(UbuntuOneBinTestCase):
     """Test the qt cloud preferences tab."""
@@ -47,12 +39,6 @@
     innerclass_name = "Ui_Form"
     class_ui = gui.PreferencesPanel
 
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(PreferencesPanelTestCase, self).setUp()
-        self.ui.backend.next_result = SAMPLE_SETTINGS
-        yield self.ui.load()
-
     def dict_from_ui_values(self):
         """Build the settings dict from the ui values."""
         autoconnect = self.ui.ui.autoconnect_checkbox.checkState()
@@ -275,7 +261,7 @@
         self._test_update_ui_from_settings_info(settings)
 
     @defer.inlineCallbacks
-    def test_is_processing_while_restoreing_changes(self):
+    def test_is_processing_while_restoring_changes(self):
         """The ui is processing while the changes are being applied."""
         def check():
             """The ui must be is_processing."""

=== added file 'ubuntuone/controlpanel/gui/qt/tests/test_side_widget.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_side_widget.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_side_widget.py	2012-03-02 19:56:20 +0000
@@ -0,0 +1,90 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2011-2012 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 Qt UI."""
+
+from PyQt4 import QtGui
+
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
+from ubuntuone.controlpanel.gui.qt.side_widget import SideWidget
+
+
+class SideWidgetTestCase(BaseTestCase):
+
+    """Test the qt main window."""
+
+    class_ui = SideWidget
+
+    def test_stage_0(self):
+        """Check that each stage in the widget enables the right labels."""
+        self.ui.stage = 0
+        self.assertTrue(self.ui.ui.install_icon.isEnabled())
+        self.assertFalse(self.ui.ui.signin_icon.isEnabled())
+        self.assertFalse(self.ui.ui.folders_icon.isEnabled())
+        self.assertFalse(self.ui.ui.sync_icon.isEnabled())
+        self.check_state_pixmap()
+
+    def test_stage_1(self):
+        """Check that each stage in the widget enables the right labels."""
+        self.ui.stage = 1
+        self.assertTrue(self.ui.ui.install_icon.isEnabled())
+        self.assertTrue(self.ui.ui.signin_icon.isEnabled())
+        self.assertFalse(self.ui.ui.folders_icon.isEnabled())
+        self.assertFalse(self.ui.ui.sync_icon.isEnabled())
+        self.check_state_pixmap()
+
+    def test_stage_2(self):
+        """Check that each stage in the widget enables the right labels."""
+        self.ui.stage = 2
+        self.assertTrue(self.ui.ui.install_icon.isEnabled())
+        self.assertTrue(self.ui.ui.signin_icon.isEnabled())
+        self.assertTrue(self.ui.ui.folders_icon.isEnabled())
+        self.assertFalse(self.ui.ui.sync_icon.isEnabled())
+        self.check_state_pixmap()
+
+    def test_stage_3(self):
+        """Check that each stage in the widget enables the right labels."""
+        self.ui.stage = 3
+        self.assertTrue(self.ui.ui.install_icon.isEnabled())
+        self.assertTrue(self.ui.ui.signin_icon.isEnabled())
+        self.assertTrue(self.ui.ui.folders_icon.isEnabled())
+        self.assertTrue(self.ui.ui.sync_icon.isEnabled())
+        self.check_state_pixmap()
+
+    def check_state_pixmap(self):
+        """Check if each label has the proper pixmap depending on the state."""
+        stage = self.ui.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")
+        sync_active_pixmap = QtGui.QPixmap(":/progress_finish_orange.png")
+        sync_no_active_pixmap = QtGui.QPixmap(":/progress_finish_grey.png")
+
+        labels = (self.ui.ui.install_icon, self.ui.ui.signin_icon,
+                  self.ui.ui.folders_icon, self.ui.ui.sync_icon)
+        for item in labels[:stage]:
+            self.assertEqualPixmaps(complete_pixmap, item.pixmap())
+
+        if stage != 3:
+            self.assertEqualPixmaps(active_pixmap, labels[stage].pixmap())
+        else:
+            self.assertEqualPixmaps(sync_active_pixmap, labels[3].pixmap())
+
+        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[3].pixmap())

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_signin.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_signin.py	2012-02-06 15:23:27 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_signin.py	2012-03-02 19:56:20 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 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
@@ -18,148 +16,42 @@
 
 """Tests for the Sign In Panel."""
 
-from twisted.internet import defer
-
+from ubuntuone.controlpanel.gui.qt import pixmap_from_name
 from ubuntuone.controlpanel.gui.qt import signin as gui
-from ubuntuone.controlpanel.gui.qt.tests import (
-    CrashyBackend,
-    CrashyBackendException,
-)
-from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
-    UbuntuOneBinTestCase,
-)
-
-EMAIL = '[e-mail]'
-PASSWORD = 'h3ll0World'
-TOKEN = {'yadda': 'doo'}
-
-MSG = {u'errtype': u'AuthenticationError',
-       u'message': u'The authentication failed.'}
-
-
-def fail(*a, **kw):
-    """Emit CredentialsError."""
-    raise TypeError(MSG)
-
-
-class BaseSignInPanelTestCase(UbuntuOneBinTestCase):
-    """Test the signin panel."""
-
-    innerclass_ui = gui.signin_ui
-    innerclass_name = "Ui_Form"
-    class_ui = gui.SignInPanel
-    logger = gui.logger
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(BaseSignInPanelTestCase, self).setUp()
-        self.ui.backend.next_result = TOKEN
-
-
-class SignInPanelTestCase(BaseSignInPanelTestCase):
-    """Test the signin panel."""
-
-    innerclass_ui = gui.signin_ui
-    innerclass_name = "Ui_Form"
-    class_ui = gui.SignInPanel
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(SignInPanelTestCase, self).setUp()
-        self.ui.backend.next_result = TOKEN
-        self.ui.ui.email_entry.setText(gui.QtCore.QString(''))
-        self.ui.ui.password_entry.setText(gui.QtCore.QString(''))
-
-    @defer.inlineCallbacks
-    def test_is_processing_while_asking_info(self):
-        """The ui is processing while the contents are loaded."""
-        def check(email, password):
-            """The ui must be is_processing."""
-            self.assertTrue(self.ui.is_processing, 'ui must be processing')
-            return TOKEN
-
-        self.patch(self.ui.backend, 'login', check)
-
-        self.assertFalse(self.ui.is_processing)
-        yield self.ui.ui.signin_button.click()
-        self.assertFalse(self.ui.is_processing)
-
-    def test_signin_disabled_at_startup(self):
-        """The signin_button is disabled at startup."""
-        self.assertFalse(self.ui.ui.signin_button.isEnabled())
-
-    def test_signin_disabled_if_no_email_but_password(self):
-        """Disable signin_button if no email."""
-        self.ui.ui.password_entry.setText(gui.QtCore.QString('doo'))
-        self.assertFalse(self.ui.ui.signin_button.isEnabled())
-
-    def test_signin_disabled_if_no_password_but_email(self):
-        """Disable signin_button if no password."""
-        self.ui.ui.email_entry.setText(gui.QtCore.QString('duh'))
-        self.assertFalse(self.ui.ui.signin_button.isEnabled())
-
-    def test_cancel_button(self):
-        """Send a signal when the cancel button is clicked."""
-        self.ui.signinCanceled.connect(self._set_called)
-        self.ui.ui.cancel_button.click()
-        self.assertEqual(self._called, ((), {}))
-
-    def test_forgot_password_button(self):
-        """When clicking the forgot passsword btn, the proper url is opened."""
-        self.assert_uri_hook_called(self.ui.ui.forgot_password_button,
-                                    gui.RESET_PASSWORD_LINK)
-
-
-class SignInButtonPanelTestCase(BaseSignInPanelTestCase):
-    """Test the signin_button widget."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(SignInButtonPanelTestCase, self).setUp()
-        self.ui.ui.email_entry.setText(gui.QtCore.QString(EMAIL))
-        self.ui.ui.password_entry.setText(gui.QtCore.QString(PASSWORD))
-
-    @defer.inlineCallbacks
-    def test_signin_button(self):
-        """Call the backend when the signin button is clicked."""
-        yield self.ui.ui.signin_button.click()
-
-        self.assert_backend_called('login', email=EMAIL, password=PASSWORD)
-        # pylint: disable=W0212
-        for arg in self.ui.backend._called['login'][1].itervalues():
-            self.assertIsInstance(arg, unicode)  # make sure not send QString
-
-    @defer.inlineCallbacks
-    def test_signin_success(self):
-        """Emit credentialsFound on signin success."""
-        self.ui.credentialsFound.connect(self._set_called)
-        yield self.ui.ui.signin_button.click()
-
-        self.assertEqual(self._called, ((TOKEN,), {}))
-        self.assertFalse(self.ui.is_processing)
-
-    def test_signin_enabled_if_email_and_password(self):
-        """Enable signin_button if email and password are non empty."""
-        self.assertTrue(self.ui.ui.signin_button.isEnabled())
-
-    def test_return_pressed(self):
-        """On return pressed, click the signin_button."""
-        self.patch(self.ui.ui.signin_button, 'click', self._set_called)
-
-        for entry in (self.ui.ui.email_entry, self.ui.ui.password_entry):
-            entry.returnPressed.emit()
-
-            # This is failing, so we need to settle with counting recievers
-            #self.assertEqual(self._called, ((), {}))
-            receivers = entry.receivers(gui.QtCore.SIGNAL('returnPressed()'))
-            self.assertEqual(1, receivers)
-
-            self._called = False
-
-    @defer.inlineCallbacks
-    def test_backend_error_is_handled(self):
-        """Any error from the backend is properly handled."""
-        self.patch(self.ui, 'backend', CrashyBackend())
-        yield self.ui.ui.signin_button.click()
-
-        self.assertTrue(self.memento.check_exception(CrashyBackendException))
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
+
+
+class SignInPanelTestCase(BaseTestCase):
+
+    """Test the signin panel."""
+
+    innerclass_ui = gui.signin_ui
+    innerclass_name = "Ui_Form"
+    class_ui = gui.SignInPanel
+
+    def test_all_buttons_enabled(self):
+        """All the buttons are enabled at startup."""
+        self.assertTrue(self.ui.isEnabled())
+        self.assertTrue(self.ui.ui.login_button.isEnabled())
+        self.assertTrue(self.ui.ui.register_button.isEnabled())
+
+    def test_login_button_is_default(self):
+        """The login_button is the only default button."""
+        self.assertTrue(self.ui.ui.login_button.isDefault())
+        self.assertFalse(self.ui.ui.register_button.isDefault())
+
+    def test_banner_is_correct(self):
+        """The banner has the correct image."""
+        expected = pixmap_from_name('banner')
+        self.assertEqualPixmaps(self.ui.ui.banner.pixmap(), expected)
+
+    def test_label_is_correct(self):
+        """The welcome_label has the correct text."""
+        self.assertEqual(self.ui.ui.welcome_label.text(), gui.WELCOME_LABEL)
+
+    def test_buttos_are_correct(self):
+        """The buttos have the correct text."""
+        self.assertEqual(self.ui.ui.login_button.text(),
+                         gui.EXISTING_ACCOUNT_CHOICE_BUTTON)
+        self.assertEqual(self.ui.ui.register_button.text(),
+                         gui.SET_UP_ACCOUNT_CHOICE_BUTTON)

=== added file 'ubuntuone/controlpanel/gui/qt/tests/test_wizard.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_wizard.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_wizard.py	2012-03-02 19:56:20 +0000
@@ -0,0 +1,158 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 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 First-time wizard."""
+
+from twisted.internet import defer
+
+from ubuntuone.controlpanel.gui.qt import wizard as gui
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase, TOKEN
+
+
+class UbuntuOneWizardTestCase(BaseTestCase):
+    """Test the UbuntuOneWizard."""
+
+    class_ui = gui.UbuntuOneWizard
+
+    def test_options(self):
+        """Tne wizard options are correct."""
+        options = [
+            (self.ui.NoBackButtonOnStartPage, True),
+            (self.ui.HaveFinishButtonOnEarlyPages, False),
+        ]
+        for option, expected in options:
+            self.assertEqual(expected, self.ui.testOption(option))
+
+    def test_style(self):
+        """Tne wizard style is Modern."""
+        self.assertEqual(self.ui.wizardStyle(), self.ui.ModernStyle)
+
+    def test_cancel_button(self):
+        """Send the rejected signal when the cancel button is clicked."""
+        button = self.ui.button(self.ui.CancelButton)
+        self.assertEqual(button.text(), gui.CLOSE_AND_SETUP_LATER)
+
+        self.ui.rejected.connect(self._set_called)
+        button.click()
+
+        self.assertEqual(self._called, ((), {}))
+
+    def test_button_layout(self):
+        """The button layout is correct."""
+        buttons = [
+            'BackButton', 'CommitButton', 'CustomButton1', 'CustomButton2',
+            'CustomButton3', 'FinishButton', 'HelpButton', 'NextButton',
+        ]
+        for button_name in buttons:
+            button = self.ui.button(getattr(self.ui, button_name))
+            self.assertFalse(button.isVisible(),
+                             'Button %s should not be visible.' % button_name)
+
+        button = self.ui.button(self.ui.CancelButton)
+        self.assertTrue(button.isVisible(),
+                        'Cancel button should not be visible.')
+
+    def test_first_page(self):
+        """The first page is the correct one."""
+        self.assertEqual(self.ui.startId(),
+                         self.ui.pages[self.ui.signin_page])
+
+    def test_tab_order(self):
+        """The button tab order is correct."""
+        # can not be tested due to Qt API limitations
+
+
+class SideWidgetTestCase(UbuntuOneWizardTestCase):
+    """Test the side widget in the wizard."""
+
+    def test_is_there(self):
+        """The side widget is correct."""
+        self.assertIsInstance(self.ui.side_widget, gui.SideWidget)
+        self.assertIs(self.ui.sideWidget(), self.ui.side_widget)
+
+
+class SignInPageTestCase(UbuntuOneWizardTestCase):
+    """Test the SignInPage wizard page."""
+
+    page_name = 'signin'
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(SignInPageTestCase, self).setUp()
+        self.page = getattr(self.ui, '%s_page' % self.page_name)
+
+    def test_was_added(self):
+        """The SignInPage is added correctly."""
+        page_id = self.ui.pages[self.page]
+        self.assertIs(self.ui.page(page_id), self.page)
+
+    def test_enabled_at_startup(self):
+        """The page is enabled at startup."""
+        self.assertTrue(self.page.isEnabled())
+
+
+class LoginTestCase(UbuntuOneWizardTestCase):
+    """Test the login through the wizard."""
+
+    method = 'login'
+
+    @defer.inlineCallbacks
+    def test_with_credentials(self):
+        """Wizard is done when credentials were retrieved."""
+        self.ui.finished.connect(self._set_called)
+        d = defer.succeed(TOKEN)
+
+        def check():
+            """Confirm the ui is disabled while processing."""
+            self.assertFalse(self.ui.signin_page.isEnabled())
+            return d
+
+        self.patch(self.ui.backend, self.method, check)
+        button = getattr(self.ui.signin_page.panel.ui,
+                         '%s_button' % self.method)
+        button.click()
+
+        yield d
+
+        self.assertTrue(self.ui.signin_page.isEnabled())
+        self.assertEqual(self._called, ((1,), {}))
+
+    @defer.inlineCallbacks
+    def test_without_credentials(self):
+        """Wizard is done when credentials were retrieved."""
+        self.ui.finished.connect(self._set_called)
+        d = defer.succeed(None)
+
+        def check():
+            """Confirm the ui is disabled while processing."""
+            self.assertFalse(self.ui.signin_page.isEnabled())
+            return d
+
+        self.patch(self.ui.backend, self.method, check)
+        button = getattr(self.ui.signin_page.panel.ui,
+                         '%s_button' % self.method)
+        button.click()
+
+        yield d
+
+        self.assertTrue(self.ui.signin_page.isEnabled())
+        self.assertFalse(self._called)
+
+
+class RegisterTestCase(LoginTestCase):
+    """Test the register through the wizard."""
+
+    method = 'register'

=== added file 'ubuntuone/controlpanel/gui/qt/wizard.py'
--- ubuntuone/controlpanel/gui/qt/wizard.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/wizard.py	2012-03-02 19:56:20 +0000
@@ -0,0 +1,110 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2011-2012 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 base widget for the Control Panel tabs."""
+
+from PyQt4 import QtGui, QtCore
+
+from twisted.internet import defer
+from ubuntu_sso.utils.ui import CLOSE_AND_SETUP_LATER
+
+from ubuntuone.controlpanel import cache
+from ubuntuone.controlpanel.gui.qt.signin import SignInPanel
+from ubuntuone.controlpanel.gui.qt.side_widget import SideWidget
+
+
+class UbuntuOnePage(QtGui.QWizardPage):
+    """A generic page for the UbuntuOneWizard."""
+
+    panel_class = None
+
+    def __init__(self, *args, **kwargs):
+        super(UbuntuOnePage, self).__init__(*args, **kwargs)
+
+        self.layout = QtGui.QVBoxLayout(self)
+        self.panel = None
+        if self.panel_class is not None:
+            self.panel = SignInPanel()
+            self.layout.addWidget(self.panel)
+
+
+class SignInPage(UbuntuOnePage):
+    """The page to signin to Ubuntu One."""
+
+    panel_class = SignInPanel
+
+
+class UbuntuOneWizard(cache.Cache, QtGui.QWizard):
+    """The Ubuntu One wizard."""
+
+    def __init__(self, *args, **kwargs):
+        super(UbuntuOneWizard, self).__init__(*args, **kwargs)
+        self.pages = {}
+
+        self.setOption(self.NoBackButtonOnStartPage, True)
+        self.setOption(self.HaveFinishButtonOnEarlyPages, False)
+        self.setWizardStyle(self.ModernStyle)
+
+        self.setButtonText(self.CancelButton, CLOSE_AND_SETUP_LATER)
+        self.setButtonLayout([self.Stretch, self.CancelButton])
+
+        self.side_widget = SideWidget()
+        self.side_widget.stage = self.side_widget.signin_stage
+        self.setSideWidget(self.side_widget)
+
+        self.signin_page = SignInPage()
+        self.addPage(self.signin_page)
+
+        self.signin_page.panel.ui.login_button.clicked.connect(self.login)
+        self.signin_page.panel.ui.register_button.clicked.connect(
+            self.register)
+
+        self.setTabOrder(self.signin_page.panel.ui.login_button,
+                         self.signin_page.panel.ui.register_button)
+        self.setTabOrder(self.signin_page.panel.ui.register_button,
+                         self.button(self.CancelButton))
+
+    # pylint: disable=C0103
+
+    def addPage(self, page):
+        """Add 'page' to this wizard, and keep a reference of its ID."""
+        page_id = super(UbuntuOneWizard, self).addPage(page)
+        self.pages[page] = page_id
+
+    # pylint: enable=C0103
+
+    @QtCore.pyqtSlot()
+    @defer.inlineCallbacks
+    def login(self):
+        """Show the login dialog."""
+        self.setEnabled(False)
+        credentials = yield self.backend.login()
+        self._process_credentials(credentials)
+        self.setEnabled(True)
+
+    @QtCore.pyqtSlot()
+    @defer.inlineCallbacks
+    def register(self):
+        """Show the register dialog."""
+        self.setEnabled(False)
+        credentials = yield self.backend.register()
+        self._process_credentials(credentials)
+        self.setEnabled(True)
+
+    def _process_credentials(self, credentials=None):
+        """Confirm which is the next step after analyzing 'credentials'."""
+        if credentials:
+            self.accept()

=== modified file 'ubuntuone/controlpanel/gui/tests/__init__.py'
--- ubuntuone/controlpanel/gui/tests/__init__.py	2011-09-09 15:05:22 +0000
+++ ubuntuone/controlpanel/gui/tests/__init__.py	2012-03-02 19:56:20 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 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
@@ -20,6 +18,8 @@
 
 import os
 
+from twisted.internet import defer
+
 from ubuntuone.controlpanel import gui
 from ubuntuone.controlpanel.backend import (
     ControlBackend,
@@ -133,6 +133,7 @@
 
     next_result = None
     exposed_methods = []
+    exposed_results = {}
 
     def __init__(self, *args, **kwargs):
         self._args = args
@@ -144,9 +145,15 @@
     def _record_call(self, func_name):
         """Store values when calling 'func_name'."""
 
-        def inner(*args, **kwargs):
+        def faked_call_in_faked_object(*args, **kwargs):
             """Fake 'func_name'."""
             self._called[func_name] = (args, kwargs)
-            return self.next_result
+            no_func_result = object()
+            result = self.exposed_results.get(func_name, no_func_result)
+            if result is no_func_result:
+                result = self.next_result
+            else:
+                result = defer.succeed(result)
+            return result
 
-        return inner
+        return faked_call_in_faked_object