diff --git a/OSCRUI/app.py b/OSCRUI/app.py index 084f06b..db7394f 100644 --- a/OSCRUI/app.py +++ b/OSCRUI/app.py @@ -158,8 +158,14 @@ def init_settings(self): """ Prepares settings. Loads stored settings. Saves current settings for next startup. """ - settings_path = os.path.abspath(self.app_dir + self.config["settings_path"]) - self.settings = QSettings(settings_path, QSettings.Format.IniFormat) + + # For Windows, Keep the Local settings for now as people are more familiar with that. + if os.name == "nt": + settings_path = os.path.abspath(self.app_dir + self.config["settings_path"]) + self.settings = QSettings(settings_path, QSettings.Format.IniFormat) + else: + self.settings = QSettings("OSCR", "OSCR-UI") + for setting, value in self.config['default_settings'].items(): if self.settings.value(setting, None) is None: self.settings.setValue(setting, value) diff --git a/com.stobuilds.oscr.yaml b/com.stobuilds.oscr.yaml index a88a6e0..a163f57 100644 --- a/com.stobuilds.oscr.yaml +++ b/com.stobuilds.oscr.yaml @@ -1,8 +1,14 @@ id: com.stobuilds.oscr -runtime: org.freedesktop.Platform -runtime-version: "23.08" -sdk: org.freedesktop.Sdk +runtime: org.kde.Platform +runtime-version: "6.7" +sdk: org.kde.Sdk command: oscr +finish-args: + - --share=ipc + - --share=network + - --socket=fallback-x11 + - --socket=wayland + - --device=dri modules: - name: python3 buildsystem: simple @@ -10,8 +16,8 @@ modules: - python3 -m pip install --prefix=/app src/deps/oscr-ui sources: - type: git - url: https://github.com/STOCD/OSCR-UI.git - commit: bdde9e46f953004c131d7faae50b57dd91e5d28a + url: https://github.com/Kraust/OSCR-UI.git + commit: 96ec4c80ae6dbba65c720398ee8b5516d4cc5e5d dest: "src/deps/oscr-ui" build-options: build-args: diff --git a/main.py b/main.py index 98f93fb..4e2d39e 100644 --- a/main.py +++ b/main.py @@ -7,7 +7,7 @@ class Launcher(): version = '2024.08b210' - __version__ = '0.2' + __version__ = '0.4' # holds the style of the app theme = { @@ -758,7 +758,7 @@ def app_config() -> dict: 'heal_columns|12': True, 'heal_columns_length': 13, 'split_log_after': 480000, - 'seconds_between_combats': 100, + 'seconds_between_combats': 45, 'excluded_event_ids': ['Autodesc.Combatevent.Falling', ''], 'graph_resolution': 0.2, 'combats_to_parse': 10,