From 0e7d49488c987e92a15c4fac9b150667ed545726 Mon Sep 17 00:00:00 2001 From: Khopa Date: Fri, 12 Jul 2019 19:35:30 +0200 Subject: [PATCH] Put CSS in resources folder, so that it is properly embedded in the release. Updated requirement and release build for new UI. --- pyinstaller.spec | 2 +- qt_ui/main.py | 2 +- requirements.txt | 4 ++-- {qt_ui => resources}/stylesheets/style.css | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename {qt_ui => resources}/stylesheets/style.css (100%) diff --git a/pyinstaller.spec b/pyinstaller.spec index ea2535c5..839c641f 100644 --- a/pyinstaller.spec +++ b/pyinstaller.spec @@ -4,7 +4,7 @@ block_cipher = None analysis = Analysis( - ['__init__.py'], + ['./qt_ui/main.py'], pathex=['.'], binaries=[], datas=[ diff --git a/qt_ui/main.py b/qt_ui/main.py index 7e40b167..831f3048 100644 --- a/qt_ui/main.py +++ b/qt_ui/main.py @@ -37,7 +37,7 @@ if __name__ == "__main__": persistency.setup(sys.argv[1]) css = "" - with open("./qt_ui/stylesheets/style.css") as stylesheet: + with open("./resources/stylesheets/style.css") as stylesheet: css = stylesheet.read() app.processEvents() diff --git a/requirements.txt b/requirements.txt index 1f940bfc..fa3362a0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ -pygame pydcs>=0.9.3 -pyinstaller \ No newline at end of file +Pyside2>=5.13.0 +pyinstaller==3.5 diff --git a/qt_ui/stylesheets/style.css b/resources/stylesheets/style.css similarity index 100% rename from qt_ui/stylesheets/style.css rename to resources/stylesheets/style.css