From b1c713be12741372decd60dfff209347b677a2a2 Mon Sep 17 00:00:00 2001
From: loathingKernel <142770+loathingKernel@users.noreply.github.com>
Date: Wed, 31 Aug 2022 16:57:50 +0300
Subject: [PATCH] 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
---
 rare/components/dialogs/install_dialog.py    | 12 +++++++-----
 rare/ui/components/dialogs/install_dialog.py |  1 -
 rare/ui/components/dialogs/install_dialog.ui |  3 ---
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/rare/components/dialogs/install_dialog.py b/rare/components/dialogs/install_dialog.py
index ff734b65..22bdf276 100644
--- a/rare/components/dialogs/install_dialog.py
+++ b/rare/components/dialogs/install_dialog.py
@@ -3,7 +3,7 @@ import platform as pf
 import sys
 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.QtWidgets import QDialog, QFileDialog, QCheckBox
 from legendary.models.downloading import ConditionCheckResult
@@ -83,7 +83,8 @@ class InstallDialog(QDialog, Ui_InstallDialog):
             self.install_dir_edit.setVisible(False)
             self.shortcut_lbl.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()
 
@@ -250,6 +251,7 @@ class InstallDialog(QDialog, Ui_InstallDialog):
         if option == "download_only":
             self.dl_item.options.no_install = self.download_only_check.isChecked()
         elif option == "shortcut":
+            QSettings().setValue("create_shortcut", self.shortcut_cb.isChecked())
             self.dl_item.options.create_shortcut = self.shortcut_cb.isChecked()
         elif option == "install_preqs":
             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.verify_button.setEnabled(self.options_changed)
         self.cancel_button.setEnabled(True)
-        if self.silent:
-            self.close()
         if pf.system() == "Windows" or ArgumentsSingleton().debug:
             if dl_item.igame.prereq_info and not dl_item.igame.prereq_info.get("installed", False):
                 self.install_preqs_check.setVisible(True)
@@ -294,6 +294,8 @@ class InstallDialog(QDialog, Ui_InstallDialog):
                 self.install_preqs_check.setText(
                     self.tr("Also install: {}").format(dl_item.igame.prereq_info.get("name", ""))
                 )
+        if self.silent:
+            self.close()
 
     def on_worker_failed(self, message: str):
         error_text = self.tr("Error")
@@ -303,7 +305,7 @@ class InstallDialog(QDialog, Ui_InstallDialog):
         self.verify_button.setEnabled(self.options_changed)
         self.cancel_button.setEnabled(True)
         if self.silent:
-            self.close()
+            self.show()
 
     def error_box(self, label: str = "", message: str = ""):
         self.warn_label.setVisible(bool(label))
diff --git a/rare/ui/components/dialogs/install_dialog.py b/rare/ui/components/dialogs/install_dialog.py
index 81059b8c..df52eea6 100644
--- a/rare/ui/components/dialogs/install_dialog.py
+++ b/rare/ui/components/dialogs/install_dialog.py
@@ -45,7 +45,6 @@ class Ui_InstallDialog(object):
         self.install_dialog_layout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.shortcut_lbl)
         self.shortcut_cb = QtWidgets.QCheckBox(InstallDialog)
         self.shortcut_cb.setText("")
-        self.shortcut_cb.setChecked(True)
         self.shortcut_cb.setObjectName("shortcut_cb")
         self.install_dialog_layout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.shortcut_cb)
         self.sdl_list_label = QtWidgets.QLabel(InstallDialog)
diff --git a/rare/ui/components/dialogs/install_dialog.ui b/rare/ui/components/dialogs/install_dialog.ui
index 37895437..0e3c9e53 100644
--- a/rare/ui/components/dialogs/install_dialog.ui
+++ b/rare/ui/components/dialogs/install_dialog.ui
@@ -66,9 +66,6 @@
      <property name="text">
       <string notr="true"/>
      </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
     </widget>
    </item>
    <item row="4" column="0">