Merge lp:~ralsina/ubuntuone-control-panel/fix-865688 into lp:ubuntuone-control-panel

[Roberto Alsina]

 - Restore minimized windows from the tray (Fixes LP:865688).

To test IRL:

PYTHONPATH=. ./bin/ubuntuone-control-panel-qt --with-icon

Minimize the control panel window

Right-click on the tray icon -> restore

The window should show itself again.

If you can't see the tray icon, install sni-qt or, whitelist the tray, or try it on windows ;-)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Brian Curtin (brian.curtin)]

Works for me on Windows.

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	2012-03-02 13:53:24 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2012-05-14 20:19:19 +0000
@@ -60,6 +60,7 @@
             # pylint: enable=W0404
             self.window = MainWindow(close_callback=self.delete_window)
         self.window.show()
+        self.window.activateWindow()
 
     def delete_window(self):
         """Close and remove the main window."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-02-06 21:10:10 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-05-14 20:19:19 +0000
@@ -100,6 +100,18 @@
         self.assertEqual(tray.window, window)
         self.assertTrue(tray.window.isVisible())
 
+    def test_restore_window_minimized(self):
+        """Test the restore window option in the menu, with a min. window."""
+        tray = systray.TrayIcon()
+        window = FakeMainWindow()
+        # This cannot be tested with the real activateWindow
+        # because the un-minimization is done by the WM, so
+        # it has a small delay, and it fails.
+        self.patch(window, "activateWindow", self._set_called)
+        tray.window = window
+        tray.restore.trigger()
+        self.assertEqual(self._called, ((), {}))
+
     def test_delete_window(self):
         """Test deleting an existing window."""
         tray = systray.TrayIcon()