weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix UI not updating properly after loading settings

Browse Source
This commit is contained in:
Raffson 2023-06-11 21:27:46 +02:00
parent 7e9380162c
commit d3e727f205
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qt_ui/windows/settings/QSettingsWindow.py
View File

@ -2,7 +2,6 @@ import json
import logging
import textwrap
import zipfile
from enum import Enum
from typing import Callable, Optional, Dict
from PySide2 import QtWidgets
@ -238,10 +237,10 @@ class AutoSettingsLayout(QGridLayout):
if isinstance(widget, QCheckBox):
widget.setChecked(value)
elif isinstance(widget, QComboBox):
if isinstance(value, Enum):
widget.setCurrentText(value.value)
elif isinstance(value, str):
widget.setCurrentText(value)
if (index := widget.findData(value)) > -1:
widget.setCurrentIndex(index)
elif (index := widget.findText(value)) > -1:
widget.setCurrentIndex(index)
else:
logging.error(
f"Incompatible type '{type(value)}' for ComboBox option {name}"
@ -333,6 +332,8 @@ class QSettingsWidget(QtWidgets.QWizardPage, SettingsContainer):
self.pluginsPage = PluginsPage(self)
self.pluginsOptionsPage = PluginOptionsPage(self)
self.updating_ui = False
self.initUi()
def initUi(self):
@ -442,6 +443,8 @@ class QSettingsWidget(QtWidgets.QWizardPage, SettingsContainer):
GameUpdateSignal.get_instance().updateGame(self.game)
def applySettings(self):
if self.updating_ui:
return
self.settings.show_red_ato = self.cheat_options.show_red_ato
self.settings.enable_frontline_cheats = self.cheat_options.show_frontline_cheat
self.settings.enable_base_capture_cheat = (
@ -460,6 +463,7 @@ class QSettingsWidget(QtWidgets.QWizardPage, SettingsContainer):
self.right_layout.setCurrentIndex(index)
def update_from_settings(self) -> None:
self.updating_ui = True
for p in self.pages.values():
p.update_from_settings()
@ -477,6 +481,8 @@ class QSettingsWidget(QtWidgets.QWizardPage, SettingsContainer):
self.pluginsPage.update_from_settings()
self.pluginsOptionsPage.update_from_settings()
self.updating_ui = False
def load_settings(self):
sd = settings_dir()
if not sd.exists():