[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 05/07: grc: renaming flowgraph errors menu
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 05/07: grc: renaming flowgraph errors menu item and xml parser action |
Date: |
Mon, 27 Jan 2014 20:10:38 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch master
in repository gnuradio.
commit 1c3b5187a61d8bf989d00791997a93a041d18d5b
Author: Sebastian Koslowski <address@hidden>
Date: Sat Jan 4 16:43:40 2014 +0100
grc: renaming flowgraph errors menu item and xml parser action
---
grc/gui/ActionHandler.py | 10 +++++-----
grc/gui/Actions.py | 4 ++--
grc/gui/Bars.py | 2 +-
grc/gui/CMakeLists.txt | 2 +-
grc/gui/{ParseDialog.py => ParserErrorsDialog.py} | 10 +++++-----
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py
index 14a781a..86f06aa 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 1776acb..284c78f 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 4c98f65..f016209 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 49aec8d..08aaf3e 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
similarity index 95%
rename from grc/gui/ParseDialog.py
rename to grc/gui/ParserErrorsDialog.py
index 119ad2c..68ee459 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
"""
- [Commit-gnuradio] [gnuradio] branch master updated (3fa56a4 -> 8211786), git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 06/07: Merge remote-tracking branch 'gnuradio-wg-grc/grc_xml_error_dialog', git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 05/07: grc: renaming flowgraph errors menu item and xml parser action,
git <=
- [Commit-gnuradio] [gnuradio] 07/07: Merge branch 'maint', git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 04/07: grc: show xml parser error warning in report window, git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 02/07: grc: xml parser errors dialog fixes and refactoring, git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 01/07: grc: adding a page that captures and stores some XML parsing errors, git, 2014/01/27
- [Commit-gnuradio] [gnuradio] 03/07: grc: detect block (category) tree files by name (not by trail and error), git, 2014/01/27