Disable text field when pre-heat button is disabled

More consistent user experience.

Contributes to issue CURA-3161.
This commit is contained in:
Ghostkeeper 2017-02-16 14:01:42 +01:00
parent 9a480ac041
commit 84f695821d
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75

View File

@ -186,9 +186,10 @@ Column
Rectangle //Input field for pre-heat temperature. Rectangle //Input field for pre-heat temperature.
{ {
id: preheatTemperatureControl id: preheatTemperatureControl
color: UM.Theme.getColor("setting_validation_ok") color: !enabled ? UM.Theme.getColor("setting_control_disabled") : UM.Theme.getColor("setting_validation_ok")
enabled: preheatButton.enabled
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: mouseArea.containsMouse ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border") border.color: !enabled ? UM.Theme.getColor("setting_control_disabled_border") : mouseArea.containsMouse ? UM.Theme.getColor("setting_control_border_highlight") : UM.Theme.getColor("setting_control_border")
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.bottom: parent.bottom anchors.bottom: parent.bottom
@ -223,9 +224,10 @@ Column
{ {
id: preheatTemperatureInput id: preheatTemperatureInput
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("setting_control_text") color: !enabled ? UM.Theme.getColor("setting_control_disabled_text") : UM.Theme.getColor("setting_control_text")
selectByMouse: true selectByMouse: true
maximumLength: 10 maximumLength: 10
enabled: parent.enabled
validator: RegExpValidator { regExp: /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } //Floating point regex. validator: RegExpValidator { regExp: /^-?[0-9]{0,9}[.,]?[0-9]{0,10}$/ } //Floating point regex.
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width anchors.leftMargin: UM.Theme.getSize("setting_unit_margin").width