From 183f9e77c006caa5d09c6b5dd4a74b83d2b8ac42 Mon Sep 17 00:00:00 2001 From: Marcel Date: Fri, 15 Sep 2017 14:47:05 +0200 Subject: [PATCH] [fixes #249] stylesheet path relative to style_settings --- QtPyLoT.py | 3 ++- pylot/styles/style_settings.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/QtPyLoT.py b/QtPyLoT.py index fe27df7f..c1d4dddd 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -679,11 +679,12 @@ class MainWindow(QMainWindow): self._styles[style] = stylecolors[style] self._phasecolors = style_settings.phasecolors + styles_dir = os.path.dirname(style_settings.__file__) for style, stylecolors in self._styles.items(): stylesheet = stylecolors['stylesheet']['filename'] if stylesheet: - stylesheet_file = open(stylesheet, 'r') + stylesheet_file = open(os.path.join(styles_dir, stylesheet), 'r') stylesheet = stylesheet_file.read() stylesheet_file.close() else: diff --git a/pylot/styles/style_settings.py b/pylot/styles/style_settings.py index 35c23399..c84a8334 100644 --- a/pylot/styles/style_settings.py +++ b/pylot/styles/style_settings.py @@ -50,7 +50,7 @@ stylecolors = { 'test': { 'rgba': (130, 190, 100, 255)}, 'stylesheet': { - 'filename': 'pylot/styles/dark.qss'} + 'filename': 'dark.qss'} }, 'bright': { 'linecolor': { @@ -64,7 +64,7 @@ stylecolors = { 'test': { 'rgba': (200, 230, 200, 255)}, 'stylesheet': { - 'filename': 'pylot/styles/bright.qss'} + 'filename': 'bright.qss'} } }