From ac7a566ae1e88a8750c7fd46a838c9cb7e45b644 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 31 Oct 2018 11:45:30 +0100 Subject: [PATCH] Do not show "move to top" on print jobs waiting for configuration change Contributes to CL-1118 --- .../resources/qml/PrintJobContextMenu.qml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml index bddefa036b..843865cd00 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml @@ -12,6 +12,7 @@ Item { id: root; property var printJob: null; property var running: isRunning(printJob); + property var assigned: isAssigned(printJob); Button { id: button; @@ -102,7 +103,7 @@ Item { PrintJobContextMenuItem { enabled: { - if (printJob && printJob.state == "queued") { + if (printJob && printJob.state == "queued" && !assigned) { if (OutputDevice && OutputDevice.queuedPrintJobs[0]) { return OutputDevice.queuedPrintJobs[0].key != printJob.key; } @@ -117,7 +118,6 @@ Item { } PrintJobContextMenuItem { - enabled: printJob && printJob.state == "queued"; onClicked: { deleteConfirmationDialog.visible = true; popup.close(); @@ -210,4 +210,10 @@ Item { } return ["paused", "printing", "pre_print"].indexOf(job.state) !== -1; } + function isAssigned(job) { + if (!job) { + return false; + } + return job.assignedPrinter ? true : false; + } }