Merge lp:~ralsina/ubuntuone-windows-installer/back-is-wrong into lp:ubuntuone-windows-installer

[Roberto Alsina]

* Enable the back buttons in cloud-to-computer and computer-to-cloud in the right circumstances
* Set the correct title/subtitle for cloud-to-computer
* Fix the workflow for the "preferences" page

* Enable the back buttons in cloud-to-computer and computer-to-cloud in the right circumstances
* Set the correct title/subtitle for cloud-to-computer

[lp:~ralsina/ubuntuone-windows-installer/back-is-wrong]

66. By Roberto Alsina on 2011-09-09

de-lint

67. By Roberto Alsina on 2011-09-09

pep8

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

So, I made this test:

* ran installer
* login with existent account
* chose nothing in the cloud to computer page, clicked next
* computer to cloud computer appeared, chose nothing, clicked back
* got cloud-to-computer page again (which is ok), I chose to sync a existent udf, clicked next
* I expected to have the computer-to-cloud again, but I got the IMAGE GOES HERE instead.

review: Needs Fixing

[lp:~ralsina/ubuntuone-windows-installer/back-is-wrong]

68. By Roberto Alsina on 2011-09-09

handle 'back' better

69. By Roberto Alsina on 2011-09-09

useless import

70. By Roberto Alsina on 2011-09-09

lint

[Roberto Alsina (ralsina)]

> So, I made this test:
>
> * ran installer
> * login with existent account
> * chose nothing in the cloud to computer page, clicked next
> * computer to cloud computer appeared, chose nothing, clicked back
> * got cloud-to-computer page again (which is ok), I chose to sync a existent
> udf, clicked next
> * I expected to have the computer-to-cloud again, but I got the IMAGE GOES
> HERE instead.

Fixed in latest revno, along with a similar problem when you clicked on "Settings" on cloud-to-computer

[lp:~ralsina/ubuntuone-windows-installer/back-is-wrong]

71. By Roberto Alsina on 2011-09-09

link bug

72. By Roberto Alsina on 2011-09-10

test fixes

73. By Roberto Alsina on 2011-09-10

added test

74. By Roberto Alsina on 2011-09-10

lint

[Natalia Bidart (nataliabidart)]

Looks good. I noticed some buggy behaviors, but they should be fixed in a separated branch (I filed bug #847847).

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/folders.py'
--- ubuntuone_installer/gui/qt/folders.py	2011-09-07 15:25:01 +0000
+++ ubuntuone_installer/gui/qt/folders.py	2011-09-10 01:59:23 +0000
@@ -36,7 +36,9 @@
 
     def __init__(self, parent=None):
         super(FoldersPage, self).__init__(folders_ui.Ui_Form(), None, parent)
-        self.setTitle(_("Syncing your computer with the cloud"))
+        self.setTitle(_("Syncing the cloud to your computer"))
+        self.setSubTitle(_("These are your folders in your cloud. "
+            "Select the ones you want to sync with this computer."))
         self.folders_widget = folders.FoldersPanel()
         self.layout().insertWidget(
             self.layout().count() - 1, self.folders_widget)
@@ -53,7 +55,6 @@
         self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
         self.wizard().setOption(QtGui.QWizard.HaveCustomButton2, False)
         self.wizard().setButtonLayout([
-            QtGui.QWizard.BackButton,
             QtGui.QWizard.Stretch,
             QtGui.QWizard.NextButton])
         self.wizard().setButtonText(QtGui.QWizard.NextButton,
 
=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-09-07 15:25:01 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-09-10 01:59:23 +0000
@@ -102,15 +102,22 @@
         self.items = {}
         self.folders_info = None
         self.account_info = None
+        self.has_back_button = True
         self.cp_backend = backend.ControlBackend()
 
     # initializePage is inherited
     # pylint: disable=C0103
     def initializePage(self):
         """UI details."""
-        self.wizard().setButtonLayout([
-            QtGui.QWizard.Stretch,
-            QtGui.QWizard.NextButton])
+        if self.has_back_button:
+            self.wizard().setButtonLayout([
+                QtGui.QWizard.BackButton,
+                QtGui.QWizard.Stretch,
+                QtGui.QWizard.NextButton])
+        else:
+            self.wizard().setButtonLayout([
+                QtGui.QWizard.Stretch,
+                QtGui.QWizard.NextButton])
         self.wizard().setButtonText(QtGui.QWizard.NextButton,
             NEXT)
         self.wizard()._next_id = self.wizard().CONGRATULATIONS_PAGE
@@ -120,6 +127,10 @@
         self.wizard().overlay.show()
         self.get_info()
 
+    def cleanupPage(self):
+        """Initialize previous page when going back."""
+        self.wizard().folders_page.initializePage()
+
     @inlineCallbacks
     def get_info(self):
         """Get information from CP backend and fill folder list."""
 
=== modified file 'ubuntuone_installer/gui/qt/preferences.py'
--- ubuntuone_installer/gui/qt/preferences.py	2011-08-11 15:02:49 +0000
+++ ubuntuone_installer/gui/qt/preferences.py	2011-09-10 01:59:23 +0000
@@ -85,7 +85,6 @@
 
     # Invalid name "cleanupPage"
     # pylint: disable=C0103
-
     def cleanupPage(self):
         """Execute this cleanup function when the back button is pressed."""
         self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
@@ -94,7 +93,5 @@
             QtGui.QWizard.BackButton,
             QtGui.QWizard.Stretch,
             QtGui.QWizard.NextButton])
-        self.wizard().setButtonText(QtGui.QWizard.NextButton, _("Sync Now!"))
-        self.wizard()._next_id = self.wizard().CONGRATULATIONS_PAGE
-
+        self.wizard().folders_page.initializePage()
     # pylint: enable=C0103
 
=== modified file 'ubuntuone_installer/gui/qt/sync_now_or_later.py'
--- ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-09-07 16:25:32 +0000
+++ ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-09-10 01:59:23 +0000
@@ -50,13 +50,18 @@
         self.wizard().overlay.show()
         self.wizard().setButtonText(QtGui.QWizard.NextButton,
             NEXT)
+        self.wizard().setButtonLayout([
+            QtGui.QWizard.Stretch,
+            QtGui.QWizard.NextButton])
         self.get_info()
 
     def nextId(self):
         """Go to the next page depending on the select field."""
         if self.has_cloud_folders:
+            self.wizard().local_folders_page.has_back_button = True
             return self.wizard().folders_page_id
         else:
+            self.wizard().local_folders_page.has_back_button = False
             return self.wizard().local_folders_page_id
 
     @inlineCallbacks
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-09 13:20:23 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-09-10 01:59:23 +0000
@@ -28,6 +28,7 @@
 from ubuntuone.platform.credentials import APP_NAME
 from ubuntuone.controlpanel.gui import qt
 
+from ubuntuone_installer.gui import NEXT
 from ubuntuone_installer.gui.qt import gui, forgotten, utils
 from ubuntuone_installer.gui.qt.tests import BaseTestCase
 
@@ -269,12 +270,21 @@
             preferences_page.preferences_widget.apply_button_clicked, True)
         # for Cleanup
         btn_pref = preferences_page.wizard().button(QtGui.QWizard.NextButton)
-        self.assertEqual(btn_pref.text(), "Sync Now!")
-        self.assertEqual(self.ui._next_id, self.ui.CONGRATULATIONS_PAGE)
-
-    def test_folders_page(self):
+        self.assertEqual(btn_pref.text(), NEXT)
+        self.assertEqual(self.ui._next_id, self.ui.local_folders_page_id)
+
+    def test_preferences_cleanup_page(self):
+        """cleanupPage should call folders.initializePage()."""
+        preferences_page = self.ui.page(self.ui.preferences_page_id)
+        self.patch(self.ui.folders_page,
+            "initializePage", self._set_called)
+        preferences_page.cleanupPage()
+        self.assertEqual(self._called, ((), {}))
+
+    def test_folders_page_with_back(self):
         """Check Folders Page UI."""
         folders_page = self.ui.page(self.ui.folders_page_id)
+        self.patch(self.ui, "setButtonLayout", self._set_called)
 
         # Show the preferences page
         self.ui.setStartId(self.ui.folders_page_id)
@@ -292,6 +302,9 @@
         self.assertEqual(tree_folders.isColumnHidden(2), True)
         # pylint: disable=W0212
         self.assertEqual(self.ui._next_id, self.ui.local_folders_page_id)
+        self.assertEqual(self._called,
+            (([QtGui.QWizard.Stretch,
+             QtGui.QWizard.NextButton],), {}))
 
     def test_folders_page_next_id(self):
         """Check Folders Page UI."""
@@ -571,6 +584,18 @@
             self.target(*args)
 
 
+class FakeWizardPage(object):
+
+    """A fake wizard page."""
+
+    def __init__(self, *args, **kwargs):
+        self.has_back_button = True
+
+    # pylint: disable=C0103
+    def initializePage(self):
+        """Fake initializePage."""
+
+
 class FakeMainWindow(object):
 
     """A fake MainWindow."""
@@ -590,6 +615,8 @@
         self.button_layout = None
         self.options = []
         self.overlay = FakeOverlay()
+        self.local_folders_page = FakeWizardPage()
+        self.folders_page = FakeWizardPage()
 
     def show(self):
         """Fake method."""
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_local_folders.py'
--- ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-08 12:56:33 +0000
+++ ubuntuone_installer/gui/qt/tests/test_local_folders.py	2011-09-10 01:59:23 +0000
@@ -235,16 +235,36 @@
         self.assertEqual(self.ui.items, {})
         self.assertEqual(self.ui.ui.folder_list.topLevelItemCount(), 0)
 
-    def test_status_after_initialize(self):
-        """Test status of page components after initializePage()."""
-        self.patch(self.ui, "get_info", self._set_called)
-        self.ui.initializePage()
-        self.assertEqual(self.ui.wizard().overlay.show_counter, 1)
-        self.assertEqual(self.ui.wizard().overlay.hide_counter, 0)
-        self.assertFalse(self.ui.ui.offer_frame.isVisible())
-        self.assertEqual(self._called, ((), {}))
-        self.assertEqual(self.ui.wizard().button_texts,
-            [(QtGui.QWizard.NextButton, NEXT)])
+    def test_status_after_initialize_with_back(self):
+        """Test status of page components after initializePage()."""
+        self.patch(self.ui, "get_info", self._set_called)
+        self.ui.has_back_button = True
+        self.ui.initializePage()
+        self.assertEqual(self.ui.wizard().overlay.show_counter, 1)
+        self.assertEqual(self.ui.wizard().overlay.hide_counter, 0)
+        self.assertFalse(self.ui.ui.offer_frame.isVisible())
+        self.assertEqual(self._called, ((), {}))
+        self.assertEqual(self.ui.wizard().button_texts,
+            [(QtGui.QWizard.NextButton, NEXT)])
+        self.assertEqual(self.ui.wizard().button_layout,
+        [QtGui.QWizard.BackButton,
+         QtGui.QWizard.Stretch,
+         QtGui.QWizard.NextButton])
+
+    def test_status_after_initialize_without_back(self):
+        """Test status of page components after initializePage()."""
+        self.patch(self.ui, "get_info", self._set_called)
+        self.ui.has_back_button = False
+        self.ui.initializePage()
+        self.assertEqual(self.ui.wizard().overlay.show_counter, 1)
+        self.assertEqual(self.ui.wizard().overlay.hide_counter, 0)
+        self.assertFalse(self.ui.ui.offer_frame.isVisible())
+        self.assertEqual(self._called, ((), {}))
+        self.assertEqual(self.ui.wizard().button_texts,
+            [(QtGui.QWizard.NextButton, NEXT)])
+        self.assertEqual(self.ui.wizard().button_layout,
+        [QtGui.QWizard.Stretch,
+         QtGui.QWizard.NextButton])
 
     @defer.inlineCallbacks
     def test_status_after_get_info(self):
@@ -549,3 +569,10 @@
             'options': local_folders.QtGui.QFileDialog.DontUseNativeDialog,
             'parent': self.ui,
         }))
+
+    def test_cleanup_page(self):
+        """cleanupPage should call folders.initializePage()."""
+        self.patch(self.ui.wizard().folders_page,
+            "initializePage", self._set_called)
+        self.ui.cleanupPage()
+        self.assertEqual(self._called, ((), {}))
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py'
--- ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py	2011-09-07 16:52:36 +0000
+++ ubuntuone_installer/gui/qt/tests/test_sync_now_or_later.py	2011-09-10 01:59:23 +0000
@@ -76,12 +76,14 @@
         """With cloud folders, next page is folders."""
         self.ui.has_cloud_folders = True
         self.assertEqual(self.ui.nextId(), FakeMainWindow.folders_page_id)
+        self.assertTrue(self.main_window.local_folders_page.has_back_button)
 
     def test_has_no_cloud_folders_next(self):
         """With cloud folders, next page is folders."""
         self.ui.has_cloud_folders = False
         self.assertEqual(self.ui.nextId(),
             FakeMainWindow.local_folders_page_id)
+        self.assertFalse(self.main_window.local_folders_page.has_back_button)
 
     def test_status_after_initialize(self):
         """Test that everything is initialized correctly."""