Merge lp:~ralsina/ubuntuone-control-panel/alerted into lp:ubuntuone-control-panel

[Roberto Alsina]

- Fixed --alert and --switch-to tabname and updated --help and manpage accordingly
  (LP: #940465).

* Implemented --alert option: Starts with the "urgent" flag set on launcher.
* Remove the "urgent" flag when u1cp gets focus.
* Implemented --switch-to tabname
* Fixed --help
* Updated manpage

[lp:~ralsina/ubuntuone-control-panel/alerted]

284. By Roberto Alsina on 2012-03-07

merged trunk

[Eric Casteleijn (thisfred)]

Looks great!

review: Approve

[Natalia Bidart (nataliabidart)]

Question, why would you patch self.patch(self.ui, "focusInEvent", lambda ev: False) in the set_urgent test?

Also, can we change this code:

        self.ui.switch_to("devices")
        self.assertEqual(
            self.ui.ui.control_panel.ui.tab_widget.currentIndex(),
            2)

to use something like:

        self.ui.switch_to("devices")
        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.devices))

which in turn allows us to do something like:

        for tab_name in self.ui.tabs:
            tab = getattr(self.ui.ui.control_panel.ui, tab_name)
            self.ui.switch_to(tab_name)
            self.assertEqual(
                self.ui.ui.control_panel.ui.tab_widget.currentIndex(),
                self.ui.ui.control_panel.ui.tab_widget.indexOf(tab))

What do you think?

review: Needs Information

[Roberto Alsina (ralsina)]

> Question, why would you patch self.patch(self.ui, "focusInEvent", lambda ev:
> False) in the set_urgent test?

Doesn't seem necessary anymore. In a previous version of this, when you create the window, that widget got focus and focusInEvent removed the urgent flag. Will remove.

> Also, can we change this code:
>
> self.ui.switch_to("devices")
> self.assertEqual(
> self.ui.ui.control_panel.ui.tab_widget.currentIndex(),
> 2)
>
> to use something like:
>
> self.ui.switch_to("devices")
> 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.devices))
>
> which in turn allows us to do something like:
>
> for tab_name in self.ui.tabs:
> tab = getattr(self.ui.ui.control_panel.ui, tab_name)
> self.ui.switch_to(tab_name)
> self.assertEqual(
> self.ui.ui.control_panel.ui.tab_widget.currentIndex(),
> self.ui.ui.control_panel.ui.tab_widget.indexOf(tab))
>
> What do you think?

It's a bit verbose, and it has a problem in that we don't want to test the tab switching in order, but something similar is doable.

[lp:~ralsina/ubuntuone-control-panel/alerted]

285. By Roberto Alsina on 2012-03-07

use widget indexes instead of magic numbers

[Natalia Bidart (nataliabidart)]

Can you please remove this debug line?

        print "CALLED:", args, kwargs

Also, after the IRC talk about the --alert not working, can you please remove that altogether? Thanks!

review: Needs Fixing

[dobey (dobey)]

We should drop --alert, but keep the unsetting of urgency on focusInEvent.

[lp:~ralsina/ubuntuone-control-panel/alerted]

286. By Roberto Alsina on 2012-03-08

kill --alert since it's not all that useful.

287. By Roberto Alsina on 2012-03-08

remove debug print

[Roberto Alsina (ralsina)]

> We should drop --alert, but keep the unsetting of urgency on focusInEvent.

Done!

[lp:~ralsina/ubuntuone-control-panel/alerted]

288. By Roberto Alsina on 2012-03-09

fix docstring

[Natalia Bidart (nataliabidart)]

Looks good

review: Approve

=== modified file 'docs/ubuntuone-control-panel-qt.1'
--- docs/ubuntuone-control-panel-qt.1	2012-03-07 14:24:40 +0000
+++ docs/ubuntuone-control-panel-qt.1	2012-03-09 01:08:17 +0000
@@ -12,10 +12,7 @@
 .TP
 \fB\-\-switch\-to\fR PANEL_NAME
 Start Ubuntu One in the PANEL_NAME tab. Possible
-values are: dashboard, volumes, devices, applications
-.TP
-\fB\-a\fR, \fB\-\-alert\fR
-Start Ubuntu One alerting the user to its presence.
+values are: folders, devices, settings, account
 .TP
 \fB\-\-minimized\fR
 Start Ubuntu One only in the notification area, with

=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-02-29 21:33:02 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-03-09 01:08:17 +0000
@@ -21,6 +21,16 @@
 from ubuntuone.controlpanel.gui.qt.systray import TrayIcon
 from ubuntuone.controlpanel.gui.qt.ui import mainwindow_ui
 
+# pylint: disable=E0611
+try:
+    from gi.repository import Unity
+    USE_LIBUNITY = True
+except ImportError:
+    USE_LIBUNITY = False
+# pylint: enable=E0611
+
+U1_DOTDESKTOP = "ubuntuone-installer.desktop"
+
 
 class MainWindow(QtGui.QMainWindow):
     """The Main Window of the Control Panel."""
@@ -36,12 +46,23 @@
             triggered=self.close)
         self.quit_action.setShortcuts(["Ctrl+q", "Ctrl+w"])
         self.addAction(self.quit_action)
+        if USE_LIBUNITY:
+            self.entry = Unity.LauncherEntry.get_for_desktop_id(U1_DOTDESKTOP)
+        else:
+            self.entry = None
 
     def _setup(self):
         """Do some extra setupping for the UI."""
         self.ui.control_panel.finished.connect(self.close)
 
-    # Invalid name "closeEvent"
+    def switch_to(self, tabname="folders"):
+        """Switch control panel to the required tab."""
+        tabnames = ["folders", "devices", "settings", "account"]
+        if tabname in tabnames:
+            self.ui.control_panel.ui.tab_widget.setCurrentIndex(
+                tabnames.index(tabname))
+
+    # Invalid names "closeEvent" "focusInEvent"
     # pylint: disable=C0103
 
     def closeEvent(self, event):
@@ -50,6 +71,16 @@
             self.close_callback()
         event.accept()
 
+    def set_urgent(self, value):
+        """Set the urgent attribute in the launcher to value."""
+        if self.entry:
+            self.entry.set_property('urgent', value)
+
+    def focusInEvent(self, event):
+        """The main window got focus, remove urgent bit."""
+        self.set_urgent(False)
+        return super(MainWindow, self).focusInEvent(event)
+
     # pylint: enable=C0103
 
 

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-02-28 14:39:43 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-03-09 01:08:17 +0000
@@ -45,11 +45,7 @@
                         metavar="PANEL_NAME", default="",
                         help="Start Ubuntu One in the "
                              "PANEL_NAME tab. Possible values are: "
-                             "dashboard, volumes, devices, applications")
-    result.add_argument("-a", "--alert", dest="alert", action="store_true",
-                        default=False,
-                        help="Start Ubuntu One "
-                             "alerting the user to its presence.")
+                             "folders, devices, settings, account")
     result.add_argument("--minimized", dest="minimized", action="store_true",
                         default=False,
                         help="Start Ubuntu One "
@@ -72,8 +68,7 @@
     parser = parser_options()
     # Use only the arguments that are not recognized by Qt
     args = parser.parse_args(args=[unicode(x) for x in app.arguments()[1:]])
-    _ = args.switch_to
-    _ = args.alert
+    switch_to = args.switch_to
     minimized = args.minimized
     with_icon = args.with_icon
     source.main(app)
@@ -84,6 +79,7 @@
     # Unused variable 'window', 'icon', pylint: disable=W0612
     icon, window = start(lambda: source.main_quit(app),
                          minimized=minimized, with_icon=with_icon)
+    window.switch_to(switch_to)
     # pylint: enable=W0612
     if icon:
         app.new_instance.connect(icon.restore_window)

=== modified file 'ubuntuone/controlpanel/gui/qt/main/tests/test_main.py'
--- ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-02-24 18:16:50 +0000
+++ ubuntuone/controlpanel/gui/qt/main/tests/test_main.py	2012-03-09 01:08:17 +0000
@@ -52,16 +52,34 @@
         pass
 
 
+class FakeMainWindow(object):
+
+    """A fake MainWindow."""
+
+    tabname = None
+    urgent = None
+
+    def switch_to(self, tabname):
+        """Fake switch_to."""
+        self.tabname = tabname
+
+    def set_urgent(self, value):
+        """Fake set_urgent."""
+        self.urgent = value
+
+
 class FakeStart(object):
 
     """Fake start function."""
 
     def __init__(self):
         self.args = None
+        self.window = None
 
     def __call__(self, *args, **kwargs):
         self.args = (args, kwargs)
-        return None, None
+        self.window = FakeMainWindow()
+        return None, self.window
 
 
 class MainTestCase(TestCase):
@@ -103,3 +121,8 @@
         """Ensure the stylesheet is loaded."""
         main.main([])
         self.assertTrue(self.app.style)
+
+    def test_switch_to_option(self):
+        """Ensure the --switch-to option is parsed and passed correctly."""
+        main.main(["foobar", "--switch-to", "folders"])
+        self.assertEqual(self.start.window.tabname, "folders")

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-03-02 16:56:10 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-03-09 01:08:17 +0000
@@ -22,6 +22,17 @@
 from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
 
 
+class FakeEntry(object):
+
+    """A fake unity launcher entry."""
+
+    called = None
+
+    def set_property(self, *args, **kwargs):
+        """Fake set_property."""
+        self.called = (args, kwargs)
+
+
 class MainWindowTestCase(BaseTestCase):
     """Test the qt main window."""
 
@@ -58,3 +69,49 @@
         self.assertFalse(self.ui.isVisible())
         self.assertEqual(self._called,
                          ((), {}), 'close_callback called.')
+
+    def test_switch_to(self):
+        """Check that switch_to changes the current tab"""
+        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.folders_tab))
+        self.ui.switch_to("foobar")
+        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.folders_tab))
+        self.ui.switch_to("devices")
+        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.devices_tab))
+        self.ui.switch_to("settings")
+        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.preferences_tab))
+        self.ui.switch_to("account")
+        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.account_tab))
+        self.ui.switch_to("folders")
+        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.folders_tab))
+
+    def test_focus_in(self):
+        """Test that focusing removes urgent bit from launcher entry."""
+        entry = FakeEntry()
+        self.patch(self.ui, "entry", entry)
+        self.ui.focusInEvent(None)
+        self.assertEqual(entry.called, (('urgent', False), {}))
+
+    def test_set_urgent(self):
+        """Test that set_urgent calls with the right arguments."""
+        entry = FakeEntry()
+        self.patch(self.ui, "entry", entry)
+        self.ui.set_urgent("foo")
+        self.assertEqual(entry.called, (('urgent', "foo"), {}))