diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-10-28 08:51:05 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-10-28 08:51:05 -0700 |
| commit | aaba9bc301b96e7d1605ff463ed695f725db405b (patch) | |
| tree | c801592680c644cd3979addefc14708389d0d78e | |
| parent | 7b874636db9e214cff863e081d59c3eaa37046fc (diff) | |
| parent | 7ce632bb7e0ba3cd2d7c7a3c65a42f613edbb7d4 (diff) | |
Merge remote-tracking branch 'skoslowski/search_block_tree'
| -rw-r--r-- | grc/gui/Actions.py | 5 | ||||
| -rw-r--r-- | grc/gui/BlockTreeWindow.py | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py index bb32953477..5daf45def8 100644 --- a/grc/gui/Actions.py +++ b/grc/gui/Actions.py @@ -292,9 +292,10 @@ RELOAD_BLOCKS = Action( ) FIND_BLOCKS = Action( label='Find Blocks', - tooltip='Search for a Block by Name or Key', + tooltip='Search for a block by bame or key', stock_id=gtk.STOCK_FIND, - keypresses=(gtk.keysyms.f, gtk.gdk.CONTROL_MASK), + keypresses=(gtk.keysyms.f, gtk.gdk.CONTROL_MASK, + gtk.keysyms.slash, NO_MODS_MASK), ) OPEN_HIER = Action( label='Open H_ier', diff --git a/grc/gui/BlockTreeWindow.py b/grc/gui/BlockTreeWindow.py index 5a24c40000..2173cb0d98 100644 --- a/grc/gui/BlockTreeWindow.py +++ b/grc/gui/BlockTreeWindow.py @@ -225,6 +225,9 @@ class BlockTreeWindow(gtk.VBox): # manually trigger action... Actions.FIND_BLOCKS.activate() + elif event.keyval == gtk.keysyms.slash: + Actions.FIND_BLOCKS.activate() + else: return False # propagate event |