InstallDialog: Show silent dialog in case of error
InstallDialog: Default shortcut creation to Unchecked in the UI file InstallDialog: Save and reuse last shortcut creation value
This commit is contained in:
parent
98489297f1
commit
b1c713be12
|
@ -3,7 +3,7 @@ import platform as pf
|
||||||
import sys
|
import sys
|
||||||
from typing import Tuple, List, Union, Optional
|
from typing import Tuple, List, Union, Optional
|
||||||
|
|
||||||
from PyQt5.QtCore import Qt, QObject, QRunnable, QThreadPool, pyqtSignal, pyqtSlot
|
from PyQt5.QtCore import Qt, QObject, QRunnable, QThreadPool, pyqtSignal, pyqtSlot, QSettings
|
||||||
from PyQt5.QtGui import QCloseEvent, QKeyEvent
|
from PyQt5.QtGui import QCloseEvent, QKeyEvent
|
||||||
from PyQt5.QtWidgets import QDialog, QFileDialog, QCheckBox
|
from PyQt5.QtWidgets import QDialog, QFileDialog, QCheckBox
|
||||||
from legendary.models.downloading import ConditionCheckResult
|
from legendary.models.downloading import ConditionCheckResult
|
||||||
|
@ -83,7 +83,8 @@ class InstallDialog(QDialog, Ui_InstallDialog):
|
||||||
self.install_dir_edit.setVisible(False)
|
self.install_dir_edit.setVisible(False)
|
||||||
self.shortcut_lbl.setVisible(False)
|
self.shortcut_lbl.setVisible(False)
|
||||||
self.shortcut_cb.setVisible(False)
|
self.shortcut_cb.setVisible(False)
|
||||||
self.shortcut_cb.setChecked(False)
|
else:
|
||||||
|
self.shortcut_cb.setChecked(QSettings().value("create_shortcut", True, bool))
|
||||||
|
|
||||||
self.error_box()
|
self.error_box()
|
||||||
|
|
||||||
|
@ -250,6 +251,7 @@ class InstallDialog(QDialog, Ui_InstallDialog):
|
||||||
if option == "download_only":
|
if option == "download_only":
|
||||||
self.dl_item.options.no_install = self.download_only_check.isChecked()
|
self.dl_item.options.no_install = self.download_only_check.isChecked()
|
||||||
elif option == "shortcut":
|
elif option == "shortcut":
|
||||||
|
QSettings().setValue("create_shortcut", self.shortcut_cb.isChecked())
|
||||||
self.dl_item.options.create_shortcut = self.shortcut_cb.isChecked()
|
self.dl_item.options.create_shortcut = self.shortcut_cb.isChecked()
|
||||||
elif option == "install_preqs":
|
elif option == "install_preqs":
|
||||||
self.dl_item.options.install_preqs = self.install_preqs_check.isChecked()
|
self.dl_item.options.install_preqs = self.install_preqs_check.isChecked()
|
||||||
|
@ -284,8 +286,6 @@ class InstallDialog(QDialog, Ui_InstallDialog):
|
||||||
self.install_size_info_label.setStyleSheet("font-style: normal; font-weight: bold")
|
self.install_size_info_label.setStyleSheet("font-style: normal; font-weight: bold")
|
||||||
self.verify_button.setEnabled(self.options_changed)
|
self.verify_button.setEnabled(self.options_changed)
|
||||||
self.cancel_button.setEnabled(True)
|
self.cancel_button.setEnabled(True)
|
||||||
if self.silent:
|
|
||||||
self.close()
|
|
||||||
if pf.system() == "Windows" or ArgumentsSingleton().debug:
|
if pf.system() == "Windows" or ArgumentsSingleton().debug:
|
||||||
if dl_item.igame.prereq_info and not dl_item.igame.prereq_info.get("installed", False):
|
if dl_item.igame.prereq_info and not dl_item.igame.prereq_info.get("installed", False):
|
||||||
self.install_preqs_check.setVisible(True)
|
self.install_preqs_check.setVisible(True)
|
||||||
|
@ -294,6 +294,8 @@ class InstallDialog(QDialog, Ui_InstallDialog):
|
||||||
self.install_preqs_check.setText(
|
self.install_preqs_check.setText(
|
||||||
self.tr("Also install: {}").format(dl_item.igame.prereq_info.get("name", ""))
|
self.tr("Also install: {}").format(dl_item.igame.prereq_info.get("name", ""))
|
||||||
)
|
)
|
||||||
|
if self.silent:
|
||||||
|
self.close()
|
||||||
|
|
||||||
def on_worker_failed(self, message: str):
|
def on_worker_failed(self, message: str):
|
||||||
error_text = self.tr("Error")
|
error_text = self.tr("Error")
|
||||||
|
@ -303,7 +305,7 @@ class InstallDialog(QDialog, Ui_InstallDialog):
|
||||||
self.verify_button.setEnabled(self.options_changed)
|
self.verify_button.setEnabled(self.options_changed)
|
||||||
self.cancel_button.setEnabled(True)
|
self.cancel_button.setEnabled(True)
|
||||||
if self.silent:
|
if self.silent:
|
||||||
self.close()
|
self.show()
|
||||||
|
|
||||||
def error_box(self, label: str = "", message: str = ""):
|
def error_box(self, label: str = "", message: str = ""):
|
||||||
self.warn_label.setVisible(bool(label))
|
self.warn_label.setVisible(bool(label))
|
||||||
|
|
|
@ -45,7 +45,6 @@ class Ui_InstallDialog(object):
|
||||||
self.install_dialog_layout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.shortcut_lbl)
|
self.install_dialog_layout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.shortcut_lbl)
|
||||||
self.shortcut_cb = QtWidgets.QCheckBox(InstallDialog)
|
self.shortcut_cb = QtWidgets.QCheckBox(InstallDialog)
|
||||||
self.shortcut_cb.setText("")
|
self.shortcut_cb.setText("")
|
||||||
self.shortcut_cb.setChecked(True)
|
|
||||||
self.shortcut_cb.setObjectName("shortcut_cb")
|
self.shortcut_cb.setObjectName("shortcut_cb")
|
||||||
self.install_dialog_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.shortcut_cb)
|
self.install_dialog_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.shortcut_cb)
|
||||||
self.sdl_list_label = QtWidgets.QLabel(InstallDialog)
|
self.sdl_list_label = QtWidgets.QLabel(InstallDialog)
|
||||||
|
|
|
@ -66,9 +66,6 @@
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true"/>
|
<string notr="true"/>
|
||||||
</property>
|
</property>
|
||||||
<property name="checked">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="0">
|
<item row="4" column="0">
|
||||||
|
|
Loading…
Reference in a new issue