Merge lp:~diegosarmentero/ubuntuone-windows-installer/ui-improves into lp:ubuntuone-windows-installer

[Diego Sarmentero]

Page 18 and 19 from the Installer complete.
Some Tests added and other fixed.
UI Bugs Fixed.

Page 18 and 19 from the Installer complete.
Some Tests added and other fixed.
UI Bugs Fixed.

[lp:~diegosarmentero/ubuntuone-windows-installer/ui-improves]

34. By Diego Sarmentero on 2011-08-10

removing commented code.

35. By Diego Sarmentero on 2011-08-11

adding errback to show_hide_offer

36. By Diego Sarmentero on 2011-08-11

qss modified to remove unnecessary border.

37. By Diego Sarmentero on 2011-08-11

fixing import order.
removing twisted debug settings from local_folders.

38. By Diego Sarmentero on 2011-08-11

fixing show_hide_offer docstring

39. By Diego Sarmentero on 2011-08-11

replacing show_hide_offer to use inlineCallbacks

40. By Diego Sarmentero on 2011-08-11

grouping together 3rd party imports

[Natalia Bidart (nataliabidart)]

(01:08:39 PM) nessita: gatox: so, as an exercise, can you please change on_add_storage_button_clicked to use inlineCallbacks + yield instead of:
(01:08:39 PM) nessita: credtool = CredentialsManagementTool()
(01:08:39 PM) nessita: d = credtool.find_credentials()
(01:08:39 PM) nessita: d.addCallback(open_url)

Also, these imports

from twisted.internet import defer
from twisted.internet import reactor

from PyQt4 import QtGui
from PyQt4 import QtCore

should be:

from twisted.internet import defer, reactor
from PyQt4 import QtGui, QtCore

* This code is not needed:

    def tearDown(self):
        """Clean up the reactor."""
        BaseTestCase.tearDown(self)

* This assert has not effect!

        self.assertTrue(True)

* This code:

    def account_info(*args):
        d = defer.Deferred()
        reactor.callLater(.1, d.callback, {"quota_total": 1000})
        return d

should be:

    def account_info(*args):
        return defer.succeed({"quota_total": 1000})

* The branch lacks of tests for the new modules local_folders.py and preferences.py.

* Why you removed the LocalFoldersTestCase?

* Also, test for local_folders.py is needed: I understand there was no former tests for this module, so I request just a test for the new functionality added/modified (show_hide_offer and on_add_storage_button_clicked).

* Question, why did you remove this code? set_button_setup_account_property

review: Needs Fixing

[Diego Sarmentero (diegosarmentero)]

* The branch lacks of tests for the new modules local_folders.py and preferences.py.
* Why you removed the LocalFoldersTestCase?
* Also, test for local_folders.py is needed: I understand there was no former tests for this module, so I request just a test for the new functionality added/modified (show_hide_offer and on_add_storage_button_clicked).

- Local Folders Tests are going to be implemented in another branch because they have to be made from scratch (I'm adding that again and leave it as skipped)

* Question, why did you remove this code? set_button_setup_account_property

- This was an old implementation that didn't make the proper validation, now the validation function is working correctly and this code is no longer necessary.

[lp:~diegosarmentero/ubuntuone-windows-installer/ui-improves]

41. By Diego Sarmentero on 2011-08-11

fixes in local_folders.
tests improved.

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

=== added file 'data/folder.png'
 Binary files data/folder.png	1970-01-01 00:00:00 +0000 and data/folder.png	2011-08-11 17:47:23 +0000 differ
=== added file 'data/qt/folders.ui'
--- data/qt/folders.ui	1970-01-01 00:00:00 +0000
+++ data/qt/folders.ui	2011-08-11 17:47:23 +0000
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>480</width>
+    <height>374</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="check_settings_button">
+       <property name="text">
+        <string>Check bandwidth settings</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
 
=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2011-08-05 16:55:58 +0000
+++ data/qt/images.qrc	2011-08-11 17:47:23 +0000
@@ -15,5 +15,6 @@
     <file>../u1icon.png</file>
     <file>../ubuntu_one_favicon.png</file>
     <file>../win_installer_graphic.png</file>
+    <file>../folder.png</file>
   </qresource>
 </RCC>
 
=== modified file 'data/qt/local_folders.ui'
--- data/qt/local_folders.ui	2011-08-04 15:32:35 +0000
+++ data/qt/local_folders.ui	2011-08-11 17:47:23 +0000
@@ -99,7 +99,10 @@
      <item>
       <widget class="AddFolderButton" name="add_folder_button">
        <property name="text">
-        <string>Add a folder</string>
+        <string>Add a folder from this computer</string>
+       </property>
+       <property name="DisabledState" stdset="0">
+        <bool>false</bool>
        </property>
       </widget>
      </item>
@@ -159,7 +162,7 @@
          </spacer>
         </item>
         <item>
-         <widget class="QPushButton" name="pushButton">
+         <widget class="QPushButton" name="add_storage_button">
           <property name="text">
            <string>Add more storage</string>
           </property>
 
=== added file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	1970-01-01 00:00:00 +0000
+++ data/qt/preferences.ui	2011-08-11 17:47:23 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>480</width>
+    <height>374</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
 
=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-08-05 19:54:27 +0000
+++ data/qt/ubuntuone.qss	2011-08-11 17:47:23 +0000
@@ -109,6 +109,20 @@
     border-color: #999999;
 }
 
+QPushButton:hover[DisabledState="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #ffb19c,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
+QPushButton:pressed[DisabledState="false"] {
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #b93f14,stop: 1.0 #dd4814);
+    color: white;
+    border-color: #999999;
+}
+
 QFrame#frm_box {
     background: #ffffff;
     border-radius: 5px;
@@ -133,3 +147,25 @@
 QLabel#title_label{
     font-size: 20px;
 }
+
+QGroupBox {
+    padding-top: 30px;
+    border: none;
+    margin-top: 1ex;
+    font: bold 15px;
+}
+
+QGroupBox::title {
+    color: #333333;
+}
+
+QGroupBox#bandwidth_settings{
+    border-style: dotted;
+    border-color: #939389;
+    border-bottom-width: 1px;
+}
+
+QTreeView {
+    background: #f7f6f5;
+    alternate-background-color: #efedec;
+}
 
=== added file 'ubuntuone_installer/gui/qt/folders.py'
--- ubuntuone_installer/gui/qt/folders.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/folders.py	2011-08-11 17:47:23 +0000
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[e-mail]>
+#          Diego Sarmentero <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Page to list folders in a Ubuntu One account."""
+
+import gettext
+
+from PyQt4 import QtCore, QtGui
+from ubuntu_sso.qt.gui import SSOWizardPage
+from ubuntuone.controlpanel.gui.qt import folders
+
+from ubuntuone_installer.gui.qt.ui import folders_ui
+
+_ = gettext.gettext
+
+
+class FoldersPage(SSOWizardPage):
+    """Wizard page to list and manage an account's folders."""
+
+    def __init__(self, parent=None):
+        super(FoldersPage, self).__init__(folders_ui.Ui_Form(), None, parent)
+        self.setTitle(_("Syncing your computer with the cloud"))
+        self.folders_widget = folders.FoldersPanel()
+        self.layout().insertWidget(
+            self.layout().count() - 1, self.folders_widget)
+        self.folders_widget.ui.share_publish_button.hide()
+        self.folders_widget.ui.add_folder_button.hide()
+        self.folders_widget.ui.folders.setHeaderHidden(True)
+        self.folders_widget.ui.folders.setColumnHidden(2, True)
+
+    # Invalid name "initializePage"
+    # pylint: disable=C0103
+
+    def initializePage(self):
+        """Set Folders Page navigation buttons."""
+        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()._next_id = self.wizard().CONGRATULATIONS_PAGE
+
+    # pylint: enable=C0103
+
+    @QtCore.pyqtSlot()
+    def on_check_settings_button_clicked(self):
+        """Show the Preferences Page when the user click on Settings button."""
+        self.wizard()._next_id = \
+            self.wizard().preferences_page_id
+        self.wizard().next()
 
=== modified file 'ubuntuone_installer/gui/qt/gui.py'
--- ubuntuone_installer/gui/qt/gui.py	2011-08-10 19:56:42 +0000
+++ ubuntuone_installer/gui/qt/gui.py	2011-08-11 17:47:23 +0000
@@ -2,6 +2,7 @@
 
 # Authors: Alejandro J. Cura <[e-mail]>
 #          Roberto Alsina <[e-mail]>
+#          Diego Sarmentero <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -72,8 +73,10 @@
 
 from ubuntuone_installer.gui.qt.are_you_sure import AreYouSure
 from ubuntuone_installer.gui.qt.currentuser import CurrentUserController
+from ubuntuone_installer.gui.qt.folders import FoldersPage
 from ubuntuone_installer.gui.qt.forgotten import ForgottenPasswordController
 from ubuntuone_installer.gui.qt.local_folders import LocalFoldersPage
+from ubuntuone_installer.gui.qt.preferences import PreferencesPage
 from ubuntuone_installer.gui.qt.sync_now_or_later import SyncNowOrLaterPage
 from ubuntuone_installer.gui.qt.setup_account import SetupAccountPage
 from ubuntuone_installer.gui.qt.side_widget import SideWidget
@@ -388,6 +391,10 @@
         self.local_folders_page = LocalFoldersPage()
         self.local_folders_page_id = self.addPage(self.local_folders_page)
         self.SYNC_NOW_OR_LATER_PAGE = self.addPage(SyncNowOrLaterPage())
+        self.folders_page = FoldersPage()
+        self.folders_page_id = self.addPage(self.folders_page)
+        self.preferences_page = PreferencesPage()
+        self.preferences_page_id = self.addPage(self.preferences_page)
         self.CONGRATULATIONS_PAGE = self.addPage(CongratulationsPage())
 
         self.currentIdChanged.connect(self.on_currentIdChanged)
 
=== modified file 'ubuntuone_installer/gui/qt/local_folders.py'
--- ubuntuone_installer/gui/qt/local_folders.py	2011-08-04 15:32:35 +0000
+++ ubuntuone_installer/gui/qt/local_folders.py	2011-08-11 17:47:23 +0000
@@ -24,10 +24,10 @@
 import threading
 import Queue
 
+from twisted.internet.defer import inlineCallbacks
 from PyQt4 import QtCore, QtGui
-
-from ubuntuone.controlpanel.gui import humanize
-
+from ubuntuone.controlpanel.gui import humanize, sign_url
+from ubuntuone.platform.credentials import CredentialsManagementTool
 from ubuntu_sso.qt.gui import SSOWizardPage
 
 from ubuntuone_installer.gui.qt.ui import local_folders_ui
@@ -38,6 +38,14 @@
     LOCAL_FOLDERS_CALCULATING,
 )
 
+from ubuntuone_installer.logger import setup_logging
+
+
+# Invalid name logger
+# pylint: disable=C0103
+logger = setup_logging('qt.local_folders')
+# pylint: enable=C0103
+
 
 class FolderItem(QtGui.QTreeWidgetItem):
     """Class representing a folder in the folder list UI."""
@@ -90,14 +98,19 @@
 
     # initializePage is inherited
     # pylint: disable=C0103
+    @inlineCallbacks
     def initializePage(self):
         """UI details."""
-        self.wizard()._next_id = None
-
-    def quota(self):
-        """The quota available to the user."""
-        # FIXME: get this from real life
-        return 2 * 1024 * 1024
+        self.wizard().setButtonLayout([
+            QtGui.QWizard.Stretch,
+            QtGui.QWizard.NextButton])
+        self.wizard()._next_id = self.wizard().SYNC_NOW_OR_LATER_PAGE
+        # Start with this invisible
+        self.ui.offer_frame.setVisible(False)
+        if not self.ui.folder_list.topLevelItemCount():
+            for folder_name in self.default_folders():
+                self.add_folder(folder_name)
+            yield self.update_sizes()
 
     def default_folders(self):
         """Return a list of the folders to add by default."""
@@ -126,6 +139,7 @@
         self.items[path] = item
         return item
 
+    @inlineCallbacks
     def update_sizes(self):
         """Poll the queue were the threads put the size info."""
         try:
@@ -144,22 +158,30 @@
             total += item.size
 
         if isinstance(total, long):
-            self.show_hide_offer(total)
+            yield self.show_hide_offer(total)
             total = humanize(total)
         else:
-            self.show_hide_offer(0)
+            yield self.show_hide_offer(0)
         self.ui.folder_list.headerItem().setText(
             1, LOCAL_FOLDERS_SPACE_HEADER % total)
 
+    @inlineCallbacks
     def show_hide_offer(self, cur_size):
-        """Show or hide the offer to buy space according to the total size."""
-        quota = self.quota()
-
+        """Show or hide the offer to buy space according to the total size.
+
+        Returns a deferred that is triggered when the update is finished.
+
+        """
+        try:
+            user_info = yield self.ui.add_folder_button.backend.account_info()
+        except:
+            logger.exception('Error while trying to update que quota:')
+
+        quota = user_info['quota_total']
         if cur_size > quota:
             self.ui.offer_frame.setVisible(True)
         else:
             self.ui.offer_frame.setVisible(False)
-
         self.ui.offer_label.setText(LOCAL_FOLDERS_OFFER_LABEL %
             {"quota": humanize(quota)})
 
@@ -178,3 +200,21 @@
             self.ui.folder_list.takeTopLevelItem(
                 self.ui.folder_list.indexOfTopLevelItem(item))
         self.update_sizes()
+
+    @inlineCallbacks
+    @QtCore.pyqtSlot()
+    def on_add_storage_button_clicked(self):
+        """user clicked on the "Add more storage" button."""
+
+        try:
+            credtool = CredentialsManagementTool()
+            creds = yield credtool.find_credentials()
+        except:
+            logger.exception('Error while trying to update que quota:')
+
+        if creds:
+            signed_url = sign_url(
+                "https://one.ubuntu.com/services/#storage_panel", creds)
+        else:
+            signed_url = "https://one.ubuntu.com/services/#storage_panel"
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(signed_url))
 
=== added file 'ubuntuone_installer/gui/qt/preferences.py'
--- ubuntuone_installer/gui/qt/preferences.py	1970-01-01 00:00:00 +0000
+++ ubuntuone_installer/gui/qt/preferences.py	2011-08-11 17:47:23 +0000
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[e-mail]>
+#          Diego Sarmentero <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Page to list folders in a Ubuntu One account."""
+
+import gettext
+
+from PyQt4 import QtGui
+from ubuntuone.controlpanel.gui.qt import preferences
+from ubuntu_sso.qt.gui import SSOWizardPage
+
+from ubuntuone_installer.gui.qt.ui import preferences_ui
+
+_ = gettext.gettext
+
+
+class PreferencesPage(SSOWizardPage):
+    """Wizard page to list and manage an account's folders."""
+
+    def __init__(self, parent=None):
+        super(PreferencesPage, self).__init__(
+            preferences_ui.Ui_Form(), None, parent)
+        self.preferences_widget = preferences.PreferencesPanel()
+        self.layout().addWidget(self.preferences_widget)
+        self.preferences_widget.ui.apply_changes_button.hide()
+        self.preferences_widget.ui.restore_defaults_button.hide()
+
+    # Invalid name "initializePage"
+    # pylint: disable=C0103
+
+    def initializePage(self):
+        self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, True)
+        self.wizard().setOption(QtGui.QWizard.HaveCustomButton2, True)
+        # This is just to catch an exception thrown when nothing
+        # is connected to the signal. It's not an exceptional
+        # condition at all.
+        try:
+            self.wizard().customButtonClicked.disconnect()
+        except TypeError:
+            pass
+        self.wizard()._next_id = None
+        self.setButtonText(QtGui.QWizard.CustomButton1,
+            _("Apply these settings >"))
+        self.setButtonText(QtGui.QWizard.CustomButton2, _("Default settings"))
+
+        self.wizard().setButtonLayout([
+            QtGui.QWizard.BackButton,
+            QtGui.QWizard.Stretch,
+            QtGui.QWizard.CustomButton2,
+            QtGui.QWizard.CustomButton1])
+        self.wizard().button(QtGui.QWizard.CustomButton1).setDefault(True)
+        self.wizard().button(QtGui.QWizard.CustomButton1).style().unpolish(
+            self.wizard().button(QtGui.QWizard.CustomButton1))
+        self.wizard().button(QtGui.QWizard.CustomButton1).style().polish(
+            self.wizard().button(QtGui.QWizard.CustomButton1))
+
+        self.wizard().customButtonClicked.connect(self._button_clicked)
+
+    # pylint: enable=C0103
+
+    def _button_clicked(self, btn):
+        """Receive custom wizard buttons clicks."""
+        if btn == QtGui.QWizard.CustomButton1:
+            self.preferences_widget.on_apply_changes_button_clicked()
+            self.cleanupPage()
+            self.wizard().back()
+        elif btn == QtGui.QWizard.CustomButton2:
+            self.preferences_widget.on_restore_defaults_button_clicked()
+
+    # 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)
+        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, _("Sync Now!"))
+        self.wizard()._next_id = self.wizard().CONGRATULATIONS_PAGE
+
+    # pylint: enable=C0103
 
=== modified file 'ubuntuone_installer/gui/qt/setup_account.py'
--- ubuntuone_installer/gui/qt/setup_account.py	2011-08-05 13:48:02 +0000
+++ ubuntuone_installer/gui/qt/setup_account.py	2011-08-11 17:47:23 +0000
@@ -22,7 +22,6 @@
 import re
 
 from PyQt4 import QtGui
-from PyQt4.QtCore import Qt
 
 from ubuntu_sso.qt import gui as sso_gui
 
@@ -86,8 +85,6 @@
         self.ui.confirm_password_edit.textEdited.connect(
             self.password_assistance)
         self.password_assistance()
-        self.ui.terms_checkbox.stateChanged.connect(
-            self.set_button_setup_account_property)
 
     def name_assistance(self):
         """Show help for the name field."""
@@ -146,13 +143,6 @@
 
         self.ui.password_assistance.setText("<br>".join(label_text))
 
-    def set_button_setup_account_property(self, state):
-        """Change the set_up_button disable property and reapply the style."""
-        self.ui.set_up_button.setProperty("DisabledState",
-            state == Qt.Unchecked)
-        self.ui.set_up_button.style().unpolish(self.ui.set_up_button)
-        self.ui.set_up_button.style().polish(self.ui.set_up_button)
-
     def showEvent(self, event):
         """Set set_up_button as default button when the page is shown."""
         # This method should stays here because if we move it to initializePage
 
=== modified file 'ubuntuone_installer/gui/qt/sync_now_or_later.py'
--- ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-08-02 02:36:16 +0000
+++ ubuntuone_installer/gui/qt/sync_now_or_later.py	2011-08-11 17:47:23 +0000
@@ -42,3 +42,10 @@
         self.wizard().setOption(QtGui.QWizard.HaveCustomButton1, False)
         self.wizard().setOption(QtGui.QWizard.NoCancelButton, True)
         self.wizard()._next_id = None
+
+    def nextId(self):
+        """Go to the next page depending on the select field."""
+        if self.field("sync_custom"):
+            return self.wizard().folders_page_id
+        else:
+            return self.wizard().CONGRATULATIONS_PAGE
 
=== modified file 'ubuntuone_installer/gui/qt/tests/test_gui.py'
--- ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-10 20:12:08 +0000
+++ ubuntuone_installer/gui/qt/tests/test_gui.py	2011-08-11 17:47:23 +0000
@@ -25,10 +25,9 @@
 import tempfile
 
 from twisted.internet import defer
-
-from PyQt4 import QtCore
-
+from PyQt4 import QtGui, QtCore
 from ubuntuone.platform.credentials import APP_NAME
+from ubuntuone.controlpanel.gui import qt
 
 from ubuntuone_installer.gui.qt import gui
 from ubuntuone_installer.gui.qt.tests import BaseTestCase
@@ -108,6 +107,51 @@
         """Fake resize."""
 
 
+class FakeLocalFoldersPage(QtGui.QWizardPage):
+    """Fake Local Folders Page."""
+
+
+class FakeUIFoldersPanel(QtGui.QWidget):
+    """Fake UI Folders Page."""
+
+    def __init__(self, parent=None):
+        QtGui.QWidget.__init__(self, parent)
+        self.share_publish_button = QtGui.QPushButton()
+        self.add_folder_button = QtGui.QPushButton()
+        self.folders = QtGui.QTreeWidget()
+        self.folders.setColumnCount(3)
+        self.folders.setColumnHidden(2, True)
+
+
+class FakeFoldersPanel(QtGui.QWidget):
+    """Fake Folders Page."""
+
+    ui = FakeUIFoldersPanel()
+
+
+class FakeUIPreferencesPanel(QtGui.QWidget):
+    """Fake UI Preferences Page."""
+
+    apply_changes_button = QtGui.QPushButton()
+    restore_defaults_button = QtGui.QPushButton()
+
+
+class FakePreferencesPanel(QtGui.QWidget):
+    """Fake Preferences Page."""
+
+    ui = FakeUIPreferencesPanel()
+    apply_button_clicked = False
+    restore_button_clicked = False
+
+    def on_apply_changes_button_clicked(self):
+        """Set apply_button_clicked to True for PreferencesPage."""
+        self.apply_button_clicked = True
+
+    def on_restore_defaults_button_clicked(self):
+        """Set restore_button_clicked to True for PreferencesPage."""
+        self.restore_button_clicked = True
+
+
 class MainWindowTestCase(BaseTestCase):
     """Test the qt main window."""
 
@@ -126,10 +170,95 @@
         self.patch(gui, "ResetPasswordController", FakeController)
         self.patch(gui, "AreYouSure", FakeAreYouSure)
         self.patch(gui, "LoadingOverlay", FakeOverlay)
+        self.patch(gui, "LocalFoldersPage", FakeLocalFoldersPage)
+        self.patch(qt.preferences, "PreferencesPanel", FakePreferencesPanel)
+        self.patch(qt.folders, "FoldersPanel", FakeFoldersPanel)
         self.patch(gui, "CredentialsManagementTool",
             FakeFailureCredentialsManagementTool)
         super(MainWindowTestCase, self).setUp()
 
+    def test_preferences_page(self):
+        """Test Preferences Page UI display."""
+        preferences_page = self.ui.page(self.ui.preferences_page_id)
+
+        # Show the preferences page
+        self.ui.setStartId(self.ui.preferences_page_id)
+        self.ui.restart()
+        self.ui.show()
+
+        btn_pref = preferences_page.preferences_widget.ui.apply_changes_button
+        self.assertEqual(btn_pref.isVisible(), False)
+        btn_pref = \
+            preferences_page.preferences_widget.ui.restore_defaults_button
+        self.assertEqual(btn_pref.isVisible(), False)
+
+    def test_preferences_page_navigation_buttons(self):
+        """Check Preferences Page navigation buttons text."""
+        preferences_page = self.ui.page(self.ui.preferences_page_id)
+
+        # Show the preferences page
+        self.ui.setStartId(self.ui.preferences_page_id)
+        self.ui.restart()
+        self.ui.show()
+
+        btn_pref = preferences_page.wizard().button(
+            QtGui.QWizard.CustomButton1)
+        self.assertEqual(btn_pref.text(), "Apply these settings >")
+        btn_pref = preferences_page.wizard().button(
+            QtGui.QWizard.CustomButton2)
+        self.assertEqual(btn_pref.text(), "Default settings")
+
+    def test_preferences_page_button_clicked(self):
+        """Check Preferences Page navigation buttons text."""
+        preferences_page = self.ui.page(self.ui.preferences_page_id)
+
+        # Show the preferences page
+        self.ui.setStartId(self.ui.preferences_page_id)
+        self.ui.restart()
+        self.ui.show()
+
+        preferences_page._button_clicked(QtGui.QWizard.CustomButton2)
+        self.assertEqual(
+            preferences_page.preferences_widget.restore_button_clicked, True)
+        preferences_page._button_clicked(QtGui.QWizard.CustomButton1)
+        self.assertEqual(
+            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):
+        """Check Folders Page UI."""
+        folders_page = self.ui.page(self.ui.folders_page_id)
+
+        # Show the preferences page
+        self.ui.setStartId(self.ui.folders_page_id)
+        self.ui.restart()
+        self.ui.show()
+
+        btn_folders = folders_page.folders_widget.ui.share_publish_button
+        self.assertEqual(btn_folders.isVisible(), False)
+        btn_folders = folders_page.folders_widget.ui.add_folder_button
+        self.assertEqual(btn_folders.isVisible(), False)
+        tree_folders = folders_page.folders_widget.ui.folders
+        self.assertEqual(tree_folders.isHeaderHidden(), True)
+        tree_folders = folders_page.folders_widget.ui.folders
+        self.assertEqual(tree_folders.isColumnHidden(2), True)
+        self.assertEqual(self.ui._next_id, self.ui.CONGRATULATIONS_PAGE)
+
+    def test_folders_page_next_id(self):
+        """Check Folders Page UI."""
+        folders_page = self.ui.page(self.ui.folders_page_id)
+
+        # Show the preferences page
+        self.ui.setStartId(self.ui.folders_page_id)
+        self.ui.restart()
+        self.ui.show()
+
+        folders_page.on_check_settings_button_clicked()
+        self.assertEqual(self.ui.currentId(), self.ui.preferences_page_id)
+
     def test_critical(self):
         """Show a critical popup, but first hide the overlay."""
         self.assertEqual(self.ui.overlay.hide_counter, 1)
@@ -165,19 +294,19 @@
     def test_overlay_connection_current_user(self):
         """Make sure we don't lose connections to the overlay."""
         self.assertEqual(self.ui.overlay.show_counter, 0)
-        self.ui.current_user.ui.sign_in_button.click()
+        self.ui.current_user.ui.sign_in_button.clicked.emit(False)
         self.assertEqual(self.ui.overlay.show_counter, 1)
 
     def test_overlay_connection_forgotten_password(self):
         """Make sure we don't lose connections to the overlay."""
         self.assertEqual(self.ui.overlay.show_counter, 0)
-        self.ui.forgotten.ui.send_button.click()
+        self.ui.forgotten.ui.send_button.clicked.emit(False)
         self.assertEqual(self.ui.overlay.show_counter, 1)
 
     def test_overlay_connection_reset_password(self):
         """Make sure we don't lose connections to the overlay."""
         self.assertEqual(self.ui.overlay.show_counter, 0)
-        self.ui.reset_password.ui.reset_password_button.click()
+        self.ui.reset_password.ui.reset_password_button.clicked.emit(False)
         self.assertEqual(self.ui.overlay.show_counter, 1)
 
     def test_next_hides_overlay(self):
@@ -276,6 +405,19 @@
         self.assertEqual(
             congrats_page.ui.progressContainer.isVisible(), True)
 
+    def test_sync_page_custom_field(self):
+        """If the user selects 'Sync Custom' we move to Folders page."""
+        sync_page = self.ui.page(self.ui.SYNC_NOW_OR_LATER_PAGE)
+        sync_page.setField("sync_custom", True)
+
+        # Show the Sync Now page
+        self.ui.setStartId(self.ui.SYNC_NOW_OR_LATER_PAGE)
+        self.ui.restart()
+        self.ui.show()
+
+        # Check the navigation is correct
+        self.assertEqual(sync_page.nextId(), self.ui.folders_page_id)
+
     def test_sync_later_hides_message(self):
         """Selecting 'Sync Later' the congrats page hides a message."""
         congrats_page = self.ui.page(self.ui.CONGRATULATIONS_PAGE)
@@ -413,6 +555,18 @@
         self.shown = True
 
 
+class FakeCPBackend(object):
+    """Fake Control Panel backend."""
+
+    def account_info(*args):
+        return defer.succeed({"quota_total": 1000})
+
+
+class FakeAddFolderButton(object):
+    """Fake Control Panel "Add Folder" button."""
+    backend = FakeCPBackend()
+
+
 class LocalFoldersTestCase(BaseTestCase):
     """Test the LocalFoldersPage code."""
 
@@ -512,6 +666,10 @@
         self.assertEqual(self._called, ((True,), {}))
 
 
+LocalFoldersTestCase.skip = 'We need to re-write this test case entirely,' \
+                            'see bug #824675 for reference.'
+
+
 class SetupAccountTestCase(BaseTestCase):
     """Test the SetupAccountPage code."""