Merge lp:~diegosarmentero/ubuntu-sso-client/sso-styling into lp:ubuntu-sso-client

[Diego Sarmentero]

- Add stylesheets for the Qt UI.

[Natalia Bidart (nataliabidart)]

Looks good! There are some minor details that will be addressed in some other branches.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntu-sso-client/sso-styling into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.keyring.tests.test_common
  TestGetHostname
    test_get_hostname ... [OK]
    test_get_hostname_uses_filesystem_encoding ... [OK]
  TestTokenNameBuilder
    test_get_complex_token_name_for_app_name ... [OK]
    test_get_complex_token_name_for_hostname ... [OK]
    test_get_simple_token_name ... [OK]
    test_get_unicode_appname_token_name ... [OK]
    test_get_utf8_hostname_token_name ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.keyring.tests.test_linux
  TestKeyring
    test_delete_credentials ... [OK]
    test_get_credentials ... [OK]
    test_get_credentials_migrating_token ... [OK]
    test_get_old_cred_found ... [OK]
    test_get_old_cred_found_but_not_asked_for ... [OK]
    test_get_old_cred_not_found ... [OK]
    test_set_credentials ... [OK]
ubuntu_sso.networkstate.tests.test_linux
  NetworkManagerStateErrorsTestCase
    test_dbus_problem ... [OK]
    test_nm_not_running ... [OK]
  NetworkManagerStateTestCase
    test_nm_connecting_then_offline ... [OK]
    test_nm_connecting_then_offline_old ... [OK]
    test_nm_connecting_then_online ... [OK]
    test_nm_connecting_then_online_old ... [OK]
    test_nm_offline ... [OK]
    test_nm_offline_local ... [OK]
    test_nm_offline_old ... [OK]
    test_nm_offline_site ... [OK]
    test_nm_online_global ... [OK]
    test_nm_online_old ... [OK]
ubuntu_sso.tests
  TestCase
    runTest ... [OK]
ubuntu_sso.networkstate.tests.test_linux
  TestConnection
    test_is_machine_connected_nm_state_connected_global ... [OK]
    test_is_machine_connected_nm_state_connected_old ... [OK]
    test_is_machine_defer_error ... [OK]
    test_is_machine_disconnected_nm_state_asleep ... ...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntu-sso-client/sso-styling into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.keyring.tests.test_common
  TestGetHostname
    test_get_hostname ... [OK]
    test_get_hostname_uses_filesystem_encoding ... [OK]
  TestTokenNameBuilder
    test_get_complex_token_name_for_app_name ... [OK]
    test_get_complex_token_name_for_hostname ... [OK]
    test_get_simple_token_name ... [OK]
    test_get_unicode_appname_token_name ... [OK]
    test_get_utf8_hostname_token_name ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.keyring.tests.test_linux
  TestKeyring
    test_delete_credentials ... [OK]
    test_get_credentials ... [OK]
    test_get_credentials_migrating_token ... [OK]
    test_get_old_cred_found ... [OK]
    test_get_old_cred_found_but_not_asked_for ... [OK]
    test_get_old_cred_not_found ... [OK]
    test_set_credentials ... [OK]
ubuntu_sso.networkstate.tests.test_linux
  NetworkManagerStateErrorsTestCase
    test_dbus_problem ... [OK]
    test_nm_not_running ... [OK]
  NetworkManagerStateTestCase
    test_nm_connecting_then_offline ... [OK]
    test_nm_connecting_then_offline_old ... [OK]
    test_nm_connecting_then_online ... [OK]
    test_nm_connecting_then_online_old ... [OK]
    test_nm_offline ... [OK]
    test_nm_offline_local ... [OK]
    test_nm_offline_old ... [OK]
    test_nm_offline_site ... [OK]
    test_nm_online_global ... [OK]
    test_nm_online_old ... [OK]
ubuntu_sso.tests
  TestCase
    runTest ... [OK]
ubuntu_sso.networkstate.tests.test_linux
  TestConnection
    test_is_machine_connected_nm_state_connected_global ... [OK]
    test_is_machine_connected_nm_state_connected_old ... [OK]
    test_is_machine_defer_error ... [OK]
    test_is_machine_disconnected_nm_state_asleep ... ...

[Ubuntu One Auto Pilot (otto-pilot)]

No proposals found for merge of lp:~diegosarmentero/ubuntu-sso-client/931452 into lp:ubuntu-sso-client.

=== added file 'data/Ubuntu-B.ttf'
Binary files data/Ubuntu-B.ttf	1970-01-01 00:00:00 +0000 and data/Ubuntu-B.ttf	2012-02-17 21:24:20 +0000 differ
=== added file 'data/Ubuntu-R.ttf'
Binary files data/Ubuntu-R.ttf	1970-01-01 00:00:00 +0000 and data/Ubuntu-R.ttf	2012-02-17 21:24:20 +0000 differ
=== added file 'data/balloon_shape.png'
Binary files data/balloon_shape.png	1970-01-01 00:00:00 +0000 and data/balloon_shape.png	2012-02-17 21:24:20 +0000 differ
=== added file 'data/password_hint_ok.png'
Binary files data/password_hint_ok.png	1970-01-01 00:00:00 +0000 and data/password_hint_ok.png	2012-02-17 21:24:20 +0000 differ
=== added file 'data/password_hint_warning.png'
Binary files data/password_hint_warning.png	1970-01-01 00:00:00 +0000 and data/password_hint_warning.png	2012-02-17 21:24:20 +0000 differ
=== added file 'data/qt/resources.qrc'
--- data/qt/resources.qrc	1970-01-01 00:00:00 +0000
+++ data/qt/resources.qrc	2012-02-17 21:24:20 +0000
@@ -0,0 +1,10 @@
+<RCC>
+  <qresource prefix="/">
+    <file>../password_hint_ok.png</file>
+    <file>../password_hint_warning.png</file>
+    <file>../Ubuntu-R.ttf</file>
+    <file>../Ubuntu-B.ttf</file>
+    <file>../balloon_shape.png</file>
+    <file>stylesheet.qss</file>
+  </qresource>
+</RCC>

=== modified file 'data/qt/setup_account.ui'
--- data/qt/setup_account.ui	2012-02-02 15:44:18 +0000
+++ data/qt/setup_account.ui	2012-02-17 21:24:20 +0000
@@ -221,6 +221,22 @@
         <number>3</number>
        </property>
        <item>
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>10</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
         <widget class="QLabel" name="password_label">
          <property name="font">
           <font>
@@ -283,6 +299,22 @@
         <number>3</number>
        </property>
        <item>
+        <spacer name="verticalSpacer_5">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>10</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
         <widget class="QLabel" name="confirm_password_label">
          <property name="font">
           <font>
@@ -576,7 +608,7 @@
      <item row="6" column="1" rowspan="2">
       <widget class="QLabel" name="password_assistance">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+        <sizepolicy hsizetype="Maximum" vsizetype="Minimum">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -584,7 +616,7 @@
        <property name="minimumSize">
         <size>
          <width>220</width>
-         <height>0</height>
+         <height>100</height>
         </size>
        </property>
        <property name="maximumSize">
@@ -663,5 +695,6 @@
    </item>
   </layout>
  </widget>
+ <resources/>
  <connections/>
 </ui>

=== added file 'data/qt/stylesheet.qss'
--- data/qt/stylesheet.qss	1970-01-01 00:00:00 +0000
+++ data/qt/stylesheet.qss	2012-02-17 21:24:20 +0000
@@ -0,0 +1,119 @@
+QWidget {
+    font-family: "Ubuntu";
+    color: #333333;
+}
+
+QWizard,
+QDialog {
+    background-color: white;
+}
+
+QLabel#password_assistance {
+    border-image: url(":/balloon_shape.png");
+}
+
+QLineEdit {
+    border: 1px solid #aea79f;
+}
+
+QPushButton {
+    border-radius: 5px;
+    border-style: solid;
+    padding: 6px;
+    padding-left: 20px;
+    padding-right: 20px;
+    border-width: 1px;
+    height: 14px;
+}
+
+QPushButton[default="true"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #fe9e84,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QPushButton:hover[default="true"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffb19c,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QPushButton:pressed[default="true"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #b93f14,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QPushButton[default="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffffff,stop: 1.0 #e6e6e6);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton:hover[default="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffffff,stop: 1.0 #ededed);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton:pressed[default="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #d9d9d9,stop: 1.0 #fefefe);
+    color: #333333;
+    border-color: #999999;
+}
+
+QPushButton[DisabledState="true"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #eaeaea, stop: 1.0 #cacaca);
+    color: #595959;
+    border-color: #939389;
+}
+
+QPushButton[DisabledState="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #fe9e84,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QPushButton:hover[DisabledState="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffb19c,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QPushButton:pressed[DisabledState="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #b93f14,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QFrame#frm_box {
+    background: #ffffff;
+    border-radius: 5px;
+    border-style: solid;
+    border-color: #939389;
+    border-width: 1px;
+    color: white;
+    min-height: 100px;
+}
+
+QFrame#frm_box > QLabel {
+    font-size: 20px;
+}
+
+QLabel#title_label {
+    font-size: 20px;
+}
+
+QFrame#header {
+    padding: 10px;
+}

=== modified file 'ubuntu_sso/qt/common.py'
--- ubuntu_sso/qt/common.py	2012-02-09 19:21:09 +0000
+++ ubuntu_sso/qt/common.py	2012-02-17 21:24:20 +0000
@@ -18,6 +18,7 @@
 """Common functionality used by the UI modules."""
 
 import re
+
 from ubuntu_sso.utils.ui import (
     PASSWORD_DIGIT,
     PASSWORD_LENGTH,

=== modified file 'ubuntu_sso/qt/current_user_sign_in_page.py'
--- ubuntu_sso/qt/current_user_sign_in_page.py	2012-02-14 14:38:23 +0000
+++ ubuntu_sso/qt/current_user_sign_in_page.py	2012-02-17 21:24:20 +0000
@@ -35,7 +35,8 @@
 )
 
 
-FORGOTTEN_PASSWORD_LINK_STYLE = '<a href="#">{forgotten_text}</a>'
+FORGOTTEN_PASSWORD_LINK_STYLE = ('<a href="#" style="color:#dd4814;">'
+                                 '{forgotten_text}</a>')
 
 
 _ = gettext.gettext
@@ -105,6 +106,10 @@
         self.ui.sign_in_button.style().polish(
             self.ui.sign_in_button)
 
+    def cleanupPage(self):
+        """Reset the wizard buttons."""
+        self.wizard().setButtonLayout([QtGui.QWizard.Stretch])
+
     def _set_translated_strings(self):
         """Set the translated strings."""
         logger.debug('CurrentUserSignInPage._set_translated_strings')
@@ -150,6 +155,7 @@
         else:
             f = self.backend.login
 
+        self.overlay.show()
         error_handler = partial(self._handle_error, f, self.on_login_error)
         f(*args, reply_handler=NO_OP, error_handler=error_handler)
 
@@ -158,12 +164,14 @@
         # let the user know
         logger.error('Got error when login %s, error: %s',
             self.app_name, error)
+        self.overlay.hide()
         self.message_box.critical(self, self.app_name,
             build_general_error_message(error))
 
     def on_logged_in(self, app_name, result):
         """We managed to log in."""
         logger.info('Logged in for %s', app_name)
+        self.overlay.hide()
         email = unicode(self.ui.email_edit.text())
         self.userLoggedIn.emit(app_name, email)
         logger.debug('Wizard.loginSuccess emitted.')

=== modified file 'ubuntu_sso/qt/enhanced_check_box.py'
--- ubuntu_sso/qt/enhanced_check_box.py	2012-02-02 15:57:02 +0000
+++ ubuntu_sso/qt/enhanced_check_box.py	2012-02-17 21:24:20 +0000
@@ -18,7 +18,7 @@
 
 """Customized Check Box to support links."""
 
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 
 
 class EnhancedCheckBox(QtGui.QCheckBox):
@@ -28,9 +28,12 @@
         QtGui.QCheckBox.__init__(self)
         hbox = QtGui.QHBoxLayout()
         self.text_label = QtGui.QLabel(text)
+        self.text_label.setAlignment(QtCore.Qt.AlignTop)
         self.text_label.setOpenExternalLinks(True)
         padding = self.iconSize().width()
-        self.text_label.setStyleSheet("padding-left: {0}px;".format(padding))
+        self.text_label.setStyleSheet("margin-top: -3px;"
+                                      "padding-left: {0}px;".format(padding))
+        hbox.setContentsMargins(padding, 0, 0, 0)
         hbox.addWidget(self.text_label)
         self.setLayout(hbox)
 

=== modified file 'ubuntu_sso/qt/forgotten_password_page.py'
--- ubuntu_sso/qt/forgotten_password_page.py	2012-02-15 18:07:10 +0000
+++ ubuntu_sso/qt/forgotten_password_page.py	2012-02-17 21:24:20 +0000
@@ -142,16 +142,20 @@
     def _connect_ui(self):
         """Connect the diff signals from the Ui."""
         self.email_address_line_edit.textChanged.connect(self._validate)
+
+        self.send_button.clicked.connect(self.request_new_password)
+        self.try_again_button.clicked.connect(self.on_try_again)
+
+    def request_new_password(self):
+        """Send the request password operation."""
         args = (self.app_name, self.email_address)
         f = self.backend.request_password_reset_token
 
         error_handler = partial(self._handle_error, f,
             self.on_password_reset_error)
 
-        self.send_button.clicked.connect(
-                            lambda: f(*args, reply_handler=NO_OP,
-                                error_handler=error_handler))
-        self.try_again_button.clicked.connect(self.on_try_again)
+        self.overlay.show()
+        f(*args, reply_handler=NO_OP, error_handler=error_handler)
 
     def _validate(self):
         """Validate that we have an email."""
@@ -171,12 +175,14 @@
     def on_password_reset_token_sent(self, app_name, result):
         """Action taken when we managed to get the password reset done."""
         # ignore the result and move to the reset page
+        self.overlay.hide()
         self.passwordResetTokenSent.emit()
     # pylint: enable=W0212
 
     def on_password_reset_error(self, app_name, error):
         """Action taken when there was an error requesting the reset."""
         # set the error message
+        self.overlay.hide()
         msg = REQUEST_PASSWORD_TOKEN_TECH_ERROR
         if error['errtype'] == 'ResetPasswordTokenError':
             # the account provided is wrong, lets tell the user to try

=== modified file 'ubuntu_sso/qt/gui.py'
--- ubuntu_sso/qt/gui.py	2012-02-14 14:38:23 +0000
+++ ubuntu_sso/qt/gui.py	2012-02-17 21:24:20 +0000
@@ -23,8 +23,8 @@
 from PyQt4.QtCore import Qt
 from PyQt4.QtGui import (
     QApplication,
-    QWidget,
     QCursor,
+    QFrame,
     QHBoxLayout,
     QVBoxLayout,
     QMessageBox,
@@ -44,12 +44,13 @@
 logger = setup_logging('ubuntu_sso.gui')
 
 
-class Header(QWidget):
+class Header(QFrame):
     """Header Class for Title and Subtitle in all wizard pages."""
 
     def __init__(self):
         """Create a new instance."""
-        QWidget.__init__(self)
+        super(Header, self).__init__()
+        self.setObjectName('header')
         vbox = QVBoxLayout(self)
         vbox.setContentsMargins(0, 0, 0, 10)
         self.title_label = QLabel()

=== modified file 'ubuntu_sso/qt/main.py'
--- ubuntu_sso/qt/main.py	2012-02-13 15:43:59 +0000
+++ ubuntu_sso/qt/main.py	2012-02-17 21:24:20 +0000
@@ -18,14 +18,26 @@
 
 import sys
 
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 
+# Module used to include the resources into this file
+# Unused import resources_rc, pylint: disable=W0611
+from ubuntu_sso.qt.ui import resources_rc
+# pylint: enable=W0611
 from ubuntu_sso.qt.ubuntu_sso_wizard import UbuntuSSOClientGUI
 
 
 def main(**kwargs):
     """Start the QT mainloop and open the main window."""
     app = QtGui.QApplication(sys.argv)
+
+    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
+    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
+
+    # Apply Style Sheet -- The windows version may be different
+    qss = QtCore.QResource(":/stylesheet.qss")
+    app.setStyleSheet(qss.data())
+
     # Unused variable 'ui', pylint: disable=W0612
     ui = UbuntuSSOClientGUI(close_callback=app.exit, **kwargs)
     app.exec_()

=== modified file 'ubuntu_sso/qt/reset_password_page.py'
--- ubuntu_sso/qt/reset_password_page.py	2012-02-15 17:33:40 +0000
+++ ubuntu_sso/qt/reset_password_page.py	2012-02-17 21:24:20 +0000
@@ -178,14 +178,15 @@
 
     def on_password_changed(self, app_name, result):
         """Let user know that the password was changed."""
+        self.overlay.hide()
         email = unicode(self.wizard().forgotten.ui.email_line_edit.text())
-        self.overlay.hide()
         self.passwordChanged.emit(email)
 
     def on_password_change_error(self, app_name, error):
         """Let the user know that there was an error."""
         logger.error('Got error changing password for %s, error: %s',
                      self.app_name, error)
+        self.overlay.hide()
         self.message_box.critical(self, self.app_name,
             build_general_error_message(error))
 
@@ -200,6 +201,7 @@
         f = self.backend.set_new_password
         error_handler = partial(self._handle_error, f,
             self.on_password_change_error)
+        self.overlay.show()
         f(*args, reply_handler=NO_OP, error_handler=error_handler)
 
     def is_correct_password_confirmation(self, password):

=== modified file 'ubuntu_sso/qt/tests/test_current_user_sign_in_page.py'
--- ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-02-15 17:33:40 +0000
+++ ubuntu_sso/qt/tests/test_current_user_sign_in_page.py	2012-02-17 21:24:20 +0000
@@ -25,6 +25,7 @@
     BaseTestCase,
     FakedBackend,
     FakedObject,
+    FakeOverlay,
     FakePageUiStyle,
     FakeSignal,
     FakeWizard,
@@ -40,6 +41,7 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(CurrentUserSignInTestCase, self).setUp()
+        self.patch(gui, "LoadingOverlay", FakeOverlay)
         self.patch(gui.main, "get_sso_client", FakedBackend)
         self.signals_results = []
         self.patch(current_user_sign_in_page.CurrentUserSignInPage,
@@ -185,6 +187,7 @@
         self.ui.ui.email_edit.setText(email)
         self.ui.ui.password_edit.setText(password)
         self.ui.login()
+        self.assertEqual(self.ui.overlay.show_counter, 1)
         self.assert_backend_called('login_and_ping',
             self.app_name, email, password, ping)
 
@@ -200,6 +203,7 @@
         self.ui.ui.email_edit.setText(email)
         self.ui.ui.password_edit.setText(password)
         self.ui.login()
+        self.assertEqual(self.ui.overlay.show_counter, 1)
         self.assert_backend_called('login',
             self.app_name, email, password)
 
@@ -210,6 +214,7 @@
         self.ui.app_name = app_name
         error = {'errtype': 'UserNotValidated'}
         self.ui.on_login_error(app_name, error)
+        self.assertEqual(self.ui.overlay.hide_counter, 2)
         expected = ((self.ui, 'my_app', ''), {})
         self.assertTrue(expected, self._called)
 
@@ -225,6 +230,7 @@
             self.signals_results.append((app, email))
         self.ui.userLoggedIn.connect(slot)
         self.ui.on_logged_in(app_name, None)
+        self.assertEqual(self.ui.overlay.hide_counter, 2)
         self.assertIn((app_name, email), self.signals_results)
 
     def test_on_forgotten_password(self):

=== modified file 'ubuntu_sso/qt/tests/test_enhanced_check_box.py'
--- ubuntu_sso/qt/tests/test_enhanced_check_box.py	2012-02-02 15:57:02 +0000
+++ ubuntu_sso/qt/tests/test_enhanced_check_box.py	2012-02-17 21:24:20 +0000
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Diego Sarmentero <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -18,8 +16,6 @@
 
 """Tests for the EnhancedCheckBox widget."""
 
-import re
-
 from PyQt4 import QtCore
 
 from ubuntu_sso.qt import enhanced_check_box
@@ -34,9 +30,6 @@
         check = enhanced_check_box.EnhancedCheckBox("text")
         self.assertEqual(check.text(), "text")
         self.assertTrue(check.text_label.openExternalLinks())
-        style_sheet = unicode(check.text_label.styleSheet())
-        size = re.sub("\D", "", style_sheet)
-        self.assertEqual(check.iconSize().width(), int(size))
         self.assertEqual(check.receivers(
             QtCore.SIGNAL('stateChanged(int)')), 1)
 

=== modified file 'ubuntu_sso/qt/tests/test_forgotten_password.py'
--- ubuntu_sso/qt/tests/test_forgotten_password.py	2012-02-17 12:59:24 +0000
+++ ubuntu_sso/qt/tests/test_forgotten_password.py	2012-02-17 21:24:20 +0000
@@ -25,6 +25,7 @@
     BaseTestCase,
     FakedBackend,
     FakedObject,
+    FakeOverlay,
     FakePageUiStyle,
     FakeSignal,
     FakeWizard,
@@ -40,6 +41,7 @@
     def setUp(self):
         yield super(ForgottenPasswordTestCase, self).setUp()
         self.signals_results = []
+        self.patch(gui, "LoadingOverlay", FakeOverlay)
         self.patch(gui.main, "get_sso_client", FakedBackend)
         self.patch(forgotten_password_page.ForgottenPasswordPage,
             "passwordResetTokenSent", FakeSignal())
@@ -58,6 +60,17 @@
         self.assertTrue(callable(self.ui._signals['PasswordResetError']))
         self.assertEqual(self.ui.backend, FakedBackend.sso_login)
 
+    def test_request_new_password(self):
+        """Test the request_new_password function."""
+        app_name = 'my_app'
+        email = '[e-mail]'
+        self.ui.app_name = app_name
+        self.ui.ui.email_line_edit.setText(email)
+        self.ui.request_new_password()
+        self.assertEqual(self.ui.overlay.show_counter, 1)
+        self.assert_backend_called('request_password_reset_token',
+            app_name, email)
+
     def test_setup_page(self):
         """Test that the backend is received and the methods are called."""
         exposed_methods = [
@@ -218,6 +231,7 @@
             self.signals_results.append(1)
         self.ui.passwordResetTokenSent.connect(slot)
         self.ui.on_password_reset_token_sent('app_name', {})
+        self.assertEqual(self.ui.overlay.hide_counter, 2)
         self.assertTrue(1 in self.signals_results)
 
     def test_on_password_reset_error(self):
@@ -234,6 +248,7 @@
         self.assertFalse(self.ui.email_widget.isVisible())
         self.assertFalse(self.ui.forgotted_password_intro_label.isVisible())
         self.assertTrue(self.ui.try_again_widget.isVisible())
+        self.assertEqual(self.ui.overlay.hide_counter, 2)
 
     def test_on_password_reset_error_with_token_error(self):
         """Test on_password_reset_error method."""

=== modified file 'ubuntu_sso/qt/ubuntu_sso_wizard.py'
--- ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-02-14 18:42:00 +0000
+++ ubuntu_sso/qt/ubuntu_sso_wizard.py	2012-02-17 21:24:20 +0000
@@ -151,6 +151,7 @@
         self.setWizardStyle(QWizard.ModernStyle)
         self.button(QWizard.CancelButton).clicked.connect(
                                                     self.on_user_cancelation)
+        self.resize(550, 500)
 
     # pylint: disable=C0103
     def nextId(self):