Move setting visibility resource type from Uranium to Cura

This commit is contained in:
fieldOfView 2018-02-09 09:19:15 +01:00
parent f79e787f2c
commit 4c1002bf47
5 changed files with 7 additions and 2 deletions

View file

@ -130,6 +130,7 @@ class CuraApplication(QtApplication):
MachineStack = Resources.UserType + 7 MachineStack = Resources.UserType + 7
ExtruderStack = Resources.UserType + 8 ExtruderStack = Resources.UserType + 8
DefinitionChangesContainer = Resources.UserType + 9 DefinitionChangesContainer = Resources.UserType + 9
SettingVisibilityPreset = Resources.UserType + 10
Q_ENUMS(ResourceTypes) Q_ENUMS(ResourceTypes)
@ -183,6 +184,7 @@ class CuraApplication(QtApplication):
Resources.addStorageType(self.ResourceTypes.ExtruderStack, "extruders") Resources.addStorageType(self.ResourceTypes.ExtruderStack, "extruders")
Resources.addStorageType(self.ResourceTypes.MachineStack, "machine_instances") Resources.addStorageType(self.ResourceTypes.MachineStack, "machine_instances")
Resources.addStorageType(self.ResourceTypes.DefinitionChangesContainer, "definition_changes") 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")
ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.QualityInstanceContainer, "quality_changes") ContainerRegistry.getInstance().addResourceType(self.ResourceTypes.QualityInstanceContainer, "quality_changes")
@ -360,8 +362,8 @@ class CuraApplication(QtApplication):
default_visibility_profile = SettingVisibilityPresetsModel.getInstance().getItem(0) 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/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") preset_setting_visibility_choice = Preferences.getInstance().getValue("general/preset_setting_visibility_choice")
if not SettingVisibilityPresetsModel.getInstance().find("id", preset_setting_visibility_choice): if not SettingVisibilityPresetsModel.getInstance().find("id", preset_setting_visibility_choice):

View file

@ -13,6 +13,9 @@ from UM.Qt.ListModel import ListModel
from UM.Resources import Resources from UM.Resources import Resources
from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError
import cura.CuraApplication
class SettingVisibilityPresetsModel(ListModel): class SettingVisibilityPresetsModel(ListModel):
IdRole = Qt.UserRole + 1 IdRole = Qt.UserRole + 1
NameRole = Qt.UserRole + 2 NameRole = Qt.UserRole + 2
@ -31,7 +34,7 @@ class SettingVisibilityPresetsModel(ListModel):
def _populate(self): def _populate(self):
items = [] items = []
for item in Resources.getAllResourcesOfType(Resources.PresetSettingVisibilityPresets): for item in Resources.getAllResourcesOfType(cura.CuraApplication.CuraApplication.ResourceTypes.SettingVisibilityPreset):
try: try:
mime_type = MimeTypeDatabase.getMimeTypeForFile(item) mime_type = MimeTypeDatabase.getMimeTypeForFile(item)
except MimeTypeNotFoundError: except MimeTypeNotFoundError: