diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-10-03 12:40:18 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-10-03 12:40:18 -0700 |
| commit | c8342fd9aed8ed1bcf0062dc02637ad11269642e (patch) | |
| tree | 6ba401aef1e3fce1e65f046f177b051e1475f569 | |
| parent | 73ae366a6a4d97a9d44a711a8f404c8a29bd31c9 (diff) | |
| parent | 8a4904d7f3c5878c42d1c0589e6ef7b1afd4a6be (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | grc/gui/Block.py | 9 | ||||
| -rw-r--r-- | grc/python/flow_graph.tmpl | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/grc/gui/Block.py b/grc/gui/Block.py index 7350e4bdfe..4157a0882d 100644 --- a/grc/gui/Block.py +++ b/grc/gui/Block.py @@ -41,11 +41,16 @@ BLOCK_MARKUP_TMPL="""\ COMMENT_COMPLEXITY_MARKUP_TMPL="""\ #set $foreground = $block.get_enabled() and '#444' or '#888' #if $complexity -<span foreground="#444" size="medium" font_desc="$font"><b>$encode($complexity)</b></span> +<span foreground="#444" size="medium" font_desc="$font"><b>$encode($complexity)</b></span>#slurp +#end if +#if $complexity and $comment +<span></span> #end if #if $comment <span foreground="$foreground" font_desc="$font">$encode($comment)</span>#slurp -#end if""" +#end if +""" + class Block(Element): diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl index 72891b7af8..35d9239e5e 100644 --- a/grc/python/flow_graph.tmpl +++ b/grc/python/flow_graph.tmpl @@ -278,7 +278,7 @@ gr.io_signaturev($(len($io_sigs)), $(len($io_sigs)), [$(', '.join($size_strs))]) filename = os.path.join( gr.prefix(), "share", "gnuradio", "themes", filename) with open(filename) as ss: - tb.setStyleSheet('1' + ss.read()) + self.setStyleSheet(ss.read()) except Exception as e: print >> sys.stderr, e #end if |