diff options
-rw-r--r-- | grc/gui/ActionHandler.py | 10 | ||||
-rw-r--r-- | grc/gui/Actions.py | 4 | ||||
-rw-r--r-- | grc/gui/Bars.py | 2 | ||||
-rw-r--r-- | grc/gui/CMakeLists.txt | 2 | ||||
-rw-r--r-- | grc/gui/ParserErrorsDialog.py (renamed from grc/gui/ParseDialog.py) | 10 |
5 files changed, 14 insertions, 14 deletions
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py index 14a781a09b..86f06aad58 100644 --- a/grc/gui/ActionHandler.py +++ b/grc/gui/ActionHandler.py @@ -31,7 +31,7 @@ import Messages from .. base import ParseXML from MainWindow import MainWindow from PropsDialog import PropsDialog -from ParseDialog import ParseDialog +from ParserErrorsDialog import ParserErrorsDialog import Dialogs from FileDialogs import OpenFlowGraphFileDialog, SaveFlowGraphFileDialog, SaveImageFileDialog @@ -119,7 +119,7 @@ class ActionHandler: ): action.set_sensitive(True) if ParseXML.xml_failures: Messages.send_xml_errors_if_any(ParseXML.xml_failures) - Actions.PARSER_ERRORS.set_sensitive(True) + Actions.XML_PARSER_ERRORS_DISPLAY.set_sensitive(True) if not self.init_file_paths: self.init_file_paths = Preferences.files_open() @@ -384,8 +384,8 @@ class ActionHandler: ################################################## # View Parser Errors ################################################## - elif action == Actions.PARSER_ERRORS: - ParseDialog(ParseXML.xml_failures).run() + elif action == Actions.XML_PARSER_ERRORS_DISPLAY: + ParserErrorsDialog(ParseXML.xml_failures).run() ################################################## # Undo/Redo ################################################## @@ -467,7 +467,7 @@ class ActionHandler: self.platform.load_blocks() self.main_window.btwin.clear() self.platform.load_block_tree(self.main_window.btwin) - Actions.PARSER_ERRORS.set_sensitive(bool(ParseXML.xml_failures)) + Actions.XML_PARSER_ERRORS_DISPLAY.set_sensitive(bool(ParseXML.xml_failures)) Messages.send_xml_errors_if_any(ParseXML.xml_failures) elif action == Actions.FIND_BLOCKS: self.main_window.btwin.show() diff --git a/grc/gui/Actions.py b/grc/gui/Actions.py index 1776acb6ac..284c78f8fc 100644 --- a/grc/gui/Actions.py +++ b/grc/gui/Actions.py @@ -261,7 +261,7 @@ BLOCK_PASTE = Action( keypresses=(gtk.keysyms.v, gtk.gdk.CONTROL_MASK), ) ERRORS_WINDOW_DISPLAY = Action( - label='_Errors', + label='Flowgraph _Errors', tooltip='View flow graph errors', stock_id=gtk.STOCK_DIALOG_ERROR, ) @@ -354,7 +354,7 @@ BUSSIFY_SINKS = Action( tooltip='Gang sink ports into a single bus port', stock_id=gtk.STOCK_JUMP_TO, ) -PARSER_ERRORS = Action( +XML_PARSER_ERRORS_DISPLAY = Action( label='_Parser Errors', tooltip='View errors that occured while parsing XML files', stock_id=gtk.STOCK_DIALOG_ERROR, diff --git a/grc/gui/Bars.py b/grc/gui/Bars.py index 4c98f65416..f016209383 100644 --- a/grc/gui/Bars.py +++ b/grc/gui/Bars.py @@ -103,7 +103,7 @@ MENU_BAR_LIST = ( (gtk.Action('Help', '_Help', None, None), [ Actions.HELP_WINDOW_DISPLAY, Actions.TYPES_WINDOW_DISPLAY, - Actions.PARSER_ERRORS, + Actions.XML_PARSER_ERRORS_DISPLAY, None, Actions.ABOUT_WINDOW_DISPLAY, ]), diff --git a/grc/gui/CMakeLists.txt b/grc/gui/CMakeLists.txt index 49aec8d557..08aaf3e4df 100644 --- a/grc/gui/CMakeLists.txt +++ b/grc/gui/CMakeLists.txt @@ -39,7 +39,7 @@ GR_PYTHON_INSTALL(FILES MainWindow.py Messages.py NotebookPage.py - ParseDialog.py + ParserErrorsDialog.py PropsDialog.py Preferences.py StateCache.py diff --git a/grc/gui/ParseDialog.py b/grc/gui/ParserErrorsDialog.py index 119ad2c69b..68ee459414 100644 --- a/grc/gui/ParseDialog.py +++ b/grc/gui/ParserErrorsDialog.py @@ -24,7 +24,7 @@ import gtk from Constants import MIN_DIALOG_WIDTH, MIN_DIALOG_HEIGHT -class ParseDialog(gtk.Dialog): +class ParserErrorsDialog(gtk.Dialog): """ A dialog for viewing parser errors """ @@ -32,7 +32,7 @@ class ParseDialog(gtk.Dialog): def __init__(self, error_logs): """ Properties dialog constructor. - + Args: block: a block instance """ @@ -49,8 +49,8 @@ class ParseDialog(gtk.Dialog): column.set_sort_column_id(0) self.tree_view = tree_view = gtk.TreeView(self.tree_store) - tree_view.set_enable_search(False) #disable pop up search box - tree_view.set_search_column(-1) # really disable search + tree_view.set_enable_search(False) # disable pop up search box + tree_view.set_search_column(-1) # really disable search tree_view.set_reorderable(False) tree_view.set_headers_visible(False) tree_view.get_selection().set_mode(gtk.SELECTION_NONE) @@ -91,7 +91,7 @@ class ParseDialog(gtk.Dialog): def run(self): """ Run the dialog and get its response. - + Returns: true if the response was accept """ |