Merge local with origin

Contributes to issue CURA-1278.
This commit is contained in:
Ghostkeeper 2016-05-20 16:16:25 +02:00
parent 7cc62db81d
commit 85ce8a719e

View File

@ -224,6 +224,7 @@ class CuraApplication(QtApplication):
## Handle loading of all plugin types (and the backend explicitly) ## Handle loading of all plugin types (and the backend explicitly)
# \sa PluginRegistery # \sa PluginRegistery
def _loadPlugins(self): def _loadPlugins(self):
self._plugin_registry.addType("profile_reader", self._addProfileReader)
self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "lib", "cura")) self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "lib", "cura"))
if not hasattr(sys, "frozen"): if not hasattr(sys, "frozen"):
self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "plugins")) self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "plugins"))
@ -711,3 +712,6 @@ class CuraApplication(QtApplication):
job = ReadMeshJob(os.path.abspath(file)) job = ReadMeshJob(os.path.abspath(file))
job.finished.connect(self._onFileLoaded) job.finished.connect(self._onFileLoaded)
job.start() job.start()
def _addProfileReader(self, profile_reader):
pass