From 10f412ca4ae547581395ce7dcbbf497b7d6e7834 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Fri, 27 Dec 2013 13:58:16 +0100
Subject: [PATCH] move toolbox stuff in containment

---
 .../qml/plasmoid/appletinterface.cpp          | 45 ------------------
 .../qml/plasmoid/containmentinterface.cpp     | 46 +++++++++++++++++++
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/src/scriptengines/qml/plasmoid/appletinterface.cpp b/src/scriptengines/qml/plasmoid/appletinterface.cpp
index ffa6c54a7..9950fdaee 100644
--- a/src/scriptengines/qml/plasmoid/appletinterface.cpp
+++ b/src/scriptengines/qml/plasmoid/appletinterface.cpp
@@ -147,51 +147,6 @@ void AppletInterface::init()
 
     qDebug() << "Graphic object created:" << applet() << applet()->property("graphicObject");
 
-    //Create the ToolBox
-    Plasma::Containment *pc = qobject_cast<Plasma::Containment *>(applet());
-    if (pc && !qobject_cast<Plasma::Applet *>(pc->parent())) {
-        KConfigGroup defaults;
-        if (pc->containmentType() == Plasma::Types::DesktopContainment) {
-            defaults = KConfigGroup(KSharedConfig::openConfig(pc->corona()->package().filePath("defaults")), "Desktop");
-        } else if (pc->containmentType() == Plasma::Types::PanelContainment) {
-            defaults = KConfigGroup(KSharedConfig::openConfig(pc->corona()->package().filePath("defaults")), "Panel");
-        }
-
-        Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage("Plasma/Generic");
-        if (defaults.isValid()) {
-            pkg.setPath(defaults.readEntry("ToolBox", "org.kde.desktoptoolbox"));
-        } else {
-            pkg.setPath("org.kde.desktoptoolbox");
-        }
-
-        if (pkg.isValid()) {
-            QObject *toolBoxObject = m_qmlObject->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")));
-
-            QObject *containmentGraphicObject = m_qmlObject->rootObject();
-
-            if (containmentGraphicObject && toolBoxObject) {
-                toolBoxObject->setProperty("parent", QVariant::fromValue(containmentGraphicObject));
-
-                containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject));
-            } else {
-                delete toolBoxObject;
-            }
-            qDebug() << "Loaded toolbox package" << pkg.path();
-        } else {
-            qWarning() << "Could not load toolbox package." << pkg.path();
-        }
-    }
-
-    //set parent, both as object hyerarchy and visually
-    //do this only for containments, applets will do it in compactrepresentationcheck
-    if (pc && m_qmlObject->rootObject()) {
-        m_qmlObject->rootObject()->setProperty("parent", QVariant::fromValue(this));
-
-        //set anchors
-        QQmlExpression expr(m_qmlObject->engine()->rootContext(), m_qmlObject->rootObject(), "parent");
-        QQmlProperty prop(m_qmlObject->rootObject(), "anchors.fill");
-        prop.write(expr.evaluate());
-    }
     geometryChanged(QRectF(), QRectF(x(), y(), width(), height()));
     emit busyChanged();
 
diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
index 7a8feda30..fc82823ba 100644
--- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp
+++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
@@ -100,6 +100,52 @@ void ContainmentInterface::init()
 
     AppletInterface::init();
 
+    //Create the ToolBox
+    Plasma::Containment *pc = containment();
+    if (pc) {
+        KConfigGroup defaults;
+        if (pc->containmentType() == Plasma::Types::DesktopContainment) {
+            defaults = KConfigGroup(KSharedConfig::openConfig(pc->corona()->package().filePath("defaults")), "Desktop");
+        } else if (pc->containmentType() == Plasma::Types::PanelContainment) {
+            defaults = KConfigGroup(KSharedConfig::openConfig(pc->corona()->package().filePath("defaults")), "Panel");
+        }
+
+        Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage("Plasma/Generic");
+        if (defaults.isValid()) {
+            pkg.setPath(defaults.readEntry("ToolBox", "org.kde.desktoptoolbox"));
+        } else {
+            pkg.setPath("org.kde.desktoptoolbox");
+        }
+
+        if (pkg.isValid()) {
+            QObject *toolBoxObject = m_qmlObject->createObjectFromSource(QUrl::fromLocalFile(pkg.filePath("mainscript")));
+
+            QObject *containmentGraphicObject = m_qmlObject->rootObject();
+
+            if (containmentGraphicObject && toolBoxObject) {
+                toolBoxObject->setProperty("parent", QVariant::fromValue(containmentGraphicObject));
+
+                containmentGraphicObject->setProperty("toolBox", QVariant::fromValue(toolBoxObject));
+            } else {
+                delete toolBoxObject;
+            }
+            qDebug() << "Loaded toolbox package" << pkg.path();
+        } else {
+            qWarning() << "Could not load toolbox package." << pkg.path();
+        }
+    }
+
+    //set parent, both as object hyerarchy and visually
+    //do this only for containments, applets will do it in compactrepresentationcheck
+    if (m_qmlObject->rootObject()) {
+        m_qmlObject->rootObject()->setProperty("parent", QVariant::fromValue(this));
+
+        //set anchors
+        QQmlExpression expr(m_qmlObject->engine()->rootContext(), m_qmlObject->rootObject(), "parent");
+        QQmlProperty prop(m_qmlObject->rootObject(), "anchors.fill");
+        prop.write(expr.evaluate());
+    }
+
     if (m_qmlObject->rootObject()->property("minimumWidth").isValid()) {
         connect(m_qmlObject->rootObject(), SIGNAL(minimumWidthChanged()),
                 this, SIGNAL(minimumWidthChanged()));