From 5d2a9141809d201cc9d0db0a02abef617d2e59be Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 23 Jan 2019 15:54:11 +0100 Subject: [PATCH 1/2] Always show context menu for print jobs Contributes to CL-1175 --- .../resources/qml/MonitorPrintJobCard.qml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml index 3a724bb731..eadcc04329 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml @@ -217,14 +217,6 @@ Item height: 32 * screenScaleFactor // TODO: Theme! enabled: !cloudConnection onClicked: enabled ? contextMenu.switchPopupState() : {} - visible: - { - if (!printJob) { - return false - } - var states = ["queued", "sent_to_printer", "pre_print", "printing", "pausing", "paused", "resuming"] - return states.indexOf(printJob.state) !== -1 - } } MonitorContextMenu From 673734ee12d554058929b66593eb8bf92bb84e79 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 24 Jan 2019 09:52:56 +0100 Subject: [PATCH 2/2] Show print job context menu if state == "error" Contributes to CL-1175 --- .../resources/qml/MonitorContextMenu.qml | 4 ++-- .../resources/qml/MonitorPrintJobCard.qml | 8 ++++++++ .../resources/qml/MonitorPrinterCard.qml | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml index 07eaa4f051..771bd4b8cf 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml @@ -53,7 +53,7 @@ Item } text: catalog.i18nc("@label", "Move to top"); visible: { - if (printJob && printJob.state == "queued" && !isAssigned(printJob)) { + if (printJob && (printJob.state == "queued" || printJob.state == "error") && !isAssigned(printJob)) { if (OutputDevice && OutputDevice.queuedPrintJobs[0]) { return OutputDevice.queuedPrintJobs[0].key != printJob.key; } @@ -72,7 +72,7 @@ Item if (!printJob) { return false; } - var states = ["queued", "sent_to_printer"]; + var states = ["queued", "error", "sent_to_printer"]; return states.indexOf(printJob.state) !== -1; } } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml index eadcc04329..c7588b83bc 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml @@ -217,6 +217,14 @@ Item height: 32 * screenScaleFactor // TODO: Theme! enabled: !cloudConnection onClicked: enabled ? contextMenu.switchPopupState() : {} + visible: + { + if (!printJob) { + return false + } + var states = ["queued", "error", "sent_to_printer", "pre_print", "printing", "pausing", "paused", "resuming"] + return states.indexOf(printJob.state) !== -1 + } } MonitorContextMenu diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 085bf774b5..e56e22e40f 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -179,7 +179,7 @@ Item if (!printer || !printer.activePrintJob) { return false } - var states = ["queued", "sent_to_printer", "pre_print", "printing", "pausing", "paused", "resuming"] + var states = ["queued", "error", "sent_to_printer", "pre_print", "printing", "pausing", "paused", "resuming"] return states.indexOf(printer.activePrintJob.state) !== -1 } }