Merge branch 'master' of https://github.com/Ultimaker/Cura

1 files changed, 6 insertions, 0 deletions

diff --git a/cura/PrinterOutputDevice.py b/cura/PrinterOutputDevice.py
index c6e98257ba..837ecc97c6 100644
--- a/cura/PrinterOutputDevice.py
+++ b/cura/PrinterOutputDevice.py
@@ -74,6 +74,7 @@ class PrinterOutputDevice(QObject, OutputDevice):
         self._can_pause = True
         self._can_abort = True
         self._can_pre_heat_bed = True
+        self._can_control_manually = True
 
     def requestWrite(self, nodes, file_name = None, filter_by_machine = False, file_handler = None):
         raise NotImplementedError("requestWrite needs to be implemented")
@@ -144,6 +145,11 @@ class PrinterOutputDevice(QObject, OutputDevice):
     def canAbort(self):
         return self._can_abort
 
+    # Does the printer support manual control at all
+    @pyqtProperty(bool, constant=True)
+    def canControlManually(self):
+        return self._can_control_manually
+
     @pyqtProperty(QObject, constant=True)
     def monitorItem(self):
         # Note that we specifically only check if the monitor component is created.