Merge lp:~unity-team/unity/infographics-with-lightdm into lp:unity/phablet

[Nicolas d'Offay]

Initial MP for review of QML only infographics.

This is an initial MP of the infographics with one animation. Currently everything is done via QML for the visuals however in future the circles will have to be rendered together via C++/GL. Any suggestions on what could be improved with the Infographics.qml would be much appreciated.

Tests will be introduced after the QML and any potential GL which needs to be done is completed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:543
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity/infographics-with-lightdm/+merge/163308/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/894/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/827/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/770/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/774/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/894/rebuild

review: Needs Fixing (continuous-integration)

=== added file 'Greeter/Circle.qml'
--- Greeter/Circle.qml	1970-01-01 00:00:00 +0000
+++ Greeter/Circle.qml	2013-05-14 17:20:13 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Item {
+    property color color
+
+    scale: 0.0
+
+    ShaderEffect {
+        property real    size:  Math.min(width, height) * 0.5
+        property variant scale: Qt.size(width >= height ? width / height : 1.0,
+                                        width >= height ? 1.0 : height / width)
+        property color   color: Qt.rgba(parent.color.r * parent.color.a,
+                                        parent.color.g * parent.color.a,
+                                        parent.color.b * parent.color.a,
+                                        parent.color.a)
+
+        visible: size > 0.0
+        anchors.fill: parent
+        vertexShader: "
+            uniform mediump mat4 qt_Matrix;
+            uniform mediump vec2 scale;
+            attribute mediump vec4 qt_Vertex;
+            attribute mediump vec2 qt_MultiTexCoord0;
+            varying highp vec2 coord;
+            void main() {
+                // Put coord in the range [-1, 1].
+                coord = ((qt_MultiTexCoord0 * 2.0) - 1.0) * scale;
+                gl_Position = qt_Matrix * qt_Vertex;
+            }
+        "
+        fragmentShader: "
+            varying highp vec2 coord;
+            uniform mediump float qt_Opacity;
+            uniform mediump vec4 color;
+            uniform mediump float size;
+            void main() {
+                // Distance function for antialiased circle.
+                mediump float value = clamp(size + 0.5 - size * length(coord), 0.0, 1.0);
+                gl_FragColor = color.rgba * vec4(qt_Opacity * value);
+            }
+        "
+    }
+}

=== added file 'Greeter/CirclePositioner.qml'
--- Greeter/CirclePositioner.qml	1970-01-01 00:00:00 +0000
+++ Greeter/CirclePositioner.qml	2013-05-14 17:20:13 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Item {
+    property int count
+    property int index
+    property real radius
+    property real halfSize
+    property real posOffset
+
+    property real slice: (2 * Math.PI / count) * index;
+
+    implicitWidth: childrenRect.width
+    implicitHeight: childrenRect.height
+
+    x: (radius - halfSize * posOffset) * Math.sin(slice) + radius - halfSize
+    y: (radius - halfSize * posOffset) * -Math.cos(slice) + radius - halfSize
+
+    rotation: Math.atan2(radius-(y+halfSize), radius-(x+halfSize)) * 180 / Math.PI - 90
+}

=== added file 'Greeter/Dot.qml'
--- Greeter/Dot.qml	1970-01-01 00:00:00 +0000
+++ Greeter/Dot.qml	2013-05-14 17:20:13 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+Image {
+states: [
+        State {
+            name: "unfilled"
+            PropertyChanges { target: dot; source: "graphics/[e-mail]" }
+        },
+
+        State {
+            name: "filled"
+            PropertyChanges { target: dot; source: "graphics/[e-mail]" }
+        },
+
+        State {
+            name: "pointer"
+            PropertyChanges { target: dot; source: "graphics/[e-mail]" }
+    }
+]
+}

=== modified file 'Greeter/Greeter.qml'
--- Greeter/Greeter.qml	2013-05-02 19:24:24 +0000
+++ Greeter/Greeter.qml	2013-05-14 17:20:13 +0000
@@ -40,6 +40,7 @@
         property variant model: LightDM.Users
         property int currentIndex: 0
         property bool promptless: item ? item.promptless : false
+        property variant infographicModel: LightDM.Infographic
 
         source: required ? "GreeterContent.qml" : ""
 

=== modified file 'Greeter/GreeterContent.qml'
--- Greeter/GreeterContent.qml	2013-05-07 14:18:30 +0000
+++ Greeter/GreeterContent.qml	2013-05-14 17:20:13 +0000
@@ -70,6 +70,8 @@
 
         onLoaded: {
             item.currentIndex = greeterContentLoader.currentIndex
+            greeterContentLoader.infographicModel.username = greeterContentLoader.model.data(
+                        greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
         }
 
         Binding {
@@ -90,26 +92,31 @@
             }
 
             onCurrentIndexChanged: {
-                greeterContentLoader.currentIndex = loginLoader.item.currentIndex;
+                if (greeterContentLoader.currentIndex !== loginLoader.item.currentIndex) {
+                    greeterContentLoader.currentIndex = loginLoader.item.currentIndex;
+                    greeterContentLoader.infographicModel.username = greeterContentLoader.model.data(
+                                greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
+                }
             }
         }
     }
 
-    // FIXME: The images are way bigger than their content because the infographic
-    // bubbles can grow a lot. Because of that the infographic image reaches under the
-    // login list. This code makes sure that it never really overlaps until unusable
-    // with the current artwork. Will be replaced by real infographic.
-    CrossFadeImage {
+    Infographics {
         id: infographics
-        width: narrowMode ? sourceSize.width : Math.min(parent.width - loginLoader.x - loginLoader.width/2, units.gu(90))
-        height: narrowMode ? sourceSize.height : width * 8/9
+        width: narrowMode ? parent.width : undefined
+        height: narrowMode ? parent.height : 0.75 * parent.height
+
+        Component.onCompleted: {
+            greeterContentLoader.infographicModel.username = "phablet"
+        }
+
+        model: greeterContentLoader.infographicModel
 
         anchors {
             verticalCenter: parent.verticalCenter
             horizontalCenter: narrowMode ? parent.horizontalCenter : undefined
-            right: narrowMode ? undefined : parent.right
-            rightMargin: narrowMode ? 0 : units.gu(-6)
+            left: narrowMode ? undefined : loginLoader.right
+            right: narrowMode ? undefined : root.right
         }
-        source: narrowMode ? "graphics/infographic_tweeter_cut.png" : loginLoader.item.userList.model.data(currentIndex, LightDM.UserRoles.InfographicRole) ? loginLoader.item.userList.model.data(currentIndex, LightDM.UserRoles.InfographicRole) : ""
     }
 }

=== added file 'Greeter/Infographics.qml'
--- Greeter/Infographics.qml	1970-01-01 00:00:00 +0000
+++ Greeter/Infographics.qml	2013-05-14 17:20:13 +0000
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Rectangle {
+    id: infographic
+
+    property int animDuration: 10
+
+    Component.onCompleted: {
+        dotAnimTimer.start()
+        notification.showAnim.start()
+    }
+
+    color: "transparent"
+
+    property variant model
+
+    Connections {
+        target: model
+
+        onLabelChanged: {
+            dotAnimTimer.dotCounter = circleAnimTimer.pastCircleCounter = circleAnimTimer.presentCircleCounter = 0
+            dotAnimTimer.start()
+            notification.showAnim.start()
+        }
+    }
+
+    visible: model.label !== ""
+
+    Item {
+        id: dataCircle
+
+        width: Math.min(parent.height, parent.width) / 1.5
+        height: width
+
+        anchors.centerIn: parent
+
+        Timer {
+            id: circleAnimTimer
+
+            property int pastCircleCounter: 0
+            property int presentCircleCounter: 0
+
+            interval: infographic.animDuration; running: false; repeat: true
+            onTriggered: {
+                if (pastCircleCounter < pastCircles.count) {
+                    var nextCircle = pastCircles.itemAt(pastCircleCounter++)
+                    if (nextCircle !== null) nextCircle.pastUnlockAnim.start()
+                }
+                if (pastCircleCounter >= pastCircles.count / 2) {
+                    var nextCircle = presentCircles.itemAt(presentCircleCounter++)
+                    if (nextCircle !== null) nextCircle.presentUnlockAnim.start()
+                }
+                if (presentCircleCounter >= presentCircles.count) {
+                    stop()
+                    pastCircleCounter = presentCircleCounter = 0
+                }
+            }
+        }
+
+        Repeater {
+            id: pastCircles
+
+            model: infographic.model.secondMonth
+
+            delegate: CirclePositioner {
+                index: model.index
+                count: pastCircles.count
+                radius: parent.width / 2
+                halfSize: pastCircle.width / 2
+                posOffset: 0.0
+                visible: modelData !== null
+
+                property variant pastUnlockAnim: pastCircleUnlockAnim
+
+                Circle {
+                    id: pastCircle
+
+                    width: dataCircle.width / 2
+                    height: dataCircle.height / 2
+
+                    Component.onCompleted: {
+                        color = infographic.model.secondColor
+                    }
+
+                    SequentialAnimation {
+                        id: pastCircleUnlockAnim
+
+                        loops: 1
+                        ParallelAnimation {
+                            PropertyAnimation {
+                                target: pastCircle
+                                property: "opacity"
+                                from: 0.0
+                                to: 0.1
+                                easing.type: Easing.OutCurve
+                                duration: circleAnimTimer.interval * 4
+                            }
+                            PropertyAnimation {
+                                target: pastCircle
+                                property: "scale"
+                                to: modelData
+                                easing.type: Easing.OutCurve
+                                duration: circleAnimTimer.interval * 4
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Repeater {
+            id: presentCircles
+
+            model: infographic.model.firstMonth
+
+            delegate: CirclePositioner {
+                index: model.index
+                count: presentCircles.count
+                radius: parent.width / 2
+                halfSize: presentCircle.width / 2
+                posOffset: 0.0
+                visible: modelData !== null
+
+                property variant presentUnlockAnim: presentCircleUnlockAnim
+
+                Circle {
+                    id: presentCircle
+
+                    width: dataCircle.width / 2
+                    height: dataCircle.height / 2
+
+                    Component.onCompleted: {
+                        color = infographic.model.firstColor
+                    }
+
+                    SequentialAnimation {
+                        id: presentCircleUnlockAnim
+
+                        loops: 1
+
+                        ParallelAnimation {
+                            PropertyAnimation {
+                                target: presentCircle
+                                property: "opacity"
+                                from: 0.0
+                                to: 0.3
+                                easing.type: Easing.OutCurve
+                                duration: circleAnimTimer.interval * 4
+                            }
+                            PropertyAnimation {
+                                target: presentCircle
+                                property: "scale"
+                                from: 0.0
+                                to: modelData
+                                easing.type: Easing.OutCurve
+                                duration: circleAnimTimer.interval * 4
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Image {
+            id: backgroundCircle
+
+            anchors.fill: parent
+            opacity: 0.9
+
+            source: "graphics/infographic_circle.png"
+        }
+
+        Timer {
+            id: dotAnimTimer
+
+            property int dotCounter: 0
+
+            interval: animDuration * 0.5; running: false; repeat: true
+            onTriggered: {
+                if (dotCounter < dots.count) {
+                    var nextDot = dots.itemAt(dotCounter++)
+                    nextDot.unlockAnimation.start()
+                }
+                else {
+                    stop()
+                }
+                if (dotCounter >= dots.count / 2) {
+                    circleAnimTimer.start()
+                }
+            }
+        }
+
+        Repeater {
+            id: dots
+
+            model: infographic.model.firstMonth
+
+            delegate: CirclePositioner {
+                index: model.index
+                count: dots.count
+                radius: backgroundCircle.width / 2
+                halfSize: dot.width / 2
+                posOffset: radius / 180
+                state: dot.state
+
+                property variant unlockAnimation: dotUnlockAnim
+
+                property int currentDay: infographic.model.currentDay
+
+                Dot {
+                    id: dot
+
+                    visible: false
+                    smooth: true
+                    scale: radius / 1000
+                    state: {
+                        if (index < currentDay)
+                            "filled"
+                        else if (index == currentDay)
+                            "pointer"
+                        else
+                            "unfilled"
+                    }
+
+                    SequentialAnimation {
+                        id: dotUnlockAnim
+
+                        PropertyAnimation {
+                            target: dot
+                            property: "visible"
+                            to: "true"
+                            duration: dotAnimTimer.interval / 2
+                        }
+                    }
+                }
+            }
+        }
+
+        Text {
+            id: notification
+
+            height: 0.7 * backgroundCircle.width
+            width: notification.height
+            anchors.centerIn: parent
+
+            text: infographic.model.label
+            font.pixelSize: notification.height / 10
+
+            wrapMode: Text.WordWrap
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            color: "white"
+
+            opacity: 0.0
+
+            property variant showAnim: increaseOpacity
+
+            PropertyAnimation {
+                id: increaseOpacity
+
+                target: notification
+                property: "opacity"
+                to: 1.0
+                duration: dotAnimTimer.interval * dots.count * 2
+            }
+        }
+    }
+
+    MouseArea {
+        anchors.fill: dataCircle
+
+        onClicked: {
+            infographic.model.nextDataSource()
+        }
+    }
+}

=== added file 'Greeter/graphics/[e-mail]'
Binary files Greeter/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and Greeter/graphics/[e-mail]	2013-05-14 17:20:13 +0000 differ
=== added file 'Greeter/graphics/[e-mail]'
Binary files Greeter/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and Greeter/graphics/[e-mail]	2013-05-14 17:20:13 +0000 differ
=== added file 'Greeter/graphics/[e-mail]'
Binary files Greeter/graphics/[e-mail]	1970-01-01 00:00:00 +0000 and Greeter/graphics/[e-mail]	2013-05-14 17:20:13 +0000 differ
=== added file 'Greeter/graphics/infographic_circle.png'
Binary files Greeter/graphics/infographic_circle.png	1970-01-01 00:00:00 +0000 and Greeter/graphics/infographic_circle.png	2013-05-14 17:20:13 +0000 differ
=== removed file 'Greeter/graphics/[e-mail]'
Binary files Greeter/graphics/[e-mail]	2013-02-12 17:43:28 +0000 and Greeter/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Greeter/graphics/[e-mail]'
Binary files Greeter/graphics/[e-mail]	2012-11-23 17:15:36 +0000 and Greeter/graphics/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'plugins/LightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	2013-05-09 14:05:05 +0000
+++ plugins/LightDM/CMakeLists.txt	2013-05-14 17:20:13 +0000
@@ -12,12 +12,15 @@
 set(QMLPLUGIN_SRC
     ../Utils/qsortfilterproxymodelqml.cpp # FIXME evaluate a more generic approach for using other plugins
     greeter.cpp
+    infographicmodel.cpp
     plugin.cpp
     usersmodel.cpp
     # TODO: Once we split out a separate greeter process, we should move these
     # files to a mock plugin and link this plugin to the real liblightdm
     lightdm-greeter.cpp
     lightdm-usersmodel.cpp
+    lightdm-infographicmodel.cpp
+    qvariantlistmodel.cpp
     )
 
 add_library(LightDM-qml MODULE
@@ -43,3 +46,4 @@
 install(FILES qmldir
     DESTINATION ${SHELL_APP_DIR}/plugins/LightDM
     )
+

=== added file 'plugins/LightDM/infographicmodel.cpp'
--- plugins/LightDM/infographicmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/infographicmodel.cpp	2013-05-14 17:20:13 +0000
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2012,2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Pete Woods <[e-mail]>
+ */
+
+#include "infographicmodel.h"
+
+#include "infographicmodel.moc"

=== added file 'plugins/LightDM/infographicmodel.h'
--- plugins/LightDM/infographicmodel.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/infographicmodel.h	2013-05-14 17:20:13 +0000
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2012,2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Pete Woods <[e-mail]>
+ */
+
+#ifndef INFOGRAPHICMODEL_H
+#define INFOGRAPHICMODEL_H
+
+#include "lightdm-infographicmodel.h"
+
+typedef QLightDM::InfographicModel InfographicModel;
+
+#endif

=== added file 'plugins/LightDM/lightdm-infographicmodel.cpp'
--- plugins/LightDM/lightdm-infographicmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/lightdm-infographicmodel.cpp	2013-05-14 17:20:13 +0000
@@ -0,0 +1,539 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
+// To use the same method of setting role name that it does, we
+// set our compatibility to Qt4 here too.
+#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
+
+#include "lightdm-infographicmodel.h"
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QString>
+#include <QtGui/QIcon>
+
+#include <QMultiMap>
+
+#include "qvariantlistmodel.h"
+
+#include <random>
+
+using namespace QLightDM;
+
+namespace QLightDM
+{
+
+class InfographicData
+{
+public:
+    explicit InfographicData(QObject *parent);
+
+    explicit InfographicData(const QString &label, const QColor &first_color,
+            const QVariantList &first_month, const QColor &second_color,
+            const QVariantList &second_month, QObject* parent);
+
+public:
+    QObject * const q_ptr;
+    QString label;
+    QColor first_color;
+    QVariantList first_month;
+    QColor second_color;
+    QVariantList second_month;
+
+private:
+    Q_DECLARE_PUBLIC(QObject)
+};
+
+class InfographicModelPrivate: QObject
+{
+Q_OBJECT
+
+public:
+    explicit InfographicModelPrivate(InfographicModel *parent);
+
+    void generateFakeData();
+
+public Q_SLOTS:
+    void nextFakeData();
+
+protected:
+    InfographicModel * const q_ptr;
+    QString label;
+    QColor first_color;
+    QVariantListModel first_month;
+    QColor second_color;
+    QVariantListModel second_month;
+    int current_day;
+    QString username;
+    int data_index;
+    QMultiMap<QString, QSharedPointer<InfographicData>> fake_data;
+    QSharedPointer<InfographicData> empty_data;
+
+protected:
+    void setFakeData(int data_index);
+
+private:
+    Q_DECLARE_PUBLIC(InfographicModel)
+};
+}
+
+InfographicData::InfographicData(QObject *parent) :
+        q_ptr(parent)
+{
+}
+
+InfographicData::InfographicData(const QString &label,
+        const QColor &first_color, const QVariantList &first_month,
+        const QColor &second_color, const QVariantList &second_month,
+        QObject* parent) :
+        q_ptr(parent), label(label), first_color(first_color), first_month(
+                first_month), second_color(second_color), second_month(
+                second_month)
+{
+}
+
+InfographicModelPrivate::InfographicModelPrivate(InfographicModel *parent) :
+        q_ptr(parent), current_day(0)
+{
+    generateFakeData();
+    setFakeData(0);
+}
+
+void InfographicModelPrivate::generateFakeData()
+{
+    std::default_random_engine generator;
+    std::normal_distribution<qreal> distribution(0.5, 0.2);
+    auto rand = std::bind(distribution, generator);
+
+    QColor orange = QColor::fromRgbF(0.9, 0.3, 0.1, 1.0);
+    QColor yellow = QColor::fromRgbF(1.0, 0.6, 0.0, 1.0);
+    QColor red = QColor::fromRgbF(0.8, 0.0, 0.0, 1.0);
+    QColor dark_purple = QColor::fromRgbF(0.5, 0.2, 0.3, 1.0);
+    QColor light_purple = QColor::fromRgbF(0.8, 0.1, 0.8, 1.0);
+    QColor pink(QColor::fromRgbF(0.75, 0.13, 0.75));
+
+    {
+        empty_data.reset(new InfographicData(this));
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 17)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("Wow, you've walked <b>5</b>kms today",
+                        yellow, first_month, orange, second_month, this));
+        fake_data.insert("phablet", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 17)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>2</b> places visited today", pink, first_month,
+                        orange, second_month, this));
+        fake_data.insert("phablet", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 17)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("You've received <b>15</b> messages today",
+                        orange, first_month, red, second_month, this));
+        fake_data.insert("phablet", data);
+    }
+
+    {
+        QVariantList first_month( { 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 0.8, 0.9, 1.0,
+                0.9, 0.8, 0.7, 0.6, 0.5, 0.4, 0.3, 0.2 });
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("Klout score of <b>50.20</b>", light_purple,
+                        first_month, dark_purple, second_month, this));
+        fake_data.insert("phablet", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 17)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>1</b>hr watching videos today", red,
+                        first_month, dark_purple, second_month, this));
+        fake_data.insert("phablet", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 20)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>4</b>hrs watching videos today", red,
+                        first_month, dark_purple, second_month, this));
+        fake_data.insert("anna", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 20)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("You've received <b>23</b> messages today",
+                        orange, first_month, red, second_month, this));
+        fake_data.insert("anna", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 20)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>2</b> places visited today", pink, first_month,
+                        orange, second_month, this));
+        fake_data.insert("anna", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 20)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant(rand()));
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant());
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>3</b> places visited today", pink, first_month,
+                        orange, second_month, this));
+        fake_data.insert("toomas", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 20)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("You've received <b>5</b> messages today",
+                        orange, first_month, red, second_month, this));
+        fake_data.insert("toomas", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 17)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>8</b>hrs watching videos today", red,
+                        first_month, dark_purple, second_month, this));
+        fake_data.insert("lois", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 17)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("Klout score of <b>20.20</b>", light_purple,
+                        first_month, dark_purple, second_month, this));
+        fake_data.insert("lois", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 17)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant());
+        QSharedPointer<InfographicData> data(
+                new InfographicData("You've received <b>33</b> messages today",
+                        orange, first_month, red, second_month, this));
+        fake_data.insert("lois", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 17)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>5</b> places visited today", pink, first_month,
+                        orange, second_month, this));
+        fake_data.insert("lois", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 29)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>2</b>hrs watching videos today", red,
+                        first_month, dark_purple, second_month, this));
+        fake_data.insert("toomas", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 29)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("Wow, you've walked <b>5</b>kms today",
+                        yellow, first_month, orange, second_month, this));
+        fake_data.insert("toomas", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 29)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant(rand()));
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant());
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>7</b> places visited today", pink, first_month,
+                        orange, second_month, this));
+        fake_data.insert("toomas", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 29)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("You've received <b>55</b> messages today",
+                        orange, first_month, red, second_month, this));
+        fake_data.insert("toomas", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 29)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("Klout score of <b>10.20</b>", light_purple,
+                        first_month, dark_purple, second_month, this));
+        fake_data.insert("toomas", data);
+    }
+
+    {
+        QVariantList first_month;
+        while (first_month.size() < 15)
+            first_month.push_back(QVariant(rand()));
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant());
+        QVariantList second_month;
+        while (second_month.size() < 31)
+            second_month.push_back(QVariant(rand()));
+        QSharedPointer<InfographicData> data(
+                new InfographicData("<b>6</b>hrs watching videos today", red,
+                        first_month, dark_purple, second_month, this));
+        fake_data.insert("empty-name", data);
+    }
+}
+
+void InfographicModelPrivate::setFakeData(int new_index)
+{
+    qDebug() << "Data sets for user" << username << "= ["
+            << fake_data.values(username).size() << "], index = [" << new_index
+            << "]";
+
+    QSharedPointer<InfographicData> new_data;
+
+    if (!fake_data.contains(username))
+    {
+        data_index = 0;
+        new_data = empty_data;
+    } else
+    {
+        data_index = new_index;
+        new_data = fake_data.values(username).at(data_index);
+    }
+
+    label = new_data->label;
+    first_color = new_data->first_color;
+    first_month.setVariantList(new_data->first_month);
+    second_color = new_data->second_color;
+    second_month.setVariantList(new_data->second_month);
+
+    for (int i(first_month.rowCount()); i != 0; --i)
+    {
+        if (!first_month.data(first_month.index(i), Qt::DisplayRole).isNull())
+        {
+            current_day = i;
+            break;
+        }
+
+    }
+
+    q_ptr->labelChanged(label);
+    q_ptr->firstColorChanged(first_color);
+    q_ptr->secondColorChanged(second_color);
+    q_ptr->currentDayChanged(current_day);
+}
+
+void InfographicModelPrivate::nextFakeData()
+{
+    if (!fake_data.contains(username))
+    {
+        return;
+    }
+
+    setFakeData((data_index + 1) % fake_data.values(username).size());
+}
+
+InfographicModel::InfographicModel(QObject *parent) :
+        QObject(parent), d_ptr(new InfographicModelPrivate(this))
+{
+    connect(this, SIGNAL(nextDataSource()), d_ptr, SLOT(nextFakeData()));
+}
+
+InfographicModel::~InfographicModel()
+{
+    delete d_ptr;
+}
+
+QString InfographicModel::label() const
+{
+    return d_ptr->label;
+}
+
+QString InfographicModel::username() const
+{
+    return d_ptr->username;
+}
+
+void InfographicModel::setUsername(const QString &username)
+{
+    qDebug() << "Set username =" << username;
+    d_ptr->username = username;
+    d_ptr->setFakeData(0);
+    usernameChanged(d_ptr->username);
+}
+
+QColor InfographicModel::firstColor() const
+{
+    return d_ptr->first_color;
+}
+
+QColor InfographicModel::secondColor() const
+{
+    return d_ptr->second_color;
+}
+
+QAbstractItemModel * InfographicModel::firstMonth() const
+{
+    return &d_ptr->first_month;
+}
+
+QAbstractItemModel * InfographicModel::secondMonth() const
+{
+    return &d_ptr->second_month;
+}
+
+int InfographicModel::currentDay() const
+{
+    return d_ptr->current_day;
+}
+
+#include "lightdm-infographicmodel.moc"
+

=== added file 'plugins/LightDM/lightdm-infographicmodel.h'
--- plugins/LightDM/lightdm-infographicmodel.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/lightdm-infographicmodel.h	2013-05-14 17:20:13 +0000
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2010-2011 David Edmundson.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef LIGHTDM_INFOGRAPHICMODEL_H
+#define LIGHTDM_INFOGRAPHICMODEL_H
+
+#include <QtCore/QString>
+#include <QtGui/qcolor.h>
+#include <QAbstractListModel>
+
+namespace QLightDM
+{
+class InfographicModelPrivate;
+
+class Q_DECL_EXPORT InfographicModel : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QString label READ label NOTIFY labelChanged FINAL)
+    Q_PROPERTY(QString username READ username WRITE setUsername NOTIFY usernameChanged FINAL)
+    Q_PROPERTY(QColor firstColor READ firstColor NOTIFY firstColorChanged FINAL)
+    Q_PROPERTY(QColor secondColor READ secondColor NOTIFY secondColorChanged FINAL)
+    Q_PROPERTY(QAbstractItemModel *firstMonth READ firstMonth NOTIFY firstMonthChanged FINAL)
+    Q_PROPERTY(QAbstractItemModel *secondMonth READ secondMonth NOTIFY secondMonthChanged FINAL)
+    Q_PROPERTY(int currentDay READ currentDay NOTIFY currentDayChanged FINAL)
+
+public:
+    explicit InfographicModel(QObject *parent = 0);
+    ~InfographicModel();
+
+    QString label() const;
+
+    QString username() const;
+
+    void setUsername(const QString &username);
+
+    QColor firstColor() const;
+
+    QAbstractItemModel *firstMonth() const;
+
+    int currentDay() const;
+
+    QColor secondColor() const;
+
+    QAbstractItemModel *secondMonth() const;
+
+Q_SIGNALS:
+    void labelChanged(const QString &label);
+
+    void usernameChanged(const QString &username);
+
+    void firstColorChanged(const QColor &color);
+
+    void firstMonthChanged(QAbstractItemModel *first_month);
+
+    void currentDayChanged(int length);
+
+    void secondColorChanged(const QColor &color);
+
+    void secondMonthChanged(QAbstractItemModel *second_month);
+
+    void nextDataSource();
+
+protected:
+
+private:
+    InfographicModelPrivate * const d_ptr;
+
+    Q_DECLARE_PRIVATE(InfographicModel)
+
+};
+
+}
+
+#endif // LIGHTDM_INFOGRAPHICMODEL_H

=== modified file 'plugins/LightDM/lightdm-usersmodel.cpp'
--- plugins/LightDM/lightdm-usersmodel.cpp	2013-05-02 17:42:30 +0000
+++ plugins/LightDM/lightdm-usersmodel.cpp	2013-05-14 17:20:13 +0000
@@ -39,18 +39,17 @@
     bool is_active;
     bool has_messages;
     QString session;
-    QString infographic;
 };
 
 const Entry fake_entries[] =
 {
-    { "anna",         "Anna Olson",   "*", 0, false, false, 0, 0 },
-    { "lois",         "Lois Mcqueen", "*", 0, false, false, 0, 0 },
-    { "lola",         "Lola Chang",   "*", 0, false, false, 0, 0 },
-    { "toomas",       "Toomas Vilms", "*", 0, false, false, 0, 0 },
-    { "empty-name",   "",             "*", 0, false, false, 0, 0 },
-    { "no-password",  "Guest",        "*", 0, false, false, 0, 0 },
-    { "",             "",             0,   0, false, false, 0, 0 }
+    { "anna",         "Anna Olson",   "*", 0, false, false, 0 },
+    { "lois",         "Lois Mcqueen", "*", 0, false, false, 0 },
+    { "lola",         "Lola Chang",   "*", 0, false, false, 0 },
+    { "toomas",       "Toomas Vilms", "*", 0, false, false, 0 },
+    { "empty-name",   "",             "*", 0, false, false, 0 },
+    { "no-password",  "Guest",        "*", 0, false, false, 0 },
+    { "",             "",             0,   0, false, false, 0 }
 };
 
 namespace QLightDM
@@ -77,12 +76,10 @@
 
 void UsersModelPrivate::fillEntries()
 {
-    QDir bgdir = QDir("/usr/share/backgrounds/");
+    QDir bgdir = QDir("/usr/share/demo-assets/shell/backgrounds/");
     QStringList backgrounds = bgdir.entryList(QDir::Files | QDir::NoDotAndDotDot);
-    QDir infodir = QDir("/usr/share/demo-assets/shell/infographics/");
-    QStringList infographics = infodir.entryList(QDir::Files | QDir::NoDotAndDotDot);
 
-    for (int i = 0, j = 0, k = 0; fake_entries[i].username != ""; i++) {
+    for (int i = 0, j = 0; fake_entries[i].username != ""; i++) {
         Entry entry = fake_entries[i];
         if (entry.background == "*") {
             if (backgrounds.isEmpty()) {
@@ -94,12 +91,6 @@
                 }
             }
         }
-        if (!infographics.isEmpty()) {
-            entry.infographic = infodir.filePath(infographics[k++]);
-            if (k >= infographics.length()) {
-                k = 0;
-            }
-        }
         entries.append(entry);
     }
 }
@@ -119,7 +110,6 @@
     roles[SessionRole] = "session";
     roles[HasMessagesRole] = "hasMessages";
     roles[ImagePathRole] = "imagePath";
-    roles[InfographicRole] = "infographic";
     setRoleNames(roles);
     d->fillEntries();
 }
@@ -170,8 +160,6 @@
         return d->entries[row].has_messages;
     case UsersModel::ImagePathRole:
         return "";
-    case UsersModel::InfographicRole:
-        return d->entries[row].infographic;
     default:
         return QVariant();
     }

=== modified file 'plugins/LightDM/lightdm-usersmodel.h'
--- plugins/LightDM/lightdm-usersmodel.h	2013-04-20 20:55:20 +0000
+++ plugins/LightDM/lightdm-usersmodel.h	2013-05-14 17:20:13 +0000
@@ -46,8 +46,7 @@
                          SessionRole,
                          HasMessagesRole,
                          ImagePathRole,
-                         BackgroundPathRole,
-                         InfographicRole // WARNING: not a real lightdm role
+                         BackgroundPathRole
     };
 
     int rowCount(const QModelIndex &parent) const;

=== modified file 'plugins/LightDM/plugin.cpp'
--- plugins/LightDM/plugin.cpp	2013-05-09 14:05:05 +0000
+++ plugins/LightDM/plugin.cpp	2013-05-14 17:20:13 +0000
@@ -21,6 +21,8 @@
 #include "greeter.h"
 #include "lightdm-usersmodel.h"
 #include "usersmodel.h"
+#include "infographicmodel.h"
+
 #include <QtCore/QAbstractItemModel>
 #include <QtQml>
 
@@ -38,10 +40,19 @@
     return new UsersModel();
 }
 
+static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new InfographicModel();
+}
+
 void LightDMPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("LightDM"));
     qmlRegisterSingletonType<Greeter>(uri, 0, 1, "Greeter", greeter_provider);
     qmlRegisterSingletonType<UsersModel>(uri, 0, 1, "Users", users_provider);
     qmlRegisterUncreatableType<QLightDM::UsersModel>(uri, 0, 1, "UserRoles", "Type is not instantiable");
+    qmlRegisterSingletonType<InfographicModel>(uri, 0, 1, "Infographic", infographic_provider);
 }
+

=== added file 'plugins/LightDM/qvariantlistmodel.cpp'
--- plugins/LightDM/qvariantlistmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/qvariantlistmodel.cpp	2013-05-14 17:20:13 +0000
@@ -0,0 +1,243 @@
+/*
+    A simple model that uses a QVariantList as its data source.
+*/
+
+// LightDM currently is Qt4 compatible, and so doesn't define setRoleNames.
+// To use the same method of setting role name that it does, we
+// set our compatibility to Qt4 here too.
+#define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(4, 0, 0)
+
+#include "qvariantlistmodel.h"
+
+#include <QtCore/qvector.h>
+
+
+/*!
+    \class QVariantListModel
+    \inmodule QtCore
+    \brief The QVariantListModel class provides a model that supplies variants to views.
+
+    \ingroup model-view
+
+    QVariantListModel is an editable model that can be used for simple
+    cases where you need to display a number of variants in a view
+    widget, such as a QListView or a QComboBox.
+
+    The model provides all the standard functions of an editable
+    model, representing the data in the variant list as a model with
+    one column and a number of rows equal to the number of items in
+    the list.
+
+    Model indexes corresponding to items are obtained with the
+    \l{QAbstractListModel::index()}{index()} function, and item flags
+    are obtained with flags().  Item data is read with the data()
+    function and written with setData().  The number of rows (and
+    number of items in the variant list) can be found with the
+    rowCount() function.
+
+    The model can be constructed with an existing variant list, or
+    variants can be set later with the setVariantList() convenience
+    function. Variants can also be inserted in the usual way with the
+    insertRows() function, and removed with removeRows(). The contents
+    of the variant list can be retrieved with the variantList()
+    convenience function.
+
+    An example usage of QVariantListModel:
+
+    \snippet qvariantlistmodel/main.cpp 0
+
+    \sa QAbstractListModel, QAbstractItemModel, {Model Classes}
+*/
+
+/*!
+    Constructs a variant list model with the given \a parent.
+*/
+
+QVariantListModel::QVariantListModel(QObject *parent)
+    : QAbstractListModel(parent)
+{
+    QHash<int, QByteArray> roles(roleNames());
+    roles[Qt::DisplayRole] = "modelData";
+    setRoleNames(roles);
+}
+
+/*!
+    Constructs a variant list model containing the specified \a list
+    with the given \a parent.
+*/
+
+QVariantListModel::QVariantListModel(const QVariantList &list, QObject *parent)
+    : QAbstractListModel(parent), lst(list)
+{
+    QHash<int, QByteArray> roles(roleNames());
+    roles[Qt::DisplayRole] = "modelData";
+    setRoleNames(roles);
+}
+
+/*!
+    Returns the number of rows in the model. This value corresponds to the
+    number of items in the model's internal variant list.
+
+    The optional \a parent argument is in most models used to specify
+    the parent of the rows to be counted. Because this is a list if a
+    valid parent is specified, the result will always be 0.
+
+    \sa insertRows(), removeRows(), QAbstractItemModel::rowCount()
+*/
+
+int QVariantListModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.isValid())
+        return 0;
+
+    return lst.count();
+}
+
+/*!
+  \reimp
+*/
+QModelIndex QVariantListModel::sibling(int row, int column, const QModelIndex &idx) const
+{
+    if (!idx.isValid() || column != 0 || row >= lst.count())
+        return QModelIndex();
+
+    return createIndex(row, 0);
+}
+
+/*!
+    Returns data for the specified \a role, from the item with the
+    given \a index.
+
+    If the view requests an invalid index, an invalid variant is returned.
+
+    \sa setData()
+*/
+
+QVariant QVariantListModel::data(const QModelIndex &index, int role) const
+{
+    if (index.row() < 0 || index.row() >= lst.size())
+        return QVariant();
+
+    if (role == Qt::DisplayRole || role == Qt::EditRole)
+        return lst.at(index.row());
+
+    return QVariant();
+}
+
+/*!
+    Returns the flags for the item with the given \a index.
+
+    Valid items are enabled, selectable, editable, drag enabled and drop enabled.
+
+    \sa QAbstractItemModel::flags()
+*/
+
+Qt::ItemFlags QVariantListModel::flags(const QModelIndex &index) const
+{
+    if (!index.isValid())
+        return QAbstractListModel::flags(index) | Qt::ItemIsDropEnabled;
+
+    return QAbstractListModel::flags(index) | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+}
+
+/*!
+    Sets the data for the specified \a role in the item with the given
+    \a index in the model, to the provided \a value.
+
+    The dataChanged() signal is emitted if the item is changed.
+
+    \sa Qt::ItemDataRole, data()
+*/
+
+bool QVariantListModel::setData(const QModelIndex &index, const QVariant &value, int role)
+{
+    if (index.row() >= 0 && index.row() < lst.size()
+        && (role == Qt::EditRole || role == Qt::DisplayRole)) {
+        lst.replace(index.row(), value);
+        dataChanged(index, index, QVector<int>() << role);
+        return true;
+    }
+    return false;
+}
+
+/*!
+    Inserts \a count rows into the model, beginning at the given \a row.
+
+    The \a parent index of the rows is optional and is only used for
+    consistency with QAbstractItemModel. By default, a null index is
+    specified, indicating that the rows are inserted in the top level of
+    the model.
+
+    \sa QAbstractItemModel::insertRows()
+*/
+
+bool QVariantListModel::insertRows(int row, int count, const QModelIndex &parent)
+{
+    if (count < 1 || row < 0 || row > rowCount(parent))
+        return false;
+
+    beginInsertRows(QModelIndex(), row, row + count - 1);
+
+    for (int r = 0; r < count; ++r)
+        lst.insert(row, QVariant());
+
+    endInsertRows();
+
+    return true;
+}
+
+/*!
+    Removes \a count rows from the model, beginning at the given \a row.
+
+    The \a parent index of the rows is optional and is only used for
+    consistency with QAbstractItemModel. By default, a null index is
+    specified, indicating that the rows are removed in the top level of
+    the model.
+
+    \sa QAbstractItemModel::removeRows()
+*/
+
+bool QVariantListModel::removeRows(int row, int count, const QModelIndex &parent)
+{
+    if (count <= 0 || row < 0 || (row + count) > rowCount(parent))
+        return false;
+
+    beginRemoveRows(QModelIndex(), row, row + count - 1);
+
+    for (int r = 0; r < count; ++r)
+        lst.removeAt(row);
+
+    endRemoveRows();
+
+    return true;
+}
+
+/*!
+    Returns the variant list used by the model to store data.
+*/
+QVariantList QVariantListModel::variantList() const
+{
+    return lst;
+}
+
+/*!
+    Sets the model's internal variant list to \a list. The model will
+    notify any attached views that its underlying data has changed.
+
+    \sa dataChanged()
+*/
+void QVariantListModel::setVariantList(const QVariantList &list)
+{
+    beginResetModel();
+    lst = list;
+    endResetModel();
+}
+
+/*!
+  \reimp
+*/
+Qt::DropActions QVariantListModel::supportedDropActions() const
+{
+    return QAbstractItemModel::supportedDropActions() | Qt::MoveAction;
+}
+

=== added file 'plugins/LightDM/qvariantlistmodel.h'
--- plugins/LightDM/qvariantlistmodel.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/qvariantlistmodel.h	2013-05-14 17:20:13 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2010-2011 David Edmundson.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#ifndef QVARIANTLISTMODEL_H
+#define QVARIANTLISTMODEL_H
+
+#include <QAbstractListModel>
+#include <QVariantList>
+
+class Q_CORE_EXPORT QVariantListModel : public QAbstractListModel
+{
+    Q_OBJECT
+public:
+    explicit QVariantListModel(QObject *parent = 0);
+    explicit QVariantListModel(const QVariantList &list, QObject *parent = 0);
+
+    int rowCount(const QModelIndex &parent = QModelIndex()) const;
+    QModelIndex sibling(int row, int column, const QModelIndex &idx) const;
+
+    QVariant data(const QModelIndex &index, int role) const;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
+
+    Qt::ItemFlags flags(const QModelIndex &index) const;
+
+    bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex());
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
+
+    QVariantList variantList() const;
+    void setVariantList(const QVariantList &list);
+
+    Qt::DropActions supportedDropActions() const;
+
+private:
+    Q_DISABLE_COPY(QVariantListModel)
+    QVariantList lst;
+};
+
+
+#endif // QVARIANTLISTMODEL_H

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-05-14 13:42:33 +0000
+++ tests/qmltests/CMakeLists.txt	2013-05-14 17:20:13 +0000
@@ -55,4 +55,4 @@
 add_qml_test(Panel Panel)
 add_qml_test(Panel SearchIndicator)
 add_qml_test(Panel/Menus IndicatorMenuWindow IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS})
-add_qml_test(SideStage SideStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
+add_qml_test(SideStage SideStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
\ No newline at end of file