GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-11 16:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename setting_validation_error/warning and border

Browse Source 
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.
This commit is contained in:
Ghostkeeper 2017-08-23 13:30:25 +02:00
parent 876c6aeced
commit ab444943cb
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/qml/PrintMonitor.qml
View File

@ -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))

8
resources/qml/Settings/SettingTextField.qml
View File

@ -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")

2
resources/qml/SidebarHeader.qml
View File

@ -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
}
}

8
resources/themes/cura/theme.json
View File

@ -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],