Merge branch 'CURA-5876-Configuration_dropdown' of ssh://github.com/Ultimaker/Cura into CURA-5876-Configuration_dropdown

This commit is contained in:
Ghostkeeper 2018-12-04 15:19:48 +01:00
commit 9c75f3fe0f
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276

View file

@ -181,8 +181,8 @@ Item
{
id: materialSelection
property var valueError: Cura.MachineManager.activeStack != null ? Cura.ContainerManager.getContainerMetaDataEntry(Cura.MachineManager.activeStack.material.id, "compatible", "") != "True" : true
property var valueWarning: !Cura.MachineManager.isActiveQualitySupported
property bool valueError: Cura.MachineManager.activeStack != null ? Cura.ContainerManager.getContainerMetaDataEntry(Cura.MachineManager.activeStack.material.id, "compatible", "") != "True" : true
property bool valueWarning: !Cura.MachineManager.isActiveQualitySupported
text: Cura.MachineManager.activeStack != null ? Cura.MachineManager.activeStack.material.name : ""
tooltip: text
@ -232,4 +232,4 @@ Item
}
}
}
}
}