jdahlin - r7176 - in flumotion/trunk: . flumotion/admin/gtk

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Mon Aug  4 11:23:14 2008
New Revision: 7176

Log:
2008-08-04  Johan Dahlin  <johan at flumotion.com>

    * flumotion/admin/gtk/adminwindow.py:
    Listen to key presses on the window and quite if control-w
    is pressed. Fixes #1074



Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/admin/gtk/adminwindow.py

Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon Aug  4 11:23:14 2008
@@ -1,3 +1,9 @@
+2008-08-04  Johan Dahlin  <johan at flumotion.com>
+
+	* flumotion/admin/gtk/adminwindow.py:
+	Listen to key presses on the window and quite if control-w
+	is pressed. Fixes #1074
+
 2008-08-04  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* flumotion/common/common.py:

Modified: flumotion/trunk/flumotion/admin/gtk/adminwindow.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/adminwindow.py	(original)
+++ flumotion/trunk/flumotion/admin/gtk/adminwindow.py	Mon Aug  4 11:23:14 2008
@@ -67,6 +67,8 @@
 
 import gobject
 import gtk
+from gtk import gdk
+from gtk import keysyms
 from kiwi.ui.delegates import GladeDelegate
 from kiwi.ui.dialogs import yesno
 from twisted.internet import defer, reactor
@@ -331,7 +333,10 @@
         del self.messages_view
 
         self._window.set_name("AdminWindow")
-        self._window.connect('delete-event', self._window_delete_event_cb)
+        self._window.connect('delete-event',
+                             self._window_delete_event_cb)
+        self._window.connect('key-press-event',
+                             self._window_key_press_event_cb)
 
         uimgr = gtk.UIManager()
         uimgr.connect('connect-proxy',
@@ -1399,6 +1404,12 @@
     def _window_delete_event_cb(self, window, event):
         self._quit()
 
+    def _window_key_press_event_cb(self, window, event):
+        # This should be removed if we're going to support connecting
+        # to multiple managers in the same application (MDI/tabs)
+        if event.state == gdk.CONTROL_MASK and event.keyval == keysyms.w:
+            self._quit()
+
     def _trayicon_quit_cb(self, trayicon):
         self._quit()