CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-02 02:34:40 +12:00
Code Issues Projects Releases Wiki Activity

InstallDialog: Always show prerequisites if they exist

Browse source 
* Do not depend the relevant InstallOptionsModel option to on the running platform
This commit is contained in:
Stelios Tsampas 2023-12-07 18:53:34 +02:00 committed by loathingKernel
parent 1c9b6f3faf
commit 7824fa20a8
No known key found for this signature in database
GPG key ID: CE0C72D0B53821FD
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
rare/components/dialogs/install_dialog.py
View file

@ -302,7 +302,7 @@ class InstallDialog(QDialog):
platform = download.igame.platform
if pf.system() == "Windows":
return platform == "Windows" or platform == "Win32"
elif pf.system() == "Dariwn":
elif pf.system() == "Darwin":
return platform == "Mac"
else:
return False
@ -324,18 +324,18 @@ class InstallDialog(QDialog):
self.ui.install_size_text.setStyleSheet("font-style: normal; font-weight: bold")
self.ui.verify_button.setEnabled(self.options_changed)
self.ui.cancel_button.setEnabled(True)
# Offer to install prerequisites only on same platforms or debug mode
if self.same_platform(download) or ArgumentsSingleton().debug:
if download.igame.prereq_info and not download.igame.prereq_info.get("installed", False):
self.advanced.ui.install_prereqs_check.setEnabled(True)
self.advanced.ui.install_prereqs_label.setEnabled(True)
self.advanced.ui.install_prereqs_check.setChecked(True)
prereq_name = download.igame.prereq_info.get("name", "")
prereq_path = os.path.split(download.igame.prereq_info.get("path", ""))[-1]
prereq_desc = prereq_name if prereq_name else prereq_path
self.advanced.ui.install_prereqs_check.setText(
self.tr("Also install: {}").format(prereq_desc)
)
has_prereqs = bool(download.igame.prereq_info) and not download.igame.prereq_info.get("installed", False)
if has_prereqs:
prereq_name = download.igame.prereq_info.get("name", "")
prereq_path = os.path.split(download.igame.prereq_info.get("path", ""))[-1]
prereq_desc = prereq_name if prereq_name else prereq_path
self.advanced.ui.install_prereqs_check.setText(self.tr("Also install: {}").format(prereq_desc))
else:
self.advanced.ui.install_prereqs_check.setText("")
# Offer to install prerequisites only on same platforms
self.advanced.ui.install_prereqs_label.setEnabled(has_prereqs)
self.advanced.ui.install_prereqs_check.setEnabled(has_prereqs)
self.advanced.ui.install_prereqs_check.setChecked(has_prereqs and self.same_platform(download))
if self.options.silent:
self.close()

2
rare/models/install.py
View file

@ -33,7 +33,7 @@ class InstallOptionsModel:
overlay: bool = False
update: bool = False
silent: bool = False
install_prereqs: bool = pf.system() == "Windows"
install_prereqs: bool = False
def __post_init__(self):
self.sdl_prompt: Callable[[str, str], list] = \