Factor out use of qmlRegisterType

pyQt only allows up to 60 non-qml types to be registered via qmlRegisterType. Since Cura and Uranium use up their fair share of these registrations, best to avoid it altogether.

Fixes #7

TabbedSettingsPlugin.py

@@ -2,19 +2,29 @@
 # The TabbedSettingsPlugin is released under the terms of the AGPLv3 or higher.
 
 import os.path
+from typing import Optional
+
+from PyQt6.QtCore import QObject, pyqtSlot
+
 from cura.CuraApplication import CuraApplication
 from UM.Extension import Extension
 from UM.Logger import Logger
 
+from . import PerCategoryVisibilityHandler
+from . import InstanceContainerVisibilityHandler
+from . import ExtendedSettingPreferenceVisibilityHandler
+
 
-class TabbedSettingsPlugin(Extension):
+class TabbedSettingsPlugin(QObject, Extension):
     def __init__(self):
         super().__init__()
 
         self._qml_patcher = None
         self._main_window = None
         CuraApplication.getInstance().engineCreatedSignal.connect(self._onEngineCreated)
 
+        self._visibility_handlers = {}
+
     def _onEngineCreated(self):
         self._main_window = CuraApplication.getInstance().getMainWindow()
         if not self._main_window:
@@ -38,12 +48,32 @@ def _onEngineCreated(self):
         )
 
         self._qml_patcher = CuraApplication.getInstance().createQmlComponent(
-            path, {"withSidebarGUI": has_sidebar_gui}
+            path, {
+                "manager": self,
+                "withSidebarGUI": has_sidebar_gui
+            }
         )
         if not self._qml_patcher:
             Logger.log(
                 "w", "Could not create qml components for TabbedSettingsPlugin"
             )
             return
 
-        self._qml_patcher.patch(self._main_window.contentItem())
+        self._qml_patcher.patch(self._main_window.contentItem())
+
+    @pyqtSlot(str, result = QObject)
+    def getVisibilityHandler(self, handler_type: str) -> Optional["QObject"]:
+        if handler_type not in self._visibility_handlers:
+            handler = None
+            if handler_type == "PerCategory":
+                handler = PerCategoryVisibilityHandler.PerCategoryVisibilityHandler()
+            elif handler_type == "InstanceContainer":
+                handler = InstanceContainerVisibilityHandler.InstanceContainerVisibilityHandler()
+            elif handler_type == "ExtendedSettingPreference":
+                handler = ExtendedSettingPreferenceVisibilityHandler.ExtendedSettingPreferenceVisibilityHandler()
+            if handler:
+                self._visibility_handlers[handler_type] = handler
+            else:
+                return
+
+        return self._visibility_handlers[handler_type]

__init__.py

@@ -8,12 +8,7 @@
 from UM.Application import Application
 from UM.Logger import Logger
 
-from PyQt6.QtQml import qmlRegisterType
-
 from . import TabbedSettingsPlugin
-from . import PerCategoryVisibilityHandler
-from . import InstanceContainerVisibilityHandler
-from . import ExtendedSettingPreferenceVisibilityHandler
 
 
 def getMetaData():
@@ -25,21 +20,6 @@ def register(app):
         Logger.log("w", "Plugin not loaded because of a version mismatch")
         return {}
 
-    qmlRegisterType(
-        PerCategoryVisibilityHandler.PerCategoryVisibilityHandler,
-        "Cura", 1, 0,
-        "PerCategoryVisibilityHandler",
-    )
-    qmlRegisterType(
-        InstanceContainerVisibilityHandler.InstanceContainerVisibilityHandler,
-        "Cura", 1, 0,
-        "InstanceContainerVisibilityHandler",
-    )
-    qmlRegisterType(
-        ExtendedSettingPreferenceVisibilityHandler.ExtendedSettingPreferenceVisibilityHandler,
-        "Cura", 1, 0,
-        "ExtendedSettingPreferenceVisibilityHandler",
-    )
     return {"extension": TabbedSettingsPlugin.TabbedSettingsPlugin()}
 
 

resources/qml/TabbedSettingsView.qml

@@ -14,12 +14,14 @@ Item
     property var tooltipItem
     property var backgroundItem
 
-    property var settingPreferenceVisibilityHandler: Cura.ExtendedSettingPreferenceVisibilityHandler {}
-    property var perCategoryVisibilityHandler: Cura.PerCategoryVisibilityHandler {}
-    property var instanceContainerVisibilityHandler: Cura.InstanceContainerVisibilityHandler
+    property var settingPreferenceVisibilityHandler: manager.getVisibilityHandler("ExtendedSettingPreference")
+    property var perCategoryVisibilityHandler: manager.getVisibilityHandler("PerCategory")
+    property var instanceContainerVisibilityHandler:
     {
-        active: false
-        containerIndex: 0
+        var handler = manager.getVisibilityHandler("InstanceContainer")
+        handler.active = false
+        handler.containerIndex = 0
+        return handler
     }
 
     property string selectedKey: categoryTabs.itemAt(categoryTabs.currentIndex).key