From 35ed2349913e91d0f163e9aa1840228cf1c2736a Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 8 Nov 2018 10:49:22 +0100 Subject: [PATCH 1/3] Show print time in monitor tab Contributes to CL-1040 --- .../resources/qml/PrintJobInfoBlock.qml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml index 8c2c8f9121..a0de63ec74 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml @@ -168,6 +168,19 @@ Item { width: 0.5 * printJobPreview.width; } } + + Label { + id: totalTimeLabel; + anchors { + bottom: parent.bottom; + right: parent.right; + } + color: UM.Theme.getColor("text"); + elide: Text.ElideRight; + font: UM.Theme.getFont("default"); + opacity: 0.6; + text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : ""; + } } // Divider From de6ab02422f04fe4c2d3ffd641f7b91472e3b827 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 8 Nov 2018 11:02:57 +0100 Subject: [PATCH 2/3] Merge pull request #4678 from fieldOfView/fix_networkprinter_post Fix type error in NetworkedPrinterOutputDevice.post --- cura/PrinterOutput/NetworkedPrinterOutputDevice.py | 2 +- plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py index f7c7f5d233..35d2ce014a 100644 --- a/cura/PrinterOutput/NetworkedPrinterOutputDevice.py +++ b/cura/PrinterOutput/NetworkedPrinterOutputDevice.py @@ -213,7 +213,7 @@ class NetworkedPrinterOutputDevice(PrinterOutputDevice): request = self._createEmptyRequest(target) self._last_request_time = time() if self._manager is not None: - reply = self._manager.post(request, data) + reply = self._manager.post(request, data.encode()) if on_progress is not None: reply.uploadProgress.connect(on_progress) self._registerOnFinishedCallback(reply, on_finished) diff --git a/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py index e45de2dbb0..18af22e72f 100644 --- a/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py @@ -498,8 +498,8 @@ class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice): self._authentication_id = None self.post("auth/request", - json.dumps({"application": "Cura-" + CuraApplication.getInstance().getVersion(), - "user": self._getUserName()}).encode(), + json.dumps({"application": "Cura-" + CuraApplication.getInstance().getVersion(), + "user": self._getUserName()}), on_finished=self._onRequestAuthenticationFinished) self.setAuthenticationState(AuthState.AuthenticationRequested) From aa6ec9e44bc6f8a2069984134dd785c70bed2fd9 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Thu, 8 Nov 2018 11:48:22 +0100 Subject: [PATCH 3/3] Make text black Contributes to CL-1040 --- plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml index a0de63ec74..a611cb4ff6 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/PrintJobInfoBlock.qml @@ -178,7 +178,6 @@ Item { color: UM.Theme.getColor("text"); elide: Text.ElideRight; font: UM.Theme.getFont("default"); - opacity: 0.6; text: printJob ? OutputDevice.formatDuration(printJob.timeTotal) : ""; } }