diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-12-07 15:34:37 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-12-07 15:34:37 -0800 |
| commit | bf6d4e2a8abf32e49a923f361162584b32e7afec (patch) | |
| tree | accce08215cee98292a74f51aaa93dc11f621e61 | |
| parent | c04bef9624059ac663c5dc1a396ce53b873e95f1 (diff) | |
| parent | 6065236bfb67bfe609d207f30aa776b69633974d (diff) | |
Merge remote-tracking branch 'gnuradio-wg-grc/maint_grcwg' into maint
| -rw-r--r-- | grc/gui/Actions.py | 2 | ||||
| -rw-r--r-- | grc/gui/Block.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py index d864db7e16..692b9d1cf3 100644 --- a/grc/gui/Actions.py +++ b/grc/gui/Actions.py @@ -422,7 +422,7 @@ BUSSIFY_SINKS = Action( ) XML_PARSER_ERRORS_DISPLAY = Action( label='_Parser Errors', - tooltip='View errors that occured while parsing XML files', + tooltip='View errors that occurred while parsing XML files', stock_id=gtk.STOCK_DIALOG_ERROR, ) TOOLS_RUN_FDESIGN = Action( diff --git a/grc/gui/Block.py b/grc/gui/Block.py index 87db6a97fc..cd40bfb3b5 100644 --- a/grc/gui/Block.py +++ b/grc/gui/Block.py @@ -158,7 +158,7 @@ class Block(Element): #display the params if self.is_dummy_block(): markups = [ - '<span foreground="black" font_desc="$font"><b>key: </b>{key}</span>'.format(font=PARAM_FONT, key=self._key) + '<span foreground="black" font_desc="{font}"><b>key: </b>{key}</span>'.format(font=PARAM_FONT, key=self._key) ] else: markups = [param.get_markup() for param in self.get_params() if param.get_hide() not in ('all', 'part')] @@ -167,7 +167,7 @@ class Block(Element): layout.set_spacing(LABEL_SEPARATION*pango.SCALE) layout.set_markup('\n'.join(markups)) layouts.append(layout) - w,h = layout.get_pixel_size() + w, h = layout.get_pixel_size() self.label_width = max(w, self.label_width) self.label_height += h + LABEL_SEPARATION width = self.label_width |