GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 07:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5992 from Ultimaker/CS-134_hide_move_to_top

Browse Source 
Hide 'move to top' option from actions
This commit is contained in:
Simon Edwards 2019-07-09 13:03:42 +02:00 committed by GitHub
commit 146f78e658
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/MonitorStage/MonitorMain.qml
View File

@ -97,7 +97,7 @@ Rectangle
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
} }
visible: isNetworkConfigured && !isConnected visible: isNetworkConfigured && !isConnected
text: catalog.i18nc("@info", "Please make sure your printer has a connection:\n- Check if the printer is turned on.\n- Check if the printer is connected to the network.") text: catalog.i18nc("@info", "Please make sure your printer has a connection:\n- Check if the printer is turned on.\n- Check if the printer is connected to the network.\n- Check if you are signed in to discover cloud-connected printers.")
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("monitor_text_primary") color: UM.Theme.getColor("monitor_text_primary")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
@ -166,4 +166,4 @@ Rectangle
} }
} }
} }
} }

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

@ -46,6 +46,9 @@ Item
spacing: Math.floor(UM.Theme.getSize("default_margin").height / 2) 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 { PrintJobContextMenuItem {
onClicked: { onClicked: {
sendToTopConfirmationDialog.visible = true; sendToTopConfirmationDialog.visible = true;
@ -53,11 +56,11 @@ Item
} }
text: catalog.i18nc("@label", "Move to top"); text: catalog.i18nc("@label", "Move to top");
visible: { visible: {
if (printJob && (printJob.state == "queued" || printJob.state == "error") && !isAssigned(printJob)) { // if (printJob && (printJob.state == "queued" || printJob.state == "error") && !isAssigned(printJob)) {
if (OutputDevice && OutputDevice.queuedPrintJobs[0]) { // if (OutputDevice && OutputDevice.queuedPrintJobs[0]) {
return OutputDevice.queuedPrintJobs[0].key != printJob.key; // return OutputDevice.queuedPrintJobs[0].key != printJob.key;
} // }
} // }
return false; return false;
} }
} }