GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 21:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Show correct labels & status icon if print was aborted

Browse Source 
CL-896
This commit is contained in:
Jaime van Kessel 2018-08-30 17:18:48 +02:00
parent 49aeb60e7d
commit e2bcf4dfa8
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/UM3NetworkPrinting/ClusterControlItem.qml
View File

@ -489,6 +489,10 @@ Component
case "paused": case "paused":
return "paused-icon.svg" return "paused-icon.svg"
case "wait_cleanup": case "wait_cleanup":
if(modelData.activePrintJob.timeElapsed < modelData.activePrintJob.timeTotal)
{
return "aborted-icon.svg"
}
return "approved-icon.svg" return "approved-icon.svg"
case "wait_user_action": case "wait_user_action":
return "aborted-icon.svg" return "aborted-icon.svg"
@ -569,7 +573,11 @@ Component
switch(modelData.activePrintJob.state) switch(modelData.activePrintJob.state)
{ {
case "wait_cleanup": case "wait_cleanup":
return catalog.i18nc("@label:status", "Finshed") if(modelData.activePrintJob.timeTotal > modelData.activePrintJob.timeElapsed)
{
return catalog.i18nc("@label:status", "Aborted")
}
return catalog.i18nc("@label:status", "Finished")
case "pre_print": case "pre_print":
case "sent_to_printer": case "sent_to_printer":
return catalog.i18nc("@label:status", "Preparing") return catalog.i18nc("@label:status", "Preparing")