GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 23:16:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't display material if an unknown material is given

Browse Source 
This makes it more clear for the cases other than UM3.

Contributes to issue CURA-3161.
This commit is contained in:
Ghostkeeper 2017-02-10 16:05:18 +01:00
parent 6629c8d0cf
commit 440508f002
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/qml/PrintMonitor.qml
View File

@ -109,10 +109,10 @@ Column
id: materialColor id: materialColor
width: materialName.height * 0.75 width: materialName.height * 0.75
height: materialName.height * 0.75 height: materialName.height * 0.75
color: (connectedPrinter != null && connectedPrinter.materialColors[index] != null) ? connectedPrinter.materialColors[index] : "#00000000" color: (connectedPrinter != null && connectedPrinter.materialColors[index] != null && connectedPrinter.materialIds[index] != "") ? connectedPrinter.materialColors[index] : "#00000000"
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining") border.color: UM.Theme.getColor("lining")
visible: (connectedPrinter != null && connectedPrinter.materialColors[index] != null) visible: connectedPrinter != null && connectedPrinter.materialColors[index] != null && connectedPrinter.materialIds[index] != ""
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: materialName.verticalCenter anchors.verticalCenter: materialName.verticalCenter
@ -120,7 +120,7 @@ Column
Label //Material name. Label //Material name.
{ {
id: materialName id: materialName
text: (connectedPrinter != null && connectedPrinter.materialNames[index] != null) ? connectedPrinter.materialNames[index] : "" text: (connectedPrinter != null && connectedPrinter.materialNames[index] != null && connectedPrinter.materialIds[index] != "") ? connectedPrinter.materialNames[index] : ""
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
anchors.left: materialColor.right anchors.left: materialColor.right