actually show the containment's qml

plasma/applet.cpp

@@ -203,6 +203,20 @@ uint Applet::id() const
     return d->appletId;
 }
 
+QObject *Applet::graphicObject() const
+{
+    return d->graphicObject;
+}
+
+void Applet::setGraphicObject(QObject *obj)
+{
+    if (d->graphicObject == obj) {
+        return;
+    }
+    d->graphicObject = obj;
+    emit graphicObjectChanged();
+}
+
 void Applet::save(KConfigGroup &g) const
 {
     if (d->transient) {

plasma/applet.h

@@ -94,6 +94,13 @@ class PLASMA_EXPORT Applet : public QObject
          */
         uint id() const;
 
+        /**
+         * @since: 5.0
+         * A pointer to the graphical representation of this applet
+         */
+        QObject *graphicObject() const;
+        void setGraphicObject(QObject *obj);
+
         /**
         * Returns the KConfigGroup to access the applets configuration.
         *
@@ -569,6 +576,11 @@ class PLASMA_EXPORT Applet : public QObject
         bool hasValidAssociatedApplication() const;
 
     Q_SIGNALS:
+        /**
+         * emitted when/if the graphic representation of the applet changes
+         */
+        void graphicObjectChanged();
+
         /**
          * This signal indicates that an application launch, window
          * creation or window focus event was triggered. This is used, for instance,

plasma/private/applet_p.cpp

@@ -71,6 +71,7 @@ AppletPrivate::AppletPrivate(KService::Ptr service, const KPluginInfo *info, int
           itemStatus(UnknownStatus),
           preferredSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored),
           modificationsTimer(0),
+          graphicObject(0),
           hasConfigurationInterface(false),
           failed(false),
           isContainment(false),

plasma/private/applet_p.h

@@ -173,6 +173,9 @@ public:
     QBasicTimer constraintsTimer;
     QBasicTimer *modificationsTimer;
 
+    // Everything graphics related that remains in Applet
+    QObject *graphicObject;
+
     // a great green field of booleans :)
     bool hasConfigurationInterface : 1;
     bool failed : 1;

scriptengines/qml/plasmoid/declarativeappletscript.cpp

@@ -104,8 +104,6 @@ bool DeclarativeAppletScript::init()
     Plasma::Applet *a = applet();
     Plasma::Containment *cont = qobject_cast<Plasma::Containment *>(a);
 
-    //TODO: assign the graphical root object
-
     if (cont) {
         m_interface = new ContainmentInterface(this);
     //fail? so it's a normal Applet
@@ -125,6 +123,8 @@ void DeclarativeAppletScript::qmlCreationFinished()
 {
     //If it's a popupapplet and the root object has a "compactRepresentation" component, use that instead of the icon
     Plasma::Applet *a = applet();
+    a->setGraphicObject(m_qmlObject->rootObject());
+
     //TODO: access rootItem from m_interface
     //m_self->setProperty("rootItem", QVariant::fromValue(m_qmlObject->rootObject()));
 

shell/desktopcorona.cpp

@@ -37,6 +37,8 @@ DesktopCorona::DesktopCorona(QObject *parent)
     connect(m_desktopWidget, SIGNAL(workAreaResized(int)),
             this, SLOT(workAreaResized(int)));
 
+    connect(this, SIGNAL(screenOwnerChanged(int, int, Plasma::Containment *)),
+            this, SLOT(updateScreenOwner(int, int, Plasma::Containment *)));
     checkViews();
 }
 
@@ -49,8 +51,11 @@ DesktopCorona::~DesktopCorona()
 void DesktopCorona::loadDefaultLayout()
 {
     Plasma::Containment *cont = addContainment("org.kde.testcontainment");
-    Plasma::Applet *appl = cont->addApplet("foo");
+    cont->setScreen(0);
-    qDebug() << "Containment:" << cont->name() << "Applet:" << appl->name() << appl;
+    qDebug() << containmentForScreen(0);
+    //Plasma::Applet *appl = cont->addApplet("foo");
+    qDebug() << "Containment:" << cont << cont->name();
+    //qDebug() << "Applet:" << appl->name() << appl;
 }
 
 void DesktopCorona::checkScreens(bool signalWhenExists)
@@ -79,7 +84,7 @@ void DesktopCorona::checkScreen(int screen, bool signalWhenExists)
     //TODO: restore activities
     //Activity *currentActivity = activity(m_activityController->currentActivity());
     //ensure the desktop(s) have a containment and view
-    checkDesktop(/*currentActivity,*/ signalWhenExists, screen, 0);
+    checkDesktop(/*currentActivity,*/ signalWhenExists, screen, -1);
 
 
     //ensure the panels get views too
@@ -184,5 +189,16 @@ void DesktopCorona::checkViews()
     }
 }
 
+void DesktopCorona::updateScreenOwner(int wasScreen, int isScreen, Plasma::Containment *containment)
+{
+    qDebug() << "Was screen" << wasScreen << "Is screen" << isScreen <<"Containment" << containment;
+    if (isScreen < 0 || m_views.count() < isScreen + 1) {
+        qWarning() << "Invalid screen";
+        return;
+    }
+
+    m_views[isScreen]->setContainment(containment);
+}
+
 #include "desktopcorona.moc"
 

shell/desktopcorona.h

@@ -69,6 +69,7 @@ protected Q_SLOTS:
     void workAreaResized(int screen);
 
     void checkViews();
+    void updateScreenOwner(int wasScreen, int isScreen, Plasma::Containment *containment);
 
 private:
     QDesktopWidget *m_desktopWidget;

shell/qmlpackages/desktop/contents/ui/main.qml

@@ -21,79 +21,20 @@ import QtQuick 2.0
 
 import org.kde.plasma.core 0.1 as PlasmaCore
 
+
 Rectangle {
-    color: "darkblue"
+    color: "red"
     width: 640
     height: 480
 
-    PlasmaCore.Svg {
+    property Item containment
-        id: actionssvg
+
-        imagePath: "widgets/configuration-icons"
+    onContainmentChanged: {
+        print("New Containment: " + containment + containment.parent)
+        //containment.parent = root
+        containment.visible = true
+        containment.anchors.fill = root
     }
 
-    PlasmaCore.FrameSvgItem {
+    Component.onCompleted: print("View QML loaded")
-        id: frame
+}
-        x: 50
-        y: 50
-        width: txt.paintedWidth + 80
-        height: txt.paintedHeight + 80 * 2
-        property int small: 100
-        property int large: parent.width - width - 150
-        imagePath: "widgets/background"
-        MouseArea {
-            anchors.fill: parent
-            drag.target: parent
-            onClicked: {
-                var s = (frame.x == frame.large) ? frame.small : frame.large;
-                frame.x = s
-                frame.height = s
-            }
-        }
-        Behavior on x { PropertyAnimation { easing.type: Easing.OutElastic; duration: 800 } }
-        //Behavior on y { PropertyAnimation { easing.type: Easing.OutElastic; duration: 800 } }
-        Behavior on height { PropertyAnimation { easing.type: Easing.InOutDouble; duration: 300 } }
-
-        Text {
-            id: txt
-            text: "Click or Drag";
-            anchors.centerIn: parent
-        }
-        PlasmaCore.SvgItem {
-            svg: actionssvg
-            elementId: "rotate"
-            width: 16
-            height: width
-            anchors.margins: frame.margins.left
-            anchors {
-                top: parent.top
-                left: parent.left
-            }
-            //Rectangle { color: "white"; opacity: 0.2; anchors.fill: parent; }
-        }
-    }
-//     PlasmaCore.SvgItem {
-//         svg: actionssvg
-//         elementId: "rotate"
-//         width: 128
-//         height: width
-//     }
-    PlasmaCore.IconItem {
-        source: "accessories-dictionary"
-        x: 50
-        y: 350
-        width: 48
-        height: 48
-        Rectangle { color: "white"; opacity: 0.2; anchors.fill: parent; }
-    }
-
-//     Svg {
-//         x: 200
-//         y: 200
-//         width: 100
-//         height: 100
-//         MouseArea {
-//             anchors.fill: parent
-//             drag.target: parent
-//         }
-//     }
-}

shell/testcontainment/contents/ui/main.qml

@@ -17,14 +17,76 @@
  */
 
 import QtQuick 2.0
-//import org.kde.plasma 2.0
 
 import org.kde.plasma.core 0.1 as PlasmaCore
 
 Rectangle {
-    color: "red"
+    id: root
+    color: "darkblue"
     width: 640
     height: 480
 
+    property Item containment
+
+    PlasmaCore.Svg {
+        id: actionssvg
+        imagePath: "widgets/configuration-icons"
+    }
+
+    PlasmaCore.FrameSvgItem {
+        id: frame
+        x: 50
+        y: 50
+        width: txt.paintedWidth + 80
+        height: txt.paintedHeight + 80 * 2
+        property int small: 100
+        property int large: parent.width - width - 150
+        imagePath: "widgets/background"
+        MouseArea {
+            anchors.fill: parent
+            drag.target: parent
+            onClicked: {
+                var s = (frame.x == frame.large) ? frame.small : frame.large;
+                frame.x = s
+                frame.height = s
+            }
+        }
+        Behavior on x { PropertyAnimation { easing.type: Easing.OutElastic; duration: 800 } }
+        //Behavior on y { PropertyAnimation { easing.type: Easing.OutElastic; duration: 800 } }
+        Behavior on height { PropertyAnimation { easing.type: Easing.InOutDouble; duration: 300 } }
+
+        Text {
+            id: txt
+            text: "Click or Drag";
+            anchors.centerIn: parent
+        }
+        PlasmaCore.SvgItem {
+            svg: actionssvg
+            elementId: "rotate"
+            width: 16
+            height: width
+            anchors.margins: frame.margins.left
+            anchors {
+                top: parent.top
+                left: parent.left
+            }
+            //Rectangle { color: "white"; opacity: 0.2; anchors.fill: parent; }
+        }
+    }
+//     PlasmaCore.SvgItem {
+//         svg: actionssvg
+//         elementId: "rotate"
+//         width: 128
+//         height: width
+//     }
+    PlasmaCore.IconItem {
+        source: "accessories-dictionary"
+        x: 50
+        y: 350
+        width: 48
+        height: 48
+        Rectangle { color: "white"; opacity: 0.2; anchors.fill: parent; }
+    }
+
     Component.onCompleted: print("Test Containment loaded")
 }

shell/view.cpp

@@ -19,7 +19,8 @@
 #include "view.h"
 
 #include <QDebug>
-
+#include <QQuickItem>
+#include <QTimer>
 #include "plasma/pluginloader.h"
 
 View::View(QWindow *parent)
@@ -44,4 +45,41 @@ View::~View()
 
 
 
+void View::setContainment(Plasma::Containment *cont)
+{
+    if (m_containment) {
+        disconnect(m_containment.data(), 0, this, 0);
+    }
+
+    m_containment = cont;
+
+    if (!cont) {
+        return;
+    }
+
+    connect(cont, SIGNAL(graphicObjectChanged()), this, SLOT(syncGraphicObject()));
+
+    if (m_containment.data()->graphicObject()) {
+        syncGraphicObject();
+    }
+}
+
+Plasma::Containment *View::containment() const
+{
+    return m_containment.data();
+}
+
+void View::syncGraphicObject()
+{
+    qDebug() << "using as graphic containment" << m_containment.data()->graphicObject()<<m_containment.data();
+    if (!m_containment || !m_containment.data()->graphicObject()) {
+        qWarning() << "Containment not valid (yet?)";
+        return;
+    }
+
+    m_containment.data()->graphicObject()->setProperty("visible", false);
+    m_containment.data()->graphicObject()->setProperty("parent", QVariant::fromValue(rootObject()));
+    rootObject()->setProperty("containment", QVariant::fromValue(m_containment.data()->graphicObject()));
+}
+
 #include "moc_view.cpp"

shell/view.h

@@ -23,6 +23,7 @@
 
 
 #include "plasma/package.h"
+#include "plasma/containment.h"
 
 
 class View : public QQuickView
@@ -33,8 +34,15 @@ public:
     View(QWindow *parent = 0);
     virtual ~View();
 
+    void setContainment(Plasma::Containment *cont);
+    Plasma::Containment *containment() const;
+
+protected Q_SLOTS:
+    void syncGraphicObject();
+
 private:
     Plasma::Package m_package;
+    QWeakPointer<Plasma::Containment> m_containment;
 };
 
 #endif // VIEW_H