diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 84b78c1d6a..01294930ea 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -21,13 +21,11 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): ## Overridden from InstanceContainer def duplicate(self, new_id, new_name = None): base_file = self.getMetaDataEntry("base_file", None) - new_uuid = str(uuid.uuid4()) if base_file: containers = UM.Settings.ContainerRegistry.getInstance().findInstanceContainers(id = base_file) if containers: new_basefile = containers[0].duplicate(self.getMetaDataEntry("brand") + "_" + new_id, new_name) - new_basefile.setMetaDataEntry("GUID", new_uuid) base_file = new_basefile.id UM.Settings.ContainerRegistry.getInstance().addContainer(new_basefile) @@ -39,7 +37,6 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): new_id += "_" + variant_containers[0].getName().replace(" ", "_") result = super().duplicate(new_id, new_name) - result.setMetaDataEntry("GUID", new_uuid) if result.getMetaDataEntry("base_file", None): result.setMetaDataEntry("base_file", base_file) return result diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml index f4a8df1dcf..a5bca7fe42 100644 --- a/resources/qml/Preferences/MaterialsPage.qml +++ b/resources/qml/Preferences/MaterialsPage.qml @@ -67,8 +67,6 @@ UM.ManagementPage enabled: base.currentItem != null && base.currentItem.id != Cura.MachineManager.activeMaterialId onClicked: Cura.MachineManager.setActiveMaterial(base.currentItem.id) }, - /* - // disabled because it has a lot of issues Button { text: catalog.i18nc("@action:button", "Duplicate"); @@ -91,7 +89,7 @@ UM.ManagementPage Cura.MachineManager.setActiveMaterial(material_id) } - }, */ + }, Button { text: catalog.i18nc("@action:button", "Remove"); @@ -188,7 +186,7 @@ UM.ManagementPage object: base.currentItem != null ? base.currentItem.name : "" onYes: { - var containers = Cura.ContainerManager.findInstanceContainers({"GUID": base.currentItem.metadata.GUID}) + var containers = Cura.ContainerManager.findInstanceContainers({"id": base.currentItem.id}) for(var i in containers) { Cura.ContainerManager.removeContainer(containers[i])