diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 46e73e6194..c4e1c416dd 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -313,7 +313,7 @@ class CuraApplication(QtApplication): preferences.addPreference("cura/material_settings", "{}") preferences.addPreference("view/invert_zoom", False) - preferences.addPreference("general/sidebar_collapse", False) + preferences.addPreference("cura/sidebar_collapse", False) self._need_to_show_user_agreement = not Preferences.getInstance().getValue("general/accepted_user_agreement") diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 8cce20d19f..91098bbb29 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -390,18 +390,18 @@ UM.MainWindow property bool collapsed: false; property var initialWidth: UM.Theme.getSize("sidebar").width; - function callExpandOrCollapse(){ - if(collapsed){ - sidebar.visible = true - sidebar.initialWidth = UM.Theme.getSize("sidebar").width - viewportRect = Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0) + function callExpandOrCollapse() { + if (collapsed) { + sidebar.visible = true; + sidebar.initialWidth = UM.Theme.getSize("sidebar").width; + viewportRect = Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0); expandSidebarAnimation.start(); - }else{ - viewportRect = Qt.rect(0, 0, 1, 1.0) - collapsSidebarAnimation.start(); + } else { + viewportRect = Qt.rect(0, 0, 1, 1.0); + collapseSidebarAnimation.start(); } collapsed = !collapsed; - UM.Preferences.setValue("general/sidebar_collapse", collapsed); + UM.Preferences.setValue("cura/sidebar_collapse", collapsed); } anchors @@ -415,7 +415,7 @@ UM.MainWindow source: UM.Controller.activeStage.sidebarComponent NumberAnimation { - id: collapsSidebarAnimation + id: collapseSidebarAnimation target: sidebar properties: "x" to: base.width @@ -432,12 +432,12 @@ UM.MainWindow Component.onCompleted: { - var sidebarCollaps = UM.Preferences.getValue("general/sidebar_collapse") + var sidebarCollapsed = UM.Preferences.getValue("cura/sidebar_collapse"); - if (sidebarCollaps == true){ + if (sidebarCollapsed) { sidebar.collapsed = true; viewportRect = Qt.rect(0, 0, 1, 1.0) - collapsSidebarAnimation.start(); + collapseSidebarAnimation.start(); } } }