Merge lp:~nataliabidart/ubuntu/oneiric/ubuntuone-control-panel/ubuntuone-control-panel-2.0.0 into lp:ubuntu/oneiric/ubuntuone-control-panel

[Natalia Bidart]

  * New upstream release:
    [ Alejandro J. Cura <email address hidden>]
      - Do not throw a webclient error when closing
        (LP: #845105).
    [ Natalia B. Bidart <email address hidden> ]
      - Removed all code related to Bookmarks (LP: #850142).
      - Replaces references to "Evolution" by "Thunderbird" (LP: #849494).
    [ Rodney Dawes <email address hidden> ]
      - Don't install a .desktop file for control panel
        (part of LP: #838778).
      - Point the indicator/Unity API at the installer .desktop file
        (part of LP: #838778).
      - Set the WMCLASS so Unity will fall back properly
        (part of LP: #838778).
      - Fix a few grammar mistakes (LP: #835093).
      - Don't show the "Get NGB free!" label on "Join now" button at all
        (LP: #819955).
  * debian/control:
    - ubuntuone-control-panel-gtk depends now on ubuntuone-installer >= 2.0.0.
    - require ubuntuone-client >= 2.0.0.
    - require ubuntu-sso-client >= 1.4.0.
    - no longer install a .desktop file (will be installed by ubuntuone-installer).

[Sebastien Bacher (seb128)]

Thank you for your work

=== removed file 'MANIFEST'
--- MANIFEST	2011-08-12 19:12:08 +0000
+++ MANIFEST	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-# file GENERATED by distutils, do NOT edit
-COPYING
-MANIFEST
-README
-com.ubuntuone.controlpanel.gui.service.in
-com.ubuntuone.controlpanel.service.in
-pylintrc
-run-tests
-run-tests.bat
-setup.py
-ubuntuone-control-panel-gtk.desktop.in
-ubuntuone-control-panel.in
-ubuntuone.controlpanel.pth
-bin/ubuntuone-control-panel-backend
-bin/ubuntuone-control-panel-gtk
-bin/ubuntuone-control-panel-qt
-data/Ubuntu-R.ttf
-data/computer.png
-data/contacts.png
-data/external_icon_orange.png
-data/external_icon_white.png
-data/facebook.png
-data/files.png
-data/folder.png
-data/music-store.png
-data/music-stream.png
-data/notes.png
-data/overview.png
-data/phone.png
-data/services-bookmarks.png
-data/services-contacts.png
-data/services-files-example.png
-data/services-files.png
-data/sync_status_alert.png
-data/sync_status_disconnected.png
-data/sync_status_sync_done.png
-data/sync_status_syncing.png
-data/twitter.png
-data/u1icon.png
-data/gtk/dashboard.ui
-data/gtk/device.ui
-data/gtk/devices.ui
-data/gtk/install.ui
-data/gtk/management.ui
-data/gtk/overview.ui
-data/gtk/services.ui
-data/gtk/volumes.ui
-data/qt/account.ui
-data/qt/controlpanel.ui
-data/qt/device.ui
-data/qt/devices.ui
-data/qt/filesyncstatus.ui
-data/qt/folders.ui
-data/qt/images.qrc
-data/qt/loadingoverlay.ui
-data/qt/mainwindow.ui
-data/qt/preferences.ui
-data/qt/ubuntuone.qss
-docs/ubuntuone-control-panel-gtk.1
-po/POTFILES.in
-po/ubuntuone-control-panel.pot
-ubuntuone/__init__.py
-ubuntuone/controlpanel/__init__.py
-ubuntuone/controlpanel/backend.py
-ubuntuone/controlpanel/constants.py.in
-ubuntuone/controlpanel/dbus_service.py
-ubuntuone/controlpanel/logger.py
-ubuntuone/controlpanel/login_client.py
-ubuntuone/controlpanel/replication_client.py
-ubuntuone/controlpanel/utils.py
-ubuntuone/controlpanel/dbustests/__init__.py
-ubuntuone/controlpanel/dbustests/test_dbus_service.py
-ubuntuone/controlpanel/dbustests/test_gui_service.py
-ubuntuone/controlpanel/dbustests/test_sd_client/__init__.py
-ubuntuone/controlpanel/dbustests/test_sd_client/test_linux.py
-ubuntuone/controlpanel/gui/__init__.py
-ubuntuone/controlpanel/gui/gtk/__init__.py
-ubuntuone/controlpanel/gui/gtk/gui.py
-ubuntuone/controlpanel/gui/gtk/package_manager.py
-ubuntuone/controlpanel/gui/gtk/widgets.py
-ubuntuone/controlpanel/gui/gtk/tests/__init__.py
-ubuntuone/controlpanel/gui/gtk/tests/test_gui.py
-ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py
-ubuntuone/controlpanel/gui/gtk/tests/test_package_manager.py
-ubuntuone/controlpanel/gui/gtk/tests/test_widgets.py
-ubuntuone/controlpanel/gui/qt/__init__.py
-ubuntuone/controlpanel/gui/qt/account.py
-ubuntuone/controlpanel/gui/qt/addfolder.py
-ubuntuone/controlpanel/gui/qt/controlpanel.py
-ubuntuone/controlpanel/gui/qt/device.py
-ubuntuone/controlpanel/gui/qt/devices.py
-ubuntuone/controlpanel/gui/qt/filesyncstatus.py
-ubuntuone/controlpanel/gui/qt/folders.py
-ubuntuone/controlpanel/gui/qt/gotoweb.py
-ubuntuone/controlpanel/gui/qt/gui.py
-ubuntuone/controlpanel/gui/qt/loadingoverlay.py
-ubuntuone/controlpanel/gui/qt/preferences.py
-ubuntuone/controlpanel/gui/qt/ubuntuonebin.py
-ubuntuone/controlpanel/gui/qt/main/__init__.py
-ubuntuone/controlpanel/gui/qt/main/linux.py
-ubuntuone/controlpanel/gui/qt/main/windows.py
-ubuntuone/controlpanel/gui/qt/tests/__init__.py
-ubuntuone/controlpanel/gui/qt/tests/test_account.py
-ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py
-ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py
-ubuntuone/controlpanel/gui/qt/tests/test_device.py
-ubuntuone/controlpanel/gui/qt/tests/test_devices.py
-ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py
-ubuntuone/controlpanel/gui/qt/tests/test_folders.py
-ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py
-ubuntuone/controlpanel/gui/qt/tests/test_gui.py
-ubuntuone/controlpanel/gui/qt/tests/test_loadingoverlay.py
-ubuntuone/controlpanel/gui/qt/tests/test_preferences.py
-ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py
-ubuntuone/controlpanel/gui/qt/ui/__init__.py
-ubuntuone/controlpanel/gui/qt/ui/account_ui.py
-ubuntuone/controlpanel/gui/qt/ui/controlpanel_ui.py
-ubuntuone/controlpanel/gui/qt/ui/device_ui.py
-ubuntuone/controlpanel/gui/qt/ui/devices_ui.py
-ubuntuone/controlpanel/gui/qt/ui/filesyncstatus_ui.py
-ubuntuone/controlpanel/gui/qt/ui/folders_ui.py
-ubuntuone/controlpanel/gui/qt/ui/images_rc.py
-ubuntuone/controlpanel/gui/qt/ui/loadingoverlay_ui.py
-ubuntuone/controlpanel/gui/qt/ui/mainwindow_ui.py
-ubuntuone/controlpanel/gui/qt/ui/preferences_ui.py
-ubuntuone/controlpanel/gui/tests/__init__.py
-ubuntuone/controlpanel/gui/tests/test_humanize.py
-ubuntuone/controlpanel/gui/tests/test_url_sign.py
-ubuntuone/controlpanel/sd_client/__init__.py
-ubuntuone/controlpanel/sd_client/linux.py
-ubuntuone/controlpanel/tests/__init__.py
-ubuntuone/controlpanel/tests/test_backend.py
-ubuntuone/controlpanel/tests/test_login_client.py
-ubuntuone/controlpanel/tests/test_replication_client.py
-ubuntuone/controlpanel/tests/test_sd_client.py
-ubuntuone/controlpanel/tests/test_utils.py
-ubuntuone/controlpanel/tests/test_web_client.py
-ubuntuone/controlpanel/web_client/__init__.py
-ubuntuone/controlpanel/web_client/libsoup.py
-ubuntuone/controlpanel/web_client/txwebclient.py
 
=== modified file 'PKG-INFO'
--- PKG-INFO	2011-08-25 19:37:14 +0000
+++ PKG-INFO	2011-09-26 18:38:27 +0000
@@ -1,30 +1,11 @@
 Metadata-Version: 1.1
 Name: ubuntuone-control-panel
-Version: 1.1.3
+Version: 2.0.0
 Summary: Ubuntu One Control Panel
 Home-page: https://launchpad.net/ubuntuone-control-panel
 Author: Natalia Bidart
 Author-email: [e-mail]
 License: GPL v3
-Description: Application to manage a Ubuntu One account. Provides a DBus service to query/modify all the Ubuntu One bits.
+Description: Application to manage an Ubuntu One account. Provides a DBus service to query/modify all the Ubuntu One bits.
 Platform: UNKNOWN
-Requires: PyQt4
-Requires: apt
-Requires: aptdaemon
-Requires: dbus
-Requires: defer
-Requires: desktopcouch.application.replication_services
-Requires: gi.repository
-Requires: gobject
-Requires: gtk
-Requires: mocker
-Requires: oauth
-Requires: pango
-Requires: simplejson
-Requires: twisted.application
-Requires: twisted.internet
-Requires: twisted.python.failure
-Requires: twisted.trial.unittest
-Requires: twisted.web
-Requires: ubuntu_sso
 Provides: ubuntuone
 
=== modified file 'bin/ubuntuone-control-panel-qt'
--- bin/ubuntuone-control-panel-qt	2011-08-25 19:37:14 +0000
+++ bin/ubuntuone-control-panel-qt	2011-09-26 18:38:27 +0000
@@ -45,10 +45,19 @@
     result.add_option("-a", "--alert", dest="alert", action="store_true",
                       default=False, help="Start Ubuntu One "
                       "alerting the user to its presence.")
+    result.add_option("--minimized", dest="minimized", action="store_true",
+                      default=False, help="Start Ubuntu One "
+                      "only in the notification area, with no visible window. "
+                      "Implies --with-icon")
+    result.add_option("--with-icon", dest="with_icon", action="store_true",
+                      default=False, help="Start Ubuntu One "
+                      "with an icon in the notification area.")
     return result
 
 
 if __name__ == "__main__":
     parser = parser_options()
     (options, args) = parser.parse_args(sys.argv)
-    main.main(switch_to=options.switch_to, alert=options.alert)
+    main.main(switch_to=options.switch_to,
+        alert=options.alert, minimized=options.minimized, 
+        with_icon=options.with_icon)
 
=== added file 'data/Ubuntu-B.ttf'
 Binary files data/Ubuntu-B.ttf	1970-01-01 00:00:00 +0000 and data/Ubuntu-B.ttf	2011-09-26 18:38:27 +0000 differ
=== modified file 'data/gtk/overview.ui'
--- data/gtk/overview.ui	2011-07-22 21:26:48 +0000
+++ data/gtk/overview.ui	2011-09-26 18:38:27 +0000
@@ -150,7 +150,7 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Stay Productive
-&lt;span foreground="#909090"&gt;Keep your Firefox bookmarks and Tomboy notes synced&lt;/span&gt;</property>
+&lt;span foreground="#909090"&gt;Keep your Tomboy notes synced&lt;/span&gt;</property>
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
               </object>
@@ -251,36 +251,11 @@
                         <property name="use_action_appearance">False</property>
                         <signal name="clicked" handler="on_join_now_button_clicked" swapped="no"/>
                         <child>
-                          <object class="GtkVBox" id="vbox4">
+                          <object class="GtkLabel" id="label1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">5</property>
-                            <child>
-                              <object class="GtkLabel" id="label1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;Join now&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label2">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">&lt;span foreground="#909090"&gt;2GB of free storage&lt;/span&gt;</property>
-                                <property name="use_markup">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">True</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
+                            <property name="label" translatable="yes">&lt;span font_size="xx-large" foreground="#4d4d4d"&gt;Join now&lt;/span&gt;</property>
+                            <property name="use_markup">True</property>
                           </object>
                         </child>
                       </object>
 
=== modified file 'data/gtk/services.ui'
--- data/gtk/services.ui	2011-07-22 21:26:48 +0000
+++ data/gtk/services.ui	2011-09-26 18:38:27 +0000
@@ -59,16 +59,21 @@
                                         <property name="use_action_appearance">False</property>
                                         <property name="draw_indicator">True</property>
                                       </object>
+                                      <packing>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
+                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkImage" id="files_icon">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="xpad">5</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
                                         <property name="right_attach">2</property>
+                                        <property name="x_options"></property>
+                                        <property name="y_options"></property>
                                       </packing>
                                     </child>
                                     <child>
@@ -154,8 +159,6 @@
                                   <object class="GtkImage" id="files_example">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="xpad">5</property>
-                                    <property name="ypad">5</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -188,6 +191,7 @@
                           <object class="GtkAlignment" id="alignment3">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="top_padding">6</property>
                             <child>
                               <object class="GtkHBox" id="hbox3">
                                 <property name="visible">True</property>
@@ -203,6 +207,7 @@
                                         <property name="can_focus">False</property>
                                         <property name="n_rows">2</property>
                                         <property name="n_columns">3</property>
+                                        <property name="column_spacing">5</property>
                                         <property name="row_spacing">5</property>
                                         <child>
                                           <object class="GtkCheckButton" id="contacts_check">
@@ -212,16 +217,21 @@
                                             <property name="use_action_appearance">False</property>
                                             <property name="draw_indicator">True</property>
                                           </object>
+                                          <packing>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkImage" id="contacts_icon">
                                             <property name="visible">True</property>
                                             <property name="can_focus">False</property>
-                                            <property name="xpad">5</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
@@ -245,7 +255,6 @@
                                             <property name="label" translatable="yes">&lt;span font_size="small"&gt;Once enabled, visit the &lt;a href="https://one.ubuntu.com"&gt;Ubuntu One website&lt;/a&gt; to manage your contacts, including Gmail and Facebook import&lt;/span&gt;</property>
                                             <property name="use_markup">True</property>
                                             <property name="wrap">True</property>
-                                            <property name="width_chars">35</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">2</property>
@@ -269,92 +278,13 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">False</property>
+                                    <property name="expand">True</property>
                                     <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkVBox" id="bookmarks">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkTable" id="bookmarks_sync">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="n_rows">2</property>
-                                        <property name="n_columns">3</property>
-                                        <property name="row_spacing">5</property>
-                                        <child>
-                                          <object class="GtkCheckButton" id="bookmarks_check">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="use_action_appearance">False</property>
-                                            <property name="draw_indicator">True</property>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkImage" id="bookmarks_icon">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xpad">5</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label6">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="label" translatable="yes">Enable Bookmarks Sync</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="right_attach">3</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="label7">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">0</property>
-                                            <property name="yalign">0</property>
-                                            <property name="label" translatable="yes">&lt;span font_size="small"&gt;Bookmarks sync works with Firefox&lt;/span&gt;</property>
-                                            <property name="use_markup">True</property>
-                                            <property name="wrap">True</property>
-                                            <property name="width_chars">30</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">2</property>
-                                            <property name="right_attach">3</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">True</property>
-                                    <property name="pack_type">end</property>
-                                    <property name="position">1</property>
-                                  </packing>
+                                  <placeholder/>
                                 </child>
                               </object>
                             </child>
 
=== modified file 'data/qt/account.ui'
--- data/qt/account.ui	2011-08-25 19:37:14 +0000
+++ data/qt/account.ui	2011-09-26 18:38:27 +0000
@@ -35,7 +35,16 @@
         <string>Your services</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_3">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>10</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
@@ -61,11 +70,23 @@
         <string>Personal details</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_4">
-        <property name="margin">
+        <property name="leftMargin">
+         <number>10</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>0</number>
+        </property>
+        <property name="bottomMargin">
          <number>0</number>
         </property>
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_2">
+          <property name="leftMargin">
+           <number>6</number>
+          </property>
           <item>
            <widget class="QLabel" name="name_label">
             <property name="text">
 
=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2011-08-25 19:37:14 +0000
+++ data/qt/controlpanel.ui	2011-09-26 18:38:27 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>367</width>
-    <height>142</height>
+    <width>387</width>
+    <height>168</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -20,215 +20,247 @@
    <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>3</number>
-   </property>
    <property name="margin">
     <number>0</number>
    </property>
    <item>
-    <widget class="QFrame" name="frame_header">
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <property name="spacing">
-       <number>5</number>
-      </property>
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item>
-       <widget class="QFrame" name="frame_greeting">
-        <layout class="QVBoxLayout" name="verticalLayout_4">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="greeting_label">
-           <property name="alignment">
-            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Fixed</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>15</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QFrame" name="frame_storage">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>165</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>165</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <layout class="QVBoxLayout" name="vLayoutStorage">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <property name="sizeConstraint">
-          <enum>QLayout::SetDefaultConstraint</enum>
-         </property>
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="QFrame" name="frame_quota">
-           <layout class="QVBoxLayout" name="verticalLayout_3">
+    <widget class="QStackedWidget" name="switcher">
+     <property name="currentIndex">
+      <number>1</number>
+     </property>
+     <widget class="QWidget" name="management">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QFrame" name="frame_header">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
             <property name="spacing">
-             <number>2</number>
+             <number>5</number>
             </property>
             <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QLabel" name="percentage_usage_label">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="text">
-               <string notr="true"/>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="quota_usage_label">
-              <property name="font">
-               <font>
-                <pointsize>8</pointsize>
-               </font>
-              </property>
-              <property name="text">
-               <string/>
-              </property>
+             <widget class="QFrame" name="frame_greeting">
+              <layout class="QVBoxLayout" name="verticalLayout_4">
+               <property name="margin">
+                <number>0</number>
+               </property>
+               <item>
+                <widget class="QLabel" name="greeting_label">
+                 <property name="alignment">
+                  <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>15</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QFrame" name="frame_storage">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>165</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>165</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <layout class="QVBoxLayout" name="vLayoutStorage">
+               <property name="spacing">
+                <number>6</number>
+               </property>
+               <property name="sizeConstraint">
+                <enum>QLayout::SetFixedSize</enum>
+               </property>
+               <property name="margin">
+                <number>0</number>
+               </property>
+               <item>
+                <widget class="QFrame" name="frame_quota">
+                 <layout class="QVBoxLayout" name="verticalLayout_3">
+                  <property name="spacing">
+                   <number>2</number>
+                  </property>
+                  <property name="margin">
+                   <number>0</number>
+                  </property>
+                  <item>
+                   <widget class="QLabel" name="percentage_usage_label">
+                    <property name="sizePolicy">
+                     <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                      <horstretch>0</horstretch>
+                      <verstretch>0</verstretch>
+                     </sizepolicy>
+                    </property>
+                    <property name="text">
+                     <string notr="true"/>
+                    </property>
+                    <property name="OverQuota" stdset="0">
+                     <bool>false</bool>
+                    </property>
+                   </widget>
+                  </item>
+                  <item>
+                   <widget class="QLabel" name="quota_usage_label">
+                    <property name="font">
+                     <font>
+                      <pointsize>8</pointsize>
+                     </font>
+                    </property>
+                    <property name="text">
+                     <string/>
+                    </property>
+                    <property name="OverQuota" stdset="0">
+                     <bool>false</bool>
+                    </property>
+                   </widget>
+                  </item>
+                 </layout>
+                 <zorder>quota_usage_label</zorder>
+                 <zorder>percentage_usage_label</zorder>
+                </widget>
+               </item>
+               <item>
+                <widget class="GoToWebButton" name="get_more_space_button">
+                 <property name="text">
+                  <string>Get more storage</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
+            <item>
+             <widget class="QFrame" name="frame_status">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>165</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>165</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <layout class="QHBoxLayout" name="horizontalLayout_8">
+               <property name="sizeConstraint">
+                <enum>QLayout::SetMinimumSize</enum>
+               </property>
+               <property name="margin">
+                <number>0</number>
+               </property>
+               <item>
+                <widget class="FileSyncStatus" name="file_sync_status" native="true">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
+                 </property>
+                 <property name="minimumSize">
+                  <size>
+                   <width>0</width>
+                   <height>0</height>
+                  </size>
+                 </property>
+                 <property name="maximumSize">
+                  <size>
+                   <width>165</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+              </layout>
              </widget>
             </item>
            </layout>
-           <zorder>quota_usage_label</zorder>
-           <zorder>percentage_usage_label</zorder>
-          </widget>
-         </item>
-         <item>
-          <widget class="GoToWebButton" name="get_more_space_button">
-           <property name="text">
-            <string>Get more storage</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item>
-       <widget class="QFrame" name="frame_status">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>165</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>165</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_8">
-         <property name="margin">
-          <number>0</number>
-         </property>
-         <item>
-          <widget class="FileSyncStatus" name="file_sync_status" native="true">
+          </widget>
+         </item>
+         <item>
+          <widget class="QTabWidget" name="tab_widget">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>165</width>
-             <height>16777215</height>
-            </size>
-           </property>
+           <property name="currentIndex">
+            <number>0</number>
+           </property>
+           <widget class="FoldersPanel" name="folders_tab">
+            <attribute name="title">
+             <string>Folders</string>
+            </attribute>
+           </widget>
+           <widget class="DevicesPanel" name="devices_tab">
+            <attribute name="title">
+             <string>Devices</string>
+            </attribute>
+           </widget>
+           <widget class="PreferencesPanel" name="preferences_tab">
+            <attribute name="title">
+             <string>Settings</string>
+            </attribute>
+           </widget>
+           <widget class="AccountPanel" name="account_tab">
+            <attribute name="title">
+             <string>Account information</string>
+            </attribute>
+           </widget>
           </widget>
          </item>
         </layout>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QTabWidget" name="tab_widget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="FoldersPanel" name="folders_tab">
-      <attribute name="title">
-       <string>Folders</string>
-      </attribute>
-     </widget>
-     <widget class="DevicesPanel" name="devices_tab">
-      <attribute name="title">
-       <string>Devices</string>
-      </attribute>
-     </widget>
-     <widget class="PreferencesPanel" name="preferences_tab">
-      <attribute name="title">
-       <string>Settings</string>
-      </attribute>
-     </widget>
-     <widget class="AccountPanel" name="account_tab">
-      <attribute name="title">
-       <string>Account information</string>
-      </attribute>
-     </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="empty"/>
+     <widget class="SignInPanel" name="signin"/>
     </widget>
    </item>
    <item>
@@ -371,9 +403,14 @@
    <header>ubuntuone.controlpanel.gui.qt.account</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>SignInPanel</class>
+   <extends>QWidget</extends>
+   <header>ubuntuone.controlpanel.gui.qt.signin</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>tab_widget</tabstop>
   <tabstop>help_button</tabstop>
   <tabstop>twitter_button</tabstop>
   <tabstop>facebook_button</tabstop>
 
=== modified file 'data/qt/images.qrc'
--- data/qt/images.qrc	2011-08-25 19:37:14 +0000
+++ data/qt/images.qrc	2011-09-26 18:38:27 +0000
@@ -15,6 +15,7 @@
     <file>../facebook.png</file>
     <file>../external_icon_white.png</file>
     <file>../Ubuntu-R.ttf</file>
+    <file>../Ubuntu-B.ttf</file>
     <file>ubuntuone.qss</file>
   </qresource>
 </RCC>
 
=== modified file 'data/qt/preferences.ui'
--- data/qt/preferences.ui	2011-08-25 19:37:14 +0000
+++ data/qt/preferences.ui	2011-09-26 18:38:27 +0000
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>433</width>
+    <width>512</width>
     <height>328</height>
    </rect>
   </property>
@@ -138,14 +138,14 @@
       <item>
        <widget class="QCheckBox" name="udf_autosubscribe_checkbox">
         <property name="text">
-         <string>Automatically sync all selected folders on this computer to the cloud</string>
+         <string>Automatically sync all new cloud folders to this computer</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCheckBox" name="share_autosubscribe_checkbox">
         <property name="text">
-         <string>Automatically sync all folders shared with me by other to this computer</string>
+         <string>Automatically sync all folders shared with me to this computer</string>
         </property>
        </widget>
       </item>
 
=== added file 'data/qt/signin.ui'
--- data/qt/signin.ui	1970-01-01 00:00:00 +0000
+++ data/qt/signin.ui	2011-09-26 18:38:27 +0000
@@ -0,0 +1,203 @@
+<?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>344</width>
+    <height>312</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout_3">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QFrame" name="signin">
+     <layout class="QVBoxLayout" name="sign_in">
+      <property name="spacing">
+       <number>15</number>
+      </property>
+      <property name="margin">
+       <number>3</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="sign_in_label">
+        <property name="text">
+         <string>Sign in to Ubuntu One</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="description_label">
+        <property name="text">
+         <string>Sign in with yur existing Ubuntu One username and password.</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <property name="spacing">
+           <number>15</number>
+          </property>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_4">
+            <property name="spacing">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="email_label">
+              <property name="text">
+               <string>Email address</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="email_entry">
+              <property name="text">
+               <string/>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_3">
+            <property name="spacing">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="password_label">
+              <property name="text">
+               <string>Password</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="password_entry">
+              <property name="echoMode">
+               <enum>QLineEdit::Password</enum>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QPushButton" name="signin_button">
+              <property name="text">
+               <string>Sign in</string>
+              </property>
+              <property name="default">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="cancel_button">
+              <property name="text">
+               <string>Cancel</string>
+              </property>
+              <property name="secondary" stdset="0">
+               <bool>true</bool>
+              </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>
+           </layout>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_4">
+            <item>
+             <widget class="GoToWebButton" name="forgot_password_button">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Forgot your password?</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_3">
+              <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>
+        </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>
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>40</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>GoToWebButton</class>
+   <extends>QPushButton</extends>
+   <header>ubuntuone.controlpanel.gui.qt.gotoweb</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
 
=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-08-25 19:37:14 +0000
+++ data/qt/ubuntuone.qss	2011-09-26 18:38:27 +0000
@@ -1,5 +1,5 @@
 QMainWindow {
-    background-color: #dd4814;
+    background-color: #aea79f;
 }
 
 QWidget {
@@ -12,6 +12,7 @@
     border: none;
 }
 
+QFrame#signin,
 QFrame#frame_header {
     background: #ffffff;
     border-radius: 5px;
@@ -137,6 +138,7 @@
     border: none;
 }
 
+GoToWebButton#forgot_password_button,
 GoToWebButton#share_publish_button {
     background: transparent;
     border: none;
@@ -216,11 +218,8 @@
     padding-top: 30px;
     border: none;
     margin-top: 1ex;
-}
-
-QGroupBox::title {
     color: #333333;
-    font: bold 15px;
+    font: bold 14px;
 }
 
 QGroupBox#profile,
@@ -228,6 +227,11 @@
     padding-left: 5px;
 }
 
+QGroupBox#bandwidth_settings,
+QGroupBox#file_sync_settings {
+    padding-left: 20px;
+}
+
 QListWidget {
     background: #f7f6f5;
     alternate-background-color: #efedec;
@@ -237,6 +241,10 @@
     min-height: 48px;
 }
 
+QLabel[OverQuota="false"] {
+    color: #333333;
+}
+
 QLabel#other_devices_label {
     font: bold 16px;
 }
@@ -249,6 +257,20 @@
     color: white;
 }
 
+QLabel#sign_in_label {
+    font: 16px;
+}
+
+QLabel#email_label,
+QLabel#password_label {
+    font-size: 10px;
+}
+
+QLabel[OverQuota="true"],
+QLabel#warning_label {
+    color: #df2d1f;
+}
+
 QAbstractItemView {
     border-style: solid;
     border-color: #898989;
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-09-07 13:35:18 +0000
+++ debian/changelog	2011-09-26 18:38:27 +0000
@@ -1,3 +1,32 @@
+ubuntuone-control-panel (2.0.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+
+    [ Alejandro J. Cura <[e-mail]>]
+      - Do not throw a webclient error when closing
+        (LP: #845105).
+    [ Natalia B. Bidart <[e-mail]> ]
+      - Removed all code related to Bookmarks (LP: #850142).
+      - Replaces references to "Evolution" by "Thunderbird" (LP: #849494).
+    [ Rodney Dawes <[e-mail]> ]
+      - Don't install a .desktop file for control panel
+        (part of LP: #838778).
+      - Point the indicator/Unity API at the installer .desktop file
+        (part of LP: #838778).
+      - Set the WMCLASS so Unity will fall back properly
+        (part of LP: #838778).
+      - Fix a few grammar mistakes (LP: #835093).
+      - Don't show the "Get NGB free!" label on "Join now" button at all
+        (LP: #819955).
+
+  * debian/control:
+    - ubuntuone-control-panel-gtk depends now on ubuntuone-installer >= 2.0.0.
+    - require ubuntuone-client >= 2.0.0.
+    - require ubuntu-sso-client >= 1.4.0.
+    - no longer install a .desktop file (will be installed by ubuntuone-installer).
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Mon, 26 Sep 2011 14:55:15 -0300
+
 ubuntuone-control-panel (1.1.3-0ubuntu2) UNRELEASED; urgency=low
 
   [ Paul Stewart ]
 
=== modified file 'debian/control'
--- debian/control	2011-08-26 21:22:36 +0000
+++ debian/control	2011-09-26 18:38:27 +0000
@@ -17,7 +17,7 @@
  ${python:Depends},
  python,
  python-ubuntuone-control-panel (= ${binary:Version}),
- ubuntuone-client (>= 1.7.1),
+ ubuntuone-client (>= 2.0.0),
 Recommends: ubuntuone-control-panel-gui
 Description: Ubuntu One Control Panel
  Desktop application to manage an Ubuntu One account.
@@ -37,8 +37,8 @@
  python-simplejson,
  python-twisted-core,
  python-twisted-web,
- python-ubuntuone-client (>= 1.7.1),
- ubuntu-sso-client (>= 1.2.0),
+ python-ubuntuone-client (>= 2.0.0),
+ ubuntu-sso-client (>= 1.4.0),
 Description: Ubuntu One Control Panel Python Libraries
  Ubuntu One Control Panel provides a Python library to manage an Ubuntu One
  account.
@@ -55,11 +55,11 @@
  python-defer | python-aptdaemon,
  python-gobject (>= 2.21.5),
  python-gtk2,
- python-ubuntuone-client (>= 1.7.1),
- ubuntu-sso-client (>= 1.2.0),
- ubuntuone-client (>= 1.7.1),
+ python-ubuntuone-client (>= 2.0.0),
+ ubuntu-sso-client (>= 1.4.0),
+ ubuntuone-client (>= 2.0.0),
  ubuntuone-control-panel (= ${binary:Version}),
+ ubuntuone-installer (>= 2.0.0),
 Provides: ubuntuone-control-panel-gui
 Description: Ubuntu One Control Panel
  GTK+ desktop application to manage an Ubuntu One account.
-
 
=== modified file 'debian/ubuntuone-control-panel-gtk.install'
--- debian/ubuntuone-control-panel-gtk.install	2011-07-22 21:45:30 +0000
+++ debian/ubuntuone-control-panel-gtk.install	2011-09-26 18:38:27 +0000
@@ -1,7 +1,6 @@
 debian/tmp/usr/bin/ubuntuone-control-panel-gtk
 debian/tmp/usr/share/dbus-1/services/com.ubuntuone.controlpanel.gui.service
 debian/tmp/usr/share/indicators/messages/applications/ubuntuone-control-panel
-debian/tmp/usr/share/applications/ubuntuone-control-panel-gtk.desktop
 debian/tmp/usr/share/ubuntuone-control-panel/gtk/*.ui
 debian/tmp/usr/share/ubuntuone-control-panel/*.png
 debian/tmp/usr/share/man/man1/ubuntuone-control-panel-gtk.*
 
=== modified file 'docs/ubuntuone-control-panel-gtk.1'
--- docs/ubuntuone-control-panel-gtk.1	2010-12-06 12:27:11 +0000
+++ docs/ubuntuone-control-panel-gtk.1	2011-09-26 18:38:27 +0000
@@ -1,7 +1,7 @@
 .TH UBUNTUONE-CONTROL-PANEL-GTK 1
 
 .SH NAME
-ubuntuone-control-panel-gtk \- A GTK UI for managing a Ubuntu One account
+ubuntuone-control-panel-gtk \- A GTK UI for managing an Ubuntu One account
 
 .SH SYNOPSYS
 .B ubutuone-control-panel-gtk
@@ -9,7 +9,7 @@
 .SH DESCRIPTION
 This manual page briefly documents the
 .BR ubuntuone-control-panel-gtk
-process, which provides a desktop application to manage a Ubuntu One account.
+process, which provides a desktop application to manage an Ubuntu One account.
 
 .SH AUTHOR
 This manual page was written by Natalia Bidart <[e-mail]>
 
=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-07-22 21:26:48 +0000
+++ po/POTFILES.in	2011-09-26 18:38:27 +0000
@@ -1,4 +1,3 @@
-ubuntuone-control-panel-gtk.desktop.in
 ubuntuone/controlpanel/gui/__init__.py
 [type: gettext/glade] data/gtk/dashboard.ui
 [type: gettext/glade] data/gtk/device.ui
 
=== removed file 'po/ubuntuone-control-panel.pot'
--- po/ubuntuone-control-panel.pot	2011-08-25 19:37:14 +0000
+++ po/ubuntuone-control-panel.pot	1970-01-01 00:00:00 +0000
@@ -1,486 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-25 15:26-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../ubuntuone-control-panel-gtk.desktop.in.h:1
-msgid "Configure and manage your Ubuntu One account"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:72
-msgid "Always in sync"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:73
-msgid "Firefox extension"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:74
-msgid "Connect to Ubuntu One"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:75
-msgid "Evolution plug-in"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:76
-msgid "There was a problem while retrieving the credentials."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:77
-msgid "View your personal details and service summary"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:79
-msgid "Welcome to Ubuntu One!"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:80
-msgid ""
-"The information could not be retrieved. Maybe your internet connection is "
-"down?"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:83
-#: ../ubuntuone/controlpanel/gui/__init__.py:156
-msgid ""
-"The settings could not be changed,\n"
-"previous values were restored."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:85
-msgid "Are you sure you want to remove this device from Ubuntu One?"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:88
-msgid "The device could not be removed."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:89
-msgid "Manage devices registered with your personal cloud"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:91
-msgid "The devices connected with your personal cloud are listed below."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:93
-msgid "Explore"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:94
-#, python-format
-msgid "<i>%(package_name)s</i> could not be installed"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:95
-msgid "Sync another folder with your cloud"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:96
-#, python-format
-msgid ""
-"The chosen directory \"%(folder_path)s\" is not valid. \n"
-"\n"
-"Please choose a folder inside your \"%(home_folder)s\" directory, and not "
-"overlapping with any existing cloud folder."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:101
-msgid "My personal folders"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:102
-#, python-format
-msgid "Shared by %(other_user_display_name)s"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:103
-#, python-format
-msgid ""
-"The contents of your cloud folder will be merged with your local folder "
-"\"%(folder_path)s\" when subscribing.\n"
-"Do you want to subscribe to this cloud folder?"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:107
-msgid "Manage your cloud folders"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:109
-msgid ""
-"Select which folders from your cloud you want to sync with this computer"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:111
-msgid "Connect"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:112
-msgid "Connect the file sync service with your personal cloud"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:114
-msgid "File Sync is disabled."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:115
-msgid "Disconnect"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:116
-msgid "Disconnect the file sync service from your personal cloud"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:118
-msgid "File Sync is disconnected."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:119
-msgid "Enable"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:120
-msgid "Enable the file sync service"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:121
-msgid "File Sync error."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:122
-msgid "File Sync is up-to-date."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:123
-msgid "Restart"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:124
-msgid "Restart the file sync service"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:125
-msgid "File Sync"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:126
-msgid "Start"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:127
-msgid "Start the file sync service"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:128
-msgid "File Sync starting..."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:129
-msgid "Stop"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:130
-msgid "Stop the file sync service"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:131
-msgid "File Sync is stopped."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:132
-msgid "File Sync in progress..."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:133
-#, python-format
-msgid "%(free_space)s available storage"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:134
-#, python-format
-msgid "Hi %(user_display_name)s"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:135
-#, python-format
-msgid ""
-"You need to install the package <i>%(package_name)s</i> in order to enable "
-"more sync services."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:137
-#, python-format
-msgid "Install the %(plugin_name)s for the sync service: %(service_name)s"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:139
-#, python-format
-msgid "Installation of <i>%(package_name)s</i> in progress"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:140
-msgid "Loading..."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:141
-#, python-format
-msgid "%(app_name)s Control Panel"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:142
-msgid "My folders"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:143
-msgid "[unknown user name]"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:144
-msgid "Purchased Music"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:146
-#, python-format
-msgid "An internet connection is required to join or sign in to %(app_name)s."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:148
-msgid "No devices to show."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:149
-msgid "No folders to show."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:150
-msgid "There is no Ubuntu One pairing record."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:151
-#, python-format
-msgid "%(percentage)s used"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:152
-#, python-format
-msgid "Using %(used)s of %(total)s (%(percentage).0f%%)"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:153
-#, python-format
-msgid "%(used)s of %(total)s"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:154
-msgid "Manage the sync services"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:155
-msgid "Enable the sync services for this computer."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:158
-msgid "Manage the shares offered to others"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:159
-msgid "Manage permissions for shares made to other users."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:160
-#, python-format
-msgid "<i>%(package_name)s</i> was successfully installed"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:161 ../data/gtk/volumes.ui.h:1
-msgid "Sync locally?"
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:162
-msgid "Value could not be retrieved."
-msgstr ""
-
-#: ../ubuntuone/controlpanel/gui/__init__.py:163
-msgid "Unknown error"
-msgstr ""
-
-#: ../data/gtk/dashboard.ui.h:1
-msgid "<b>Personal details</b>"
-msgstr ""
-
-#: ../data/gtk/dashboard.ui.h:2
-msgid "<b>Your services</b>"
-msgstr ""
-
-#: ../data/gtk/dashboard.ui.h:3
-msgid "Buy storage and plans"
-msgstr ""
-
-#: ../data/gtk/dashboard.ui.h:4
-msgid "Edit account details"
-msgstr ""
-
-#: ../data/gtk/device.ui.h:1
-msgid "KiB/s"
-msgstr ""
-
-#: ../data/gtk/device.ui.h:2
-msgid "Limit file sync bandwidth usage"
-msgstr ""
-
-#: ../data/gtk/device.ui.h:3
-msgid "Max download speed:"
-msgstr ""
-
-#: ../data/gtk/device.ui.h:4
-msgid "Max upload speed:"
-msgstr ""
-
-#: ../data/gtk/device.ui.h:5
-msgid "Show activity notifications"
-msgstr ""
-
-#: ../data/gtk/install.ui.h:1
-msgid "_Install now"
-msgstr ""
-
-#: ../data/gtk/management.ui.h:1
-msgid "Account"
-msgstr ""
-
-#: ../data/gtk/management.ui.h:2
-msgid "Cloud Folders"
-msgstr ""
-
-#: ../data/gtk/management.ui.h:3
-msgid "Community Support"
-msgstr ""
-
-#: ../data/gtk/management.ui.h:4
-msgid "Devices"
-msgstr ""
-
-#: ../data/gtk/management.ui.h:5
-msgid "Official Support"
-msgstr ""
-
-#: ../data/gtk/management.ui.h:6
-msgid "Services"
-msgstr ""
-
-#: ../data/gtk/management.ui.h:7
-msgid "Shares"
-msgstr ""
-
-#: ../data/gtk/management.ui.h:8
-msgid "Talk to us on:"
-msgstr ""
-
-#: ../data/gtk/management.ui.h:9
-msgid "http://twitter.com/ubuntuone"
-msgstr ""
-
-#: ../data/gtk/management.ui.h:10
-msgid "http://www.facebook.com/ubuntuone"
-msgstr ""
-
-#: ../data/gtk/overview.ui.h:1
-msgid ""
-"<span font=\"24\" foreground=\"#4d4d4d\">The Power of Your Personal Cloud</"
-"span>"
-msgstr ""
-
-#: ../data/gtk/overview.ui.h:2
-msgid "<span font_size=\"xx-large\" foreground=\"#4d4d4d\">Join now</span>"
-msgstr ""
-
-#: ../data/gtk/overview.ui.h:3
-msgid "<span foreground=\"#909090\">2GB of free storage</span>"
-msgstr ""
-
-#: ../data/gtk/overview.ui.h:4
-msgid "<span foreground=\"#909090\">Learn More</span>"
-msgstr ""
-
-#: ../data/gtk/overview.ui.h:5
-msgid ""
-"Files Anywhere\n"
-"<span foreground=\"#909090\">Back up and access your files from Ubuntu, "
-"Windows, Web or Mobile</span>"
-msgstr ""
-
-#: ../data/gtk/overview.ui.h:7
-msgid "I already have an account!"
-msgstr ""
-
-#: ../data/gtk/overview.ui.h:8
-msgid ""
-"Keep Connected\n"
-"<span foreground=\"#909090\">Unify your contacts across Desktop, Mobile and "
-"Web</span>"
-msgstr ""
-
-#: ../data/gtk/overview.ui.h:10
-msgid ""
-"Rock Out\n"
-"<span foreground=\"#909090\">Your entire collection follows you around with "
-"music streaming to Android and iPhone</span>"
-msgstr ""
-
-#: ../data/gtk/overview.ui.h:12
-msgid ""
-"Stay Productive\n"
-"<span foreground=\"#909090\">Keep your Firefox bookmarks and Tomboy notes "
-"synced</span>"
-msgstr ""
-
-#: ../data/gtk/services.ui.h:1
-msgid "<span font_size=\"small\">Bookmarks sync works with Firefox</span>"
-msgstr ""
-
-#: ../data/gtk/services.ui.h:2
-msgid ""
-"<span font_size=\"small\">Enable and then choose which folders you want to "
-"access from the Web or any device you connected to Ubuntu One\n"
-"\n"
-"Simply drag and drop any file or folder to your Ubuntu One folder on this "
-"computer</span>"
-msgstr ""
-
-#: ../data/gtk/services.ui.h:5
-msgid ""
-"<span font_size=\"small\">Once enabled, visit the <a href=\"https://one."
-"ubuntu.com\">Ubuntu One website</a> to manage your contacts, including Gmail "
-"and Facebook import</span>"
-msgstr ""
-
-#: ../data/gtk/services.ui.h:6
-msgid "Enable Bookmarks Sync"
-msgstr ""
-
-#: ../data/gtk/services.ui.h:7
-msgid "Enable Contacts Sync"
-msgstr ""
-
-#: ../data/gtk/services.ui.h:8
-msgid "Enable File Sync"
-msgstr ""
-
-#: ../data/gtk/services.ui.h:9
-msgid "_Show me my Ubuntu One folder"
-msgstr ""
 
=== modified file 'setup.py'
--- setup.py	2011-08-25 19:37:14 +0000
+++ setup.py	2011-09-26 18:38:27 +0000
@@ -229,12 +229,12 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntuone-control-panel',
-    version='1.1.3',
+    version='2.0.0',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',
     description='Ubuntu One Control Panel',
-    long_description='Application to manage a Ubuntu One account. Provides' \
+    long_description='Application to manage an Ubuntu One account. Provides' \
         ' a DBus service to query/modify all the Ubuntu One bits.',
     url='https://launchpad.net/ubuntuone-control-panel',
     packages=[
 
=== removed file 'ubuntuone-control-panel-gtk.desktop.in'
--- ubuntuone-control-panel-gtk.desktop.in	2011-07-22 21:26:48 +0000
+++ ubuntuone-control-panel-gtk.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Ubuntu One
-_Comment=Configure and manage your Ubuntu One account
-Exec=ubuntuone-control-panel-gtk
-Icon=ubuntuone
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
-StartupNotify=true
-X-Ayatana-Appmenu-Show-Stubs=False
-X-GNOME-Settings-Panel=ubuntuone
 
=== modified file 'ubuntuone-control-panel.in'
--- ubuntuone-control-panel.in	2011-01-27 22:10:30 +0000
+++ ubuntuone-control-panel.in	2011-09-26 18:38:27 +0000
@@ -1,1 +1,1 @@
-@prefix@/share/applications/ubuntuone-control-panel-gtk.desktop
+@prefix@/share/applications/ubuntuone-installer.desktop
 
=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-08-25 19:37:14 +0000
+++ ubuntuone/controlpanel/backend.py	2011-09-26 18:38:27 +0000
@@ -67,8 +67,7 @@
 MSG_KEY = 'message'
 STATUS_KEY = 'status'
 
-BOOKMARKS_PKG = 'xul-ext-bindwood'
-CONTACTS_PKG = 'evolution-couchdb'
+CONTACTS_PKG = 'thunderbird-couchdb'
 
 
 def append_path_sep(path):
@@ -99,7 +98,7 @@
             result = yield f(instance, *args, **kwargs)
         except UnauthorizedError, e:
             logger.exception('process_unauthorized (clearing credentials):')
-            yield instance.login_client.clear_credentials()
+            yield instance.clear_credentials()
             raise e
 
         returnValue(result)
@@ -138,6 +137,8 @@
         self.sd_client = sd_client.SyncDaemonClient()
         self.wc = web_client_factory(self.get_credentials)
 
+        logger.info('ControlBackend: instance started.')
+
     def _process_file_sync_status(self, status):
         """Process raw file sync status into custom format.
 
@@ -297,16 +298,32 @@
     @inlineCallbacks
     def get_credentials(self):
         """Find credentials."""
-        if self._credentials is None:
+        if not self._credentials:
             self._credentials = yield self.login_client.find_credentials()
         returnValue(self._credentials)
 
     @inlineCallbacks
+    def clear_credentials(self):
+        """Clear the credentials."""
+        self._credentials = None
+        yield self.login_client.clear_credentials()
+
+    @inlineCallbacks
     def get_token(self):
         """Return the token from the credentials."""
         credentials = yield self.get_credentials()
         returnValue(credentials["token"])
 
+    @log_call(logger.debug, with_args=False)
+    @inlineCallbacks
+    def login(self, email, password):
+        """Login using 'email' and 'password'."""
+        result = yield self.login_client.login_email_password(
+                    email=email, password=password)
+        # cache credentils
+        self._credentials = result
+        returnValue(result)
+
     @inlineCallbacks
     def device_is_local(self, device_id):
         """Return whether 'device_id' is the local devicew or not."""
@@ -480,7 +497,7 @@
         if is_local:
             logger.warning('remove_device: device is local! removing and '
                            'clearing credentials.')
-            yield self.login_client.clear_credentials()
+            yield self.clear_credentials()
 
         returnValue(device_id)
 
@@ -580,6 +597,7 @@
                                'list (%r).', vid, self._volumes[vid])
             self._volumes[vid] = share
 
+            share[u'realpath'] = share[u'path']
             nicer_path = share[u'path'].replace(shares_dir, shares_dir_link)
             share[u'path'] = nicer_path
             share[u'subscribed'] = bool(share[u'subscribed'])
@@ -690,9 +708,7 @@
         result = []
         for rep in replications:
             dependency = ''
-            if rep == replication_client.BOOKMARKS:
-                dependency = BOOKMARKS_PKG
-            elif rep == replication_client.CONTACTS:
+            if rep == replication_client.CONTACTS:
                 dependency = CONTACTS_PKG
 
             repd = {
@@ -717,18 +733,6 @@
         returnValue(replication_id)
 
     @log_call(logger.debug)
-    def query_bookmark_extension(self):
-        """True if the bookmark extension has been installed."""
-        # still pending (LP: #673672)
-        returnValue(False)
-
-    @log_call(logger.debug)
-    def install_bookmarks_extension(self):
-        """Install the extension to sync bookmarks."""
-        # still pending (LP: #673673)
-        returnValue(None)
-
-    @log_call(logger.debug)
     @inlineCallbacks
     def file_sync_settings_info(self):
         """Get the file sync settings info."""
 
=== added file 'ubuntuone/controlpanel/cache.py'
--- ubuntuone/controlpanel/cache.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/cache.py	2011-09-26 18:38:27 +0000
@@ -0,0 +1,50 @@
+# -*- 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 object that holds a backend instance."""
+
+from ubuntuone.controlpanel import backend
+
+
+class Cache(object):
+    """The base object that caches stuff."""
+
+    logger = None
+    _shared_objects = {}
+
+    def __init__(self, *args, **kwargs):
+        """Initialize the object using 'backend' as backend."""
+        super(Cache, self).__init__()
+        if self.logger is not None:
+            self.logger.debug('%s: started.', self.__class__.__name__)
+
+    def get_backend(self):
+        """A cached ControlBackend instance."""
+        if not self._shared_objects:
+            self._shared_objects['backend'] = backend.ControlBackend()
+        return self._shared_objects['backend']
+
+    def set_backend(self, new_value):
+        """Set a new ControlBackend instance."""
+        self._shared_objects['backend'] = new_value
+
+    backend = property(fget=get_backend, fset=set_backend)
+
+    def clear(self):
+        """Clear all cached objects."""
+        self._shared_objects = {}
 
=== modified file 'ubuntuone/controlpanel/dbus_service.py'
--- ubuntuone/controlpanel/dbus_service.py	2011-08-25 19:37:14 +0000
+++ ubuntuone/controlpanel/dbus_service.py	2011-09-26 18:38:27 +0000
@@ -563,46 +563,6 @@
 
     #---
 
-    @log_call(logger.debug)
-    @method(dbus_interface=DBUS_PREFERENCES_IFACE, in_signature="")
-    def query_bookmark_extension(self):
-        """Check if the extension to sync bookmarks is installed."""
-        d = self.backend.query_bookmark_extension()
-        d.addCallback(self.QueryBookmarksResult)
-        d.addErrback(self.transform(self.QueryBookmarksError))
-
-    @log_call(logger.debug)
-    @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="b")
-    def QueryBookmarksResult(self, enabled):
-        """The bookmark extension is or is not installed."""
-
-    @log_call(logger.error)
-    @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="a{ss}")
-    def QueryBookmarksError(self, error):
-        """Problem getting the status of the extension."""
-
-    #---
-
-    @log_call(logger.info)
-    @method(dbus_interface=DBUS_PREFERENCES_IFACE, in_signature="")
-    def install_bookmarks_extension(self):
-        """Install the extension to sync bookmarks."""
-        d = self.backend.install_bookmarks_extension()
-        d.addCallback(lambda _: self.InstallBookmarksSuccess())
-        d.addErrback(self.transform(self.InstallBookmarksError))
-
-    @log_call(logger.info)
-    @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="")
-    def InstallBookmarksSuccess(self):
-        """The extension to sync bookmarks has been installed."""
-
-    @log_call(logger.error)
-    @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="a{ss}")
-    def InstallBookmarksError(self, error):
-        """Problem installing the extension to sync bookmarks."""
-
-    #---
-
     @log_call(logger.info)
     @method(dbus_interface=DBUS_PREFERENCES_IFACE, in_signature="")
     def shutdown(self):
 
=== modified file 'ubuntuone/controlpanel/dbustests/test_dbus_service.py'
--- ubuntuone/controlpanel/dbustests/test_dbus_service.py	2011-08-25 19:37:14 +0000
+++ ubuntuone/controlpanel/dbustests/test_dbus_service.py	2011-09-26 18:38:27 +0000
@@ -50,7 +50,7 @@
         "limit_bandwidth": True,
         "max_upload_speed": 12345,
         "max_download_speed": 54321,
-        "available_services": "files, contacts, music, bookmarks",
+        "available_services": "files, contacts, music",
         "enabled_services": "files, music",
     },
     {
@@ -59,8 +59,8 @@
         "date_added": "2010-09-22T20:45:38.0",
         "type": "computer",
         "configurable": False,
-        "available_services": "files, contacts, bookmarks",
-        "enabled_services": "files, bookmarks",
+        "available_services": "files, contacts",
+        "enabled_services": "files",
     },
 ]
 
@@ -244,14 +244,6 @@
         """Configure a given replication."""
         return self._process(replication_id)
 
-    def query_bookmark_extension(self):
-        """True if the bookmark extension has been installed."""
-        return self._process(False)
-
-    def install_bookmarks_extension(self):
-        """Install the extension to sync bookmarks."""
-        return self._process(None)
-
     def shutdown(self):
         """Stop this service."""
         self.shutdown_func()
@@ -616,29 +608,6 @@
                 expected_replication_id, {'enabled': ''})
         return self.assert_correct_method_call(*args)
 
-    def test_query_bookmarks_extension(self):
-        """The bookmarks extension is queried."""
-
-        def got_signal(enabled):
-            """The correct status was received."""
-            self.assertEqual(enabled, False)
-            self.deferred.callback("success")
-
-        args = ("QueryBookmarksResult", "QueryBookmarksError", got_signal,
-                self.backend.query_bookmark_extension)
-        return self.assert_correct_method_call(*args)
-
-    def test_install_bookmarks_extension(self):
-        """The bookmarks extension is installed."""
-
-        def got_signal():
-            """The extension was installed."""
-            self.deferred.callback("success")
-
-        args = ("InstallBookmarksSuccess", "InstallBookmarksError", got_signal,
-                self.backend.install_bookmarks_extension)
-        return self.assert_correct_method_call(*args)
-
 
 class OperationsErrorTestCase(OperationsTestCase):
     """Test for the DBus service operations when there is an error."""
 
=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2011-09-26 18:38:27 +0000
@@ -51,28 +51,29 @@
 MUSIC_STORE_ICON = 'music-store.png'
 MUSIC_STREAM_ICON = 'music-stream.png'
 NOTES_ICON = 'notes.png'
-SERVICES_BOOKMARKS_ICON = 'services-bookmarks.png'
 SERVICES_CONTACTS_ICON = 'services-contacts.png'
 SERVICES_FILES_EXAMPLE = 'services-files-example.png'
 SERVICES_FILES_ICON = 'services-files.png'
 
 FILE_URI_PREFIX = 'file://'
+UBUNTUONE_FROM_OAUTH = 'https://one.ubuntu.com/api/1.0/from_oauth/'
 UBUNTUONE_LINK = 'https://one.ubuntu.com/'
 
 CONTACTS_LINK = UBUNTUONE_LINK
 EDIT_ACCOUNT_LINK = UBUNTUONE_LINK + 'account/'
 EDIT_DEVICES_LINK = EDIT_ACCOUNT_LINK + 'machines/'
 EDIT_PROFILE_LINK = 'https://login.ubuntu.com/'
+EDIT_SERVICES_LINK = UBUNTUONE_LINK + 'services'
 FACEBOOK_LINK = 'http://www.facebook.com/ubuntuone/'
 GET_SUPPORT_LINK = UBUNTUONE_LINK + 'support/'
 LEARN_MORE_LINK = UBUNTUONE_LINK
 MANAGE_FILES_LINK = UBUNTUONE_LINK + 'files/'
+RESET_PASSWORD_LINK = EDIT_PROFILE_LINK + '+forgot_password'
 TWITTER_LINK = 'http://twitter.com/ubuntuone/'
 
 ALWAYS_SUBSCRIBED = _('Always in sync')
-BOOKMARKS = _('Firefox extension')
 CONNECT_BUTTON_LABEL = _('Connect to Ubuntu One')
-CONTACTS = _('Evolution plug-in')
+CONTACTS = _('Thunderbird plug-in')
 CREDENTIALS_ERROR = _('There was a problem while retrieving the credentials.')
 DASHBOARD_BUTTON_TOOLTIP = _('View your personal details and service '
                              'summary')
@@ -188,9 +189,8 @@
                                    credentials["consumer_secret"])
     token = oauth.OAuthToken(credentials["token"],
                              credentials["token_secret"])
-    uri = 'https://one.ubuntu.com/api/1.0/from_oauth/'
     request = oauth.OAuthRequest.from_consumer_and_token(
-        http_url=uri, http_method='GET',
+        http_url=UBUNTUONE_FROM_OAUTH, http_method='GET',
         oauth_consumer=consumer, token=token,
         parameters={'next': url})
     sig_method = oauth.OAuthSignatureMethod_HMAC_SHA1()
 
=== modified file 'ubuntuone/controlpanel/gui/gtk/gui.py'
--- ubuntuone/controlpanel/gui/gtk/gui.py	2011-08-25 19:37:14 +0000
+++ ubuntuone/controlpanel/gui/gtk/gui.py	2011-09-26 18:38:27 +0000
@@ -62,7 +62,7 @@
 try:
     from gi.repository import Unity     # pylint: disable=E0611
     USE_LIBUNITY = True
-    U1_DOTDESKTOP = "ubuntuone-control-panel-gtk.desktop"
+    U1_DOTDESKTOP = "ubuntuone-installer.desktop"
 except ImportError:
     USE_LIBUNITY = False
 
@@ -71,6 +71,9 @@
 
 WARNING_MARKUP = '<span foreground="%s"><b>%%s</b></span>' % ERROR_COLOR
 
+CP_WMCLASS_NAME = 'ubuntuone-control-panel-gtk'
+CP_WMCLASS_CLASS = 'ubuntuone-installer'
+
 
 def error_handler(*args, **kwargs):
     """Log errors when calling D-Bus methods in a async way."""
@@ -1118,11 +1121,8 @@
         self.files_icon.set_from_file(get_data_file(SERVICES_FILES_ICON))
         self.files_example.set_from_file(get_data_file(SERVICES_FILES_EXAMPLE))
         self.contacts_icon.set_from_file(get_data_file(SERVICES_CONTACTS_ICON))
-        icon = get_data_file(SERVICES_BOOKMARKS_ICON)
-        self.bookmarks_icon.set_from_file(icon)
 
-        self.plugin_names = {'contacts': CONTACTS,
-                             'bookmarks': BOOKMARKS}
+        self.plugin_names = {'contacts': CONTACTS}
 
         self.package_manager = package_manager.PackageManager()
         self.install_box = None
@@ -1161,13 +1161,6 @@
         """
         uri_hook(None, CONTACTS)
 
-    def on_bookmarks_button_clicked(self, *args, **kwargs):
-        """The bookmarks button was clicked.
-
-        XXX: this should be part of the DesktopcouchService widget.
-
-        """
-
     @log_call(logger.debug)
     def load(self):
         """Load info."""
@@ -1614,6 +1607,10 @@
     def __init__(self, switch_to='', alert=False):
         super(ControlPanelWindow, self).__init__()
 
+        # We need to set WMCLASS so Unity falls back and we only get one
+        # launcher on the launcher panel
+        self.set_wmclass(CP_WMCLASS_NAME, CP_WMCLASS_CLASS)
+
         self.connect('focus-in-event', self.remove_urgency)
         self.set_title(MAIN_WINDOW_TITLE % {'app_name': U1_APP_NAME})
         self.set_position(gtk.WIN_POS_CENTER_ALWAYS)
 
=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/__init__.py'
--- ubuntuone/controlpanel/gui/gtk/tests/__init__.py	2011-08-25 19:37:14 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/__init__.py	2011-09-26 18:38:27 +0000
@@ -109,8 +109,8 @@
     ]
 
 
-class FakeControlPanelBackend(FakedDBusBackend):
-    """Fake a Control Panel Service, act as a dbus.Interface."""
+class FakedGUIBackend(FakedDBusBackend):
+    """Fake a Control Panel GUI Service, act as a dbus.Interface."""
 
     bus_name = gui.DBUS_BUS_NAME_GUI
     object_path = gui.DBUS_PATH_GUI
@@ -135,7 +135,7 @@
             return FakedControlPanelBackend(obj, dbus_interface,
                                             *args, **kwargs)
         if dbus_interface == gui.DBUS_IFACE_GUI:
-            return FakeControlPanelBackend(
+            return FakedGUIBackend(
                 obj, dbus_interface, *args, **kwargs)
 
 
 
=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-08-25 19:37:14 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-09-26 18:38:27 +0000
@@ -122,6 +122,14 @@
         self.assertEqual(
             self._called, ((), {}), 'gtk.main_quit was not called.')
 
+    def test_wmclass_is_correct(self):
+        """Test that the WMCLASS is set."""
+        self.patch(gui.ControlPanelWindow, 'set_wmclass', self._set_called)
+        cp = gui.ControlPanelWindow()
+        cp.destroy()
+        expected = ((gui.CP_WMCLASS_NAME, gui.CP_WMCLASS_CLASS), {})
+        self.assertEqual(self._called, expected)
+
     def test_title_is_correct(self):
         """The window title is correct."""
         expected = gui.MAIN_WINDOW_TITLE % {'app_name': gui.U1_APP_NAME}
@@ -315,7 +323,7 @@
 
 
 class UbuntuOneBinTestCase(BaseTestCase):
-    """The test suite for a Ubuntu One panel."""
+    """The test suite for the Ubuntu One panel."""
 
     klass = gui.UbuntuOneBin
     kwargs = {'title': 'Something old, something new and something blue.'}
 
=== modified file 'ubuntuone/controlpanel/gui/qt/__init__.py'
--- ubuntuone/controlpanel/gui/qt/__init__.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/__init__.py	2011-09-26 18:38:27 +0000
@@ -18,13 +18,25 @@
 
 """The Qt graphical interface for the control panel for Ubuntu One."""
 
+import collections
+import logging
+
+from functools import wraps
+
 from PyQt4 import QtGui, QtCore
+from twisted.internet import defer
+
+from ubuntuone.controlpanel.gui import FILE_URI_PREFIX
 
 
 def uri_hook(uri):
     """Open an URI using the default browser/file manager."""
-    url = QtCore.QString(uri)
-    QtGui.QDesktopServices.openUrl(QtCore.QUrl(url))
+    if uri.startswith(FILE_URI_PREFIX):
+        url = QtCore.QUrl(uri)
+    else:
+        url = QtCore.QUrl()
+        url.setEncodedUrl(uri)
+    QtGui.QDesktopServices.openUrl(url)
 
 
 def pixmap_from_name(icon_name):
@@ -52,3 +64,46 @@
     icon.icon_name = icon_name
 
     return icon
+
+
+def handle_errors(error_handler=None, logger=None):
+    """Decorator to handle errors when calling a function.
+
+    if 'error_handler' is not None, it will be yielded on if any error happens.
+
+    """
+    if logger is None:
+        logger = logging.getLogger()
+
+    def middle(f):
+        """Decorator to handle errors when calling 'f'."""
+
+        @defer.inlineCallbacks
+        @wraps(f)
+        def inner(*args, **kwargs):
+            """Call 'f' passing 'args' and 'kwargs'.
+
+            Catch any error and show a error message.
+
+            """
+            try:
+                res = yield f(*args, **kwargs)
+            except Exception, e:  # pylint: disable=W0703
+                logger.exception(f.__name__)
+            else:
+                defer.returnValue(res)
+
+            # this code will only be executed if there was an exception
+            if error_handler is not None:
+                yield error_handler()
+
+            if len(e.args) > 0 and isinstance(e.args[0], collections.Mapping):
+                msgs = e.args[0].itervalues()
+            else:
+                msgs = [e.__class__.__name__] + map(repr, e.args)
+            msg = '\n'.join(msgs)
+            QtGui.QMessageBox.warning(None, '', msg, QtGui.QMessageBox.Close)
+
+        return inner
+
+    return middle
 
=== modified file 'ubuntuone/controlpanel/gui/qt/account.py'
--- ubuntuone/controlpanel/gui/qt/account.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/account.py	2011-09-26 18:38:27 +0000
@@ -37,12 +37,15 @@
     """The Account Tab Panel widget"""
 
     ui_class = account_ui
+    logger = logger
 
     def _setup(self):
         """Do some extra setupping for the UI."""
+        super(AccountPanel, self)._setup()
         self.ui.edit_profile_button.uri = EDIT_PROFILE_LINK
         self.ui.edit_services_button.uri = EDIT_ACCOUNT_LINK
 
+    # pylint: disable=E0202
     @defer.inlineCallbacks
     def load(self):
         """Load info."""
 
=== modified file 'ubuntuone/controlpanel/gui/qt/addfolder.py'
--- ubuntuone/controlpanel/gui/qt/addfolder.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/addfolder.py	2011-09-26 18:38:27 +0000
@@ -25,11 +25,10 @@
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
 
-from ubuntuone.controlpanel import backend
+from ubuntuone.controlpanel import cache
 from ubuntuone.controlpanel.logger import setup_logging
-from ubuntuone.controlpanel.gui import (
-    FOLDER_INVALID_PATH,
-)
+from ubuntuone.controlpanel.gui import FOLDER_INVALID_PATH
+from ubuntuone.controlpanel.gui.qt import handle_errors
 
 
 logger = setup_logging('qt.addfolder')
@@ -37,9 +36,11 @@
 CLOSE = QtGui.QMessageBox.Close
 
 
-class AddFolderButton(QtGui.QPushButton):
+class AddFolderButton(cache.Cache, QtGui.QPushButton):
     """The AddFolderButton widget"""
 
+    logger = logger
+
     folderCreated = QtCore.pyqtSignal(unicode)
     folderCreationCanceled = QtCore.pyqtSignal()
 
@@ -47,16 +48,17 @@
         """Initialize the UI of the widget."""
         super(AddFolderButton, self).__init__(*args, **kwargs)
         self.cloud_folders = []
-        self.backend = backend.ControlBackend()
         self.clicked.connect(self.on_clicked)
-        logger.debug('%s: started.', self.__class__.__name__)
 
     @QtCore.pyqtSlot()
+    @handle_errors(logger=logger)
     @defer.inlineCallbacks
     def on_clicked(self):
         """The 'Sync another folder' button was clicked."""
-        folder = QtGui.QFileDialog.getExistingDirectory(parent=self)
-        folder = unicode(folder)
+        # The options argument is because of LP: #835013
+        folder = QtGui.QFileDialog.getExistingDirectory(
+            parent=self, options=QtGui.QFileDialog.DontUseNativeDialog)
+        folder = unicode(QtCore.QDir.toNativeSeparators(folder))
         logger.debug('on_add_folder_button_clicked: user requested folder '
                      'creation for path %r', folder)
         if folder == '':
 
=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2011-09-26 18:38:27 +0000
@@ -21,62 +21,79 @@
 
 from __future__ import division
 
-from PyQt4 import QtGui, QtCore
+from PyQt4 import QtCore
 from twisted.internet import defer
 
-from ubuntuone.controlpanel import backend
+from ubuntuone.controlpanel.backend import AUTOCONNECT_KEY
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
     humanize,
-    EDIT_ACCOUNT_LINK,
+    EDIT_SERVICES_LINK,
     FACEBOOK_LINK,
     GET_SUPPORT_LINK,
     GREETING,
     PERCENTAGE_LABEL,
+    QUOTA_THRESHOLD,
     TWITTER_LINK,
     USAGE_LABEL,
 )
-from ubuntuone.controlpanel.gui.qt import uri_hook
+from ubuntuone.controlpanel.gui import qt
+from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
 from ubuntuone.controlpanel.gui.qt.ui import controlpanel_ui
 
 
 logger = setup_logging('qt.controlpanel')
 
-NAME_STYLE = '<br><span style=" font-size:24pt;">%s!</span>'
+NAME_STYLE = '<br><span style=" font-size:16pt;">%s!</span>'
 PERCENTAGE_STYLE = '<span style=" font-size:16pt;">%.0f%%</span>'
 
 
-class ControlPanel(QtGui.QWidget):
+class ControlPanel(UbuntuOneBin):
     """The Control Panel widget"""
 
-    def __init__(self, parent=None):
-        """Initialize the UI of the widget."""
-        QtGui.QWidget.__init__(self, parent)
-        self.ui = controlpanel_ui.Ui_Form()
-        self.ui.setupUi(self)
-
-        self.backend = backend.ControlBackend()
-        self._setup()
-        logger.debug('%s: started.', self.__class__.__name__)
+    ui_class = controlpanel_ui
+    logger = logger
 
     def _setup(self):
         """Do some extra setupping for the UI."""
-        self.ui.get_more_space_button.uri = EDIT_ACCOUNT_LINK
+        self.ui.get_more_space_button.uri = EDIT_SERVICES_LINK
         self.ui.help_button.uri = GET_SUPPORT_LINK
-
-    # Invalid name "showEvent"
-    # pylint: disable=C0103
-
-    def showEvent(self, event):
-        """Load info."""
-        self.load()
-        event.accept()
-
+        self.ui.devices_tab.localDeviceRemoved.connect(
+            self.on_credentials_not_found)
+        self.ui.signin.credentialsFound.connect(lambda creds: self.load())
+
+    @defer.inlineCallbacks
+    def connect_file_sync(self):
+        """Connect file sync service if the setting autoconnect is enabled."""
+        settings = yield self.backend.file_sync_settings_info()
+        if AUTOCONNECT_KEY in settings and settings[AUTOCONNECT_KEY]:
+            yield self.backend.connect_files()
+
+    @log_call(logger.debug)
+    def on_credentials_not_found(self):
+        """Credentials are not found or were removed."""
+        self.ui.switcher.setCurrentWidget(self.ui.signin)
+        self.is_processing = False
+
+    @log_call(logger.debug)
+    def on_credentials_found(self):
+        """Credentials are not found or were removed."""
+        self.ui.switcher.setCurrentWidget(self.ui.management)
+        self.connect_file_sync()
+        self.is_processing = False
+
+    # pylint: disable=E0202
     @defer.inlineCallbacks
     def load(self):
         """Load info."""
-        info = yield self.backend.account_info()
-        self.process_info(info)
+        self.is_processing = True
+        credentials = yield self.backend.get_credentials()
+        if not credentials:
+            self.on_credentials_not_found()
+        else:
+            self.on_credentials_found()
+            info = yield self.backend.account_info()
+            self.process_info(info)
 
     @log_call(logger.debug)
     def process_info(self, info):
@@ -86,17 +103,43 @@
 
         used = int(info['quota_used'])
         total = int(info['quota_total'])
-        percentage = {'percentage': PERCENTAGE_STYLE % ((used / total) * 100)}
+        percentage_value = ((used / total) * 100)
+        percentage = {'percentage': PERCENTAGE_STYLE % percentage_value}
         data = {'used': humanize(used), 'total': humanize(total)}
         self.ui.percentage_usage_label.setText(PERCENTAGE_LABEL % percentage)
         self.ui.quota_usage_label.setText(USAGE_LABEL % data)
+        self._update_quota({'percentage': percentage_value})
+
+    @log_call(logger.debug)
+    def _update_quota(self, data=None):
+        """Update the quota info."""
+        fraction = 0.0
+        if data is not None:
+            fraction = data.get('percentage', 0.0) / 100
+            if fraction > 0 and fraction < 0.05:
+                fraction = 0.05
+            else:
+                fraction = round(fraction, 2)
+
+        logger.debug('ManagementPanel: updating quota to %r.', fraction)
+        self.ui.percentage_usage_label.setProperty("OverQuota",
+            fraction >= QUOTA_THRESHOLD)
+        self.ui.quota_usage_label.setProperty("OverQuota",
+            fraction >= QUOTA_THRESHOLD)
+        self.ui.percentage_usage_label.style().unpolish(
+            self.ui.percentage_usage_label)
+        self.ui.percentage_usage_label.style().polish(
+            self.ui.percentage_usage_label)
+        self.ui.quota_usage_label.style().unpolish(
+            self.ui.quota_usage_label)
+        self.ui.quota_usage_label.style().polish(self.ui.quota_usage_label)
 
     @QtCore.pyqtSlot()
     def on_twitter_button_clicked(self):
         """The twitter button was clicked."""
-        uri_hook(TWITTER_LINK)
+        qt.uri_hook(TWITTER_LINK)
 
     @QtCore.pyqtSlot()
     def on_facebook_button_clicked(self):
         """The facebook button was clicked."""
-        uri_hook(FACEBOOK_LINK)
+        qt.uri_hook(FACEBOOK_LINK)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/device.py'
--- ubuntuone/controlpanel/gui/qt/device.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/device.py	2011-09-26 18:38:27 +0000
@@ -25,9 +25,15 @@
     DEVICE_TYPE_COMPUTER,
     DEVICE_TYPE_PHONE,
 )
+from ubuntuone.controlpanel import cache
 from ubuntuone.controlpanel.gui import DEVICE_CONFIRM_REMOVE
-from ubuntuone.controlpanel.gui.qt import icon_from_name, pixmap_from_name
+from ubuntuone.controlpanel.gui.qt import (
+    handle_errors,
+    icon_from_name,
+    pixmap_from_name,
+)
 from ubuntuone.controlpanel.gui.qt.ui import device_ui
+from ubuntuone.controlpanel.logger import setup_logging
 
 COMPUTER_ICON = "computer"
 PHONE_ICON = "phone"
@@ -43,25 +49,27 @@
 YES = QtGui.QMessageBox.Yes
 
 
+logger = setup_logging('qt.device')
+
+
 def icon_name_from_type(device_type):
     """Get the icon name for the device."""
     icon_name = DEVICE_TYPE_TO_ICON_MAP.get(device_type, DEFAULT_ICON)
     return icon_name
 
 
-class DeviceWidget(QtGui.QWidget):
+class DeviceWidget(cache.Cache, QtGui.QWidget):
     """The widget for each device in the control panel."""
 
     removed = QtCore.pyqtSignal()
     removeCanceled = QtCore.pyqtSignal()
 
-    def __init__(self, backend, device_id, **kwargs):
+    def __init__(self, device_id, *args, **kwargs):
         """Initialize the UI of the widget."""
-        QtGui.QWidget.__init__(self, **kwargs)
+        super(DeviceWidget, self).__init__(*args, **kwargs)
         self.ui = device_ui.Ui_Form()
         self.ui.setupUi(self)
         self.id = device_id
-        self.backend = backend
 
     def update_device_info(self, device_info):
         """Update the device info."""
@@ -70,8 +78,9 @@
         pixmap = pixmap_from_name(icon_name)
         self.ui.device_icon_label.setPixmap(pixmap)
 
+    @QtCore.pyqtSlot()
+    @handle_errors(logger=logger)
     @defer.inlineCallbacks
-    @QtCore.pyqtSlot()
     def on_remove_device_button_clicked(self):
         """The user wants to remove this device."""
         msg = DEVICE_CONFIRM_REMOVE
 
=== modified file 'ubuntuone/controlpanel/gui/qt/devices.py'
--- ubuntuone/controlpanel/gui/qt/devices.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/devices.py	2011-09-26 18:38:27 +0000
@@ -18,8 +18,6 @@
 
 """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
@@ -39,13 +37,17 @@
 class DevicesPanel(UbuntuOneBin):
     """The DevicesFolders Tab Panel widget"""
 
-    title = _('This device')
     ui_class = devices_ui
+    logger = logger
+
+    localDeviceRemoved = QtCore.pyqtSignal()
 
     def _setup(self):
         """Do some extra setupping for the UI."""
+        super(DevicesPanel, self)._setup()
         self.ui.manage_devices_button.uri = EDIT_DEVICES_LINK
 
+    # pylint: disable=E0202
     @defer.inlineCallbacks
     def load(self):
         """Load info."""
@@ -64,6 +66,11 @@
 
         self.is_processing = False
 
+    def on_local_device_removed(self):
+        """When the local device is removed, clear the box and emit signal."""
+        self.clear_device_info(self.ui.local_device_box)
+        self.localDeviceRemoved.emit()
+
     def clear_device_info(self, box):
         """Clear all the device info."""
         children = box.count()
@@ -84,11 +91,9 @@
 
     def update_local_device(self, device_info):
         """Update the info for the local device."""
-        device_widget = device.DeviceWidget(backend=self.backend,
-                                            device_id=device_info['device_id'])
+        device_widget = device.DeviceWidget(device_id=device_info['device_id'])
         device_widget.update_device_info(device_info)
-        f = lambda: self.clear_device_info(self.ui.local_device_box)
-        device_widget.removed.connect(f)
+        device_widget.removed.connect(self.on_local_device_removed)
 
         self.ui.local_device_box.addWidget(device_widget)
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2011-08-25 19:37:14 +0000
+++ ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2011-09-26 18:38:27 +0000
@@ -21,7 +21,7 @@
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
 
-from ubuntuone.controlpanel import backend
+from ubuntuone.controlpanel import backend, cache
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
     ERROR_COLOR,
@@ -108,27 +108,26 @@
     return icon_name
 
 
-class FileSyncStatus(QtGui.QWidget):
+class FileSyncStatus(cache.Cache, QtGui.QWidget):
     """The FileSyncStatus widget"""
 
-    def __init__(self, parent=None):
+    def __init__(self, *args, **kwargs):
         """Initialize the UI of the widget."""
-        QtGui.QWidget.__init__(self, parent)
+        super(FileSyncStatus, self).__init__(*args, **kwargs)
         self.ui = filesyncstatus_ui.Ui_Form()
         self.ui.setupUi(self)
 
         self._backend_method = None
-        self.backend = backend.ControlBackend()
-
-        logger.debug('%s: started.', self.__class__.__name__)
 
     # Invalid name "showEvent"
     # pylint: disable=C0103
 
     def showEvent(self, event):
         """Load info."""
+        super(FileSyncStatus, self).showEvent(event)
         self.load()
-        event.accept()
+
+    # pylint: enable=C0103
 
     @defer.inlineCallbacks
     def load(self):
 
=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2011-09-26 18:38:27 +0000
@@ -29,7 +29,6 @@
 from ubuntuone.controlpanel.gui import (
     ALWAYS_SUBSCRIBED,
     EXPLORE,
-    FILE_URI_PREFIX,
     FOLDER_ICON_NAME,
     FOLDER_OWNED_BY,
     FOLDER_SHARED_BY,
@@ -65,11 +64,12 @@
     """The Folders Tab Panel widget"""
 
     ui_class = folders_ui
+    logger = logger
 
     def _setup(self):
         """Do some extra setupping for the UI."""
-        load_info = lambda *a, **kw: self.load()
-        self.ui.add_folder_button.folderCreated.connect(load_info)
+        super(FoldersPanel, self)._setup()
+        self.ui.add_folder_button.folderCreated.connect(self.on_folder_created)
 
         headers = self.ui.folders.header()
         headers.setResizeMode(FOLDER_NAME_COL, headers.Stretch)
@@ -81,8 +81,16 @@
         icon = icon_from_name('external_icon_orange')
         self.ui.share_publish_button.setIcon(icon)
 
-        logger.debug('%s: started.', self.__class__.__name__)
+    @log_call(logger.info)
+    def on_folder_created(self, new_folder):
+        """Reload folder info after folder creation."""
+        self.is_processing = True
+        # hack to ensure that syncdaemon updates the folder list.
+        # pylint: disable=W0404, E1101
+        from twisted.internet import reactor
+        reactor.callLater(2, self.load)
 
+    # pylint: disable=E0202
     @defer.inlineCallbacks
     def load(self):
         """Load specific tab info."""
@@ -124,9 +132,15 @@
             self.ui.folders.addTopLevelItem(item)
 
             for volume in volumes:
+                is_root = volume[u'type'] == self.backend.ROOT_TYPE
+                is_share = volume[u'type'] == self.backend.SHARE_TYPE
+
                 child = QtGui.QTreeWidgetItem()
                 child.setSizeHint(FOLDER_NAME_COL, QtCore.QSize(-1, 35))
-                child.volume_path = volume['path']
+                if is_share and 'realpath' in volume:
+                    child.volume_path = volume['realpath']
+                else:
+                    child.volume_path = volume['path']
                 child.volume_id = volume['volume_id']
 
                 name = self._process_name(volume[u'display_name'])
@@ -134,9 +148,6 @@
                 child.setToolTip(FOLDER_NAME_COL, name)
                 child.setToolTip(EXPLORE_COL, EXPLORE)
 
-                is_root = volume[u'type'] == self.backend.ROOT_TYPE
-                is_share = volume[u'type'] == self.backend.SHARE_TYPE
-
                 icon_name = FOLDER_ICON_NAME
                 if is_share:
                     icon_name = SHARE_ICON_NAME
@@ -173,12 +184,14 @@
                 policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,
                                            QtGui.QSizePolicy.Fixed)
                 button.setSizePolicy(policy)
+                button.setEnabled(bool(volume[u'subscribed']))
 
                 # Operator not preceded by a space
                 # pylint: disable=C0322
-                cb = lambda item=child: self.on_folders_itemActivated(item)
+                cb = lambda checked, item=child: \
+                    self.on_folders_itemActivated(item)
                 # pylint: enable=C0322
-                QtCore.QObject.connect(button, QtCore.SIGNAL('clicked()'), cb)
+                button.clicked.connect(cb)
                 self.ui.folders.setIndexWidget(model_index, button)
 
         self.ui.folders.expandAll()
@@ -196,7 +209,7 @@
             logger.warning('on_folders_itemActivated: stored path %r '
                            'does not exist.', volume_path)
         else:
-            uri = FILE_URI_PREFIX + volume_path
+            uri = unicode(QtCore.QUrl.fromLocalFile(volume_path).toString())
             uri_hook(uri)
 
     @defer.inlineCallbacks
@@ -230,6 +243,7 @@
             # user accepted, merge the folder content
             yield self.backend.change_volume_settings(volume_id,
                                                 {'subscribed': subscribed})
+            self.load()
         else:
             # restore old value
             old = UNCHECKED if subscribed else CHECKED
 
=== modified file 'ubuntuone/controlpanel/gui/qt/gotoweb.py'
--- ubuntuone/controlpanel/gui/qt/gotoweb.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/gotoweb.py	2011-09-26 18:38:27 +0000
@@ -20,10 +20,13 @@
 
 from PyQt4 import QtGui, QtCore
 
-from ubuntuone.controlpanel.gui import qt
-
-
-class GoToWebButton(QtGui.QPushButton):
+from twisted.internet import defer
+
+from ubuntuone.controlpanel import cache
+from ubuntuone.controlpanel.gui import qt, sign_url, UBUNTUONE_LINK
+
+
+class GoToWebButton(cache.Cache, QtGui.QPushButton):
     """The GoToWebButton widget"""
 
     def __init__(self, *args, **kwargs):
@@ -33,9 +36,20 @@
         self.setIcon(qt.icon_from_name('external_icon_white'))
         self.setLayoutDirection(QtCore.Qt.RightToLeft)
         self.clicked.connect(self.on_clicked)
+        self.setCursor(QtGui.QCursor(QtCore.Qt.PointingHandCursor))
 
+    @defer.inlineCallbacks
     @QtCore.pyqtSlot()
     def on_clicked(self):
         """Open self.uri if not None, do nothing otherwise."""
         if self.uri is not None:
-            qt.uri_hook(self.uri)
+
+            credentials = None
+            if self.uri.startswith(UBUNTUONE_LINK):
+                credentials = yield self.backend.get_credentials()
+
+            uri = self.uri
+            if credentials:
+                uri = sign_url(uri, credentials)
+
+            qt.uri_hook(uri)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2011-09-26 18:38:27 +0000
@@ -21,22 +21,24 @@
 
 from PyQt4 import QtGui
 
-from ubuntuone.controlpanel.logger import setup_logging
+from ubuntuone.controlpanel.gui.qt.systray import TrayIcon
 from ubuntuone.controlpanel.gui.qt.ui import mainwindow_ui
 
 
-logger = setup_logging('qt.gui')
-
-
 class MainWindow(QtGui.QMainWindow):
     """The Main Window of the Control Panel."""
 
     def __init__(self, close_callback=None):
         """Initialize this instance with the UI layout."""
-        QtGui.QMainWindow.__init__(self)
+        super(MainWindow, self).__init__()
         self.ui = mainwindow_ui.Ui_MainWindow()
         self.ui.setupUi(self)
         self.close_callback = close_callback
+        self._setup()
+
+    def _setup(self):
+        """Do some extra setupping for the UI."""
+        self.ui.control_panel.ui.signin.signinCanceled.connect(self.close)
 
     # Invalid name "closeEvent"
     # pylint: disable=C0103
@@ -46,3 +48,24 @@
         if self.close_callback is not None:
             self.close_callback()
         event.accept()
+
+    # pylint: enable=C0103
+
+
+def start(stop, minimized=False, with_icon=False):
+    """Show the UI elements."""
+    # pylint: disable=W0404, F0401
+    if not minimized:
+        if with_icon or minimized:
+            window = MainWindow()
+        else:
+            window = MainWindow(close_callback=stop)
+        window.show()
+    else:
+        window = None
+    if with_icon or minimized:
+        QtGui.QApplication.instance().setQuitOnLastWindowClosed(False)
+        icon = TrayIcon(window=window)
+    else:
+        icon = None
+    return icon, window
 
=== modified file 'ubuntuone/controlpanel/gui/qt/loadingoverlay.py'
--- ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/loadingoverlay.py	2011-09-26 18:38:27 +0000
@@ -18,8 +18,7 @@
 
 """Loading animation over a widget."""
 
-from PyQt4 import QtGui
-from PyQt4 import QtCore
+from PyQt4 import QtGui, QtCore
 
 from ubuntuone.controlpanel.gui.qt.ui import loadingoverlay_ui
 
@@ -29,12 +28,15 @@
 
     In order to have this working, the Widget which is going to use this
     overlay has to reimplement the resizeEvent as follows:
+
     def resizeEvent(self, event):
         self.overlay.resize(event.size())
-        event.accept()"""
+        event.accept()
+
+    """
 
     def __init__(self, parent=None):
-        QtGui.QFrame.__init__(self, parent)
+        super(LoadingOverlay, self).__init__(parent=parent)
         self.ui = loadingoverlay_ui.Ui_Form()
         self.ui.setupUi(self)
 
 
=== modified file 'ubuntuone/controlpanel/gui/qt/main/linux.py'
--- ubuntuone/controlpanel/gui/qt/main/linux.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/main/linux.py	2011-09-26 18:38:27 +0000
@@ -29,7 +29,7 @@
 # pylint: enable=W0611
 
 
-def main(switch_to='', alert=False):
+def main(switch_to='', alert=False, minimized=False, with_icon=False):
     """Start the Qt reactor and open the main window."""
 
     # The DBus main loop MUST be initialized before importing the reactor
@@ -49,11 +49,9 @@
     from qtreactor import qt4reactor
     qt4reactor.install()
     from twisted.internet import reactor
+    from ubuntuone.controlpanel.gui.qt.gui import start
 
-    # pylint believes that reactor has no run nor stop methods. Silence it.
     # pylint: disable=E1101
-    from ubuntuone.controlpanel.gui.qt.gui import MainWindow
-    window = MainWindow(close_callback=reactor.stop)
-    window.show()
-
+    icon, window = start(reactor.stop,
+        minimized=minimized, with_icon=with_icon)
     reactor.run()
 
=== modified file 'ubuntuone/controlpanel/gui/qt/main/windows.py'
--- ubuntuone/controlpanel/gui/qt/main/windows.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/main/windows.py	2011-09-26 18:38:27 +0000
@@ -27,7 +27,7 @@
 # pylint: enable=W0611
 
 
-def main(switch_to='', alert=False):
+def main(switch_to='', alert=False, minimized=False, with_icon=False):
     """Start the Qt reactor and open the main window."""
 
     # The following cannot be imported outside this function
@@ -35,25 +35,22 @@
     # pylint: disable=F0401, W0404
     import qtreactor.qt4reactor
     qtreactor.qt4reactor.install()
+    from twisted.internet import reactor
+    from ubuntuone.controlpanel.gui.qt.gui import start
 
     # The main loop MUST be initialized before importing the reactor
     # pylint: disable=W0612
     app = Qt.QApplication(sys.argv)
+    # Apply font to the entire application
+    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
+    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
     # Apply Style Sheet
     qss_file = QtCore.QFile(":/ubuntuone.qss")
     qss_file.open(QtCore.QFile.ReadOnly)
     stylesheet = QtCore.QLatin1String(qss_file.readAll())
     app.setStyleSheet(stylesheet)
 
-    # Apply font to the entire application
-    QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
-
-    # pylint: disable=W0404, F0401
-    from twisted.internet import reactor
-
-    from ubuntuone.controlpanel.gui.qt.gui import MainWindow
-    window = MainWindow(close_callback=reactor.stop)
-    window.show()
-
+    icon, window = start(reactor.stop,
+        minimized=minimized, with_icon=with_icon)
     # pylint: disable=E1101
     reactor.run()
 
=== modified file 'ubuntuone/controlpanel/gui/qt/preferences.py'
--- ubuntuone/controlpanel/gui/qt/preferences.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/preferences.py	2011-09-26 18:38:27 +0000
@@ -62,7 +62,9 @@
     """The Preferences Tab Panel widget"""
 
     ui_class = preferences_ui
+    logger = logger
 
+    # pylint: disable=E0202
     @defer.inlineCallbacks
     def load(self):
         """Load info."""
 
=== added file 'ubuntuone/controlpanel/gui/qt/signin.py'
--- ubuntuone/controlpanel/gui/qt/signin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/signin.py	2011-09-26 18:38:27 +0000
@@ -0,0 +1,89 @@
+# -*- 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 signin page."""
+
+from PyQt4 import QtCore
+from twisted.internet import defer
+
+from ubuntuone.controlpanel.gui import RESET_PASSWORD_LINK
+from ubuntuone.controlpanel.gui.qt import icon_from_name, handle_errors
+from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
+from ubuntuone.controlpanel.gui.qt.ui import signin_ui
+from ubuntuone.controlpanel.logger import setup_logging, log_call
+
+
+logger = setup_logging('qt.signin')
+
+
+class SignInPanel(UbuntuOneBin):
+    """The widget for signing in."""
+
+    ui_class = signin_ui
+    logger = logger
+
+    signinCanceled = QtCore.pyqtSignal()
+    credentialsFound = QtCore.pyqtSignal(dict)
+
+    def _setup(self):
+        """Do some extra setupping for the UI."""
+        super(SignInPanel, self)._setup()
+
+        self.ui.forgot_password_button.uri = RESET_PASSWORD_LINK
+        icon = icon_from_name('external_icon_orange')
+        self.ui.forgot_password_button.setIcon(icon)
+
+        self.ui.signin_button.setEnabled(False)
+        for entry in (self.ui.email_entry, self.ui.password_entry):
+            entry.textChanged.connect(self.validate)
+            entry.returnPressed.connect(self.ui.signin_button.click)
+
+    def validate(self, *a, **kw):
+        """Enable sign in button only if email and password are non empty."""
+        email = unicode(self.ui.email_entry.text())
+        password = unicode(self.ui.password_entry.text())
+        self.ui.signin_button.setEnabled(bool(email and password))
+        self.ui.signin_button.style().unpolish(self.ui.signin_button)
+        self.ui.signin_button.style().polish(self.ui.signin_button)
+
+    # pylint: disable=E0202
+    @defer.inlineCallbacks
+    def load(self):
+        """Load specific tab info."""
+        yield self.backend.get_credentials()
+
+    @QtCore.pyqtSlot()
+    @handle_errors(logger=logger)
+    @log_call(logger.debug)
+    @defer.inlineCallbacks
+    def on_signin_button_clicked(self):
+        """The 'Sign in' button was clicked."""
+        email = unicode(self.ui.email_entry.text())
+        password = unicode(self.ui.password_entry.text())
+        self.is_processing = True
+        try:
+            result = yield self.backend.login(email=email, password=password)
+            logger.info('Emitting credentialsFound for email %r.', email)
+            self.credentialsFound.emit(result)
+        finally:
+            self.is_processing = False
+
+    @QtCore.pyqtSlot()
+    def on_cancel_button_clicked(self):
+        """The 'Cancel' button was clicked."""
+        self.signinCanceled.emit()
 
=== added file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2011-09-26 18:38:27 +0000
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+
+# Authors: Roberto Alsina <[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/>.
+"""System notification area icon."""
+
+from PyQt4 import QtGui
+
+
+class TrayIcon(QtGui.QSystemTrayIcon):
+
+    """System notification icon."""
+
+    def __init__(self, window=None):
+        super(TrayIcon, self).__init__(None)
+        self.setIcon(QtGui.QIcon(":/u1icon.png"))
+        self.setVisible(True)
+        self.window = window
+        self.activated.connect(self.on_activated)
+        self.context_menu = QtGui.QMenu()
+        self.restore = QtGui.QAction("Restore", self,
+            triggered=self.restore_window)
+        self.quit = QtGui.QAction("Quit Ubuntu One", self,
+            triggered=self.stop)
+        self.context_menu.addAction(self.restore)
+        self.context_menu.addSeparator()
+        self.context_menu.addAction(self.quit)
+        self.setContextMenu(self.context_menu)
+
+    def on_activated(self, reason):
+        """The user activated the icon."""
+        if reason == self.Trigger:  # Left-click
+            self.restore_window()
+
+    def restore_window(self):
+        """Show the main window."""
+        if self.window is None:
+            # pylint: disable=W0404
+            from ubuntuone.controlpanel.gui.qt.gui import MainWindow
+            # pylint: enable=W0404
+            self.window = MainWindow(close_callback=self.delete_window)
+        self.window.show()
+
+    def delete_window(self):
+        """Close and remove the main window."""
+        if self.window is not None:
+            self.window.close()
+            self.window = None
+
+    def stop(self):
+        """Stop the application."""
+        # pylint: disable=W0404
+        from twisted.internet import reactor
+        # pylint: enable=W0404
+        reactor.stop()
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2011-09-26 18:38:27 +0000
@@ -18,12 +18,16 @@
 
 """The test suite for the Qt UI for the control panel for Ubuntu One."""
 
+import logging
 import os
-
-from PyQt4 import QtCore
-
-from ubuntuone.controlpanel import backend
-from ubuntuone.controlpanel.tests import TestCase, EXPECTED_ACCOUNT_INFO
+import urllib
+
+from PyQt4 import QtGui, QtCore
+from ubuntuone.devtools.handlers import MementoHandler
+
+from ubuntuone.controlpanel import backend, cache
+from ubuntuone.controlpanel.tests import TestCase, EXPECTED_ACCOUNT_INFO, TOKEN
+from ubuntuone.controlpanel.gui import qt, UBUNTUONE_FROM_OAUTH
 from ubuntuone.controlpanel.gui.tests import FakedObject, USER_HOME
 
 # Attribute 'yyy' defined outside __init__, access to a protected member
@@ -76,21 +80,6 @@
     return folder
 
 
-def skip_if_abstract_class(test):
-    """Decorator to skip a test if is an abstract class."""
-
-    def inner(instance):
-        """Skip a test if is an abstract class."""
-        abstract = instance.class_ui is None
-        result = None
-        if not abstract:
-            result = test(instance)
-
-        return result
-
-    return inner
-
-
 class FakeUi(FakedObject):
     """A fake Ui object."""
 
@@ -114,7 +103,7 @@
         backend.UPLOAD_KEY: -1,  # no limit
     }
 
-    next_result = object()
+    next_result = []
     exposed_methods = [
         'account_info',  # account
         'devices_info', 'device_names_info',  # devices
@@ -128,13 +117,41 @@
         'file_sync_settings_info',
         'change_file_sync_settings',
         'restore_file_sync_settings',
-        'shutdown',
+        'shutdown', 'login',
     ]
 
-
-class FakedConfirmDialog(object):
+    def get_credentials(self):
+        """Fake credentials retrieval."""
+        self._called['get_credentials'] = ((), {})
+        return TOKEN
+
+
+class CrashyBackendException(Exception):
+    """A faked backend crash."""
+
+
+class CrashyBackend(FakedControlPanelBackend):
+    """A faked backend that crashes."""
+
+    def __init__(self, *args, **kwargs):
+        super(CrashyBackend, self).__init__(*args, **kwargs)
+        for i in self.exposed_methods + ['get_credentials']:
+            setattr(self, i, self._fail(i))
+
+    def _fail(self, f):
+        """Crash boom bang."""
+
+        def inner(*args, **kwargs):
+            """Raise a custom exception."""
+            raise CrashyBackendException(f)
+
+        return inner
+
+
+class FakedDialog(object):
     """Fake a confirmation dialog."""
 
+    Close = 0
     response = args = kwargs = None
 
     @classmethod
@@ -149,6 +166,7 @@
     """Fake a file chooser dialog."""
 
     response = args = kwargs = None
+    DontUseNativeDialog = 4
 
     # Invalid name "getExistingDirectory"
     # pylint: disable=C0103
@@ -168,19 +186,43 @@
     innerclass_name = None
     class_ui = None
     kwargs = {}
+    logger = None
 
-    @skip_if_abstract_class
     def setUp(self):
+        cache.Cache._shared_objects = {}
         super(BaseTestCase, self).setUp()
         self.patch(backend, 'ControlBackend', FakedControlPanelBackend)
-        # self.class_ui is not callable
-        # pylint: disable=E1102
-        self.ui = self.class_ui(**self.kwargs)
-        self.addCleanup(self.ui.destroy)
-
-        if hasattr(self.ui, 'backend'):
-            # clean backend calls
-            self.ui.backend._called.clear()
+
+        self.ui = None
+        if self.class_ui is not None:
+            # self.class_ui is not callable
+            # pylint: disable=E1102
+            self.ui = self.class_ui(**self.kwargs)
+            # pylint: enable=E1102
+            self.addCleanup(self.ui.destroy)
+
+        if getattr(self.ui, 'backend', None) is not None:
+            self.addCleanup(self.ui.backend._called.clear)
+
+        logger = self.logger if self.logger is not None else \
+                 getattr(self.ui, 'logger', None)
+        self.memento = None
+        if logger is not None:
+            self.memento = MementoHandler()
+            self.memento.setLevel(logging.DEBUG)
+            logger.addHandler(self.memento)
+            self.addCleanup(logger.removeHandler, self.memento)
+
+        # default response if user does nothing
+        FakedFileDialog.response = QtCore.QString('')
+        FakedFileDialog.args = None
+        FakedFileDialog.kwargs = None
+        self.patch(QtGui, 'QFileDialog', FakedFileDialog)
+
+        FakedDialog.response = None
+        FakedDialog.args = None
+        FakedDialog.kwargs = None
+        self.patch(QtGui, 'QMessageBox', FakedDialog)
 
     def get_pixmap_data(self, pixmap):
         """Get the raw data of a QPixmap."""
@@ -202,6 +244,19 @@
         self.assertIn(method_name, self.ui.backend._called)
         self.assertEqual(self.ui.backend._called[method_name], (args, kwargs))
 
+    def assert_uri_hook_called(self, button, url):
+        """Check that uri_hook was called with 'url' when clicking 'button'."""
+        self.patch(qt, 'uri_hook', self._set_called)
+        button.click()
+
+        self.assertEqual(len(self._called), 2, 'uri_hook must be called.')
+        self.assertEqual(len(self._called[0]), 1, 'uri_hook must be called.')
+        actual_url = self._called[0][0]
+        if actual_url.startswith(UBUNTUONE_FROM_OAUTH):
+            self.assertIn(urllib.urlencode({'next': url}), actual_url)
+        else:
+            self.assertEqual(actual_url, url)
+
     def test_init_loads_ui(self, expected_setup_ui=None):
         """The __init__ method loads the ui."""
         if self.innerclass_ui is None:
@@ -219,3 +274,8 @@
             expected_setup_ui = expected_setup_ui(self.ui)
         self.assertEqual(self.ui.ui._called,
                          {'setupUi': ((expected_setup_ui,), {})})
+
+    def test_backend_is_correct(self):
+        """The backend instance is correct."""
+        if getattr(self.ui, 'backend', None) is not None:
+            self.assertIsInstance(self.ui.backend, FakedControlPanelBackend)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_account.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_account.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_account.py	2011-09-26 18:38:27 +0000
@@ -20,7 +20,6 @@
 
 from twisted.internet import defer
 
-from ubuntuone.controlpanel.gui import qt
 from ubuntuone.controlpanel.gui.qt import account as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     SAMPLE_ACCOUNT_INFO, SAMPLE_EMAIL, SAMPLE_NAME, SAMPLE_PLAN,
@@ -75,14 +74,10 @@
 
     def test_edit_account_button(self):
         """When clicking the edit account button, the proper url is opened."""
-        self.patch(qt, 'uri_hook', self._set_called)
-        self.ui.ui.edit_profile_button.click()
-
-        self.assertEqual(self._called, ((gui.EDIT_PROFILE_LINK,), {}))
+        self.assert_uri_hook_called(self.ui.ui.edit_profile_button,
+                                    gui.EDIT_PROFILE_LINK)
 
     def test_edit_services_button(self):
         """When clicking the mobile plan button, the proper url is opened."""
-        self.patch(qt, 'uri_hook', self._set_called)
-        self.ui.ui.edit_services_button.click()
-
-        self.assertEqual(self._called, ((gui.EDIT_ACCOUNT_LINK,), {}))
+        self.assert_uri_hook_called(self.ui.ui.edit_services_button,
+                                    gui.EDIT_ACCOUNT_LINK)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2011-09-26 18:38:27 +0000
@@ -29,7 +29,9 @@
 from ubuntuone.controlpanel.gui.qt import addfolder as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     BaseTestCase,
-    FakedConfirmDialog,
+    CrashyBackend,
+    CrashyBackendException,
+    FakedDialog,
     FakedFileDialog,
     set_path_on_file_dialog,
 )
@@ -53,20 +55,6 @@
         os.environ['HOME'] = USER_HOME
         self.addCleanup(lambda: os.environ.__setitem__('HOME', old_home))
 
-        # default response if user does nothing
-        FakedFileDialog.response = gui.QtCore.QString('')
-        FakedFileDialog.args = None
-        FakedFileDialog.kwargs = None
-        self.patch(gui.QtGui, 'QFileDialog', FakedFileDialog)
-
-        FakedConfirmDialog.response = None
-        FakedConfirmDialog.args = None
-        FakedConfirmDialog.kwargs = None
-        self.patch(gui.QtGui, 'QMessageBox', FakedConfirmDialog)
-
-        # reset backend state
-        self.ui.backend._called.clear()
-
     @defer.inlineCallbacks
     def assert_does_nothing(self, method_call):
         """Nothing happens.
@@ -92,7 +80,10 @@
         yield self.ui.click()
 
         self.assertEqual(FakedFileDialog.args, ())
-        self.assertEqual(FakedFileDialog.kwargs, {'parent': self.ui})
+        self.assertEqual(FakedFileDialog.kwargs, {
+            'options': gui.QtGui.QFileDialog.DontUseNativeDialog,
+            'parent': self.ui,
+        })
 
     @defer.inlineCallbacks
     def test_does_nothing_if_user_closes_file_chooser(self):
@@ -100,8 +91,8 @@
         yield self.assert_does_nothing(self.ui.click)
 
         # the warning dialog was not opened
-        self.assertEqual(FakedConfirmDialog.args, None)
-        self.assertEqual(FakedConfirmDialog.kwargs, None)
+        self.assertEqual(FakedDialog.args, None)
+        self.assertEqual(FakedDialog.kwargs, None)
 
     @defer.inlineCallbacks
     def test_opens_warning_if_folder_path_not_valid(self):
@@ -113,9 +104,9 @@
 
         args = {'folder_path': folder_path, 'home_folder': USER_HOME}
         msg = gui.FOLDER_INVALID_PATH % args
-        self.assertEqual(FakedConfirmDialog.args,
+        self.assertEqual(FakedDialog.args,
                          (self.ui, '', msg, gui.CLOSE))
-        self.assertEqual(FakedConfirmDialog.kwargs, {})
+        self.assertEqual(FakedDialog.kwargs, {})
 
         yield self.assert_does_nothing(self.ui.click)
 
@@ -126,8 +117,8 @@
         yield self.ui.click()
 
         # no warning
-        self.assertEqual(FakedConfirmDialog.args, None)
-        self.assertEqual(FakedConfirmDialog.kwargs, None)
+        self.assertEqual(FakedDialog.args, None)
+        self.assertEqual(FakedDialog.kwargs, None)
         # backend called
         self.assert_backend_called('create_folder', folder_path=folder)
 
@@ -138,8 +129,8 @@
         yield self.ui.click()
 
         # no warning
-        self.assertEqual(FakedConfirmDialog.args, None)
-        self.assertEqual(FakedConfirmDialog.kwargs, None)
+        self.assertEqual(FakedDialog.args, None)
+        self.assertEqual(FakedDialog.kwargs, None)
         # backend called
         self.assert_backend_called('create_folder', folder_path=folder)
 
@@ -167,3 +158,12 @@
         yield self.ui.click()
 
         self.assertEqual(self._called, ((), {}))
+
+    @defer.inlineCallbacks
+    def test_backend_error_is_handled(self):
+        """Any error from the backend is properly handled."""
+        set_path_on_file_dialog()
+        self.patch(self.ui, 'backend', CrashyBackend())
+        yield self.ui.click()
+
+        self.assertTrue(self.memento.check_exception(CrashyBackendException))
 
=== added file 'ubuntuone/controlpanel/gui/qt/tests/test_common.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_common.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_common.py	2011-09-26 18:38:27 +0000
@@ -0,0 +1,210 @@
+# -*- 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 uri_hook helper."""
+
+import logging
+
+from PyQt4 import QtGui, QtCore
+from twisted.internet import defer
+
+from ubuntuone.controlpanel.logger import setup_logging
+from ubuntuone.controlpanel.gui.qt import uri_hook, handle_errors
+from ubuntuone.controlpanel.gui.qt.tests import (
+    BaseTestCase,
+    FakedDialog,
+)
+
+
+class UriHookTestCase(BaseTestCase):
+    """The test suite for the uri_hook."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(UriHookTestCase, self).setUp()
+        self.patch(QtGui.QDesktopServices, 'openUrl', self._set_called)
+
+    def test_opens_url(self):
+        """The url is opened properly."""
+        expected = 'foo bar'
+        uri_hook(expected)
+        self.assertEqual(self._called, ((QtCore.QUrl(expected),), {}))
+
+    def test_opens_url_encoded(self):
+        """The encoded url is opened properly."""
+        expected = 'http://foo.bar/?next=https://one.ubuntu.com/'
+        uri_hook(expected)
+        self.assertEqual(self._called, ((QtCore.QUrl(expected),), {}))
+
+
+class HandleErrorTestCase(BaseTestCase):
+    """Test suite for the generic error handler."""
+
+    error_handler = None
+    use_logger = False
+    logger = logging.getLogger()  # root logger
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(HandleErrorTestCase, self).setUp()
+        self.called = None
+        self.result = None
+        self.failure = None
+        self.error_handler_called = None
+
+        if self.use_logger:
+            logger = self.logger
+        else:
+            logger = None
+
+        self.decorate_me = handle_errors(error_handler=self.error_handler,
+                                         logger=logger)(self._decorate_me)
+
+    @defer.inlineCallbacks
+    def _decorate_me(self, *args, **kwargs):
+        """Helper to test thye decorator."""
+        if self.failure:
+            # Raising only classes, instances or string are allowed
+            # pylint: disable=E0702
+            raise self.failure
+
+        yield
+        self.called = (args, kwargs)
+        defer.returnValue(self.result)
+
+    @defer.inlineCallbacks
+    def test_is_decorator(self):
+        """Is a decorator."""
+        yield self.decorate_me()
+
+    @defer.inlineCallbacks
+    def test_params_are_passed(self):
+        """Named and unnamed arguments are passed."""
+        args = ({}, object(), 'foo')
+        kwargs = {'1': 1, 'test': None, '0': ['a']}
+        yield self.decorate_me(*args, **kwargs)
+
+        self.assertTrue(self.called, (args, kwargs))
+
+    @defer.inlineCallbacks
+    def test_result_is_returned(self):
+        """Result is returned."""
+        self.result = object()
+        result = yield self.decorate_me()
+
+        self.assertEqual(self.result, result)
+
+    def test_name_is_preserved(self):
+        """The method name is not masqueraded."""
+        self.assertEqual(self.decorate_me.__name__, self._decorate_me.__name__)
+
+    @defer.inlineCallbacks
+    def test_exeptions_are_handled(self):
+        """Any exception is handled and logged in the root logger."""
+        msg = 'This is me failing badly.'
+        self.failure = Exception(msg)
+
+        yield self.decorate_me()
+
+        logged = self.memento.check_exception(self.failure.__class__, msg)
+        recs = '\n'.join(rec.exc_text for rec in self.memento.records)
+        self.assertTrue(logged, 'Exception must be logged, got:\n%s' % recs)
+
+    @defer.inlineCallbacks
+    def test_show_error_message(self):
+        """On error, show an error message."""
+        self.failure = Exception()
+
+        yield self.decorate_me()
+
+        msg = self.failure.__class__.__name__
+        self.assertEqual(FakedDialog.args,
+                         (None, '', msg, QtGui.QMessageBox.Close))
+        self.assertEqual(FakedDialog.kwargs, {})
+
+    @defer.inlineCallbacks
+    def test_show_error_message_if_args(self):
+        """On error, show an error message."""
+        msg1 = 'This is me failing badly.'
+        msg2 = 'More details about what went wrong.'
+        obj = object()
+        self.failure = Exception(msg1, msg2, obj)
+
+        yield self.decorate_me()
+
+        msg = '\n'.join(map(repr, (msg1, msg2, obj)))
+        msg = self.failure.__class__.__name__ + '\n' + msg
+        self.assertEqual(FakedDialog.args,
+                         (None, '', msg, QtGui.QMessageBox.Close))
+        self.assertEqual(FakedDialog.kwargs, {})
+
+    @defer.inlineCallbacks
+    def test_show_error_message_if_mapping(self):
+        """On error, show an error message."""
+        msg1 = 'This is me failing badly.'
+        msg2 = 'More details about what went wrong.'
+        errdict = {'foo': msg1, 'bar': msg2}
+        self.failure = Exception(errdict)
+
+        yield self.decorate_me()
+
+        msg = '\n'.join((msg1, msg2))
+        self.assertEqual(FakedDialog.args,
+                         (None, '', msg, QtGui.QMessageBox.Close))
+        self.assertEqual(FakedDialog.kwargs, {})
+
+    @defer.inlineCallbacks
+    def test_no_error_message_if_no_exception(self):
+        """On success, do not show an error message."""
+        yield self.decorate_me()
+
+        self.assertEqual(FakedDialog.args, None)
+        self.assertEqual(FakedDialog.kwargs, None)
+
+    @defer.inlineCallbacks
+    def test_call_error_handler(self):
+        """On success, do not execute error_handler."""
+        yield self.decorate_me()
+        self.assertFalse(self.error_handler_called)
+
+
+class HandleErrorWithCustomLoggerTestCase(HandleErrorTestCase):
+    """Test suite for the generic error handler."""
+
+    use_logger = True
+    logger = setup_logging('HandleErrorWithoutLoggerTestCase')  # custom logger
+
+
+class HandleErrorWithHandlerTestCase(HandleErrorTestCase):
+    """Test suite for the generic error handler when using a custom handler."""
+
+    @defer.inlineCallbacks
+    def error_handler(self, *a, **kw):
+        """Implement an error handler."""
+        self.error_handler_called = (a, kw)
+        yield
+
+    @defer.inlineCallbacks
+    def test_call_error_handler(self):
+        """On error, execute error_handler."""
+        msg = 'This is me failing badly.'
+        self.failure = Exception(msg)
+
+        yield self.decorate_me()
+
+        self.assertEqual(self.error_handler_called, ((), {}))
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_controlpanel.py	2011-09-26 18:38:27 +0000
@@ -22,14 +22,16 @@
 
 from twisted.internet import defer
 
-from ubuntuone.controlpanel.gui import qt
 from ubuntuone.controlpanel.gui.qt import controlpanel as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
-    BaseTestCase, SAMPLE_ACCOUNT_INFO, SAMPLE_NAME,
-)
-
-
-class ControlPanelTestCase(BaseTestCase):
+    SAMPLE_ACCOUNT_INFO, SAMPLE_NAME, TOKEN,
+)
+from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
+    UbuntuOneBinTestCase,
+)
+
+
+class ControlPanelTestCase(UbuntuOneBinTestCase):
     """Test the qt control panel."""
 
     innerclass_ui = gui.controlpanel_ui
@@ -39,18 +41,68 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(ControlPanelTestCase, self).setUp()
+        self.patch(self.ui.ui.folders_tab, 'process_info', lambda info: None)
         self.ui.backend.next_result = SAMPLE_ACCOUNT_INFO
 
-    def test_backend(self):
-        """Backend is created."""
-        self.assertIsInstance(self.ui.backend,
-                              gui.backend.ControlBackend)
+    @defer.inlineCallbacks
+    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')
+            return {}
+
+        self.patch(self.ui.backend, 'get_credentials', check)
+
+        yield self.ui.load()  # trigger the info request
+        self.assertFalse(self.ui.is_processing, 'ui must not be processing')
+
+    @defer.inlineCallbacks
+    def test_credentials_are_requested_on_load(self):
+        """The info is requested to the backend."""
+        yield self.ui.load()
+        self.assert_backend_called('get_credentials')
+
+    @defer.inlineCallbacks
+    def test_on_credentials_not_found_called(self):
+        """If no credentials, on_credentials_not_found is called."""
+        self.patch(self.ui, 'on_credentials_not_found', self._set_called)
+        self.patch(self.ui.backend, 'get_credentials', lambda: {})
+        yield self.ui.load()
+
+        self.assertEqual(self._called, ((), {}))
+
+    def test_on_credentials_not_found(self):
+        """The signin panel is shown."""
+        self.ui.on_credentials_found()
+        self.ui.on_credentials_not_found()
+        self.assertIs(self.ui.ui.switcher.currentWidget(), self.ui.ui.signin)
+
+    @defer.inlineCallbacks
+    def test_on_credentials_found_called(self):
+        """If credentials, on_credentials_not_found is called."""
+        self.patch(self.ui, 'on_credentials_found', self._set_called)
+        yield self.ui.load()
+
+        self.assertEqual(self._called, ((), {}))
+
+    def test_on_credentials_found(self):
+        """The management panel is shown."""
+        self.patch(self.ui, 'connect_file_sync', self._set_called)
+        self.ui.on_credentials_not_found()
+        self.ui.on_credentials_found()
+
+        self.assertIs(self.ui.ui.switcher.currentWidget(),
+                      self.ui.ui.management)
+        self.assertEqual(self._called, ((), {}))
 
     @defer.inlineCallbacks
     def test_info_is_requested_on_load(self):
         """The info is requested to the backend."""
+        self.patch(self.ui, 'process_info', self._set_called)
         yield self.ui.load()
         self.assert_backend_called('account_info')
+        self.assertEqual(self._called, ((SAMPLE_ACCOUNT_INFO,), {}))
 
     def test_process_info(self):
         """The info is processed when ready."""
@@ -72,32 +124,85 @@
         msg = gui.PERCENTAGE_LABEL % percentage_usage
         self.assertEqual(self.ui.ui.percentage_usage_label.text(), msg)
 
+    def test_update_over_quota(self):
+        """Check the labels state when the user exceed the quota."""
+        percentage_value = 100
+        # pylint: disable=W0212
+        self.ui._update_quota({'percentage': percentage_value})
+        # pylint: enable=W0212
+
+        self.assertTrue(
+            self.ui.ui.percentage_usage_label.property("OverQuota").toBool())
+        self.assertTrue(
+            self.ui.ui.quota_usage_label.property("OverQuota").toBool())
+
+    def test_update_quota_in_range(self):
+        """Check the labels state when the quota is under the threshold."""
+        percentage_value = 50
+        # pylint: disable=W0212
+        self.ui._update_quota({'percentage': percentage_value})
+        # pylint: enable=W0212
+
+        self.assertFalse(
+            self.ui.ui.percentage_usage_label.property("OverQuota").toBool())
+        self.assertFalse(
+            self.ui.ui.quota_usage_label.property("OverQuota").toBool())
+
+    def test_on_local_device_removed(self):
+        """On DeviesPanel's localDeviceRemoved, emit credentialsNotFound."""
+        self.ui.ui.devices_tab.localDeviceRemoved.emit()
+        self.assertIs(self.ui.ui.switcher.currentWidget(), self.ui.ui.signin)
+
+    def test_on_signin_credentials_found(self):
+        """On SignInPanel's credentialsFound, the management panel is shown."""
+        self.patch(self.ui, 'load', self._set_called)
+        self.ui.ui.signin.credentialsFound.emit(TOKEN)
+
+        self.assertEqual(self._called, ((), {}))
+
+    @defer.inlineCallbacks
+    def test_connect_file_sync_with_autoconnect(self):
+        """Connect is called if autoconnect is enabled."""
+        settings = {gui.AUTOCONNECT_KEY: True}
+        self.patch(self.ui.backend, 'file_sync_settings_info',
+                   lambda: defer.succeed(settings))
+
+        yield self.ui.connect_file_sync()
+
+        self.assert_backend_called('connect_files')
+
+    @defer.inlineCallbacks
+    def test_connect_file_sync_without_autoconnect(self):
+        """Connect is called if autoconnect is disabled."""
+        settings = {gui.AUTOCONNECT_KEY: False}
+        self.patch(self.ui.backend, 'file_sync_settings_info',
+                   lambda: defer.succeed(settings))
+
+        yield self.ui.connect_file_sync()
+
+        # pylint: disable=W0212
+        self.assertNotIn('connect_files', self.ui.backend._called)
+
 
 class ExternalLinkButtonsTestCase(ControlPanelTestCase):
     """The link in the go-to-web buttons are correct."""
 
-    @defer.inlineCallbacks
-    def setUp(self):
-        self.patch(qt, 'uri_hook', self._set_called)
-        self.patch(gui, 'uri_hook', self._set_called)
-        yield super(ExternalLinkButtonsTestCase, self).setUp()
-
     def test_get_more_space_button(self):
         """When clicking the get more GB button, the proper url is opened."""
-        self.ui.ui.get_more_space_button.click()
-        self.assertEqual(self._called, ((gui.EDIT_ACCOUNT_LINK,), {}))
+        self.assert_uri_hook_called(self.ui.ui.get_more_space_button,
+                                    gui.EDIT_SERVICES_LINK)
 
     def test_help_button(self):
         """When clicking the help button, the proper url is opened."""
-        self.ui.ui.help_button.click()
-        self.assertEqual(self._called, ((gui.GET_SUPPORT_LINK,), {}))
+        self.assert_uri_hook_called(self.ui.ui.help_button,
+                                    gui.GET_SUPPORT_LINK)
 
     def test_twitter_button(self):
         """When clicking the twitter button, the proper url is opened."""
-        self.ui.ui.twitter_button.click()
-        self.assertEqual(self._called, ((gui.TWITTER_LINK,), {}))
+        self.assert_uri_hook_called(self.ui.ui.twitter_button,
+                                    gui.TWITTER_LINK)
 
     def test_facebook_button(self):
         """When clicking the facebook button, the proper url is opened."""
-        self.ui.ui.facebook_button.click()
-        self.assertEqual(self._called, ((gui.FACEBOOK_LINK,), {}))
+        self.assert_uri_hook_called(self.ui.ui.facebook_button,
+                                    gui.FACEBOOK_LINK)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_device.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_device.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_device.py	2011-09-26 18:38:27 +0000
@@ -23,8 +23,9 @@
 from ubuntuone.controlpanel.gui.qt import device as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     BaseTestCase,
-    FakedConfirmDialog,
-    FakedControlPanelBackend,
+    CrashyBackend,
+    CrashyBackendException,
+    FakedDialog,
     SAMPLE_COMPUTER_INFO,
     SAMPLE_PHONE_INFO,
 )
@@ -40,18 +41,14 @@
     innerclass_ui = gui.device_ui
     innerclass_name = "Ui_Form"
     class_ui = gui.DeviceWidget
-    backend = FakedControlPanelBackend()
     device_id = 'zaraza'
-    kwargs = {'backend': backend, 'device_id': device_id}
+    kwargs = {'device_id': device_id}
+    logger = gui.logger
 
     def test_has_id(self):
         """The device as an id, None by default."""
         self.assertEqual(self.ui.id, self.device_id)
 
-    def test_has_backend(self):
-        """The device as a backend, None by default."""
-        self.assertIs(self.ui.backend, self.backend)
-
     def test_update_device_info(self):
         """The widget is updated with the info."""
         info = SAMPLE_COMPUTER_INFO
@@ -104,10 +101,7 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(RemoveDeviceTestCase, self).setUp()
-        FakedConfirmDialog.response = gui.NO
-        FakedConfirmDialog.args = None
-        FakedConfirmDialog.kwargs = None
-        self.patch(gui.QtGui, 'QMessageBox', FakedConfirmDialog)
+        FakedDialog.response = gui.YES
 
     def test_remove_device_opens_confirmation_dialog(self):
         """A confirmation dialog is opened when user clicks 'delete device'."""
@@ -115,13 +109,13 @@
 
         msg = gui.DEVICE_CONFIRM_REMOVE
         buttons = gui.YES | gui.NO
-        self.assertEqual(FakedConfirmDialog.args,
+        self.assertEqual(FakedDialog.args,
                          (self.ui, '', msg, buttons, gui.NO))
-        self.assertEqual(FakedConfirmDialog.kwargs, {})
+        self.assertEqual(FakedDialog.kwargs, {})
 
     def test_remove_device_does_not_remove_if_answer_is_no(self):
         """The device is not removed is answer is No."""
-        FakedConfirmDialog.response = gui.NO
+        FakedDialog.response = gui.NO
         self.ui.removed.connect(self._set_called)
         self.ui.ui.remove_device_button.click()
 
@@ -130,7 +124,7 @@
 
     def test_remove_device_does_remove_if_answer_is_yes(self):
         """The device is removed is answer is Yes."""
-        FakedConfirmDialog.response = gui.YES
+        FakedDialog.response = gui.YES
         self.ui.ui.remove_device_button.click()
 
         self.assert_backend_called('remove_device', device_id=self.device_id)
@@ -144,7 +138,7 @@
             """Fire deferred when the device was removed."""
             d.callback(device_id)
 
-        FakedConfirmDialog.response = gui.YES
+        FakedDialog.response = gui.YES
         self.ui.removed.connect(self._set_called)
         self.patch(self.ui.backend, 'remove_device', check)
         self.ui.ui.remove_device_button.click()
@@ -154,8 +148,16 @@
 
     def test_remove_device_emits_signal_when_not_removed(self):
         """The signal 'removeCanceled' is emitted when user cancels removal."""
-        FakedConfirmDialog.response = gui.NO
+        FakedDialog.response = gui.NO
         self.ui.removeCanceled.connect(self._set_called)
         self.ui.ui.remove_device_button.click()
 
         self.assertEqual(self._called, ((), {}))
+
+    @defer.inlineCallbacks
+    def test_backend_error_is_handled(self):
+        """Any error from the backend is properly handled."""
+        self.patch(self.ui, 'backend', CrashyBackend())
+        yield self.ui.ui.remove_device_button.click()
+
+        self.assertTrue(self.memento.check_exception(CrashyBackendException))
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_devices.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2011-09-26 18:38:27 +0000
@@ -20,10 +20,8 @@
 
 from twisted.internet import defer
 
-from ubuntuone.controlpanel.gui import qt
 from ubuntuone.controlpanel.gui.qt import devices as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
-    FakedConfirmDialog,
     SAMPLE_DEVICES_INFO,
 )
 from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
@@ -42,7 +40,6 @@
     def setUp(self):
         yield super(DevicesPanelTestCase, self).setUp()
         self.ui.backend.next_result = SAMPLE_DEVICES_INFO
-        self.patch(gui.QtGui, 'QMessageBox', FakedConfirmDialog)
 
     def test_is_processing_while_asking_info(self):
         """The ui is processing while the contents are loaded."""
@@ -97,10 +94,8 @@
 
     def test_manage_devices_button(self):
         """Clicking the manage devices button opens the proper url."""
-        self.patch(qt, 'uri_hook', self._set_called)
-        self.ui.ui.manage_devices_button.click()
-
-        self.assertEqual(self._called, ((gui.EDIT_DEVICES_LINK,), {}))
+        self.assert_uri_hook_called(self.ui.ui.manage_devices_button,
+                                    gui.EDIT_DEVICES_LINK)
 
     def test_remove_device_widget_after_removal(self):
         """When a device widget was deleted, remove it from the UI."""
@@ -110,3 +105,13 @@
         local_device.removed.emit()
 
         self.assertTrue(self.ui.ui.local_device_box.itemAt(0) is None)
+
+    def test_local_device_removed_signal(self):
+        """When the local device is removed, emit localDeviceRemoved signal."""
+        self.ui.localDeviceRemoved.connect(self._set_called)
+        self.ui.process_info(SAMPLE_DEVICES_INFO)
+
+        local_device = self.ui.ui.local_device_box.itemAt(0).widget()
+        local_device.removed.emit()
+
+        self.assertEqual(self._called, ((), {}))
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-08-12 19:12:08 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-09-26 18:38:27 +0000
@@ -31,11 +31,9 @@
     FAKE_VOLUMES_NO_FREE_SPACE_INFO,
     MUSIC_FOLDER, ROOT, USER_HOME,
 )
-from ubuntuone.controlpanel.gui import qt
 from ubuntuone.controlpanel.gui.qt import folders as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
-    FakedConfirmDialog,
-    FakedFileDialog,
+    FakedDialog,
 )
 from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
     UbuntuOneBinTestCase,
@@ -140,8 +138,10 @@
                 self.assertTrue(item is not None)
 
                 name = volume['path'].replace(USER_HOME + os.path.sep, '')
+                expected_path = volume['path']
                 if volume['type'] == self.ui.backend.SHARE_TYPE:
                     name = volume['name']
+                    expected_path = volume['realpath']
                 label = item.text(gui.FOLDER_NAME_COL)
                 self.assertEqual(label, name)
 
@@ -161,7 +161,7 @@
                     self.assertEqual(icon_name, gui.SHARE_ICON_NAME)
 
                 self.assertEqual(item.volume_id, volume['volume_id'])
-                self.assertEqual(item.volume_path, volume['path'])
+                self.assertEqual(item.volume_path, expected_path)
 
                 # tooltips are correct
                 self.assertEqual(item.toolTip(gui.FOLDER_NAME_COL), name)
@@ -175,6 +175,8 @@
                                  gui.FOLDER_ICON_NAME)
                 self.assertEqual(button.iconSize().width(), 12)
                 self.assertEqual(button.iconSize().height(), 12)
+                self.assertEqual(button.isEnabled(),
+                                 bool(volume['subscribed']))
 
             treeiter += 1
             item = treeiter.value()
@@ -245,7 +247,8 @@
         self.ui.on_folders_itemActivated(item)
 
         self.assertEqual(self._called,
-                         ((gui.FILE_URI_PREFIX + path,), {}))
+            ((unicode(gui.QtCore.QUrl.fromLocalFile(path).toString()),), {}))
+        self.assertTrue(gui.QtCore.QUrl(self._called[0][0]).isValid())
 
     def test_clicking_on_row_handles_path_none(self):
         """None paths are properly handled."""
@@ -302,10 +305,8 @@
 
     def test_share_publish_button(self):
         """When clicking the share/publish button, the proper url is opened."""
-        self.patch(qt, 'uri_hook', self._set_called)
-        self.ui.ui.share_publish_button.click()
-
-        self.assertEqual(self._called, ((gui.MANAGE_FILES_LINK,), {}))
+        self.assert_uri_hook_called(self.ui.ui.share_publish_button,
+                                    gui.MANAGE_FILES_LINK)
 
 
 class FoldersPanelAddFolderTestCase(FoldersPanelTestCase):
@@ -322,17 +323,6 @@
         # reset backend state
         self.ui.backend._called.clear()
 
-        # default response if user does nothing
-        FakedFileDialog.response = gui.QtCore.QString('')
-        FakedFileDialog.args = None
-        FakedFileDialog.kwargs = None
-        self.patch(gui.QtGui, 'QFileDialog', FakedFileDialog)
-
-        FakedConfirmDialog.response = None
-        FakedConfirmDialog.args = None
-        FakedConfirmDialog.kwargs = None
-        self.patch(gui.QtGui, 'QMessageBox', FakedConfirmDialog)
-
     def test_not_is_processing(self):
         """Before clicking the add folder button, the UI is not processing."""
         self.assertFalse(self.ui.is_processing, 'ui must not be processing')
@@ -356,10 +346,7 @@
     def setUp(self):
         yield super(FoldersPanelSubscriptionTestCase, self).setUp()
         self.patch(gui.os.path, 'exists', lambda path: True)
-        FakedConfirmDialog.response = gui.YES
-        FakedConfirmDialog.args = None
-        FakedConfirmDialog.kwargs = None
-        self.patch(gui.QtGui, 'QMessageBox', FakedConfirmDialog)
+        FakedDialog.response = gui.YES
 
         self.ui.process_info(FAKE_VOLUMES_MINIMAL_INFO)
         # the music folder
@@ -368,6 +355,7 @@
     @defer.inlineCallbacks
     def test_on_folders_item_changed(self):
         """Clicking on 'subscribed' updates the folder subscription."""
+        self.patch(self.ui, 'load', self._set_called)
         volume = MUSIC_FOLDER
         fid = volume['volume_id']
         subscribed = not bool(volume['subscribed'])
@@ -386,6 +374,9 @@
         value = self.item.checkState(gui.SUBSCRIPTION_COL) == gui.CHECKED
         self.assertEqual(value, bool(subscribed))
 
+        # folder list was reloaded
+        self.assertEqual(self._called, ((), {}))
+
     @defer.inlineCallbacks
     def test_on_folders_item_changed_is_processing(self):
         """Clicking on 'subscribed' sets is_processing flag until done."""
@@ -438,9 +429,9 @@
         volume_path = self.item.volume_path
         msg = gui.FOLDERS_CONFIRM_MERGE % {'folder_path': volume_path}
         buttons = gui.YES | gui.NO | gui.CANCEL
-        self.assertEqual(FakedConfirmDialog.args,
+        self.assertEqual(FakedDialog.args,
                          (self.ui, '', msg, buttons, gui.YES))
-        self.assertEqual(FakedConfirmDialog.kwargs, {})
+        self.assertEqual(FakedDialog.kwargs, {})
 
     @defer.inlineCallbacks
     def test_confirm_dialog_if_path_does_not_exist(self):
@@ -454,14 +445,13 @@
 
         yield self.ui.on_folders_itemChanged(self.item)
 
-        self.assertEqual(FakedConfirmDialog.args, None)
-        self.assertEqual(FakedConfirmDialog.kwargs, None)
+        self.assertEqual(FakedDialog.args, None)
+        self.assertEqual(FakedDialog.kwargs, None)
 
     @defer.inlineCallbacks
     def test_subscribe_does_not_call_backend_if_dialog_closed(self):
         """Backend is not called if users closes the confirmation dialog."""
-        FakedConfirmDialog.response = gui.CANCEL
-        self.patch(gui.QtGui, 'QMessageBox', FakedConfirmDialog)
+        FakedDialog.response = gui.CANCEL
 
         # make sure the item is subscribed
         self.ui.is_processing = True
@@ -470,7 +460,7 @@
 
         yield self.ui.on_folders_itemChanged(self.item)
 
-        self.assertFalse(FakedConfirmDialog.args is None, 'warning was called')
+        self.assertFalse(FakedDialog.args is None, 'warning was called')
         self.assertNotIn('change_volume_settings', self.ui.backend._called)
         self.assertFalse(self.ui.is_processing)
 
@@ -480,8 +470,7 @@
     @defer.inlineCallbacks
     def test_subscribe_does_not_call_backend_if_answer_is_no(self):
         """Backend is not called if users clicks on 'No'."""
-        FakedConfirmDialog.response = gui.NO
-        self.patch(gui.QtGui, 'QMessageBox', FakedConfirmDialog)
+        FakedDialog.response = gui.NO
 
         # make sure the item is subscribed
         self.ui.is_processing = True
@@ -490,7 +479,7 @@
 
         yield self.ui.on_folders_itemChanged(self.item)
 
-        self.assertFalse(FakedConfirmDialog.args is None, 'warning was called')
+        self.assertFalse(FakedDialog.args is None, 'warning was called')
         self.assertNotIn('change_volume_settings', self.ui.backend._called)
         self.assertFalse(self.ui.is_processing)
 
@@ -506,10 +495,10 @@
         self.ui.is_processing = False
 
         # the confirm dialog was not called so far
-        assert FakedConfirmDialog.args is None
-        assert FakedConfirmDialog.kwargs is None
+        assert FakedDialog.args is None
+        assert FakedDialog.kwargs is None
 
         yield self.ui.on_folders_itemChanged(self.item)
 
-        self.assertTrue(FakedConfirmDialog.args is None, 'dialog was not run')
-        self.assertTrue(FakedConfirmDialog.kwargs is None, 'dialog was hid')
+        self.assertTrue(FakedDialog.args is None, 'dialog was not run')
+        self.assertTrue(FakedDialog.kwargs is None, 'dialog was hid')
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py	2011-09-26 18:38:27 +0000
@@ -20,7 +20,7 @@
 
 from twisted.internet import defer
 
-from ubuntuone.controlpanel.gui import qt
+from ubuntuone.controlpanel.gui import qt, UBUNTUONE_LINK
 from ubuntuone.controlpanel.gui.qt import gotoweb as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     BaseTestCase,
@@ -35,7 +35,6 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(GoToWebButtonTestCase, self).setUp()
-        self.patch(qt, 'uri_hook', self._set_called)
 
     def test_uri_can_be_set(self):
         """The uri can be set."""
@@ -47,8 +46,14 @@
         """The layout direction is RightToLeft."""
         self.assertEqual(self.ui.layoutDirection(), gui.QtCore.Qt.RightToLeft)
 
+    def test_cursor_pointer(self):
+        """The cursor is PointingHandCursor."""
+        self.assertEqual(self.ui.cursor().shape(),
+                         gui.QtCore.Qt.PointingHandCursor)
+
     def test_open_uri_when_clicked(self):
         """When clicking the button, the uri is opened."""
+        self.patch(qt, 'uri_hook', self._set_called)
         self.ui.uri = 'yadda-yadda-yoo'
         self.ui.click()
 
@@ -56,7 +61,54 @@
 
     def test_do_nothing_on_clicked_if_uri_is_none(self):
         """When clicking the button, if the uri is None, do nothing."""
+        self.patch(qt, 'uri_hook', self._set_called)
         self.ui.uri = None
         self.ui.click()
 
         self.assertEqual(self._called, False)
+
+
+class SignUrlTestCase(GoToWebButtonTestCase):
+    """The test suite for the sign url management."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(SignUrlTestCase, self).setUp()
+        self.patch(qt, 'uri_hook', lambda url: None)
+        self.patch(gui, 'sign_url', self._set_called)
+        self.creds = yield self.ui.backend.get_credentials()
+        assert len(self.creds) > 0
+
+    def test_without_ubuntuone_prefix(self):
+        """If given url is not an ubuntuone url, don't sign it."""
+        self.ui.uri = 'bad_prefix' + UBUNTUONE_LINK
+        self.ui.click()
+
+        self.assertFalse(self._called)
+
+    def test_with_ubuntuone_prefix(self):
+        """If given url is an ubuntuone url, sign it."""
+        self.ui.uri = UBUNTUONE_LINK + 'foo'
+        self.ui.click()
+
+        self.assertEqual(self._called, ((self.ui.uri, self.creds,), {}))
+
+
+class SignUrlNoCredsTestCase(SignUrlTestCase):
+    """The test suite for the sign url management when there are no creds."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(SignUrlNoCredsTestCase, self).setUp()
+        self.patch(self.ui.backend, 'get_credentials', lambda: {})
+
+    def test_with_ubuntuone_prefix(self):
+        """If given url is an ubuntuone url, don't sign it.
+
+        Since we have no credentials, the url should not be signed.
+
+        """
+        self.ui.uri = UBUNTUONE_LINK + 'foo'
+        self.ui.click()
+
+        self.assertFalse(self._called)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2011-09-26 18:38:27 +0000
@@ -41,3 +41,10 @@
         self.ui.close_callback = None
         self.ui.closeEvent(event=gui.QtGui.QCloseEvent())
         # world did not explode
+
+    def test_on_signin_canceled(self):
+        """On SigninPanel's signinCanceled, close."""
+        self.patch(self.ui, 'closeEvent', self._set_called)
+        self.ui.ui.control_panel.ui.signin.signinCanceled.emit()
+        self.assertEqual(len(self._called[0]), 1)
+        self.assertIsInstance(self._called[0][0], gui.QtGui.QCloseEvent)
 
=== added file 'ubuntuone/controlpanel/gui/qt/tests/test_signin.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_signin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_signin.py	2011-09-26 18:38:27 +0000
@@ -0,0 +1,168 @@
+# -*- 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 Sign In Panel."""
+
+from twisted.internet import defer
+
+from ubuntuone.controlpanel.gui import qt
+from ubuntuone.controlpanel.gui.qt import signin as gui
+from ubuntuone.controlpanel.gui.qt.tests import (
+    CrashyBackend,
+    CrashyBackendException,
+)
+from ubuntuone.controlpanel.gui.qt.tests.test_ubuntuonebin import (
+    UbuntuOneBinTestCase,
+)
+
+EMAIL = '[e-mail]'
+PASSWORD = 'h3ll0World'
+TOKEN = {'yadda': 'doo'}
+
+MSG = {u'errtype': u'AuthenticationError',
+       u'message': u'The authentication failed.'}
+
+
+def fail(*a, **kw):
+    """Emit CredentialsError."""
+    raise TypeError(MSG)
+
+
+class BaseSignInPanelTestCase(UbuntuOneBinTestCase):
+    """Test the signin panel."""
+
+    innerclass_ui = gui.signin_ui
+    innerclass_name = "Ui_Form"
+    class_ui = gui.SignInPanel
+    logger = gui.logger
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(BaseSignInPanelTestCase, self).setUp()
+        self.ui.backend.next_result = TOKEN
+
+
+class SignInPanelTestCase(BaseSignInPanelTestCase):
+    """Test the signin panel."""
+
+    innerclass_ui = gui.signin_ui
+    innerclass_name = "Ui_Form"
+    class_ui = gui.SignInPanel
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(SignInPanelTestCase, self).setUp()
+        self.ui.backend.next_result = TOKEN
+        self.ui.ui.email_entry.setText(gui.QtCore.QString(''))
+        self.ui.ui.password_entry.setText(gui.QtCore.QString(''))
+
+    @defer.inlineCallbacks
+    def test_is_processing_while_asking_info(self):
+        """The ui is processing while the contents are loaded."""
+        def check(email, password):
+            """The ui must be is_processing."""
+            self.assertTrue(self.ui.is_processing, 'ui must be processing')
+            return TOKEN
+
+        self.patch(self.ui.backend, 'login', check)
+
+        self.assertFalse(self.ui.is_processing)
+        yield self.ui.ui.signin_button.click()
+        self.assertFalse(self.ui.is_processing)
+
+    def test_signin_disabled_at_startup(self):
+        """The signin_button is disabled at startup."""
+        self.assertFalse(self.ui.ui.signin_button.isEnabled())
+
+    def test_signin_disabled_if_no_email_but_password(self):
+        """Disable signin_button if no email."""
+        self.ui.ui.password_entry.setText(gui.QtCore.QString('doo'))
+        self.assertFalse(self.ui.ui.signin_button.isEnabled())
+
+    def test_signin_disabled_if_no_password_but_email(self):
+        """Disable signin_button if no password."""
+        self.ui.ui.email_entry.setText(gui.QtCore.QString('duh'))
+        self.assertFalse(self.ui.ui.signin_button.isEnabled())
+
+    def test_cancel_button(self):
+        """Send a signal when the cancel button is clicked."""
+        self.ui.signinCanceled.connect(self._set_called)
+        self.ui.ui.cancel_button.click()
+        self.assertEqual(self._called, ((), {}))
+
+    def test_forgot_password_button(self):
+        """When clicking the forgot passsword btn, the proper url is opened."""
+        self.patch(qt, 'uri_hook', self._set_called)
+        self.ui.ui.forgot_password_button.click()
+
+        self.assertEqual(self._called, ((gui.RESET_PASSWORD_LINK,), {}))
+
+
+class SignInButtonPanelTestCase(BaseSignInPanelTestCase):
+    """Test the signin_button widget."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(SignInButtonPanelTestCase, self).setUp()
+        self.ui.ui.email_entry.setText(gui.QtCore.QString(EMAIL))
+        self.ui.ui.password_entry.setText(gui.QtCore.QString(PASSWORD))
+
+    @defer.inlineCallbacks
+    def test_signin_button(self):
+        """Call the backend when the signin button is clicked."""
+        yield self.ui.ui.signin_button.click()
+
+        self.assert_backend_called('login', email=EMAIL, password=PASSWORD)
+        # pylint: disable=W0212
+        for arg in self.ui.backend._called['login'][1].itervalues():
+            self.assertIsInstance(arg, unicode)  # make sure not send QString
+
+    @defer.inlineCallbacks
+    def test_signin_success(self):
+        """Emit credentialsFound on signin success."""
+        self.ui.credentialsFound.connect(self._set_called)
+        yield self.ui.ui.signin_button.click()
+
+        self.assertEqual(self._called, ((TOKEN,), {}))
+        self.assertFalse(self.ui.is_processing)
+
+    def test_signin_enabled_if_email_and_password(self):
+        """Enable signin_button if email and password are non empty."""
+        self.assertTrue(self.ui.ui.signin_button.isEnabled())
+
+    def test_return_pressed(self):
+        """On return pressed, click the signin_button."""
+        self.patch(self.ui.ui.signin_button, 'click', self._set_called)
+
+        for entry in (self.ui.ui.email_entry, self.ui.ui.password_entry):
+            entry.returnPressed.emit()
+
+            # This is failing, so we need to settle with counting recievers
+            #self.assertEqual(self._called, ((), {}))
+            receivers = entry.receivers(gui.QtCore.SIGNAL('returnPressed()'))
+            self.assertEqual(1, receivers)
+
+            self._called = False
+
+    @defer.inlineCallbacks
+    def test_backend_error_is_handled(self):
+        """Any error from the backend is properly handled."""
+        self.patch(self.ui, 'backend', CrashyBackend())
+        yield self.ui.ui.signin_button.click()
+
+        self.assertTrue(self.memento.check_exception(CrashyBackendException))
 
=== added file 'ubuntuone/controlpanel/gui/qt/tests/test_start.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_start.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_start.py	2011-09-26 18:38:27 +0000
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+
+# Author: Roberto Alsina <[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 start function."""
+
+from twisted.internet import defer
+
+from ubuntuone.controlpanel.gui.qt import gui
+from ubuntuone.controlpanel.gui.qt.tests import NO_OP
+from ubuntuone.controlpanel.tests import TestCase
+
+
+class FakeThing(object):
+
+    """A fake thing."""
+
+    def __init__(self):
+        self.args = []
+        self.shown = False
+
+    def __call__(self, *args, **kwargs):
+        self.args.append((args, kwargs))
+        return self
+
+    def show(self):
+        """Show."""
+        self.shown = True
+
+
+class FakeReactor(object):
+    """A fake reactor."""
+
+    def run(self):
+        """Start."""
+
+    def stop(self):
+        """Stop."""
+
+
+class StartTestCase(TestCase):
+    """Test the qt control panel."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(StartTestCase, self).setUp()
+        self.main_window = FakeThing()
+        self.tray_icon = FakeThing()
+        self.patch(gui, "MainWindow", self.main_window)
+        self.patch(gui, "TrayIcon", self.tray_icon)
+
+    def test_minimized(self):
+        """Test behaviour with minimized=True."""
+        gui.start(NO_OP, minimized=True, with_icon=True)
+        self.assertEqual(self.tray_icon.args, [((), {'window': None})])
+        self.assertEqual(self.main_window.args, [])
+
+    def test_with_icon(self):
+        """Test behaviour with with_icon=True."""
+        gui.start(NO_OP, with_icon=True, minimized=False)
+        self.assertEqual(self.main_window.args, [((), {})])
+        self.assertEqual(self.tray_icon.args, [((),
+            {'window': self.main_window})])
+
+    def test_both_false(self):
+        """Test behaviour when with_icon and minimized are False."""
+        gui.start(NO_OP, with_icon=False, minimized=False)
+        # Should be called
+        self.assertNotEqual(self.main_window.args, [])
+        # Should not be called
+        self.assertEqual(self.tray_icon.args, [])
+
+    def test_both_true(self):
+        """Test behaviour when with_icon and minimized are True."""
+        gui.start(NO_OP, with_icon=True, minimized=True)
+        self.assertEqual(self.tray_icon.args, [((), {'window': None})])
+        self.assertEqual(self.main_window.args, [])
 
=== added file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2011-09-26 18:38:27 +0000
@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+
+# Author: Roberto Alsina <[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 notification area icon."""
+
+from PyQt4 import QtGui
+
+from ubuntuone.controlpanel.gui.qt.systray import TrayIcon
+from ubuntuone.controlpanel.tests import TestCase
+import ubuntuone.controlpanel.gui.qt.gui
+
+
+class FakeMainWindow(QtGui.QWidget):
+
+    """Fake Main Window."""
+
+    def __init__(self, *args, **kwargs):
+        self.args = (args, kwargs)
+        super(FakeMainWindow, self).__init__()
+
+
+class SystrayTestCase(TestCase):
+
+    """Test the notification area icon."""
+
+    def test_quit(self):
+        """Test the quit option in the menu."""
+        # Not done on setup, because if I patch stop
+        # after instantiation, it doesn't get called.
+        self.patch(TrayIcon, "stop", self._set_called)
+        tray = TrayIcon()
+        tray.quit.trigger()
+        self.assertEqual(self._called, ((False,), {}))
+
+    def test_restore_no_window(self):
+        """Test the restore window option in the menu, with no window."""
+        self.patch(ubuntuone.controlpanel.gui.qt.gui,
+            "MainWindow", FakeMainWindow)
+        tray = TrayIcon()
+        self.assertEqual(tray.window, None)
+        tray.restore.trigger()
+        self.assertIsInstance(tray.window, FakeMainWindow)
+        self.assertTrue(tray.window.isVisible())
+        self.assertEqual(tray.window.args, ((),
+            {'close_callback': tray.delete_window}))
+
+    def test_activate(self):
+        """Test the icon activation."""
+        tray = TrayIcon()
+        window = FakeMainWindow()
+        tray.window = window
+        self.assertFalse(tray.window.isVisible())
+        tray.activated.emit(tray.Trigger)
+        self.assertEqual(tray.window, window)
+        self.assertTrue(tray.window.isVisible())
+
+    def test_restore_window(self):
+        """Test the restore window option in the menu, with a window."""
+        tray = TrayIcon()
+        window = FakeMainWindow()
+        tray.window = window
+        self.assertFalse(tray.window.isVisible())
+        tray.restore.trigger()
+        self.assertEqual(tray.window, window)
+        self.assertTrue(tray.window.isVisible())
+
+    def test_delete_window(self):
+        """Test deleting an existing window."""
+        tray = TrayIcon()
+        window = FakeMainWindow()
+        tray.window = window
+        tray.delete_window()
+        self.assertEqual(tray.window, None)
+        self.assertFalse(window.isVisible())
+
+    def test_delete_no_window(self):
+        """Test deleting without an existing window."""
+        tray = TrayIcon()
+        tray.delete_window()
+        self.assertEqual(tray.window, None)
+
+    def test_initialization(self):
+        """Test that everything initializes correctly."""
+        tray = TrayIcon()
+        self.assertTrue(tray.isVisible())
+        self.assertEqual(tray.window, None)
+        self.assertIsInstance(tray.context_menu, QtGui.QMenu)
+        self.assertFalse(tray.icon() == None)
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py	2011-07-22 21:26:48 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_ubuntuonebin.py	2011-09-26 18:38:27 +0000
@@ -18,25 +18,24 @@
 
 """Tests for the Ubuntu One Bin."""
 
-from ubuntuone.devtools.testcase import skipIfOS
+from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.qt import ubuntuonebin as gui
-from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
+from ubuntuone.controlpanel.gui.qt.tests import (
+    BaseTestCase,
+    CrashyBackend,
+    CrashyBackendException,
+)
 
 # Attribute 'yyy' defined outside __init__, access to a protected member
 # pylint: disable=W0201, W0212
 
 
 class UbuntuOneBinTestCase(BaseTestCase):
-    """Test the qt cloud folders tab."""
+    """Test the Ubuntu One base widget."""
 
     class_ui = gui.UbuntuOneBin
 
-    def test_backend(self):
-        """Backend is created."""
-        self.assertIsInstance(self.ui.backend,
-                              gui.backend.ControlBackend)
-
     def test_is_not_processing_after_creation(self):
         """After creation, is not processing."""
         self.assertFalse(self.ui.is_processing)
@@ -46,22 +45,33 @@
         """The animation is active."""
         self.assertFalse(self.ui.overlay.isVisible())
 
-    @skipIfOS('win32', 'crashes under windows, see LP: #806154')
     def test_is_enabled_if_not_processing(self):
         """If not processing, the UI is enabled."""
         self.ui.show()  # need to show to test widgets visibility
+        self.addCleanup(self.ui.hide)
 
         self.ui.is_processing = False
 
         self.assertTrue(self.ui.isEnabled())
         self.assertFalse(self.ui.overlay.isVisible())
 
-    @skipIfOS('win32', 'crashes under windows, see LP: #806154')
     def test_is_not_enabled_if_processing(self):
         """If processing, the UI is disabled."""
         self.ui.show()  # need to show to test widgets visibility
+        self.addCleanup(self.ui.hide)
 
         self.ui.is_processing = True
 
         self.assertFalse(self.ui.isEnabled())
         self.assertTrue(self.ui.overlay.isVisible())
+
+    @defer.inlineCallbacks
+    def test_backend_error_is_handled(self):
+        """Any error from the backend is properly handled."""