Refactor SettingVisibilityProfiles to SettingVisibilityPresets

This is closer to the current Cura intend

cura/CuraApplication.py

@@ -57,7 +57,7 @@ from cura.Settings.QualityAndUserProfilesModel import QualityAndUserProfilesMode
 from cura.Settings.SettingInheritanceManager import SettingInheritanceManager
 from cura.Settings.UserProfilesModel import UserProfilesModel
 from cura.Settings.SimpleModeSettingsManager import SimpleModeSettingsManager
-from cura.Settings.SettingVisibilityProfilesModel import SettingVisibilityProfilesModel
+from cura.Settings.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel
 
 
 from . import PlatformPhysics
@@ -79,7 +79,7 @@ from cura.Settings.ContainerSettingsModel import ContainerSettingsModel
 from cura.Settings.MaterialSettingsVisibilityHandler import MaterialSettingsVisibilityHandler
 from cura.Settings.QualitySettingsModel import QualitySettingsModel
 from cura.Settings.ContainerManager import ContainerManager
-from cura.Settings.SettingVisibilityProfilesModel import SettingVisibilityProfilesModel
+from cura.Settings.SettingVisibilityPresetsModel import SettingVisibilityPresetsModel
 
 from cura.ObjectsModel import ObjectsModel
 from cura.BuildPlateModel import BuildPlateModel
@@ -358,13 +358,13 @@ class CuraApplication(QtApplication):
 
         preferences.setDefault("local_file/last_used_type", "text/x-gcode")
 
-        default_visibility_profile = SettingVisibilityProfilesModel.getInstance().getItem(0)
+        default_visibility_profile = SettingVisibilityPresetsModel.getInstance().getItem(0)
 
         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 SettingVisibilityProfilesModel.getInstance().find("id", preset_setting_visibility_choice):
+        if not SettingVisibilityPresetsModel.getInstance().find("id", preset_setting_visibility_choice):
             Preferences.getInstance().setValue("general/preset_setting_visibility_choice", default_visibility_profile["id"])
 
         self.applicationShuttingDown.connect(self.saveSettings)
@@ -816,7 +816,7 @@ class CuraApplication(QtApplication):
         qmlRegisterType(MachineNameValidator, "Cura", 1, 0, "MachineNameValidator")
         qmlRegisterType(UserChangesModel, "Cura", 1, 1, "UserChangesModel")
         qmlRegisterSingletonType(ContainerManager, "Cura", 1, 0, "ContainerManager", ContainerManager.createContainerManager)
-        qmlRegisterSingletonType(SettingVisibilityProfilesModel, "Cura", 1, 0, "SettingVisibilityProfilesModel", SettingVisibilityProfilesModel.createSettingVisibilityProfilesModel)
+        qmlRegisterSingletonType(SettingVisibilityPresetsModel, "Cura", 1, 0, "SettingVisibilityPresetsModel", SettingVisibilityPresetsModel.createSettingVisibilityPresetsModel)
 
         # As of Qt5.7, it is necessary to get rid of any ".." in the path for the singleton to work.
         actions_url = QUrl.fromLocalFile(os.path.abspath(Resources.getPath(CuraApplication.ResourceTypes.QmlFiles, "Actions.qml")))

cura/Settings/SettingVisibilityPresetsModel.py

@@ -13,7 +13,7 @@ from UM.Qt.ListModel import ListModel
 from UM.Resources import Resources
 from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError
 
-class SettingVisibilityProfilesModel(ListModel):
+class SettingVisibilityPresetsModel(ListModel):
     IdRole = Qt.UserRole + 1
     NameRole = Qt.UserRole + 2
     SettingsRole = Qt.UserRole + 4
@@ -31,7 +31,7 @@ class SettingVisibilityProfilesModel(ListModel):
 
     def _populate(self):
         items = []
-        for item in Resources.getAllResourcesOfType(Resources.PresetSettingVisibilityGroups):
+        for item in Resources.getAllResourcesOfType(Resources.PresetSettingVisibilityPresets):
             try:
                 mime_type = MimeTypeDatabase.getMimeTypeForFile(item)
             except MimeTypeNotFoundError:
@@ -76,15 +76,15 @@ class SettingVisibilityProfilesModel(ListModel):
 
     # Factory function, used by QML
     @staticmethod
-    def createSettingVisibilityProfilesModel(engine, js_engine):
-        return SettingVisibilityProfilesModel.getInstance()
+    def createSettingVisibilityPresetsModel(engine, js_engine):
+        return SettingVisibilityPresetsModel.getInstance()
 
     ##  Get the singleton instance for this class.
     @classmethod
-    def getInstance(cls) -> "SettingVisibilityProfilesModel":
+    def getInstance(cls) -> "SettingVisibilityPresetsModel":
         # Note: Explicit use of class name to prevent issues with inheritance.
-        if not SettingVisibilityProfilesModel.__instance:
-            SettingVisibilityProfilesModel.__instance = cls()
-        return SettingVisibilityProfilesModel.__instance
+        if not SettingVisibilityPresetsModel.__instance:
+            SettingVisibilityPresetsModel.__instance = cls()
+        return SettingVisibilityPresetsModel.__instance
 
-    __instance = None   # type: "SettingVisibilityProfilesModel"
+    __instance = None   # type: "SettingVisibilityPresetsModel"

resources/qml/Menus/SettingVisibilityPresetsMenu.qml

@@ -40,7 +40,7 @@ Menu
 
     Instantiator
     {
-        model: Cura.SettingVisibilityProfilesModel
+        model: Cura.SettingVisibilityPresetsModel
 
         MenuItem
         {

resources/qml/Preferences/SettingVisibilityPage.qml

@@ -123,7 +123,7 @@ UM.PreferencesPage
                 right: parent.right
             }
 
-            model: Cura.SettingVisibilityProfilesModel
+            model: Cura.SettingVisibilityPresetsModel
             textRole: "name"
 
             currentIndex:

resources/qml/Settings/SettingView.qml

@@ -110,7 +110,7 @@ Item
 
     ToolButton
     {
-        id: settingVisibilityProfileMenu
+        id: settingVisibilityMenu
 
         width: height
         height: UM.Theme.getSize("setting_control").height
@@ -137,7 +137,7 @@ Item
             }
             label: Label{}
         }
-        menu: SettingVisibilityProfilesMenu
+        menu: SettingVisibilityPresetsMenu
         {
             showingSearchResults: findingSettings
             showingAllSettings: showingAllSettings
@@ -185,7 +185,7 @@ Item
             topMargin: UM.Theme.getSize("sidebar_margin").height
             left: parent.left
             leftMargin: UM.Theme.getSize("sidebar_margin").width
-            right: settingVisibilityProfileMenu.left
+            right: settingVisibilityMenu.left
             rightMargin: Math.floor(UM.Theme.getSize("default_margin").width / 2)
         }
         height: visible ? UM.Theme.getSize("setting_control").height : 0