Merge branch '4.3'

This commit is contained in:
ChrisTerBeke 2019-09-12 12:04:01 +02:00
commit 558698add7
2 changed files with 17 additions and 7 deletions

View file

@ -303,6 +303,17 @@ class GlobalStack(CuraContainerStack):
Logger.log("w", "Firmware file %s not found.", hex_file)
return ""
def getName(self) -> str:
return self._metadata.get("group_name", self._metadata.get("name", ""))
def setName(self, name: "str") -> None:
super().setName(name)
nameChanged = pyqtSignal()
name = pyqtProperty(str, fget=getName, fset=setName, notify=nameChanged)
## private:
global_stack_mime = MimeType(
name = "application/x-cura-globalstack",