From 0273cd2a0e4432f7f77766824b8c843c9657a943 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Tue, 30 Oct 2018 13:44:24 +0100 Subject: [PATCH] Don't show the context menu for printed jobs (only active ones and queued ones) Contributes to CL-1118 --- .../UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml index 55d3c66eb4..bddefa036b 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml @@ -33,6 +33,7 @@ Item { hoverEnabled: true; onClicked: parent.switchPopupState(); text: "\u22EE"; //Unicode; Three stacked points. + visible: printJob.state == "queued" || running ? true : false; width: 35 * screenScaleFactor; // TODO: Theme! } @@ -101,7 +102,7 @@ Item { PrintJobContextMenuItem { enabled: { - if (printJob && !running) { + if (printJob && printJob.state == "queued") { if (OutputDevice && OutputDevice.queuedPrintJobs[0]) { return OutputDevice.queuedPrintJobs[0].key != printJob.key; } @@ -116,7 +117,7 @@ Item { } PrintJobContextMenuItem { - enabled: printJob && !running; + enabled: printJob && printJob.state == "queued"; onClicked: { deleteConfirmationDialog.visible = true; popup.close();