Merge lp:~nataliabidart/ubuntuone-control-panel/computer-to-cloud-page into lp:ubuntuone-control-panel

[Natalia Bidart]

- Added 'Computer to cloud' page to the wizard (part of LP: #933697).
- Tweaked the title of the aforementioned page (LP: #888521).

To test IRL, please have nightlies installed and up to date. Then, from this branch, please run:

./setup.py clean build; U1_DEBUG=True PYTHONPATH=. bin/ubuntuone-control-panel-qt

Assuming you already have U1 credentials, go to the devices tab and remove the current device. You will be presented with the initial screen, where you can play with:

From the dependency branch, you will get:

- closing from the button in the right bottom corner, you should get a confirmation dialog
- after login/register you should be presented with a screen to choose cloud folders to sync from your cloud to your desktop
- optionally, you can play with settings clicking on the button at the end of the folder listing

From this branch, you will get an additional page at the end to choose local folders to sync to your cloud. The list will offer some 'suggested' folders, and you can also add a custom folder using the 'add folder' button. Please note that changes will get applied *only* when the finish button is clicked.

Known bugs from this branch:

Bug #959447
Bug #959690

[lp:~nataliabidart/ubuntuone-control-panel/computer-to-cloud-page]

296. By Natalia Bidart on 2012-03-19

Merged trunk in.

[Eric Casteleijn (thisfred)]

It all works as expected!

Code looks good, but it does use new style and old style formatting: The problem is that while new style formatting has an awesome syntax, it is reportedly much slower than the old style, *and* it may tie us to a newer Python than we want without good reason.

Old style formatting is not scheduled to ever disappear from the language so I feel we should stick with that, at least until the performance problems are solved, and everyone is on a python that supports it, but maybe just forever.

review: Approve

[Roberto Alsina (ralsina)]

+1 excellent work!

review: Approve

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2012-03-12 20:29:41 +0000
+++ data/qt/controlpanel.ui	2012-03-19 21:32:18 +0000
@@ -153,9 +153,9 @@
                 </widget>
                </item>
                <item>
-                <widget class="GoToWebButton" name="get_more_space_button">
+                <widget class="GetStorageButton" name="get_more_space_button">
                  <property name="text">
-                  <string notr="true">Get more storage</string>
+                  <string notr="true">foo bar baz</string>
                  </property>
                  <property name="default">
                   <bool>true</bool>
@@ -362,6 +362,11 @@
  </widget>
  <customwidgets>
   <customwidget>
+   <class>GetStorageButton</class>
+   <extends>QPushButton</extends>
+   <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
+  </customwidget>
+  <customwidget>
    <class>GoToWebButton</class>
    <extends>QPushButton</extends>
    <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>

=== added file 'data/qt/local_folders.ui'
--- data/qt/local_folders.ui	1970-01-01 00:00:00 +0000
+++ data/qt/local_folders.ui	2012-03-19 21:32:18 +0000
@@ -0,0 +1,179 @@
+<?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>274</width>
+    <height>312</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QTreeWidget" name="folders">
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOn</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="indentation">
+      <number>0</number>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
+     <property name="allColumnsShowFocus">
+      <bool>true</bool>
+     </property>
+     <attribute name="headerStretchLastSection">
+      <bool>false</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string notr="true">Sync these folders on my computer</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string notr="true">Space (Total)</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <spacer name="horizontalSpacer_4">
+       <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="AddFolderButton" name="add_folder_button">
+       <property name="text">
+        <string notr="true">Add a folder</string>
+       </property>
+       <property name="default">
+        <bool>true</bool>
+       </property>
+       <property name="DisabledState" stdset="0">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <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>
+   <item>
+    <widget class="QFrame" name="offer_frame">
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="offer_label">
+        <property name="text">
+         <string notr="true">overflow message</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <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="GetStorageButton" name="add_storage_button">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string notr="true">add storage</string>
+          </property>
+          <property name="default">
+           <bool>true</bool>
+          </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>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>GetStorageButton</class>
+   <extends>QPushButton</extends>
+   <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
+  </customwidget>
+  <customwidget>
+   <class>AddFolderButton</class>
+   <extends>QPushButton</extends>
+   <header>ubuntuone.controlpanel.gui.qt.addfolder</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-03-16 21:18:43 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-03-19 21:32:18 +0000
@@ -71,6 +71,7 @@
 EDIT_PROFILE_LINK = u'https://login.ubuntu.com/'
 EDIT_SERVICES_LINK = UBUNTUONE_LINK + u'services'
 FACEBOOK_LINK = u'http://www.facebook.com/ubuntuone/'
+GET_STORAGE_LINK = UBUNTUONE_LINK + u'services/#storage_panel'
 GET_SUPPORT_LINK = UBUNTUONE_LINK + u'support/'
 LEARN_MORE_LINK = UBUNTUONE_LINK
 MANAGE_FILES_LINK = UBUNTUONE_LINK + u'files/'
@@ -93,6 +94,9 @@
 CLOUD_TO_COMPUTER_SUBTITLE = _('These are the folders in your cloud. '
     'Select the ones you want to sync with this computer.')
 CLOUD_TO_COMPUTER_TITLE = _('Syncing the cloud to your computer')
+COMPUTER_TO_CLOUD_SUBTITLE = _('Okay! Now it\'s time to choose which folders '
+    'on this computer you would like to sync to the cloud.')
+COMPUTER_TO_CLOUD_TITLE = _('Syncing your computer with the cloud')
 CONNECT_BUTTON_LABEL = _('Connect to Ubuntu One')
 CONTACTS = _('Thunderbird plug-in')
 CREDENTIALS_ERROR = _('There was a problem while retrieving the credentials.')
@@ -177,6 +181,12 @@
 INSTALLING = _('Installation of <i>%(package_name)s</i> in progress')
 LOADING = _('Loading...')
 LOADING_OVERLAY = _('Getting information, please wait...')
+LOCAL_FOLDERS_CALCULATING = _('Calculating...')
+LOCAL_FOLDERS_OVERFLOW = _('The folders you have selected to sync take '
+    'over your {quota_total} space. '
+    'You can remove some folders or add some extra storage.')
+LOCAL_FOLDERS_FOLDER_HEADER = _('Sync these folders on my computer')
+LOCAL_FOLDERS_SPACE_HEADER = _('Space {space_total}')
 MAIN_ACCOUNT_TAB = _('Account information')
 MAIN_DEVICES_TAB = _('Devices')
 MAIN_FOLDERS_TAB = _('Folders')

=== modified file 'ubuntuone/controlpanel/gui/qt/addfolder.py'
--- ubuntuone/controlpanel/gui/qt/addfolder.py	2012-03-09 14:16:38 +0000
+++ ubuntuone/controlpanel/gui/qt/addfolder.py	2012-03-19 21:32:18 +0000
@@ -56,6 +56,8 @@
     def __init__(self, *args, **kwargs):
         """Initialize the UI of the widget."""
         super(AddFolderButton, self).__init__(*args, **kwargs)
+        self.add_folder_func = \
+            lambda *a, **kw: defer.fail(NotImplementedError())
         self.cloud_folders = []
         self.clicked.connect(self.on_clicked)
 
@@ -70,18 +72,20 @@
             parent=self, directory=home_dir,
             options=FILE_CHOOSER_OPTIONS)
         folder = unicode(QtCore.QDir.toNativeSeparators(folder))
-        logger.debug('on_add_folder_button_clicked: user requested folder '
-                     'creation for path %r', folder)
+        logger.info('on_add_folder_button_clicked: user requested folder '
+                    'creation for path %r.', folder)
         if folder == '':
             self.folderCreationCanceled.emit()
-            return
+            defer.returnValue(None)
 
         is_valid = yield self.backend.validate_path_for_folder(folder)
         if not is_valid:
+            logger.error('on_add_folder_button_clicked: user requested to '
+                         'create a folder for an invalid path %r.', folder)
             text = FOLDER_INVALID_PATH % {'folder_path': folder,
                                           'home_folder': home_dir}
             QtGui.QMessageBox.warning(self, '', text, CLOSE)
-            return
+            defer.returnValue(None)
 
-        yield self.backend.create_folder(folder_path=folder)
+        yield self.add_folder_func(folder_path=folder)
         self.folderCreated.emit(folder)

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-03-16 21:12:20 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-03-19 21:32:18 +0000
@@ -24,10 +24,10 @@
 from ubuntuone.controlpanel.backend import AUTOCONNECT_KEY
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
-    EDIT_SERVICES_LINK,
     FACEBOOK_LINK,
     GET_HELP_ONLINE,
     GET_MORE_STORAGE,
+    GET_STORAGE_LINK,
     GET_SUPPORT_LINK,
     GREETING,
     humanize,
@@ -63,7 +63,7 @@
     def _setup(self):
         """Do some extra setupping for the UI."""
         self.ui.get_more_space_button.setText(GET_MORE_STORAGE)
-        self.ui.get_more_space_button.uri = EDIT_SERVICES_LINK
+        self.ui.get_more_space_button.uri = GET_STORAGE_LINK
 
         self.ui.help_button.setText(GET_HELP_ONLINE)
         self.ui.help_button.uri = GET_SUPPORT_LINK
@@ -100,6 +100,8 @@
     @log_call(logger.debug)
     def on_credentials_found(self):
         """Credentials are not found or were removed."""
+        folders_tab_idx = self.ui.tab_widget.indexOf(self.ui.folders_tab)
+        self.ui.tab_widget.setCurrentIndex(folders_tab_idx)
         self.ui.switcher.setCurrentWidget(self.ui.management)
         self.connect_file_sync()
         self.is_processing = False

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2012-03-19 13:47:56 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2012-03-19 21:32:18 +0000
@@ -19,10 +19,13 @@
 from __future__ import division
 
 import os
+import Queue
+import threading
 
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
 
+from ubuntuone.controlpanel.utils import default_folders
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
     ALWAYS_SUBSCRIBED,
@@ -35,6 +38,12 @@
     FOLDERS_COLUMN_SYNC_LOCALLY,
     FOLDERS_CONFIRM_MERGE,
     FOLDERS_MANAGE_LABEL,
+    GET_MORE_STORAGE,
+    humanize,
+    LOCAL_FOLDERS_CALCULATING,
+    LOCAL_FOLDERS_FOLDER_HEADER,
+    LOCAL_FOLDERS_OVERFLOW,
+    LOCAL_FOLDERS_SPACE_HEADER,
     MANAGE_FILES_LINK,
     MUSIC_ICON_NAME,
     MUSIC_DISPLAY_NAME,
@@ -48,7 +57,7 @@
     uri_hook,
 )
 from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
-from ubuntuone.controlpanel.gui.qt.ui import folders_ui
+from ubuntuone.controlpanel.gui.qt.ui import folders_ui, local_folders_ui
 
 
 logger = setup_logging('qt.folders')
@@ -57,6 +66,9 @@
 SUBSCRIPTION_COL = 1
 EXPLORE_COL = 2
 
+LOCAL_SUBSCRIPTION_COL = 0
+LOCAL_SPACE_COL = 1
+
 CANCEL = QtGui.QMessageBox.Cancel
 CHECKED = QtCore.Qt.Checked
 CLOSE = QtGui.QMessageBox.Close
@@ -102,6 +114,7 @@
         super(FoldersPanel, self)._setup()
         self.ui.add_folder_button.folderCreated.connect(self.on_folder_created)
         self.ui.add_folder_button.setText(FOLDERS_BUTTON_ADD_FOLDER)
+        self.ui.add_folder_button.add_folder_func = self.backend.create_folder
 
         self.ui.share_publish_button.setVisible(not self.remote_folders)
         self.ui.add_folder_button.setVisible(not self.remote_folders)
@@ -328,3 +341,287 @@
     """The Folders Panel that only shows remote cloud folders."""
 
     remote_folders = True
+
+
+class CalculateSize(threading.Thread):
+    """A thread that calculates, in the background, the size of a folder."""
+
+    def __init__(self, path_name, queue):
+        self.path_name = path_name
+        self.queue = queue
+        self._stop = False
+
+        super(CalculateSize, self).__init__()
+
+        # http://docs.python.org/library/threading.html#threading.Thread.daemon
+        # "A boolean value indicating whether this thread is a daemon thread
+        # (True) or not (False)"
+        self.daemon = True
+
+    def run(self):
+        """Run this thread."""
+        logger.debug('size_calculator: about to calculate size for %r.',
+                     self.path_name)
+        try:
+            total_size = 0
+            for dirpath, _, filenames in os.walk(self.path_name):
+                for f in filenames:
+                    fp = os.path.join(dirpath, f)
+                    if os.path.isfile(fp):
+                        total_size += os.path.getsize(fp)
+                if self._stop:
+                    logger.warning('size_calculator: stopping due to external '
+                                   'request.')
+                    return
+        except:  # pylint: disable=W0702
+            logger.exception('size_calculator: failed for %r:', self.path_name)
+        else:
+            logger.info('size_calculator: added new size %r for %r.',
+                         self.path_name, total_size)
+            self.queue.put([self.path_name, total_size])
+
+
+class FolderItem(QtGui.QTreeWidgetItem):
+    """A folder in the local folder list."""
+
+    def __init__(self, values=None, path=None, queue=None, volume_id=None):
+        super(FolderItem, self).__init__(values)
+        self.path = path
+        self.volume_id = volume_id
+        self.thread = None
+        self.size = 0
+
+        state = UNCHECKED
+        if path is not None:
+            if volume_id is not None:
+                state = CHECKED
+            elif queue is not None:
+                # calculate sizes of non-existing folders
+                self.thread = CalculateSize(path, queue)
+                self.thread.start()
+                self.size = None
+
+        self.setCheckState(LOCAL_SUBSCRIPTION_COL, state)
+
+
+class LocalFoldersPanel(UbuntuOneBin):
+    """The panel that only shows local, non-synched folders."""
+
+    changesApplied = QtCore.pyqtSignal()
+    changesCanceled = QtCore.pyqtSignal()
+    logger = logger
+    ui_class = local_folders_ui
+
+    def __init__(self, *args, **kwargs):
+        super(LocalFoldersPanel, self).__init__(*args, **kwargs)
+        self.queue = Queue.Queue()
+        self.timer = QtCore.QTimer()
+        self.items = {}
+        self.user_home = None
+        self.account_info = None
+
+    def _setup(self):
+        """Do some extra setupping for the UI."""
+        super(LocalFoldersPanel, self)._setup()
+        # Start with storage upgrade offer invisible
+        self.ui.offer_frame.setVisible(False)
+
+        headers = self.ui.folders.header()
+        headers.setResizeMode(LOCAL_SUBSCRIPTION_COL, headers.Stretch)
+        headers.setResizeMode(LOCAL_SPACE_COL, headers.Custom)
+        headers.resizeSection(LOCAL_SPACE_COL, 130)
+
+        self.ui.folders.headerItem().setText(LOCAL_SUBSCRIPTION_COL,
+                                             LOCAL_FOLDERS_FOLDER_HEADER)
+        self._set_space_header()
+
+        self.ui.add_folder_button.folderCreated.connect(self.on_folder_created)
+        self.ui.add_folder_button.setText(FOLDERS_BUTTON_ADD_FOLDER)
+        self.ui.add_folder_button.add_folder_func = self.add_folder
+
+        self.ui.add_storage_button.setText(GET_MORE_STORAGE)
+
+    def _set_space_header(self, total=None):
+        """Set the folders listing 'space' header."""
+        if total is None:
+            total = ''
+        else:
+            try:
+                total = humanize(long(total))
+            except (TypeError, ValueError):
+                pass
+            total = '(%s)' % total
+
+        title = LOCAL_FOLDERS_SPACE_HEADER.format(space_total=total)
+        self.ui.folders.headerItem().setText(LOCAL_SPACE_COL, title)
+
+    def _stop(self):
+        """Stop all pending threads and timers."""
+        self.timer.stop()
+        self.timer = None
+
+        for item in self.items.itervalues():
+            if item.thread is None:
+                logger.warning('LocalFoldersPanel: attempted to stop a thread '
+                               'for an item with a None thread.')
+            else:
+                item.thread._stop = True
+
+    # pylint: disable=E0202
+    @defer.inlineCallbacks
+    def load(self):
+        """Load specific tab info."""
+        self.is_processing = True
+        self.account_info = yield self.backend.account_info()
+        self._set_space_header(self.account_info['quota_used'])
+        volumes_info = yield self.backend.volumes_info(with_storage_info=False)
+        yield self.process_info(volumes_info)
+
+    @defer.inlineCallbacks
+    @log_call(logger.debug)
+    def process_info(self, volumes_info):
+        """Load local folders info into the tree view."""
+        try:
+            folders = []
+            for _, _, volumes in volumes_info:
+                for volume in volumes:
+                    if (volume[u'type'] == self.backend.FOLDER_TYPE and
+                        bool(volume['subscribed'])):
+                        folders.append((volume['path'], volume['volume_id']))
+
+            # add local folders only if they are valid
+            self.user_home = yield self.backend.get_home_dir()
+            for folder in default_folders(user_home=self.user_home):
+                is_valid = yield self.backend.validate_path_for_folder(folder)
+                if is_valid:
+                    folders.append((folder, None))
+
+            # always clear the items dict first, since clearing the folders
+            # list will trigger "underlying C/C++ object has been deleted"
+            self.items.clear()
+            self.ui.folders.clear()
+
+            # self.timer can be None if self._stop was called before
+            # this piece of code was executed
+            if self.timer is not None:
+                for path, volume_id in folders:
+                    self.add_folder(folder_path=path, volume_id=volume_id)
+
+                self.timer.start(2000)
+                self.timer.timeout.connect(self.update_sizes)
+        finally:
+            self.is_processing = False
+
+    @handle_errors(logger=logger)
+    @defer.inlineCallbacks
+    def apply_changes(self):
+        """When moving to next page, create/[un]subscribe UDFs."""
+        self.is_processing = True
+        try:
+            self._stop()
+
+            for path, item in self.items.iteritems():
+                subscribed = item.checkState(LOCAL_SUBSCRIPTION_COL) == CHECKED
+                if item.volume_id is not None:
+                    logger.info('apply_changes: change settings for %r to %r.',
+                                item.path, dict(subscribed=subscribed))
+                    yield self.backend.change_volume_settings(item.volume_id,
+                            dict(subscribed=subscribed))
+                else:
+                    if subscribed:
+                        logger.info('apply_changes: create folder for %r.',
+                                    path)
+                        yield self.backend.create_folder(path)
+        finally:
+            self.is_processing = False
+
+        self.changesApplied.emit()
+
+    @handle_errors(logger=logger)
+    def add_folder(self, folder_path, volume_id=None):
+        """Add a folder to the list."""
+        if folder_path in self.items:
+            logger.warning('LocalFoldersPanel: already have an item for %r.',
+                           folder_path)
+
+        if self.user_home is None:
+            logger.warning('LocalFoldersPanel: user home is None! '
+                           'paths will not be pretty.')
+            display_name = folder_path
+        else:
+            user_home = self.user_home + os.path.sep
+            display_name = _process_name(folder_path.replace(user_home, ''))
+
+        item = FolderItem([display_name, ""], path=folder_path,
+                          queue=self.queue, volume_id=volume_id)
+        self.ui.folders.addTopLevelItem(item)
+
+        if volume_id is None:  # new folder
+            self.items[folder_path] = item
+
+    @log_call(logger.info)
+    def on_folder_created(self, new_folder):
+        """User clicked on the "Add Folder" button."""
+        item = self.items.get(unicode(new_folder))
+        if item is not None:
+            item.setCheckState(LOCAL_SUBSCRIPTION_COL, CHECKED)
+        else:
+            logger.warning('LocalFoldersPanel: on_folder_created was called '
+                           'for %r which is not tracked in the internal dict',
+                           unicode(new_folder))
+
+    @handle_errors(logger=logger)
+    def update_sizes(self):
+        """Poll the queue were the threads put the size info.
+
+        Every item put in this queue will be a non-synched folder. Thus, the
+        item's volume_id will be None, so no need to check that.
+
+        """
+        while True:
+            try:
+                path, size = self.queue.get(block=False)
+            except Queue.Empty:
+                break
+            else:
+                item = self.items.get(path)
+                if item:
+                    item.size = size
+                    item.setText(LOCAL_SPACE_COL, humanize(size))
+
+        total = long(self.account_info['quota_used'])
+        for path, item in self.items.iteritems():
+            if item.size is None:
+                total = LOCAL_FOLDERS_CALCULATING
+                break
+
+            subscribed = item.checkState(LOCAL_SUBSCRIPTION_COL) == CHECKED
+            if subscribed:
+                total += item.size
+
+        if isinstance(total, long):
+            self.show_hide_offer(total)
+        else:
+            self.show_hide_offer(0)
+
+        self._set_space_header(total)
+
+    def show_hide_offer(self, current_size):
+        """Show or hide the offer to buy space according to the total size."""
+        quota = long(self.account_info['quota_total'])
+        if current_size > quota:
+            msg = LOCAL_FOLDERS_OVERFLOW.format(quota_total=humanize(quota))
+            self.ui.offer_label.setText(msg)
+            self.ui.offer_frame.setVisible(True)
+        else:
+            self.ui.offer_frame.setVisible(False)
+
+    # pylint: disable=C0103
+
+    def on_folders_itemChanged(self, item, column):
+        """Update the size for the chosen row."""
+        if column == LOCAL_SUBSCRIPTION_COL:
+            self.update_sizes()
+            self.items[item.path] = item
+
+    # pylint: enable=C0103

=== modified file 'ubuntuone/controlpanel/gui/qt/gotoweb.py'
--- ubuntuone/controlpanel/gui/qt/gotoweb.py	2012-02-06 15:23:27 +0000
+++ ubuntuone/controlpanel/gui/qt/gotoweb.py	2012-03-19 21:32:18 +0000
@@ -23,16 +23,25 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel import cache
+from ubuntuone.controlpanel.gui import (
+    GET_MORE_STORAGE,
+    GET_STORAGE_LINK,
+)
 from ubuntuone.controlpanel.gui import qt
 
 
 class GoToWebButton(cache.Cache, QtGui.QPushButton):
     """The GoToWebButton widget"""
 
+    uri = None
+    legend = None
+
     def __init__(self, *args, **kwargs):
         """Initialize the UI of the widget."""
         super(GoToWebButton, self).__init__(*args, **kwargs)
-        self.uri = None
+        if self.legend is not None:
+            self.setText(self.legend)
+
         self.setIcon(qt.icon_from_name('external_icon_white'))
         self.setLayoutDirection(QtCore.Qt.RightToLeft)
         self.clicked.connect(self.on_clicked)
@@ -45,3 +54,10 @@
         if self.uri is not None:
             uri = yield self.backend.build_signed_iri(self.uri)
             qt.uri_hook(uri)
+
+
+class GetStorageButton(GoToWebButton):
+    """A specific GoToWebButton to get more storage."""
+
+    legend = GET_MORE_STORAGE
+    uri = GET_STORAGE_LINK

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2012-03-09 13:44:53 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2012-03-19 21:32:18 +0000
@@ -18,8 +18,6 @@
 
 """Tests for the AddFolderButton widget."""
 
-import os
-
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.tests import (
@@ -48,11 +46,10 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(AddFolderButtonTestCase, self).setUp()
+        self.created_folders = []
         self.patch(FakedFileDialog, 'response', gui.QtCore.QString(''))
         self.patch(self.ui.backend, 'validate_path_for_folder', lambda p: True)
-        old_home = os.environ['HOME']
-        os.environ['HOME'] = USER_HOME
-        self.addCleanup(lambda: os.environ.__setitem__('HOME', old_home))
+        self.patch(self.ui, 'add_folder_func', self.add_folder)
 
     @defer.inlineCallbacks
     def assert_does_nothing(self, method_call):
@@ -73,6 +70,18 @@
         # the folderCreated signal was not emitted
         self.assertEqual(self._called, False)
 
+    def add_folder(self, folder_path):
+        """A dummy add folder func."""
+        self.created_folders.append(folder_path)
+        return defer.succeed(None)
+
+    def test_default_add_folder_func(self):
+        """The add_folder_func is used."""
+        folder = set_path_on_file_dialog()
+        yield self.ui.on_clicked()
+
+        self.assertEqual(self.created_folders, [folder])
+
     @defer.inlineCallbacks
     def test_add_folder_button_clicked_opens_file_chooser(self):
         """When adding a new folder, the proper file chooser is raised."""
@@ -121,7 +130,7 @@
         self.assertEqual(FakedDialog.args, None)
         self.assertEqual(FakedDialog.kwargs, None)
         # backend called
-        self.assert_backend_called('create_folder', folder_path=folder)
+        self.assertEqual(self.created_folders, [folder])
 
     @defer.inlineCallbacks
     def test_calls_backend(self):
@@ -133,7 +142,7 @@
         self.assertEqual(FakedDialog.args, None)
         self.assertEqual(FakedDialog.kwargs, None)
         # backend called
-        self.assert_backend_called('create_folder', folder_path=folder)
+        self.assertEqual(self.created_folders, [folder])
 
     @defer.inlineCallbacks
     def test_emit_folder_created_on_success(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-03-16 18:54:55 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2012-03-19 21:32:18 +0000
@@ -193,7 +193,7 @@
     def test_get_more_space_button(self):
         """When clicking the get more GB button, the proper url is opened."""
         self.assert_uri_hook_called(self.ui.ui.get_more_space_button,
-                                    gui.EDIT_SERVICES_LINK)
+                                    gui.GET_STORAGE_LINK)
 
     def test_help_button(self):
         """When clicking the help button, the proper url is opened."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-19 13:47:56 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-03-19 21:32:18 +0000
@@ -20,11 +20,14 @@
 import logging
 import operator
 import os
+import Queue
+import shutil
 
 from PyQt4 import QtGui
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
 
+from ubuntuone.controlpanel.tests import helper_fail
 from ubuntuone.controlpanel.gui.tests import (
     FAKE_VOLUMES_INFO,
     FAKE_VOLUMES_MINIMAL_INFO,
@@ -413,6 +416,8 @@
 
     def test_add_folder_button(self):
         """The 'add_folder_button' is visible by default."""
+        self.assertEqual(self.ui.ui.add_folder_button.add_folder_func,
+                         self.ui.backend.create_folder)
         self.assertTrue(self.ui.ui.add_folder_button.isVisible())
 
     def test_check_settings_button(self):
@@ -650,3 +655,204 @@
 
     class_ui = gui.RemoteFoldersPanel
     faked_volumes = volumes_with_music_unsubscribed()
+
+
+class BaseLocalFoldersTestCase(BaseTestCase):
+    """Test suite for the class implementing the LocalFolders feature."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        self.path = 'not-existing-dir'
+        self.expected_size = self.build_test_dir(self.path)
+        self.queue = Queue.Queue()
+        yield super(BaseLocalFoldersTestCase, self).setUp()
+
+    def build_test_dir(self, dir_path):
+        """Build a testing directory hierarchy."""
+        assert not os.path.exists(dir_path)
+
+        os.makedirs(dir_path)
+        self.addCleanup(shutil.rmtree, dir_path)
+
+        total_size = 0
+
+        a_file = os.path.join(dir_path, 'test_file')
+        with open(a_file, 'wb') as f:
+            f.write('z' * 1000000)
+
+        total_size += os.path.getsize(a_file)
+
+        inner_dir = os.path.join(dir_path, 'test_dir')
+        os.mkdir(inner_dir)
+
+        other_file = os.path.join(dir_path, 'other_test_file')
+        with open(other_file, 'wb') as f:
+            f.write(' ' * 99999)
+
+        total_size += os.path.getsize(other_file)
+
+        empty_dir = os.path.join(dir_path, 'empty')
+        os.mkdir(empty_dir)
+
+        # add a symlink to confirm those are avoided
+        a_link = os.path.join(dir_path, 'some_link')
+        os.symlink(a_file, a_link)
+
+        return total_size
+
+
+class CalculateSizeTestCase(BaseLocalFoldersTestCase):
+    """Test suite for the CalculateSize thread implementation."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(CalculateSizeTestCase, self).setUp()
+        self.ui = gui.CalculateSize(path_name=self.path, queue=self.queue)
+        self.patch(self.ui, 'start', lambda: None)
+
+    def test_creation(self):
+        """The created instance is correct."""
+        self.assertEqual(self.ui.path_name, self.path)
+        self.assertEqual(self.ui.queue, self.queue)
+        self.assertTrue(self.ui.daemon)
+
+    def test_run(self):
+        """The run() method calculates the size for the given path."""
+        self.ui.run()
+
+        path, size = self.queue.get(block=True, timeout=0.5)
+
+        self.assertEqual(path, self.path)
+        self.assertEqual(size, self.expected_size)
+
+    def test_run_handles_errors(self):
+        """The run() method handles errors."""
+        self.patch(gui.os, 'walk', helper_fail)
+        self.ui.run()
+
+        self.assertRaises(Queue.Empty, self.queue.get, block=True, timeout=0.5)
+
+
+class FakedCalculateSize(object):
+    """A faked CalculateSize thread."""
+
+    def __init__(self, *args, **kwargs):
+        self.started = False
+
+    def start(self):
+        """Fake start."""
+        self.started = True
+
+
+class FolderItemTestCase(BaseLocalFoldersTestCase):
+    """Test suite for the FolderItem widget."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(FolderItemTestCase, self).setUp()
+        self.calculator = FakedCalculateSize(self.path, self.queue)
+        self.patch(gui, 'CalculateSize', lambda *a, **kw: self.calculator)
+        self.values = ['foo', 'bar']
+
+        assert not self.calculator.started
+
+    def test_no_params(self):
+        """The creation with no params uses defaults."""
+        item = gui.FolderItem()
+
+        self.assertEqual(item.text(gui.LOCAL_SUBSCRIPTION_COL), '')
+        self.assertEqual(item.text(gui.LOCAL_SPACE_COL), '')
+        self.assertEqual(item.path, None)
+        self.assertEqual(item.volume_id, None)
+        self.assertEqual(item.thread, None)
+        self.assertEqual(item.size, 0)
+        self.assertEqual(item.checkState(gui.LOCAL_SUBSCRIPTION_COL),
+                         gui.UNCHECKED)
+
+    def test_values(self):
+        """The creation with only values."""
+        item = gui.FolderItem(values=self.values)
+
+        self.assertEqual(item.text(gui.LOCAL_SUBSCRIPTION_COL), self.values[0])
+        self.assertEqual(item.text(gui.LOCAL_SPACE_COL), self.values[1])
+        self.assertEqual(item.path, None)
+        self.assertEqual(item.volume_id, None)
+        self.assertEqual(item.thread, None)
+        self.assertEqual(item.size, 0)
+        self.assertEqual(item.checkState(gui.LOCAL_SUBSCRIPTION_COL),
+                         gui.UNCHECKED)
+
+    def test_path(self):
+        """The creation with only a path."""
+        item = gui.FolderItem(path=self.path)
+
+        self.assertEqual(item.text(gui.LOCAL_SUBSCRIPTION_COL), '')
+        self.assertEqual(item.text(gui.LOCAL_SPACE_COL), '')
+        self.assertEqual(item.path, self.path)
+        self.assertEqual(item.volume_id, None)
+        self.assertEqual(item.thread, None)
+        self.assertEqual(item.size, 0)
+        self.assertEqual(item.checkState(gui.LOCAL_SUBSCRIPTION_COL),
+                         gui.UNCHECKED)
+
+    def test_queue(self):
+        """The creation with only a queue."""
+        item = gui.FolderItem(queue=self.queue)
+
+        self.assertEqual(item.text(gui.LOCAL_SUBSCRIPTION_COL), '')
+        self.assertEqual(item.text(gui.LOCAL_SPACE_COL), '')
+        self.assertEqual(item.path, None)
+        self.assertEqual(item.volume_id, None)
+        self.assertEqual(item.thread, None)
+        self.assertEqual(item.size, 0)
+        self.assertEqual(item.checkState(gui.LOCAL_SUBSCRIPTION_COL),
+                         gui.UNCHECKED)
+
+    def test_volume_id(self):
+        """The creation with only a volume_id."""
+        item = gui.FolderItem(volume_id='yadda')
+
+        self.assertEqual(item.text(gui.LOCAL_SUBSCRIPTION_COL), '')
+        self.assertEqual(item.text(gui.LOCAL_SPACE_COL), '')
+        self.assertEqual(item.path, None)
+        self.assertEqual(item.volume_id, 'yadda')
+        self.assertEqual(item.thread, None)
+        self.assertEqual(item.size, 0)
+        self.assertEqual(item.checkState(gui.LOCAL_SUBSCRIPTION_COL),
+                         gui.UNCHECKED)
+
+    def test_path_and_volume_id(self):
+        """The creation with only a volume_id."""
+        item = gui.FolderItem(path=self.path, volume_id='yadda')
+
+        self.assertEqual(item.text(gui.LOCAL_SUBSCRIPTION_COL), '')
+        self.assertEqual(item.text(gui.LOCAL_SPACE_COL), '')
+        self.assertEqual(item.path, self.path)
+        self.assertEqual(item.volume_id, 'yadda')
+        self.assertEqual(item.thread, None)
+        self.assertEqual(item.size, 0)
+        self.assertEqual(item.checkState(gui.LOCAL_SUBSCRIPTION_COL),
+                         gui.CHECKED)
+
+    def test_path_and_queue(self):
+        """The creation with only a volume_id."""
+        item = gui.FolderItem(path=self.path, queue=self.queue)
+
+        self.assertEqual(item.text(gui.LOCAL_SUBSCRIPTION_COL), '')
+        self.assertEqual(item.text(gui.LOCAL_SPACE_COL), '')
+        self.assertEqual(item.path, self.path)
+        self.assertEqual(item.volume_id, None)
+        self.assertEqual(item.thread, self.calculator)
+        self.assertEqual(item.size, None)
+        self.assertEqual(item.checkState(gui.LOCAL_SUBSCRIPTION_COL),
+                         gui.UNCHECKED)
+
+        self.assertTrue(self.calculator.started)
+
+
+class LocalFoldersPanelTestCase(UbuntuOneBinTestCase):
+    """Test suite for the LocalFoldersPanel widget."""
+
+    class_ui = gui.LocalFoldersPanel
+
+    # TODO: add the test suite (LP: #959690).

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py	2012-02-06 15:23:27 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py	2012-03-19 21:32:18 +0000
@@ -18,8 +18,6 @@
 
 """Tests for the GoToWebButton widget."""
 
-from twisted.internet import defer
-
 from ubuntuone.controlpanel.gui import qt
 from ubuntuone.controlpanel.gui.qt import gotoweb as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
@@ -32,9 +30,16 @@
 
     class_ui = gui.GoToWebButton
 
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(GoToWebButtonTestCase, self).setUp()
+    def test_uri_default(self):
+        """The uri uses the default."""
+        self.assertEqual(self.ui.uri, self.class_ui.uri)
+
+    def test_text_default(self):
+        """The text uses the default."""
+        if self.class_ui.legend is not None:
+            self.assertEqual(self.ui.text(), self.class_ui.legend)
+        else:
+            self.assertEqual(self.ui.text(), '')
 
     def test_uri_can_be_set(self):
         """The uri can be set."""
@@ -69,3 +74,17 @@
         self.ui.click()
 
         self.assertEqual(self._called, False)
+
+
+class GetStorageButtonTestCase(GoToWebButtonTestCase):
+    """The test suite for the GetStorageButton widget."""
+
+    class_ui = gui.GetStorageButton
+
+    def test_uri(self):
+        """The default uri is correct."""
+        self.assertEqual(self.ui.uri, gui.GET_STORAGE_LINK)
+
+    def test_text(self):
+        """The default legend is correct."""
+        self.assertEqual(self.ui.text(), gui.GET_MORE_STORAGE)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_wizard.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_wizard.py	2012-03-16 21:15:09 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_wizard.py	2012-03-19 21:32:18 +0000
@@ -110,10 +110,6 @@
     panel_class = gui.RemoteFoldersPanel
     sub_title = gui.CLOUD_TO_COMPUTER_SUBTITLE
 
-    def test_is_final(self):
-        """The page is not final."""
-        self.assertTrue(self.ui.isFinalPage())
-
     def test_folder_panel_shows_remote_folders_only(self):
         """The FolderPanel shows only remote folders."""
         self.assertTrue(self.ui.panel.remote_folders)
@@ -126,6 +122,19 @@
     panel_class = gui.PreferencesPanel
 
 
+class ComputerToCloudPageTestCase(UbuntuOnePageTestCase):
+    """Test the ComputerToCloudPage wizard page."""
+
+    class_ui = gui.ComputerToCloudPage
+    main_title = gui.COMPUTER_TO_CLOUD_TITLE
+    panel_class = gui.LocalFoldersPanel
+    sub_title = gui.COMPUTER_TO_CLOUD_SUBTITLE
+
+    def test_is_final(self):
+        """The page is not final."""
+        self.assertTrue(self.ui.isFinalPage())
+
+
 class UbuntuOneWizardTestCase(BaseTestCase):
     """Test the UbuntuOneWizard widget."""
 
@@ -266,16 +275,33 @@
 class UbuntuOneWizardCloudToComputerTestCase(UbuntuOneWizardSignInTestCase):
     """Test the CloudToComputerPage wizard page."""
 
-    buttons = {'FinishButton':
-               (None, 'finished', (gui.QtGui.QDialog.Accepted,))}
+    buttons = {'NextButton': (None, 'currentIdChanged', (3,))}
     page_name = 'cloud_folders'
     stage_name = 'folders'
 
+
+class UbuntuOneWizardSettingsTestCase(UbuntuOneWizardSignInTestCase):
+    """Test the CloudToComputerPage wizard page."""
+
+    buttons = {'BackButton': (None, 'currentIdChanged', (0,))}
+    page_name = 'settings'
+    stage_name = 'folders'
+
+
+class UbuntuOneWizardComputerToCloudTestCase(UbuntuOneWizardSignInTestCase):
+    """Test the CloudToComputerPage wizard page."""
+
+    buttons = {
+        'FinishButton': (None, 'finished', (gui.QtGui.QDialog.Accepted,)),
+        'BackButton': (None, 'currentIdChanged', (0,)),
+    }
+    page_name = 'local_folders'
+    stage_name = 'sync'
+
     def test_done_rejected(self):
         """When the wizard is closed on the final page, emit rejected."""
         self.ui.finished.connect(self._set_called)
 
-        self.ui._next_id = self.ui.pages[self.ui.cloud_folders_page]
         assert self.ui.page(self.ui.currentId()).isFinalPage()
         self.ui.done(gui.QtGui.QDialog.Rejected)
 
@@ -286,14 +312,6 @@
         # does not apply to this page
 
 
-class UbuntuOneWizardSettingsTestCase(UbuntuOneWizardSignInTestCase):
-    """Test the CloudToComputerPage wizard page."""
-
-    buttons = {'BackButton': (None, 'currentIdChanged', (0,))}
-    page_name = 'settings'
-    stage_name = 'folders'
-
-
 class UbuntuOneWizardLoginTestCase(UbuntuOneWizardTestCase):
     """Test the login through the wizard."""
 

=== modified file 'ubuntuone/controlpanel/gui/qt/wizard.py'
--- ubuntuone/controlpanel/gui/qt/wizard.py	2012-03-16 21:15:09 +0000
+++ ubuntuone/controlpanel/gui/qt/wizard.py	2012-03-19 21:32:18 +0000
@@ -34,10 +34,13 @@
     ARE_YOU_SURE_YES,
     CLOUD_TO_COMPUTER_SUBTITLE,
     CLOUD_TO_COMPUTER_TITLE,
+    COMPUTER_TO_CLOUD_SUBTITLE,
+    COMPUTER_TO_CLOUD_TITLE,
     UBUNTUONE_LINK,
 )
 from ubuntuone.controlpanel.gui.qt.folders import (
     RemoteFoldersPanel,
+    LocalFoldersPanel,
 )
 from ubuntuone.controlpanel.gui.qt.preferences import PreferencesPanel
 from ubuntuone.controlpanel.gui.qt.signin import SignInPanel
@@ -109,7 +112,6 @@
     main_title = CLOUD_TO_COMPUTER_TITLE
     panel_class = RemoteFoldersPanel
     sub_title = CLOUD_TO_COMPUTER_SUBTITLE
-    is_final = True
 
     def __init__(self, *args, **kwargs):
         super(CloudToComputerPage, self).__init__(*args, **kwargs)
@@ -122,6 +124,15 @@
     panel_class = PreferencesPanel
 
 
+class ComputerToCloudPage(UbuntuOnePage):
+    """The page to choose local folders to sync remotly."""
+
+    is_final = True
+    main_title = COMPUTER_TO_CLOUD_TITLE
+    panel_class = LocalFoldersPanel
+    sub_title = COMPUTER_TO_CLOUD_SUBTITLE
+
+
 class UbuntuOneWizard(cache.Cache, QtGui.QWizard):
     """The Ubuntu One wizard."""
 
@@ -160,6 +171,10 @@
         self.settings_page = SettingsPage()
         self.addPage(self.settings_page)
 
+        # computer to cloud
+        self.local_folders_page = ComputerToCloudPage()
+        self.addPage(self.local_folders_page)
+
         self._next_id = self.pages[self.signin_page]
         self.next()
 
@@ -187,16 +202,22 @@
             stage = self.side_widget.signin_stage
             self._next_id = self.pages[self.cloud_folders_page]
         elif page is self.cloud_folders_page:
-            button_layout = [self.Stretch, self.FinishButton]
+            button_layout = [self.Stretch, self.NextButton]
             button = self.cloud_folders_page.panel.ui.check_settings_button
-            button_to = self.button(self.FinishButton)
+            button_to = self.button(self.NextButton)
             stage = self.side_widget.folders_stage
+            self._next_id = self.pages[self.local_folders_page]
         elif page is self.settings_page:
-            button_layout = [self.BackButton, self.Stretch]
+            button_layout = [self.Stretch, self.BackButton]
             button = self.settings_page.panel.ui.apply_changes_button
             button_to = self.button(self.BackButton)
             stage = self.side_widget.folders_stage
             self._next_id = self.pages[self.cloud_folders_page]
+        elif page is self.local_folders_page:
+            button_layout = [self.Stretch, self.BackButton, self.FinishButton]
+            button = self.local_folders_page.panel.ui.add_folder_button
+            button_to = self.button(self.BackButton)
+            stage = self.side_widget.sync_stage
         else:
             logger.error('UbuntuOneWizard.initializePage was called with an'
                          'unknown page: %r (page_id was %r).', page, page_id)
@@ -217,7 +238,7 @@
         """Called clean up 'page_id' just before the user leaves it."""
         page = self.page(page_id)
         logger.debug('UbuntuOneWizard.cleanupPage: page is %r.', page)
-        if page is self.settings_page:
+        if page is self.settings_page or page is self.local_folders_page:
             self.initializePage(self.pages[self.cloud_folders_page])
 
     def nextId(self):
@@ -257,8 +278,13 @@
 
     def done(self, result):
         """The main window is being closed, call any custom callback."""
-        if (result == QtGui.QDialog.Rejected and
-            not self.page(self.currentId()).isFinalPage()):
+        if result == QtGui.QDialog.Accepted:
+            parent_done = super(UbuntuOneWizard, self).done
+            f = lambda: parent_done(QtGui.QDialog.Accepted)
+            self.local_folders_page.panel.changesApplied.connect(f)
+            # commit local_folders_page's changes
+            self.local_folders_page.panel.apply_changes()
+        elif not self.page(self.currentId()).isFinalPage():
             response = self.confirm_dialog.exec_()
             if response == QtGui.QDialog.Accepted:
                 logger.warning('UbuntuOneWizard: user canceled setup.')

=== modified file 'ubuntuone/controlpanel/tests/__init__.py'
--- ubuntuone/controlpanel/tests/__init__.py	2011-11-21 13:32:44 +0000
+++ ubuntuone/controlpanel/tests/__init__.py	2012-03-19 21:32:18 +0000
@@ -334,6 +334,15 @@
 ]
 
 
+class CustomError(Exception):
+    """Custom error for tests."""
+
+
+def helper_fail(*a, **kw):
+    """Helper to raise an exception, usually used when monkey-patching."""
+    raise CustomError((a, kw))
+
+
 class TestCase(BaseTestCase):
     """Basics for testing."""
 

=== modified file 'ubuntuone/controlpanel/tests/test_login_client.py'
--- ubuntuone/controlpanel/tests/test_login_client.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/tests/test_login_client.py	2012-03-19 21:32:18 +0000
@@ -21,11 +21,7 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel import login_client
-from ubuntuone.controlpanel.tests import TestCase, TOKEN
-
-
-class CustomError(Exception):
-    """Custom error for tests."""
+from ubuntuone.controlpanel.tests import CustomError, TestCase, TOKEN
 
 
 class FakedCredentialsManagementTool(object):

=== modified file 'ubuntuone/controlpanel/tests/test_sd_client.py'
--- ubuntuone/controlpanel/tests/test_sd_client.py	2012-01-26 13:16:17 +0000
+++ ubuntuone/controlpanel/tests/test_sd_client.py	2012-03-19 21:32:18 +0000
@@ -32,7 +32,7 @@
 from ubuntuone.syncdaemon.interaction_interfaces import bool_str
 
 from ubuntuone.controlpanel import sd_client
-from ubuntuone.controlpanel.tests import TestCase
+from ubuntuone.controlpanel.tests import CustomError, TestCase
 
 # Instance of 'SyncDaemonTool' has no 'foo' member
 # pylint: disable=E1101
@@ -41,10 +41,6 @@
 SAMPLE_LIMITS = {'upload': 999, 'download': 838}
 
 
-class CustomError(Exception):
-    """Custom error for tests."""
-
-
 class FakedSyncDaemonTool(object):
     """Fake the SyncDaemonTool."""