CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-03 03:04:42 +12:00
Code Issues Projects Releases Wiki Activity

Fix proton prefix settings, saving always

Browse source
This commit is contained in:
Dummerle 2022-03-20 22:49:00 +01:00
parent 81da5faec9
commit 89e1336940
No known key found for this signature in database
GPG key ID: AB68CC59CA39F2F1
3 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rare/components/tabs/settings/__init__.py
View file

@ -5,7 +5,7 @@ from .about import About
from .legendary import LegendarySettings
from rare.components.tabs.settings.widgets.linux import LinuxSettings
from .rare import RareSettings
from .game_settings import DefaultGameSettings
from .default_game_settings import DefaultGameSettings
class SettingsTab(SideTabWidget):

0
rare/components/tabs/settings/game_settings.py → rare/components/tabs/settings/default_game_settings.py
View file

71
rare/components/tabs/settings/widgets/proton.py
View file

@ -41,7 +41,7 @@ def find_proton_combos():
class ProtonSettings(QGroupBox, Ui_ProtonSettings):
app_name: str
not_loading = True
changeable = True
def __init__(self, linux_settings: LinuxSettings, wrapper_settings: WrapperSettings):
super(ProtonSettings, self).__init__()
@ -64,7 +64,7 @@ class ProtonSettings(QGroupBox, Ui_ProtonSettings):
self.placeholder_prefix_edit.deleteLater()
def load_settings(self, app_name: str, proton: str):
self.not_loading = False
self.changeable = False
self.app_name = app_name
proton = proton.replace('"', "")
@ -83,45 +83,46 @@ class ProtonSettings(QGroupBox, Ui_ProtonSettings):
fallback=str(Path.home().joinpath(".proton")),
)
self.proton_prefix.setText(proton_prefix)
self.not_loading = True
self.changeable = True
def change_proton(self, i):
if self.not_loading:
# First combo box entry: Don't use Proton
if i == 0:
self._wrapper_settings.delete_wrapper("proton")
config_helper.remove_option(self.app_name, "no_wine")
config_helper.remove_option(f"{self.app_name}.env", "STEAM_COMPAT_DATA_PATH")
config_helper.remove_option(f"{self.app_name}.env", "STEAM_COMPAT_CLIENT_INSTALL_PATH")
if not self.changeable:
return
# First combo box entry: Don't use Proton
if i == 0:
self._wrapper_settings.delete_wrapper("proton")
config_helper.remove_option(self.app_name, "no_wine")
config_helper.remove_option(f"{self.app_name}.env", "STEAM_COMPAT_DATA_PATH")
config_helper.remove_option(f"{self.app_name}.env", "STEAM_COMPAT_CLIENT_INSTALL_PATH")
self.proton_prefix.setEnabled(False)
# lk: TODO: This has to be fixed properly.
# lk: It happens because of the widget update. Mask it for now behind disabling the save button
self.proton_prefix.setEnabled(False)
# lk: TODO: This has to be fixed properly.
# lk: It happens because of the widget update. Mask it for now behind disabling the save button
self._linux_settings.wine_groupbox.setEnabled(True)
else:
self.proton_prefix.setEnabled(True)
self._linux_settings.wine_groupbox.setEnabled(False)
wrapper = self.possible_proton_combos[i - 1]
self._linux_settings.wine_groupbox.setEnabled(True)
else:
self.proton_prefix.setEnabled(True)
self._linux_settings.wine_groupbox.setEnabled(False)
wrapper = self.possible_proton_combos[i - 1]
self._wrapper_settings.add_wrapper(wrapper)
config_helper.add_option(self.app_name, "no_wine", "true")
config_helper.add_option(
f"{self.app_name}.env",
"STEAM_COMPAT_DATA_PATH",
os.path.expanduser("~/.proton"),
)
config_helper.add_option(
f"{self.app_name}.env",
"STEAM_COMPAT_CLIENT_INSTALL_PATH",
str(Path.home().joinpath(".steam", "steam"))
)
self._wrapper_settings.add_wrapper(wrapper)
config_helper.add_option(self.app_name, "no_wine", "true")
config_helper.add_option(
f"{self.app_name}.env",
"STEAM_COMPAT_DATA_PATH",
os.path.expanduser("~/.proton"),
)
config_helper.add_option(
f"{self.app_name}.env",
"STEAM_COMPAT_CLIENT_INSTALL_PATH",
str(Path.home().joinpath(".steam", "steam"))
)
self.proton_prefix.setText(os.path.expanduser("~/.proton"))
self.proton_prefix.setText(os.path.expanduser("~/.proton"))
# Don't use Wine
self._linux_settings.wine_exec.setText("")
self._linux_settings.wine_prefix.setText("")
# Don't use Wine
self._linux_settings.wine_exec.setText("")
self._linux_settings.wine_prefix.setText("")
config_helper.save_config()
@ -133,6 +134,8 @@ class ProtonSettings(QGroupBox, Ui_ProtonSettings):
return os.path.exists(parent_dir), text, PathEdit.reasons.dir_not_exist
def proton_prefix_save(self, text: str):
if not self.changeable:
return
config_helper.add_option(
f"{self.app_name}.env", "STEAM_COMPAT_DATA_PATH", text
)