Merge lp:~diegosarmentero/ubuntuone-control-panel/refactor-sync-status into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Refactoring some sync status info to be able to use those functions and constants from the sync menu too (LP: #1034542).

For u1lint you should set the PYTHONPATH including this branch: lp:~diegosarmentero/ubuntuone-client/ipcmenu

[Brian Curtin (brian.curtin)]

Looks reasonable to me.

review: Approve

[Roberto Alsina (ralsina)]

+1 with the promise that those string constants are used in a following branch.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/refactor-sync-status into lp:ubuntuone-control-panel 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 ... [...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/refactor-sync-status into lp:ubuntuone-control-panel 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 ... [...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/refactor-sync-status into lp:ubuntuone-control-panel 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 ... [...

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2012-06-22 14:42:29 +0000
+++ ubuntuone/controlpanel/backend.py	2012-08-08 18:47:18 +0000
@@ -821,6 +821,13 @@
         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)
     def shutdown(self):
         """Stop this service."""
         # do any other needed cleanup

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2012-08-06 20:15:30 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-08-08 18:47:18 +0000
@@ -66,6 +66,7 @@
 FILE_URI_PREFIX = u'file://'
 
 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/'
@@ -176,6 +177,8 @@
 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')
 INSTALL = _('Install')
 INSTALL_PACKAGE = _('You need to install the package <i>%(package_name)s'
                     '</i> in order to enable more sync services.')
@@ -215,11 +218,14 @@
 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')
 SELECT_FOLDERS = _('Select sync folders')
 SERVICES_BUTTON_TOOLTIP = _('Manage the sync services')
@@ -239,12 +245,14 @@
     'to this computer')
 SETTINGS_SYNC_ALL_SHARES = _('Automatically sync all folders shared with me '
     'to this computer')
+SHARE_A_FILE = _('Share a File')
 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-08 18:47: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/filesyncstatus.py'
--- ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2012-05-10 21:01:30 +0000
+++ ubuntuone/controlpanel/gui/qt/filesyncstatus.py	2012-08-08 18:47: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/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-08 18:47: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/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-08 18:47: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-08 18:47: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)