From 4c1002bf47f9ae901a3ecae59c34391b4cb8158b Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Fri, 9 Feb 2018 09:19:15 +0100
Subject: [PATCH] Move setting visibility resource type from Uranium to Cura

---
 cura/CuraApplication.py                                      | 4 +++-
 cura/Settings/SettingVisibilityPresetsModel.py               | 5 ++++-
 .../advanced.cfg                                             | 0
 .../basic.cfg                                                | 0
 .../expert.cfg                                               | 0
 5 files changed, 7 insertions(+), 2 deletions(-)
 rename resources/{preset_setting_visibility_groups => setting_visibility}/advanced.cfg (100%)
 rename resources/{preset_setting_visibility_groups => setting_visibility}/basic.cfg (100%)
 rename resources/{preset_setting_visibility_groups => setting_visibility}/expert.cfg (100%)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 19a5b50e65..05ed178bf9 100755
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -130,6 +130,7 @@ class CuraApplication(QtApplication):
         MachineStack = Resources.UserType + 7
         ExtruderStack = Resources.UserType + 8
         DefinitionChangesContainer = Resources.UserType + 9
+        SettingVisibilityPreset = Resources.UserType + 10
 
     Q_ENUMS(ResourceTypes)
 
@@ -183,6 +184,7 @@ class CuraApplication(QtApplication):
         Resources.addStorageType(self.ResourceTypes.ExtruderStack, "extruders")
         Resources.addStorageType(self.ResourceTypes.MachineStack, "machine_instances")
         Resources.addStorageType(self.ResourceTypes.DefinitionChangesContainer, "definition_changes")
+        Resources.addStorageType(self.ResourceTypes.SettingVisibilityPreset, "setting_visibility")
 
         ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.QualityInstanceContainer, "quality")
         ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.QualityInstanceContainer, "quality_changes")
@@ -360,8 +362,8 @@ class CuraApplication(QtApplication):
 
         default_visibility_profile = SettingVisibilityPresetsModel.getInstance().getItem(0)
 
+        preferences.addPreference("general/preset_setting_visibility_choice", default_visibility_profile["id"])
         preferences.setDefault("general/visible_settings", ";".join(default_visibility_profile["settings"]))
-        preferences.setDefault("general/preset_setting_visibility_choice", default_visibility_profile["id"])
 
         preset_setting_visibility_choice = Preferences.getInstance().getValue("general/preset_setting_visibility_choice")
         if not SettingVisibilityPresetsModel.getInstance().find("id", preset_setting_visibility_choice):
diff --git a/cura/Settings/SettingVisibilityPresetsModel.py b/cura/Settings/SettingVisibilityPresetsModel.py
index a5b4541ee4..6052fd2509 100644
--- a/cura/Settings/SettingVisibilityPresetsModel.py
+++ b/cura/Settings/SettingVisibilityPresetsModel.py
@@ -13,6 +13,9 @@ from UM.Qt.ListModel import ListModel
 from UM.Resources import Resources
 from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError
 
+import cura.CuraApplication
+
+
 class SettingVisibilityPresetsModel(ListModel):
     IdRole = Qt.UserRole + 1
     NameRole = Qt.UserRole + 2
@@ -31,7 +34,7 @@ class SettingVisibilityPresetsModel(ListModel):
 
     def _populate(self):
         items = []
-        for item in Resources.getAllResourcesOfType(Resources.PresetSettingVisibilityPresets):
+        for item in Resources.getAllResourcesOfType(cura.CuraApplication.CuraApplication.ResourceTypes.SettingVisibilityPreset):
             try:
                 mime_type = MimeTypeDatabase.getMimeTypeForFile(item)
             except MimeTypeNotFoundError:
diff --git a/resources/preset_setting_visibility_groups/advanced.cfg b/resources/setting_visibility/advanced.cfg
similarity index 100%
rename from resources/preset_setting_visibility_groups/advanced.cfg
rename to resources/setting_visibility/advanced.cfg
diff --git a/resources/preset_setting_visibility_groups/basic.cfg b/resources/setting_visibility/basic.cfg
similarity index 100%
rename from resources/preset_setting_visibility_groups/basic.cfg
rename to resources/setting_visibility/basic.cfg
diff --git a/resources/preset_setting_visibility_groups/expert.cfg b/resources/setting_visibility/expert.cfg
similarity index 100%
rename from resources/preset_setting_visibility_groups/expert.cfg
rename to resources/setting_visibility/expert.cfg