From 2660d158570e44958aee278f5e8699f7bf8023d2 Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Mon, 19 Mar 2018 10:42:46 +0100
Subject: [PATCH] Make "show all settings" work

CURA-5088

"Show All Settings" in setting visibility menu now sets all settings
to be visible.
---
 .../Menus/SettingVisibilityPresetsMenu.qml    |  5 +---
 .../qml/Preferences/SettingVisibilityPage.qml |  4 +--
 resources/qml/Settings/SettingView.qml        | 29 ++++---------------
 3 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/resources/qml/Menus/SettingVisibilityPresetsMenu.qml b/resources/qml/Menus/SettingVisibilityPresetsMenu.qml
index 0753c83b17..47f8846050 100644
--- a/resources/qml/Menus/SettingVisibilityPresetsMenu.qml
+++ b/resources/qml/Menus/SettingVisibilityPresetsMenu.qml
@@ -13,11 +13,8 @@ Menu
     title: catalog.i18nc("@action:inmenu", "Visible Settings")
 
     property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
-    property bool showingSearchResults
-    property bool showingAllSettings
 
     signal showAllSettings()
-    signal showSettingVisibilityProfile()
 
     Instantiator
     {
@@ -43,7 +40,7 @@ Menu
     MenuSeparator {}
     MenuItem
     {
-        text: catalog.i18nc("@action:inmenu", "All Settings")
+        text: catalog.i18nc("@action:inmenu", "Show All Settings")
         checkable: true
         checked: showingAllSettings
         exclusiveGroup: group
diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml
index b6b1c133ed..d5ff57cb7c 100644
--- a/resources/qml/Preferences/SettingVisibilityPage.qml
+++ b/resources/qml/Preferences/SettingVisibilityPage.qml
@@ -72,11 +72,11 @@ UM.PreferencesPage
                 {
                     if(parent.checkedState == Qt.Unchecked || parent.checkedState == Qt.PartiallyChecked)
                     {
-                        definitionsModel.setAllVisible(true)
+                        definitionsModel.setAllExpandedVisible(true)
                     }
                     else
                     {
-                        definitionsModel.setAllVisible(false)
+                        definitionsModel.setAllExpandedVisible(false)
                     }
 
                     // After change set "Custom" option
diff --git a/resources/qml/Settings/SettingView.qml b/resources/qml/Settings/SettingView.qml
index cf9697210b..199db1bbaa 100644
--- a/resources/qml/Settings/SettingView.qml
+++ b/resources/qml/Settings/SettingView.qml
@@ -18,7 +18,6 @@ Item
     property QtObject settingVisibilityPresetsModel: CuraApplication.getSettingVisibilityPresetsModel()
     property Action configureSettings
     property bool findingSettings
-    property bool showingAllSettings
     signal showTooltip(Item item, point location, string text)
     signal hideTooltip()
 
@@ -140,21 +139,9 @@ Item
         }
         menu: SettingVisibilityPresetsMenu
         {
-            showingSearchResults: findingSettings
-            showingAllSettings: showingAllSettings
-
             onShowAllSettings:
             {
-                base.showingAllSettings = true;
-                base.findingSettings = false;
-                filter.text = "";
-                filter.updateDefinitionModel();
-            }
-            onShowSettingVisibilityProfile:
-            {
-                base.showingAllSettings = false;
-                base.findingSettings = false;
-                filter.text = "";
+                definitionsModel.setAllVisible(true);
                 filter.updateDefinitionModel();
             }
         }
@@ -219,10 +206,6 @@ Item
                 findingSettings = (text.length > 0);
                 if(findingSettings != lastFindingSettings)
                 {
-                    if(findingSettings)
-                    {
-                        showingAllSettings = false;
-                    }
                     updateDefinitionModel();
                     lastFindingSettings = findingSettings;
                 }
@@ -235,7 +218,7 @@ Item
 
             function updateDefinitionModel()
             {
-                if(findingSettings || showingAllSettings)
+                if(findingSettings)
                 {
                     expandedCategories = definitionsModel.expanded.slice();
                     definitionsModel.expanded = [""]; // keep categories closed while to prevent render while making settings visible one by one
@@ -558,13 +541,13 @@ Item
                 MenuItem
                 {
                     //: Settings context menu action
-                    visible: !(findingSettings || showingAllSettings);
+                    visible: !findingSettings
                     text: catalog.i18nc("@action:menu", "Hide this setting");
                     onTriggered:
                     {
                         definitionsModel.hide(contextMenu.key);
                         // visible settings have changed, so we're no longer showing a preset
-                        if (settingVisibilityPresetsModel.activePreset != "" && !showingAllSettings)
+                        if (settingVisibilityPresetsModel.activePreset != "")
                         {
                             settingVisibilityPresetsModel.setActivePreset("custom");
                         }
@@ -584,7 +567,7 @@ Item
                             return catalog.i18nc("@action:menu", "Keep this setting visible");
                         }
                     }
-                    visible: (findingSettings || showingAllSettings);
+                    visible: findingSettings
                     onTriggered:
                     {
                         if (contextMenu.settingVisible)
@@ -596,7 +579,7 @@ Item
                             definitionsModel.show(contextMenu.key);
                         }
                         // visible settings have changed, so we're no longer showing a preset
-                        if (settingVisibilityPresetsModel.activePreset != "" && !showingAllSettings)
+                        if (settingVisibilityPresetsModel.activePreset != "")
                         {
                             settingVisibilityPresetsModel.setActivePreset("custom");
                         }