3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into fix_tests_cura_engine_backend

Browse source
This commit is contained in:
Ian Paschal 2018-07-06 09:48:07 +02:00 • committed by GitHub
commit 75d5828f5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 119 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/Toolbox/src/Toolbox.py
View file

@ -224,6 +224,11 @@ class Toolbox(QObject, Extension):
if not self._dialog:
self._dialog = self._createDialog("Toolbox.qml")
if not self._dialog:
Logger.log("e", "Unexpected error trying to create the 'Toolbox' dialog.")
return
self._dialog.show()
# Apply enabled/disabled state to installed plugins
@ -231,9 +236,11 @@ class Toolbox(QObject, Extension):
def _createDialog(self, qml_name: str) -> QObject:
Logger.log("d", "Toolbox: Creating dialog [%s].", qml_name)
path = os.path.join(cast(str, PluginRegistry.getInstance().getPluginPath(self.getPluginId())), "resources", "qml", qml_name)
if not path:
raise Exception("Failed to create toolbox QML path")
plugin_path = PluginRegistry.getInstance().getPluginPath(self.getPluginId())
if not plugin_path:
return None
path = os.path.join(plugin_path, "resources", "qml", qml_name)
dialog = self._application.createQmlComponent(path, {"toolbox": self})
if not dialog:
raise Exception("Failed to create toolbox dialog")