3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Resume, pause & abort are handled correctly

Browse source 
CURA-1036
This commit is contained in:
Jaime van Kessel 2016-06-16 17:47:05 +02:00
parent 74c4774092
commit ec34d92500
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
resources/qml/MonitorButton.qml
View file

@ -22,7 +22,22 @@ Rectangle
property string fileBaseName
property string statusText:
{
return "Printing..."
if(Cura.MachineManager.printerOutputDevices[0].jobState == "printing")
{
return "Printing..."
} else if(Cura.MachineManager.printerOutputDevices[0].jobState == "paused")
{
return "Paused"
}
else if(Cura.MachineManager.printerOutputDevices[0].jobState == "pre_print")
{
return "Preparing..."
}
else
{
return " "
}
}
Label
@ -73,7 +88,8 @@ Rectangle
anchors.rightMargin: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@label:", "Abort Job")
onClicked: {}
onClicked: { Cura.MachineManager.printerOutputDevices[0].setJobState("abort") }
style: ButtonStyle
{
@ -117,7 +133,7 @@ Rectangle
anchors.rightMargin: UM.Theme.getSize("default_margin").width
text: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? catalog.i18nc("@label:", "Resume") : catalog.i18nc("@label:", "Pause")
onClicked: { Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? Cura.MachineManager.printerOutputDevices[0].setJobState("printing") : Cura.MachineManager.printerOutputDevices[0].setJobState("paused") }
onClicked: { Cura.MachineManager.printerOutputDevices[0].jobState == "paused" ? Cura.MachineManager.printerOutputDevices[0].setJobState("print") : Cura.MachineManager.printerOutputDevices[0].setJobState("pause") }
style: ButtonStyle
{