Merge pull request #134 from Dpeta/Qt6.5

Update dependencies with fixes (Qt 6.5)

convo.py

@@ -999,10 +999,6 @@ class PesterConvo(QtWidgets.QFrame):
 
     def closeEvent(self, event):
         self.mainwindow.waitingMessages.messageAnswered(self.title())
-        for movie in self.textArea.urls.copy():
-            movie.setFileName("")  # Required, sometimes, for some reason. . .
-            movie.stop()
-            del movie
         self.windowClosed.emit(self.title())
 
     def setChumOpen(self, o):

pesterchum.py

@@ -3497,6 +3497,7 @@ class PesterWindow(MovingWindow):
 
     @QtCore.pyqtSlot()
     def killApp(self):
+        PchumLog.info("killApp() called")
         self.disconnectIRC.emit()
         self.parent.trayicon.hide()
         self.app.quit()
@@ -4065,10 +4066,13 @@ class MainProgram(QtCore.QObject):
         self.app.aboutToQuit.connect(self.death)
 
     def death(self):
-        # app murder in progress
+        """app murder in progress, kill the IRC thread if it didnt die already."""
-        # print("death inbound")
+        PchumLog.debug("death inbound")
-        if hasattr(self, "widget"):
+        if hasattr(self, "irc"):
-            self.widget.killApp()
+            if self.irc:
+                if self.irc.isRunning():
+                    PchumLog.debug("Calling exit() on IRC thread.")
+                    self.irc.exit()
 
     # def lastWindow(self):
     #    print("all windows closed")

requirements-qt5.txt

@@ -1,4 +1,2 @@
-certifi==2022.12.7
+PyQt5
-PyQt5==5.15.7
+certifi
-PyQt5-Qt5==5.15.2
-PyQt5-sip==12.11.0

requirements.txt

@@ -1,4 +1,2 @@
-certifi==2022.12.7
+PyQt6
-PyQt6==6.4.0
+certifi
-PyQt6-Qt6==6.4.0
-PyQt6-sip==13.4.0

toast.py

@@ -232,7 +232,13 @@ class ToastMachine:
 class PesterToast(QtWidgets.QWidget, DefaultToast):
     def __init__(self, machine, title, msg, icon, time=3000, parent=None):
         # FIXME: Not sure how this works exactly either xd, can't we init the parents seperately?
-        kwds = dict(parent=parent, machine=machine, title=title, msg=msg, icon=icon)
+        kwds = {
+            "parent": parent,
+            "machine": machine,
+            "title": title,
+            "msg": msg,
+            "icon": icon,
+        }
         super().__init__(**kwds)
 
         self.machine = machine