put the flow graph errors button into the toolbar

diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py
index 1cc12a8194cac20121c86c2e33a2d7e0efbe2de1..f374efde18d9e5d8d9ec6cbd2e814322e583ce96 100644 (file)
--- a/grc/gui/Actions.py
+++ b/grc/gui/Actions.py
@@ -217,7 +217,7 @@ BLOCK_PASTE = Action(
 )
 ERRORS_WINDOW_DISPLAY = Action(
        label='_Errors',
-       tooltip='Flowgraph error messages',
+       tooltip='View flow graph errors',
        stock_id=gtk.STOCK_DIALOG_ERROR,
 )
 ABOUT_WINDOW_DISPLAY = Action(
@@ -227,13 +227,13 @@ ABOUT_WINDOW_DISPLAY = Action(
 )
 HELP_WINDOW_DISPLAY = Action(
        label='_Help',
-       tooltip='Usage Tips',
+       tooltip='Usage tips',
        stock_id=gtk.STOCK_HELP,
        keypresses=(gtk.keysyms.F1, NO_MODS_MASK),
 )
 TYPES_WINDOW_DISPLAY = Action(
        label='_Types',
-       tooltip='Types Color Mapping',
+       tooltip='Types color mapping',
        stock_id=gtk.STOCK_DIALOG_INFO,
 )
 FLOW_GRAPH_GEN = Action(

diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py
index 17835eb004eabe92aabb5104095a16435804d363..8fd167869828f163d619b271441b6a60bd9c5d93 100644 (file)
--- a/grc/gui/Bars.py
+++ b/grc/gui/Bars.py
@@ -39,6 +39,7 @@ TOOLBAR_LIST = (
        Actions.FLOW_GRAPH_UNDO,
        Actions.FLOW_GRAPH_REDO,
        None,
+       Actions.ERRORS_WINDOW_DISPLAY,
        Actions.FLOW_GRAPH_GEN,
        Actions.FLOW_GRAPH_EXEC,
        Actions.FLOW_GRAPH_KILL,

diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py
index a8e7afb057a326381fe23cb5637f6756d905c4f8..af40f47c088a38d57baebc2dc20477a25fcb9b35 100644 (file)
--- a/grc/gui/Dialogs.py
+++ b/grc/gui/Dialogs.py
@@ -67,7 +67,7 @@ $encode($err_msg.replace('\t', '  '))
 def ErrorsDialog(flowgraph): MessageDialogHelper(
        type=gtk.MESSAGE_ERROR,
        buttons=gtk.BUTTONS_CLOSE,
-       title='Flowgraph Errors',
+       title='Flow Graph Errors',
        markup=Utils.parse_template(ERRORS_MARKUP_TMPL, errors=flowgraph.get_error_messages()),
 )