diff --git a/.gitignore b/.gitignore index 429b3e6..674e3dd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ /.idea/ /tests/ env.py -/client/dist/ \ No newline at end of file +/client/dist/ +settings.json \ No newline at end of file diff --git a/admin/data/settings.json b/admin/data/settings.json deleted file mode 100644 index 6e4f6b6..0000000 --- a/admin/data/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "animation": "InOutQuart" -} \ No newline at end of file diff --git a/admin/data/settings.py b/admin/data/settings.py index 71d62ab..b3117c4 100644 --- a/admin/data/settings.py +++ b/admin/data/settings.py @@ -2,6 +2,20 @@ import json class Settings: + @staticmethod + def get_settings(): + try: + with open("data/settings.json", "r") as file: + settings = json.load(file) + except FileNotFoundError: + settings = { + "animation": "InOutQuart" + } + with open("data/settings.json", "w") as file: + json.dump(settings, file) + + return settings + @staticmethod def animation(): from PyQt5.QtCore import QEasingCurve diff --git a/admin/daunRat_admin.py b/admin/daunRat_admin.py index 9458338..9fb0e3d 100644 --- a/admin/daunRat_admin.py +++ b/admin/daunRat_admin.py @@ -8,10 +8,15 @@ try: except ImportError: from gui.gui import Ui_MainWindow +settings = Settings.get_settings() + app = QtWidgets.QApplication(sys.argv) MainWindow = QtWidgets.QMainWindow() ui = Ui_MainWindow() ui.setupUi(MainWindow) + +ui.chooseAnimationBox.setCurrentText(settings["animation"]) + MainWindow.show()