Merge lp:~dobey/ubuntuone-control-panel/one-launcher into lp:ubuntuone-control-panel

[dobey]

Don't install a .desktop file for control panel
Point the indicator/Unity API at the installer .desktop file
Set the WMCLASS so Unity will fall back properly

[Natalia Bidart (nataliabidart)]

Code looks good.

Can you please add tests for the change in ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py, inside the ControlPanelWindowTestCase?

Thanks.

review: Needs Fixing

[lp:~dobey/ubuntuone-control-panel/one-launcher]

230. By dobey on 2011-09-16

Add a 'test' and use constants

[Natalia Bidart (nataliabidart)]

Looks good!

please fix the lint issue before landing:

ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py:
    128: [W0612, ControlPanelWindowTestCase.test_wmclass_is_correct] Unused variable 'cp'

review: Approve

[lp:~dobey/ubuntuone-control-panel/one-launcher]

231. By dobey on 2011-09-16

Use the useless variable in the test

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-05-24 14:20:18 +0000
+++ po/POTFILES.in	2011-09-16 18:06:22 +0000
@@ -1,4 +1,3 @@
-ubuntuone-control-panel-gtk.desktop.in
 ubuntuone/controlpanel/gui/__init__.py
 [type: gettext/glade] data/gtk/dashboard.ui
 [type: gettext/glade] data/gtk/device.ui

=== removed file 'ubuntuone-control-panel-gtk.desktop.in'
--- ubuntuone-control-panel-gtk.desktop.in	2011-07-08 16:20:03 +0000
+++ ubuntuone-control-panel-gtk.desktop.in	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Ubuntu One
-_Comment=Configure and manage your Ubuntu One account
-Exec=ubuntuone-control-panel-gtk
-Icon=ubuntuone
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalSettings
-StartupNotify=true
-X-Ayatana-Appmenu-Show-Stubs=False
-X-GNOME-Settings-Panel=ubuntuone

=== modified file 'ubuntuone-control-panel.in'
--- ubuntuone-control-panel.in	2011-01-27 20:56:58 +0000
+++ ubuntuone-control-panel.in	2011-09-16 18:06:22 +0000
@@ -1,1 +1,1 @@
-@prefix@/share/applications/ubuntuone-control-panel-gtk.desktop
+@prefix@/share/applications/ubuntuone-installer.desktop

=== modified file 'ubuntuone/controlpanel/gui/gtk/gui.py'
--- ubuntuone/controlpanel/gui/gtk/gui.py	2011-08-23 05:29:30 +0000
+++ ubuntuone/controlpanel/gui/gtk/gui.py	2011-09-16 18:06:22 +0000
@@ -62,7 +62,7 @@
 try:
     from gi.repository import Unity     # pylint: disable=E0611
     USE_LIBUNITY = True
-    U1_DOTDESKTOP = "ubuntuone-control-panel-gtk.desktop"
+    U1_DOTDESKTOP = "ubuntuone-installer.desktop"
 except ImportError:
     USE_LIBUNITY = False
 
@@ -71,6 +71,9 @@
 
 WARNING_MARKUP = '<span foreground="%s"><b>%%s</b></span>' % ERROR_COLOR
 
+CP_WMCLASS_NAME = 'ubuntuone-control-panel-gtk'
+CP_WMCLASS_CLASS = 'ubuntuone-installer'
+
 
 def error_handler(*args, **kwargs):
     """Log errors when calling D-Bus methods in a async way."""
@@ -1614,6 +1617,10 @@
     def __init__(self, switch_to='', alert=False):
         super(ControlPanelWindow, self).__init__()
 
+        # We need to set WMCLASS so Unity falls back and we only get one
+        # launcher on the launcher panel
+        self.set_wmclass(CP_WMCLASS_NAME, CP_WMCLASS_CLASS)
+
         self.connect('focus-in-event', self.remove_urgency)
         self.set_title(MAIN_WINDOW_TITLE % {'app_name': U1_APP_NAME})
         self.set_position(gtk.WIN_POS_CENTER_ALWAYS)

=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-09-07 13:49:19 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-09-16 18:06:22 +0000
@@ -122,6 +122,14 @@
         self.assertEqual(
             self._called, ((), {}), 'gtk.main_quit was not called.')
 
+    def test_wmclass_is_correct(self):
+        """Test that the WMCLASS is set."""
+        self.patch(gui.ControlPanelWindow, 'set_wmclass', self._set_called)
+        cp = gui.ControlPanelWindow()
+        cp.destroy()
+        expected = ((gui.CP_WMCLASS_NAME, gui.CP_WMCLASS_CLASS), {})
+        self.assertEqual(self._called, expected)
+
     def test_title_is_correct(self):
         """The window title is correct."""
         expected = gui.MAIN_WINDOW_TITLE % {'app_name': gui.U1_APP_NAME}