diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-02-11 22:45:55 +0100 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-02-17 19:55:17 +0100 |
| commit | 7453e24321e6ca237ded87a6bbed8d645d2a6b53 (patch) | |
| tree | e62d0989c9e7082768dfece98372845658dbef9f /grc/gui | |
| parent | d905f0d803574acd158183135e113b807bd7c878 (diff) | |
grc-refactor: Platform.py
Diffstat (limited to 'grc/gui')
| -rw-r--r-- | grc/gui/ActionHandler.py | 3 | ||||
| -rw-r--r-- | grc/gui/BlockTreeWindow.py | 6 | ||||
| -rw-r--r-- | grc/gui/Connection.py | 2 | ||||
| -rw-r--r-- | grc/gui/Dialogs.py | 12 | ||||
| -rw-r--r-- | grc/gui/MainWindow.py | 6 | ||||
| -rw-r--r-- | grc/gui/NotebookPage.py | 6 | ||||
| -rw-r--r-- | grc/gui/Platform.py | 3 |
7 files changed, 20 insertions, 18 deletions
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py index ab7839b20e..41eb6f12b6 100644 --- a/grc/gui/ActionHandler.py +++ b/grc/gui/ActionHandler.py @@ -372,7 +372,8 @@ class ActionHandler: # Window stuff ################################################## elif action == Actions.ABOUT_WINDOW_DISPLAY: - Dialogs.AboutDialog(self.get_flow_graph().get_parent()) + platform = self.get_flow_graph().get_parent() + Dialogs.AboutDialog(platform.config) elif action == Actions.HELP_WINDOW_DISPLAY: Dialogs.HelpDialog() elif action == Actions.TYPES_WINDOW_DISPLAY: diff --git a/grc/gui/BlockTreeWindow.py b/grc/gui/BlockTreeWindow.py index 8a29120102..4279e8c61d 100644 --- a/grc/gui/BlockTreeWindow.py +++ b/grc/gui/BlockTreeWindow.py @@ -175,7 +175,7 @@ class BlockTreeWindow(gtk.VBox): if model.iter_has_child(iter_): return # category node, no doc string key = model.get_value(iter_, KEY_INDEX) - block = self.platform.get_block(key) + block = self.platform.blocks[key] doc = Utils.parse_template(DOC_MARKUP_TMPL, doc=block.get_doc()) model.set_value(iter_, DOC_INDEX, doc) @@ -228,8 +228,8 @@ class BlockTreeWindow(gtk.VBox): self.treeview.set_model(self.treestore) self.treeview.collapse_all() else: - blocks = self.get_flow_graph().get_parent().get_blocks() - matching_blocks = filter(lambda b: key in b.get_key().lower() or key in b.get_name().lower(), blocks) + matching_blocks = filter(lambda b: key in b.get_key().lower() or key in b.get_name().lower(), + self.platform.blocks.values()) self.treestore_search.clear() self._categories_search = {tuple(): None} diff --git a/grc/gui/Connection.py b/grc/gui/Connection.py index 733c6b7218..50361c19d0 100644 --- a/grc/gui/Connection.py +++ b/grc/gui/Connection.py @@ -92,7 +92,7 @@ class Connection(Element, _Connection): if not source_domain == sink_domain == GR_MESSAGE_DOMAIN \ else gtk.gdk.LINE_ON_OFF_DASH get_domain_color = lambda d: Colors.get_color(( - self.get_parent().get_parent().get_domain(d) or {} + self.get_parent().get_parent().domains.get(d, {}) ).get('color') or Colors.DEFAULT_DOMAIN_COLOR_CODE) self._color = get_domain_color(source_domain) self._bg_color = get_domain_color(sink_domain) diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py index 7d55e1b2e7..c5b4d8b2a7 100644 --- a/grc/gui/Dialogs.py +++ b/grc/gui/Dialogs.py @@ -175,14 +175,14 @@ def ErrorsDialog(flowgraph): MessageDialogHelper( class AboutDialog(gtk.AboutDialog): """A cute little about dialog.""" - def __init__(self, platform): + def __init__(self, config): """AboutDialog constructor.""" gtk.AboutDialog.__init__(self) - self.set_name(platform.get_name()) - self.set_version(platform.get_version()) - self.set_license(platform.get_license()) - self.set_copyright(platform.get_license().splitlines()[0]) - self.set_website(platform.get_website()) + self.set_name(config.name) + self.set_version(config.version) + self.set_license(config.license) + self.set_copyright(config.license.splitlines()[0]) + self.set_website(config.website) self.run() self.destroy() diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py index 18118dbd79..6da240d85b 100644 --- a/grc/gui/MainWindow.py +++ b/grc/gui/MainWindow.py @@ -69,11 +69,13 @@ class MainWindow(gtk.Window): Setup the menu, toolbar, flowgraph editor notebook, block selection window... """ self._platform = platform - gen_opts = platform.get_block('options').get_param('generate_options') + + gen_opts = platform.blocks['options'].get_param('generate_options') generate_mode_default = gen_opts.get_value() generate_modes = [ (o.get_key(), o.get_name(), o.get_key() == generate_mode_default) for o in gen_opts.get_options()] + # load preferences Preferences.load(platform) #setup window @@ -281,7 +283,7 @@ class MainWindow(gtk.Window): new_flowgraph_title=NEW_FLOGRAPH_TITLE, read_only=self.get_page().get_read_only(), saved=self.get_page().get_saved(), - platform_name=self._platform.get_name(), + platform_name=self._platform.config.name, ) ) #set tab titles diff --git a/grc/gui/NotebookPage.py b/grc/gui/NotebookPage.py index 481aca4eea..2c1fd7c3b3 100644 --- a/grc/gui/NotebookPage.py +++ b/grc/gui/NotebookPage.py @@ -95,10 +95,8 @@ class NotebookPage(gtk.HBox): Returns: generator """ - return self.get_flow_graph().get_parent().get_generator()( - self.get_flow_graph(), - self.get_file_path(), - ) + platform = self.get_flow_graph().get_parent() + return platform.Generator(self.get_flow_graph(), self.get_file_path()) def _handle_button(self, button): """ diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py index 793065b025..85a6872027 100644 --- a/grc/gui/Platform.py +++ b/grc/gui/Platform.py @@ -40,7 +40,8 @@ class Platform(Element, _Platform): self._move_old_pref_file() self._prefs_file = PREFS_FILE - def get_prefs_file(self): return self._prefs_file + def get_prefs_file(self): + return self._prefs_file @staticmethod def _move_old_pref_file(): |