3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '3.5' into CURA-5682_material_manager_leftovers

Browse source
This commit is contained in:
Diego Prado Gesto 2018-09-12 17:12:40 +02:00
commit 7e1a833e9c
120 changed files with 62031 additions and 1842 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/CuraApplication.py
View file

@ -93,6 +93,7 @@ from . import CuraActions
from cura.Scene import ZOffsetDecorator
from . import CuraSplashScreen
from . import CameraImageProvider
from . import PrintJobPreviewImageProvider
from . import MachineActionManager
from cura.TaskManagement.OnExitCallbackManager import OnExitCallbackManager
@ -428,6 +429,7 @@ class CuraApplication(QtApplication):
# Readers & Writers:
"GCodeWriter",
"STLReader",
"3MFWriter",
# Tools:
"CameraTool",
@ -504,6 +506,7 @@ class CuraApplication(QtApplication):
def _onEngineCreated(self):
self._qml_engine.addImageProvider("camera", CameraImageProvider.CameraImageProvider())
self._qml_engine.addImageProvider("print_job_preview", PrintJobPreviewImageProvider.PrintJobPreviewImageProvider())
@pyqtProperty(bool)
def needToShowUserAgreement(self):