summaryrefslogtreecommitdiff
path: root/grc/gui/Bars.py
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2015-06-14 09:19:03 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2015-06-14 09:19:03 -0700
commit7ee2f91d3c51498a6d1923fb47f47b882c9a77e5 (patch)
tree525e79df13a027722b88fc0f031696833fed46ec /grc/gui/Bars.py
parenta80edf4570d75f1325dce7e026e166956bb1db5f (diff)
parent91dd2fce59ba81d4dc22b9dcdc909211cafe9f5f (diff)
Merge remote-tracking branch 'gnuradio-wg-grc/master_grcwg'
Diffstat (limited to 'grc/gui/Bars.py')
-rw-r--r--grc/gui/Bars.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py
index 40ce20536c..abcc3c6434 100644
--- a/grc/gui/Bars.py
+++ b/grc/gui/Bars.py
@@ -49,6 +49,7 @@ TOOLBAR_LIST = (
None,
Actions.BLOCK_ENABLE,
Actions.BLOCK_DISABLE,
+ Actions.BLOCK_BYPASS,
Actions.TOGGLE_HIDE_DISABLED_BLOCKS,
None,
Actions.FIND_BLOCKS,
@@ -85,6 +86,7 @@ MENU_BAR_LIST = (
None,
Actions.BLOCK_ENABLE,
Actions.BLOCK_DISABLE,
+ Actions.BLOCK_BYPASS,
None,
Actions.BLOCK_PARAM_MODIFY,
]),
@@ -134,6 +136,7 @@ CONTEXT_MENU_LIST = [
Actions.BLOCK_ROTATE_CW,
Actions.BLOCK_ENABLE,
Actions.BLOCK_DISABLE,
+ Actions.BLOCK_BYPASS,
None,
(gtk.Action('More', '_More', None, None), [
Actions.BLOCK_CREATE_HIER,