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

This commit is contained in:
Jack Ha 2017-02-20 09:45:51 +01:00
commit cd54552498
12 changed files with 364 additions and 350 deletions

View file

@ -704,7 +704,7 @@ class CuraApplication(QtApplication):
sceneBoundingBoxChanged = pyqtSignal()
@pyqtProperty(bool, notify = activityChanged)
def getPlatformActivity(self):
def platformActivity(self):
return self._platform_activity
@pyqtProperty(str, notify = sceneBoundingBoxChanged)