3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-10 15:28:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge branch '2.3' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2016-09-09 13:28:34 +02:00
commit b6e6871f23
8 changed files with 42 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
resources/qml/SidebarHeader.qml
View file

@ -232,6 +232,19 @@ Column
text: Cura.MachineManager.activeMaterialName
tooltip: Cura.MachineManager.activeMaterialName
visible: Cura.MachineManager.hasMaterials
property var valueError:
{
var data = Cura.ContainerManager.getContainerMetaDataEntry(Cura.MachineManager.activeMaterialId, "compatible")
print(data)
if(data == "" || data == "True")
{
return false
}
if(data == "False")
{
return true
}
}
enabled: !extrudersList.visible || base.currentExtruderIndex > -1
height: UM.Theme.getSize("setting_control").height

6
resources/themes/cura/styles.qml
View file

@ -15,7 +15,11 @@ QtObject {
{
if(control.enabled)
{
if(control.valueWarning)
if(control.valueError)
{
return Theme.getColor("setting_validation_error");
}
else if(control.valueWarning)
{
return Theme.getColor("setting_validation_warning");
} else