Merge lp:~roignac/ubuntuone-control-panel/close_window_shortcuts into lp:ubuntuone-control-panel

[Vadim Rutkovsky]

This change adds shortcuts to main windows (both GTK and QT) - close on Ctrl+W or Ctrl+Q

[Natalia Bidart (nataliabidart)]

Hello Vadim!

First of all, thanks a lot for your contribution.
Secondly, I will have to set this branch as Needs Fixing since we have a strict policy about not adding new code without having the matching test suite validating the change.

To run the whole test suite, you can run the command:

./run-tests

At the moment, that command depends on a patched version of twisted that you can find out in our nightlies PPA: ppa:ubuntuone/nightlies.

Let me know if you need any other guidance.
Regards, Natalia.

review: Needs Fixing

[Vadim Rutkovsky (roignac)]

I guess, I should install a trunk version of ubuntu-sso-client, as the version from PPA lacks tests:

$ apt-cache policy ubuntu-sso-client
ubuntu-sso-client:
  Installed: 3.1+r874-38~precise1
  Candidate: 3.1+r874-38~precise1
  Version table:
 *** 3.1+r874-38~precise1 0
        500 http://ppa.launchpad.net/ubuntuone/nightlies/ubuntu/ precise/main i386 Packages
        100 /var/lib/dpkg/status
     2.99.4-0ubuntu1 0
        500 http://by.archive.ubuntu.com/ubuntu/ precise/main i386 Packages

$ ./run-tests
*** Running test suite for ubuntuone/controlpanel ***
Traceback (most recent call last):
  File "/usr/bin/u1trial", line 325, in <module>
    main()
  File "/usr/bin/u1trial", line 305, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 184, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 168, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 108, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/home/vadik/Devel/ubuntuone-control-panel/close_window_shortcuts/ubuntuone/controlpanel/tests/test_web_client.py", line 24, in <module>
    from ubuntu_sso.utils.webclient.tests import BaseMockWebServer
ImportError: No module named tests

I'll try using trunk version of ubuntu-sso-client.
Not sure whether it is a bug, as it doesn't affect ubuntuone-control-panel, however, new developers might encounter this issue too.

[dobey (dobey)]

You can install the python-ubuntu-sso-client.tests package, to get the test modules for sso which control-panel needs now.

[Natalia Bidart (nataliabidart)]

Hello Vadim,

Once again, thanks a lot for contributing to Ubuntu One. Since we did not heard back from you, we implemented this ourselves, so I will have to close this merge proposal.

Thanks again!
Please feel welcomed to keep contributing.

Regards, Natalia.

Unmerged revisions

260. By Vadim Rutkovsky on 2012-02-16

Close window on Ctrl+Q or Ctrl+W

=== modified file 'ubuntuone/controlpanel/gui/gtk/gui.py'
--- ubuntuone/controlpanel/gui/gtk/gui.py	2012-02-06 21:02:54 +0000
+++ ubuntuone/controlpanel/gui/gtk/gui.py	2012-02-16 05:12:18 +0000
@@ -1622,6 +1622,14 @@
         self.set_size_request(736, 525)  # bug #683164
 
         self.connect('delete-event', lambda w, e: gtk.main_quit())
+
+        self.accel_group = gtk.AccelGroup()
+        self.add_accel_group(self.accel_group)
+        self.accel_group.connect_group(ord('Q'), gtk.gdk.CONTROL_MASK, 0, 
+            lambda *etc: gtk.main_quit())
+        self.accel_group.connect_group(ord('W'), gtk.gdk.CONTROL_MASK, 0, 
+            lambda *etc: gtk.main_quit())
+
         if alert:
             self.draw_attention()
         else:
 
=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2012-02-07 13:54:46 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-02-16 05:12:18 +0000
@@ -39,6 +39,15 @@
     def _setup(self):
         """Do some extra setupping for the UI."""
         self.ui.control_panel.ui.signin.signinCanceled.connect(self.close)
+        self.closeCtrlW = QtGui.QAction('Close', self)
+        self.closeCtrlW.setShortcut('Ctrl+W')
+        self.closeCtrlW.triggered.connect(self.close_callback)
+        self.ui.centralwidget.addAction(self.closeCtrlW)
+
+        self.closeCtrlQ = QtGui.QAction('Close', self)
+        self.closeCtrlQ.setShortcut('Ctrl+Q')
+        self.closeCtrlQ.triggered.connect(self.close_callback)
+        self.ui.centralwidget.addAction(self.closeCtrlQ)
 
     # Invalid name "closeEvent"
     # pylint: disable=C0103