3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-12-05 16:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'feature_light_colours_icons'

Browse source 
CURA-4148
This commit is contained in:
alekseisasin 2017-09-01 19:25:29 +02:00
commit 24c9dc9bee
116 changed files with 1909 additions and 1461 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/qml/PrintMonitor.qml
View file

@ -353,7 +353,7 @@ Column
Rectangle //Input field for pre-heat temperature.
{
id: preheatTemperatureControl
color: !enabled ? UM.Theme.getColor("setting_control_disabled") : showError ? UM.Theme.getColor("setting_validation_error") : UM.Theme.getColor("setting_validation_ok")
color: !enabled ? UM.Theme.getColor("setting_control_disabled") : showError ? UM.Theme.getColor("setting_validation_error_background") : UM.Theme.getColor("setting_validation_ok")
property var showError:
{
if(bedTemperature.properties.maximum_value != "None" && bedTemperature.properties.maximum_value < parseInt(preheatTemperatureInput.text))