Merge lp:~nataliabidart/ubuntuone-control-panel/better-folder-mgmt into lp:ubuntuone-control-panel

[Natalia Bidart]

- Implementing a common ancestor for Control Panel's tabs to gracefully handle info processing and delays from the backend.

- Cloud folder creation process is now improved: new UDFs can not be nested, but can be a prefix of an existent folder (LP: #798964).

- Going back to using the system's SDTool, seems like DBus is not longer segfaulting (finger cross!).

DISCLAIMER: please ignore all the warnings that look like:

QLayout: Attempting to add QLayout "" to SomePanel "Form", which already has a layout

I know what casues them, I'm not sure how to fix them, I need our QT guru to teach me how to nest Ui_Forms better.

To test IRL, run:

DEBUG=True PYTHONPATH=. ./bin/ubuntuone-control-panel-qt

and go to the Cloud Folders tab. You should your REAL folder info (be careful when playing around!). You should try to add new folders inside an UDF, and also trying with a folder which has in its name the same prefix as an existent UDF (this last operation should succeed).

[Eric Casteleijn (thisfred)]

- Adding folder A/B/C and then adding folder A/B/C/D fails as it should and gives a nice error dialog.
- Adding folder A/B/C/D and then adding folder A/B/C fails, and shows this on the command line:

Failure: ubuntuone.platform.linux.tools.ErrorSignal: ('FolderCreateError', (dbus.Dictionary({dbus.String(u'path'): dbus.String(u'/home/eric/ogg/dominik_eulberg')}, signature=dbus.Signature('ss')), dbus.String(u'UDFs can not be nested')))

But after this everything on the Files tab remains greyed out for a long time, and then becomes reponsive again with no changes.

We should at least show a similar error message. (For a future version we could think about just adding the new UDF and removing all previous once that it contains, but that may be harder to explain than just disallowing it.)

I will approve this branch, (unless I find other problems) since it is quite big already, so the other case can be solved in a new one.

I've tested with folders sharing a prefix, but I don't see that being very useful, since all UDFs share a common prefix already (/home/$USER/), so I would assume this has always worked? Maybe I misunderstand the instruction.

[Eric Casteleijn (thisfred)]

+ 'Please choose a folder outside the existent cloud '
467 + 'folder "%(existent_folder_path)s".'

s/existent/existing/

review: Needs Fixing

[Eric Casteleijn (thisfred)]

in FoldersPanel.on_add_folder_button_clicked, this seems unnecessary and dangerous:

folder = unicode(folder)

This will take any 8-bit ascii string and make it into a unicode string with the same content, or return unmodified anything that is already a unicode string. Anything that is an encoded string with non-ascii characters will break it though.

Of course showing a path with an unknown encoding to the user will present challenges, but at least we should not error. So maybe use: unicode(folder, 'utf-8', 'replace'), but I have no idea if utf-8 is actually the default on Windows.

review: Needs Fixing

[Eric Casteleijn (thisfred)]

I see you test for unicode paths, but the trick is to test for encoded paths instead (or at least I think so, does the QT ui do the encoding for you? In that case, the unicode() call is still unnecessary.)

[Eric Casteleijn (thisfred)]

review: Approve

[Eric Casteleijn (thisfred)]

I will set this to approve, to not hold this up in case I'm not around to re-review, but please fix the last two concerns (or explain why I'm wrong about them ;)

[Natalia Bidart (nataliabidart)]

> I see you test for unicode paths, but the trick is to test for encoded paths
> instead (or at least I think so, does the QT ui do the encoding for you? In
> that case, the unicode() call is still unnecessary.)

Qt returns a Qstring, which does not support any of the string/unicode methods from the python standard lib. So we need to cast explicitly to unicode() in order to operate with them.

But since you pointed this out, I went to the doc again and I realized I should do a better string management (http://doc.qt.nokia.com/latest/qstring.html#converting-between-8-bit-strings-and-unicode-strings). I'll fix.

[Natalia Bidart (nataliabidart)]

> + 'Please choose a folder outside the existent cloud '
> 467 + 'folder "%(existent_folder_path)s".'
>
> s/existent/existing/

Fixed!

[Natalia Bidart (nataliabidart)]

> - Adding folder A/B/C and then adding folder A/B/C/D fails as it should and
> gives a nice error dialog.
> - Adding folder A/B/C/D and then adding folder A/B/C fails, and shows this on
> the command line:
>
> Failure: ubuntuone.platform.linux.tools.ErrorSignal: ('FolderCreateError',
> (dbus.Dictionary({dbus.String(u'path'):
> dbus.String(u'/home/eric/ogg/dominik_eulberg')},
> signature=dbus.Signature('ss')), dbus.String(u'UDFs can not be nested')))
>
> But after this everything on the Files tab remains greyed out for a long time,
> and then becomes reponsive again with no changes.
>
> We should at least show a similar error message. (For a future version we
> could think about just adding the new UDF and removing all previous once that
> it contains, but that may be harder to explain than just disallowing it.)
>
> I will approve this branch, (unless I find other problems) since it is quite
> big already, so the other case can be solved in a new one.

Thanks. I opened bug #800161 to track this.

> I've tested with folders sharing a prefix, but I don't see that being very
> useful, since all UDFs share a common prefix already (/home/$USER/), so I
> would assume this has always worked? Maybe I misunderstand the instruction.

Is very common to make the mistake of not adding the path separator to a path when checking if one oath is prefix of the other, so what I meant was:

having a UDF called A/B, try to create a new one in A/B1. The first version of this branch will no allow it ;-) (but this final version does, and has tests for that).

[Natalia Bidart (nataliabidart)]

> > I see you test for unicode paths, but the trick is to test for encoded paths
> > instead (or at least I think so, does the QT ui do the encoding for you? In
> > that case, the unicode() call is still unnecessary.)
>
> Qt returns a Qstring, which does not support any of the string/unicode methods
> from the python standard lib. So we need to cast explicitly to unicode() in
> order to operate with them.
>
> But since you pointed this out, I went to the doc again and I realized I
> should do a better string management
> (http://doc.qt.nokia.com/latest/qstring.html#converting-between-8-bit-strings-
> and-unicode-strings). I'll fix.

Reading the doc in detail, seems like a QString is already handling all the needed encoding/decoding. As you can see from a run:

PyQt4.QtCore.QString(u'/home/nessita/\xf1o\xf1o \xf1and\xfa')

but I do need to extract the unicode inside the QString, since that is what the backend expects. Does it make sense?

[Eric Casteleijn (thisfred)]

It does, but here you're passing in a unicode string, what happens if you pass in an encoded string (which I'm pretty sure you can get from the filesystem.)

PyQt4.QtCore.QString(u'/home/nessita/\xf1o\xf1o \xf1and\xfa'.encode('utf-8'))

[Roberto Alsina (ralsina)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~nataliabidart/ubuntuone-control-panel/better-folder-mgmt into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

running build
Compiled data/qt/device.ui into ubuntuone/controlpanel/gui/qt/ui/device_ui.py
Compiled data/qt/mainwindow.ui into ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py
Compiled data/qt/filesyncstatus.ui into ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py
Compiled data/qt/folders.ui into ubuntuone/controlpanel/gui/qt/ui/folders_ui.py
Compiled data/qt/devices.ui into ubuntuone/controlpanel/gui/qt/ui/devices_ui.py
Compiled data/qt/preferences.ui into ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py
compiled data/qt/images.qrc into ubuntuone/controlpanel/gui/qt/ui/images_rc.py
Compiled data/qt/ubuntuonebin.ui into ubuntuone/controlpanel/gui/qt/ui/ubuntuonebin_ui.py
Compiled data/qt/services.ui into ubuntuone/controlpanel/gui/qt/ui/services_ui.py
Compiled data/qt/controlpanel.ui into ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py
Compiled data/qt/profile.ui into ubuntuone/controlpanel/gui/qt/ui/profile_ui.py
running build_py
creating build
creating build/lib.linux-i686-2.7
creating build/lib.linux-i686-2.7/ubuntuone
copying ubuntuone/__init__.py -> build/lib.linux-i686-2.7/ubuntuone
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/replication_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/utils.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/login_client.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/dbus_service.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/backend.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
copying ubuntuone/controlpanel/logger.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
copying ubuntuone/controlpanel/gui/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/package_manager.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/widgets.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
copying ubuntuone/controlpanel/gui/gtk/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/gtk
creating build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/__init__.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/ubuntuonebin.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/gui.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/controlpanel/gui/qt/controlpanel.py -> build/lib.linux-i686-2.7/ubuntuone/controlpanel/gui/qt
copying ubuntuone/co...

[lp:~nataliabidart/ubuntuone-control-panel/better-folder-mgmt]

174. By Natalia Bidart on 2011-06-21

Why lint why!

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2011-06-02 15:49:20 +0000
+++ data/qt/controlpanel.ui	2011-06-21 16:31:15 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>646</width>
-    <height>487</height>
+    <width>374</width>
+    <height>172</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

=== modified file 'data/qt/device.ui'
--- data/qt/device.ui	2011-06-02 15:48:25 +0000
+++ data/qt/device.ui	2011-06-21 16:31:15 +0000
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>

=== modified file 'data/qt/devices.ui'
--- data/qt/devices.ui	2011-06-02 15:30:51 +0000
+++ data/qt/devices.ui	2011-06-21 16:31:15 +0000
@@ -6,22 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>702</width>
-    <height>434</height>
+    <width>558</width>
+    <height>156</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="tab_header_label">
-     <property name="text">
-      <string>All cloud connected devices</string>
-     </property>
-    </widget>
-   </item>
-   <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="verticalScrollBarPolicy">
       <enum>Qt::ScrollBarAlwaysOn</enum>
@@ -37,8 +30,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>669</width>
-        <height>391</height>
+        <width>535</width>
+        <height>136</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout_2">

=== modified file 'data/qt/filesyncstatus.ui'
--- data/qt/filesyncstatus.ui	2011-05-26 22:18:04 +0000
+++ data/qt/filesyncstatus.ui	2011-06-21 16:31:15 +0000
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <item>

=== modified file 'data/qt/folders.ui'
--- data/qt/folders.ui	2011-06-01 18:10:22 +0000
+++ data/qt/folders.ui	2011-06-21 16:31:15 +0000
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2011-06-16 18:18:23 +0000
+++ data/qt/preferences.ui	2011-06-21 16:31:15 +0000
@@ -6,98 +6,92 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>737</width>
-    <height>481</height>
+    <width>469</width>
+    <height>352</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="verticalGroupBox">
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
-       <widget class="QGroupBox" name="groupBox">
-        <property name="title">
-         <string>Bandwidth settings</string>
-        </property>
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="0" column="0">
-          <widget class="QCheckBox" name="limit_uploads_checkbox">
-           <property name="text">
-            <string>Limit upload speed to</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QSpinBox" name="upload_speed_spinbox">
-           <property name="minimum">
-            <number>-1</number>
-           </property>
-           <property name="maximum">
-            <number>999999999</number>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="2">
-          <widget class="QLabel" name="kbps_label_1">
-           <property name="text">
-            <string>Kilobits per second</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="0">
-          <widget class="QCheckBox" name="limit_downloads_checkbox">
-           <property name="text">
-            <string>Limit download speed to</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QSpinBox" name="download_speed_spinbox">
-           <property name="minimum">
-            <number>-1</number>
-           </property>
-           <property name="maximum">
-            <number>999999999</number>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="2">
-          <widget class="QLabel" name="kbps_label_2">
-           <property name="text">
-            <string>Kilobits per second</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="3">
-          <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>
-         <item row="3" column="0" colspan="3">
-          <widget class="QLabel" name="label_2">
-           <property name="text">
-            <string>Please note that your files will not sync if you set bandwidth to 0</string>
-           </property>
-           <property name="scaledContents">
-            <bool>false</bool>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-        </layout>
+     <property name="title">
+      <string>Bandwidth settings</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="limit_uploads_checkbox">
+        <property name="text">
+         <string>Limit upload speed to</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="upload_speed_spinbox">
+        <property name="minimum">
+         <number>-1</number>
+        </property>
+        <property name="maximum">
+         <number>999999999</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="kbps_label_1">
+        <property name="text">
+         <string>Kilobits per second</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QCheckBox" name="limit_downloads_checkbox">
+        <property name="text">
+         <string>Limit download speed to</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QSpinBox" name="download_speed_spinbox">
+        <property name="minimum">
+         <number>-1</number>
+        </property>
+        <property name="maximum">
+         <number>999999999</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QLabel" name="kbps_label_2">
+        <property name="text">
+         <string>Kilobits per second</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <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>
+      <item row="3" column="0" colspan="3">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Please note that your files will not sync if you set bandwidth to 0</string>
+        </property>
+        <property name="scaledContents">
+         <bool>false</bool>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
        </widget>
       </item>
      </layout>
@@ -108,7 +102,7 @@
      <property name="title">
       <string>File Sync Settings</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
+     <layout class="QVBoxLayout" name="verticalLayout_1">
       <item>
        <widget class="QCheckBox" name="autoconnect_checkbox">
         <property name="text">
@@ -179,7 +173,7 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>152</height>
+       <height>40</height>
       </size>
      </property>
     </spacer>

=== modified file 'data/qt/profile.ui'
--- data/qt/profile.ui	2011-06-16 19:49:43 +0000
+++ data/qt/profile.ui	2011-06-21 16:31:15 +0000
@@ -6,12 +6,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>704</width>
-    <height>449</height>
+    <width>456</width>
+    <height>189</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

=== modified file 'data/qt/services.ui'
--- data/qt/services.ui	2011-05-28 06:16:06 +0000
+++ data/qt/services.ui	2011-06-21 16:31:15 +0000
@@ -6,22 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>636</width>
-    <height>478</height>
+    <width>341</width>
+    <height>248</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="tab_header_label">
-     <property name="text">
-      <string>Selected plans and storage</string>
-     </property>
-    </widget>
-   </item>
-   <item>
     <layout class="QVBoxLayout" name="mobile_plan_verticallayout">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
@@ -108,22 +101,6 @@
     </layout>
    </item>
    <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Preferred</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
     <layout class="QVBoxLayout" name="storage_plan_verticallayout">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_3">

=== added file 'data/qt/ubuntuonebin.ui'
--- data/qt/ubuntuonebin.ui	1970-01-01 00:00:00 +0000
+++ data/qt/ubuntuonebin.ui	2011-06-21 16:31:15 +0000
@@ -0,0 +1,64 @@
+<?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>248</width>
+    <height>59</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="title_label">
+       <property name="text">
+        <string notr="true">The Panel Title</string>
+       </property>
+      </widget>
+     </item>
+     <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="QProgressBar" name="spinner">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximum">
+        <number>0</number>
+       </property>
+       <property name="value">
+        <number>-1</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QWidget" name="container" native="true"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2011-06-17 20:08:02 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2011-06-21 16:31:15 +0000
@@ -59,6 +59,7 @@
 
 CONTACTS_LINK = UBUNTUONE_LINK
 EDIT_ACCOUNT_LINK = UBUNTUONE_LINK + 'account/'
+EDIT_DEVICES_LINK = EDIT_ACCOUNT_LINK + 'machines/'
 EDIT_PROFILE_LINK = 'https://login.ubuntu.com/'
 LEARN_MORE_LINK = UBUNTUONE_LINK
 MANAGE_FILES_LINK = UBUNTUONE_LINK + 'files/'
@@ -89,6 +90,10 @@
                         '\n\n'
                         'Please choose a folder inside your "%(home_folder)s" '
                         'directory.')
+FOLDER_NESTED_PATH = _('The chosen directory "%(folder_path)s" is not valid. '
+                       '\n\n'
+                       'Please choose a folder outside the existing cloud '
+                       'folder "%(existent_folder_path)s".')
 FOLDERS_CONFIRM_MERGE = _('The contents of your cloud folder will be merged '
                           'with your local folder "%(folder_path)s" when '
                           'subscribing.\nDo you want to subscribe to this '

=== modified file 'ubuntuone/controlpanel/gui/qt/devices.py'
--- ubuntuone/controlpanel/gui/qt/devices.py	2011-06-02 19:55:45 +0000
+++ ubuntuone/controlpanel/gui/qt/devices.py	2011-06-21 16:31:15 +0000
@@ -18,20 +18,29 @@
 
 """The user interface for the control panel for Ubuntu One."""
 
-from PyQt4 import QtGui
-
+from gettext import gettext as _
+
+# Unused import QtGui
+# pylint: disable=W0611
+from PyQt4 import QtGui, QtCore
+# pylint: enable=W0611
+
+from ubuntuone.controlpanel.gui import EDIT_DEVICES_LINK
+from ubuntuone.controlpanel.gui.qt import uri_hook
 from ubuntuone.controlpanel.gui.qt.ui import devices_ui
+from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.device import DeviceWidget
 
 
-class DevicesPanel(QtGui.QWidget):
+class DevicesPanel(UbuntuOneBin):
     """The DevicesFolders Tab Panel widget"""
 
-    def __init__(self, *args):
-        """Initialize the UI of the widget."""
-        QtGui.QWidget.__init__(self, *args)
-        self.ui = devices_ui.Ui_Form()
-        self.ui.setupUi(self)
+    title = _('All cloud-connected devices')
+    ui_class = devices_ui
+
+    def load(self):
+        """Load info."""
+        # request devices info
 
     def update_local_device(self, device_info):
         """Update the info for the local device."""
@@ -54,3 +63,8 @@
         """Update the list of devices in this panel."""
         for device_info in devices_info:
             self.update_device_info(device_info)
+
+    @QtCore.pyqtSlot()
+    def on_manage_devices_button_clicked(self):
+        """The storage plan modify button was clicked."""
+        uri_hook(EDIT_DEVICES_LINK)

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2011-06-17 21:11:45 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2011-06-21 16:31:15 +0000
@@ -25,7 +25,6 @@
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
 
-from ubuntuone.controlpanel import backend
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
     ALWAYS_SUBSCRIBED,
@@ -34,6 +33,7 @@
     FILE_URI_PREFIX,
     FOLDER_ICON_NAME,
     FOLDER_INVALID_PATH,
+    FOLDER_NESTED_PATH,
     FOLDERS_CONFIRM_MERGE,
     KILOBYTES,
     MANAGE_FILES_LINK,
@@ -47,6 +47,7 @@
     SHARES_MIN_SIZE_FULL,
 )
 from ubuntuone.controlpanel.gui.qt import uri_hook
+from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import folders_ui
 
 
@@ -68,17 +69,22 @@
 YES = QtGui.QMessageBox.Yes
 
 
-class FoldersPanel(QtGui.QWidget):
+def append_path_sep(path):
+    """If 'path' does not end with the path separator, append it."""
+    if not path.endswith(os.path.sep):
+        path += os.path.sep
+    return path
+
+
+class FoldersPanel(UbuntuOneBin):
     """The Folders Tab Panel widget"""
 
-    def __init__(self, *args):
+    ui_class = folders_ui
+
+    def __init__(self, *args, **kwargs):
         """Initialize the UI of the widget."""
-        QtGui.QWidget.__init__(self, *args)
-        self.ui = folders_ui.Ui_Form()
-        self.ui.setupUi(self)
-
-        self.is_processing = False
-        self.backend = backend.ControlBackend()
+        super(FoldersPanel, self).__init__(*args, **kwargs)
+        self._backend_folders = None
         logger.debug('%s: started.', self.__class__.__name__)
 
     # Invalid name "showEvent"
@@ -89,9 +95,7 @@
         headers = self.ui.folders.header()
         headers.setResizeMode(FOLDER_NAME_COL, headers.Stretch)
         headers.setResizeMode(SUBSCRIPTION_COL, headers.ResizeToContents)
-
-        self.load()
-        event.accept()
+        super(FoldersPanel, self).showEvent(event)
 
     @defer.inlineCallbacks
     def load(self):
@@ -127,6 +131,7 @@
     def process_folders(self, info):
         """Load folders info into the tree view."""
         self.ui.folders.clear()
+        self._backend_folders = []
         self.is_processing = False
 
         if not info:
@@ -170,6 +175,7 @@
                 child = QtGui.QTreeWidgetItem()
                 child.volume_path = volume['path']
                 child.volume_id = volume['volume_id']
+                self._backend_folders.append(append_path_sep(volume['path']))
 
                 name = self._process_name(volume[u'display_name'])
                 icon_name = FOLDER_ICON_NAME
@@ -267,19 +273,31 @@
     @defer.inlineCallbacks
     def on_add_folder_button_clicked(self):
         """The 'Sync another folder' button was clicked."""
-        user_home = os.path.expanduser('~')
+        user_home = append_path_sep(os.path.expanduser('~'))
         folder = QtGui.QFileDialog.getExistingDirectory(parent=self,
                                                         directory=user_home)
+        folder = unicode(folder)
         logger.debug('on_add_folder_button_clicked: user requested folder '
                      'creation for path %r', folder)
         if folder == '':
             return
 
+        folder = append_path_sep(folder)
+
         # handle folder path not within '~'
-        if not folder.startsWith(user_home):  # folder is a QString
+        if not folder.startswith(user_home):
             text = FOLDER_INVALID_PATH % {'folder_path': folder,
                                           'home_folder': user_home}
             QtGui.QMessageBox.warning(self, '', text, CLOSE)
+            return
+
+        # handle folder path inside an existent cloud folder
+        inside_udf = filter(folder.startswith, self._backend_folders)
+        if inside_udf:
+            text = FOLDER_NESTED_PATH % {'folder_path': folder,
+                                         'existent_folder_path': inside_udf[0]}
+            QtGui.QMessageBox.warning(self, '', text, CLOSE)
+            return
 
         self.is_processing = True
         yield self.backend.create_folder(folder_path=folder)

=== modified file 'ubuntuone/controlpanel/gui/qt/main/linux.py'
--- ubuntuone/controlpanel/gui/qt/main/linux.py	2011-06-20 01:46:29 +0000
+++ ubuntuone/controlpanel/gui/qt/main/linux.py	2011-06-21 16:31:15 +0000
@@ -149,7 +149,7 @@
             subprocess.Popen(('u1sdtool', '--unsubscribe-folder', folder_id))
 
     from ubuntuone.platform.linux import tools
-    tools.SyncDaemonTool = SDTool
+    #tools.SyncDaemonTool = SDTool
 
     # pylint believes that reactor has no run nor stop methods. Silence it.
     # pylint: disable=E1101

=== modified file 'ubuntuone/controlpanel/gui/qt/preferences.py'
--- ubuntuone/controlpanel/gui/qt/preferences.py	2011-06-17 20:08:02 +0000
+++ ubuntuone/controlpanel/gui/qt/preferences.py	2011-06-21 16:31:15 +0000
@@ -18,14 +18,19 @@
 
 """The user interface for the control panel for Ubuntu One."""
 
+# Unused import QtGui
+# pylint: disable=W0611
 from PyQt4 import QtGui, QtCore
+# pylint: enable=W0611
 from twisted.internet import defer
 
 from ubuntuone.controlpanel import backend
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import KILOBYTES
+from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import preferences_ui
 
+
 logger = setup_logging('qt.preferences')
 
 CHECKED = QtCore.Qt.Checked
@@ -37,25 +42,10 @@
     return CHECKED if checked else UNCHECKED
 
 
-class PreferencesPanel(QtGui.QWidget):
+class PreferencesPanel(UbuntuOneBin):
     """The Preferences Tab Panel widget"""
 
-    def __init__(self, *args):
-        """Initialize the UI of the widget."""
-        QtGui.QWidget.__init__(self, *args)
-        self.ui = preferences_ui.Ui_Form()
-        self.ui.setupUi(self)
-
-        self.backend = backend.ControlBackend()
-        logger.debug('%s: started.', self.__class__.__name__)
-
-    # Invalid name "showEvent"
-    # pylint: disable=C0103
-
-    def showEvent(self, event):
-        """Load info."""
-        self.load()
-        event.accept()
+    ui_class = preferences_ui
 
     @defer.inlineCallbacks
     def load(self):
@@ -93,6 +83,9 @@
         else:
             checkbox.setCheckState(CHECKED)
 
+    # Invalid name "on_{down, up}load_speed_spinbox_valueChanged"
+    # pylint: disable=C0103
+
     @QtCore.pyqtSlot(int)
     def on_download_speed_spinbox_valueChanged(self, new_value):
         """A new download speed was set."""

=== modified file 'ubuntuone/controlpanel/gui/qt/profile.py'
--- ubuntuone/controlpanel/gui/qt/profile.py	2011-06-16 19:49:43 +0000
+++ ubuntuone/controlpanel/gui/qt/profile.py	2011-06-21 16:31:15 +0000
@@ -18,21 +18,25 @@
 
 """The user interface for the control panel for Ubuntu One."""
 
+# Unused import QtGui
+# pylint: disable=W0611
 from PyQt4 import QtGui, QtCore
+# pylint: enable=W0611
 
 from ubuntuone.controlpanel.gui import EDIT_PROFILE_LINK
 from ubuntuone.controlpanel.gui.qt import uri_hook
+from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import profile_ui
 
 
-class ProfilePanel(QtGui.QWidget):
+class ProfilePanel(UbuntuOneBin):
     """The Profile Tab Panel widget"""
 
-    def __init__(self, *args):
-        """Initialize the UI of the widget."""
-        QtGui.QWidget.__init__(self, *args)
-        self.ui = profile_ui.Ui_Form()
-        self.ui.setupUi(self)
+    ui_class = profile_ui
+
+    def load(self):
+        """Load info."""
+        # request account info
 
     def update_account_info(self, account_info):
         """Update the widgets with the account info."""

=== modified file 'ubuntuone/controlpanel/gui/qt/services.py'
--- ubuntuone/controlpanel/gui/qt/services.py	2011-06-16 19:49:43 +0000
+++ ubuntuone/controlpanel/gui/qt/services.py	2011-06-21 16:31:15 +0000
@@ -18,21 +18,28 @@
 
 """The user interface for the control panel for Ubuntu One."""
 
+from gettext import gettext as _
+
+# Unused import QtGui
+# pylint: disable=W0611
 from PyQt4 import QtGui, QtCore
+# pylint: enable=W0611
 
 from ubuntuone.controlpanel.gui import EDIT_ACCOUNT_LINK
 from ubuntuone.controlpanel.gui.qt import uri_hook
+from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import services_ui
 
 
-class ServicesPanel(QtGui.QWidget):
+class ServicesPanel(UbuntuOneBin):
     """The ServicesFolders Tab Panel widget"""
 
-    def __init__(self, *args):
-        """Initialize the UI of the widget."""
-        QtGui.QWidget.__init__(self, *args)
-        self.ui = services_ui.Ui_Form()
-        self.ui.setupUi(self)
+    title = _('Selected plans and storage')
+    ui_class = services_ui
+
+    def load(self):
+        """Load info."""
+        # request account info
 
     def update_account_info(self, account_info):
         """Update the widgets with the account info."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2011-06-17 20:08:02 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2011-06-21 16:31:15 +0000
@@ -67,9 +67,7 @@
 
     def inner(instance):
         """Skip a test if is an abstract class."""
-        abstract = any(i is None for i in (instance.innerclass_ui,
-                                           instance.innerclass_name,
-                                           instance.class_ui))
+        abstract = instance.class_ui is None
         result = None
         if not abstract:
             result = test(instance)
@@ -172,9 +170,10 @@
         self.assertIn(method_name, self.ui.backend._called)
         self.assertEqual(self.ui.backend._called[method_name], (args, kwargs))
 
-    @skip_if_abstract_class
     def test_init_loads_ui(self):
         """The __init__ method loads the ui."""
+        if self.innerclass_ui is None:
+            return
         self.patch(self.innerclass_ui, self.innerclass_name, FakeUi)
         # pylint: disable=E1102
         self.ui = self.class_ui(**self.kwargs)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_devices.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2011-06-02 19:55:45 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2011-06-21 16:31:15 +0000
@@ -19,17 +19,31 @@
 """Tests for the devices tab."""
 
 from ubuntuone.controlpanel.gui.qt import devices as gui
-from ubuntuone.controlpanel.gui.qt.tests import (BaseTestCase,
-    SAMPLE_DEVICES_INFO)
-
-
-class DevicesPanelTestCase(BaseTestCase):
+from ubuntuone.controlpanel.gui.qt.tests import (
+    SAMPLE_DEVICES_INFO,
+)
+from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
+    UbuntuOneBinTestCase,
+)
+
+
+class DevicesPanelTestCase(UbuntuOneBinTestCase):
     """Test the qt control panel."""
 
     innerclass_ui = gui.devices_ui
     innerclass_name = "Ui_Form"
     class_ui = gui.DevicesPanel
 
+    def test_is_processing_while_asking_info(self):
+        """The ui is processing while the contents are loaded."""
+        def check():
+            """The ui must be is_processing."""
+            self.assertTrue(self.ui.is_processing, 'ui must be processing')
+
+        self.patch(self.ui.backend, 'devices_info', check)
+
+        return self.ui.load()  # trigger the info request
+
     def test_update_devices_info(self):
         """The widget is updated with the info."""
         container = self.ui.ui.devices_list_verticallayout
@@ -38,3 +52,10 @@
         expected_name = SAMPLE_DEVICES_INFO[0]["name"]
         self.assertEqual(self.ui.ui.device_name_label.text(), expected_name)
         self.assertEqual(container.count(), len(SAMPLE_DEVICES_INFO) - 1)
+
+    def test_manage_devices_button(self):
+        """Clicking the manage devices button opens the proper url."""
+        self.patch(gui, 'uri_hook', self._set_called)
+        self.ui.ui.manage_devices_button.click()
+
+        self.assertEqual(self._called, ((gui.EDIT_DEVICES_LINK,), {}))

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-06-17 21:11:45 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-06-21 16:31:15 +0000
@@ -25,59 +25,63 @@
 from twisted.internet import defer
 from ubuntuone.devtools.handlers import MementoHandler
 
-from ubuntuone.controlpanel.gui.qt import folders as gui
-from ubuntuone.controlpanel.gui.qt.tests import (
-    BaseTestCase, FakedConfirmDialog, FakedFileDialog,
-)
 from ubuntuone.controlpanel.gui.tests import (
     FAKE_VOLUMES_INFO,
     FAKE_VOLUMES_MINIMAL_INFO,
     FAKE_VOLUMES_NO_FREE_SPACE_INFO,
     MUSIC_FOLDER, ROOT, USER_HOME,
 )
+from ubuntuone.controlpanel.gui.qt import folders as gui
+from ubuntuone.controlpanel.gui.qt.tests import (
+    FakedConfirmDialog, FakedFileDialog,
+)
+from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
+    UbuntuOneBinTestCase,
+)
 
 
 # Access to a protected member
-# pylint: disable=W0212
-
-
-class FoldersPanelTestCase(BaseTestCase):
+# Instance of 'ControlBackend' has no '_called' member
+# pylint: disable=W0212, E1103
+
+
+class FoldersPanelTestCase(UbuntuOneBinTestCase):
     """Test the qt cloud folders tab."""
 
     innerclass_ui = gui.folders_ui
     innerclass_name = "Ui_Form"
     class_ui = gui.FoldersPanel
 
+    @defer.inlineCallbacks
     def setUp(self):
-        super(FoldersPanelTestCase, self).setUp()
+        yield super(FoldersPanelTestCase, self).setUp()
         self.memento = MementoHandler()
         self.memento.setLevel(logging.DEBUG)
         gui.logger.addHandler(self.memento)
 
-    def test_backend(self):
-        """Backend is created."""
-        self.assertIsInstance(self.ui.backend,
-                              gui.backend.ControlBackend)
+        old_home = os.environ['HOME']
+        os.environ['HOME'] = USER_HOME
+        self.addCleanup(lambda: os.environ.__setitem__('HOME', old_home))
 
 
 class FoldersPanelVolumesInfoTestCase(FoldersPanelTestCase):
     """Test the qt cloud folders tab."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        super(FoldersPanelVolumesInfoTestCase, self).setUp()
-        return self.ui.load()
+        yield super(FoldersPanelVolumesInfoTestCase, self).setUp()
+        yield self.ui.load()
 
     @defer.inlineCallbacks
-    def test_is_processing_before_asking_volume_info(self):
-        """The ui is processing when contents are load."""
+    def test_is_processing_while_asking_info(self):
+        """The ui is processing while the contents are loaded."""
         def check():
             """The ui must be is_processing."""
-            # the ui is processing
             self.assertTrue(self.ui.is_processing, 'ui must be processing')
 
         self.patch(self.ui.backend, 'volumes_info', check)
 
-        yield self.ui.load()  # trigger the volumes_info request
+        yield self.ui.load()  # trigger the info request
 
     def test_is_not_processing_after_info_ready(self):
         """The ui is not processing when contents are load."""
@@ -312,11 +316,12 @@
         self.assertEqual(self._called, ((gui.MANAGE_FILES_LINK,), {}))
 
 
-class FoldersPanelFolderCreateTestCase(FoldersPanelTestCase):
+class FoldersPanelAddFolderTestCase(FoldersPanelTestCase):
     """The test suite for the folder creation from a local dir."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        super(FoldersPanelFolderCreateTestCase, self).setUp()
+        yield super(FoldersPanelAddFolderTestCase, self).setUp()
         # simulate volumes info properly processed
         self.ui.process_folders([])
         # reset backend state
@@ -343,9 +348,9 @@
         yield self.ui.ui.add_folder_button.click()
 
         self.assertEqual(FakedFileDialog.args, ())
+        user_home = gui.append_path_sep(os.path.expanduser('~'))
         self.assertEqual(FakedFileDialog.kwargs,
-                         {'parent': self.ui,
-                          'directory': os.path.expanduser('~')})
+                         {'parent': self.ui, 'directory': user_home})
 
     @defer.inlineCallbacks
     def test_does_nothing_if_user_closes_file_chooser(self):
@@ -367,11 +372,90 @@
         FakedFileDialog.response = gui.QtCore.QString(outside_home)
         yield self.ui.ui.add_folder_button.click()
 
-        msg = gui.FOLDER_INVALID_PATH % {'folder_path': outside_home,
-                                         'home_folder': user_home}
-        self.assertEqual(FakedConfirmDialog.args,
-                         (self.ui, '', msg, gui.CLOSE))
-        self.assertEqual(FakedConfirmDialog.kwargs, {})
+        args = {'folder_path': gui.append_path_sep(outside_home),
+                'home_folder': gui.append_path_sep(user_home)}
+        msg = gui.FOLDER_INVALID_PATH % args
+        self.assertEqual(FakedConfirmDialog.args,
+                         (self.ui, '', msg, gui.CLOSE))
+        self.assertEqual(FakedConfirmDialog.kwargs, {})
+        # the backend was not called
+        self.assertEqual(self.ui.backend._called, {})
+
+    @defer.inlineCallbacks
+    def test_opens_warning_if_folder_inside_root(self):
+        """If the user chooses a folder inside the root, show a warning."""
+        self.ui.process_folders(FAKE_VOLUMES_MINIMAL_INFO)
+        root_path = ROOT['path']
+        # create a valid path inside the root
+        inside_root = os.path.abspath(os.path.join(root_path, 'test'))
+        FakedFileDialog.response = gui.QtCore.QString(inside_root)
+        yield self.ui.ui.add_folder_button.click()
+
+        args = {'folder_path': gui.append_path_sep(inside_root),
+                'existent_folder_path': gui.append_path_sep(root_path)}
+        msg = gui.FOLDER_NESTED_PATH % args
+        self.assertEqual(FakedConfirmDialog.args,
+                         (self.ui, '', msg, gui.CLOSE))
+        self.assertEqual(FakedConfirmDialog.kwargs, {})
+        # the backend was not called
+        self.assertEqual(self.ui.backend._called, {})
+
+    @defer.inlineCallbacks
+    def test_opens_warning_if_folder_inside_an_udf(self):
+        """If the user chooses a folder inside an UDF, show a warning."""
+        self.ui.process_folders(FAKE_VOLUMES_MINIMAL_INFO)
+        udf_path = MUSIC_FOLDER['path']
+        # create a valid path inside an existing UDF
+        inside_udf = os.path.abspath(os.path.join(udf_path, 'test'))
+        FakedFileDialog.response = gui.QtCore.QString(inside_udf)
+        yield self.ui.ui.add_folder_button.click()
+
+        args = {'folder_path': gui.append_path_sep(inside_udf),
+                'existent_folder_path': gui.append_path_sep(udf_path)}
+        msg = gui.FOLDER_NESTED_PATH % args
+        self.assertEqual(FakedConfirmDialog.args,
+                         (self.ui, '', msg, gui.CLOSE))
+        self.assertEqual(FakedConfirmDialog.kwargs, {})
+        # the backend was not called
+        self.assertEqual(self.ui.backend._called, {})
+
+    @defer.inlineCallbacks
+    def test_no_warning_if_folder_is_prefix_from_a_udf(self):
+        """Test proper displaying of warning messages.
+
+        If the user chooses a folder with the same prefix as an UDF, but
+        outside every UDF, do not show a warning and call backend.
+
+        """
+        self.ui.process_folders(FAKE_VOLUMES_MINIMAL_INFO)
+        tricky_path = ROOT['path']
+        assert not tricky_path.endswith(os.path.sep)
+        tricky_path += ' Suffix'
+        assert tricky_path.startswith(ROOT['path'])
+
+        FakedFileDialog.response = gui.QtCore.QString(tricky_path)
+        yield self.ui.ui.add_folder_button.click()
+
+        # no warning
+        self.assertEqual(FakedConfirmDialog.args, None)
+        self.assertEqual(FakedConfirmDialog.kwargs, None)
+        # backend called
+        tricky_path = gui.append_path_sep(tricky_path)
+        self.assert_backend_called('create_folder', folder_path=tricky_path)
+
+    @defer.inlineCallbacks
+    def test_handles_unicode_paths(self):
+        """Unicode paths are properly handled."""
+        folder = os.path.join(os.path.expanduser('~'), u'ñoño ñandú ❤')
+        FakedFileDialog.response = gui.QtCore.QString(folder)
+        yield self.ui.ui.add_folder_button.click()
+
+        # no warning
+        self.assertEqual(FakedConfirmDialog.args, None)
+        self.assertEqual(FakedConfirmDialog.kwargs, None)
+        # backend called
+        folder = gui.append_path_sep(folder)
+        self.assert_backend_called('create_folder', folder_path=folder)
 
     @defer.inlineCallbacks
     def test_calls_backend(self):
@@ -380,6 +464,11 @@
         FakedFileDialog.response = gui.QtCore.QString(folder)
         yield self.ui.ui.add_folder_button.click()
 
+        # no warning
+        self.assertEqual(FakedConfirmDialog.args, None)
+        self.assertEqual(FakedConfirmDialog.kwargs, None)
+        # backend called
+        folder = gui.append_path_sep(folder)
         self.assert_backend_called('create_folder', folder_path=folder)
 
     @defer.inlineCallbacks
@@ -398,7 +487,7 @@
         self.assertFalse(self.ui.is_processing, 'ui must not be processing')
 
     @defer.inlineCallbacks
-    def test_reload_volumes_info(self):
+    def test_reload_volumes_info_on_success(self):
         """Once the folder is created, the volumes info is reloaded."""
         self.patch(self.ui, 'load', self._set_called)
 
@@ -412,8 +501,9 @@
 class FoldersPanelSubscriptionTestCase(FoldersPanelTestCase):
     """The test suite for the folder subscription."""
 
+    @defer.inlineCallbacks
     def setUp(self):
-        super(FoldersPanelSubscriptionTestCase, self).setUp()
+        yield super(FoldersPanelSubscriptionTestCase, self).setUp()
         self.patch(gui.os.path, 'exists', lambda path: True)
         FakedConfirmDialog.response = gui.YES
         FakedConfirmDialog.args = None
@@ -450,7 +540,6 @@
         """Clicking on 'subscribed' sets is_processing flag until done."""
         def check(volume_id, settings):
             """The ui must be is_processing when a change was requested."""
-            # the ui is processing
             self.assertTrue(self.ui.is_processing, 'ui must be processing')
 
         self.patch(self.ui.backend, 'change_volume_settings', check)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_preferences.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_preferences.py	2011-06-17 20:08:02 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_preferences.py	2011-06-21 16:31:15 +0000
@@ -20,28 +20,38 @@
 
 from __future__ import division
 
+from twisted.internet import defer
+
 from ubuntuone.controlpanel.gui.qt import preferences as gui
-from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
+from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
+    UbuntuOneBinTestCase,
+)
 
 # Access to a protected member
 # pylint: disable=W0212
 
 
-class PreferencesPanelTestCase(BaseTestCase):
+class PreferencesPanelTestCase(UbuntuOneBinTestCase):
     """Test the qt cloud preferences tab."""
 
     innerclass_ui = gui.preferences_ui
     innerclass_name = "Ui_Form"
     class_ui = gui.PreferencesPanel
 
+    @defer.inlineCallbacks
     def setUp(self):
-        super(PreferencesPanelTestCase, self).setUp()
-        return self.ui.load()
-
-    def test_backend(self):
-        """Backend is created."""
-        self.assertIsInstance(self.ui.backend,
-                              gui.backend.ControlBackend)
+        yield super(PreferencesPanelTestCase, self).setUp()
+        yield self.ui.load()
+
+    def test_is_processing_while_asking_info(self):
+        """The ui is processing while the contents are loaded."""
+        def check():
+            """The ui must be is_processing."""
+            self.assertTrue(self.ui.is_processing, 'ui must be processing')
+
+        self.patch(self.ui.backend, 'file_sync_settings_info', check)
+
+        yield self.ui.load()  # trigger the info request
 
     def test_file_sync_settings_info_is_requested(self):
         """The file_sync_settings info is requested to the backend."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_profile.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_profile.py	2011-06-16 20:33:39 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_profile.py	2011-06-21 16:31:15 +0000
@@ -19,17 +19,31 @@
 """Tests for the profile tab."""
 
 from ubuntuone.controlpanel.gui.qt import profile as gui
-from ubuntuone.controlpanel.gui.qt.tests import (BaseTestCase,
-    SAMPLE_ACCOUNT_INFO, SAMPLE_EMAIL, SAMPLE_NAME)
-
-
-class ProfilePanelTestCase(BaseTestCase):
+from ubuntuone.controlpanel.gui.qt.tests import (
+    SAMPLE_ACCOUNT_INFO, SAMPLE_EMAIL, SAMPLE_NAME,
+)
+from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
+    UbuntuOneBinTestCase,
+)
+
+
+class ProfilePanelTestCase(UbuntuOneBinTestCase):
     """Test the qt control panel."""
 
     innerclass_ui = gui.profile_ui
     innerclass_name = "Ui_Form"
     class_ui = gui.ProfilePanel
 
+    def test_is_processing_while_asking_info(self):
+        """The ui is processing while the contents are loaded."""
+        def check():
+            """The ui must be is_processing."""
+            self.assertTrue(self.ui.is_processing, 'ui must be processing')
+
+        self.patch(self.ui.backend, 'account_info', check)
+
+        return self.ui.load()  # trigger the info request
+
     def test_update_account_info(self):
         """Backend's file sync status changed callback is connected."""
         self.ui.update_account_info(SAMPLE_ACCOUNT_INFO)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_services.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_services.py	2011-06-16 20:33:39 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_services.py	2011-06-21 16:31:15 +0000
@@ -19,17 +19,31 @@
 """Tests for the services tab."""
 
 from ubuntuone.controlpanel.gui.qt import services as gui
-from ubuntuone.controlpanel.gui.qt.tests import (BaseTestCase,
-    SAMPLE_ACCOUNT_INFO, SAMPLE_PLAN)
-
-
-class ServicesPanelTestCase(BaseTestCase):
+from ubuntuone.controlpanel.gui.qt.tests import (
+    SAMPLE_ACCOUNT_INFO, SAMPLE_PLAN,
+)
+from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
+    UbuntuOneBinTestCase,
+)
+
+
+class ServicesPanelTestCase(UbuntuOneBinTestCase):
     """Test the qt control panel."""
 
     innerclass_ui = gui.services_ui
     innerclass_name = "Ui_Form"
     class_ui = gui.ServicesPanel
 
+    def test_is_processing_while_asking_info(self):
+        """The ui is processing while the contents are loaded."""
+        def check():
+            """The ui must be is_processing."""
+            self.assertTrue(self.ui.is_processing, 'ui must be processing')
+
+        self.patch(self.ui.backend, 'account_info', check)
+
+        return self.ui.load()  # trigger the info request
+
     def test_update_account_info(self):
         """Backend's file sync status changed callback is connected."""
         self.ui.update_account_info(SAMPLE_ACCOUNT_INFO)

=== added file 'ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py	2011-06-21 16:31:15 +0000
@@ -0,0 +1,92 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Natalia B Bidart <[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/>.
+
+"""Tests for the Ubuntu One Bin."""
+
+from ubuntuone.controlpanel.gui.qt import ubuntuonebin as gui
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase, FakeUi
+
+# Attribute 'yyy' defined outside __init__, access to a protected member
+# pylint: disable=W0201, W0212
+
+
+class UbuntuOneBinTestCase(BaseTestCase):
+    """Test the qt cloud folders tab."""
+
+    class_ui = gui.UbuntuOneBin
+
+    def setUp(self):
+        super(UbuntuOneBinTestCase, self).setUp()
+        self.ui.show()  # need to show to test widgets visibility
+
+    def test_backend(self):
+        """Backend is created."""
+        self.assertIsInstance(self.ui.backend,
+                              gui.backend.ControlBackend)
+
+    def test_init_loads_ui(self):
+        """The __init__ method loads the ui."""
+        if self.innerclass_ui is None:
+            return
+        self.patch(self.innerclass_ui, self.innerclass_name, FakeUi)
+        # pylint: disable=E1102
+        self.ui = self.class_ui(**self.kwargs)
+        # pylint: disable=E1101
+        self.assertEqual(self.ui.ui._called,
+                         {'setupUi': ((self.ui.bin_ui.container,), {})})
+
+    def test_is_not_processing_after_creation(self):
+        """After creation, is not processing."""
+        self.assertFalse(self.ui.is_processing)
+
+    def test_spinner_is_active(self):
+        """The spinner is active."""
+        self.assertEqual(self.ui.bin_ui.spinner.minimum(), 0)
+        self.assertEqual(self.ui.bin_ui.spinner.maximum(), 0)
+
+    def test_is_enabled_if_not_processing(self):
+        """If not processing, the UI is enabled."""
+        self.ui.is_processing = False
+        self.assertTrue(self.ui.isEnabled())
+        self.assertFalse(self.ui.bin_ui.spinner.isVisible())
+
+    def test_is_not_enabled_if_processing(self):
+        """If processing, the UI is disabled."""
+        self.ui.is_processing = True
+        self.assertFalse(self.ui.isEnabled())
+        self.assertTrue(self.ui.bin_ui.spinner.isVisible())
+
+    def test_title_when_none(self):
+        """The title is the empty string when class title is None."""
+
+        class MyBin(gui.UbuntuOneBin):
+            """Inherit to set a class title."""
+            title = None
+
+        ui = MyBin()
+        self.assertEqual(ui.bin_ui.title_label.text(), '')
+
+    def test_title_when_not_none(self):
+        """The title is the empty string when class title is None."""
+
+        class MyBin(gui.UbuntuOneBin):
+            """Inherit to set a class title."""
+            title = 'Hello World!'
+
+        ui = MyBin()
+        self.assertEqual(ui.bin_ui.title_label.text(), MyBin.title)

=== added file 'ubuntuone/controlpanel/gui/qt/ubuntuonebin.py'
--- ubuntuone/controlpanel/gui/qt/ubuntuonebin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/ubuntuonebin.py	2011-06-21 16:31:15 +0000
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Natalia B Bidart <[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/>.
+
+"""The base widget for the Control Panel tabs."""
+
+from PyQt4 import QtGui, QtCore
+
+from ubuntuone.controlpanel import backend
+from ubuntuone.controlpanel.gui.qt.ui import ubuntuonebin_ui
+
+
+class UbuntuOneBin(QtGui.QWidget):
+    """The base widget for the Control Panel's tabs."""
+
+    title = None
+    ui_class = None
+
+    def __init__(self, parent=None):
+        """Initialize the UI of the widget."""
+        QtGui.QWidget.__init__(self, parent)
+
+        self.bin_ui = ubuntuonebin_ui.Ui_Form()
+        self.bin_ui.setupUi(self)
+
+        if self.title is None:
+            self.bin_ui.title_label.setText('')
+        else:
+            self.bin_ui.title_label.setText(self.title)
+
+        self.ui = None
+        if self.ui_class is not None:
+            # self.ui_class is not callable
+            # pylint: disable=E1102
+            self.ui = self.ui_class.Ui_Form()
+            self.ui.setupUi(self.bin_ui.container)
+            # connect all signals to this instance
+            QtCore.QMetaObject.connectSlotsByName(self)
+
+        self._is_processing = None
+        self.is_processing = False
+
+        self.backend = backend.ControlBackend()
+
+    def _get_is_processing(self):
+        """Get the value of is_processing."""
+        return self._is_processing
+
+    def _set_is_processing(self, new_value):
+        """Set the value of is_processing.
+
+        If is_processing, disable the UI and show a spinner.
+        If not is_processing, enable the UI and hide the spinner.
+
+        """
+        self.bin_ui.spinner.setVisible(new_value)
+        self.setEnabled(not new_value)
+        self._is_processing = new_value
+
+    is_processing = property(fget=_get_is_processing, fset=_set_is_processing)
+
+    # Invalid name "showEvent"
+    # pylint: disable=C0103
+
+    def showEvent(self, event):
+        """Load info."""
+        self.load()
+        event.accept()
+
+    def load(self):
+        """Load the widget with specific info."""

=== modified file 'ubuntuone/controlpanel/sd_client/linux.py'
--- ubuntuone/controlpanel/sd_client/linux.py	2011-06-14 21:44:32 +0000
+++ ubuntuone/controlpanel/sd_client/linux.py	2011-06-21 16:31:15 +0000
@@ -25,6 +25,8 @@
 
 from ubuntuone.controlpanel.logger import setup_logging
 
+# pylint: disable=E1101
+
 
 logger = setup_logging('sd_client')