Browse Source

Rename sidebar_collapsed and code style

sidebar_collapsed is more consistent with other options and setting names we use. Better change it before the next release rolls out otherwise we'd have to do a version upgrade.
Also changed some code style things to be in line with our guidelines.

Contributes to issue CURA-4234.
Ruben D 7 years ago
parent
commit
689a18ee57
3 changed files with 10 additions and 6 deletions
  1. 1 1
      cura/CuraApplication.py
  2. 4 3
      resources/qml/Cura.qml
  3. 5 2
      resources/qml/Topbar.qml

+ 1 - 1
cura/CuraApplication.py

@@ -316,7 +316,7 @@ class CuraApplication(QtApplication):
         preferences.addPreference("cura/material_settings", "{}")
 
         preferences.addPreference("view/invert_zoom", False)
-        preferences.addPreference("cura/sidebar_collapse", False)
+        preferences.addPreference("cura/sidebar_collapsed", False)
 
         self._need_to_show_user_agreement = not Preferences.getInstance().getValue("general/accepted_user_agreement")
 

+ 4 - 3
resources/qml/Cura.qml

@@ -401,7 +401,7 @@ UM.MainWindow
                         collapseSidebarAnimation.start();
                     }
                     collapsed = !collapsed;
-                    UM.Preferences.setValue("cura/sidebar_collapse", collapsed);
+                    UM.Preferences.setValue("cura/sidebar_collapsed", collapsed);
                 }
 
                 anchors
@@ -432,9 +432,10 @@ UM.MainWindow
 
                 Component.onCompleted:
                 {
-                    var sidebarCollapsed = UM.Preferences.getValue("cura/sidebar_collapse");
+                    var sidebar_collapsed = UM.Preferences.getValue("cura/sidebar_collapsed");
 
-                    if (sidebarCollapsed) {
+                    if (sidebar_collapsed)
+                    {
                         sidebar.collapsed = true;
                         viewportRect = Qt.rect(0, 0, 1, 1.0)
                         collapseSidebarAnimation.start();

+ 5 - 2
resources/qml/Topbar.qml

@@ -25,9 +25,12 @@ Rectangle
     property int allItemsWidth: 0;
 
     function updateMarginsAndSizes() {
-        if (UM.Preferences.getValue("cura/sidebar_collapse")) {
+        if (UM.Preferences.getValue("cura/sidebar_collapsed"))
+        {
             rightMargin = UM.Theme.getSize("default_margin").width;
-        } else {
+        }
+        else
+        {
             rightMargin = UM.Theme.getSize("sidebar").width + UM.Theme.getSize("default_margin").width;
         }
         allItemsWidth = (