3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 15:44:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Use the BackendState enumeration in QML to not use integers but use the

Browse source 
enumeration literals.

Contributes to CURA-5786.
This commit is contained in:
Diego Prado Gesto 2018-10-30 15:12:03 +01:00
parent 00d75cd4d6
commit 027bf204cd
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
resources/qml/SliceProcessWidget.qml
View file

@ -28,7 +28,7 @@ Column
function sliceOrStopSlicing() function sliceOrStopSlicing()
{ {
if ([1, 5].indexOf(widget.backendState) != -1) // == BackendState.NotStarted or BackendState.Disabled if ([UM.Backend.NotStarted, UM.Backend.Disabled].indexOf(widget.backendState) != -1)
{ {
CuraApplication.backend.forceSlice() CuraApplication.backend.forceSlice()
} }
@ -43,7 +43,7 @@ Column
id: message id: message
width: parent.width width: parent.width
height: childrenRect.height height: childrenRect.height
visible: widget.backendState == 4 // == BackendState.Error visible: widget.backendState == UM.Backend.Error
UM.RecolorImage UM.RecolorImage
{ {
@ -79,7 +79,7 @@ Column
width: parent.width width: parent.width
height: UM.Theme.getSize("progressbar").height height: UM.Theme.getSize("progressbar").height
value: progress value: progress
visible: widget.backendState == 2 // == BackendState.Processing visible: widget.backendState == UM.Backend.Processing
background: Rectangle background: Rectangle
{ {
@ -108,7 +108,7 @@ 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 if ([UM.Backend.NotStarted, UM.Backend.Error, UM.Backend.Disabled].indexOf(widget.backendState) != -1)
{ {
return catalog.i18nc("@button", "Slice") return catalog.i18nc("@button", "Slice")
} }
@ -118,14 +118,16 @@ Column
} }
return catalog.i18nc("@button", "Cancel") return catalog.i18nc("@button", "Cancel")
} }
enabled: !autoSlice && ([1, 2].indexOf(widget.backendState) != -1) enabled: !autoSlice && !disabledSlice
// 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")
// Disable the slice process when
property bool disabledSlice: [UM.Backend.Done, UM.Backend.Error, UM.Backend.Disabled].indexOf(widget.backendState) != -1
disabledColor: ([1, 2].indexOf(widget.backendState) == -1) ? UM.Theme.getColor("action_button_disabled") : "transparent" disabledColor: disabledSlice ? UM.Theme.getColor("action_button_disabled") : "transparent"
textDisabledColor: ([1, 2].indexOf(widget.backendState) == -1) ? UM.Theme.getColor("action_button_disabled_text") : UM.Theme.getColor("primary") textDisabledColor: disabledSlice ? UM.Theme.getColor("action_button_disabled_text") : UM.Theme.getColor("primary")
outlineDisabledColor: ([1, 2].indexOf(widget.backendState) == -1) ? UM.Theme.getColor("action_button_disabled_border") : "transparent" outlineDisabledColor: disabledSlice ? UM.Theme.getColor("action_button_disabled_border") : "transparent"
onClicked: sliceOrStopSlicing() onClicked: sliceOrStopSlicing()
} }