Factor out qmlRegisterSingletonType

pyQt only allows a limited number of types to register via qmlRegisterSingletonType or qmlRegisterType

Author: fieldOfView

SidebarGUIPlugin.py

@@ -4,7 +4,6 @@
 import os.path
 from UM.Application import Application
 from UM.Extension import Extension
-from UM.Resources import Resources
 from UM.Logger import Logger
 
 try:
@@ -51,14 +50,7 @@ def _onEngineCreated(self):
         Logger.log("d", "Registering replacement stages")
 
         engine = Application.getInstance()._qml_engine
-        try:
-            qmlRegisterSingletonType(
-                SidebarGUIProxy, "Cura", 1, 0, self.getProxy, "SidebarGUIPlugin"
-            )
-        except TypeError:
-            qmlRegisterSingletonType(
-                SidebarGUIProxy, "Cura", 1, 0, "SidebarGUIPlugin", self.getProxy
-            )
+        engine.rootContext().setContextProperty("SidebarGUIPlugin", self._proxy)
 
         sidebar_component_path = os.path.join(
             os.path.dirname(os.path.abspath(__file__)),
@@ -137,8 +129,3 @@ def _onViewChanged(self):
         else:
             if active_stage_id != "PrepareStage":
                 self._controller.setActiveStage("PrepareStage")
-
-    ##  Hackish way to ensure the proxy is already created, which ensures that the sidebargui.qml is already created
-    #   as this caused some issues.
-    def getProxy(self, engine, script_engine):
-        return self._proxy

resources/qml/ExtruderTabs40.qml

@@ -109,7 +109,7 @@ TabRow
                             return Cura.MachineManager.getExtruder(model.index);
                         }
                     }
-                    property bool valueWarning: !Cura.SidebarGUIPlugin.getExtruderHasQualityForMaterial(extruderStack)
+                    property bool valueWarning: !SidebarGUIPlugin.getExtruderHasQualityForMaterial(extruderStack)
                     property bool valueError: extruderStack == undefined ? false : Cura.ContainerManager.getContainerMetaDataEntry(extruderStack.material.id, "compatible", "") != "True"
 
                     visible: (tabBar.hasMaterials || tabBar.hasVariants) && (valueWarning || valueError)

resources/qml/ExtruderTabs411.qml

@@ -119,7 +119,7 @@ TabRow
                             {
                                 return UM.StatusIcon.Status.ERROR
                             }
-                            if (!Cura.SidebarGUIPlugin.getExtruderHasQualityForMaterial(extruderStack))
+                            if (!SidebarGUIPlugin.getExtruderHasQualityForMaterial(extruderStack))
                             {
                                 return UM.StatusIcon.Status.WARNING
                             }

resources/qml/ExtruderTabs50.qml

@@ -106,7 +106,7 @@ TabRow
                             {
                                 return UM.StatusIcon.Status.ERROR
                             }
-                            if (!Cura.SidebarGUIPlugin.getExtruderHasQualityForMaterial(extruderStack))
+                            if (!SidebarGUIPlugin.getExtruderHasQualityForMaterial(extruderStack))
                             {
                                 return UM.StatusIcon.Status.WARNING
                             }