Add support for Cura 5.3

fieldOfView · fieldOfView · commit 99dc0cfacf65 · 2023-02-22T18:10:49.000+01:00
diff --git a/SidebarGUIPlugin.py b/SidebarGUIPlugin.py
@@ -24,6 +24,7 @@
 class SidebarGUIPlugin(Extension):
     def __init__(self):
         super().__init__()
+
         self._prepare_stage_view_id = "SolidView"  # can be "SolidView" or "XRayView"
 
         Application.getInstance().pluginsLoaded.connect(self._onPluginsLoaded)
diff --git a/plugin.json b/plugin.json
@@ -3,13 +3,13 @@
     "author": "fieldOfView",
     "version": "4.5.1-DEV",
     "minimum_cura_version": "4.0",
-    "maximum_cura_version": "5.2",
+    "maximum_cura_version": "5.3",
     "description": "Provides an alternative, setting-centric interface based around a fixed 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",
-        "8.0.0", "8.1.0", "8.2.0"
+        "8.0.0", "8.1.0", "8.2.0", "8.3.0"
     ],
     "i18n-catalog": "cura"
 }
diff --git a/resources/qml/MachineSelector40.qml b/resources/qml/MachineSelector40.qml
@@ -0,0 +1,33 @@
+// Copyright (c) 2022 Aldo Hoeben / fieldOfView
+// SidebarGUIPlugin is released under the terms of the AGPLv3 or higher.
+
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
+
+import UM 1.3 as UM
+import Cura 1.1 as Cura
+
+Cura.MachineSelector
+{
+    id: machineSelection
+    headerCornerSide: Cura.RoundedRectangle.Direction.All
+
+    Component.onCompleted:
+    {
+        if(isLE410)
+        {
+            machineSelection.children[1].visible = false // remove shadow
+        }
+
+        if(isLE46)
+        {
+            var machineSelectionHeader = machineSelection.children[0].children[3].children[0]
+        } else {
+            var machineSelectionHeader = machineSelection.children[0].children[3].children[1]
+        }
+        // adjust header margins, because the height is smaller than designed
+        machineSelectionHeader.anchors.topMargin = 0
+        machineSelectionHeader.anchors.bottomMargin = 0
+    }
+}
diff --git a/resources/qml/MachineSelector53.qml b/resources/qml/MachineSelector53.qml
@@ -0,0 +1,75 @@
+// Copyright (c) 2022 Aldo Hoeben / fieldOfView
+// SidebarGUIPlugin is released under the terms of the AGPLv3 or higher.
+
+import QtQuick 2.10
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
+
+import UM 1.3 as UM
+import Cura 1.1 as Cura
+
+Cura.MachineSelector
+{
+    id: machineSelection
+    headerCornerSide: Cura.RoundedRectangle.Direction.All
+
+    machineManager: Cura.MachineManager
+    onSelectPrinter: function(machine)
+    {
+        toggleContent();
+        Cura.MachineManager.setActiveMachine(machine.id);
+    }
+    machineListModel: Cura.MachineListModel {}
+    buttons: [
+        Cura.SecondaryButton
+        {
+            id: addPrinterButton
+            leftPadding: UM.Theme.getSize("default_margin").width
+            rightPadding: UM.Theme.getSize("default_margin").width
+            text: catalog.i18nc("@button", "Add printer")
+            // The maximum width of the button is half of the total space, minus the padding of the parent, the left
+            // padding of the component and half the spacing because of the space between buttons.
+            fixedWidthMode: true
+            width: Math.round(parent.width / 2 - leftPadding * 1.5)
+            onClicked:
+            {
+                machineSelection.toggleContent()
+                Cura.Actions.addMachine.trigger()
+            }
+        },
+        Cura.SecondaryButton
+        {
+            id: managePrinterButton
+            leftPadding: UM.Theme.getSize("default_margin").width
+            rightPadding: UM.Theme.getSize("default_margin").width
+            text: catalog.i18nc("@button", "Manage printers")
+            fixedWidthMode: true
+            // The maximum width of the button is half of the total space, minus the padding of the parent, the right
+            // padding of the component and half the spacing because of the space between buttons.
+            width: Math.round(parent.width / 2 - rightPadding * 1.5)
+            onClicked:
+            {
+                machineSelection.toggleContent()
+                Cura.Actions.configureMachines.trigger()
+            }
+        }
+    ]
+
+    Component.onCompleted:
+    {
+        if(isLE410)
+        {
+            machineSelection.children[1].visible = false // remove shadow
+        }
+
+        if(isLE46)
+        {
+            var machineSelectionHeader = machineSelection.children[0].children[3].children[0]
+        } else {
+            var machineSelectionHeader = machineSelection.children[0].children[3].children[1]
+        }
+        // adjust header margins, because the height is smaller than designed
+        machineSelectionHeader.anchors.topMargin = 0
+        machineSelectionHeader.anchors.bottomMargin = 0
+    }
+}
diff --git a/resources/qml/MonitorStageMenu.qml b/resources/qml/MonitorStageMenu.qml
@@ -20,6 +20,7 @@ Item
     property bool isLE410
     property bool isLE413
     property bool isLE51
+    property bool isLE52
 
     Component.onCompleted:
     {
@@ -28,7 +29,8 @@ Item
         isLE46 = (CuraSDKVersion <= "7.2.0")
         isLE410 = (CuraSDKVersion <= "7.6.0")
         isLE413 = (CuraSDKVersion <= "7.9.0")
-        isLE51 = (CuraSDKVersion <= "8.1.0") && UM.Application.version != "master" && UM.Application.version != "dev"
+        isLE51 = (CuraSDKVersion <= "8.1.0")
+        isLE52 = (CuraSDKVersion <= "8.2.0") && UM.Application.version != "master" && UM.Application.version != "dev"
 
         // adjust message stack position for sidebar
         var messageStack
@@ -44,10 +46,14 @@ Item
         {
             messageStack = base.contentItem.children[2].children[3].children[8]
         }
-        else
+        else if(isLE52)
         {
             messageStack = base.contentItem.children[3].children[3].children[8]
         }
+        else
+        {
+            messageStack = base.contentItem.children[4].children[3].children[8]
+        }
         messageStack.anchors.horizontalCenter = undefined
         messageStack.anchors.left = messageStack.parent.left
         messageStack.anchors.leftMargin = Qt.binding(function()
@@ -72,10 +78,10 @@ Item
         })
     }
 
-    Cura.MachineSelector
+    Loader
     {
-        id: machineSelection
-        headerCornerSide: Cura.RoundedRectangle.Direction.All
+        anchors.right: parent.right
+        anchors.rightMargin: UM.Theme.getSize("print_setup_widget").width - width
         width: UM.Theme.getSize("machine_selector_widget").width
         height:
         {
@@ -86,26 +92,15 @@ Item
                 return Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
             }
         }
-        anchors.right: parent.right
-        anchors.rightMargin: UM.Theme.getSize("print_setup_widget").width - width
         y: - Math.floor((UM.Theme.getSize("main_window_header").height + height) / 2)
 
-        Component.onCompleted:
+        source:
         {
-            if(isLE410)
-            {
-                machineSelection.children[1].visible = false // remove shadow
-            }
-
-            if(isLE46)
-            {
-                var machineSelectionHeader = machineSelection.children[0].children[3].children[0]
+            if(isLE52) {
+                return "MachineSelector40.qml";
             } else {
-                var machineSelectionHeader = machineSelection.children[0].children[3].children[1]
+                return "MachineSelector53.qml";
             }
-            // adjust header margins, because the height is smaller than designed
-            machineSelectionHeader.anchors.topMargin = 0
-            machineSelectionHeader.anchors.bottomMargin = 0
         }
     }
 }
diff --git a/resources/qml/ProfileSelector51.qml b/resources/qml/ProfileSelector51.qml
@@ -47,7 +47,14 @@ Item
             Label
             {
                 id: textLabel
-                text: Cura.MachineManager.activeQualityDisplayNameMap["main"]
+                text:
+                {
+                    if(isLE52) {
+                        return Cura.MachineManager.activeQualityDisplayNameMap["main"]
+                    } else {
+                        return Cura.MachineManager.activeQualityDisplayNameMainStringParts.join(" - ")
+                    }
+                }
                 font: UM.Theme.getFont("default")
                 color: UM.Theme.getColor("text")
                 Layout.margins: 0
@@ -73,29 +80,40 @@ Item
 
                 function activeQualityDetailText()
                 {
-                    var resultMap = Cura.MachineManager.activeQualityDisplayNameMap
-                    var resultSuffix = resultMap["suffix"]
-                    var result = ""
+                    if(isLE52) {
+                        var resultMap = Cura.MachineManager.activeQualityDisplayNameMap
+                        var resultSuffix = resultMap["suffix"]
+                        var result = ""
 
-                    if (Cura.MachineManager.isActiveQualityExperimental)
-                    {
-                        resultSuffix += " (Experimental)"
-                    }
+                        if (Cura.MachineManager.isActiveQualityExperimental)
+                        {
+                            resultSuffix += " (Experimental)"
+                        }
 
-                    if (Cura.MachineManager.isActiveQualitySupported)
-                    {
-                        if (Cura.MachineManager.activeQualityLayerHeight > 0)
+                        if (Cura.MachineManager.isActiveQualitySupported)
                         {
-                            if (resultSuffix)
+                            if (Cura.MachineManager.activeQualityLayerHeight > 0)
                             {
-                                result += " - " + resultSuffix
+                                if (resultSuffix)
+                                {
+                                    result += " - " + resultSuffix
+                                }
+                                result += " - "
+                                result += Cura.MachineManager.activeQualityLayerHeight + "mm"
                             }
-                            result += " - "
-                            result += Cura.MachineManager.activeQualityLayerHeight + "mm"
+                        }
+                        return result
+                    } else {
+                        const string_parts = Cura.MachineManager.activeQualityDisplayNameTailStringParts;
+                        if (string_parts.length === 0)
+                        {
+                            return "";
+                        }
+                        else
+                        {
+                            return ` - ${string_parts.join(" - ")}`
                         }
                     }
-
-                    return result
                 }
             }
         }
diff --git a/resources/qml/SidebarStageMenu.qml b/resources/qml/SidebarStageMenu.qml
@@ -17,6 +17,7 @@ Item
     property bool isLE410
     property bool isLE413
     property bool isLE51
+    property bool isLE52
 
     property bool prepareStageActive: UM.Controller.activeStage.toString().indexOf("PrepareStage") == 0
     property bool preSlicedData: PrintInformation !== null && PrintInformation.preSliced
@@ -34,7 +35,8 @@ Item
         isLE46 = (CuraSDKVersion <= "7.2.0")
         isLE410 = (CuraSDKVersion <= "7.6.0")
         isLE413 = (CuraSDKVersion <= "7.9.0")
-        isLE51 = (CuraSDKVersion <= "8.1.0") && UM.Application.version != "master" && UM.Application.version != "dev"
+        isLE51 = (CuraSDKVersion <= "8.1.0")
+        isLE52 = (CuraSDKVersion <= "8.2.0") && UM.Application.version != "master" && UM.Application.version != "dev"
         if(is40)
         {
              CuraApplication.log("SidebarGUIPlugin patching interface for Cura 4.0")
@@ -59,10 +61,14 @@ Item
         {
              CuraApplication.log("SidebarGUIPlugin patching interface for Cura 5.0 - 5.1")
         }
-        else
+        else if(isLE52)
         {
              CuraApplication.log("SidebarGUIPlugin patching interface for Cura 5.2 and newer")
         }
+        else
+        {
+             CuraApplication.log("SidebarGUIPlugin patching interface for Cura 5.3 and newer")
+        }
 
         // top-align toolbar (defined in Cura.qml)
         toolbar.visible = true
@@ -89,10 +95,14 @@ Item
         {
             messageStack = base.contentItem.children[2].children[3].children[8]
         }
-        else
+        else if(isLE52)
         {
             messageStack = base.contentItem.children[3].children[3].children[8]
         }
+        else
+        {
+            messageStack = base.contentItem.children[4].children[3].children[8]
+        }
         messageStack.anchors.horizontalCenter = undefined
         messageStack.anchors.left = messageStack.parent.left
         messageStack.anchors.leftMargin = Qt.binding(function()
@@ -159,6 +169,13 @@ Item
         customPrintSetup.children[0].height = 0
         customPrintSetup.children[2].anchors.rightMargin = 0
 
+        var recommendedPrintSetup = printSetupChildren.children[0]
+        if(!isLE52)
+        {
+            recommendedPrintSetup.height = undefined
+            recommendedPrintSetup.children[0].contentItem.children[0].children[9].children[0].visible = false
+        }
+
         // tweak header height
         headerBackground.height = mainWindowHeader.height + UM.Theme.getSize("default_margin").height
         main.anchors.top = main.parent.top
@@ -208,10 +225,9 @@ Item
         }
     }
 
-    Cura.MachineSelector
+    Loader
     {
-        id: machineSelection
-        headerCornerSide: Cura.RoundedRectangle.Direction.All
+        anchors.left: printSetupSidebar.left
         width: UM.Theme.getSize("machine_selector_widget").width
         height:
         {
@@ -222,25 +238,15 @@ Item
                 return Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
             }
         }
-        anchors.left: printSetupSidebar.left
         y: - Math.floor((UM.Theme.getSize("main_window_header").height + height) / 2)
 
-        Component.onCompleted:
+        source:
         {
-            if(isLE410)
-            {
-                machineSelection.children[1].visible = false // remove shadow
-            }
-
-            if(isLE46)
-            {
-                var machineSelectionHeader = machineSelection.children[0].children[3].children[0]
+            if(isLE52) {
+                return "MachineSelector40.qml";
             } else {
-                var machineSelectionHeader = machineSelection.children[0].children[3].children[1]
+                return "MachineSelector53.qml";
             }
-            // adjust header margins, because the height is smaller than designed
-            machineSelectionHeader.anchors.topMargin = 0
-            machineSelectionHeader.anchors.bottomMargin = 0
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ Item`
`20`	`20`	`property bool isLE410`
`21`	`21`	`property bool isLE413`
`22`	`22`	`property bool isLE51`
	`23`	`+ property bool isLE52`
`23`	`24`
`24`	`25`	`Component.onCompleted:`
`25`	`26`	`{`
`@@ -28,7 +29,8 @@ Item`
`28`	`29`	`isLE46 = (CuraSDKVersion <= "7.2.0")`
`29`	`30`	`isLE410 = (CuraSDKVersion <= "7.6.0")`
`30`	`31`	`isLE413 = (CuraSDKVersion <= "7.9.0")`
`31`		`- isLE51 = (CuraSDKVersion <= "8.1.0") && UM.Application.version != "master" && UM.Application.version != "dev"`
	`32`	`+ isLE51 = (CuraSDKVersion <= "8.1.0")`
	`33`	`+ isLE52 = (CuraSDKVersion <= "8.2.0") && UM.Application.version != "master" && UM.Application.version != "dev"`
`32`	`34`
`33`	`35`	`// adjust message stack position for sidebar`
`34`	`36`	`var messageStack`
`@@ -44,10 +46,14 @@ Item`
`44`	`46`	`{`
`45`	`47`	`messageStack = base.contentItem.children[2].children[3].children[8]`
`46`	`48`	`}`
`47`		`- else`
	`49`	`+ else if(isLE52)`
`48`	`50`	`{`
`49`	`51`	`messageStack = base.contentItem.children[3].children[3].children[8]`
`50`	`52`	`}`
	`53`	`+ else`
	`54`	`+ {`
	`55`	`+ messageStack = base.contentItem.children[4].children[3].children[8]`
	`56`	`+ }`
`51`	`57`	`messageStack.anchors.horizontalCenter = undefined`
`52`	`58`	`messageStack.anchors.left = messageStack.parent.left`
`53`	`59`	`messageStack.anchors.leftMargin = Qt.binding(function()`
`@@ -72,10 +78,10 @@ Item`
`72`	`78`	`})`
`73`	`79`	`}`
`74`	`80`
`75`		`- Cura.MachineSelector`
	`81`	`+ Loader`
`76`	`82`	`{`
`77`		`- id: machineSelection`
`78`		`- headerCornerSide: Cura.RoundedRectangle.Direction.All`
	`83`	`+ anchors.right: parent.right`
	`84`	`+ anchors.rightMargin: UM.Theme.getSize("print_setup_widget").width - width`
`79`	`85`	`width: UM.Theme.getSize("machine_selector_widget").width`
`80`	`86`	`height:`
`81`	`87`	`{`
`@@ -86,26 +92,15 @@ Item`
`86`	`92`	`return Math.round(0.5 * UM.Theme.getSize("main_window_header").height)`
`87`	`93`	`}`
`88`	`94`	`}`
`89`		`- anchors.right: parent.right`
`90`		`- anchors.rightMargin: UM.Theme.getSize("print_setup_widget").width - width`
`91`	`95`	`y: - Math.floor((UM.Theme.getSize("main_window_header").height + height) / 2)`
`92`	`96`
`93`		`- Component.onCompleted:`
	`97`	`+ source:`
`94`	`98`	`{`
`95`		`- if(isLE410)`
`96`		`- {`
`97`		`- machineSelection.children[1].visible = false // remove shadow`
`98`		`- }`
`99`		`-`
`100`		`- if(isLE46)`
`101`		`- {`
`102`		`- var machineSelectionHeader = machineSelection.children[0].children[3].children[0]`
	`99`	`+ if(isLE52) {`
	`100`	`+ return "MachineSelector40.qml";`
`103`	`101`	`} else {`
`104`		`- var machineSelectionHeader = machineSelection.children[0].children[3].children[1]`
	`102`	`+ return "MachineSelector53.qml";`
`105`	`103`	`}`
`106`		`- // adjust header margins, because the height is smaller than designed`
`107`		`- machineSelectionHeader.anchors.topMargin = 0`
`108`		`- machineSelectionHeader.anchors.bottomMargin = 0`
`109`	`104`	`}`
`110`	`105`	`}`
`111`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ Item`
`17`	`17`	`property bool isLE410`
`18`	`18`	`property bool isLE413`
`19`	`19`	`property bool isLE51`
	`20`	`+ property bool isLE52`
`20`	`21`
`21`	`22`	`property bool prepareStageActive: UM.Controller.activeStage.toString().indexOf("PrepareStage") == 0`
`22`	`23`	`property bool preSlicedData: PrintInformation !== null && PrintInformation.preSliced`
`@@ -34,7 +35,8 @@ Item`
`34`	`35`	`isLE46 = (CuraSDKVersion <= "7.2.0")`
`35`	`36`	`isLE410 = (CuraSDKVersion <= "7.6.0")`
`36`	`37`	`isLE413 = (CuraSDKVersion <= "7.9.0")`
`37`		`- isLE51 = (CuraSDKVersion <= "8.1.0") && UM.Application.version != "master" && UM.Application.version != "dev"`
	`38`	`+ isLE51 = (CuraSDKVersion <= "8.1.0")`
	`39`	`+ isLE52 = (CuraSDKVersion <= "8.2.0") && UM.Application.version != "master" && UM.Application.version != "dev"`
`38`	`40`	`if(is40)`
`39`	`41`	`{`
`40`	`42`	`CuraApplication.log("SidebarGUIPlugin patching interface for Cura 4.0")`
`@@ -59,10 +61,14 @@ Item`
`59`	`61`	`{`
`60`	`62`	`CuraApplication.log("SidebarGUIPlugin patching interface for Cura 5.0 - 5.1")`
`61`	`63`	`}`
`62`		`- else`
	`64`	`+ else if(isLE52)`
`63`	`65`	`{`
`64`	`66`	`CuraApplication.log("SidebarGUIPlugin patching interface for Cura 5.2 and newer")`
`65`	`67`	`}`
	`68`	`+ else`
	`69`	`+ {`
	`70`	`+ CuraApplication.log("SidebarGUIPlugin patching interface for Cura 5.3 and newer")`
	`71`	`+ }`
`66`	`72`
`67`	`73`	`// top-align toolbar (defined in Cura.qml)`
`68`	`74`	`toolbar.visible = true`
`@@ -89,10 +95,14 @@ Item`
`89`	`95`	`{`
`90`	`96`	`messageStack = base.contentItem.children[2].children[3].children[8]`
`91`	`97`	`}`
`92`		`- else`
	`98`	`+ else if(isLE52)`
`93`	`99`	`{`
`94`	`100`	`messageStack = base.contentItem.children[3].children[3].children[8]`
`95`	`101`	`}`
	`102`	`+ else`
	`103`	`+ {`
	`104`	`+ messageStack = base.contentItem.children[4].children[3].children[8]`
	`105`	`+ }`
`96`	`106`	`messageStack.anchors.horizontalCenter = undefined`
`97`	`107`	`messageStack.anchors.left = messageStack.parent.left`
`98`	`108`	`messageStack.anchors.leftMargin = Qt.binding(function()`
`@@ -159,6 +169,13 @@ Item`
`159`	`169`	`customPrintSetup.children[0].height = 0`
`160`	`170`	`customPrintSetup.children[2].anchors.rightMargin = 0`
`161`	`171`
	`172`	`+ var recommendedPrintSetup = printSetupChildren.children[0]`
	`173`	`+ if(!isLE52)`
	`174`	`+ {`
	`175`	`+ recommendedPrintSetup.height = undefined`
	`176`	`+ recommendedPrintSetup.children[0].contentItem.children[0].children[9].children[0].visible = false`
	`177`	`+ }`
	`178`	`+`
`162`	`179`	`// tweak header height`
`163`	`180`	`headerBackground.height = mainWindowHeader.height + UM.Theme.getSize("default_margin").height`
`164`	`181`	`main.anchors.top = main.parent.top`
`@@ -208,10 +225,9 @@ Item`
`208`	`225`	`}`
`209`	`226`	`}`
`210`	`227`
`211`		`- Cura.MachineSelector`
	`228`	`+ Loader`
`212`	`229`	`{`
`213`		`- id: machineSelection`
`214`		`- headerCornerSide: Cura.RoundedRectangle.Direction.All`
	`230`	`+ anchors.left: printSetupSidebar.left`
`215`	`231`	`width: UM.Theme.getSize("machine_selector_widget").width`
`216`	`232`	`height:`
`217`	`233`	`{`
`@@ -222,25 +238,15 @@ Item`
`222`	`238`	`return Math.round(0.5 * UM.Theme.getSize("main_window_header").height)`
`223`	`239`	`}`
`224`	`240`	`}`
`225`		`- anchors.left: printSetupSidebar.left`
`226`	`241`	`y: - Math.floor((UM.Theme.getSize("main_window_header").height + height) / 2)`
`227`	`242`
`228`		`- Component.onCompleted:`
	`243`	`+ source:`
`229`	`244`	`{`
`230`		`- if(isLE410)`
`231`		`- {`
`232`		`- machineSelection.children[1].visible = false // remove shadow`
`233`		`- }`
`234`		`-`
`235`		`- if(isLE46)`
`236`		`- {`
`237`		`- var machineSelectionHeader = machineSelection.children[0].children[3].children[0]`
	`245`	`+ if(isLE52) {`
	`246`	`+ return "MachineSelector40.qml";`
`238`	`247`	`} else {`
`239`		`- var machineSelectionHeader = machineSelection.children[0].children[3].children[1]`
	`248`	`+ return "MachineSelector53.qml";`
`240`	`249`	`}`
`241`		`- // adjust header margins, because the height is smaller than designed`
`242`		`- machineSelectionHeader.anchors.topMargin = 0`
`243`		`- machineSelectionHeader.anchors.bottomMargin = 0`
`244`	`250`	`}`
`245`	`251`	`}`
`246`	`252`