From 6be0d58039b3e2d88033800c735dcfff97f7cbef Mon Sep 17 00:00:00 2001 From: casper Date: Fri, 19 Nov 2021 17:22:13 +0100 Subject: [PATCH] Add handling of missing printJob status cases The `printJob` now also contains a status for detecting aborted prints that were awaiting cleanup, preventing the need for the additional checks in the `await_cleanup` status. --- .../qml/MonitorPrintJobProgressBar.qml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml index 6ad295beec..f698bd948e 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobProgressBar.qml @@ -73,10 +73,6 @@ Item switch (printJob.state) { case "wait_cleanup": - if (printJob.timeTotal > printJob.timeElapsed) - { - return catalog.i18nc("@label:status", "Aborted"); - } return catalog.i18nc("@label:status", "Finished"); case "finished": return catalog.i18nc("@label:status", "Finished"); @@ -88,6 +84,20 @@ Item return catalog.i18nc("@label:status", "Aborting..."); case "aborted": // NOTE: Unused, see above return catalog.i18nc("@label:status", "Aborted"); + case "aborted_post_print": + return catalog.i18nc("@label:status", "Aborted"); + case "aborted_wait_user_action": + return catalog.i18nc("@label:status", "Aborted"); + case "aborted_wait_cleanup": + return catalog.i18nc("@label:status", "Aborted"); + case "failed": + return catalog.i18nc("@label:status", "Failed"); + case "failed_post_print": + return catalog.i18nc("@label:status", "Failed"); + case "failed_wait_user_action": + return catalog.i18nc("@label:status", "Failed"); + case "failed_wait_cleanup": + return catalog.i18nc("@label:status", "Failed"); case "pausing": return catalog.i18nc("@label:status", "Pausing..."); case "paused":