From 711d60e8c7e2948f80e50f7c339dcfa27e21d6ee Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Fri, 9 Mar 2018 16:30:37 +0100
Subject: [PATCH] Allow switching back to the "Custom" set

---
 .../Settings/SettingVisibilityPresetsModel.py | 27 ++++++++++++++++---
 .../Menus/SettingVisibilityPresetsMenu.qml    |  2 ++
 .../qml/Preferences/SettingVisibilityPage.qml |  5 ++++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/cura/Settings/SettingVisibilityPresetsModel.py b/cura/Settings/SettingVisibilityPresetsModel.py
index 9ec8875a39..e5a2e24412 100644
--- a/cura/Settings/SettingVisibilityPresetsModel.py
+++ b/cura/Settings/SettingVisibilityPresetsModel.py
@@ -29,10 +29,12 @@ class SettingVisibilityPresetsModel(ListModel):
 
         self._populate()
 
-        preferences = Preferences.getInstance()
-        preferences.addPreference("cura/active_setting_visibility_preset", "custom")
+        self._preferences = Preferences.getInstance()
+        self._preferences.addPreference("cura/active_setting_visibility_preset", "custom") # Preference to store which preset is currently selected
+        self._preferences.addPreference("cura/custom_visible_settings", "") # Preference that stores the "custom" set so it can always be restored (even after a restart)
+        self._preferences.preferenceChanged.connect(self._onPreferencesChanged)
 
-        self._active_preset = Preferences.getInstance().getValue("cura/active_setting_visibility_preset")
+        self._active_preset = self._preferences.getValue("cura/active_setting_visibility_preset")
         if self.find("id", self._active_preset) < 0:
             self._active_preset = "custom"
 
@@ -90,7 +92,12 @@ class SettingVisibilityPresetsModel(ListModel):
             Logger.log("w", "Tried to set active preset to unknown id %s", preset_id)
             return
 
-        Preferences.getInstance().setValue("cura/active_setting_visibility_preset", preset_id);
+        if preset_id == "custom" and self._active_preset == "custom":
+            # Copy current visibility set to custom visibility set preference so it can be restored later
+            visibility_string = self._preferences.getValue("general/visible_settings")
+            self._preferences.setValue("cura/custom_visible_settings", visibility_string)
+
+        self._preferences.setValue("cura/active_setting_visibility_preset", preset_id)
 
         self._active_preset = preset_id
         self.activePresetChanged.emit()
@@ -101,6 +108,18 @@ class SettingVisibilityPresetsModel(ListModel):
     def activePreset(self):
         return self._active_preset
 
+    def _onPreferencesChanged(self, name):
+        if name != "general/visible_settings":
+            return
+
+        if self._active_preset != "custom":
+            return
+
+        # Copy current visibility set to custom visibility set preference so it can be restored later
+        visibility_string = self._preferences.getValue("general/visible_settings")
+        self._preferences.setValue("cura/custom_visible_settings", visibility_string)
+
+
     # Factory function, used by QML
     @staticmethod
     def createSettingVisibilityPresetsModel(engine, js_engine):
diff --git a/resources/qml/Menus/SettingVisibilityPresetsMenu.qml b/resources/qml/Menus/SettingVisibilityPresetsMenu.qml
index de9eac08cf..19c36e6118 100644
--- a/resources/qml/Menus/SettingVisibilityPresetsMenu.qml
+++ b/resources/qml/Menus/SettingVisibilityPresetsMenu.qml
@@ -27,6 +27,8 @@ Menu
         onTriggered:
         {
             Cura.SettingVisibilityPresetsModel.setActivePreset("custom");
+            // Restore custom set from preference
+            UM.Preferences.setValue("general/visible_settings", UM.Preferences.getValue("cura/custom_visible_settings"));
             showSettingVisibilityProfile();
         }
     }
diff --git a/resources/qml/Preferences/SettingVisibilityPage.qml b/resources/qml/Preferences/SettingVisibilityPage.qml
index bc271971b4..f0c24e2cbe 100644
--- a/resources/qml/Preferences/SettingVisibilityPage.qml
+++ b/resources/qml/Preferences/SettingVisibilityPage.qml
@@ -164,6 +164,11 @@ UM.PreferencesPage
                     UM.Preferences.setValue("general/visible_settings", Cura.SettingVisibilityPresetsModel.getItem(index - 1).settings.join(";"));
                     // "Custom selection" entry is added in front, so index is off by 1
                 }
+                else
+                {
+                    // Restore custom set from preference
+                    UM.Preferences.setValue("general/visible_settings", UM.Preferences.getValue("cura/custom_visible_settings"));
+                }
                 base.inhibitSwitchToCustom = false;
             }
         }