Ubuntu One Windows Installer

Merge lp:~diegosarmentero/ubuntuone-windows-installer/success-fix into lp:ubuntuone-windows-installer

  1. success-fix
  2. Merge into trunk
Proposed by Diego Sarmentero
Status: Merged
Approved by: Alejandro J. Cura
Approved revision: 87
Merged at revision: 87
Proposed branch: lp:~diegosarmentero/ubuntuone-windows-installer/success-fix
Merge into: lp:ubuntuone-windows-installer
Diff against target: 46 lines (+11/-0)
2 files modified
ubuntuone_installer/gui/qt/gui.py (+6/-0)
ubuntuone_installer/gui/qt/tests/test_gui.py (+5/-0)
To merge this branch: bzr merge lp:~diegosarmentero/ubuntuone-windows-installer/success-fix
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+82017@code.launchpad.net

Commit message

Fixed: Successfull message after login says "TextLabel" (LP: #889255).

Description of the change

Fixed: Successfull message after login says "TextLabel" (LP: #889255).

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

Looks good!

review: Approve
Revision history for this message
Alejandro J. Cura (alecu) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone_installer/gui/qt/gui.py'
2--- ubuntuone_installer/gui/qt/gui.py 2011-11-10 13:08:54 +0000
3+++ ubuntuone_installer/gui/qt/gui.py 2011-11-11 20:44:40 +0000
4@@ -31,6 +31,9 @@
5 ForgottenPasswordPage,
6 ResetPasswordPage,
7 )
8+from ubuntu_sso.utils.ui import (
9+ SUCCESS,
10+)
11 from ubuntu_sso.qt.current_user_sign_in_ui import \
12 Ui_CurrentUserSignInPage
13 from ubuntu_sso.qt.email_verification_ui import \
14@@ -248,6 +251,9 @@
15 self.next_button.style().polish(self.next_button)
16 self.backend.connect_files()
17
18+ self.ui.success_message_body.setText(
19+ SUCCESS % {'app_name': self.wizard().app_name})
20+
21 def nextId(self):
22 """Provide the next id."""
23 return self.next
24
25=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
26--- ubuntuone_installer/gui/qt/tests/test_gui.py 2011-11-10 13:57:33 +0000
27+++ ubuntuone_installer/gui/qt/tests/test_gui.py 2011-11-11 20:44:40 +0000
28@@ -23,6 +23,9 @@
29 from ubuntuone.controlpanel.gui import qt
30 from ubuntuone.platform.credentials import APP_NAME
31 from twisted.internet import defer
32+from ubuntu_sso.utils.ui import (
33+ SUCCESS,
34+)
35
36 # Module used to include the resources into this file
37 # pylint: disable=W0611
38@@ -689,6 +692,8 @@
39 self.assertEqualPixmaps(self.ui.ui.image_label.pixmap(),
40 QtGui.QPixmap(':/win_installer_graphic.png'))
41 self.assertEqual(self.ui.backend.called, ['connect_files'])
42+ self.assertEqual(self.ui.ui.success_message_body.text(),
43+ SUCCESS % {'app_name': self.ui.wizard().app_name})
44
45
46 class SignInPageTestCase(BaseTestCase):

Subscribers

People subscribed via source and target branches