diff options
author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-06 09:32:21 -0700 |
---|---|---|
committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-06-06 09:32:21 -0700 |
commit | 91e8ecdcb55a224e1572dca5f920b4b2d347cb77 (patch) | |
tree | b8702b972de819733cfad105bde22b9fd43212c3 /gr-utils/python/modtool | |
parent | e89c1dcdf98281a84f0fb4070ca3b56baf5743e6 (diff) | |
parent | 0f61e4e150359d4e68439085a5489f96df04f685 (diff) |
Merge branch 'master' into next
Conflicts:
gr-utils/python/modtool/templates.py
Diffstat (limited to 'gr-utils/python/modtool')
-rw-r--r-- | gr-utils/python/modtool/grc_xml_generator.py | 2 | ||||
-rw-r--r-- | gr-utils/python/modtool/templates.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gr-utils/python/modtool/grc_xml_generator.py b/gr-utils/python/modtool/grc_xml_generator.py index 7ccd443196..af17ca1822 100644 --- a/gr-utils/python/modtool/grc_xml_generator.py +++ b/gr-utils/python/modtool/grc_xml_generator.py @@ -35,7 +35,7 @@ class GRCXMLGenerator(object): # Can't make a dict 'cause order matters self._header = (('name', blockname.replace('_', ' ').capitalize()), ('key', '%s_%s' % (modname, blockname)), - ('category', modname.upper()), + ('category', '[%s]' % modname.upper()), ('import', 'import %s' % modname), ('make', '%s.%s(%s)' % (modname, blockname, ', '.join(params_list))) ) diff --git a/gr-utils/python/modtool/templates.py b/gr-utils/python/modtool/templates.py index 1d03d9f24d..07534e5673 100644 --- a/gr-utils/python/modtool/templates.py +++ b/gr-utils/python/modtool/templates.py @@ -531,7 +531,7 @@ Templates['grc_xml'] = '''<?xml version="1.0"?> <block> <name>${blockname}</name> <key>${modname}_${blockname}</key> - <category>${modname}</category> + <category>[${modname}]</category> <import>import ${modname}</import> <make>${modname}.${blockname}(${strip_arg_types_grc(arglist)})</make> <!-- Make one 'param' node for every Parameter you want settable from the GUI. |