Add support for Qt6

While still falling back to Qt5 as needed.

Author: ctrueden

src/napari_imagej/widgets/widget_utils.py

@@ -146,10 +146,19 @@ def __init__(self, title: str, error_message: str, *args, **kwargs):
         textHeight = textSize.height() + 100
         self.resize(textWidth, textHeight)
         # Maximum size - ~80% of the user's screen
-        screen_size = QApplication.desktop().screenGeometry()
-        self.setMaximumSize(
-            int(screen_size.width() * 0.8), int(screen_size.height() * 0.8)
-        )
+        screen_size = None
+        try:
+            screen_size = QApplication.primaryScreen().geometry()  # PyQt6
+        except Exception:
+            pass
+        if not screen_size:
+            try:
+                screen_size = QApplication.desktop().screenGeometry()  # PyQt5
+            except Exception:
+                pass
+        screen_width = screen_size.width() if screen_size else 1024
+        screen_height = screen_size.height() if screen_size else 768
+        self.setMaximumSize(int(screen_width * 0.8), int(screen_height * 0.8))
 
         btn_box = QDialogButtonBox(QDialogButtonBox.Ok)
         btn_box.accepted.connect(self.accept)

tests/widgets/test_menu.py

@@ -79,7 +79,7 @@ def popup_handler(asserter) -> Callable[[str, Callable[[], None]], None]:
     def handle_popup(
         popup_generator: Callable[[], None], popup_handler: Callable[[QDialog], bool]
     ):
-        # # Start the handler in a new thread
+        # Start the handler in a new thread
         class Handler(QRunnable):
             # Test popup when running headlessly
             def run(self) -> None:
@@ -89,7 +89,7 @@ def run(self) -> None:
                 asserter(lambda: QApplication.activeModalWidget() is not widget)
 
             def passed(self) -> bool:
-                return self._passed
+                return getattr(self, '_passed', False)
 
         runnable = Handler()
         QThreadPool.globalInstance().start(runnable)

tests/widgets/test_result_tree.py

@@ -120,7 +120,12 @@ def test_right_click(fixed_tree: SearcherTreeView, asserter):
     # First, assert the policy
     assert fixed_tree.contextMenuPolicy() == Qt.CustomContextMenu
     # Then, grab an arbitratry Search Result
-    idx = fixed_tree.model().index(0, 0).child(0, 0)
+    parent_idx = fixed_tree.model().index(0, 0)
+    idx = (
+        parent_idx.child(0, 0)  # PyQt5
+        if hasattr(parent_idx, "child")
+        else fixed_tree.model().index(0, 0, parent_idx)  # PyQt6
+    )
     rect = fixed_tree.visualRect(idx)
     item = fixed_tree.model().itemFromIndex(idx)
     # Find its SearchActions