Merge lp:~nataliabidart/ubuntuone-control-panel/open-in-a-tab into lp:ubuntuone-control-panel

[Natalia Bidart]

- Added a command line option to start the UI on a given panel (LP: #702968).

If you run the UI, you can check that
DEBUG=True PYTHONPATH=. ./bin/ubuntuone-control-panel-gtk --help

Returns:

Usage: ubuntuone-control-panel-gtk [option]

Options:
  -h, --help show this help message and exit
  --switch-to=PANEL_NAME
                        Start the Ubuntu One Control Panel (GTK) in the
                        PANEL_NAME tab. Possible values are: dashboard,
                        folders, devices, applications

Also, you can play passing different values to switch_to to check it works.

[lp:~nataliabidart/ubuntuone-control-panel/open-in-a-tab]

50. By Natalia Bidart on 2011-01-20

Added a missing space.

[Eric Casteleijn (thisfred)]

Looks great, works as advertised. I wonder if falling back to the default option when an unrecognized option is passed in to --switch-to is the right thing, rather than refuse to switch at all.

[Eric Casteleijn (thisfred)]

review: Approve

[Alejandro J. Cura (alecu)]

review: Approve

=== modified file 'bin/ubuntuone-control-panel-gtk'
--- bin/ubuntuone-control-panel-gtk	2010-12-16 21:09:46 +0000
+++ bin/ubuntuone-control-panel-gtk	2011-01-20 21:29:26 +0000
@@ -20,13 +20,32 @@
 
 # Invalid name "ubuntuone-control-panel-gtk", pylint: disable=C0103
 
+import sys
+
 import dbus.mainloop.glib
 
-import ubuntuone.controlpanel.gtk.gui
+from optparse import OptionParser
+
+from ubuntuone.controlpanel.gtk.gui import ControlPanelWindow
 
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
 
 
+def parser_options():
+    """Parse command line parameters."""
+    usage = "Usage: %prog [option]"
+    parser = OptionParser(usage=usage)
+    parser.add_option("", "--switch-to", dest="switch_to", type="string",
+                      metavar="PANEL_NAME",
+                      help="Start the Ubuntu One Control Panel (GTK) in the "
+                           "PANEL_NAME tab. Possible values are: "
+                           "dashboard, folders, devices, applications")
+    return parser
+
+
 if __name__ == "__main__":
-    gui = ubuntuone.controlpanel.gtk.gui.ControlPanelWindow()
+    parser = parser_options()
+    (options, args) = parser.parse_args(sys.argv)
+
+    gui = ControlPanelWindow(switch_to=options.switch_to)
     gui.main()

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-01-19 16:16:38 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-01-20 21:29:26 +0000
@@ -169,7 +169,7 @@
 
     TITLE = _('My %(app_name)s Dashboard')
 
-    def __init__(self):
+    def __init__(self, switch_to=None):
         super(ControlPanelWindow, self).__init__()
 
         self.set_title(self.TITLE % {'app_name': U1_APP_NAME})
@@ -183,6 +183,16 @@
         self.control_panel = ControlPanel(window_id=self.window.xid)
         self.add(self.control_panel)
 
+        logger.info('Starting %s pointing at panel: %r.',
+                     self.__class__.__name__, switch_to)
+        if switch_to is not None:
+            button = getattr(self.control_panel.management,
+                             '%s_button' % switch_to, None)
+            if button is not None:
+                button.clicked()
+            else:
+                logger.warning('Could not start at panel: %r.', switch_to)
+
         logger.debug('%s: started (window size %r).',
                      self.__class__.__name__, self.get_size_request())
 
@@ -1280,7 +1290,6 @@
         """Load the account info and file sync status list."""
         self.backend.account_info(reply_handler=NO_OP,
                                   error_handler=error_handler)
-        self.dashboard_button.clicked()
 
     @log_call(logger.debug)
     def on_account_info_ready(self, info):

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-01-19 12:19:28 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-01-20 21:29:26 +0000
@@ -184,6 +184,41 @@
         self.assertTrue(self.ui.get_size_request() <= (736, 525))
 
 
+class ControlPanelWindowParamsTestCase(ControlPanelWindowTestCase):
+    """The test suite for the control panel window when passing params."""
+
+    kwargs = {'switch_to': 'devices'}
+
+    def test_switch_to(self):
+        """Can pass a 'switch_to' parameter to start on a particular tab."""
+        actual = self.ui.control_panel.management.notebook.get_current_page()
+        self.assertEqual(actual, self.ui.control_panel.management.DEVICES_PAGE)
+
+
+class ControlPanelWindowParamsNoneTestCase(ControlPanelWindowTestCase):
+    """The suite for the control panel window when passing None params."""
+
+    kwargs = {'switch_to': None}
+
+    def test_switch_to(self):
+        """Can pass a 'switch_to' being None. Should default to dashboard."""
+        actual = self.ui.control_panel.management.notebook.get_current_page()
+        expected = self.ui.control_panel.management.DASHBOARD_PAGE
+        self.assertEqual(actual, expected)
+
+
+class ControlPanelWindowInvalidParamsTestCase(ControlPanelWindowTestCase):
+    """The suite for the control panel window when passing invalid params."""
+
+    kwargs = {'switch_to': 'yadda-yadda'}
+
+    def test_switch_to(self):
+        """Can pass an invalid 'switch_to'. Should default to dashboard."""
+        actual = self.ui.control_panel.management.notebook.get_current_page()
+        expected = self.ui.control_panel.management.DASHBOARD_PAGE
+        self.assertEqual(actual, expected)
+
+
 class ControlPanelTestCase(BaseTestCase):
     """The test suite for the control panel itself."""