hamster-applet r687 - trunk/hamster

[tbaugis svn gnome org]

Author: tbaugis
Date: Wed Feb  4 10:11:48 2009
New Revision: 687
URL: http://svn.gnome.org/viewvc/hamster-applet?rev=687&view=rev

Log:
ctrl+w closes windows, fixes bug 565088

Modified:
   trunk/hamster/add_custom_fact.py
   trunk/hamster/applet.py
   trunk/hamster/stats.py

Modified: trunk/hamster/add_custom_fact.py
==============================================================================
--- trunk/hamster/add_custom_fact.py	(original)
+++ trunk/hamster/add_custom_fact.py	Wed Feb  4 10:11:48 2009
@@ -279,7 +279,9 @@
         self.get_widget("ok").set_sensitive(activity != '')
 
     def on_window_key_pressed(self, tree, event_key):
-        if (event_key.keyval == gtk.keysyms.Escape):
+        if (event_key.keyval == gtk.keysyms.Escape
+          or (event_key.keyval == gtk.keysyms.w 
+              and event_key.state & gtk.gdk.CONTROL_MASK)):
             self.window.destroy()
         elif (event_key.keyval == gtk.keysyms.Return or
               event_key.keyval == gtk.keysyms.KP_Enter):

Modified: trunk/hamster/applet.py
==============================================================================
--- trunk/hamster/applet.py	(original)
+++ trunk/hamster/applet.py	Wed Feb  4 10:11:48 2009
@@ -617,7 +617,9 @@
         
         
     def on_windows_keys(self, tree, event_key):
-        if (event_key.keyval == gtk.keysyms.Escape):
+        if (event_key.keyval == gtk.keysyms.Escape
+          or (event_key.keyval == gtk.keysyms.w 
+              and event_key.state & gtk.gdk.CONTROL_MASK)):
             dispatcher.dispatch('panel_visible', False)
             return True
         return False

Modified: trunk/hamster/stats.py
==============================================================================
--- trunk/hamster/stats.py	(original)
+++ trunk/hamster/stats.py	Wed Feb  4 10:11:48 2009
@@ -495,7 +495,9 @@
         return False
 
     def on_window_key_pressed(self, tree, event_key):
-      if (event_key.keyval == gtk.keysyms.Escape):
+      if (event_key.keyval == gtk.keysyms.Escape
+          or (event_key.keyval == gtk.keysyms.w 
+              and event_key.state & gtk.gdk.CONTROL_MASK)):
         self.window.destroy()
     
     def show(self):