Merge pull request #50 from meteozond/update-compatible-version-to-5.11

Fix compatibility with Cura 5.11

Author: fieldOfView

SidebarGUIPlugin.py

@@ -5,6 +5,7 @@
 from UM.Application import Application
 from UM.Extension import Extension
 from UM.Logger import Logger
+from PyQt6.QtCore import QTimer
 
 from .SidebarGUIProxy import SidebarGUIProxy
 
@@ -79,6 +80,12 @@ def _onEngineCreated(self):
 
     def _onStageChanged(self):
         active_stage_id = self._controller.getActiveStage().getPluginId()
+        active_view = self._controller.getActiveView()
+
+        # Don't change view if PaintTool is active
+        if active_view and active_view.getPluginId() == "PaintTool":
+            return
+
         view_id = ""
 
         if active_stage_id == "PrepareStage":
@@ -93,28 +100,44 @@ def _onStageChanged(self):
             self._controller.setActiveView(view_id)
 
     def _onViewChanged(self):
-        active_stage_id = self._controller.getActiveStage().getPluginId()
-        active_view_id = self._controller.getActiveView().getPluginId()
+        active_stage = self._controller.getActiveStage()
+        active_view = self._controller.getActiveView()
+
+        if not active_stage or not active_view:
+            return
+
+        active_stage_id = active_stage.getPluginId()
+        active_view_id = active_view.getPluginId()
+
+        # Force machine settings update when PaintTool is activated to fix rendering issue
+        if active_view_id == "PaintTool":
+            QTimer.singleShot(0, lambda: Application.getInstance().getMachineManager().forceUpdateAllSettings())
 
         if (
             active_stage_id == "SmartSlicePlugin"
         ):  # SmartSlicePlugin view is provided by the SmartSlicePlugin plugin
             return
 
         if active_stage_id == "PrepareStage":
-            if active_view_id not in ["SolidView", "XRayView"]:
+            if active_view_id not in ["SolidView", "XRayView", "PaintTool"]:
                 self._controller.setActiveView("SolidView")
                 return
-            self._prepare_stage_view_id = active_view_id
+            if active_view_id in ["SolidView", "XRayView"]:
+                self._prepare_stage_view_id = active_view_id
         elif active_stage_id == "MonitorStage":
             return
+        elif active_stage_id == "PreviewStage":
+            # Ensure SimulationView is active when in PreviewStage
+            if active_view_id != "SimulationView":
+                self._controller.setActiveView("SimulationView")
+            return
 
         if active_view_id in [
             "SimulationView",
             "FastView",
         ]:  # FastView is provided by the RAWMouse plugin
             if active_stage_id != "PreviewStage":
                 self._controller.setActiveStage("PreviewStage")
-        else:
+        elif active_view_id not in ["PaintTool"]:
             if active_stage_id != "PrepareStage":
                 self._controller.setActiveStage("PrepareStage")

plugin.json

@@ -1,9 +1,9 @@
 {
     "name": "Sidebar GUI",
     "author": "fieldOfView",
-    "version": "4.6.8",
+    "version": "4.6.9",
     "minimum_cura_version": "4.0",
-    "maximum_cura_version": "5.10",
+    "maximum_cura_version": "5.11",
     "description": "Provides an alternative, setting-centric interface based around a fixed sidebar",
     "api": "6.0.0",
     "supported_sdk_versions": [