From b6a00b9f7f3cc753103c6546ea21bc819f17be28 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Tue, 9 Jul 2019 08:26:44 +0200 Subject: [PATCH 1/2] Hide 'move to top' opion from actions --- .../resources/qml/MonitorContextMenu.qml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml index fbae66117e..5a40aef780 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorContextMenu.qml @@ -46,6 +46,9 @@ 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; @@ -53,11 +56,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; } } From 9ad89017d0fb9814c988ee471f7e289a6b1f902a Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Tue, 9 Jul 2019 09:09:08 +0200 Subject: [PATCH 2/2] Add text about cloud connection when no printer can be reached on monitor --- plugins/MonitorStage/MonitorMain.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index 9e719ddb43..7c0a20ef66 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -97,7 +97,7 @@ Rectangle horizontalCenter: parent.horizontalCenter } 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") color: UM.Theme.getColor("monitor_text_primary") wrapMode: Text.WordWrap @@ -166,4 +166,4 @@ Rectangle } } } -} \ No newline at end of file +}