From 2dd4a3058640f5e62563cb0c2447f576ff0282c1 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 4 Apr 2019 20:07:27 +0200 Subject: [PATCH] Prevent machines without an extruder from showing "undefined" in the workspace dialog This fixes #5572 --- .../qml/Dialogs/WorkspaceSummaryDialog.qml | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml index 25cde33c99..f20a83a5e3 100644 --- a/resources/qml/Dialogs/WorkspaceSummaryDialog.qml +++ b/resources/qml/Dialogs/WorkspaceSummaryDialog.qml @@ -153,7 +153,9 @@ UM.Dialog { height: childrenRect.height width: parent.width - Label + property string variantName: Cura.MachineManager.activeVariantNames[modelData] !== undefined ? Cura.MachineManager.activeVariantNames[modelData]: "" + property string materialName: Cura.MachineManager.getExtruder(modelData).material.name !== undefined ? Cura.MachineManager.getExtruder(modelData).material.name : "" + Label { text: { var extruder = Number(modelData) @@ -175,14 +177,30 @@ UM.Dialog { width: parent.width height: childrenRect.height + Label { - text: catalog.i18nc("@action:label", "%1 & material").arg(Cura.MachineManager.activeDefinitionVariantsName) + text: + { + if(variantName !== "" && materialName !== "") + { + return catalog.i18nc("@action:label", "%1 & material").arg(Cura.MachineManager.activeDefinitionVariantsName) + } + return catalog.i18nc("@action:label", "Material") + } width: Math.floor(scroll.width / 3) | 0 } Label { - text: Cura.MachineManager.activeVariantNames[modelData] + ", " + Cura.MachineManager.getExtruder(modelData).material.name + text: + { + if(variantName !== "" && materialName !== "") + { + return variantName + ", " + materialName + } + return materialName + } + width: Math.floor(scroll.width / 3) | 0 } }