Merge lp:~diegosarmentero/ubuntu-sso-client/back-button into lp:ubuntu-sso-client

[Diego Sarmentero]

- Fixed: Qt UI: there is a Back button in the "Enter verification page" (LP: #944769 )

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/qt/email_verification_page.py'
--- ubuntu_sso/qt/email_verification_page.py	2012-03-01 20:46:34 +0000
+++ ubuntu_sso/qt/email_verification_page.py	2012-03-02 17:14:18 +0000
@@ -18,7 +18,7 @@
 
 from functools import partial
 
-from PyQt4 import QtCore
+from PyQt4 import QtGui, QtCore
 
 from ubuntu_sso import NO_OP
 from ubuntu_sso.logger import setup_logging
@@ -136,4 +136,5 @@
         """Called to prepare the page just before it is shown."""
         self.next_button.setDefault(True)
         self.next_button.setEnabled(False)
+        self.wizard().setButtonLayout([QtGui.QWizard.Stretch])
     #pylint: enable=C0103

=== modified file 'ubuntu_sso/qt/tests/test_email_verification.py'
--- ubuntu_sso/qt/tests/test_email_verification.py	2012-03-01 20:46:34 +0000
+++ ubuntu_sso/qt/tests/test_email_verification.py	2012-03-02 17:14:18 +0000
@@ -96,6 +96,8 @@
         self.ui.initializePage()
         self.assertTrue(button.properties['default'])
         self.assertFalse(button.isEnabled())
+        expected = [('setButtonLayout', (([QtGui.QWizard.Stretch],), {}))]
+        self.assertEqual(self.wizard.called, expected)
 
     def test_on_email_validation_error(self):
         """Test the validate_email method."""