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

[Diego Sarmentero]

Removed Setup Account button when the user move to another page.

Removed Setup Account button when the user move to another page.

[lp:~diegosarmentero/ubuntuone-windows-installer/setup-button-fix]

48. By Diego Sarmentero on 2011-09-05

Adding associated bug.

[Roberto Alsina (ralsina)]

+1

review: Approve

[lp:~diegosarmentero/ubuntuone-windows-installer/setup-button-fix]

49. By Diego Sarmentero on 2011-09-05

adding missing docstrings.

50. By Diego Sarmentero on 2011-09-05

Added initializePage.

[Natalia Bidart (nataliabidart)]

I'm getting this test failures:

[FAIL]
Traceback (most recent call last):
  File "/home/nessita/canonical/u1/windows-installer/review_setup-button-fix/ubuntuone_installer/gui/qt/tests/test_gui.py", line 332, in test_overlay_connection_setup_account
    self.assertEqual(self.ui.overlay.show_counter, 1)
twisted.trial.unittest.FailTest: not equal:
a = 2
b = 1

ubuntuone_installer.gui.qt.tests.test_gui.MainWindowTestCase.test_overlay_connection_setup_account

(but not in trunk)

review: Needs Fixing

[lp:~diegosarmentero/ubuntuone-windows-installer/setup-button-fix]

51. By Diego Sarmentero on 2011-09-07

Fixed test (to avoid double signal connection).

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-09-01 11:15:49 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-09-07 12:05:57 +0000
@@ -178,16 +178,19 @@
         """Set set_up_button as default button when the page is shown."""
         # This method should stays here because if we move it to initializePage
         # set_up_button won't take the proper style for hover and press
+        self.set_up_button.setVisible(True)
         self.set_up_button.setDefault(True)
-        self.set_up_button.setProperty("DisabledState", True)
-        self.set_up_button.style().unpolish(self.set_up_button)
-        self.set_up_button.style().polish(self.set_up_button)
+        if not self.set_up_button.isEnabled():
+            self.set_up_button.setProperty("DisabledState", True)
+            self.set_up_button.style().unpolish(self.set_up_button)
+            self.set_up_button.style().polish(self.set_up_button)
         self.connect(QtGui.QApplication.instance(),
             QtCore.SIGNAL("focusChanged(QWidget*, QWidget*)"),
             self.focus_changed)
 
     def hideEvent(self, event):
         """Disconnect the focusChanged signal when the page change."""
+        self.set_up_button.setVisible(False)
         try:
             self.disconnect(QtGui.QApplication.instance(),
                 QtCore.SIGNAL("focusChanged(QWidget*, QWidget*)"),
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-06 16:25:25 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-07 12:05:57 +0000
@@ -150,6 +150,8 @@
         self.patch(qt.preferences, "PreferencesPanel", FakePreferencesPanel)
         self.patch(qt.folders, "FoldersPanel", FakeFoldersPanel)
         super(MainWindowTestCase, self).setUp()
+        setup_page = self.ui.page(self.ui.setup_account_page_id)
+        setup_page.initializePage()
 
     def test_wizard_init(self):
         """Check the Wizard flags regarding to the context help button."""
@@ -169,6 +171,30 @@
         self.assertFalse(setup_page.ui.confirm_email_assistance.isVisible())
         self.assertFalse(setup_page.ui.password_assistance.isVisible())
 
+    def test_setup_account_show_event_enabled_false(self):
+        """Check the proper state of the Setup Account button on shown."""
+        setup_page = self.ui.page(self.ui.setup_account_page_id)
+        self.ui.setStartId(self.ui.setup_account_page_id)
+        self.ui.restart()
+        setup_page.set_up_button.setEnabled(False)
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.assertTrue(setup_page.set_up_button.isVisible())
+        self.assertTrue(setup_page.set_up_button.isDefault())
+        self.assertFalse(setup_page.set_up_button.isEnabled())
+        self.assertTrue(setup_page.set_up_button.property("DisabledState"))
+
+    def test_setup_account_hide_event_enabled_false(self):
+        """Check the proper state of the Setup Account button on hide."""
+        setup_page = self.ui.page(self.ui.setup_account_page_id)
+        self.ui.setStartId(self.ui.setup_account_page_id)
+        self.ui.restart()
+        self.ui.show()
+        self.ui.hide()
+        self.addCleanup(self.ui.hide)
+        self.assertFalse(setup_page.set_up_button.isVisible())
+        self.assertTrue(setup_page.set_up_button.isDefault())
+
     def test_execute_uninstall_on_licence_cancel(self):
         """Pressing Disagree button from license page the uninstall is exec."""
         self.ui.setStartId(self.ui.LICENSE_PAGE_ID)
@@ -300,8 +326,6 @@
         """Make sure we don't lose connections to the overlay."""
         # Show the setup account page
         setup_page = self.ui.page(self.ui.setup_account_page_id)
-        self.ui.setStartId(self.ui.setup_account_page_id)
-        self.ui.restart()
         self.ui.show()
         self.addCleanup(self.ui.hide)
         self.assertEqual(self.ui.overlay.show_counter, 0)