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

[Diego Sarmentero]

Agree button modified to look as a default button.

Agree button modified to look as a default button.

[Diego Sarmentero (diegosarmentero)]

Before: http://ubuntuone.com/18HDM589UxcGP25mfM4HVq

After: http://ubuntuone.com/5M9hcyyJWno47AfoZe80Na

[lp:~diegosarmentero/ubuntuone-windows-installer/default-agree]

100. By Diego Sarmentero on 2012-01-02

The agree button in the license page doesn't have the proper style

[Roberto Alsina (ralsina)]

+1 pretty!

review: Approve

[lp:~diegosarmentero/ubuntuone-windows-installer/default-agree]

101. By Diego Sarmentero on 2012-01-03

Removed some unnecessary lines in the test

102. By Diego Sarmentero on 2012-01-03

Improves in tests

[Manuel de la Peña (mandel)]

Much better! this way we know that we forced the repaint! Approving!

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-12-13 12:40:25 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2012-01-03 15:04:23 +0000
@@ -155,6 +155,7 @@
         super(LicensePage, self).__init__(license_ui.Ui_Form(), None, parent)
         self.header.setVisible(False)
         self.ui.textBrowser.setHtml(qt.LICENSE_CONTENT)
+        self.agree_button = None
 
     # Invalid names of Qt-inherited methods
     # pylint: disable=C0103
@@ -181,6 +182,11 @@
             QtGui.QWizard.NextButton,
             QtGui.QWizard.FinishButton])
 
+        self.agree_button = self.wizard().button(QtGui.QWizard.NextButton)
+        self.agree_button.setDefault(True)
+        self.agree_button.style().unpolish(self.agree_button)
+        self.agree_button.style().polish(self.agree_button)
+
     def nextId(self):
         """Return next page's ID."""
         if self._next_id is None:

=== modified file 'ubuntuone_installer/gui/qt/tests/__init__.py'
--- ubuntuone_installer/gui/qt/tests/__init__.py	2011-11-10 13:57:33 +0000
+++ ubuntuone_installer/gui/qt/tests/__init__.py	2012-01-03 15:04:23 +0000
@@ -175,6 +175,39 @@
         return self.buttons.setdefault(button_id, QtGui.QPushButton())
 
 
+class FakeWizardButtonStyle(FakeWizard):
+
+    def __init__(self):
+        super(FakeWizardButtonStyle, self).__init__()
+        self.data = {}
+
+    # pylint: disable=C0103
+    def setDefault(self, value):
+        """Fake setDefault for button."""
+        self.data['default'] = value
+
+    def isDefault(self):
+        """Fake isDefault."""
+        return self.data['default']
+    # pylint: enable=C0103
+
+    def button(self, button_id):
+        """Fake the functionality of button on QWizard class."""
+        return self
+
+    def style(self):
+        """Fake button style."""
+        return self
+
+    def polish(self, button):
+        """Fake polish."""
+        self.data['polish'] = button
+
+    def unpolish(self, button):
+        """Fake unpolish."""
+        self.data['unpolish'] = button
+
+
 class FakeWizardPage(object):
 
     """A fake wizard page."""

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-12-13 16:16:56 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2012-01-03 15:04:23 +0000
@@ -39,6 +39,7 @@
     FakeController,
     FakeOverlay,
     FakeSignal,
+    FakeWizardButtonStyle,
     FakeWizardPage,
     NO_OP,
 )
@@ -224,7 +225,24 @@
         self.assertFalse(setup_page.set_up_button.isVisible())
         self.assertTrue(setup_page.set_up_button.isDefault())
 
-    def test_execute_uninstall_on_licence_cancel(self):
+    def test_license_page_agree_button_style(self):
+        """Check that License Page shows agree button with the proper style."""
+        license_page = self.ui.page(self.ui.LICENSE_PAGE)
+        self.ui.setStartId(self.ui.LICENSE_PAGE)
+        self.ui.restart()
+        self.ui.show()
+        self.addCleanup(self.ui.hide)
+        self.patch(license_page, "wizard", FakeWizardButtonStyle)
+        license_page.initializePage()
+        self.assertTrue(license_page.agree_button.isDefault())
+        self.assertTrue('polish' in license_page.agree_button.data)
+        self.assertTrue('unpolish' in license_page.agree_button.data)
+        self.assertEqual(license_page.agree_button.data['polish'],
+            license_page.agree_button)
+        self.assertEqual(license_page.agree_button.data['unpolish'],
+            license_page.agree_button)
+
+    def test_execute_uninstall_on_license_cancel(self):
         """Pressing Disagree button from license page the uninstall is exec."""
         self.ui.setStartId(self.ui.LICENSE_PAGE)
         self.ui.restart()
@@ -235,7 +253,7 @@
         self.ui.done(result=0)
         self.assertTrue(self._called)
 
-    def test_execute_uninstall_on_licence_cancel_frozen(self):
+    def test_execute_uninstall_on_license_cancel_frozen(self):
         """Pressing Disagree button from license page the uninstall is exec."""
         self.ui.setStartId(self.ui.LICENSE_PAGE)
         self.ui.restart()