diff options
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/gui/ActionHandler.py | 3 | ||||
| -rw-r--r-- | grc/gui/Actions.py | 5 | ||||
| -rw-r--r-- | grc/gui/Bars.py | 3 | ||||
| -rw-r--r-- | grc/gui/Dialogs.py | 14 | ||||
| -rw-r--r-- | grc/python/Param.py | 2 |
5 files changed, 26 insertions, 1 deletions
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py index 361be1cf8..ee3e19a6c 100644 --- a/grc/gui/ActionHandler.py +++ b/grc/gui/ActionHandler.py @@ -210,6 +210,8 @@ class ActionHandler: Dialogs.HelpDialog() elif action == Actions.TYPES_WINDOW_DISPLAY: Dialogs.TypesDialog(self.get_flow_graph().get_parent()) + elif action == Actions.ERRORS_WINDOW_DISPLAY: + Dialogs.ErrorsDialog(self.get_flow_graph()) ################################################## # Param Modifications ################################################## @@ -307,6 +309,7 @@ class ActionHandler: # Global Actions for all States ################################################## #update general buttons + Actions.ERRORS_WINDOW_DISPLAY.set_sensitive(not self.get_flow_graph().is_valid()) Actions.ELEMENT_DELETE.set_sensitive(bool(self.get_flow_graph().get_selected_elements())) Actions.BLOCK_PARAM_MODIFY.set_sensitive(bool(self.get_flow_graph().get_selected_block())) Actions.BLOCK_ROTATE_CCW.set_sensitive(bool(self.get_flow_graph().get_selected_blocks())) diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py index b22279c1d..1cc12a819 100644 --- a/grc/gui/Actions.py +++ b/grc/gui/Actions.py @@ -215,6 +215,11 @@ BLOCK_PASTE = Action( stock_id=gtk.STOCK_PASTE, keypresses=(gtk.keysyms.v, gtk.gdk.CONTROL_MASK), ) +ERRORS_WINDOW_DISPLAY = Action( + label='_Errors', + tooltip='Flowgraph error messages', + stock_id=gtk.STOCK_DIALOG_ERROR, +) ABOUT_WINDOW_DISPLAY = Action( label='_About', tooltip='About this program', diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py index fff5ebc08..17835eb00 100644 --- a/grc/gui/Bars.py +++ b/grc/gui/Bars.py @@ -81,6 +81,9 @@ MENU_BAR_LIST = ( None, Actions.BLOCK_PARAM_MODIFY, ]), + (gtk.Action('View', '_View', None, None), [ + Actions.ERRORS_WINDOW_DISPLAY, + ]), (gtk.Action('Build', '_Build', None, None), [ Actions.FLOW_GRAPH_GEN, Actions.FLOW_GRAPH_EXEC, diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py index 3cf617b92..a8e7afb05 100644 --- a/grc/gui/Dialogs.py +++ b/grc/gui/Dialogs.py @@ -57,6 +57,20 @@ def MessageDialogHelper(type, buttons, title=None, markup=None): message_dialog.destroy() return response + +ERRORS_MARKUP_TMPL="""\ +#for $i, $err_msg in enumerate($errors) +<b>Error $i:</b> +$encode($err_msg.replace('\t', ' ')) + +#end for""" +def ErrorsDialog(flowgraph): MessageDialogHelper( + type=gtk.MESSAGE_ERROR, + buttons=gtk.BUTTONS_CLOSE, + title='Flowgraph Errors', + markup=Utils.parse_template(ERRORS_MARKUP_TMPL, errors=flowgraph.get_error_messages()), +) + class AboutDialog(gtk.AboutDialog): """A cute little about dialog.""" diff --git a/grc/python/Param.py b/grc/python/Param.py index 387fab548..1c1511315 100644 --- a/grc/python/Param.py +++ b/grc/python/Param.py @@ -254,7 +254,7 @@ class Param(_Param, _GUIParam): elif t in ('raw', 'complex', 'real', 'int', 'complex_vector', 'real_vector', 'int_vector', 'hex', 'bool'): #raise exception if python cannot evaluate this value try: e = self.get_parent().get_parent().evaluate(v) - except Exception, e: raise Exception, 'Value "%s" cannot be evaluated: %s'%(v, e) + except Exception, e: raise Exception, 'Value "%s" cannot be evaluated:\n%s'%(v, e) #raise an exception if the data is invalid if t == 'raw': return e elif t == 'complex': |