GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-07 06:38:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tweak the colors of the disabled state.

Browse Source 
Contributes to CURA-5786.
This commit is contained in:
Diego Prado Gesto 2018-10-30 12:28:51 +01:00
parent 45af4eec90
commit 00d75cd4d6
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
resources/qml/SliceProcessWidget.qml
View File

@ -108,27 +108,24 @@ Column
height: UM.Theme.getSize("action_panel_button").height height: UM.Theme.getSize("action_panel_button").height
text: text:
{ {
if ([1, 4, 5].indexOf(widget.backendState) != -1) // == BackendState.NotStarted or BackendState.Error or BackendState.Disabled
{
return catalog.i18nc("@button", "Slice")
}
if (autoSlice) if (autoSlice)
{ {
return catalog.i18nc("@button", "Auto slicing...") return catalog.i18nc("@button", "Auto slicing...")
} }
else if ([1, 5].indexOf(widget.backendState) != -1) // == BackendState.NotStarted or BackendState.Disabled return catalog.i18nc("@button", "Cancel")
{
return catalog.i18nc("@button", "Slice")
}
else
{
return catalog.i18nc("@button", "Cancel")
}
} }
enabled: !autoSlice enabled: !autoSlice && ([1, 2].indexOf(widget.backendState) != -1)
// Get the current value from the preferences // Get the current value from the preferences
property bool autoSlice: UM.Preferences.getValue("general/auto_slice") property bool autoSlice: UM.Preferences.getValue("general/auto_slice")
disabledColor: "transparent" disabledColor: ([1, 2].indexOf(widget.backendState) == -1) ? UM.Theme.getColor("action_button_disabled") : "transparent"
textDisabledColor: UM.Theme.getColor("primary") textDisabledColor: ([1, 2].indexOf(widget.backendState) == -1) ? UM.Theme.getColor("action_button_disabled_text") : UM.Theme.getColor("primary")
outlineDisabledColor: "transparent" outlineDisabledColor: ([1, 2].indexOf(widget.backendState) == -1) ? UM.Theme.getColor("action_button_disabled_border") : "transparent"
onClicked: sliceOrStopSlicing() onClicked: sliceOrStopSlicing()
} }