summaryrefslogtreecommitdiff
path: root/grc/python/Block.py
diff options
context:
space:
mode:
authorSebastian Koslowski <koslowski@kit.edu>2016-02-05 11:43:26 +0100
committerSebastian Koslowski <koslowski@kit.edu>2016-02-05 11:55:55 +0100
commitdec3bf564e5ca3b6fc103b3eb66a80e8abe8229b (patch)
tree8639e4ba8141460f3d9975cade1f902525fbeae4 /grc/python/Block.py
parente21a3dad6cf8e035ff5104d9eddfce11a8582658 (diff)
grc: nicer block documentation tooltip and properties dialog tab
Diffstat (limited to 'grc/python/Block.py')
-rw-r--r--grc/python/Block.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/grc/python/Block.py b/grc/python/Block.py
index f5c994dc05..f43b006e5f 100644
--- a/grc/python/Block.py
+++ b/grc/python/Block.py
@@ -185,8 +185,11 @@ class Block(_Block, _GUIBlock):
def get_doc(self):
platform = self.get_parent().get_parent()
- extracted_docs = platform.block_docstrings.get(self._key, '')
- return (self._doc + '\n\n' + extracted_docs).strip()
+ documentation = platform.block_docstrings.get(self._key, {})
+ from_xml = self._doc.strip()
+ if from_xml:
+ documentation[''] = from_xml
+ return documentation
def get_category(self):
return _Block.get_category(self)