3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 17:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix printer and print job ordering, add back 'move to top'

Browse source
This commit is contained in:
ChrisTerBeke 2019-07-10 12:42:01 +02:00
parent 146f78e658
commit f1df7b93c4
4 changed files with 116 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml
View file

@ -46,9 +46,6 @@ Item
spacing: Math.floor(UM.Theme.getSize("default_margin").height / 2)
// Due to an issue with the ordering if print jobs caused by the Qt list models,
// we hide the 'move to top' feature for now as it's not displayed on the appropriate elements.
// Solving the ordering issue will cost more time than we currently have available.
PrintJobContextMenuItem {
onClicked: {
sendToTopConfirmationDialog.visible = true;
@ -56,11 +53,11 @@ Item
}
text: catalog.i18nc("@label", "Move to top");
visible: {
// if (printJob && (printJob.state == "queued" || printJob.state == "error") && !isAssigned(printJob)) {
// if (OutputDevice && OutputDevice.queuedPrintJobs[0]) {
// return OutputDevice.queuedPrintJobs[0].key != printJob.key;
// }
// }
if (printJob && (printJob.state == "queued" || printJob.state == "error") && !isAssigned(printJob)) {
if (OutputDevice && OutputDevice.queuedPrintJobs[0]) {
return OutputDevice.queuedPrintJobs[0].key != printJob.key;
}
}
return false;
}
}