Merge pull request #70 from dihm/pyqt6

Add Pyqt6

Author: dihm

pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
     "labscript_utils>=3.1.0b1",
     "labscript-c-extensions",
     "pyqtgraph>=0.11.1",
-    "qtutils>=4.0.0",
+    "qtutils>=4.1.3",
     "zprocess",
     "numpy>=1.15",
     "scipy",

runviewer/__main__.py

@@ -197,7 +197,10 @@ class RunviewerMainWindow(QtWidgets.QMainWindow):
     def changeEvent(self, event):
 
         # theme update only for PySide6/PyQt6
-        if QT_ENV.endswith('6') and event.type() == QtCore.QEvent.Type.ThemeChange:
+        if (QT_ENV.endswith('6')
+            and (event.type() == QtCore.QEvent.Type.ApplicationPaletteChange
+            or event.type() == QtCore.QEvent.Type.StyleChange)):
+
             for widget in self.findChildren(QtWidgets.QWidget):
                 # Complex widgets, like TreeView and TableView require triggering styleSheet and palette updates
                 widget.setStyleSheet(widget.styleSheet())
@@ -1668,7 +1671,6 @@ def handler(self, h5_filepath):
 if __name__ == "__main__":
     qapplication = QtWidgets.QApplication.instance()
     if qapplication is None:
-        qapplication = QApplication(sys.argv)
         qapplication = QtWidgets.QApplication(sys.argv)
 
     shots_to_process_queue = Queue()