Merge lp:~diegosarmentero/ubuntuone-windows-installer/bug-820872 into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Show Form Errors at the bottom of each Page.

Show Form Errors at the bottom of each Page.

[lp:~diegosarmentero/ubuntuone-windows-installer/bug-820872]

36. By Diego Sarmentero on 2011-08-17

adding tests for adding and removing the form error message.

37. By Diego Sarmentero on 2011-08-17

reverting changes in qss and setup_account.ui

38. By Diego Sarmentero on 2011-08-17

adding missing style to qss

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-08-11 11:58:23 +0000
+++ data/qt/ubuntuone.qss	2011-08-17 14:36:24 +0000
@@ -169,3 +169,8 @@
     background: #f7f6f5;
     alternate-background-color: #efedec;
 }
+
+QLabel#form_errors{
+    font: bold 14px;
+    color: #dd4814;
+}

=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-08-15 21:41:54 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-08-17 14:36:24 +0000
@@ -302,6 +302,11 @@
         self.setWizardStyle(self.ModernStyle)
         self.close_callback = close_callback
 
+        # Label for Form Errors
+        self.form_errors_label = QtGui.QLabel()
+        self.form_errors_label.setObjectName("form_errors")
+        self.form_errors_label.hide()
+
         self.setSideWidget(SideWidget())
         self.overlay = LoadingOverlay(self)
 
@@ -412,8 +417,7 @@
     def creds_eb(self, exc):
         """Handle credentials error."""
         self.LICENSE_PAGE._next_id = self.SIGNIN_PAGE
-        self.critical(self, CREDENTIALS_ERROR_TITLE,
-            CREDENTIALS_ERROR % exc.value)
+        self.critical(CREDENTIALS_ERROR % exc.value)
         logger.error(
             'Error while getting the credentials: %r', exc.value)
         self.close()
@@ -426,14 +430,20 @@
         else:
             self.LICENSE_PAGE._next_id = self.local_folders_page_id
 
-    def critical(self, *args, **kwargs):
-        """Wrapper for QMessageBox.critical that hides the overlay."""
+    def critical(self, message):
+        """Show a message at the bottom of the page on form errors."""
         self.overlay.hide()
-        QtGui.QMessageBox.critical(*args, **kwargs)
+        self.form_errors_label.setText(message)
+        self.form_errors_label.show()
+        if self.currentPage():
+            self.currentPage().layout().addWidget(self.form_errors_label)
 
     def next(self):
-        """Show the next page to display."""
+        """Show the next page to display and remove the form errors label."""
         self.overlay.hide()
+        self.form_errors_label.hide()
+        self.currentPage().layout().removeWidget(self.form_errors_label)
+        self.form_errors_label.setParent(None)
         super(MainWindow, self).next()
 
     def nextId(self):

=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-15 21:41:54 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-17 14:36:24 +0000
@@ -262,10 +262,9 @@
     def test_critical(self):
         """Show a critical popup, but first hide the overlay."""
         self.assertEqual(self.ui.overlay.hide_counter, 1)
-        self.patch(gui.QtGui.QMessageBox, "critical", self._set_called)
         self.ui.critical("WORRY!")
         self.assertEqual(self.ui.overlay.hide_counter, 2)
-        self.assertEqual(self._called, (('WORRY!',), {}))
+        self.assertEqual(self.ui.form_errors_label.text(), "WORRY!")
 
     def test_forgotten_password_controller_error(self):
         """When there is an error, it should hide the overlay."""
@@ -311,11 +310,29 @@
 
     def test_next_hides_overlay(self):
         """Make sure next() hides the overlay."""
+        self.ui.setStartId(self.ui.LICENSE_PAGE_ID)
+        self.ui.restart()
+        self.ui.show()
         self.ui.next()
         # This is 2 because we hide it once on __init__()
         # and then again on next()
         self.assertEqual(self.ui.overlay.hide_counter, 2)
 
+    def test_insert_remove_critical_message(self):
+        """Make sure critical message is added and next() removes it."""
+        self.ui.setStartId(self.ui.LICENSE_PAGE_ID)
+        self.ui.restart()
+        self.ui.show()
+        license_page = self.ui.page(self.ui.LICENSE_PAGE_ID)
+        self.assertEqual(self.ui.form_errors_label.parentWidget(), None)
+        self.ui.critical("test critical message")
+        self.assertEqual(self.ui.form_errors_label.parentWidget(),
+            license_page)
+        self.assertEqual(self.ui.form_errors_label.text(),
+            "test critical message")
+        self.ui.next()
+        self.assertEqual(self.ui.form_errors_label.parentWidget(), None)
+
     def test_done_calls_custom_close_callback(self):
         """When closing the window, close_callback is called."""
         gui.AreYouSure.result = 0
@@ -938,7 +955,6 @@
         self.patch(gui, "LocalFoldersPage", FakeLocalFoldersPage)
         self.patch(qt.preferences, "PreferencesPanel", FakePreferencesPanel)
         self.patch(qt.folders, "FoldersPanel", FakeFoldersPanel)
-        self.patch(gui.QtGui.QMessageBox, "critical", self._set_called)
         self.patch(gui, "CredentialsManagementTool",
             FakeFailingCredentialsManagementTool)
         super(CredsFailureMainWindowTestCase, self).setUp()
@@ -949,5 +965,5 @@
 
     def test_critical(self):
         """Credential errors should display a critical message."""
-        self.assertEqual(self._called, ((self.ui, 'Error getting credentials',
-  "Application will close.\n\nException()"), {}))
+        self.assertEqual(self.ui.form_errors_label.text(),
+            "Application will close.\n\nException()")