Add basic compatibility with PyQt6

Author: fieldOfView

SidebarGUIPlugin.py

@@ -7,8 +7,12 @@
 from UM.Resources import Resources
 from UM.Logger import Logger
 
-from PyQt5.QtCore import QUrl
-from PyQt5.QtQml import qmlRegisterSingletonType
+try:
+    from PyQt6.QtCore import QUrl
+    from PyQt6.QtQml import qmlRegisterSingletonType
+except ImportError:
+    from PyQt5.QtCore import QUrl
+    from PyQt5.QtQml import qmlRegisterSingletonType
 
 from .SidebarGUIProxy import SidebarGUIProxy
 
@@ -42,9 +46,14 @@ def _onEngineCreated(self):
         Logger.log("d", "Registering replacement stages")
 
         engine = Application.getInstance()._qml_engine
-        qmlRegisterSingletonType(
-            SidebarGUIProxy, "Cura", 1, 0, "SidebarGUIPlugin", self.getProxy
-        )
+        try:
+            qmlRegisterSingletonType(
+                SidebarGUIProxy, "Cura", 1, 0, self.getProxy, "SidebarGUIPlugin"
+            )
+        except TypeError:
+            qmlRegisterSingletonType(
+                SidebarGUIProxy, "Cura", 1, 0, "SidebarGUIPlugin", self.getProxy
+            )
 
         sidebar_component_path = os.path.join(
             os.path.dirname(os.path.abspath(__file__)),

SidebarGUIProxy.py

@@ -5,7 +5,10 @@
 from UM.Logger import Logger
 from UM.FlameProfiler import pyqtSlot
 
-from PyQt5.QtCore import QObject, QRectF
+try:
+    from PyQt6.QtCore import QObject, QRectF
+except ImportError:
+    from PyQt5.QtCore import QObject, QRectF
 
 try:
     from cura.Machines.ContainerTree import ContainerTree

plugin.json

@@ -3,11 +3,11 @@
     "author": "fieldOfView",
     "version": "4.2.3-DEV",
     "minimum_cura_version": "4.0",
-    "maximum_cura_version": "4.13",
+    "maximum_cura_version": "5.0",
     "description": "Provides an alternative interface which restores the sidebar",
     "api": "6.0.0",
     "supported_sdk_versions": [
-        "6.0.0", "6.1.0", "6.2.0", "6.3.0", "7.0.0", "7.1.0", "7.2.0", "7.3.0", "7.4.0", "7.5.0", "7.6.0", "7.7.0", "7.8.0", "7.9.0"
+        "6.0.0", "6.1.0", "6.2.0", "6.3.0", "7.0.0", "7.1.0", "7.2.0", "7.3.0", "7.4.0", "7.5.0", "7.6.0", "7.7.0", "7.8.0", "7.9.0", "8.0.0"
     ],
     "i18n-catalog": "cura"
 }