graphical changes,iproved uninstall, and fixed progress

Author: Protonosgit

components/popups.py

@@ -3,7 +3,7 @@
 
 def errorDialog(text):
     error_dialog = QErrorMessage()
-    error_dialog.setWindowTitle('Warning an error occured')
+    error_dialog.setWindowTitle('Warning an error was detected')
     error_dialog.showMessage(text)
     error_dialog.exec()
 

components/shellbridge.py

@@ -4,7 +4,6 @@
 import psutil
 import shutil
 from PyQt6.QtCore import Qt, QThread, pyqtSignal
-import requests
 
 # Installer task for both windows and linux/mac with progress and error handling
 class InstallSpicetify(QThread):
@@ -25,12 +24,12 @@ def run(self):
                 subprocess.run('spicetify apply -n -q',check=True)
                 self.progress_signal.emit("Installing Marketplace...")
                 subprocess.run('powershell.exe -Command "iwr -useb https://raw.githubusercontent.com/spicetify/spicetify-marketplace/main/resources/install.ps1 | iex"',check=True)
+                self.progress_signal.emit("done")
         except Exception as e:
             print("Error detected!")
             print(e)
             self.progress_signal.emit("fail")
-        finally:
-            self.progress_signal.emit("done")
+
         self.finished_signal.emit()
 
 # Update spicetify task

manager_window.py

@@ -4,7 +4,7 @@
 import os
 import sys
 import subprocess
-from PyQt6.QtWidgets import  QMainWindow
+from PyQt6.QtWidgets import  QMainWindow,QMessageBox
 from PyQt6.QtCore import Qt, QUrl
 from PyQt6.uic import loadUi
 from PyQt6.QtGui import QDesktopServices
@@ -66,7 +66,7 @@ def masterButton(self):
             self.l_versioninfo.setText('⏳Please wait⏳')
             self.iprocess = InstallSpicetify()
             self.iprocess.finished_signal.connect(self.setup_finished)
-            self.iprocess.progress_signal.connect(self.progressmaster)
+            self.iprocess.progress_signal.connect(self.installProgress)
             self.iprocess.start()
         elif self.managermode == 3:
             self.setCursor(Qt.CursorShape.WaitCursor)
@@ -96,11 +96,16 @@ def masterButton(self):
             self.iprocess.start()
 
     #Update user about progress while installing spicetify
-    def progressmaster(self, action):
+    def installProgress(self, action):
         if (action == "fail"):
             self.l_status.setStyleSheet("color: red")
             self.l_status.setText("⚠️ Installer has crashed ⚠️")
             errorDialog("The installation of Spicetify has failed due to an unrecoverable error! Check logs or ask for help.")
+        elif (action == "done"):
+            self.SystemSoftStatusCheck()
+            windowsNotification("Spicetify Manager", "Spicetify has successfully been installed!")
+            dialog = Popup(self)
+            dialog.exec()
         else:
             self.l_status.setStyleSheet("color: Orange")
             self.l_status.setText(action)
@@ -110,15 +115,19 @@ def progressmaster(self, action):
 
     # Launch uninstaller task
     def startRemoval(self):
-        self.setCursor(Qt.CursorShape.WaitCursor)
-        self.bt_uninstall.setEnabled(False)
-        self.bt_refresh.setEnabled(False)
-        self.bt_master.setEnabled(False)
-        self.l_status.setStyleSheet("color: Orange")
-        self.l_status.setText("Uninstalling Spicetify...")
-        self.iprocess = UninstallSpicetify()
-        self.iprocess.finished_signal.connect(self.uninstall_finished)
-        self.iprocess.start()
+        reply = QMessageBox.question(None, 'Confirmation', 'Are you sure you want to uninstall Spicetify?', QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No)
+        if reply == QMessageBox.StandardButton.Yes:
+            self.setCursor(Qt.CursorShape.WaitCursor)
+            self.bt_uninstall.setEnabled(False)
+            self.bt_refresh.setEnabled(False)
+            self.bt_master.setEnabled(False)
+            self.l_status.setStyleSheet("color: Orange")
+            self.l_status.setText("Uninstalling Spicetify...")
+            self.iprocess = UninstallSpicetify()
+            self.iprocess.finished_signal.connect(self.uninstall_finished)
+            self.iprocess.start()
+        else:
+            return False
 
 
     # Run custom commands
@@ -138,10 +147,7 @@ def DisableUpdate(self):
 
     #Called when spicetify is installed or not?
     def setup_finished(self):
-        self.SystemSoftStatusCheck()
-        dialog = Popup(self)
-        dialog.exec()
-        windowsNotification("Spicetify Manager", "Spicetify has successfully been installed!")
+        pass
 
     #Called when spicetify is applied
     def apply_finished(self):
@@ -153,6 +159,7 @@ def update_finished(self):
         self.SystemSoftStatusCheck()
         windowsNotification("Spicetify Manager", "Spicetify has been updated!")
 
+
     #Called when spicetify is uninstalled
     def uninstall_finished(self):
         self.SystemSoftStatusCheck()
@@ -234,10 +241,12 @@ def installerUiUpdate(self):
                 self.l_versioninfo.setText('Press install to start the process')
                 #self.l_versioninfo.setText('Latest version: '+self.LATESTSPICETIFYVER)
                 self.bt_master.setText("Install")
+                self.bt_uninstall.setEnabled(False)
                 self.managermode = 2
         else:
             self.l_status.setText("Spotify is not installed")
             self.l_status.setStyleSheet("color: red")
             self.l_versioninfo.setText('Download Spotify from the official website')
             self.bt_master.setText("Download")
+            self.bt_uninstall.setEnabled(False)
             self.managermode = 1

res/Frame 12.png

@@ -68,15 +68,15 @@
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>81</width>
-     <height>231</height>
+     <width>71</width>
+     <height>291</height>
     </rect>
    </property>
    <property name="text">
     <string/>
    </property>
    <property name="pixmap">
-    <pixmap>spotify_sidebar.jpg</pixmap>
+    <pixmap>spotify-sidebar-hint.jpg</pixmap>
    </property>
    <property name="scaledContents">
     <bool>true</bool>
@@ -85,9 +85,9 @@
   <widget class="QTextBrowser" name="textBrowser">
    <property name="geometry">
     <rect>
-     <x>100</x>
+     <x>90</x>
      <y>20</y>
-     <width>381</width>
+     <width>391</width>
      <height>211</height>
     </rect>
    </property>

res/afterinstalltip.ui

@@ -44,7 +44,7 @@
   </property>
   <property name="windowIcon">
    <iconset>
-    <normaloff>logo.png</normaloff>logo.png</iconset>
+    <normaloff>Frame 12.png</normaloff>Frame 12.png</iconset>
   </property>
   <property name="styleSheet">
    <string notr="true"/>
@@ -216,15 +216,15 @@ QPushButton:pressed
      <rect>
       <x>20</x>
       <y>10</y>
-      <width>71</width>
+      <width>81</width>
       <height>71</height>
      </rect>
     </property>
     <property name="text">
      <string/>
     </property>
     <property name="pixmap">
-     <pixmap>logo.png</pixmap>
+     <pixmap>Frame 12.png</pixmap>
     </property>
     <property name="scaledContents">
      <bool>true</bool>
@@ -701,7 +701,7 @@ li.checked::marker { content: &quot;\2612&quot;; }
        <string notr="true">color:white;</string>
       </property>
       <property name="text">
-       <string>Project spicy green 2023 v0.3</string>
+       <string>Project spicy green 2023 v0.4</string>
       </property>
       <property name="alignment">
        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>

res/manager.ui

@@ -122,7 +122,7 @@ background: rgba(0,0,0,0.5);</string>
 background: rgba(0,0,0,0.0);</string>
      </property>
      <property name="text">
-      <string>V 0.3</string>
+      <string>V 0.4</string>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>