diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index e832d6ccfb..74102a862b 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -117,6 +117,10 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): builder.data(metadata.pop("color_name", "")) builder.end("color") + builder.start("label") + builder.data(self._name) + builder.end("label") + builder.end("name") ## End Name Block @@ -235,8 +239,12 @@ class XmlMaterialProfile(UM.Settings.InstanceContainer): brand = entry.find("./um:brand", self.__namespaces) material = entry.find("./um:material", self.__namespaces) color = entry.find("./um:color", self.__namespaces) + label = entry.find("./um:label", self.__namespaces) - self.setName(self._profile_name(material.text, color.text)) + if label: + self.setName(label.text) + else: + self.setName(self._profile_name(material.text, color.text)) self.addMetaDataEntry("brand", brand.text) self.addMetaDataEntry("material", material.text) diff --git a/resources/qml/Preferences/MaterialsPage.qml b/resources/qml/Preferences/MaterialsPage.qml index 0bd2d16fb3..43182ef581 100644 --- a/resources/qml/Preferences/MaterialsPage.qml +++ b/resources/qml/Preferences/MaterialsPage.qml @@ -282,7 +282,6 @@ UM.ManagementPage { return } - materialProperties.name = currentItem.name; if(currentItem.metadata != undefined && currentItem.metadata != null) @@ -305,6 +304,7 @@ UM.ManagementPage materialProperties.density = 0.0; materialProperties.diameter = 0.0; } + } } }