From 58ae1e923c1ad043a4328cb4677b1e90839ac3e5 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Thu, 30 Jun 2016 19:13:46 +0200 Subject: [PATCH 1/2] Prevent warning when no printer is connected. CURA-1036 --- resources/qml/MonitorButton.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/MonitorButton.qml b/resources/qml/MonitorButton.qml index 10fc44b3f0..b8bfbab869 100644 --- a/resources/qml/MonitorButton.qml +++ b/resources/qml/MonitorButton.qml @@ -109,7 +109,7 @@ Rectangle id: abortButton visible: printerConnected - enabled: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" || Cura.MachineManager.printerOutputDevices[0].jobState == "printing" + enabled: printerConnected && Cura.MachineManager.printerOutputDevices[0].jobState == "paused" || Cura.MachineManager.printerOutputDevices[0].jobState == "printing" height: UM.Theme.getSize("save_button_save_to_button").height anchors.top: progressBar.bottom @@ -156,7 +156,7 @@ Rectangle id: pauseButton visible: printerConnected - enabled: Cura.MachineManager.printerOutputDevices[0].jobState == "paused" || Cura.MachineManager.printerOutputDevices[0].jobState == "printing" + enabled: printerConnected && Cura.MachineManager.printerOutputDevices[0].jobState == "paused" || Cura.MachineManager.printerOutputDevices[0].jobState == "printing" height: UM.Theme.getSize("save_button_save_to_button").height anchors.top: progressBar.bottom From fea534509ee514bcf222100785bfc3f8ef90e43a Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Fri, 1 Jul 2016 10:12:11 +0200 Subject: [PATCH 2/2] Fix two "critical errors" on startup CuraMachineManager.isGlobalStackValid would return None on startup, which qml does not like. CURA-1585 --- cura/MachineManagerModel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py index 43b4ab521d..76786efe61 100644 --- a/cura/MachineManagerModel.py +++ b/cura/MachineManagerModel.py @@ -213,7 +213,7 @@ class MachineManagerModel(QObject): # Calling _checkStackForErrors on every change is simply too expensive @pyqtProperty(bool, notify = globalValidationChanged) def isGlobalStackValid(self): - return self._global_stack_valid + return bool(self._global_stack_valid) @pyqtProperty(str, notify = activeStackChanged) def activeUserProfileId(self):