diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-08-09 21:15:56 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-08-09 21:18:29 +0200 |
| commit | 8e2886dc6b45b4e3f68d84887f728483fd2d1538 (patch) | |
| tree | e682bbea9e329c80ebc66233d58a01a1306bddbd /grc/core/Config.py | |
| parent | cbe1e43b0f0d1ee0d356b7110700400578855ac6 (diff) | |
| parent | fc1a6a88483120921936e415aba4d5d1a9b42d96 (diff) | |
Merge remote-tracking branch 'upstream/next' into gtk3
Diffstat (limited to 'grc/core/Config.py')
| -rw-r--r-- | grc/core/Config.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/grc/core/Config.py b/grc/core/Config.py index 400d5d365f..b65a421b7a 100644 --- a/grc/core/Config.py +++ b/grc/core/Config.py @@ -21,6 +21,8 @@ from __future__ import absolute_import import os from os.path import expanduser, normpath, expandvars, exists +from . import Constants + class Config(object): @@ -29,7 +31,7 @@ class Config(object): license = __doc__.strip() website = 'http://gnuradio.org' - hier_block_lib_dir = os.environ.get('GRC_HIER_PATH', expanduser('~/.grc_gnuradio')) + hier_block_lib_dir = os.environ.get('GRC_HIER_PATH', Constants.DEFAULT_HIER_BLOCK_LIB_DIR) def __init__(self, prefs_file, version, version_parts=None): self.prefs = prefs_file @@ -54,3 +56,12 @@ class Config(object): for path in collected_paths if exists(path)] return valid_paths + + @property + def default_flow_graph(self): + user_default = ( + os.environ.get('GRC_DEFAULT_FLOW_GRAPH') or + self.prefs.get_string('grc', 'default_flow_graph', '') or + os.path.join(self.hier_block_lib_dir, 'default_flow_graph.grc') + ) + return user_default if exists(user_default) else Constants.DEFAULT_FLOW_GRAPH |