Factor out Connections to UM.Preferences

Author: fieldOfView

resources/qml/PrintSetupSummary.qml

@@ -132,6 +132,7 @@ Cura.RoundedRectangle
         onClicked:
         {
             UM.Preferences.setValue("view/settings_visible", true)
+            stageMenu.settingsVisible = true
         }
     }
 }

resources/qml/ProfileSelector40.qml

@@ -57,6 +57,7 @@ Item
         onClicked:
         {
             UM.Preferences.setValue("sidebargui/docked_sidebar", !UM.Preferences.getValue("sidebargui/docked_sidebar"))
+            stageMenu.settingsDocked = UM.Preferences.getValue("sidebargui/docked_sidebar")
         }
     }
 
@@ -79,6 +80,7 @@ Item
         onClicked:
         {
             UM.Preferences.setValue("view/settings_visible", false)
+            stageMenu.settingsVisible = false
         }
     }
 }

resources/qml/ProfileSelector44.qml

@@ -201,6 +201,7 @@ Item
         onClicked:
         {
             UM.Preferences.setValue("sidebargui/docked_sidebar", !UM.Preferences.getValue("sidebargui/docked_sidebar"))
+            stageMenu.settingsDocked = UM.Preferences.getValue("sidebargui/docked_sidebar")
         }
     }
 
@@ -223,6 +224,7 @@ Item
         onClicked:
         {
             UM.Preferences.setValue("view/settings_visible", false)
+            stageMenu.settingsVisible = false
         }
     }
 }

resources/qml/SidebarStageMenu.qml

@@ -27,6 +27,11 @@ Item
     property bool sidebarVisible: settingsVisible && (prepareStageActive || !preSlicedData) && settingsDocked
     property real sidebarWidth: sidebarVisible ? printSetupSelector.width : 0
 
+    onSidebarVisibleChanged:
+    {
+        base.onWidthChanged(base.width)
+    }
+
     property var printSetupTooltip
 
     Component.onCompleted:
@@ -150,25 +155,6 @@ Item
         printSetupTooltip = tooltip // defined in Cura.qml
     }
 
-    Connections
-    {
-        target: UM.Preferences
-        onPreferenceChanged:
-        {
-            switch (preference)
-            {
-                case "view/settings_visible":
-                    settingsVisible = UM.Preferences.getValue("view/settings_visible")
-                    base.onWidthChanged(base.width)
-                    break
-                case "sidebargui/docked_sidebar":
-                    settingsDocked = UM.Preferences.getValue("sidebargui/docked_sidebar")
-                    base.onWidthChanged(base.width)
-                    break
-            }
-        }
-    }
-
     Connections
     {
         target: tooltip

resources/qml/StageMain.qml

@@ -11,10 +11,10 @@ Loader
     id: loader
     source: UM.Controller.activeView != null && UM.Controller.activeView.mainComponent != null ? UM.Controller.activeView.mainComponent : ""
 
-    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")
-    property bool sidebarVisible: settingsVisible && !preSlicedData && settingsDocked
+    property bool sidebarVisible:
+    {
+        return base.viewportRect.width != 1;
+    }
 
     onLoaded:
     {
@@ -39,7 +39,7 @@ Loader
                 if(sidebarVisible)
                     return UM.Theme.getSize("default_margin").height;
                 else
-                    return sidebarFooter.height + UM.Theme.getSize("default_margin").height
+                    return sidebarFooter.height + UM.Theme.getSize("default_margin").height;
             });
 
             var layerSlider = item.children[2];
@@ -53,31 +53,13 @@ Loader
             {
                 var unavailableHeight = (stageMenu.item.children[2].height + pathSlider.height + 5 * UM.Theme.getSize("default_margin").height);
                 if(!sidebarVisible)
-                    unavailableHeight = (sidebarFooter.height + stageMenu.item.children[3].height + pathSlider.height + 3 * UM.Theme.getSize("default_margin").height)
+                    unavailableHeight = (sidebarFooter.height + stageMenu.item.children[3].height + pathSlider.height + 5 * UM.Theme.getSize("default_margin").height)
 
                 return Math.min(
                         UM.Theme.getSize("slider_layerview_size").height,
                         contentItem.height - unavailableHeight
-                    );
+                );
             })
         }
     }
-
-    Connections
-    {
-        target: UM.Preferences
-        onPreferenceChanged:
-        {
-            switch (preference)
-            {
-                case "view/settings_visible":
-                    settingsVisible = UM.Preferences.getValue("view/settings_visible")
-                    base.onWidthChanged(base.width)
-                    break
-                case "sidebargui/docked_sidebar":
-                    settingsDocked = UM.Preferences.getValue("sidebargui/docked_sidebar")
-                    break
-            }
-        }
-    }
 }