Ubuntu Single Sign On Client

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

  1. back-button
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: Roberto Alsina
Approved revision: 895
Merged at revision: 896
Proposed branch: lp:~diegosarmentero/ubuntu-sso-client/back-button
Merge into: lp:ubuntu-sso-client
Diff against target: 31 lines (+4/-1)
2 files modified
ubuntu_sso/qt/email_verification_page.py (+2/-1)
ubuntu_sso/qt/tests/test_email_verification.py (+2/-0)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntu-sso-client/back-button
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+95622@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks great!

review: Approve
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu_sso/qt/email_verification_page.py'
2--- ubuntu_sso/qt/email_verification_page.py 2012-03-01 20:46:34 +0000
3+++ ubuntu_sso/qt/email_verification_page.py 2012-03-02 17:14:18 +0000
4@@ -18,7 +18,7 @@
5
6 from functools import partial
7
8-from PyQt4 import QtCore
9+from PyQt4 import QtGui, QtCore
10
11 from ubuntu_sso import NO_OP
12 from ubuntu_sso.logger import setup_logging
13@@ -136,4 +136,5 @@
14 """Called to prepare the page just before it is shown."""
15 self.next_button.setDefault(True)
16 self.next_button.setEnabled(False)
17+ self.wizard().setButtonLayout([QtGui.QWizard.Stretch])
18 #pylint: enable=C0103
19
20=== modified file 'ubuntu_sso/qt/tests/test_email_verification.py'
21--- ubuntu_sso/qt/tests/test_email_verification.py 2012-03-01 20:46:34 +0000
22+++ ubuntu_sso/qt/tests/test_email_verification.py 2012-03-02 17:14:18 +0000
23@@ -96,6 +96,8 @@
24 self.ui.initializePage()
25 self.assertTrue(button.properties['default'])
26 self.assertFalse(button.isEnabled())
27+ expected = [('setButtonLayout', (([QtGui.QWizard.Stretch],), {}))]
28+ self.assertEqual(self.wizard.called, expected)
29
30 def test_on_email_validation_error(self):
31 """Test the validate_email method."""

Subscribers

People subscribed via source and target branches