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

Set paneltoolbox properties on construction

Browse Source 
Also refactor the code to avoid creating and deleting an object if
containmentGraphicObject does not exist.
This commit is contained in:
David Edmundson 2014-02-07 19:35:19 +01:00
parent 233267f492
commit 39ce54c0db
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,18 +121,16 @@ void ContainmentInterface::init()
}
if (pkg.isValid()) {
QObject *toolBoxObject = qmlObject()->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")));
QObject *containmentGraphicObject = qmlObject()->rootObject();
if (containmentGraphicObject && toolBoxObject) {
toolBoxObject->setProperty("parent", QVariant::fromValue(containmentGraphicObject));
containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject));
} else {
delete toolBoxObject;
if (containmentGraphicObject) {
QVariantHash toolboxProperties;
toolboxProperties["parent"] = QVariant::fromValue(containmentGraphicObject);
QObject *toolBoxObject = qmlObject()->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")), toolboxProperties);
if (toolBoxObject) {
containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject));
}
qDebug() << "Loaded toolbox package" << pkg.path();
}
qDebug() << "Loaded toolbox package" << pkg.path();
} else {
qWarning() << "Could not load toolbox package." << pkg.path();
}