From c2935759e8ee5cf95f9d85790d8f93172d449300 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 12 Jan 2018 11:04:10 +0100 Subject: [PATCH] Fixed broken printjob state in machines page CL-541 --- resources/qml/Preferences/MachinesPage.qml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index a8e25155e1..889dfa8d5b 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -143,7 +143,7 @@ UM.ManagementPage property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property var connectedPrinter: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands - + property var printJob: connectedPrinter != null ? connectedPrinter.activePrintJob: null Label { text: catalog.i18nc("@label", "Printer type:") @@ -178,7 +178,12 @@ UM.ManagementPage return ""; } - switch(Cura.MachineManager.printerOutputDevices[0].jobState) + if (machineInfo.printJob == null) + { + return catalog.i18nc("@label:MonitorStatus", "Waiting for a printjob"); + } + + switch(machineInfo.printJob.state) { case "printing": return catalog.i18nc("@label:MonitorStatus", "Printing..."); @@ -194,10 +199,9 @@ UM.ManagementPage return catalog.i18nc("@label:MonitorStatus", "In maintenance. Please check the printer"); case "abort": // note sure if this jobState actually occurs in the wild return catalog.i18nc("@label:MonitorStatus", "Aborting print..."); - case "ready": // ready to print or getting ready - case "": // ready to print or getting ready - return catalog.i18nc("@label:MonitorStatus", "Waiting for a printjob"); + } + return "" } visible: base.currentItem && base.currentItem.id == Cura.MachineManager.activeMachineId && machineInfo.printerAcceptsCommands wrapMode: Text.WordWrap