diff options
| author | Håkon Vågsether <haakonsv@gmail.com> | 2019-07-26 00:19:44 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2019-07-28 17:38:54 +0200 |
| commit | e3a58c8a2c054427f41dc160f2e5d98e9f48b83f (patch) | |
| tree | e8edb9243a8d8a82aaadd70c8a51d82223e6eb23 | |
| parent | 20ba5b4d0246545ac403c6c752150fb492e8f53b (diff) | |
grc: Add sensible defaults to Options block
| -rw-r--r-- | grc/core/default_flow_graph.grc | 4 | ||||
| -rw-r--r-- | grc/core/params/dtypes.py | 2 | ||||
| -rw-r--r-- | grc/gui/Application.py | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/grc/core/default_flow_graph.grc b/grc/core/default_flow_graph.grc index d57ec75aea..02af6b83ec 100644 --- a/grc/core/default_flow_graph.grc +++ b/grc/core/default_flow_graph.grc @@ -5,8 +5,8 @@ options: parameters: - id: 'top_block' - title: 'top_block' + id: 'default' + title: 'Not titled yet' states: coordinate: - 8 diff --git a/grc/core/params/dtypes.py b/grc/core/params/dtypes.py index 7238b8f5c3..093ca67dc9 100644 --- a/grc/core/params/dtypes.py +++ b/grc/core/params/dtypes.py @@ -26,7 +26,7 @@ from .. import Constants # Blacklist certain ids, its not complete, but should help -ID_BLACKLIST = ['self', 'options', 'gr', 'math', 'firdes'] + dir(builtins) +ID_BLACKLIST = ['self', 'options', 'gr', 'math', 'firdes', 'default'] + dir(builtins) try: from gnuradio import gr ID_BLACKLIST.extend(attr for attr in dir(gr.top_block()) if not attr.startswith('_')) diff --git a/grc/gui/Application.py b/grc/gui/Application.py index fff663177b..5601cf9f30 100644 --- a/grc/gui/Application.py +++ b/grc/gui/Application.py @@ -25,6 +25,7 @@ import os import subprocess from gi.repository import Gtk, Gio, GLib, GObject +from getpass import getuser from . import Constants, Dialogs, Actions, Executor, FileDialogs, Utils, Bars @@ -596,6 +597,7 @@ class Application(Gtk.Application): args = (GLib.Variant('s', 'qt_gui'),) flow_graph = main.current_page.flow_graph flow_graph._options_block.params['generate_options'].set_value(str(args[0])[1:-1]) + flow_graph._options_block.params['author'].set_value(getuser()) flow_graph_update(flow_graph) elif action == Actions.FLOW_GRAPH_NEW_TYPE: main.new_page() @@ -637,7 +639,13 @@ class Application(Gtk.Application): page.saved = False elif action == Actions.FLOW_GRAPH_SAVE_AS: file_path = FileDialogs.SaveFlowGraph(main, page.file_path).run() + if file_path is not None: + if flow_graph._options_block.params['id'].get_value() == 'default': + file_name = os.path.basename(file_path).replace(".grc", "") + flow_graph._options_block.params['id'].set_value(file_name) + flow_graph_update(flow_graph) + page.file_path = os.path.abspath(file_path) try: self.platform.save_flow_graph(page.file_path, flow_graph) |