3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0

Browse source
This commit is contained in:
ChrisTerBeke 2017-09-28 09:21:53 +02:00
commit bff79c63d5
17 changed files with 1414 additions and 1664 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/qml/PrintMonitor.qml
View file

@ -164,6 +164,7 @@ Column
id: materialColor
width: materialName.height * 0.75
height: materialName.height * 0.75
radius: width / 2
color: (connectedPrinter != null && connectedPrinter.materialColors[index] != null && connectedPrinter.materialIds[index] != "") ? connectedPrinter.materialColors[index] : "#00000000"
border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining")