alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't load hidden toolboxes

Browse Source 
Change-Id: I96badc3f3b0c1ff0986bc74570f3dd19073e83b3
This commit is contained in:
Marco Martin 2015-01-30 21:05:38 +01:00
parent 7ef09d883d
commit 0161b2fce3
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -115,17 +115,19 @@ void ContainmentInterface::init()
interceptor->addAllowedPath(pkg.path());
}
if (pkg.isValid()) {
QObject *containmentGraphicObject = qmlObject()->rootObject();
if (pkg.metadata().isValid() && !pkg.metadata().isHidden()) {
if (pkg.isValid()) {
QObject *containmentGraphicObject = qmlObject()->rootObject();
QVariantHash toolboxProperties;
toolboxProperties["parent"] = QVariant::fromValue(this);
QObject *toolBoxObject = qmlObject()->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")), 0, toolboxProperties);
if (toolBoxObject && containmentGraphicObject) {
containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject));
QVariantHash toolboxProperties;
toolboxProperties["parent"] = QVariant::fromValue(this);
QObject *toolBoxObject = qmlObject()->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")), 0, toolboxProperties);
if (toolBoxObject && containmentGraphicObject) {
containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject));
}
} else {
qWarning() << "Could not load toolbox package." << pkg.path();
}
} else {
qWarning() << "Could not load toolbox package." << pkg.path();
}
}