gnome-specimen r173 - in trunk-from-bzr: . specimen

[wbolster svn gnome org]

Author: wbolster
Date: Tue Jun 17 18:44:22 2008
New Revision: 173
URL: http://svn.gnome.org/viewvc/gnome-specimen?rev=173&view=rev

Log:
* specimen/specimenwindow.py:
  - Do not capture '/' if one of the entries is focused
  - Focus the font listing if find mode stops


Modified:
   trunk-from-bzr/   (props changed)
   trunk-from-bzr/specimen/specimenwindow.py

Modified: trunk-from-bzr/specimen/specimenwindow.py
==============================================================================
--- trunk-from-bzr/specimen/specimenwindow.py	(original)
+++ trunk-from-bzr/specimen/specimenwindow.py	Tue Jun 17 18:44:22 2008
@@ -279,6 +279,7 @@
     def stop_find(self):
         self.remove_find_filter()
         self.find_controls.hide()
+        self.fonts_treeview.grab_focus()
 
     def cancel_find_cb(self, button, data=None):
         self.stop_find()
@@ -572,8 +573,13 @@
             self.stop_find()
             return True
         if event.keyval == gtk.keysyms.slash:
-            self.start_find()
-            return True
+            # we only handle slash if no text entry is not focused, because
+            # otherwise it will prevent the user from typing a / there
+            entries = [self.preview_text_entry, self.find_entry]
+            if not [e for e in entries if e.is_focus()]:
+                # empty list means none of entries is focused
+                self.start_find()
+                return True
 
         # Keyboard shortcuts with control key pressed
         if event.state & gtk.gdk.CONTROL_MASK: