diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 2a456c3ff1..6bc407928b 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -498,6 +498,17 @@ class MachineManager(QObject): return "" + @pyqtProperty("QVariantList", notify=activeVariantChanged) + def activeVariantNames(self): + result = [] + if ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks() is not None: + for stack in ExtruderManager.getInstance().getActiveGlobalAndExtruderStacks(): + variant_container = stack.findContainer({"type": "variant"}) + if variant_container and variant_container != self._empty_variant_container: + result.append(variant_container.getName()) + + return result + @pyqtProperty("QVariantList", notify = activeMaterialChanged) def activeMaterialNames(self): result = [] @@ -987,7 +998,7 @@ class MachineManager(QObject): if self._global_container_stack: definition = self._global_container_stack.getBottom() if definition: - return definition.getMetaDataEntry("name", "") + return definition.getName() return "" diff --git a/resources/qml/WorkspaceSummaryDialog.qml b/resources/qml/WorkspaceSummaryDialog.qml index 1f52dd3719..61022ca3b4 100644 --- a/resources/qml/WorkspaceSummaryDialog.qml +++ b/resources/qml/WorkspaceSummaryDialog.qml @@ -102,7 +102,7 @@ UM.Dialog } Label { - text: manager.activeDefinitionName + text: Cura.MachineManager.activeDefinitionName width: parent.width / 3 } } @@ -120,8 +120,37 @@ UM.Dialog text: Cura.MachineManager.activeMachineName width: parent.width / 3 } - } + + Repeater + { + model: Cura.MachineManager.activeMaterialNames + delegate: Column + { + Label + { + text: catalog.i18nc("@action:label", "Extruder %1").arg(index+1) + } + height: childrenRect.height + width: parent.width + Row + { + width: parent.width + height: childrenRect.height + Label + { + text: catalog.i18nc("@action:label", "%1 & material").arg(Cura.MachineManager.activeDefinitionVariantsName) + width: parent.width / 3 + } + Label + { + text: Cura.MachineManager.activeVariantNames[index] + ", " + modelData + width: parent.width / 3 + } + } + } + } + Item // Spacer { height: spacerHeight