Dialog improvements

Author: Protonosgit

components/popups.py

@@ -22,13 +22,16 @@ def infoDialog(text):
     info_dialog.exec()
 
 
-def confirmDialog(title, text):
-    confirm_dialog = QMessageBox()
-    confirm_dialog.setIcon(QMessageBox.Icon.Question)
-    confirm_dialog.setWindowTitle(title)
-    confirm_dialog.setText(text)
-    confirm_dialog.setStandardButtons(QMessageBox.StandardButton.Ok)
-    confirm_dialog.exec()
+def warnDialog(text):
+    info_dialog = QMessageBox()
+    info_dialog.setIcon(QMessageBox.Icon.Warning)
+    info_dialog.setWindowTitle('Warning')
+    info_dialog.setText(text)
+    info_dialog.exec()
+
+
+def confirmationModal(title, message):
+    return QMessageBox.question(None, title, QMessageBox.Icon.Information, message, QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
 
 
 def windowsToast(title, message):

components/shellbridge.py

@@ -50,7 +50,7 @@ def run(self):
         print("Update started")
         try:
             self.progress_signal.emit("Auto Updating...")
-            subprocess.run('spicetify upgrade -q', shell=True)
+            subprocess.run('spicetify upgrade -q -n', shell=True)
             self.progress_signal.emit("done")
         except Exception as e:
             self.progress_signal.emit("fail")

components/tools.py

@@ -8,7 +8,6 @@
 
 
 def initConfig():
-    print('!! Temporary Action3 called !!')
     try:
         file_path = os.path.join(os.path.join(os.path.expanduser(
             '~'), 'AppData', 'Local'), 'spicetify', 'Manager.ini')
@@ -21,7 +20,7 @@ def initConfig():
 autoclose = False
     '''
     except:
-        print("Error while creating config file")
+        print("Error while checking config file")
     try:
         with open(file_path, 'w') as f:
             f.write(config_dict)
@@ -31,9 +30,7 @@ def initConfig():
 
 # Reads config files
 def readConfig(section, key):
-    print('!! Temporary Action1 called !!')
     try:
-        print(key)
         file_path = os.path.join(os.path.join(os.path.expanduser(
             '~'), 'AppData', 'Local'), 'spicetify', 'Manager.ini')
         config = configparser.ConfigParser()
@@ -50,7 +47,6 @@ def readConfig(section, key):
 
 
 def writeConfig(section, key, value):
-    print('!! Temporary Action2 called !!')
     try:
         file_path = os.path.join(os.path.join(os.path.expanduser(
             '~'), 'AppData', 'Local'), 'spicetify', 'Manager.ini')
@@ -131,6 +127,7 @@ def isAddedToStartup():
     except FileNotFoundError:
         return False
     except Exception as e:
+        print("Error while checking if added to startup")
         print(e)
         return False
 

manager_window.py

@@ -8,7 +8,7 @@
 from PyQt6.QtCore import Qt, QUrl
 from PyQt6.uic import loadUi
 from PyQt6.QtGui import QDesktopServices, QMovie
-from components.popups import errorDialog, infoDialog, windowsToast, winUpdateToast
+from components.popups import errorDialog, infoDialog, windowsToast, confirmationModal
 from components.shellbridge import InstallSpicetify, watchwitchInjector, UpdateSpicetify, ApplySpicetify, UninstallSpicetify, CustomCommand, checkApplied, blockSpotifyUpdate, checkUpdateSupression
 from components.tools import getLatestSpicetifyRelease, readConfig, writeConfig, addToStartup
 from components.dialog_windows import AfterInstall
@@ -64,9 +64,10 @@ def InitWindow(self):
 
         self.background_graphics.setMovie(movie)
         self.background_graphics.show()
-        self.background_graphics.setStyleSheet("opacity: 0.2;")
         movie.start()
-        infoDialog('Lorem Ipsum')
+        reply = confirmationModal('hi', 'User')
+        if reply == QMessageBox.StandardButton.Yes:
+            print('confirm')
 
     # Ask user to keep manager in background
 
@@ -191,8 +192,8 @@ def updateProgress(self, action):
 
     # Launch uninstaller task
     def startRemoval(self):
-        reply = QMessageBox.question(None, 'Uninstall', 'Are you sure you want to uninstall Spicetify and remove all installed mods/themes ?',
-                                     QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
+        reply = confirmationModal(
+            'Uninstall', 'Are you sure you want to uninstall Spicetify and remove all installed mods/themes ?')
         if reply == QMessageBox.StandardButton.Yes:
             self.setCursor(Qt.CursorShape.WaitCursor)
             self.bt_uninstall.setEnabled(False)
@@ -218,8 +219,8 @@ def DisableUpdate(self):
         writeConfig('Manager', 'NoUpdate', str(
             self.check_noupdate.isChecked()))
         if self.check_noupdate.isChecked():
-            reply = QMessageBox.question(None, 'Deactivate Updates', 'This function will try to disable all automatic updates for Spotify! Are you sure you want to do this?',
-                                         QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
+            reply = confirmationModal(
+                'Disable Updates', 'Are you sure you want to disable all automatic updates for Spotify?')
             if reply == QMessageBox.StandardButton.Yes:
                 if (blockSpotifyUpdate(self.check_noupdate.isChecked())):
                     pass
@@ -240,7 +241,6 @@ def DisableUpdate(self):
 
     # Apply Watchwitch server
     def PatchWatchWitch(self):
-        print(self.check_watchwitch.isChecked())
         folder_path = os.path.join(os.path.join(os.path.expanduser(
             '~'), 'AppData', 'Local'), 'spicetify', 'Manager.exe')
         if os.path.exists(folder_path):
@@ -252,8 +252,8 @@ def PatchWatchWitch(self):
             self.check_watchwitch.setChecked(False)
             folder_path = os.path.join(os.path.join(
                 os.path.expanduser('~'), 'AppData', 'Local'), 'spicetify')
-            reply = QMessageBox.question(None, 'Executeable not found', 'Please put the manager executeable in the "localappdata/spicetify/Manager.exe" folder! \n Do you want to open the folder?',
-                                         QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
+            reply = confirmationModal(
+                'Executeable not found', 'Please put the manager executeable in the "localappdata/spicetify/Manager.exe" folder! \n Do you want to open the folder?')
             if reply == QMessageBox.StandardButton.Yes:
                 os.startfile(folder_path)
     # Auto close manager after completing actions (does not check for status!)
@@ -352,6 +352,7 @@ def SystemSoftStatusCheck(self):
                 self.check_autoclose.setChecked(False)
                 self.isAutoClosing = False
         except Exception as e:
+            print('Error while checking spicetify status')
             print(e)
 
         self.installerUiUpdate()