Merge lp:~diegosarmentero/ubuntuone-windows-installer/default-wrong-buttons into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Fixed: When running the wizard from the bundle, the "Skip tour" is the default button (LP: #845778).
Fixed: When running the wizard from the bundle, there is no default button in the first screen (LP: #848016).

Fixed: When running the wizard from the bundle, the "Skip tour" is the default button (LP: #845778).
Fixed: When running the wizard from the bundle, there is no default button in the first screen (LP: #848016).

[Roberto Alsina (ralsina)]

+1

review: Approve

[Manuel de la Peña (mandel)]

Looks good and tests pass.

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-09-29 13:26:44 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-10-07 20:11:29 +0000
@@ -160,7 +160,9 @@
             QtGui.QWizard.Stretch,
             QtGui.QWizard.NextButton])
 
-        # Set existing_account_button as default when the page is shown.
+    def showEvent(self, event):
+        """Set existing_account_button as default when the page is shown."""
+        super(SignInPage, self).showEvent(event)
         self.ui.existing_account_button.setDefault(True)
         self.ui.existing_account_button.style().unpolish(
             self.ui.existing_account_button)
@@ -225,6 +227,13 @@
             SKIP_TOUR)
         self.wizard().setButtonText(QtGui.QWizard.NextButton,
             START_SETUP)
+        self.finish_button = self.wizard().button(QtGui.QWizard.FinishButton)
+        self.next_button = self.wizard().button(QtGui.QWizard.NextButton)
+        self.finish_button.style().unpolish(self.finish_button)
+        self.finish_button.style().polish(self.finish_button)
+        self.next_button.setDefault(True)
+        self.next_button.style().unpolish(self.next_button)
+        self.next_button.style().polish(self.next_button)
 
     def nextId(self):
         """Provide the next id."""

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-29 13:26:44 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-10-07 20:11:29 +0000
@@ -634,6 +634,10 @@
         """Fake setButtonText."""
         self.button_layout = layout
 
+    def button(self, button):
+        """Fake button method to obtain the wizard buttons."""
+        return QtGui.QPushButton()
+
     def setOption(self, *args):
         """Fake setOption."""
         self.options.append(args)
@@ -641,6 +645,9 @@
     def next(self):
         """Fake next."""
 
+    def reject(self):
+        """Fake reject."""
+
 
 class SuccesPageTestCase(BaseTestCase):
     """Test the SuccessPage code."""
@@ -663,6 +670,27 @@
         [QtGui.QWizard.Stretch,
          QtGui.QWizard.FinishButton,
          QtGui.QWizard.NextButton])
+        self.assertTrue(self.ui.next_button.isDefault())
+        self.assertFalse(self.ui.finish_button.isDefault())
+
+
+class SignInPageTestCase(BaseTestCase):
+    """Test the SuccessPage code."""
+
+    def setUp(self):
+        """Initialize this test instance."""
+        super(SignInPageTestCase, self).setUp()
+        self.ui = gui.SignInPage(gui.choose_sign_in_ui.Ui_ChooseSignInPage(),
+                                 None, None)
+
+    def test_show_event(self):
+        """Check the page is initialized correctly."""
+        wizard = FakeMainWindow()
+        self.patch(self.ui, 'wizard', lambda *args: wizard)
+        self.ui.initializePage()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertTrue(self.ui.ui.existing_account_button.isDefault())
 
 
 class UpgradeQuestion(BaseTestCase):