Merge lp:~diegosarmentero/ubuntuone-windows-installer/successful-page into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Fixed: Process finished successfully (LP: #859743).

Fixed: Process finished successfully (LP: #859743).

[lp:~diegosarmentero/ubuntuone-windows-installer/successful-page]

86. By Diego Sarmentero on 2011-10-24

Fixed tests

87. By Diego Sarmentero on 2011-10-24

merge

88. By Diego Sarmentero on 2011-10-24

Conflicts resolved

89. By Diego Sarmentero on 2011-11-07

merge

90. By Diego Sarmentero on 2011-11-08

merge

91. By Diego Sarmentero on 2011-11-08

Fixed lint issues

92. By Diego Sarmentero on 2011-11-08

merge

93. By Diego Sarmentero on 2011-11-10

Removed changes from network-detect branch

94. By Diego Sarmentero on 2011-11-10

Tests improved.

Unmerged revisions

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-10-17 15:11:02 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-10-19 17:23:35 +0000
@@ -56,6 +56,10 @@
     TC_URL,
 )
 
+# Module used to include the resources into this file
+# pylint: disable=W0611
+from ubuntuone_installer.gui.qt.ui import images_rc
+# pylint: enable=W0611
 from ubuntuone_installer.logger import setup_logging
 from ubuntuone_installer.gui.qt.ui import (
     choose_sign_in_ui,
@@ -84,6 +88,7 @@
 CREDENTIALS_ERROR = _('Application will close.\n\n%r')
 SKIP_TOUR = _("Skip tour, go to Dashboard")
 START_SETUP = _("Start setup")
+SUCCESSFUL_LOGIN = _("Login successful")
 UPDATE_TITLE = _("Updates are available")
 UPDATE_SOFTWARE = _("There is a new version available. "
                     "Do you want perform an upgrade?")
@@ -213,9 +218,12 @@
 
     def __init__(self, parent=None):
         super(SuccessPage, self).__init__(
-            Ui_SuccessPage(), SuccessController(), parent)
+            Ui_SuccessPage(),
+            SuccessController(title=SUCCESSFUL_LOGIN), parent)
         self.finish_button = None
         self.next_button = None
+        self.ui.image_label.setPixmap(
+            QtGui.QPixmap(':/win_installer_graphic.png'))
 
     def initializePage(self):
         """Setup UI details."""

=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-09-29 13:26:44 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-10-19 17:23:35 +0000
@@ -29,7 +29,6 @@
 # pylint: disable=W0611
 from ubuntuone_installer.gui.qt.ui import images_rc
 # pylint: enable=W0611
-from ubuntuone_installer.gui.qt import utils
 
 
 def stop(*args):
@@ -48,6 +47,7 @@
 @defer.inlineCallbacks
 def success_cb(creds, gui, installing, logger):
     """Handle credentials success."""
+    from ubuntuone_installer.gui.qt import utils
     logger.debug('Got back from sso.')
     if creds:  # Have credentials already
         logger.debug('Already got credentials.')
@@ -89,6 +89,7 @@
 @defer.inlineCallbacks
 def check_updates(gui, logger):
     """Check for updates."""
+    from ubuntuone_installer.gui.qt import utils
     logger.info('Checking for updates.')
     # the idea is simple, check if there are updates, ask user if we perform
     # the update and continue.

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-10-13 10:30:25 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-10-19 17:23:35 +0000
@@ -24,6 +24,10 @@
 from ubuntuone.platform.credentials import APP_NAME
 from twisted.internet import defer
 
+# Module used to include the resources into this file
+# pylint: disable=W0611
+from ubuntuone_installer.gui.qt.ui import images_rc
+# pylint: enable=W0611
 from ubuntuone_installer.gui import NEXT
 from ubuntuone_installer.gui.qt import gui, forgotten, utils
 from ubuntuone_installer.gui.qt.tests import (
@@ -654,6 +658,21 @@
 
     class_ui = gui.SuccessPage
 
+    def get_pixmap_data(self, pixmap):
+        """Get the raw data of a QPixmap."""
+        byte_array = QtCore.QByteArray()
+        array_buffer = QtCore.QBuffer(byte_array)
+        pixmap.save(array_buffer, "PNG")
+        return byte_array
+
+    # pylint: disable=C0103
+    def assertEqualPixmaps(self, pixmap1, pixmap2):
+        """Compare two Qt pixmaps."""
+        d1 = self.get_pixmap_data(pixmap1)
+        d2 = self.get_pixmap_data(pixmap2)
+        self.assertEqual(d1, d2)
+    # pylint: enable=C0103
+
     def test_after_initialize(self):
         """Check the page is initialized correctly."""
         wizard = FakeMainWindow()
@@ -672,6 +691,8 @@
          QtGui.QWizard.NextButton])
         self.assertTrue(self.ui.next_button.isDefault())
         self.assertFalse(self.ui.finish_button.isDefault())
+        self.assertEqualPixmaps(self.ui.ui.image_label.pixmap(),
+            QtGui.QPixmap(':/win_installer_graphic.png'))
 
 
 class SignInPageTestCase(BaseTestCase):