From ab444943cba64ff6e370a12e4266baa91b1fd739 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 23 Aug 2017 13:30:25 +0200 Subject: [PATCH] Rename setting_validation_error/warning and border In some places we want to use the bright error or warning colours to display that something is going on. In those places we'd like to refer to the colour setting_validation_error rather than setting_validation_error_border or something, so I'm renaming these four theme items. Contributes to issue CURA-4148. --- resources/qml/PrintMonitor.qml | 2 +- resources/qml/Settings/SettingTextField.qml | 8 ++++---- resources/qml/SidebarHeader.qml | 2 +- resources/themes/cura/theme.json | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml index 41e8794014..dc2467174f 100644 --- a/resources/qml/PrintMonitor.qml +++ b/resources/qml/PrintMonitor.qml @@ -320,7 +320,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)) diff --git a/resources/qml/Settings/SettingTextField.qml b/resources/qml/Settings/SettingTextField.qml index d80daf23b0..752e846f1a 100644 --- a/resources/qml/Settings/SettingTextField.qml +++ b/resources/qml/Settings/SettingTextField.qml @@ -29,10 +29,10 @@ SettingItem case "ValidatorState.Exception": case "ValidatorState.MinimumError": case "ValidatorState.MaximumError": - return UM.Theme.getColor("setting_validation_error_border"); + return UM.Theme.getColor("setting_validation_error"); case "ValidatorState.MinimumWarning": case "ValidatorState.MaximumWarning": - return UM.Theme.getColor("setting_validation_warning_border"); + return UM.Theme.getColor("setting_validation_warning"); } //Validation is OK. if(hovered || input.activeFocus) @@ -52,10 +52,10 @@ SettingItem case "ValidatorState.Exception": case "ValidatorState.MinimumError": case "ValidatorState.MaximumError": - return UM.Theme.getColor("setting_validation_error") + return UM.Theme.getColor("setting_validation_error_background") case "ValidatorState.MinimumWarning": case "ValidatorState.MaximumWarning": - return UM.Theme.getColor("setting_validation_warning") + return UM.Theme.getColor("setting_validation_warning_background") case "ValidatorState.Valid": return UM.Theme.getColor("setting_validation_ok") diff --git a/resources/qml/SidebarHeader.qml b/resources/qml/SidebarHeader.qml index 6f0ae9e196..2762543d18 100644 --- a/resources/qml/SidebarHeader.qml +++ b/resources/qml/SidebarHeader.qml @@ -336,7 +336,7 @@ Column //sourceSize.width: width + 5 //sourceSize.height: width + 5 - color: UM.Theme.getColor("setting_control_text") + color: UM.Theme.getColor("setting_validation_warning") visible: !Cura.MachineManager.isActiveQualitySupported } } diff --git a/resources/themes/cura/theme.json b/resources/themes/cura/theme.json index eb34b75298..08b29086fd 100644 --- a/resources/themes/cura/theme.json +++ b/resources/themes/cura/theme.json @@ -154,10 +154,10 @@ "setting_control_disabled_text": [255, 255, 255, 101], "setting_control_disabled_border": [255, 255, 255, 101], "setting_unit": [255, 255, 255, 127], - "setting_validation_error": [59, 31, 53, 255], - "setting_validation_error_border": [212, 31, 53, 255], - "setting_validation_warning": [62, 54, 46, 255], - "setting_validation_warning_border": [245, 166, 35, 255], + "setting_validation_error_background": [59, 31, 53, 255], + "setting_validation_error": [212, 31, 53, 255], + "setting_validation_warning_background": [62, 54, 46, 255], + "setting_validation_warning": [245, 166, 35, 255], "setting_validation_ok": [43, 48, 52, 255], "progressbar_background": [255, 255, 255, 48],