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

[Roberto Alsina]

- Added keyboard shortcuts for quitting the control panel (LP: #900753).

Add keyboard shortcuts for quitting the control panel (Ctrl+w and Ctrl+q).

To test IRL, start it and press Ctrl+q (or Ctrl+w)

[dobey (dobey)]

review: Approve

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

268. By Roberto Alsina on 2012-02-28

close the window instead of quitting the app

269. By Roberto Alsina on 2012-02-28

moved stuff to MainWindow

[Natalia Bidart (nataliabidart)]

Could you please remove the leftover in diff line 8?

+ quit_action = None

Thanks!

review: Needs Fixing

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

270. By Roberto Alsina on 2012-02-28

removed leftover

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-02-17 14:42:57 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-02-28 21:33:17 +0000
@@ -32,6 +32,10 @@
         self.ui.setupUi(self)
         self.close_callback = close_callback
         self._setup()
+        self.quit_action = QtGui.QAction(self,
+            triggered=self.close)
+        self.quit_action.setShortcuts(["Ctrl+q", "Ctrl+w"])
+        self.addAction(self.quit_action)
 
     def _setup(self):
         """Do some extra setupping for the UI."""
 
=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gui.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2011-08-26 17:16:16 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gui.py	2012-02-28 21:33:17 +0000
@@ -48,3 +48,13 @@
         self.ui.ui.control_panel.ui.signin.signinCanceled.emit()
         self.assertEqual(len(self._called[0]), 1)
         self.assertIsInstance(self._called[0][0], gui.QtGui.QCloseEvent)
+
+    def test_quit_action(self):
+        """Check that the app can quit using the keyboard."""
+        self.assertEqual(self.ui.quit_action.shortcuts(),
+            ["Ctrl+q", "Ctrl+w"])
+        self.ui.close_callback = self._set_called
+        self.ui.quit_action.trigger()
+        self.assertFalse(self.ui.isVisible())
+        self.assertEqual(self._called,
+                         ((), {}), 'close_callback called.')