From e2bcf4dfa82611412f99b553237c8a2f9f8f7a24 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 30 Aug 2018 17:18:48 +0200 Subject: [PATCH] Show correct labels & status icon if print was aborted CL-896 --- plugins/UM3NetworkPrinting/ClusterControlItem.qml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/ClusterControlItem.qml b/plugins/UM3NetworkPrinting/ClusterControlItem.qml index e2a77063b5..4978ce821a 100644 --- a/plugins/UM3NetworkPrinting/ClusterControlItem.qml +++ b/plugins/UM3NetworkPrinting/ClusterControlItem.qml @@ -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")