Merge lp:~diegosarmentero/ubuntuone-client/menu-new-options into lp:ubuntuone-client

[Diego Sarmentero]

- Adding access to the Ubuntu One folder and Share tab from the sync menu indicator (LP: #1063786 #1063788).

You can test it IRL, stopping syncdaemon with: u1sdtool -q
And then executing this branch with (inside this branch folder): PYTHONPATH=. bin/ubuntuone-syncdaemon

[lp:~diegosarmentero/ubuntuone-client/menu-new-options]

1358. By Diego Sarmentero on 2012-10-30

sorting the string alphabetically

[Michał Karnicki (karni)]

review: Approve

[dobey (dobey)]

Is there a rationale somewhere for these additions? The bugs just say "we need these" with no rationale or design documentation about them at all. Adding a bunch of excessive things to the menu seems to be the wrong way to go about this.

review: Needs Information

[Diego Sarmentero (diegosarmentero)]

> Is there a rationale somewhere for these additions? The bugs just say "we need
> these" with no rationale or design documentation about them at all. Adding a
> bunch of excessive things to the menu seems to be the wrong way to go about
> this.

Yes, this was designed, but we didn't have the time to implement it before:
https://docs.google.com/a/canonical.com/presentation/d/1muWyqTsKPgHahHfapHGROafcJcm_Z_XiSaNyxKS3h-w/edit

[dobey (dobey)]

review: Approve

=== modified file 'tests/platform/sync_menu/test_linux.py'
--- tests/platform/sync_menu/test_linux.py	2012-10-11 12:01:27 +0000
+++ tests/platform/sync_menu/test_linux.py	2012-10-30 14:00:39 +0000
@@ -76,6 +76,7 @@
     def __init__(self):
         self.connect_called = False
         self.disconnect_called = False
+        self.fake_root_path = "/home/user/Ubuntu One"
 
     def connect(self):
         """Set connect to True."""
@@ -85,6 +86,10 @@
         """Set connect to True."""
         self.disconnect_called = True
 
+    def get_rootdir(self):
+        """Return a fake ubuntu one folder path."""
+        return self.fake_root_path
+
 
 class FakeSyncMenuApp(object):
     """Fake SyncMenu."""
@@ -157,9 +162,17 @@
             self.sync_menu.root_menu)
         self.assertEqual(self.sync_menu.transfers.get_parent(),
             self.sync_menu.root_menu)
+        self.assertEqual(self.sync_menu.open_u1_folder.get_parent(),
+            self.sync_menu.root_menu)
+        self.assertEqual(self.sync_menu.share_file.get_parent(),
+            self.sync_menu.root_menu)
 
         self.assertEqual(self.sync_menu.open_u1.property_get(
             linux.Dbusmenu.MENUITEM_PROP_LABEL), linux.OPEN_U1)
+        self.assertEqual(self.sync_menu.open_u1_folder.property_get(
+            linux.Dbusmenu.MENUITEM_PROP_LABEL), linux.OPEN_U1_FOLDER)
+        self.assertEqual(self.sync_menu.share_file.property_get(
+            linux.Dbusmenu.MENUITEM_PROP_LABEL), linux.SHARE_A_FILE)
         self.assertEqual(self.sync_menu.go_to_web.property_get(
             linux.Dbusmenu.MENUITEM_PROP_LABEL), linux.GO_TO_WEB)
         self.assertEqual(self.sync_menu.transfers.property_get(
@@ -181,6 +194,15 @@
         self.sync_menu.open_control_panel()
         self.assertEqual(data, ['ubuntuone-control-panel-qt'])
 
+    def test_open_share_tab(self):
+        """Check that the proper action is executed."""
+        data = []
+
+        self.patch(linux.glib, "spawn_command_line_async", data.append)
+        self.sync_menu.open_share_file_tab()
+        self.assertEqual(data, [
+            'ubuntuone-control-panel-qt --switch-to share_links'])
+
     def test_go_to_web(self):
         """Check that the proper action is executed."""
         data = []
@@ -189,6 +211,14 @@
         self.sync_menu.open_go_to_web()
         self.assertEqual(data, [linux.DASHBOARD])
 
+    def test_open_ubuntu_one_folder(self):
+        """Check that the proper action is executed."""
+        data = []
+
+        self.patch(linux.webbrowser, "open", data.append)
+        self.sync_menu.open_ubuntu_one_folder()
+        self.assertEqual(data, [self.syncdaemon_service.fake_root_path])
+
     def test_get_help(self):
         """Check that the proper action is executed."""
         data = []

=== modified file 'ubuntuone/platform/sync_menu/linux.py'
--- ubuntuone/platform/sync_menu/linux.py	2012-10-11 13:00:10 +0000
+++ ubuntuone/platform/sync_menu/linux.py	2012-10-30 14:00:39 +0000
@@ -63,11 +63,13 @@
 
 Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
 
+GET_HELP = Q_("Get Help on the Web")
+GO_TO_WEB = Q_("Go to the Ubuntu One Website")
+MORE_STORAGE = Q_("Get More Space")
 OPEN_U1 = Q_("Open Ubuntu One")
-GO_TO_WEB = Q_("Go to the Ubuntu One Website")
+OPEN_U1_FOLDER = Q_("Open the Ubuntu One Folder")
+SHARE_A_FILE = Q_("Share a File")
 TRANSFERS = Q_("Current and Recent Transfers")
-MORE_STORAGE = Q_("Get More Space")
-GET_HELP = Q_("Get Help on the Web")
 
 DELAY_BETWEEN_UPDATES = 3
 UBUNTUONE_LINK = u'https://one.ubuntu.com/'
@@ -90,6 +92,12 @@
 
         self.open_u1 = Dbusmenu.Menuitem()
         self.open_u1.property_set(Dbusmenu.MENUITEM_PROP_LABEL, OPEN_U1)
+        self.open_u1_folder = Dbusmenu.Menuitem()
+        self.open_u1_folder.property_set(Dbusmenu.MENUITEM_PROP_LABEL,
+            OPEN_U1_FOLDER)
+        self.share_file = Dbusmenu.Menuitem()
+        self.share_file.property_set(Dbusmenu.MENUITEM_PROP_LABEL,
+            SHARE_A_FILE)
 
         self.go_to_web = Dbusmenu.Menuitem()
         self.go_to_web.property_set(Dbusmenu.MENUITEM_PROP_LABEL,
@@ -110,6 +118,10 @@
         # Connect signals
         self.open_u1.connect(Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
             self.open_control_panel)
+        self.open_u1_folder.connect(Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
+            self.open_ubuntu_one_folder)
+        self.share_file.connect(Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
+            self.open_share_file_tab)
         self.go_to_web.connect(Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
             self.open_go_to_web)
         self.get_help.connect(Dbusmenu.MENUITEM_SIGNAL_ITEM_ACTIVATED,
@@ -119,6 +131,8 @@
 
         # Add items
         self.root_menu.child_append(self.open_u1)
+        self.root_menu.child_append(self.open_u1_folder)
+        self.root_menu.child_append(self.share_file)
         self.root_menu.child_append(self.go_to_web)
         self.root_menu.child_append(self.transfers)
         self.root_menu.child_append(self.more_storage)
@@ -155,6 +169,18 @@
         except glib.GError as e:
             logger.warning('Failed to open the control panel: %s.' % e)
 
+    def open_ubuntu_one_folder(self, *args):
+        """Open the Ubuntu One folder."""
+        webbrowser.open(self._syncdaemon_service.get_rootdir())
+
+    def open_share_file_tab(self, *args):
+        """Open the Control Panel in the Share Tab."""
+        try:
+            glib.spawn_command_line_async('ubuntuone-control-panel-qt '
+                '--switch-to share_links')
+        except glib.GError as e:
+            logger.warning('Failed to open the control panel: %s.' % e)
+
     def open_go_to_web(self, *args):
         """Open the Ubunto One Help Page"""
         webbrowser.open(DASHBOARD)