Use explicit bindings instead of Connections for oft-occurring changes

Author: fieldOfView

resources/qml/MonitorStageMenu.qml

@@ -14,9 +14,6 @@ Item
     signal showTooltip(Item item, point location, string text)
     signal hideTooltip()
 
-    property var messageStack
-    property var stagesListContainer
-
     property bool is40
     property bool isLE44
     property bool isLE46
@@ -28,25 +25,37 @@ Item
         isLE46 = (CuraSDKVersion <= "7.2.0") && UM.Application.version != "master"
 
         // adjust message stack position for sidebar
-        messageStack = base.contentItem.children[0].children[3].children[8]
-        messageStack.anchors.leftMargin = Math.floor((base.width - printSetupSelector.width) / 2)
+        var messageStack
+        if(is40)
+        {
+            messageStack = base.contentItem.children[0].children[3].children[7]
+        }
+        else if(isLE44)
+        {
+            messageStack = base.contentItem.children[2].children[3].children[7]
+        }
+        else
+        {
+            messageStack = base.contentItem.children[2].children[3].children[8]
+        }
+        messageStack.anchors.leftMargin = Qt.binding(function()
+        {
+            return Math.floor((base.width) / 2)
+        })
 
         // adjust stages menu position for sidebar
-        stagesListContainer = mainWindowHeader.children[1]
-        stagesListContainer.anchors.leftMargin = Math.floor((base.width - printSetupSelector.width - stagesListContainer.width) / 2)
-    }
-
-    Connections
-    {
-        target: base
-        onWidthChanged:
+        var stagesListContainer = mainWindowHeader.children[1]
+        stagesListContainer.anchors.leftMargin = Qt.binding(function()
         {
-            // adjust message stack position for sidebar
-            messageStack.anchors.leftMargin = Math.floor((base.width - printSetupSelector.width) / 2)
+            return Math.floor((base.width - printSetupSelector.width - stagesListContainer.width) / 2)
+        })
 
-            // adjust stages menu position for sidebar
-            stagesListContainer.anchors.leftMargin = Math.floor((base.width - printSetupSelector.width - stagesListContainer.width) / 2)
-        }
+        // hide application logo if there is no room for it
+        var applicationLogo = mainWindowHeader.children[0] // declared as property above
+        applicationLogo.visible = Qt.binding(function()
+        {
+            return stagesListContainer.anchors.leftMargin > applicationLogo.width + 2 * UM.Theme.getSize("default_margin").width
+        })
     }
 
     Cura.MachineSelector

resources/qml/SidebarStageMenu.qml

@@ -13,15 +13,14 @@ Item
 {
     id: stageMenu
 
-    property var messageStack
-    property var stagesListContainer
-    property var applicationLogo
-
     property bool is40
     property bool isLE44
     property bool isLE46
 
-    property bool prepareStageActive: UM.Controller.activeStage.toString().indexOf("PrepareStage") > 0
+    property bool prepareStageActive: Qt.binding(function()
+    {
+        return UM.Controller.activeStage.toString().indexOf("PrepareStage") > 0
+    })
     property bool preSlicedData: PrintInformation !== null && PrintInformation.preSliced
     property bool settingsVisible: UM.Preferences.getValue("view/settings_visible")
     property bool settingsDocked: UM.Preferences.getValue("sidebargui/docked_sidebar")
@@ -64,34 +63,49 @@ Item
         viewOrientationControls.anchors.margins = 0
 
         // adjust message stack position for sidebar
+        var messageStack
         if(is40)
         {
-            messageStack = base.contentItem.children[0].children[3].children[7] // declared as property above
+            messageStack = base.contentItem.children[0].children[3].children[7]
         }
         else if(isLE44)
         {
-            messageStack = base.contentItem.children[2].children[3].children[7] // declared as property above
+            messageStack = base.contentItem.children[2].children[3].children[7]
         }
         else
         {
-            messageStack = base.contentItem.children[2].children[3].children[8] // declared as property above
+            messageStack = base.contentItem.children[2].children[3].children[8]
         }
         messageStack.anchors.horizontalCenter = undefined
         messageStack.anchors.left = messageStack.parent.left
-        messageStack.anchors.leftMargin = Math.floor((base.width - printSetupSelector.width) / 2)
+        messageStack.anchors.leftMargin = Qt.binding(function()
+        {
+            return Math.floor((base.width - printSetupSelector.width) / 2)
+        })
 
         // adjust stages menu position for sidebar
-        stagesListContainer = mainWindowHeader.children[1] // declared as property above
+        var stagesListContainer = mainWindowHeader.children[1]
         stagesListContainer.anchors.horizontalCenter = undefined
         stagesListContainer.anchors.left = stagesListContainer.parent.left
-        stagesListContainer.anchors.leftMargin = Math.floor((base.width - printSetupSelector.width - stagesListContainer.width) / 2)
+        stagesListContainer.anchors.leftMargin = Qt.binding(function()
+        {
+            return Math.floor((base.width - printSetupSelector.width - stagesListContainer.width) / 2)
+        })
+
 
         // hide application logo if there is no room for it
-        applicationLogo = mainWindowHeader.children[0] // declared as property above
-        applicationLogo.visible = stagesListContainer.anchors.leftMargin > applicationLogo.width + 2 * UM.Theme.getSize("default_margin").width
+        var applicationLogo = mainWindowHeader.children[0]
+        applicationLogo.visible = Qt.binding(function()
+        {
+            return stagesListContainer.anchors.leftMargin > applicationLogo.width + 2 * UM.Theme.getSize("default_margin").width
+        })
 
         // compensate viewport for full-height sidebar
-        base.viewportRect = Qt.rect(0, 0, (base.width - sidebarWidth) / base.width, 1.0)
+        base.viewportRect = Qt.binding(function()
+        {
+            return Qt.rect(0, 0, (base.width - sidebarWidth) / base.width, 1.0)
+        })
+
 
         // make settingview take up available height
         var printSetupContent = printSetupSelector.contentItem
@@ -136,25 +150,6 @@ Item
         printSetupTooltip = tooltip // defined in Cura.qml
     }
 
-    Connections
-    {
-        target: base
-        onWidthChanged:
-        {
-            // compensate viewport for full-height sidebar
-            base.viewportRect = Qt.rect(0, 0, (base.width - sidebarWidth) / base.width, 1.0)
-
-            // adjust message stack position for sidebar
-            messageStack.anchors.leftMargin = Math.floor((base.width - printSetupSelector.width) / 2)
-
-            // adjust stages menu position for sidebar
-            stagesListContainer.anchors.leftMargin = Math.floor((base.width - printSetupSelector.width - stagesListContainer.width) / 2)
-
-            // hide application logo if there is no room for it
-            applicationLogo.visible = stagesListContainer.anchors.leftMargin > applicationLogo.width + 2 * UM.Theme.getSize("default_margin").width
-        }
-    }
-
     Connections
     {
         target: UM.Preferences
@@ -174,15 +169,6 @@ Item
         }
     }
 
-    Connections
-    {
-        target: UM.Controller
-        onActiveStageChanged:
-        {
-            prepareStageActive = (UM.Controller.activeStage.toString().indexOf("PrepareStage") == 0)
-        }
-    }
-
     Connections
     {
         target: tooltip