Merge lp:~ralsina/ubuntuone-windows-installer/no-icon-without-arguments into lp:ubuntuone-windows-installer

[Roberto Alsina]

When launching control panel at the end of setup: launch with icon
When launching control panel because there are credentials: launch without icon

When launching control panel at the end of setup: launch with icon
When launching control panel because there are credentials: launch without icon

Trying this IRL involves:

* Build an installer
* Delete credentials
* Start installer, reach a point where it starts control panel

The control panel should show an icon in the notification area

* Close the notification area icon
* Start ubuntu one from the windows menu

There should *not* be an ubuntu one icon in the notification area

----------------

Since I don't expect anyone to do that, trust the tests ;-)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

Code looks great.

review: Approve

=== modified file 'ubuntuone_installer/gui/qt/main/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/main/tests/test_windows.py	2011-09-07 20:03:40 +0000
+++ ubuntuone_installer/gui/qt/main/tests/test_windows.py	2011-09-19 23:12:25 +0000
@@ -123,7 +123,7 @@
         # Should not log errors
         self.assertEqual(logger.error_args, None)
         # Should start u1cp
-        self.assertEqual(self._called, ((), {}))
+        self.assertEqual(self._called, ((), {'with_icon': False}))
         # Should stop the app
         self.assertTrue(self.stopped)
 

=== modified file 'ubuntuone_installer/gui/qt/main/windows.py'
--- ubuntuone_installer/gui/qt/main/windows.py	2011-09-14 14:12:02 +0000
+++ ubuntuone_installer/gui/qt/main/windows.py	2011-09-19 23:12:25 +0000
@@ -48,7 +48,7 @@
     """Handle credentials success."""
     if creds:  # Have credentials already
         from ubuntuone_installer.gui.qt import utils
-        utils.start_control_panel()
+        utils.start_control_panel(with_icon=False)
         stop()
     else:  # No credentials
         window = gui.MainWindow(close_callback=stop, installing=installing)

=== modified file 'ubuntuone_installer/gui/qt/utils/tests/test_windows.py'
--- ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-15 19:33:35 +0000
+++ ubuntuone_installer/gui/qt/utils/tests/test_windows.py	2011-09-19 23:12:25 +0000
@@ -92,15 +92,20 @@
 
     """Test the start of the control panel."""
 
-    def test_start_control_panel(self):
+    def test_start_control_panel_with_icon(self):
         """The proper process is started."""
         self.patch(subprocess, "Popen", self._set_called)
-
         utils.start_control_panel()
-
         expected = ((['ubuntuone-control-panel-qt', '--with-icon'],), {})
         self.assertEqual(self._called, expected)
 
+    def test_start_control_panel_without_icon(self):
+        """The proper process is started."""
+        self.patch(subprocess, "Popen", self._set_called)
+        utils.start_control_panel(with_icon=False)
+        expected = ((['ubuntuone-control-panel-qt'],), {})
+        self.assertEqual(self._called, expected)
+
     def test_start_control_panel_frozen(self):
         """When frozen, the control-panel has a path."""
         # I can't patch sys because frozen is not there by default

=== modified file 'ubuntuone_installer/gui/qt/utils/windows.py'
--- ubuntuone_installer/gui/qt/utils/windows.py	2011-09-15 19:33:35 +0000
+++ ubuntuone_installer/gui/qt/utils/windows.py	2011-09-19 23:12:25 +0000
@@ -47,7 +47,7 @@
             '--mode win32', '', 0)
 
 
-def start_control_panel():
+def start_control_panel(with_icon=True):
     """Start the control panel."""
     # If we are in windows and "frozen", assume it's in
     # the same folder as this .exe
@@ -56,7 +56,10 @@
         cp_path = os.path.join(cp_dir, "ubuntuone-control-panel-qt.exe")
     else:
         cp_path = "ubuntuone-control-panel-qt"
-    subprocess.Popen([cp_path, "--with-icon"])
+    if with_icon:
+        subprocess.Popen([cp_path, "--with-icon"])
+    else:
+        subprocess.Popen([cp_path])
 
 
 def add_syncdaemon_to_autostart():