GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 01:15:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Prevent machines without an extruder from showing "undefined" in the workspace dialog

Browse Source 
This fixes #5572
This commit is contained in:
Jaime van Kessel 2019-04-04 20:07:27 +02:00
parent 13c56d40e7
commit 2dd4a30586
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
resources/qml/Dialogs/WorkspaceSummaryDialog.qml
View File

@ -153,6 +153,8 @@ UM.Dialog
{ {
height: childrenRect.height height: childrenRect.height
width: parent.width width: parent.width
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 Label
{ {
text: { text: {
@ -175,14 +177,30 @@ UM.Dialog
{ {
width: parent.width width: parent.width
height: childrenRect.height height: childrenRect.height
Label 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 width: Math.floor(scroll.width / 3) | 0
} }
Label 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 width: Math.floor(scroll.width / 3) | 0
} }
} }