diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2014-04-09 17:41:52 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2014-04-09 17:45:09 +0200 |
| commit | 14625c6ed115af2206e379bc92ad2adf96f6cff9 (patch) | |
| tree | e03b545996c076e9c267e070379e4a8cf2884637 /grc/gui | |
| parent | 0b69cb314c4e63dc82bd971551cb2cdbae12a302 (diff) | |
grc: nicer output of blocks paths and prefs file
Diffstat (limited to 'grc/gui')
| -rw-r--r-- | grc/gui/Messages.py | 11 | ||||
| -rw-r--r-- | grc/gui/Platform.py | 7 | ||||
| -rw-r--r-- | grc/gui/Preferences.py | 7 |
3 files changed, 18 insertions, 7 deletions
diff --git a/grc/gui/Messages.py b/grc/gui/Messages.py index c4706459af..2bf488bb58 100644 --- a/grc/gui/Messages.py +++ b/grc/gui/Messages.py @@ -48,7 +48,16 @@ register_messenger(sys.stdout.write) # Special functions for specific program functionalities ########################################################################### def send_init(platform): - send("""<<< Welcome to %s %s >>>\n"""%(platform.get_name(), platform.get_version())) + p = platform + send('\n'.join([ + "<<< Welcome to %s %s >>>" % (p.get_name(), p.get_version()), + "", + "Preferences file: " + p.get_prefs_file(), + "Block paths:" + ] + [ + "\t%s" % path + (" (%s)" % opath if opath != path else "") + for path, opath in p.get_block_paths().iteritems() + ]) + "\n") def send_page_switch(file_path): send('\nShowing: "%s"\n'%file_path) diff --git a/grc/gui/Platform.py b/grc/gui/Platform.py index 6a8175b9fa..db77ff2112 100644 --- a/grc/gui/Platform.py +++ b/grc/gui/Platform.py @@ -20,4 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA from Element import Element class Platform(Element): - def __init__(self): Element.__init__(self) + def __init__(self, prefs_file): + Element.__init__(self) + + self._prefs_file = prefs_file + + def get_prefs_file(self): return self._prefs_file
\ No newline at end of file diff --git a/grc/gui/Preferences.py b/grc/gui/Preferences.py index 061bda9c05..b15fb9738b 100644 --- a/grc/gui/Preferences.py +++ b/grc/gui/Preferences.py @@ -24,7 +24,6 @@ _platform = None _config_parser = ConfigParser.ConfigParser() def file_extension(): return '.'+_platform.get_key() -def _prefs_file(): return os.environ.get('GRC_PREFS_PATH', os.path.join(os.path.expanduser('~'), file_extension())) def load(platform): global _platform @@ -32,12 +31,10 @@ def load(platform): #create sections _config_parser.add_section('main') _config_parser.add_section('files_open') - print "Reading preferences from:", _prefs_file() - try: _config_parser.read(_prefs_file()) + try: _config_parser.read(_platform.get_prefs_file()) except: pass def save(): - print "Writing preferences to:", _prefs_file() - try: _config_parser.write(open(_prefs_file(), 'w')) + try: _config_parser.write(open(_platform.get_prefs_file(), 'w')) except: pass ########################################################################### |