From b748bf2011e86ff8207e46052cadad0002a0ec3b Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Fri, 22 Sep 2017 13:11:57 +0200 Subject: [PATCH] CURA-4341 add bi-directional signal to update topbar when monitoring --- resources/qml/Cura.qml | 9 ++++++++- resources/qml/Topbar.qml | 11 ++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 37c481defc..702864f01b 100755 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -25,8 +25,11 @@ UM.MainWindow target: Printer onShowPrintMonitor: { + topbar.monitoringChanged(show) + if (show) { + topbar.startMonitoringPrint() } else @@ -349,13 +352,17 @@ UM.MainWindow } } + function isMonitoringPrint () { + return base.showPrintMonitor + } + Topbar { id: topbar anchors.left:parent.left anchors.right: parent.right anchors.top: parent.top - monitoringPrint: base.showPrintMonitor + monitoringPrint: isMonitoringPrint() onStartMonitoringPrint: base.showPrintMonitor = true onStopMonitoringPrint: base.showPrintMonitor = false } diff --git a/resources/qml/Topbar.qml b/resources/qml/Topbar.qml index e3550aaad7..4cd684339f 100644 --- a/resources/qml/Topbar.qml +++ b/resources/qml/Topbar.qml @@ -22,7 +22,16 @@ Rectangle property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands - property bool monitoringPrint: false + + // monitoring status + property bool monitoringPrint + + // incoming signal + function monitoringChanged (isNowMonitoring) { + monitoringPrint = isNowMonitoring + } + + // outgoing signal signal startMonitoringPrint() signal stopMonitoringPrint()