summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2016-04-25 15:42:30 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2016-04-25 15:42:30 -0700
commit4aa94044e721f1a4fbff75f5bfb32c5adb5691ea (patch)
tree1cd975d4334302953b500d5ff7bdc0d2e344b0cd
parent1db085e73455204679c14ca560466d5359980adf (diff)
parentc4a7a9a620fc9a1117b70e463b071ab4be9539a2 (diff)
Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint
-rw-r--r--grc/gui/Bars.py4
-rw-r--r--grc/python/Platform.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py
index 19f041f508..8b389a797c 100644
--- a/grc/gui/Bars.py
+++ b/grc/gui/Bars.py
@@ -188,7 +188,7 @@ class SubMenuCreator(object):
item = Actions.FLOW_GRAPH_NEW.create_menu_item()
item.set_label(name)
else:
- item = gtk.MenuItem(name)
+ item = gtk.MenuItem(name, use_underline=False)
item.connect('activate', self.callback_adaptor, (action, key))
menu.append(item)
menu.show_all()
@@ -201,7 +201,7 @@ class SubMenuCreator(object):
recent_files = Preferences.get_recent_files()
if len(recent_files) > 0:
for i, file_name in enumerate(recent_files):
- item = gtk.MenuItem("%d. %s" % (i+1, file_name))
+ item = gtk.MenuItem("%d. %s" % (i+1, file_name), use_underline=False)
item.connect('activate', self.callback_adaptor,
(action, file_name))
menu.append(item)
diff --git a/grc/python/Platform.py b/grc/python/Platform.py
index 2a0bbf9a9e..351f04cb95 100644
--- a/grc/python/Platform.py
+++ b/grc/python/Platform.py
@@ -146,6 +146,8 @@ class Platform(_Platform, _GUIPlatform):
flow_graph.validate()
if not flow_graph.is_valid():
raise Exception('Flowgraph invalid')
+ if not flow_graph.get_option('generate_options').startswith('hb'):
+ raise Exception('Not a hier block')
except Exception as e:
Messages.send('>>> Load Error: %r: %s\n' % (file_path, str(e)))
return False