Merge pull request #4691 from Ultimaker/CL-1118_no_context_menu_on_finished_jobs

CL-1118 Don't show the context menu for printed jobs
This commit is contained in:
Simon Edwards 2018-10-30 14:37:16 +01:00 committed by GitHub
commit 839f1f2adc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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();