Merge pull request #127 from dihm/pyqt6

Pyqt6 support

Author: dihm

pyproject.toml

@@ -32,7 +32,7 @@ dependencies = [
     "labscript>=3.0.0",
     "labscript_utils>=3.3.0",
     "pandas>=0.13",
-    "qtutils>=4.0",
+    "qtutils>=4.1.3",
     "matplotlib",
 ]
 dynamic = ["version"]

runmanager/__main__.py

@@ -16,6 +16,7 @@
 import queue
 import os
 import sys
+import importlib.metadata
 import labscript_utils.excepthook
 
 # Associate app windows with OS menu shortcuts:
@@ -49,6 +50,7 @@
 
 from qtutils.qt import QtCore, QtGui, QtWidgets, QT_ENV
 from qtutils.qt.QtCore import pyqtSignal as Signal
+PYQT_VERSION_STR = importlib.metadata.version(QT_ENV)
 
 splash.update_text('importing labscript suite modules')
 from labscript_utils.ls_zprocess import zmq_get, ProcessTree, ZMQServer
@@ -1445,7 +1447,10 @@ def paintEvent(self, event):
     def changeEvent(self, event):
 
         # theme update only for PySide6
-        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)):
+
             self.logger.info('Theme change event')
             # update group tab color themes
             RunmanagerColors().update_colors_from_scheme()
@@ -1491,6 +1496,15 @@ class RunManager(object):
 
     def __init__(self):
         self.logger = logging.getLogger('runmanager')
+        # log dependency versions
+        self.logger.info(f'Python version: {sys.version}')
+        self.logger.info(f'Platform: {sys.platform}')
+        self.logger.info(f'Qt environment: {QT_ENV}')
+        self.logger.info(f'PySide/PyQt version: {PYQT_VERSION_STR}')
+        self.logger.info(f'Qt version: {QtCore.qVersion()}')
+        self.logger.info(f"qtutils version: {importlib.metadata.version('qtutils')}")
+        self.logger.info(f"runmanager version: {runmanager.__version__}")
+
         splash.update_text('loading graphical interface')
         loader = UiLoader()
         loader.registerCustomWidget(FingerTabWidget)