Merge lp:~dobey/ubuntuone-control-panel/update-4-0 into lp:ubuntuone-control-panel/stable-4-0

[dobey]

[Diego Sarmentero]

    - Adding Share Links Tab UI (LP: #1039142).
    - Show the not accepted shares (LP: #1034542).
    - Show current and recent transfers on the transfers menu (LP: #1034542).
    - Adding open (folder, program, url) actions to the menu (LP: #1034542)
    - Adding status actions to the system tray menu (LP: #1034542).

[Mike McCracken]

    - Remove use of env vars for u1lint and u1trial from old buildout. (LP: #1037904)
    - Add darwin-only function to perform first-run "install" steps (LP: #1024623)

[Roberto Alsina]

     - Give an error if the user subscribes a UDF and the local path is not a folder (LP:1033488)
     - Prevented loading of the scrollbar overlay (LP:1007421).

[Alejandro J. Cura (alecu)]

Looks just like trunk. +1.

review: Approve (trivial)

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-4-0 into lp:ubuntuone-control-panel/stable-4-0 failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
    t...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-4-0 into lp:ubuntuone-control-panel/stable-4-0 failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... [OK]
    t...

[lp:~dobey/ubuntuone-control-panel/update-4-0]

335. By Roberto Alsina on 2012-08-23

[Diego Sarmentero]

    - Adding Share Links Tab UI (LP: #1039142).
    - Show the not accepted shares (LP: #1034542).
    - Show current and recent transfers on the transfers menu (LP: #1034542).
    - Adding open (folder, program, url) actions to the menu (LP: #1034542)
    - Adding status actions to the system tray menu (LP: #1034542).

[Mike McCracken]

    - Remove use of env vars for u1lint and u1trial from old buildout. (LP: #1037904)
    - Add darwin-only function to perform first-run "install" steps (LP: #1024623)

[Roberto Alsina]

     - Give an error if the user subscribes a UDF and the local path is not a folder (LP:1033488)
     - Prevented loading of the scrollbar overlay (LP:1007421).

=== modified file 'data/qt/controlpanel.ui'
--- data/qt/controlpanel.ui	2012-03-20 13:05:20 +0000
+++ data/qt/controlpanel.ui	2012-08-22 21:22:18 +0000
@@ -26,7 +26,7 @@
    <item>
     <widget class="QStackedWidget" name="switcher">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="management">
       <property name="sizePolicy">
@@ -229,13 +229,18 @@
             </sizepolicy>
            </property>
            <property name="currentIndex">
-            <number>0</number>
+            <number>1</number>
            </property>
            <widget class="FoldersPanel" name="folders_tab">
             <attribute name="title">
              <string notr="true">Folders</string>
             </attribute>
            </widget>
+           <widget class="ShareLinksPanel" name="share_links_tab">
+            <attribute name="title">
+             <string>Share Links</string>
+            </attribute>
+           </widget>
            <widget class="DevicesPanel" name="devices_tab">
             <attribute name="title">
              <string notr="true">Devices</string>
@@ -416,6 +421,12 @@
    <header>ubuntuone.controlpanel.gui.qt.wizard</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ShareLinksPanel</class>
+   <extends>QWidget</extends>
+   <header>ubuntuone.controlpanel.gui.qt.share_links</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>help_button</tabstop>

=== added file 'data/qt/share_links.ui'
--- data/qt/share_links.ui	1970-01-01 00:00:00 +0000
+++ data/qt/share_links.ui	2012-08-22 21:22:18 +0000
@@ -0,0 +1,133 @@
+<?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>532</width>
+    <height>335</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>15</number>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>10</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="spacing">
+      <number>0</number>
+     </property>
+     <property name="sizeConstraint">
+      <enum>QLayout::SetDefaultConstraint</enum>
+     </property>
+     <property name="leftMargin">
+      <number>10</number>
+     </property>
+     <item>
+      <widget class="QLabel" name="search_files_lbl">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>10</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Search files</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEdit">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>400</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="frame">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <widget class="QWidget" name="page">
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="spacing">
+        <number>0</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="shared_group">
+         <property name="title">
+          <string>   Shared files</string>
+         </property>
+         <property name="flat">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <property name="spacing">
+           <number>0</number>
+          </property>
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item>
+           <widget class="QTreeWidget" name="treeWidget">
+            <attribute name="headerVisible">
+             <bool>false</bool>
+            </attribute>
+            <column>
+             <property name="text">
+              <string notr="true">1</string>
+             </property>
+            </column>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_2"/>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

=== modified file 'docs/ubuntuone-control-panel-qt.1'
--- docs/ubuntuone-control-panel-qt.1	2012-03-08 16:40:50 +0000
+++ docs/ubuntuone-control-panel-qt.1	2012-08-22 21:22:18 +0000
@@ -12,7 +12,7 @@
 .TP
 \fB\-\-switch\-to\fR PANEL_NAME
 Start Ubuntu One in the PANEL_NAME tab. Possible
-values are: folders, devices, settings, account
+values are: folders, share_links, devices, settings, account
 .TP
 \fB\-\-minimized\fR
 Start Ubuntu One only in the notification area, with

=== modified file 'run-tests'
--- run-tests	2012-06-07 23:00:22 +0000
+++ run-tests	2012-08-22 21:22:18 +0000
@@ -32,7 +32,7 @@
 fi
 
 style_check() {
-    $u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
+    u1lint --ignore ubuntuone/controlpanel/gui/qt/ui
     if [ -x `which pep8` ]; then
         pep8 --exclude '.svn,CVS,.bzr,.hg,.git,*_ui.py,*_rc.py' --repeat . bin/*
     else
@@ -52,8 +52,6 @@
 SYSNAME=`uname -s`
 
 if [ "$SYSNAME" == "Darwin" ]; then
-    u1trial="python $u1trial"
-    u1lint="python $u1lint"
     IGNORE_FILES="$WINDOWS_TESTS, $LINUX_TESTS"
     IGNORE_DBUS="-p $DBUS_TESTS_PATH"
     echo "*** Skipping DBus test suite ***"
@@ -64,21 +62,19 @@
     if [ "x$XVFB_CMDLINE" == "x" ]; then
 	echo "WARNING: Could not find xvfb-run, prepare for visual spam."
     fi
-    u1trial=u1trial
-    u1lint=u1lint
     IGNORE_FILES="$WINDOWS_TESTS, $DARWIN_TESTS"
     IGNORE_DBUS=""
     echo "*** Running DBus test suite ***"
-    $u1trial --reactor=glib "$DBUS_TESTS_PATH"
+    u1trial --reactor=glib "$DBUS_TESTS_PATH"
     REACTOR=gi
 fi
 
 echo "*** Running test suite for ""$MODULE"" ***"
-$u1trial --reactor=$REACTOR -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH" -i "$IGNORE_FILES" "$MODULE"
+u1trial --reactor=$REACTOR -p "$DBUS_TESTS_PATH, $QT_TESTS_PATH" -i "$IGNORE_FILES" "$MODULE"
 
 echo "*** Running QT test suite for ""$MODULE"" ***"
 ./setup.py build
-$XVFB_CMDLINE $u1trial $IGNORE_DBUS -i "$IGNORE_FILES" --reactor=qt4 --gui "$MODULE"
+$XVFB_CMDLINE u1trial $IGNORE_DBUS -i "$IGNORE_FILES" --reactor=qt4 --gui "$MODULE"
 rm -rf _trial_temp
 rm -rf build
 

=== modified file 'run-tests.bat'
--- run-tests.bat	2012-04-20 14:45:56 +0000
+++ run-tests.bat	2012-08-22 21:22:18 +0000
@@ -19,7 +19,7 @@
 SET MODULE="ubuntuone"
 SET PYTHONEXEPATH=""
 SET IGNORE_PATHS="ubuntuone\controlpanel\dbustests"
-SET IGNORE_MODULES="test_linux.py, test_libsoup.py"
+SET IGNORE_MODULES="test_linux.py, test_libsoup.py, test_darwin.py"
 SET PYTHONPATH=%PYTHONPATH%;..\ubuntu-sso-client;..\ubuntuone-client;.
 
 ECHO Checking for Python on the path

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2012-06-22 14:42:29 +0000
+++ ubuntuone/controlpanel/backend.py	2012-08-22 21:22:18 +0000
@@ -821,6 +821,20 @@
         yield self.change_file_sync_settings(self.DEFAULT_FILE_SYNC_SETTINGS)
 
     @log_call(logger.info)
+    @inlineCallbacks
+    def sync_menu(self):
+        """Obtain the data to create the sync menu."""
+        result = yield self.sd_client.sync_menu()
+        returnValue(result)
+
+    @log_call(logger.info)
+    @inlineCallbacks
+    def get_shares(self):
+        """Obtain the data to create the sync menu."""
+        result = yield self.sd_client.get_shares()
+        returnValue(result)
+
+    @log_call(logger.info)
     def shutdown(self):
         """Stop this service."""
         # do any other needed cleanup

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-05-29 14:36:17 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-08-22 21:22:18 +0000
@@ -42,6 +42,10 @@
 SHARES_MIN_SIZE_FULL = 1048576
 SUCCESS_COLOR = u'green'
 
+# Sync Menu:
+RECENTTRANSFERS = 'recent-transfers'
+UPLOADING = 'uploading'
+
 ERROR_ICON = u'✘'
 SYNCING_ICON = u'⇅'
 IDLE_ICON = u'✔'
@@ -65,7 +69,9 @@
 
 FILE_URI_PREFIX = u'file://'
 
+ACCEPT_SHARES = 'https://one.ubuntu.com/files/shareoffer/%s/'
 CONTACTS_LINK = UBUNTUONE_LINK
+DASHBOARD = UBUNTUONE_LINK + u'dashboard/'
 EDIT_ACCOUNT_LINK = UBUNTUONE_LINK + u'account/'
 EDIT_DEVICES_LINK = EDIT_ACCOUNT_LINK + u'machines/'
 EDIT_PROFILE_LINK = u'https://login.ubuntu.com/'
@@ -140,6 +146,9 @@
                           'with your local folder "%(folder_path)s" when '
                           'subscribing.\nDo you want to subscribe to this '
                           'cloud folder?')
+FOLDER_EXISTS_AS_FILE = _('Unable to subscribe because '
+                         '"%(folder_path)s" already exists on your '
+                         'device and is not a folder.')
 FOLDERS_MANAGE_LABEL = _('Go to the web for public and private sharing '
     'options')
 FOLDERS_TITLE = _('Select which folders from your cloud you want to sync with '
@@ -173,6 +182,9 @@
 GET_HELP_ONLINE = _('Get help online')
 GET_MORE_STORAGE = _('Get more storage')
 GREETING = _('Hi %(user_display_name)s')
+GO_TO_WEB = _('Go to the Website')
+IN_PROGRESS = _('In Progress')
+IN_PROGRESS_FILE = u'%s – %d%%'
 INSTALL = _('Install')
 INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s'
                     '</i> in order to enable more sync services.')
@@ -202,6 +214,7 @@
 MAIN_DEVICES_TAB = _('Devices')
 MAIN_FOLDERS_TAB = _('Folders')
 MAIN_PREFERENCES_TAB = _('Settings')
+MAIN_SHARE_LINKS_TAB = _('Share links')
 MAIN_WINDOW_TITLE = _('%(app_name)s Control Panel')
 MUSIC_DISPLAY_NAME = _('Purchased Music')
 MUSIC_REAL_PATH = u'.ubuntuone/Purchased from Ubuntu One'
@@ -209,15 +222,20 @@
 NAME_NOT_SET = _('[unknown user name]')
 NETWORK_OFFLINE = _('An internet connection is required to join or sign '
                     'in to %(app_name)s.')
+NEW_SHARE_BY = _('New Share by %s')
 NO_DEVICES = _('No devices to show.')
 NO_FOLDERS = _('No folders to show.')
 NO_PAIRING_RECORD = _('There is no Ubuntu One pairing record.')
+OPEN_UBUNTU_ONE = _('Open Ubuntu One')
+OPEN_UBUNTU_ONE_FOLDER = _('Open the Ubuntu One Folder')
 PERCENTAGE_LABEL = _('%(percentage)s used')
 PLEASE_WAIT = _('Please wait')
 PROFILE_LABEL = _('Personal details')
 QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
 REMOVE_BUTTON = _('Remove')
+RECENT_TRANSFERS = _('Recent Transfers')
 RESTORE_LABEL = _('Restore')
+SEARCH_FILES = _('Search files')
 SELECT_FOLDERS = _('Select sync folders')
 SERVICES_BUTTON_TOOLTIP = _('Manage the sync services')
 SERVICES_TITLE = _('Enable the sync services for this computer.')
@@ -236,12 +254,15 @@
     'to this computer')
 SETTINGS_SYNC_ALL_SHARES = _('Automatically sync all folders shared with me '
     'to this computer')
+SHARE_A_FILE = _('Share a File')
+SHARED_FILES = _('Shared files')
 SHARES_BUTTON_TOOLTIP = _('Manage the shares offered to others')
 SHARES_TITLE = _('Manage permissions for shares made to other users.')
 SIGN_IN = _('Sign in')
 SUCCESS_INSTALL = _('<i>%(package_name)s</i> was successfully installed')
 SYNC_STREAM_SHARE = _('Sync, stream, share')
 TALK_TO_US = _('Talk to us')
+TRANSFERS = _('Current and Recent Transfers')
 VALUE_ERROR = _('Value could not be retrieved.')
 UNKNOWN_ERROR = _('Unknown error')
 USAGE_LABEL = _('%(used)s of %(total)s')

=== modified file 'ubuntuone/controlpanel/gui/qt/__init__.py'
--- ubuntuone/controlpanel/gui/qt/__init__.py	2012-04-17 18:08:45 +0000
+++ ubuntuone/controlpanel/gui/qt/__init__.py	2012-08-22 21:22:18 +0000
@@ -24,13 +24,91 @@
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
 
+from ubuntuone.controlpanel import backend
 from ubuntuone.controlpanel.gui import (
+    ERROR_COLOR,
+    FILE_SYNC_CONNECT,
+    FILE_SYNC_CONNECT_TOOLTIP,
+    FILE_SYNC_DISABLED,
+    FILE_SYNC_DISCONNECT,
+    FILE_SYNC_DISCONNECT_TOOLTIP,
+    FILE_SYNC_DISCONNECTED,
+    FILE_SYNC_ENABLE,
+    FILE_SYNC_ENABLE_TOOLTIP,
+    FILE_SYNC_ERROR,
+    FILE_SYNC_IDLE,
+    FILE_SYNC_RESTART,
+    FILE_SYNC_RESTART_TOOLTIP,
+    FILE_SYNC_START,
+    FILE_SYNC_START_TOOLTIP,
+    FILE_SYNC_STARTING,
+    FILE_SYNC_STOP,
+    FILE_SYNC_STOP_TOOLTIP,
+    FILE_SYNC_STOPPED,
+    FILE_SYNC_SYNCING,
     FILE_URI_PREFIX,
     GENERAL_ERROR_TITLE,
     GENERAL_ERROR_MSG,
 )
 
 
+WARNING_MARKUP = '<font color="%s"><b>%%s</b></font>' % ERROR_COLOR
+DISCONNECTED_ICON = 'sync_status_disconnected'
+ERROR_ICON = 'sync_status_alert'
+IDLE_ICON = 'sync_status_sync_done'
+SYNCING_ICON = 'sync_status_syncing'
+
+
+FILE_SYNC_STATUS = {
+    backend.FILE_SYNC_DISABLED:
+        {'msg': FILE_SYNC_DISABLED, 'action': FILE_SYNC_ENABLE,
+         'backend_method': 'enable_files',
+         'icon': ERROR_ICON,
+         'tooltip': FILE_SYNC_ENABLE_TOOLTIP},
+    backend.FILE_SYNC_DISCONNECTED:
+        {'msg': FILE_SYNC_DISCONNECTED, 'action': FILE_SYNC_CONNECT,
+         'backend_method': 'connect_files',
+         'icon': DISCONNECTED_ICON,
+         'tooltip': FILE_SYNC_CONNECT_TOOLTIP},
+    backend.FILE_SYNC_ERROR:
+        {'msg': WARNING_MARKUP % FILE_SYNC_ERROR, 'action': FILE_SYNC_RESTART,
+         'backend_method': 'restart_files',
+         'icon': ERROR_ICON,
+         'tooltip': FILE_SYNC_RESTART_TOOLTIP},
+    backend.FILE_SYNC_IDLE:
+        {'msg': FILE_SYNC_IDLE, 'action': FILE_SYNC_DISCONNECT,
+         'backend_method': 'disconnect_files',
+         'icon': IDLE_ICON,
+         'tooltip': FILE_SYNC_DISCONNECT_TOOLTIP},
+    backend.FILE_SYNC_STARTING:
+        {'msg': FILE_SYNC_STARTING, 'action': FILE_SYNC_STOP,
+         'backend_method': 'stop_files',
+         'icon': SYNCING_ICON,
+         'tooltip': FILE_SYNC_STOP_TOOLTIP},
+    backend.FILE_SYNC_STOPPED:
+        {'msg': FILE_SYNC_STOPPED, 'action': FILE_SYNC_START,
+         'backend_method': 'start_files',
+         'icon': ERROR_ICON,
+         'tooltip': FILE_SYNC_START_TOOLTIP},
+    backend.FILE_SYNC_SYNCING:
+        {'msg': FILE_SYNC_SYNCING, 'action': FILE_SYNC_DISCONNECT,
+         'backend_method': 'disconnect_files',
+         'icon': SYNCING_ICON,
+         'tooltip': FILE_SYNC_DISCONNECT_TOOLTIP},
+    backend.FILE_SYNC_UNKNOWN:
+        {'msg': WARNING_MARKUP % FILE_SYNC_ERROR, 'action': FILE_SYNC_RESTART,
+         'backend_method': 'restart_files',
+         'icon': ERROR_ICON,
+         'tooltip': FILE_SYNC_RESTART_TOOLTIP},
+}
+
+
+def icon_name_from_status(status_key):
+    """Get the icon name for the status."""
+    icon_name = FILE_SYNC_STATUS[status_key]['icon']
+    return icon_name
+
+
 def force_wordwrap(widget, size, text):
     """Set the text to the widget after word wrapping it."""
     font_metrics = QtGui.QFontMetrics(widget.font())

=== modified file 'ubuntuone/controlpanel/gui/qt/controlpanel.py'
--- ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-04-11 11:47:19 +0000
+++ ubuntuone/controlpanel/gui/qt/controlpanel.py	2012-08-22 21:22:18 +0000
@@ -35,6 +35,7 @@
     MAIN_DEVICES_TAB,
     MAIN_FOLDERS_TAB,
     MAIN_PREFERENCES_TAB,
+    MAIN_SHARE_LINKS_TAB,
     PERCENTAGE_LABEL,
     show_quota_warning,
     TALK_TO_US,
@@ -76,6 +77,9 @@
         self.ui.tab_widget.setTabText(
             self.ui.tab_widget.indexOf(self.ui.folders_tab), MAIN_FOLDERS_TAB)
         self.ui.tab_widget.setTabText(
+            self.ui.tab_widget.indexOf(self.ui.share_links_tab),
+                MAIN_SHARE_LINKS_TAB)
+        self.ui.tab_widget.setTabText(
             self.ui.tab_widget.indexOf(self.ui.devices_tab), MAIN_DEVICES_TAB)
         self.ui.tab_widget.setTabText(
             self.ui.tab_widget.indexOf(self.ui.preferences_tab),

=== modified file 'ubuntuone/controlpanel/gui/qt/filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2012-05-10 21:01:30 +0000
+++ ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2012-08-22 21:22:18 +0000
@@ -22,92 +22,19 @@
 from ubuntuone.controlpanel import backend, cache
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
-    ERROR_COLOR,
-    FILE_SYNC_CONNECT,
-    FILE_SYNC_CONNECT_TOOLTIP,
-    FILE_SYNC_DISABLED,
-    FILE_SYNC_DISCONNECT,
-    FILE_SYNC_DISCONNECT_TOOLTIP,
-    FILE_SYNC_DISCONNECTED,
-    FILE_SYNC_ENABLE,
-    FILE_SYNC_ENABLE_TOOLTIP,
-    FILE_SYNC_ERROR,
-    FILE_SYNC_IDLE,
-    FILE_SYNC_RESTART,
-    FILE_SYNC_RESTART_TOOLTIP,
-    FILE_SYNC_START,
-    FILE_SYNC_START_TOOLTIP,
-    FILE_SYNC_STARTING,
-    FILE_SYNC_STOP,
-    FILE_SYNC_STOP_TOOLTIP,
-    FILE_SYNC_STOPPED,
-    FILE_SYNC_SYNCING,
     LOADING,
     PLEASE_WAIT,
 )
-from ubuntuone.controlpanel.gui.qt import pixmap_from_name
+from ubuntuone.controlpanel.gui.qt import (
+    FILE_SYNC_STATUS,
+    pixmap_from_name,
+)
 from ubuntuone.controlpanel.gui.qt.ui import filesyncstatus_ui
 
 
 logger = setup_logging('qt.filesyncstatus')
 
 
-WARNING_MARKUP = '<font color="%s"><b>%%s</b></font>' % ERROR_COLOR
-DISCONNECTED_ICON = 'sync_status_disconnected'
-ERROR_ICON = 'sync_status_alert'
-IDLE_ICON = 'sync_status_sync_done'
-SYNCING_ICON = 'sync_status_syncing'
-
-FILE_SYNC_STATUS = {
-    backend.FILE_SYNC_DISABLED:
-        {'msg': FILE_SYNC_DISABLED, 'action': FILE_SYNC_ENABLE,
-         'backend_method': 'enable_files',
-         'icon': ERROR_ICON,
-         'tooltip': FILE_SYNC_ENABLE_TOOLTIP},
-    backend.FILE_SYNC_DISCONNECTED:
-        {'msg': FILE_SYNC_DISCONNECTED, 'action': FILE_SYNC_CONNECT,
-         'backend_method': 'connect_files',
-         'icon': DISCONNECTED_ICON,
-         'tooltip': FILE_SYNC_CONNECT_TOOLTIP},
-    backend.FILE_SYNC_ERROR:
-        {'msg': WARNING_MARKUP % FILE_SYNC_ERROR, 'action': FILE_SYNC_RESTART,
-         'backend_method': 'restart_files',
-         'icon': ERROR_ICON,
-         'tooltip': FILE_SYNC_RESTART_TOOLTIP},
-    backend.FILE_SYNC_IDLE:
-        {'msg': FILE_SYNC_IDLE, 'action': FILE_SYNC_DISCONNECT,
-         'backend_method': 'disconnect_files',
-         'icon': IDLE_ICON,
-         'tooltip': FILE_SYNC_DISCONNECT_TOOLTIP},
-    backend.FILE_SYNC_STARTING:
-        {'msg': FILE_SYNC_STARTING, 'action': FILE_SYNC_STOP,
-         'backend_method': 'stop_files',
-         'icon': SYNCING_ICON,
-         'tooltip': FILE_SYNC_STOP_TOOLTIP},
-    backend.FILE_SYNC_STOPPED:
-        {'msg': FILE_SYNC_STOPPED, 'action': FILE_SYNC_START,
-         'backend_method': 'start_files',
-         'icon': ERROR_ICON,
-         'tooltip': FILE_SYNC_START_TOOLTIP},
-    backend.FILE_SYNC_SYNCING:
-        {'msg': FILE_SYNC_SYNCING, 'action': FILE_SYNC_DISCONNECT,
-         'backend_method': 'disconnect_files',
-         'icon': SYNCING_ICON,
-         'tooltip': FILE_SYNC_DISCONNECT_TOOLTIP},
-    backend.FILE_SYNC_UNKNOWN:
-        {'msg': WARNING_MARKUP % FILE_SYNC_ERROR, 'action': FILE_SYNC_RESTART,
-         'backend_method': 'restart_files',
-         'icon': ERROR_ICON,
-         'tooltip': FILE_SYNC_RESTART_TOOLTIP},
-}
-
-
-def icon_name_from_status(status_key):
-    """Get the icon name for the status."""
-    icon_name = FILE_SYNC_STATUS[status_key]['icon']
-    return icon_name
-
-
 class FileSyncStatus(cache.Cache, QtGui.QWidget):
     """The FileSyncStatus widget"""
 

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2012-06-04 16:25:39 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2012-08-22 21:22:18 +0000
@@ -26,6 +26,8 @@
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
 
+from ubuntuone.platform import is_link
+
 from ubuntuone.controlpanel.utils import default_folders
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.gui import (
@@ -38,6 +40,7 @@
     FOLDERS_COLUMN_NAME,
     FOLDERS_COLUMN_SYNC_LOCALLY,
     FOLDERS_CONFIRM_MERGE,
+    FOLDER_EXISTS_AS_FILE,
     FOLDERS_MANAGE_LABEL,
     GET_MORE_STORAGE,
     humanize,
@@ -328,16 +331,23 @@
                     os.path.exists(volume_path))
         response = YES
         if subscribed and os.path.exists(volume_path):
-            text = FOLDERS_CONFIRM_MERGE % {'folder_path': volume_path}
-            buttons = YES | NO | CANCEL
-            response = QtGui.QMessageBox.warning(self, '', text, buttons, YES)
+            if os.path.isdir(volume_path) and not is_link(volume_path):
+                text = FOLDERS_CONFIRM_MERGE % {'folder_path': volume_path}
+                buttons = YES | NO | CANCEL
+                response = QtGui.QMessageBox.warning(self, '', text, buttons,
+                    YES)
+            else:
+                text = FOLDER_EXISTS_AS_FILE % {'folder_path': volume_path}
+                buttons = CLOSE
+                QtGui.QMessageBox.warning(self, '', text, buttons)
+                response = NO
 
         self.is_processing = True
 
         if response == YES:
             # user accepted, merge the folder content
             yield self.backend.change_volume_settings(volume_id,
-                                                {'subscribed': subscribed})
+                                            {'subscribed': subscribed})
             self.load()
         else:
             # restore old value

=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-07-05 16:43:00 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-08-22 21:22:18 +0000
@@ -67,7 +67,7 @@
 
     def switch_to(self, tabname="folders"):
         """Switch control panel to the required tab."""
-        tabnames = ["folders", "devices", "settings", "account"]
+        tabnames = ["folders", "share_links", "devices", "settings", "account"]
         if tabname in tabnames:
             self.ui.control_panel.ui.tab_widget.setCurrentIndex(
                 tabnames.index(tabname))

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-06-28 04:25:16 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-08-22 21:22:18 +0000
@@ -17,6 +17,7 @@
 """Provide the correct ui main module."""
 
 import argparse
+import os
 import sys
 
 from PyQt4 import QtCore
@@ -37,6 +38,8 @@
     source = dbus_main
 # pylint: enable=C0103
 
+from ubuntuone.controlpanel.utils import install_config_and_daemons
+
 
 def parser_options():
     """Parse command line parameters."""
@@ -44,8 +47,8 @@
     result.add_argument("--switch-to", dest="switch_to",
                         metavar="PANEL_NAME", default="",
                         help="Start Ubuntu One in the "
-                             "PANEL_NAME tab. Possible values are: "
-                             "folders, devices, settings, account")
+                            "PANEL_NAME tab. Possible values are: "
+                            "folders, share_links, devices, settings, account")
     result.add_argument("--minimized", dest="minimized", action="store_true",
                         default=False,
                         help="Start Ubuntu One "
@@ -69,6 +72,15 @@
 
 def main(args, install_reactor_darwin=False):
     """Start the Qt mainloop and open the main window."""
+
+    # Disable the overlay-scrollbar GTK module that was
+    # added in Ubuntu 12.10 because it breaks Qt (LP:1007421)
+    gtk_mod = os.getenv('GTK_MODULES')
+    if gtk_mod is not None:
+        gtk_mod = ':'.join([mod for mod in
+            gtk_mod.split(':') if mod != 'overlay-scrollbar'])
+        os.environ['GTK_MODULES'] = gtk_mod
+
     # The following cannot be imported outside this function
     # because u1trial already provides a reactor.
 
@@ -109,6 +121,8 @@
         data.append(unicode(qss.data()))
     app.setStyleSheet('\n'.join(data))
 
+    install_config_and_daemons()
+
     # Unused variable 'window', 'icon', pylint: disable=W0612
     icon, window = start(lambda: source.main_quit(app),
                          minimized=minimized, with_icon=with_icon,

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-06-28 04:14:08 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-08-22 21:22:18 +0000
@@ -16,6 +16,7 @@
 
 """Tests for the control panel's Qt main."""
 
+import os
 import sys
 
 from PyQt4 import QtCore
@@ -146,6 +147,32 @@
             (['ubuntuone-installer', sys.argv[0]],
             ('ubuntuone-control-panel',), {}))
 
+    def _test_gtk_module_cleanup(self, modules, expected):
+        """Check if the module cleanup works."""
+        old_modules = os.environ.get('GTK_MODULES', '')
+
+        def clean_env():
+            """Reset the environment variable."""
+            os.environ['GTK_MODULES'] = old_modules
+
+        self.addCleanup(clean_env)
+        os.environ['GTK_MODULES'] = modules
+        main.main([sys.argv[0]])
+        self.assertEqual(os.environ['GTK_MODULES'], expected)
+
+    def test_gtk_module_cleanup_1(self):
+        """Test that we deactivate the overlay scrollbar GTK module."""
+        self._test_gtk_module_cleanup('aaa:overlay-scrollbar:bbb', 'aaa:bbb')
+
+    def test_gtk_module_cleanup_2(self):
+        """Test that we deactivate the overlay scrollbar GTK module."""
+        self._test_gtk_module_cleanup('overlay-scrollbar', '')
+
+    def test_gtk_module_cleanup_3(self):
+        """Test that we deactivate the overlay scrollbar GTK module."""
+        self._test_gtk_module_cleanup('overlay-scrollbar:overlay-scrollbars',
+            'overlay-scrollbars')
+
     def test_title_not_fail(self):
         """Ensure -title is removed before it gets to argparse."""
         main.main([sys.argv[0], "-title"])
@@ -233,3 +260,11 @@
         self.patch(sys, 'platform', 'not-darwin')
         main.main([sys.argv[0]], install_reactor_darwin=False)
         self.assertEqual(self.qt4reactor_installed, False)
+
+    def test_install_config(self):
+        """Test that install_config_and_daemons is called."""
+        self.patch(main, 'install_config_and_daemons',
+                   self._set_called)
+
+        main.main([sys.argv[0]], install_reactor_darwin=False)
+        self.assertEqual(self._called, ((), {}))

=== added file 'ubuntuone/controlpanel/gui/qt/share_links.py'
--- ubuntuone/controlpanel/gui/qt/share_links.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/share_links.py	2012-08-22 21:22:18 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 *-*
+
+# Copyright 2012 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 user interface for the control panel for Ubuntu One."""
+
+from ubuntuone.controlpanel.logger import setup_logging
+from ubuntuone.controlpanel.gui import (
+    SEARCH_FILES,
+    SHARED_FILES,
+)
+
+from ubuntuone.controlpanel.gui.qt.ui import share_links_ui
+from ubuntuone.controlpanel.gui.qt.ubuntuonebin import UbuntuOneBin
+
+
+logger = setup_logging('qt.share_links')
+
+
+class ShareLinksPanel(UbuntuOneBin):
+    """The Share Links Tab Panel widget"""
+
+    ui_class = share_links_ui
+    logger = logger
+
+    def _setup(self):
+        """Do some extra setupping for the UI."""
+        super(ShareLinksPanel, self)._setup()
+        self.ui.search_files_lbl.setText(SEARCH_FILES)
+        self.ui.shared_group.setTitle(SHARED_FILES)

=== modified file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	2012-05-14 20:16:02 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2012-08-22 21:22:18 +0000
@@ -15,17 +15,94 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """System notification area icon."""
 
-from PyQt4 import QtGui
+import os
+import sys
+from operator import itemgetter
+
+from PyQt4 import QtGui, QtCore
 from twisted.internet.defer import inlineCallbacks
 from ubuntuone.platform.tools import SyncDaemonTool
 
+from ubuntuone.controlpanel import backend, cache
+from ubuntuone.controlpanel.logger import setup_logging
 from ubuntuone.controlpanel.gui import (
-    RESTORE_LABEL,
-    QUIT_LABEL,
-)
-
-
-class TrayIcon(QtGui.QSystemTrayIcon):
+    ACCEPT_SHARES,
+    DASHBOARD,
+    GET_HELP_ONLINE,
+    GET_MORE_STORAGE,
+    GET_STORAGE_LINK,
+    GET_SUPPORT_LINK,
+    GO_TO_WEB,
+    IN_PROGRESS,
+    IN_PROGRESS_FILE,
+    LOADING,
+    NEW_SHARE_BY,
+    OPEN_UBUNTU_ONE,
+    OPEN_UBUNTU_ONE_FOLDER,
+    PLEASE_WAIT,
+    RECENT_TRANSFERS,
+    RECENTTRANSFERS,
+    TRANSFERS,
+    UPLOADING,
+)
+from ubuntuone.controlpanel.gui.qt import (
+    FILE_SYNC_STATUS,
+    icon_from_name,
+)
+
+
+logger = setup_logging('qt.systray')
+
+
+class ProgressBarAction(QtGui.QWidgetAction):
+
+    """Menu action that display a progress bar for the uploads."""
+
+    def __init__(self, filename, percentage, parent=None):
+        super(ProgressBarAction, self).__init__(parent)
+        self._filename = os.path.basename(filename)
+        self.widget = QtGui.QWidget(None)
+        text = IN_PROGRESS_FILE % (self._filename, percentage)
+        self.setText(text)
+        self.label = QtGui.QLabel(text)
+        self.progress = QtGui.QProgressBar()
+        self.progress.setTextVisible(False)
+        self.progress.setValue(percentage)
+        self.progress.setFixedHeight(10)
+        vbox = QtGui.QVBoxLayout()
+        vbox.setContentsMargins(10, 5, 10, 5)
+        vbox.addWidget(self.label)
+        vbox.addWidget(self.progress)
+        self.widget.setLayout(vbox)
+
+        self.setDefaultWidget(self.widget)
+
+    def set_value(self, progress):
+        """Set the value of the progress bar."""
+        text = IN_PROGRESS_FILE % (self._filename, progress)
+        self.setText(text)
+        self.label.setText(text)
+        self.setText(text)
+        self.progress.setValue(progress)
+
+
+class SharesAction(QtGui.QAction):
+
+    """New Shares action."""
+
+    def __init__(self, text, volume_id, parent=None):
+        super(SharesAction, self).__init__(text, parent)
+        self._volume_id = volume_id
+
+        self.triggered.connect(self.accept_share)
+
+    def accept_share(self):
+        """Open the accept shares page."""
+        url = ACCEPT_SHARES % self._volume_id
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(url))
+
+
+class TrayIcon(QtGui.QSystemTrayIcon, cache.Cache):
 
     """System notification icon."""
 
@@ -34,23 +111,162 @@
         self.setIcon(QtGui.QIcon(":/icon.png"))
         self.setVisible(True)
         self.window = window
-        self.activated.connect(self.on_activated)
+        self.root_path = ''
+        self.recent_transfers = {}
+        self.uploading = {}
+        self._backend_method = None
+        self._previous_shares = None
+        self.close_callback = close_callback
         self.context_menu = QtGui.QMenu()
-        self.restore = QtGui.QAction(RESTORE_LABEL, self,
-            triggered=self.restore_window)
-        self.quit = QtGui.QAction(QUIT_LABEL, 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)
-
-        self.close_callback = close_callback
-
-    def on_activated(self, reason):
-        """The user activated the icon."""
-        if reason == self.Trigger:  # Left-click
-            self.restore_window()
+        self.status = None
+        self.quit = None
+        self.get_help_online = None
+        self.open_u1 = None
+        self.status_action = None
+        self.go_to_web = None
+        self.get_more_storage = None
+        self.transfers = None
+        self.open_u1_folder = None
+
+        self.load_menu()
+        # Refresh the Shares every five minutes if needed.
+        self._timer_id = self.startTimer(300000)
+
+    # pylint: disable=C0103
+
+    def timerEvent(self, event):
+        """Update the menu on each iteration."""
+        self.load_menu()
+
+    # pylint: enable=C0103
+
+    @inlineCallbacks
+    def load_menu(self):
+        """Load the content of the menu."""
+        shares_info = yield self.backend.get_shares()
+        shares_info = [share for share in shares_info if not share['accepted']]
+        if shares_info != self._previous_shares:
+            # Items
+            self.context_menu.clear()
+
+            self.status = self.context_menu.addAction(LOADING)
+            self.status.setEnabled(False)
+            self.status_action = self.context_menu.addAction(PLEASE_WAIT)
+            self.refresh_status()
+            self.context_menu.addSeparator()
+
+            self.open_u1 = self.context_menu.addAction(OPEN_UBUNTU_ONE)
+            # TODO: Share a file action when the Shares tab is ready in U1-CP
+            self.open_u1_folder = self.context_menu.addAction(
+                OPEN_UBUNTU_ONE_FOLDER)
+            self.go_to_web = self.context_menu.addAction(GO_TO_WEB)
+            self.context_menu.addSeparator()
+
+            # Shares
+            self._previous_shares = shares_info
+            max_shares = 0
+            for share in self._previous_shares:
+                if max_shares == 3:
+                    break
+                max_shares += 1
+                text = NEW_SHARE_BY % share['other_visible_name']
+                share_action = SharesAction(text, share['volume_id'],
+                    self.context_menu)
+                self.context_menu.addAction(share_action)
+            if self._previous_shares:
+                self.context_menu.addSeparator()
+
+            # Transfers
+            self.transfers = TransfersMenu(self)
+            self.context_menu.addMenu(self.transfers)
+
+            self.get_more_storage = self.context_menu.addAction(
+                GET_MORE_STORAGE)
+            self.get_help_online = self.context_menu.addAction(GET_HELP_ONLINE)
+            self.quit = self.context_menu.addAction("Quit")
+
+            self.setContextMenu(self.context_menu)
+
+            # Connect Signals
+            self.status_action.triggered.connect(self.change_status)
+            self.open_u1.triggered.connect(self.restore_window)
+            self.open_u1_folder.triggered.connect(self.open_u1_folder_action)
+            self.get_more_storage.triggered.connect(
+                self.get_more_storage_action)
+            self.go_to_web.triggered.connect(self.go_to_web_action)
+            self.get_help_online.triggered.connect(self.get_help_action)
+            self.quit.triggered.connect(self.stop)
+
+            self._get_volumes_info()
+
+    @inlineCallbacks
+    def refresh_status(self):
+        """Update Ubuntu One status."""
+        info = yield self.backend.file_sync_status()
+        self._process_status(info)
+        self.backend.status_changed_handler = self._process_status
+
+    def _process_status(self, status):
+        """Match status with signals."""
+        if status is None:
+            return
+        try:
+            status_key = status[backend.STATUS_KEY]
+            data = FILE_SYNC_STATUS[status_key]
+        except (KeyError, TypeError):
+            logger.exception(
+                '_process_status: received unknown status dict %r', status)
+            return
+
+        self.status_action.setEnabled(True)
+        icon_name = data.get('icon')
+        icon = QtGui.QIcon()
+        if icon_name is not None:
+            icon = icon_from_name(icon_name)
+        text = data.get('msg')
+        self.status.setIcon(icon)
+        self.status.setText(text)
+
+        action = data.get('action')
+        self._backend_method = getattr(self.backend,
+            data['backend_method'], None)
+        self.status_action.setText(action)
+
+    def change_status(self):
+        """Change the Syncing status of syncdaemon."""
+        if self._backend_method is not None:
+            self.status_action.setEnabled(False)
+            self._backend_method()
+        else:
+            logger.error('on_sync_status_button_clicked: backend method is '
+                         'None!')
+
+    @inlineCallbacks
+    def _get_volumes_info(self):
+        """Get the volumes info."""
+        info = yield self.backend.volumes_info()
+        self._process_volumes_info(info)
+
+    def _process_volumes_info(self, info):
+        """Process the volumes info."""
+        _, _, volumes = info[0]
+        self.root_path = u'file://%s' % unicode(volumes[0]['path'])
+
+    def open_u1_folder_action(self):
+        """Open the web to get more storage."""
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(self.root_path))
+
+    def get_more_storage_action(self):
+        """Open the web to get more storage."""
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(GET_STORAGE_LINK))
+
+    def go_to_web_action(self):
+        """Open the web in the dashboard."""
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(DASHBOARD))
+
+    def get_help_action(self):
+        """Open the web in the dashboard."""
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(GET_SUPPORT_LINK))
 
     def restore_window(self):
         """Show the main window."""
@@ -81,3 +297,80 @@
             # Maybe it was not running?
             pass
         self.close_callback()
+
+
+class TransfersMenu(QtGui.QMenu):
+
+    """Menu that shows recent and current transfers."""
+
+    def __init__(self, parent):
+        super(TransfersMenu, self).__init__(TRANSFERS)
+        self._parent = parent
+        self.uploading = {}
+        self.previous_data = {}
+
+        if sys.platform not in ('win32', 'darwin'):
+            self._timer_id = self.startTimer(1000)
+
+    # pylint: disable=C0103
+
+    def showEvent(self, event):
+        """Executed when the transfers menu is shown."""
+        logger.info('This is never executed on Ubuntu')
+        super(TransfersMenu, self).showEvent(event)
+        self.get_transfers_data()
+        self._timer_id = self.startTimer(1000)
+
+    def hideEvent(self, event):
+        """Executed when the transfers menu is hidden."""
+        logger.info('This is never executed on Ubuntu')
+        super(TransfersMenu, self).hideEvent(event)
+        self.killTimer(self._timer_id)
+
+    def timerEvent(self, event):
+        """Update the menu on each iteration."""
+        self.get_transfers_data()
+
+    # pylint: enable=C0103
+
+    @inlineCallbacks
+    def get_transfers_data(self):
+        """Get the transfers data to create the submenu."""
+        data = yield self._parent.backend.sync_menu()
+        self._update_transfers(data)
+
+    def _update_transfers(self, data):
+        """Generate the transfers menu."""
+        current_transfers = data[RECENTTRANSFERS]
+        current_upload = [
+            filename for filename, _, _ in data[UPLOADING]]
+        uploading_data = data[UPLOADING]
+        uploading_data.sort(key=itemgetter(2))
+        uploading_data.reverse()
+        if current_transfers != self.previous_data.get('transfers') or \
+           current_upload != self.previous_data.get('uploading'):
+            self.clear()
+            self.previous_data['transfers'] = current_transfers
+            self.previous_data['uploading'] = current_upload
+            self.uploading.clear()
+            recent = self.addAction(RECENT_TRANSFERS)
+            recent.setEnabled(False)
+            for filename in data[RECENTTRANSFERS]:
+                self.addAction(os.path.basename(filename))
+            self.addSeparator()
+            in_progress = self.addAction(IN_PROGRESS)
+            in_progress.setEnabled(False)
+            show_max = 0
+            for filename, size, written in uploading_data:
+                if show_max == 5:
+                    break
+                percentage = written * 100 / size
+                self.uploading[filename] = ProgressBarAction(
+                    filename, percentage)
+                self.addAction(self.uploading[filename])
+                show_max += 1
+        else:
+            for filename, size, written in uploading_data:
+                percentage = written * 100 / size
+                if filename in self.uploading:
+                    self.uploading[filename].set_value(percentage)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-04-02 11:10:49 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-08-22 21:22:18 +0000
@@ -25,7 +25,11 @@
 
 from ubuntuone.controlpanel import backend, cache
 from ubuntuone.controlpanel.tests import TestCase, EXPECTED_ACCOUNT_INFO, TOKEN
-from ubuntuone.controlpanel.gui import qt
+from ubuntuone.controlpanel.gui import (
+    qt,
+    RECENTTRANSFERS,
+    UPLOADING,
+)
 from ubuntuone.controlpanel.gui.tests import (
     FakedObject,
     FAKE_VOLUMES_INFO,
@@ -164,6 +168,17 @@
     def build_signed_iri(self, iri):
         """Fake iri signing."""
 
+    def sync_menu(self):
+        """Fake sync_menu."""
+        data = {}
+        data[RECENTTRANSFERS] = []
+        data[UPLOADING] = []
+        return data
+
+    def get_shares(self):
+        """Fake get_shares."""
+        return []
+
 
 class CrashyBackendException(Exception):
     """A faked backend crash."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2012-05-10 21:01:30 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py	2012-08-22 21:22:18 +0000
@@ -22,6 +22,7 @@
     LOADING,
     PLEASE_WAIT,
 )
+from ubuntuone.controlpanel.gui import qt
 from ubuntuone.controlpanel.gui.qt import filesyncstatus as gui
 from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
 
@@ -64,7 +65,7 @@
         self.assertEqual(expected_text, actual_text)
 
         actual_icon = self.ui.ui.sync_status_icon.pixmap()
-        pixmap_name = gui.icon_name_from_status(status_bd)
+        pixmap_name = qt.icon_name_from_status(status_bd)
         expected_icon = gui.pixmap_from_name(pixmap_name)
         self.assertEqualPixmaps(expected_icon, actual_icon)
 
@@ -73,7 +74,7 @@
             action)
 
         is_default = self.ui.ui.sync_status_button.isDefault()
-        expected_default = (action == gui.FILE_SYNC_CONNECT)
+        expected_default = (action == qt.FILE_SYNC_CONNECT)
         self.assertEqual(expected_default, is_default)
 
         self.ui.ui.sync_status_button.click()
@@ -96,17 +97,17 @@
     def test_process_info_invalid_status(self):
         """File sync status invalid, ignore event."""
         status = {backend.STATUS_KEY: backend.FILE_SYNC_STARTING,
-                  backend.MSG_KEY: gui.FILE_SYNC_STARTING,
+                  backend.MSG_KEY: qt.FILE_SYNC_STARTING,
                   'icon': backend.FILE_SYNC_STARTING}
         self.ui.process_info(status)
         self.ui.process_info(3)
 
         actual_icon = self.ui.ui.sync_status_icon.pixmap()
-        pixmap_name = gui.icon_name_from_status(backend.FILE_SYNC_STARTING)
+        pixmap_name = qt.icon_name_from_status(backend.FILE_SYNC_STARTING)
         expected_icon = gui.pixmap_from_name(pixmap_name)
         self.assertEqualPixmaps(expected_icon, actual_icon)
         actual_text = unicode(self.ui.ui.sync_status_label.text())
-        self.assertEqual(gui.FILE_SYNC_STARTING, actual_text)
+        self.assertEqual(qt.FILE_SYNC_STARTING, actual_text)
 
     def test_process_info_changed(self):
         """Backend's file sync status changed callback is connected."""
@@ -120,70 +121,70 @@
     def test_process_info_disabled(self):
         """File sync status disabled update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_DISABLED,
-                                   status_ui=gui.FILE_SYNC_DISABLED,
-                                   action=gui.FILE_SYNC_ENABLE,
+                                   status_ui=qt.FILE_SYNC_DISABLED,
+                                   action=qt.FILE_SYNC_ENABLE,
                                    callback='enable_files',
-                                   tooltip=gui.FILE_SYNC_ENABLE_TOOLTIP)
+                                   tooltip=qt.FILE_SYNC_ENABLE_TOOLTIP)
 
     def test_process_info_disconnected(self):
         """File sync status disconnected update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_DISCONNECTED,
-                                   status_ui=gui.FILE_SYNC_DISCONNECTED,
-                                   action=gui.FILE_SYNC_CONNECT,
+                                   status_ui=qt.FILE_SYNC_DISCONNECTED,
+                                   action=qt.FILE_SYNC_CONNECT,
                                    callback='connect_files',
-                                   tooltip=gui.FILE_SYNC_CONNECT_TOOLTIP)
+                                   tooltip=qt.FILE_SYNC_CONNECT_TOOLTIP)
 
     def test_process_info_error(self):
         """File sync status error update the label."""
-        msg = gui.WARNING_MARKUP % gui.FILE_SYNC_ERROR
+        msg = qt.WARNING_MARKUP % qt.FILE_SYNC_ERROR
         self.assert_status_correct(status_bd=backend.FILE_SYNC_ERROR,
                                    status_ui=msg,
                                    msg_bd='what an error!',
-                                   action=gui.FILE_SYNC_RESTART,
+                                   action=qt.FILE_SYNC_RESTART,
                                    callback='restart_files',
-                                   tooltip=gui.FILE_SYNC_RESTART_TOOLTIP)
+                                   tooltip=qt.FILE_SYNC_RESTART_TOOLTIP)
 
     def test_process_info_idle(self):
         """File sync status idle update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_IDLE,
-                                   status_ui=gui.FILE_SYNC_IDLE,
-                                   action=gui.FILE_SYNC_DISCONNECT,
+                                   status_ui=qt.FILE_SYNC_IDLE,
+                                   action=qt.FILE_SYNC_DISCONNECT,
                                    callback='disconnect_files',
-                                   tooltip=gui.FILE_SYNC_DISCONNECT_TOOLTIP)
+                                   tooltip=qt.FILE_SYNC_DISCONNECT_TOOLTIP)
 
     def test_process_info_starting(self):
         """File sync status starting update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_STARTING,
-                                   status_ui=gui.FILE_SYNC_STARTING,
-                                   action=gui.FILE_SYNC_STOP,
+                                   status_ui=qt.FILE_SYNC_STARTING,
+                                   action=qt.FILE_SYNC_STOP,
                                    callback='stop_files',
-                                   tooltip=gui.FILE_SYNC_STOP_TOOLTIP)
+                                   tooltip=qt.FILE_SYNC_STOP_TOOLTIP)
 
     def test_process_info_stopped(self):
         """File sync status stopped update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_STOPPED,
-                                   status_ui=gui.FILE_SYNC_STOPPED,
-                                   action=gui.FILE_SYNC_START,
+                                   status_ui=qt.FILE_SYNC_STOPPED,
+                                   action=qt.FILE_SYNC_START,
                                    callback='start_files',
-                                   tooltip=gui.FILE_SYNC_START_TOOLTIP)
+                                   tooltip=qt.FILE_SYNC_START_TOOLTIP)
 
     def test_process_info_syncing(self):
         """File sync status syncing update the label."""
         self.assert_status_correct(status_bd=backend.FILE_SYNC_SYNCING,
-                                   status_ui=gui.FILE_SYNC_SYNCING,
-                                   action=gui.FILE_SYNC_DISCONNECT,
+                                   status_ui=qt.FILE_SYNC_SYNCING,
+                                   action=qt.FILE_SYNC_DISCONNECT,
                                    callback='disconnect_files',
-                                   tooltip=gui.FILE_SYNC_DISCONNECT_TOOLTIP)
+                                   tooltip=qt.FILE_SYNC_DISCONNECT_TOOLTIP)
 
     def test_process_info_unknown(self):
         """File sync status unknown update the label."""
-        msg = gui.WARNING_MARKUP % gui.FILE_SYNC_ERROR
+        msg = qt.WARNING_MARKUP % qt.FILE_SYNC_ERROR
         self.assert_status_correct(status_bd=backend.FILE_SYNC_UNKNOWN,
                                    status_ui=msg,
                                    msg_bd='yadda oops',
-                                   action=gui.FILE_SYNC_RESTART,
+                                   action=qt.FILE_SYNC_RESTART,
                                    callback='restart_files',
-                                   tooltip=gui.FILE_SYNC_RESTART_TOOLTIP)
+                                   tooltip=qt.FILE_SYNC_RESTART_TOOLTIP)
 
     def test_on_sync_status_button_clicked(self):
         """Check the labels and icon when the button is pressed."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-06-22 14:42:29 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2012-08-22 21:22:18 +0000
@@ -591,6 +591,8 @@
     def test_confirm_dialog_if_path_exists(self):
         """The confirmation dialog is correct."""
         self.patch(gui.os.path, 'exists', lambda path: True)
+        self.patch(gui.os.path, 'isdir', lambda path: True)
+        self.patch(gui, 'is_link', lambda path: False)
 
         # make sure the item is subscribed
         self.ui.is_processing = True
@@ -607,6 +609,48 @@
         self.assertEqual(FakedDialog.kwargs, {})
 
     @defer.inlineCallbacks
+    def test_error_if_path_exists_as_file(self):
+        """The error dialog is correct."""
+        self.patch(gui.os.path, 'exists', lambda path: True)
+        self.patch(gui.os.path, 'isdir', lambda path: False)
+        self.patch(gui, 'is_link', lambda path: False)
+
+        # make sure the item is subscribed
+        self.ui.is_processing = True
+        self.set_item_checked()
+        self.ui.is_processing = False
+
+        yield self.ui.on_folders_itemChanged(self.item)
+
+        volume_path = self.item.volume_path
+        msg = gui.FOLDER_EXISTS_AS_FILE % {'folder_path': volume_path}
+        buttons = gui.CLOSE
+        self.assertEqual(FakedDialog.args,
+                         (self.ui, '', msg, buttons))
+        self.assertEqual(FakedDialog.kwargs, {})
+
+    @defer.inlineCallbacks
+    def test_error_if_path_exists_as_valid_link(self):
+        """The error dialog is correct."""
+        self.patch(gui.os.path, 'exists', lambda path: True)
+        self.patch(gui.os.path, 'isdir', lambda path: True)
+        self.patch(gui, 'is_link', lambda path: True)
+
+        # make sure the item is subscribed
+        self.ui.is_processing = True
+        self.set_item_checked()
+        self.ui.is_processing = False
+
+        yield self.ui.on_folders_itemChanged(self.item)
+
+        volume_path = self.item.volume_path
+        msg = gui.FOLDER_EXISTS_AS_FILE % {'folder_path': volume_path}
+        buttons = gui.CLOSE
+        self.assertEqual(FakedDialog.args,
+                         (self.ui, '', msg, buttons))
+        self.assertEqual(FakedDialog.kwargs, {})
+
+    @defer.inlineCallbacks
     def test_confirm_dialog_if_path_does_not_exist(self):
         """The confirmation dialog is not created if not needed."""
         self.patch(gui.os.path, 'exists', lambda path: False)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-04-05 14:52:55 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-08-22 21:22:18 +0000
@@ -81,6 +81,11 @@
             self.ui.ui.control_panel.ui.tab_widget.currentIndex(),
             self.ui.ui.control_panel.ui.tab_widget.indexOf(
                 self.ui.ui.control_panel.ui.folders_tab))
+        self.ui.switch_to("share_links")
+        self.assertEqual(
+            self.ui.ui.control_panel.ui.tab_widget.currentIndex(),
+            self.ui.ui.control_panel.ui.tab_widget.indexOf(
+                self.ui.ui.control_panel.ui.share_links_tab))
         self.ui.switch_to("devices")
         self.assertEqual(
             self.ui.ui.control_panel.ui.tab_widget.currentIndex(),

=== added file 'ubuntuone/controlpanel/gui/qt/tests/test_share_links.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_share_links.py	2012-08-22 21:22:18 +0000
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2012 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 account tab."""
+
+from ubuntuone.controlpanel.gui import (
+    SEARCH_FILES,
+    SHARED_FILES,
+)
+from ubuntuone.controlpanel.gui.qt import share_links as gui
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
+
+
+class ShareLinksTestCase(BaseTestCase):
+    """Test the qt control panel."""
+
+    innerclass_ui = gui.share_links_ui
+    innerclass_name = "Ui_Form"
+    class_ui = gui.ShareLinksPanel
+
+    def test_setup(self):
+        """Check that the strings are properly setted."""
+        self.assertEqual(self.ui.ui.search_files_lbl.text(), SEARCH_FILES)
+        self.assertEqual(self.ui.ui.shared_group.title(), SHARED_FILES)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-06-22 14:42:29 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-08-22 21:22:18 +0000
@@ -18,12 +18,25 @@
 
 """Tests for the notification area icon."""
 
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 from twisted.internet.defer import inlineCallbacks
 
+import ubuntuone.controlpanel.gui.qt.gui
+from ubuntuone.controlpanel.gui import (
+    qt,
+    IN_PROGRESS,
+    IN_PROGRESS_FILE,
+    RECENT_TRANSFERS,
+    RECENTTRANSFERS,
+    UPLOADING,
+)
 from ubuntuone.controlpanel.gui.qt import systray
-from ubuntuone.controlpanel.tests import TestCase
-import ubuntuone.controlpanel.gui.qt.gui
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
+from ubuntuone.controlpanel.tests import ROOT_PATH
+
+
+# pylint: disable=C0103, W0212
+backend = systray.backend
 
 
 class FakeSDTool(object):
@@ -46,14 +59,153 @@
         super(FakeMainWindow, self).__init__()
 
 
-class SystrayTestCase(TestCase):
+class FakeDesktopService(object):
+
+    """Fake QDesktopService."""
+
+    data = {}
+
+    @classmethod
+    def openUrl(cls, url):
+        """Fake openUrl."""
+        FakeDesktopService.data['cls'] = cls
+        FakeDesktopService.data['url'] = url
+
+
+class SystrayTestCase(BaseTestCase):
 
     """Test the notification area icon."""
 
+    class_ui = systray.TrayIcon
+
+    @inlineCallbacks
+    def setUp(self):
+        # We need to patch the startTimer first, to avoid the timer
+        # to get started on initialization.
+        self.patch(systray.TrayIcon, "startTimer", lambda s, x: None)
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
+        yield super(SystrayTestCase, self).setUp()
+        self.patch(QtGui, "QDesktopServices", FakeDesktopService)
+
+    def assert_status_correct(self, status_bd, status_ui, action,
+                              callback=None):
+        """The shown status is correct."""
+        expected_text = status_ui
+
+        status = {backend.STATUS_KEY: status_bd}
+        self.ui._process_status(status)
+
+        actual_text = unicode(self.ui.status.text())
+        self.assertEqual(expected_text, actual_text)
+
+        self.assertFalse(self.ui.status.isEnabled())
+        self.assertEqual(unicode(self.ui.status_action.text()), action)
+
+        self.ui.status_action.trigger()
+        self.assertFalse(self.ui.status_action.isEnabled())
+        self.assert_backend_called(callback)
+
+    def test_process_info_invalid_status(self):
+        """File sync status invalid, ignore event."""
+        status = {backend.STATUS_KEY: backend.FILE_SYNC_STARTING,
+                  backend.MSG_KEY: qt.FILE_SYNC_STARTING,
+                  'icon': backend.FILE_SYNC_STARTING}
+        self.ui._process_status(status)
+        self.ui._process_status(3)
+
+        actual_text = unicode(self.ui.status.text())
+        self.assertEqual(qt.FILE_SYNC_STARTING, actual_text)
+
+    def test_process_info_changed(self):
+        """Backend's file sync status changed callback is connected."""
+        self.ui.refresh_status()
+        self.assertEqual(self.ui.backend.status_changed_handler,
+                         self.ui._process_status)
+
+    def test_process_info_disabled(self):
+        """File sync status disabled update the label."""
+        self.ui.refresh_status()
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_DISABLED,
+                                   status_ui=qt.FILE_SYNC_DISABLED,
+                                   action=qt.FILE_SYNC_ENABLE,
+                                   callback='enable_files')
+
+    def test_process_info_disconnected(self):
+        """File sync status disconnected update the label."""
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_DISCONNECTED,
+                                   status_ui=qt.FILE_SYNC_DISCONNECTED,
+                                   action=qt.FILE_SYNC_CONNECT,
+                                   callback='connect_files')
+
+    def test_process_info_error(self):
+        """File sync status error update the label."""
+        msg = qt.WARNING_MARKUP % qt.FILE_SYNC_ERROR
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_ERROR,
+                                   status_ui=msg,
+                                   action=qt.FILE_SYNC_RESTART,
+                                   callback='restart_files')
+
+    def test_process_info_idle(self):
+        """File sync status idle update the label."""
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_IDLE,
+                                   status_ui=qt.FILE_SYNC_IDLE,
+                                   action=qt.FILE_SYNC_DISCONNECT,
+                                   callback='disconnect_files')
+
+    def test_process_info_starting(self):
+        """File sync status starting update the label."""
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_STARTING,
+                                   status_ui=qt.FILE_SYNC_STARTING,
+                                   action=qt.FILE_SYNC_STOP,
+                                   callback='stop_files')
+
+    def test_process_info_stopped(self):
+        """File sync status stopped update the label."""
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_STOPPED,
+                                   status_ui=qt.FILE_SYNC_STOPPED,
+                                   action=qt.FILE_SYNC_START,
+                                   callback='start_files')
+
+    def test_process_info_syncing(self):
+        """File sync status syncing update the label."""
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_SYNCING,
+                                   status_ui=qt.FILE_SYNC_SYNCING,
+                                   action=qt.FILE_SYNC_DISCONNECT,
+                                   callback='disconnect_files')
+
+    def test_process_info_unknown(self):
+        """File sync status unknown update the label."""
+        msg = qt.WARNING_MARKUP % qt.FILE_SYNC_ERROR
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_UNKNOWN,
+                                   status_ui=msg,
+                                   action=qt.FILE_SYNC_RESTART,
+                                   callback='restart_files')
+
+    def test_backend(self):
+        """Backend is created."""
+        self.assertIsInstance(self.ui.backend,
+                              backend.ControlBackend)
+
+    def test_refresh_status_requested(self):
+        """test refresh_status was requested on initialized."""
+        data = {}
+
+        def callback(status):
+            """Fake _process_status callback."""
+            data['called'] = True
+            data['status'] = status
+
+        self.patch(self.ui, "_process_status", callback)
+        self.ui.refresh_status()
+        self.assert_backend_called('file_sync_status')
+        self.assertTrue(data['called'])
+        self.assertEqual(data['status'], [])
+
     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(systray.TransfersMenu, "startTimer", lambda s, x: None)
         self.patch(systray.TrayIcon, "stop", self._set_called)
         tray = systray.TrayIcon()
         tray.quit.trigger()
@@ -63,6 +215,7 @@
     def test_stop_sd(self):
         """Quit should call SyncDaemonTool.quit()."""
         st = FakeSDTool()
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         self.patch(systray, "SyncDaemonTool", lambda: st)
         tray = systray.TrayIcon()
         yield tray.stop()
@@ -70,38 +223,31 @@
 
     def test_restore_no_window(self):
         """Test the restore window option in the menu, with no window."""
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         self.patch(ubuntuone.controlpanel.gui.qt.gui,
             "MainWindow", FakeMainWindow)
         tray = systray.TrayIcon()
         self.assertEqual(tray.window, None)
-        tray.restore.trigger()
+        tray.open_u1.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 = systray.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."""
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         tray = systray.TrayIcon()
         window = FakeMainWindow()
         tray.window = window
         self.assertFalse(tray.window.isVisible())
-        tray.restore.trigger()
+        tray.open_u1.trigger()
         self.assertEqual(tray.window, window)
         self.assertTrue(tray.window.isVisible())
 
     def test_restore_window_minimized(self):
         """Test the restore window option in the menu, with a min. window."""
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         tray = systray.TrayIcon()
         window = FakeMainWindow()
         # This cannot be tested with the real activateWindow
@@ -109,11 +255,12 @@
         # it has a small delay, and it fails.
         self.patch(window, "activateWindow", self._set_called)
         tray.window = window
-        tray.restore.trigger()
+        tray.open_u1.trigger()
         self.assertEqual(self._called, ((), {}))
 
     def test_delete_window(self):
         """Test deleting an existing window."""
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         tray = systray.TrayIcon()
         window = FakeMainWindow()
         tray.window = window
@@ -123,14 +270,330 @@
 
     def test_delete_no_window(self):
         """Test deleting without an existing window."""
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         tray = systray.TrayIcon()
         tray.delete_window()
         self.assertEqual(tray.window, None)
 
+    def test_open_u1_folder_action(self):
+        """Test open_u1_folder_action."""
+        self.ui.open_u1_folder.trigger()
+        self.assertEqual(FakeDesktopService.data['cls'], FakeDesktopService)
+        expected_url = QtCore.QUrl(u'file://%s' % ROOT_PATH)
+        self.assertEqual(FakeDesktopService.data['url'], expected_url)
+
+    def test_get_more_storage_action(self):
+        """Test get_more_storage."""
+        self.ui.get_more_storage.trigger()
+        self.assertEqual(FakeDesktopService.data['cls'], FakeDesktopService)
+        expected_url = QtCore.QUrl(systray.GET_STORAGE_LINK)
+        self.assertEqual(FakeDesktopService.data['url'], expected_url)
+
+    def test_go_to_web_action(self):
+        """Test go_to_web."""
+        self.ui.go_to_web.trigger()
+        self.assertEqual(FakeDesktopService.data['cls'], FakeDesktopService)
+        expected_url = QtCore.QUrl(systray.DASHBOARD)
+        self.assertEqual(FakeDesktopService.data['url'], expected_url)
+
+    def test_get_help_action(self):
+        """Test get_help_online."""
+        self.ui.get_help_online.trigger()
+        self.assertEqual(FakeDesktopService.data['cls'], FakeDesktopService)
+        expected_url = QtCore.QUrl(systray.GET_SUPPORT_LINK)
+        self.assertEqual(FakeDesktopService.data['url'], expected_url)
+
     def test_initialization(self):
         """Test that everything initializes correctly."""
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
         tray = systray.TrayIcon()
         self.assertTrue(tray.isVisible())
         self.assertEqual(tray.window, None)
+        self.assertNotEqual(tray.icon(), None)
+        self.assertEqual(tray.uploading, {})
+        self.assertEqual(tray.recent_transfers, {})
         self.assertIsInstance(tray.context_menu, QtGui.QMenu)
-        self.assertNotEqual(tray.icon(), None)
+        self.assertIsInstance(tray.status, QtGui.QAction)
+        self.assertIsInstance(tray.status_action, QtGui.QAction)
+        self.assertIsInstance(tray.open_u1, QtGui.QAction)
+        self.assertIsInstance(tray.open_u1_folder, QtGui.QAction)
+        self.assertIsInstance(tray.go_to_web, QtGui.QAction)
+        self.assertIsInstance(tray.get_more_storage, QtGui.QAction)
+        self.assertIsInstance(tray.get_help_online, QtGui.QAction)
+        self.assertIsInstance(tray.transfers, QtGui.QMenu)
+        # This checks that _get_volumes_info and _process_volumes_info
+        # is being called correctly on initialization.
+        expected_home = u'file://%s' % ROOT_PATH
+        self.assertEqual(tray.root_path, expected_home)
+
+    def test_get_transfers_data(self):
+        """Check that _get_transfers_data return the proper data."""
+
+        result = []
+
+        def fake_callback(data):
+            """Fake callback to process data."""
+            result.append(data)
+
+        self.patch(self.ui.transfers, "_update_transfers", fake_callback)
+        self.ui.transfers.get_transfers_data()
+        self.assertEqual(result, [{RECENTTRANSFERS: [], UPLOADING: []}])
+
+
+class TransfersMenuTestCase(BaseTestCase):
+
+    """Test the info to be display in the transfers menu."""
+
+    class_ui = systray.TrayIcon
+
+    @inlineCallbacks
+    def setUp(self):
+        # We need to patch the startTimer first, to avoid the timer
+        # to get started on initialization.
+        self.patch(systray.TrayIcon, "startTimer", lambda s, x: None)
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
+        yield super(TransfersMenuTestCase, self).setUp()
+        self.patch(QtGui, "QDesktopServices", FakeDesktopService)
+        self.patch(self.ui.transfers._parent.backend, "sync_menu",
+            self.fake_sync_menu)
+        self.recent_transfers = []
+        self.uploading = []
+
+    def fake_sync_menu(self):
+        """Fake backend sync_menu."""
+        return {RECENTTRANSFERS: self.recent_transfers,
+                UPLOADING: self.uploading}
+
+    def test_load_menu(self):
+        """Show the menu with just the labels."""
+        self.ui.transfers.get_transfers_data()
+        actions = self.ui.transfers.actions()
+        self.assertEqual(actions[0].text(), RECENT_TRANSFERS)
+        self.assertTrue(actions[1].isSeparator())
+        self.assertEqual(actions[2].text(), IN_PROGRESS)
+
+    def test_load_recent_transfers(self):
+        """Show the menu with the recent transfers."""
+        self.recent_transfers = ['file1', 'file2']
+        self.ui.transfers.get_transfers_data()
+        actions = self.ui.transfers.actions()
+        self.assertEqual(actions[0].text(), RECENT_TRANSFERS)
+        self.assertEqual(actions[1].text(), 'file1')
+        self.assertEqual(actions[2].text(), 'file2')
+        self.assertTrue(actions[3].isSeparator())
+        self.assertEqual(actions[4].text(), IN_PROGRESS)
+
+    def test_load_in_progress(self):
+        """Show the menu with the current progress."""
+        in_progress = [
+            ('file1', 200, 150),
+            ('file2', 400, 100),
+            ('file3', 300, 200),
+        ]
+
+        # Return copy of in_progress
+        self.uploading = in_progress[:]
+        self.ui.transfers.get_transfers_data()
+        actions = self.ui.transfers.actions()
+        self.assertEqual(actions[0].text(), RECENT_TRANSFERS)
+        self.assertTrue(actions[1].isSeparator())
+        self.assertEqual(actions[2].text(), IN_PROGRESS)
+
+        # This also check that the files are ordered based on written
+        percentage = in_progress[2][2] * 100 / in_progress[2][1]
+        text = IN_PROGRESS_FILE % (in_progress[2][0], percentage)
+        self.assertEqual(actions[3].label.text(), text)
+        self.assertEqual(actions[3].progress.value(), percentage)
+
+        percentage = in_progress[0][2] * 100 / in_progress[0][1]
+        text = IN_PROGRESS_FILE % (in_progress[0][0], percentage)
+        self.assertEqual(actions[4].label.text(), text)
+        self.assertEqual(actions[4].progress.value(), percentage)
+
+        percentage = in_progress[1][2] * 100 / in_progress[1][1]
+        text = IN_PROGRESS_FILE % (in_progress[1][0], percentage)
+        self.assertEqual(actions[5].label.text(), text)
+        self.assertEqual(actions[5].progress.value(), percentage)
+
+    def test_load_in_progress_refresh(self):
+        """Show the menu with the current progress and refresh it."""
+        in_progress = [
+            ('file1', 200, 150),
+            ('file2', 400, 100),
+            ('file3', 300, 200),
+        ]
+        # Return copy of in_progress
+        self.uploading = in_progress[:]
+        self.ui.transfers.get_transfers_data()
+        actions = self.ui.transfers.actions()
+        self.assertEqual(actions[0].text(), RECENT_TRANSFERS)
+        self.assertTrue(actions[1].isSeparator())
+        self.assertEqual(actions[2].text(), IN_PROGRESS)
+
+        # This also check that the files are ordered based on written
+        previous_actions = []
+        percentage = in_progress[2][2] * 100 / in_progress[2][1]
+        text = IN_PROGRESS_FILE % (in_progress[2][0], percentage)
+        self.assertEqual(actions[3].text(), text)
+        previous_actions.append(actions[3])
+
+        percentage = in_progress[0][2] * 100 / in_progress[0][1]
+        text = IN_PROGRESS_FILE % (in_progress[0][0], percentage)
+        self.assertEqual(actions[4].text(), text)
+        previous_actions.append(actions[4])
+
+        percentage = in_progress[1][2] * 100 / in_progress[1][1]
+        text = IN_PROGRESS_FILE % (in_progress[1][0], percentage)
+        self.assertEqual(actions[5].text(), text)
+        previous_actions.append(actions[5])
+
+        in_progress = [
+            ('file1', 200, 170),
+            ('file2', 400, 300),
+            ('file3', 300, 210),
+        ]
+        self.uploading = in_progress[:]
+
+        self.ui.transfers.get_transfers_data()
+        actions = self.ui.transfers.actions()
+        current_actions = []
+        self.assertEqual(actions[0].text(), RECENT_TRANSFERS)
+        self.assertTrue(actions[1].isSeparator())
+        self.assertEqual(actions[2].text(), IN_PROGRESS)
+
+        # This also check that the files are ordered based on written
+        percentage = in_progress[2][2] * 100 / in_progress[2][1]
+        text = IN_PROGRESS_FILE % (in_progress[2][0], percentage)
+        self.assertEqual(actions[3].text(), text)
+        current_actions.append(actions[3])
+
+        percentage = in_progress[0][2] * 100 / in_progress[0][1]
+        text = IN_PROGRESS_FILE % (in_progress[0][0], percentage)
+        self.assertEqual(actions[4].text(), text)
+        current_actions.append(actions[4])
+
+        percentage = in_progress[1][2] * 100 / in_progress[1][1]
+        text = IN_PROGRESS_FILE % (in_progress[1][0], percentage)
+        self.assertEqual(actions[5].text(), text)
+        current_actions.append(actions[5])
+
+        self.assertEqual(previous_actions, current_actions)
+
+    def test_menu_not_reload(self):
+        """Show the menu and test that is not reload it on refresh."""
+        self.recent_transfers = ['file1', 'file2']
+        self.ui.transfers.get_transfers_data()
+        previous_actions = self.ui.transfers.actions()
+        self.ui.transfers.get_transfers_data()
+        current_actions = self.ui.transfers.actions()
+        self.assertEqual(previous_actions, current_actions)
+
+    def test_menu_reload(self):
+        """Show the menu and test that is reload it on refresh."""
+        self.recent_transfers = ['file1', 'file2']
+        self.ui.transfers.get_transfers_data()
+        previous_actions = self.ui.transfers.actions()
+        self.recent_transfers = ['file1', 'file2', 'file3']
+
+        self.ui.transfers.get_transfers_data()
+        current_actions = self.ui.transfers.actions()
+        self.assertNotEqual(previous_actions, current_actions)
+
+    def test_progress_not_reload(self):
+        """Show the menu and test that is not reload it on refresh."""
+        in_progress = [
+            ('file1', 200, 150),
+            ('file2', 400, 100),
+            ('file3', 300, 200),
+        ]
+        # Return copy of in_progress
+        self.uploading = in_progress[:]
+        self.ui.transfers.get_transfers_data()
+        previous_actions = self.ui.transfers.actions()
+        in_progress = [
+            ('file1', 200, 170),
+            ('file2', 400, 300),
+            ('file3', 300, 210),
+        ]
+        self.uploading = in_progress[:]
+        self.ui.transfers.get_transfers_data()
+        current_actions = self.ui.transfers.actions()
+
+        self.assertEqual(previous_actions, current_actions)
+
+    def test_progress_reload(self):
+        """Show the menu and test that is reload it on refresh."""
+        in_progress = [
+            ('file1', 200, 150),
+            ('file2', 400, 100),
+            ('file3', 300, 200),
+        ]
+        # Return copy of in_progress
+        self.uploading = in_progress[:]
+        self.ui.transfers.get_transfers_data()
+        previous_actions = self.ui.transfers.actions()
+        in_progress = [
+            ('file1', 200, 170),
+            ('file2', 400, 300),
+            ('file3', 300, 210),
+            ('file4', 1000, 410),
+        ]
+        self.uploading = in_progress[:]
+        self.ui.transfers.get_transfers_data()
+        current_actions = self.ui.transfers.actions()
+
+        self.assertNotEqual(previous_actions, current_actions)
+
+
+class SharesTestCase(BaseTestCase):
+
+    """Test the info to be displayed in the shares section."""
+
+    class_ui = systray.TrayIcon
+
+    @inlineCallbacks
+    def setUp(self):
+        # We need to patch the startTimer first, to avoid the timer
+        # to get started on initialization.
+        self.patch(systray.TrayIcon, "startTimer", lambda s, x: None)
+        self.patch(systray.TransfersMenu, "startTimer", lambda s, x: None)
+        yield super(SharesTestCase, self).setUp()
+        self.patch(QtGui, "QDesktopServices", FakeDesktopService)
+        self.patch(self.ui.backend, "get_shares", self.fake_get_backend)
+        self._shares_info = []
+
+    def fake_get_backend(self):
+        """Fake get_backend."""
+        return self._shares_info
+
+    def test_shares_refresh_not_reload(self):
+        """Check that we get the new info of shares but not reload the menu."""
+        actions = self.ui.context_menu.actions()
+        self.ui.load_menu()
+        post_actions = self.ui.context_menu.actions()
+        self.assertEqual(actions, post_actions)
+
+    def test_shares_refresh_reload(self):
+        """Check that we get the new info of shares but not reload the menu."""
+        actions = self.ui.context_menu.actions()
+        self._shares_info = [
+            {'accepted': False, 'other_visible_name': 'name',
+            'volume_id': 'asd123-asd123-asd123-asd123'}
+        ]
+        self.ui.load_menu()
+        post_actions = self.ui.context_menu.actions()
+        self.assertNotEqual(actions, post_actions)
+
+    def test_share_triggered(self):
+        """Check that we get the new info of shares but not reload the menu."""
+        volume_id = 'asd123-asd123-asd123-asd123'
+        self._shares_info = [
+            {'accepted': False, 'other_visible_name': 'name',
+            'volume_id': volume_id}
+        ]
+        self.ui.load_menu()
+        actions = self.ui.context_menu.actions()
+        share_action = actions[7]
+        share_action.trigger()
+        expected = QtCore.QUrl(systray.ACCEPT_SHARES % volume_id)
+        self.assertEqual(FakeDesktopService.data['url'], expected)

=== modified file 'ubuntuone/controlpanel/sd_client/__init__.py'
--- ubuntuone/controlpanel/sd_client/__init__.py	2012-03-29 21:37:22 +0000
+++ ubuntuone/controlpanel/sd_client/__init__.py	2012-08-22 21:22:18 +0000
@@ -205,3 +205,7 @@
     def refresh_volumes(self):
         """Refresh the volumes information from syncdaemon."""
         return self.proxy.refresh_volumes()
+
+    def sync_menu(self):
+        """Get the sync menu data from syncdaemon."""
+        return self.proxy.sync_menu()

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2012-05-11 13:30:34 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2012-08-22 21:22:18 +0000
@@ -167,6 +167,7 @@
         self.shares = []
         self.folders = []
         self.volumes_refreshed = False
+        self.menu_data = {'recent-transfers': (), 'uploading': ()}
 
     def get_throttling_limits(self):
         """Return the sample speed limits."""
@@ -326,6 +327,10 @@
         self.volumes_refreshed = True
         return defer.succeed(None)
 
+    def sync_menu(self):
+        """Return the sync menu data."""
+        return self.menu_data
+
 
 class MockReplicationClient(CallRecorder):
     """A mock replication_client module."""
@@ -1697,3 +1702,10 @@
 
         result = yield self.be.file_sync_settings_info()
         self.assertEqual(self.default_settings, result)
+
+    @inlineCallbacks
+    def test_sync_menu(self):
+        """Check that we get the right data to create the menu."""
+        result = yield self.be.sync_menu()
+        expected = {'recent-transfers': (), 'uploading': ()}
+        self.assertEqual(result, expected)

=== modified file 'ubuntuone/controlpanel/utils/__init__.py'
--- ubuntuone/controlpanel/utils/__init__.py	2012-04-05 14:52:55 +0000
+++ ubuntuone/controlpanel/utils/__init__.py	2012-08-22 21:22:18 +0000
@@ -40,13 +40,23 @@
     add_to_autostart = windows.add_to_autostart
     are_updates_present = windows.are_updates_present
     default_folders = windows.default_folders
+    install_config_and_daemons = no_op
     perform_update = windows.perform_update
     uninstall_application = windows.uninstall_application
+elif sys.platform == 'darwin':
+    from ubuntuone.controlpanel.utils import darwin
+    add_to_autostart = no_op
+    are_updates_present = no_op
+    default_folders = darwin.default_folders
+    install_config_and_daemons = darwin.install_config_and_daemons
+    perform_update = no_op
+    uninstall_application = no_op
 else:
     from ubuntuone.controlpanel.utils import linux
     add_to_autostart = no_op
     are_updates_present = no_op
     default_folders = linux.default_folders
+    install_config_and_daemons = no_op
     perform_update = no_op
     uninstall_application = no_op
 

=== added file 'ubuntuone/controlpanel/utils/darwin.py'
--- ubuntuone/controlpanel/utils/darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/utils/darwin.py	2012-08-22 21:22:18 +0000
@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 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/>.
+
+"""Miscelaneous functions and constants for darwin."""
+
+import os
+import shutil
+import sys
+
+from twisted.internet import defer
+
+from dirspec.basedir import save_config_path
+from ubuntuone.controlpanel.logger import setup_logging
+
+logger = setup_logging('utils.darwin')
+AUTOUPDATE_BIN_NAME = 'autoupdate-darwin'
+UNINSTALL_BIN_NAME = 'uninstall-darwin'
+
+
+def add_to_autostart():
+    """Add syncdaemon to the session's autostart."""
+    # TODO
+
+
[e-mail]
+def are_updates_present():
+    """Return if there are updates for Ubuntu One."""
+    result = False
+    # TODO
+    defer.returnValue(result)
+
+
+def default_folders(user_home=None):
+    """Return a list of the folders to add by default."""
+    folders = []
+    # TODO
+    return folders
+
+
+def install_config_and_daemons():
+    """Install required data files and fsevents daemon.
+
+    This function is a replacement for an installer. As such it is
+    required on first-run, but it's also called every time we start
+    up, in case anything has moved or been deleted.
+    """
+
+    # Do nothing if we are running from source:
+    if getattr(sys, 'frozen', None) is None:
+        return
+
+    main_app_dir = ''.join(__file__.partition('.app')[:-1])
+    main_app_resources_dir = os.path.join(main_app_dir,
+                                          'Contents',
+                                          'Resources')
+
+    config_path = save_config_path('ubuntuone')
+
+    conf_filenames = ['syncdaemon.conf',
+                      'logging.conf']
+    for conf_filename in conf_filenames:
+        src_path = os.path.join(main_app_resources_dir,
+                                conf_filename)
+        dest_path = os.path.join(config_path,
+                                 conf_filename)
+
+        if not os.path.exists(dest_path):
+            shutil.copyfile(src_path, dest_path)
+
+
+def perform_update():
+    """Spawn the autoupdate process and call the stop function."""
+    # TODO
+
+
+def uninstall_application():
+    """Uninstall Ubuntu One."""
+    # TODO

=== added file 'ubuntuone/controlpanel/utils/tests/test_darwin.py'
--- ubuntuone/controlpanel/utils/tests/test_darwin.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/utils/tests/test_darwin.py	2012-08-22 21:22:18 +0000
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2012 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/>.
+
+"""Test the darwin utils functions."""
+
+import os
+import sys
+
+from twisted.internet import defer
+
+from ubuntuone.controlpanel import utils
+from ubuntuone.devtools.testcases import TestCase
+
+# let me use protected methods
+# pylint: disable=W0212
+
+
+class InstallConfigTestCase(TestCase):
+    """Test install_config_and_daemons."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set up multi-call checker."""
+        yield super(InstallConfigTestCase, self).setUp()
+        self._called = []
+
+    def _set_called(self, *args, **kwargs):
+        """Store 'args' and 'kwargs for test assertions."""
+        self._called.append((args, kwargs))
+
+    def test_do_nothing_unfrozen(self):
+        """Test that install_config_and_daemons does nothing when unfrozen."""
+
+        self.patch(utils.darwin, 'save_config_path',
+                   self._set_called)
+        utils.install_config_and_daemons()
+        self.assertEqual(self._called, [])
+
+    def _test_copying_conf_files(self, exists):
+        """Call install_config_and_daemons, parameterize os.path.exists."""
+        sys.frozen = 'macosx_app'
+        self.addCleanup(delattr, sys, 'frozen')
+        self.patch(utils.darwin, 'save_config_path', lambda x: "TARGET_PATH")
+        self.patch(utils.darwin, '__file__', "/path/to/Main.app/ignore")
+        self.patch(os.path, "exists", lambda x: exists)
+        self.patch(utils.darwin.shutil, 'copyfile',
+                   self._set_called)
+        utils.install_config_and_daemons()
+
+    def test_copies_conf_files(self):
+        """When frozen, we copy the conf files if they don't exist."""
+        self._test_copying_conf_files(False)
+        self.assertEqual(self._called,
+                         [(('/path/to/Main.app/Contents/'
+                           'Resources/syncdaemon.conf',
+                           'TARGET_PATH/syncdaemon.conf'), {}),
+                          (('/path/to/Main.app/Contents/'
+                            'Resources/logging.conf',
+                            'TARGET_PATH/logging.conf'),
+                           {})])
+
+    def test_does_not_copy_conf_files(self):
+        """When frozen, we do not copy the conf files if they do exist."""
+        self._test_copying_conf_files(True)
+        self.assertEqual(self._called, [])

=== modified file 'ubuntuone/controlpanel/utils/tests/test_utils.py'
--- ubuntuone/controlpanel/utils/tests/test_utils.py	2011-11-14 11:33:31 +0000
+++ ubuntuone/controlpanel/utils/tests/test_utils.py	2012-08-22 21:22:18 +0000
@@ -24,6 +24,7 @@
 from twisted.internet import defer
 
 from ubuntuone.devtools.handlers import MementoHandler
+from ubuntuone.devtools.testcases import skipIfOS
 
 from ubuntuone.controlpanel import utils
 from ubuntuone.controlpanel.tests import TestCase
@@ -149,3 +150,13 @@
                     utils.ERROR_MESSAGE: unicode(exc)}
 
         self.assertEqual(expected, result)
+
+
+class FirstRunInstallTestCase(TestCase):
+    """Test cases for darwin-only first-run installations."""
+
+    @skipIfOS("darwin", "Darwin-only code is tested in test_darwin.")
+    def test_no_op_on_win_or_linux(self):
+        """Test that install_config_and_daemons does nothing on win/linux."""
+        self.assertEqual(utils.install_config_and_daemons,
+                         utils.no_op)