Show correct labels & status icon if print was aborted

CL-896
This commit is contained in:
Jaime van Kessel 2018-08-30 17:18:48 +02:00
parent 49aeb60e7d
commit e2bcf4dfa8

View file

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