diff options
| author | Tom Rondeau | 2011-05-08 19:58:43 +0100 |
|---|---|---|
| committer | Tom Rondeau | 2011-05-08 19:58:43 +0100 |
| commit | a72bde633dda63c4471111894ca6b92a87318d5f (patch) | |
| tree | c60e447e922b1a7076dd839ed8a94fcc9b665919 /grc/gui/Actions.py | |
| parent | bdd0bd405c2ea645395917c1abb91c964210c4d9 (diff) | |
| parent | 207a2ae73bd5d6cab201bb57ed8db64fd54cfd90 (diff) | |
| download | gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.tar.gz gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.tar.bz2 gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.zip | |
Merge branch 'master' into 8psk
Diffstat (limited to 'grc/gui/Actions.py')
| -rw-r--r-- | grc/gui/Actions.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py index f374efde1..4d196477e 100644 --- a/grc/gui/Actions.py +++ b/grc/gui/Actions.py @@ -1,5 +1,5 @@ """ -Copyright 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright 2007-2011 Free Software Foundation, Inc. This file is part of GNU Radio GNU Radio Companion is free software; you can redistribute it and/or @@ -76,7 +76,8 @@ class Action(gtk.Action): for i in range(len(keypresses)/2): keyval, mod_mask = keypresses[i*2:(i+1)*2] #register this keypress - assert not _actions_keypress_dict.has_key((keyval, mod_mask)) + if _actions_keypress_dict.has_key((keyval, mod_mask)): + raise KeyError('keyval/mod_mask pair already registered "%s"'%str((keyval, mod_mask))) _actions_keypress_dict[(keyval, mod_mask)] = self #set the accelerator group, and accelerator path #register the key name and mod mask with the accelerator path |