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

[Nicolas d'Offay]

Commit of infographics with initial animation.

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.

=== added file 'Greeter/Circle.qml'
--- Greeter/Circle.qml	1970-01-01 00:00:00 +0000
+++ Greeter/Circle.qml	2013-05-10 12:09:35 +0000
@@ -0,0 +1,61 @@
+/*
+ * 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 {
+        id: shader
+
+        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-10 12:09:35 +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-10 12:09:35 +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-04-09 00:39:33 +0000
+++ Greeter/Greeter.qml	2013-05-10 12:09:35 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import QtQuick.XmlListModel 2.0
+import LightDM 0.1 as LightDM
 import "../Components"
 
 Showable {
@@ -24,8 +24,8 @@
     enabled: shown
     created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
 
-    property alias model: userList
-    property bool locked: shown && multiUser && !greeterContentLoader.guestAccount
+    property alias model: greeterContentLoader.model
+    property bool locked: shown && multiUser && !greeterContentLoader.promptless
 
     readonly property bool narrowMode: width <= units.gu(60)
     readonly property bool multiUser: !narrowMode // TODO: populate with real value
@@ -33,50 +33,14 @@
     signal selected(int uid)
     signal unlocked(int uid)
 
-    ListModel {
-        id: userList
-        objectName: "userList"
-        ListElement { name: "Guest"; background: "graphics/tablet_background.jpg" }
-    }
-
-    // TODO: Replace with a ModelAggregator once we have one.
-    // Check Unity2D for a possibly usable one.
-    XmlListModel {
-        id: xmlReader
-        source: "/usr/share/demo-assets/shell/users.xml"
-        query: "/users/user"
-
-        XmlRole { name: "name"; query: "username/string()" }
-        XmlRole { name: "password"; query: "password/string()" }
-        XmlRole { name: "background"; query: "background/string()" }
-        XmlRole { name: "infographic"; query: "infographic/string()" }
-
-        onStatusChanged: {
-            if (status == XmlListModel.Ready) {
-                // Need to reset the model to make sure everything updates correctly.
-                // Otherwise currentIndex, count etc could stay the same and bindings are not updated.
-                greeterContentLoader.currentIndex = -1;
-                greeterContentLoader.model = undefined;
-
-                userList.clear();
-                for (var i = 0; i < xmlReader.count; i++) {
-                    userList.append(xmlReader.get(i));
-                }
-                userList.append({ "name": "Guest", background: "graphics/tablet_background.jpg" });
-
-                greeterContentLoader.model = userList;
-                greeterContentLoader.currentIndex = 0;
-            }
-        }
-    }
-
     Loader {
         id: greeterContentLoader
         objectName: "greeterContentLoader"
         anchors.fill: parent
-        property variant model: userList
+        property variant model: LightDM.Users
         property int currentIndex: 0
-        property bool guestAccount: item ? item.guestAccount : false
+        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-04-05 11:03:11 +0000
+++ Greeter/GreeterContent.qml	2013-05-10 12:09:35 +0000
@@ -16,13 +16,14 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import LightDM 0.1 as LightDM
 import "../Components"
 
 MouseArea {
     id: root
     anchors.fill: parent
 
-    property bool guestAccount: loginLoader.status == Loader.Ready && loginLoader.item.guestAccount
+    property bool promptless: loginLoader.status == Loader.Ready && LightDM.Greeter.promptless
     property bool ready: wallpaper.status == Image.Ready
 
     signal selected(int uid)
@@ -69,6 +70,8 @@
 
         onLoaded: {
             item.currentIndex = greeterContentLoader.currentIndex
+            greeterContentLoader.infographicModel.username = greeterContentLoader.model.data(
+                        greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
         }
 
         Binding {
@@ -90,25 +93,28 @@
 
             onCurrentIndexChanged: {
                 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 : parent.width / 1.7
+        height: narrowMode ? parent.height : width / 1.7
+
+        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
+            leftMargin: narrowMode ? 0 : width / 6
         }
-        source: narrowMode ? "graphics/infographic_tweeter_cut.png" : userList.get(greeterContentLoader.currentIndex).infographic ? userList.get(greeterContentLoader.currentIndex).infographic : ""
     }
 }

=== added file 'Greeter/Infographics.desktop'
--- Greeter/Infographics.desktop	1970-01-01 00:00:00 +0000
+++ Greeter/Infographics.desktop	2013-05-10 12:09:35 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Infographics
+Comment=My project description
+Exec=/usr/bin/qmlscene $@ /usr/share/Infographics/Infographics.qml
+Icon=qmlscene
+Terminal=false
+Type=Application
+X-Ubuntu-Touch=true
+Name[en_GB]=Infographics.desktop

=== added file 'Greeter/Infographics.qml'
--- Greeter/Infographics.qml	1970-01-01 00:00:00 +0000
+++ Greeter/Infographics.qml	2013-05-10 12:09:35 +0000
@@ -0,0 +1,300 @@
+/*
+ * 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: 20
+
+    Component.onCompleted: {
+        dotAnimTimer.start();
+        notification.showAnim.start();
+    }
+
+    color: "transparent"
+
+    property variant model
+
+    Connections {
+        target: model
+
+        onLabelChanged: {
+            dotAnimTimer.dotCounter = 0;
+            circleAnimTimer.pastCircleCounter = 0;
+            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(presentCircles.count === 0 || pastCircles.count === 0) {
+                    stop()
+                    pastCircleCounter = presentCircleCounter = 0
+                }
+
+                if (pastCircleCounter < pastCircles.count) {
+                    var nextCircle = pastCircles.itemAt(pastCircleCounter++)
+                    nextCircle.pastUnlockAnim.start()
+                }
+                if (pastCircleCounter >= pastCircles.count / 2) {
+                    var nextCircle = presentCircles.itemAt(presentCircleCounter++)
+                    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 var 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: 0.6 + 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 var 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 var 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/Infographics.qmlproject'
--- Greeter/Infographics.qmlproject	1970-01-01 00:00:00 +0000
+++ Greeter/Infographics.qmlproject	2013-05-10 12:09:35 +0000
@@ -0,0 +1,20 @@
+/* File generated by Qt Creator, version 2.7.0 */
+
+import QmlProject 1.1
+
+Project {
+    mainFile: "Infographics.qml"
+    
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ "../exampleplugin" ]
+}

=== modified file 'Greeter/LoginList.qml'
--- Greeter/LoginList.qml	2013-04-12 05:54:57 +0000
+++ Greeter/LoginList.qml	2013-05-10 12:09:35 +0000
@@ -16,17 +16,18 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import LightDM 0.1 as LightDM
 
 Item {
     id: root
 
+    property alias userList: userList
     property alias model: userList.model
     property alias currentIndex: userList.currentIndex
 
     readonly property int cellHeight: units.gu(6)
     readonly property int highlightedHeight: units.gu(10)
     readonly property int moveDuration: 200
-    readonly property bool guestAccount: userList.model.get(userList.currentIndex).password === undefined
 
     signal selected(int uid)
     signal unlocked(int uid)
@@ -66,9 +67,18 @@
         readonly property int offsetStartDistance: units.gu(7)
         readonly property int fadeOutDistance: pathStartMargin - units.gu(1)
 
+        onCountChanged: {
+            // Start authentication when we start up
+            if (!LightDM.Greeter.authenticationUser && userList.currentItem) {
+                root.selected(userList.currentIndex);
+                root.resetAuthentication();
+            }
+        }
+
         onCurrentIndexChanged: {
-            passwordInput.text = "";
-            passwordInput.focus = false
+            if (LightDM.Greeter.authenticationUser != userList.model.data(currentIndex, LightDM.UserRoles.NameRole)) {
+                root.resetAuthentication();
+            }
         }
 
         onMovingInternallyChanged: {
@@ -157,7 +167,7 @@
                     right: parent.right
                     rightMargin: units.gu(2)
                 }
-                text: name
+                text: realName
                 color: "white"
                 elide: Text.ElideRight
             }
@@ -201,7 +211,7 @@
         }
         height: units.gu(4.5)
         width: parent.width - anchors.margins * 2
-        placeholderText: root.guestAccount ? "Tap to unlock" : "Password"
+        placeholderText: LightDM.Greeter.promptless ? "Tap to unlock" : "Password"
         echoMode: TextInput.Password
         opacity: userList.movingInternally ? 0 : 1
 
@@ -209,15 +219,7 @@
             NumberAnimation { duration: 100 }
         }
 
-        onAccepted: {
-            if (text === userList.model.get(userList.currentIndex).password) {
-                root.unlocked(userList.currentIndex);
-                passwordInput.focus = false;
-            } else {
-                wrongPasswordAnimation.start();
-            }
-            text = "";
-        }
+        onAccepted: LightDM.Greeter.respond(text)
 
         Image {
             anchors {
@@ -225,7 +227,7 @@
                 rightMargin: units.gu(2)
                 verticalCenter: parent.verticalCenter
             }
-            visible: root.guestAccount
+            visible: LightDM.Greeter.promptless
             source: "graphics/icon_arrow.png"
         }
 
@@ -265,11 +267,38 @@
         }
 
     }
+
     MouseArea {
         anchors.fill: passwordInput
-        enabled: root.guestAccount
+        enabled: LightDM.Greeter.promptless
         onClicked: {
             root.unlocked(userList.currentIndex);
         }
     }
+
+    function resetAuthentication() {
+        if (!userList.currentItem) {
+            return;
+        }
+        passwordInput.text = "";
+        passwordInput.focus = false;
+        LightDM.Greeter.authenticate(userList.model.data(currentIndex, LightDM.UserRoles.NameRole));
+    }
+
+    Connections {
+        target: LightDM.Greeter
+
+        onAuthenticationComplete: {
+            if (LightDM.Greeter.promptless) {
+                return;
+            }
+            if (LightDM.Greeter.authenticated) {
+                root.unlocked(userList.currentIndex);
+                passwordInput.focus = false;
+            } else {
+                wrongPasswordAnimation.start();
+            }
+            passwordInput.text = "";
+        }
+    }
 }

=== 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-10 12:09:35 +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-10 12:09:35 +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-10 12:09:35 +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-10 12:09:35 +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 'Shell.qml'
--- Shell.qml	2013-05-02 22:07:11 +0000
+++ Shell.qml	2013-05-10 12:09:35 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Application 0.1
 import Ubuntu.Components 0.1
+import LightDM 0.1 as LightDM
 import "Dash"
 import "Greeter"
 import "Launcher"
@@ -36,7 +37,8 @@
     height: tablet ? units.gu(100) : units.gu(71)
 
     property real edgeSize: units.gu(2)
-    property url background: shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg"
+    property url default_background: shell.width >= units.gu(60) ? "graphics/tablet_background.jpg" : "graphics/phone_background.jpg"
+    property url background: default_background
     readonly property real panelHeight: panel.panelHeight
 
     property bool dashShown: dash.shown
@@ -351,8 +353,10 @@
         onShownChanged: if (shown) greeter.forceActiveFocus()
 
         onUnlocked: greeter.hide()
-        onSelected: shell.background = greeter.model.get(uid).background;
-
+        onSelected: {
+            var bgPath = greeter.model.data(uid, LightDM.UserRoles.BackgroundPathRole)
+            shell.background = bgPath ? bgPath : default_background
+        }
     }
 
     Revealer {

=== modified file 'debian/control'
--- debian/control	2013-05-09 08:55:23 +0000
+++ debian/control	2013-05-10 12:09:35 +0000
@@ -4,7 +4,6 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
-               demo-assets,
                doxygen,
                graphviz,
                libboost-regex1.49-dev (>= 1.49),

=== modified file 'debian/qml-phone-shell.install'
--- debian/qml-phone-shell.install	2013-04-18 18:53:42 +0000
+++ debian/qml-phone-shell.install	2013-05-10 12:09:35 +0000
@@ -12,5 +12,6 @@
 /usr/share/qml-phone-shell/SideStage/*
 /usr/share/qml-phone-shell/graphics/*
 /usr/share/qml-phone-shell/plugins/HudClient/*
+/usr/share/qml-phone-shell/plugins/LightDM/*
 /usr/share/qml-phone-shell/plugins/Unity/*
 /usr/share/qml-phone-shell/plugins/Utils/*

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2013-04-18 17:20:37 +0000
+++ plugins/CMakeLists.txt	2013-05-10 12:09:35 +0000
@@ -1,3 +1,4 @@
 add_subdirectory(Utils)
 add_subdirectory(Unity)
 add_subdirectory(HudClient)
+add_subdirectory(LightDM)

=== added directory 'plugins/LightDM'
=== added file 'plugins/LightDM/CMakeLists.txt'
--- plugins/LightDM/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/CMakeLists.txt	2013-05-10 12:09:35 +0000
@@ -0,0 +1,49 @@
+# Dependencies
+# TODO: Once we split out a separate greeter process, uncomment these lines
+#include(FindPkgConfig)
+#pkg_check_modules(LIBLIGHTDM REQUIRED liblightdm-qt5-2)
+
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${LIBLIGHTDM_INCLUDE_DIRS}
+)
+
+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
+    ${QMLPLUGIN_SRC}
+    )
+
+# TODO: Once we split out a separate greeter process, uncomment these lines
+#target_link_libraries(LightDM-qml
+#    ${LIBLIGHTDM_LDFLAGS}
+#    )
+
+qt5_use_modules(LightDM-qml Gui Qml)
+
+# copy qmldir file into build directory for shadow builds
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/qmldir"
+    DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+    )
+
+install(TARGETS LightDM-qml
+    DESTINATION ${SHELL_APP_DIR}/plugins/LightDM
+    )
+
+install(FILES qmldir
+    DESTINATION ${SHELL_APP_DIR}/plugins/LightDM
+    )
+

=== added file 'plugins/LightDM/greeter.cpp'
--- plugins/LightDM/greeter.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/greeter.cpp	2013-05-10 12:09:35 +0000
@@ -0,0 +1,133 @@
+/*
+ * 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: Michael Terry <[e-mail]>
+ */
+
+#include "greeter.h"
+#include "lightdm-greeter.h"
+
+class GreeterPrivate
+{
+public:
+    explicit GreeterPrivate(Greeter *parent);
+
+    QLightDM::Greeter *m_greeter;
+    bool wasPrompted;
+    bool promptless;
+
+protected:
+    Greeter * const q_ptr;
+
+private:
+    Q_DECLARE_PUBLIC(Greeter)
+};
+
+
+GreeterPrivate::GreeterPrivate(Greeter* parent)
+  : m_greeter(new QLightDM::Greeter(parent)),
+    wasPrompted(false),
+    promptless(false),
+    q_ptr(parent)
+{
+}
+
+Greeter::Greeter(QObject* parent)
+  : QObject(parent),
+    d_ptr(new GreeterPrivate(this))
+{
+    Q_D(Greeter);
+
+    connect(d->m_greeter, SIGNAL(showMessage(QString, QLightDM::Greeter::MessageType)),
+            this, SLOT(showMessageFilter(QString, QLightDM::Greeter::MessageType)));
+    connect(d->m_greeter, SIGNAL(showPrompt(QString, QLightDM::Greeter::PromptType)),
+            this, SLOT(showPromptFilter(QString, QLightDM::Greeter::PromptType)));
+    connect(d->m_greeter, SIGNAL(authenticationComplete()),
+            this, SLOT(authenticationCompleteFilter()));
+
+    d->m_greeter->connectSync();
+}
+
+bool Greeter::isAuthenticated() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->isAuthenticated();
+}
+
+QString Greeter::authenticationUser() const
+{
+    Q_D(const Greeter);
+    return d->m_greeter->authenticationUser();
+}
+
+bool Greeter::promptless() const
+{
+    Q_D(const Greeter);
+    return d->promptless;
+}
+
+void Greeter::authenticate(const QString &username)
+{
+    Q_D(Greeter);
+    d->wasPrompted = false;
+    if (d->promptless) {
+        d->promptless = false;
+        Q_EMIT promptlessChanged();
+    }
+
+    d->m_greeter->authenticate(username);
+}
+
+void Greeter::respond(const QString &response)
+{
+    Q_D(Greeter);
+    d->m_greeter->respond(response);
+}
+
+bool Greeter::startSessionSync(const QString &session)
+{
+    Q_D(Greeter);
+    return d->m_greeter->startSessionSync(session);
+}
+
+void Greeter::showPromptFilter(QString text, QLightDM::Greeter::PromptType type)
+{
+    Q_D(Greeter);
+    d->wasPrompted = true;
+
+    // Strip prompt of any colons at the end
+    text = text.trimmed();
+    if (text.endsWith(":") || text.endsWith("：")) {
+        text.chop(1);
+    }
+
+    Q_EMIT showPrompt(text, type == QLightDM::Greeter::PromptTypeSecret);
+}
+
+void Greeter::showMessageFilter(QString text, QLightDM::Greeter::MessageType type)
+{
+    Q_EMIT showMessage(text, type == QLightDM::Greeter::MessageTypeError);
+}
+
+void Greeter::authenticationCompleteFilter()
+{
+    Q_D(Greeter);
+    if (!d->wasPrompted) {
+        d->promptless = true;
+        Q_EMIT promptlessChanged();
+    }
+
+    Q_EMIT authenticationComplete();
+}

=== added file 'plugins/LightDM/greeter.h'
--- plugins/LightDM/greeter.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/greeter.h	2013-05-10 12:09:35 +0000
@@ -0,0 +1,70 @@
+/*
+ * 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: Michael Terry <[e-mail]>
+ */
+
+/* This class is a really tiny filter around QLightDM::Greeter.  There are some
+   operations that we want to edit a bit for the benefit of Qml.  Specifically,
+   we want to chop colons off of any password prompts.  But there may be more
+   such edits in the future, and by inserting ourselves here, we have more
+   control. */
+
+#ifndef GREETER_H
+#define GREETER_H
+
+#include "lightdm-greeter.h"
+#include <QtCore/QObject>
+
+class GreeterPrivate;
+
+class Greeter : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool authenticated READ isAuthenticated)
+    Q_PROPERTY(QString authenticationUser READ authenticationUser)
+    Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
+
+public:
+    explicit Greeter(QObject* parent=0);
+
+    bool isAuthenticated() const;
+    QString authenticationUser() const;
+    bool promptless() const;
+
+public Q_SLOTS:
+    void authenticate(const QString &username=QString());
+    void respond(const QString &response);
+    bool startSessionSync(const QString &session=QString());
+
+Q_SIGNALS:
+    void showMessage(QString text, bool isError);
+    void showPrompt(QString text, bool isSecret);
+    void authenticationComplete();
+    void promptlessChanged();
+
+private:
+    GreeterPrivate * const d_ptr;
+
+    Q_DECLARE_PRIVATE(Greeter)
+
+private Q_SLOTS:
+    void showMessageFilter(QString text, QLightDM::Greeter::MessageType type);
+    void showPromptFilter(QString text, QLightDM::Greeter::PromptType type);
+    void authenticationCompleteFilter();
+};
+
+#endif

=== added file 'plugins/LightDM/infographicmodel.cpp'
--- plugins/LightDM/infographicmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/infographicmodel.cpp	2013-05-10 12:09:35 +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-10 12:09:35 +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-greeter.cpp'
--- plugins/LightDM/lightdm-greeter.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/lightdm-greeter.cpp	2013-05-10 12:09:35 +0000
@@ -0,0 +1,195 @@
+/*
+ * 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: Michael Terry <[e-mail]>
+ */
+
+#include "lightdm-greeter.h"
+#include <QtCore/QCoreApplication>
+
+namespace QLightDM
+{
+
+class GreeterPrivate
+{
+public:
+    explicit GreeterPrivate(Greeter *parent);
+
+    bool authenticated;
+    QString authenticationUser;
+
+protected:
+    Greeter * const q_ptr;
+
+private:
+    Q_DECLARE_PUBLIC(Greeter)
+};
+
+GreeterPrivate::GreeterPrivate(Greeter* parent)
+  : authenticated(false),
+    authenticationUser(),
+    q_ptr(parent)
+{
+}
+
+Greeter::Greeter(QObject *parent)
+  : QObject(parent),
+    d_ptr(new GreeterPrivate(this))
+{
+}
+
+Greeter::~Greeter()
+{
+}
+
+QString Greeter::authenticationUser() const
+{
+    Q_D(const Greeter);
+    return d->authenticationUser;
+}
+
+bool Greeter::hasGuestAccountHint() const
+{
+    return true;
+}
+
+QString Greeter::getHint(const QString &name) const
+{
+    Q_UNUSED(name)
+    return "";
+}
+
+QString Greeter::defaultSessionHint() const
+{
+    return "ubuntu";
+}
+
+bool Greeter::hideUsersHint() const
+{
+    return false;
+}
+
+bool Greeter::showManualLoginHint() const
+{
+    return true;
+}
+
+bool Greeter::showRemoteLoginHint() const
+{
+    return true;
+}
+
+bool Greeter::lockHint () const
+{
+    return false;
+}
+
+QString Greeter::selectUserHint() const
+{
+    return "";
+}
+
+bool Greeter::selectGuestHint() const
+{
+    return false;
+}
+
+QString Greeter::autologinUserHint() const
+{
+    return "";
+}
+
+bool Greeter::autologinGuestHint() const
+{
+    return false;
+}
+
+int Greeter::autologinTimeoutHint() const
+{
+    return 0;
+}
+
+bool Greeter::inAuthentication() const
+{
+    return false;
+}
+
+QString Greeter::hostname() const
+{
+    return "hostname1";
+}
+
+bool Greeter::isAuthenticated() const
+{
+    Q_D(const Greeter);
+    return d->authenticated;
+}
+
+bool Greeter::connectSync()
+{
+    return true;
+}
+
+void Greeter::authenticate(const QString &username)
+{
+    Q_D(Greeter);
+
+    d->authenticated = false;
+    d->authenticationUser = username;
+
+    if (d->authenticationUser == "no-password") {
+        d->authenticated = true;
+        Q_EMIT authenticationComplete();
+    } else {
+        Q_EMIT showPrompt("Password: ", PromptTypeSecret);
+    }
+}
+
+void Greeter::authenticateAsGuest()
+{}
+
+void Greeter::authenticateAutologin()
+{}
+
+void Greeter::authenticateRemote(const QString &session, const QString &username)
+{
+    Q_UNUSED(session)
+    Q_UNUSED(username)
+}
+
+void Greeter::cancelAuthentication()
+{}
+
+void Greeter::setLanguage (const QString &language)
+{
+    Q_UNUSED(language)
+}
+
+bool Greeter::startSessionSync(const QString &session)
+{
+    Q_UNUSED(session)
+    QCoreApplication::quit();
+    return true;
+}
+
+void Greeter::respond(const QString &response)
+{
+    Q_D(Greeter);
+
+    d->authenticated = (response == "password");
+    Q_EMIT authenticationComplete();
+}
+
+}

=== added file 'plugins/LightDM/lightdm-greeter.h'
--- plugins/LightDM/lightdm-greeter.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/lightdm-greeter.h	2013-05-10 12:09:35 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ * Copyright (C) 2010-2011 David Edmundson.
+ * Copyright (C) 2010-2011 Robert Ancell
+ *
+ * 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: David Edmundson <[e-mail]>
+ */
+
+#ifndef LIGHTDM_GREETER_H
+#define LIGHTDM_GREETER_H
+
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
+
+
+namespace QLightDM
+{
+    class GreeterPrivate;
+
+class Q_DECL_EXPORT Greeter : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool authenticated READ isAuthenticated ) //NOTFIY authenticationComplete
+    Q_PROPERTY(QString authenticationUser READ authenticationUser )
+    Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)
+    Q_PROPERTY(QString selectUser READ selectUserHint CONSTANT)
+    Q_PROPERTY(bool selectGuest READ selectGuestHint CONSTANT)
+
+    Q_PROPERTY(QString hostname READ hostname CONSTANT)
+    Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
+    Q_PROPERTY(bool locked READ lockHint CONSTANT)
+
+    Q_PROPERTY(QString hostname READ hostname CONSTANT)
+
+    Q_ENUMS(PromptType MessageType)
+
+public:
+    enum PromptType {
+        PromptTypeQuestion,
+        PromptTypeSecret
+    };
+
+    enum MessageType {
+        MessageTypeInfo,
+        MessageTypeError
+    };
+
+    explicit Greeter(QObject* parent=0);
+    virtual ~Greeter();
+
+    QString getHint(const QString &name) const;
+    QString defaultSessionHint() const;
+    bool hideUsersHint() const;
+    bool showManualLoginHint() const;
+    bool showRemoteLoginHint() const;
+    bool lockHint () const;
+    bool hasGuestAccountHint() const;
+    QString selectUserHint() const;
+    bool selectGuestHint() const;
+    QString autologinUserHint() const;
+    bool autologinGuestHint() const;
+    int autologinTimeoutHint() const;
+
+    bool inAuthentication() const;
+    bool isAuthenticated() const;
+    QString authenticationUser() const;
+    QString hostname() const;
+
+public Q_SLOTS:
+    bool connectSync();
+    void authenticate(const QString &username=QString());
+    void authenticateAsGuest();
+    void authenticateAutologin();
+    void authenticateRemote(const QString &session=QString(), const QString &username=QString());
+    void respond(const QString &response);
+    void cancelAuthentication();
+    void setLanguage (const QString &language);
+    bool startSessionSync(const QString &session=QString());
+
+Q_SIGNALS:
+    void showMessage(QString text, QLightDM::Greeter::MessageType type);
+    void showPrompt(QString text, QLightDM::Greeter::PromptType type);
+    void authenticationComplete();
+    void autologinTimerExpired();
+
+private:
+    GreeterPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(Greeter)
+};
+}
+
+#endif // LIGHTDM_GREETER_H

=== 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-10 12:09:35 +0000
@@ -0,0 +1,370 @@
+/*
+ * 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 <random>
+#include <iostream>
+
+using namespace QLightDM;
+
+namespace QLightDM
+{
+
+class InfographicData
+{
+public:
+    explicit InfographicData(QObject *parent);
+
+    explicit InfographicData(QString label, QColor first_color,
+            QVariantList &first_month, QColor second_color,
+            QVariantList &second_month, QObject *parent);
+
+public:
+    QObject * const q_ptr;
+    QString label;
+    QColor first_color;
+    QVariantListModel first_month;
+    QColor second_color;
+    QVariantListModel second_month;
+
+private:
+    Q_DECLARE_PUBLIC(QObject)
+};
+
+class InfographicModelPrivate: QObject
+{
+Q_OBJECT
+
+public:
+    explicit InfographicModelPrivate(InfographicModel *parent);
+
+    void generateFakeData();
+
+    void nextFakeData();
+
+protected:
+    InfographicModel * const q_ptr;
+    InfographicData data;
+    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(QString label, QColor first_color,
+        QVariantList &first_month, QColor second_color,
+        QVariantList &second_month, QObject* parent) :
+        q_ptr(parent), label(label), first_color(first_color), first_month(
+                first_month, parent), second_color(second_color), second_month(
+                second_month, parent)
+{
+}
+
+InfographicModelPrivate::InfographicModelPrivate(InfographicModel *parent) :
+        q_ptr(parent), data(this), 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);
+
+    {
+        QVariantList month;
+        QColor black;
+        empty_data.reset(
+                new InfographicData("", black, month, black, month, this));
+    }
+
+    {
+        QVariantList first_month( { 0.1, 0.2, 0.4, 0.6, 0.1, 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("Wow, you've walked <b>5</b>kms today",
+                        yellow, first_month, orange, second_month, this));
+        fake_data.insert("phablet", data);
+    }
+
+    {
+        QVariantList first_month(
+                { 0.1, 0.2, 1.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7, 0.8, 0.2, 0.3,
+                        0.4, 0.2, 0.3, 0.4, 0.5, 0.7, 0.8, 0.5, 0.7, 0.8 });
+        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, 1.0, 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, 0.1 });
+        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( { 0.1, 0.2, 1.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.7,
+                0.8, 1.0, 0.2, 0.6, 0.1, 0.8 });
+        while (first_month.size() < 31)
+            first_month.push_back(QVariant(rand()));
+        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() < 5)
+            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() < 2)
+            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() < 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() < 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)
+{
+    std::cout << "Data sets for user " << username.toStdString() << " = "
+            << fake_data.values(username).size() << ", index = " << new_index
+            << std::endl;
+
+    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);
+    }
+
+    data.label = new_data->label;
+    data.first_color = new_data->first_color;
+    data.first_month.setVariantList(new_data->first_month.variantList());
+    data.second_color = new_data->second_color;
+    data.second_month.setVariantList(new_data->second_month.variantList());
+
+    QVariantListModel &first_month(data.first_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(data.label);
+    q_ptr->firstColorChanged(data.first_color);
+    q_ptr->secondColorChanged(data.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))
+{
+}
+
+InfographicModel::~InfographicModel()
+{
+    delete d_ptr;
+}
+
+QString InfographicModel::label() const
+{
+    return d_ptr->data.label;
+}
+
+QString InfographicModel::username() const
+{
+    return d_ptr->username;
+}
+
+void InfographicModel::setUsername(const QString &username)
+{
+    d_ptr->username = username;
+    d_ptr->setFakeData(0);
+    usernameChanged(d_ptr->username);
+}
+
+QColor InfographicModel::firstColor() const
+{
+    return d_ptr->data.first_color;
+}
+
+QColor InfographicModel::secondColor() const
+{
+    return d_ptr->data.second_color;
+}
+
+QAbstractItemModel * InfographicModel::firstMonth() const
+{
+    return &d_ptr->data.first_month;
+}
+
+QAbstractItemModel * InfographicModel::secondMonth() const
+{
+    return &d_ptr->data.second_month;
+}
+
+int InfographicModel::currentDay() const
+{
+    return d_ptr->current_day;
+}
+
+void InfographicModel::nextDataSource()
+{
+    d_ptr->nextFakeData();
+}
+#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-10 12:09:35 +0000
@@ -0,0 +1,95 @@
+/*
+ * 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 <QtCore/QSharedDataPointer>
+#include <QAbstractListModel>
+
+#include "qvariantlistmodel.h"
+
+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);
+
+public Q_SLOTS:
+    void nextDataSource();
+
+protected:
+
+private:
+    InfographicModelPrivate * const d_ptr;
+
+    Q_DECLARE_PRIVATE(InfographicModel)
+
+};
+
+}
+
+#endif // LIGHTDM_INFOGRAPHICMODEL_H

=== added file 'plugins/LightDM/lightdm-usersmodel.cpp'
--- plugins/LightDM/lightdm-usersmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/lightdm-usersmodel.cpp	2013-05-10 12:09:35 +0000
@@ -0,0 +1,166 @@
+/*
+ * 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: Michael Terry <[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-usersmodel.h"
+#include <QtCore/QDebug>
+#include <QtCore/QDir>
+#include <QtCore/QString>
+#include <QtGui/QIcon>
+
+using namespace QLightDM;
+
+class Entry
+{
+public:
+    QString username;
+    QString real_name;
+    QString background;
+    QString layouts;
+    bool is_active;
+    bool has_messages;
+    QString session;
+};
+
+const Entry fake_entries[] =
+{
+    { "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
+{
+class UsersModelPrivate
+{
+public:
+    explicit UsersModelPrivate(UsersModel *parent);
+    QList<Entry> entries;
+
+protected:
+    UsersModel * const q_ptr;
+    void fillEntries();
+
+private:
+    Q_DECLARE_PUBLIC(UsersModel)
+};
+}
+
+UsersModelPrivate::UsersModelPrivate(UsersModel* parent)
+  : q_ptr(parent)
+{
+}
+
+void UsersModelPrivate::fillEntries()
+{
+    QDir bgdir = QDir("/usr/share/demo-assets/shell/backgrounds/");
+    QStringList backgrounds = bgdir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+
+    for (int i = 0, j = 0; fake_entries[i].username != ""; i++) {
+        Entry entry = fake_entries[i];
+        if (entry.background == "*") {
+            if (backgrounds.isEmpty()) {
+                entry.background = ""; // to avoid warnings about a 404 on "*"
+            } else {
+                entry.background = bgdir.filePath(backgrounds[j++]);
+                if (j >= backgrounds.length()) {
+                    j = 0;
+                }
+            }
+        }
+        entries.append(entry);
+    }
+}
+
+UsersModel::UsersModel(QObject *parent) :
+    QAbstractListModel(parent),
+    d_ptr(new UsersModelPrivate(this))
+{
+    Q_D(UsersModel);
+    // Extend roleNames (we want to keep the "display" role)
+    QHash<int, QByteArray> roles = roleNames();
+    roles[NameRole] = "name";
+    roles[RealNameRole] = "realName";
+    roles[LoggedInRole] = "loggedIn";
+    roles[BackgroundRole] = "background";
+    roles[BackgroundPathRole] = "backgroundPath";
+    roles[SessionRole] = "session";
+    roles[HasMessagesRole] = "hasMessages";
+    roles[ImagePathRole] = "imagePath";
+    setRoleNames(roles);
+    d->fillEntries();
+}
+
+UsersModel::~UsersModel()
+{
+    delete d_ptr;
+}
+
+int UsersModel::rowCount(const QModelIndex &parent) const
+{
+    Q_D(const UsersModel);
+
+    if (parent.isValid()) {
+        return 0;
+    } else { // parent is root
+        return d->entries.size();
+    }
+}
+
+QVariant UsersModel::data(const QModelIndex &index, int role) const
+{
+    Q_D(const UsersModel);
+
+    if (!index.isValid()) {
+        return QVariant();
+    }
+
+    int row = index.row();
+    switch (role) {
+    case Qt::DisplayRole:
+        return d->entries[row].real_name;
+    case Qt::DecorationRole:
+        return QIcon();
+    case UsersModel::NameRole:
+        return d->entries[row].username;
+    case UsersModel::RealNameRole:
+        return d->entries[row].real_name;
+    case UsersModel::SessionRole:
+        return d->entries[row].session;
+    case UsersModel::LoggedInRole:
+        return d->entries[row].is_active;
+    case UsersModel::BackgroundRole:
+        return QPixmap(d->entries[row].background);
+    case UsersModel::BackgroundPathRole:
+        return d->entries[row].background;
+    case UsersModel::HasMessagesRole:
+        return d->entries[row].has_messages;
+    case UsersModel::ImagePathRole:
+        return "";
+    default:
+        return QVariant();
+    }
+}

=== added file 'plugins/LightDM/lightdm-usersmodel.h'
--- plugins/LightDM/lightdm-usersmodel.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/lightdm-usersmodel.h	2013-05-10 12:09:35 +0000
@@ -0,0 +1,66 @@
+/*
+ * 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: David Edmundson <[e-mail]>
+ */
+
+#ifndef LIGHTDM_USERSMODEL_H
+#define LIGHTDM_USERSMODEL_H
+
+#include <QtCore/QString>
+#include <QtCore/QSharedDataPointer>
+#include <QAbstractListModel>
+
+
+namespace QLightDM
+{
+class UsersModelPrivate;
+
+class Q_DECL_EXPORT UsersModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(UserModelRoles)
+
+public:
+    explicit UsersModel(QObject *parent = 0);
+    ~UsersModel();
+
+    enum UserModelRoles {NameRole = Qt::UserRole,
+                         RealNameRole,
+                         LoggedInRole,
+                         BackgroundRole,
+                         SessionRole,
+                         HasMessagesRole,
+                         ImagePathRole,
+                         BackgroundPathRole
+    };
+
+    int rowCount(const QModelIndex &parent) const;
+    QVariant data(const QModelIndex &index, int role) const;
+
+protected:
+
+private:
+    UsersModelPrivate * const d_ptr;
+
+    Q_DECLARE_PRIVATE(UsersModel)
+
+};
+
+}
+
+#endif // LIGHTDM_USERSMODEL_H

=== added file 'plugins/LightDM/plugin.cpp'
--- plugins/LightDM/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/plugin.cpp	2013-05-10 12:09:35 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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: Gerry Boland <[e-mail]>
+ *          Michael Terry <[e-mail]>
+ */
+
+#include "plugin.h"
+#include "greeter.h"
+#include "lightdm-usersmodel.h"
+#include "usersmodel.h"
+#include "infographicmodel.h"
+#include <QtCore/QAbstractItemModel>
+#include <QtQml>
+
+static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new Greeter();
+}
+
+static QObject *users_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    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/plugin.h'
--- plugins/LightDM/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/plugin.h	2013-05-10 12:09:35 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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: Gerry Boland <[e-mail]>
+ *          Michael Terry <[e-mail]>
+ */
+
+#ifndef LIGHTDM_PLUGIN_H
+#define LIGHTDM_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class LightDMPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif

=== added file 'plugins/LightDM/qmldir'
--- plugins/LightDM/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/qmldir	2013-05-10 12:09:35 +0000
@@ -0,0 +1,2 @@
+module LightDM
+plugin LightDM-qml

=== added file 'plugins/LightDM/qvariantlistmodel.cpp'
--- plugins/LightDM/qvariantlistmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/qvariantlistmodel.cpp	2013-05-10 12:09:35 +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 strings 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 strings 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 string 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 string list) can be found with the
+    rowCount() function.
+
+    The model can be constructed with an existing string list, or
+    strings can be set later with the setStringList() convenience
+    function. Strings can also be inserted in the usual way with the
+    insertRows() function, and removed with removeRows(). The contents
+    of the string list can be retrieved with the stringList()
+    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-10 12:09:35 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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());
+
+    //void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
+
+    QVariantList variantList() const;
+    void setVariantList(const QVariantList &list);
+
+    Qt::DropActions supportedDropActions() const;
+
+private:
+    Q_DISABLE_COPY(QVariantListModel)
+    QVariantList lst;
+};
+
+
+#endif // QVARIANTLISTMODEL_H

=== added file 'plugins/LightDM/usersmodel.cpp'
--- plugins/LightDM/usersmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/usersmodel.cpp	2013-05-10 12:09:35 +0000
@@ -0,0 +1,68 @@
+/*
+ * 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: Michael Terry <[e-mail]>
+ */
+
+#include "usersmodel.h"
+#include "lightdm-usersmodel.h"
+#include <QtCore/QSortFilterProxyModel>
+
+// First, we define an internal class that wraps LightDM's UsersModel.  This
+// class will modify some of the data coming from LightDM.  For example, we
+// modify any empty Real Names into just normal Names.
+// (We can't modify the data directly in UsersModel below because it won't sort
+// using the modified data.)
+class MangleModel : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+public:
+    explicit MangleModel(QObject* parent=0);
+
+    virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
+};
+
+MangleModel::MangleModel(QObject* parent)
+  : QSortFilterProxyModel(parent)
+{
+    setSourceModel(new QLightDM::UsersModel(this));
+}
+
+QVariant MangleModel::data(const QModelIndex &index, int role) const
+{
+    QVariant data = QSortFilterProxyModel::data(index, role);
+
+    // If user's real name is empty, switch to unix name
+    if (role == QLightDM::UsersModel::RealNameRole && data.toString().isEmpty()) {
+        data = QSortFilterProxyModel::data(index, QLightDM::UsersModel::NameRole);
+    }
+
+    return data;
+}
+
+// **** Now we continue with actual UsersModel class ****
+
+UsersModel::UsersModel(QObject* parent)
+  : QSortFilterProxyModelQML(parent)
+{
+    setModel(new MangleModel(this));
+    setSortCaseSensitivity(Qt::CaseInsensitive);
+    setSortLocaleAware(true);
+    setSortRole(QLightDM::UsersModel::RealNameRole);
+    sort(0);
+}
+
+#include "usersmodel.moc"

=== added file 'plugins/LightDM/usersmodel.h'
--- plugins/LightDM/usersmodel.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/usersmodel.h	2013-05-10 12:09:35 +0000
@@ -0,0 +1,37 @@
+/*
+ * 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: Michael Terry <[e-mail]>
+ */
+
+/* This class is a really tiny filter around QLightDM::UsersModel.  There are
+   some operations that we want to edit a bit for the benefit of Qml.
+   Specifically, we want to sort users according to realName. */
+
+#ifndef USERSMODEL_H
+#define USERSMODEL_H
+
+#include "plugins/Utils/qsortfilterproxymodelqml.h"
+#include <QtCore/QObject>
+
+class UsersModel : public QSortFilterProxyModelQML
+{
+    Q_OBJECT
+
+public:
+    explicit UsersModel(QObject* parent=0);
+};
+
+#endif

=== modified file 'plugins/Utils/qsortfilterproxymodelqml.cpp'
--- plugins/Utils/qsortfilterproxymodelqml.cpp	2013-05-09 14:23:10 +0000
+++ plugins/Utils/qsortfilterproxymodelqml.cpp	2013-05-10 12:09:35 +0000
@@ -57,6 +57,16 @@
     }
 }
 
+QVariant
+QSortFilterProxyModelQML::data(int row, int role)
+{
+    if (sourceModel() == NULL) {
+        return QVariant();
+    }
+
+    return index(row, 0).data(role);
+}
+
 int
 QSortFilterProxyModelQML::totalCount() const
 {

=== modified file 'plugins/Utils/qsortfilterproxymodelqml.h'
--- plugins/Utils/qsortfilterproxymodelqml.h	2013-05-08 11:22:15 +0000
+++ plugins/Utils/qsortfilterproxymodelqml.h	2013-05-10 12:09:35 +0000
@@ -31,6 +31,7 @@
 public:
     explicit QSortFilterProxyModelQML(QObject *parent = 0);
 
+    Q_INVOKABLE QVariant data(int row, int role);
     Q_INVOKABLE int count();
     Q_INVOKABLE int findFirst(int role, const QVariant& value) const;
     virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;

=== modified file 'tests/autopilot/qml_phone_shell/tests/helpers.py'
--- tests/autopilot/qml_phone_shell/tests/helpers.py	2013-04-05 11:03:11 +0000
+++ tests/autopilot/qml_phone_shell/tests/helpers.py	2013-05-10 12:09:35 +0000
@@ -15,26 +15,49 @@
 class TestShellHelpers(object):
     """Helpers for testing the Shell"""
 
-    def unlock_greeter(self, retries=2):
+    def select_greeter_user(self, username):
         greeter = self.main_window.get_greeter()
         self.assertThat(greeter.created, Eventually(Equals(True)))
-
-        if greeter.multiUser:
-            login_loader = self.main_window.get_login_loader()
-            self.assertThat(login_loader.progress, Eventually(Equals(1)))
-            login_list = self.main_window.get_login_list()
-            path_view = login_list.get_children_by_type("QQuickPathView")[0]
+        self.assertThat(greeter.multiUser, Eventually(Equals(True)))
+
+        login_loader = self.main_window.get_login_loader()
+        self.assertThat(login_loader.progress, Eventually(Equals(1)))
+
+        login_list = self.main_window.get_login_list()
+        path_view = login_list.get_children_by_type("QQuickPathView")[0]
+
+        try_count = 0
+        max_tries = 50  # just in case we go off rails
+        while try_count < max_tries:
             users = path_view.get_children_by_type("QQuickItem")
+            target_user = None
             for user in users:
                 try:
                     user_label = user.get_children_by_type("Label")[0]
-                    if user_label.text == "Guest":
-                        self.pointing_device.move_to_object(user_label)
-                        self.pointing_device.click()
-                except:
+                    if user_label.text == username:
+                        target_user = user
+                        break
+                    elif target_user is None or user.y > target_user.y:
+                        target_user = user
+                except Exception:
                     pass
-
-            password_field = login_list.get_children_by_type("TextField")[0]
+            if target_user is None:
+                break
+            user_label = target_user.get_children_by_type("Label")[0]
+            self.pointing_device.move_to_object(user_label)
+            self.pointing_device.click()
+            self.assertThat(path_view.movingInternally, Eventually(Equals(False)))
+            if user_label.text == username:
+                return login_list.get_children_by_type("TextField")[0]
+            try_count = try_count + 1
+        self.fail()  # We didn't find it
+
+    def unlock_greeter(self, retries=2):
+        greeter = self.main_window.get_greeter()
+        self.assertThat(greeter.created, Eventually(Equals(True)))
+
+        if greeter.multiUser:
+            password_field = self.select_greeter_user("Guest")
             self.pointing_device.move_to_object(password_field)
             self.assertThat(password_field.opacity, Eventually(Equals(1)))
             self.pointing_device.click()

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-05-09 07:01:25 +0000
+++ tests/qmltests/CMakeLists.txt	2013-05-10 12:09:35 +0000
@@ -49,7 +49,7 @@
                                            ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/People PeopleFilterGrid IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_CURRENT_SOURCE_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
-add_qml_test(Greeter Greeter)
+add_qml_test(Greeter Greeter IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
 add_qml_test(Hud Hud)
 add_qml_test(Hud Result)
 add_qml_test(Launcher Launcher)
@@ -60,4 +60,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

=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
--- tests/qmltests/Greeter/tst_Greeter.qml	2013-04-17 13:01:10 +0000
+++ tests/qmltests/Greeter/tst_Greeter.qml	2013-05-10 12:09:35 +0000
@@ -46,53 +46,69 @@
         name: "Greeter"
         when: windowShown
 
+        function select_user(name) {
+            // We could be anywhere in list; find target index to know which direction
+            for (var i = 0; i < greeter.model.count; i++) {
+                if (greeter.model.get(i).name == name) {
+                    break
+                }
+            }
+            if (i == greeter.model.count) {
+                return
+            }
+            var pathview = findChild(greeter, "userList")
+            while (pathview.currentIndex != i) {
+                var next = pathview.currentIndex + 1
+                if (pathview.currentIndex > i) {
+                    next = pathview.currentIndex - 1
+                }
+                var account = findChild(greeter, "username"+next)
+                mouseClick(account, 1, 1)
+                tryCompare(pathview, "currentIndex", next)
+            }
+        }
+
         function test_cycle_data() {
-            tryCompare(findChild(greeter, "userList"), "count", 5)
+            tryCompare(findChild(greeter, "userList"), "count", 6)
             var data = new Array()
             for (var i = 1; i < greeter.model.count; i++) {
                 data[i] = {tag: greeter.model.get(i).name, username: "username"+i, uid: i }
             }
+            // We add first name last in data to guarantee a selected signal
             data[greeter.model.count] = {tag: greeter.model.get(0).name, username: "username0", uid: 0 }
             return data
         }
 
         function test_cycle(data) {
-            tryCompare(findChild(greeter, "userList"), "count", 5)
+            tryCompare(findChild(greeter, "userList"), "count", 6)
             selectionSpy.clear();
             var user = findChild(greeter, data.username)
             mouseClick(user, user.width / 2, user.height / 2)
             var pathview = findChild(greeter, "userList")
             tryCompare(pathview, "currentIndex", data.uid)
-            tryCompare(greeter, "locked", greeter.model.get(data.uid).password !== undefined)
+            tryCompare(greeter, "locked", data.tag !== "no-password")
             tryCompare(selectionSpy, "count", 1)
         }
 
         function test_unlock_password() {
+            select_user("lois") // to guarantee a selected signal
             unlockSpy.clear()
-            // First one is Lolas account right now. Replace with password protected user from lightdm
-            var account = findChild(greeter, "username1")
-            mouseClick(account, 1, 1)
-            account = findChild(greeter, "username0")
-            mouseClick(account, 1, 1)
+            select_user("lola")
             var passwordInput = findChild(greeter, "passwordInput")
-            tryCompare(passwordInput, "opacity", 0)
             tryCompare(passwordInput, "opacity", 1)
             mouseClick(passwordInput, 1, 1)
             compare(unlockSpy.count, 0)
-            typeString(greeter.model.get(0).password)
+            typeString("password")
             keyClick(Qt.Key_Enter)
             unlockSpy.wait()
         }
 
         function test_unlock_wrong_password() {
+            select_user("lois") // to guarantee a selected signal
             unlockSpy.clear()
-            // First one is Lolas account right now. Replace with password protected user from lightdm
-            var account = findChild(greeter, "username1")
-            mouseClick(account, 1, 1)
-            account = findChild(greeter, "username0")
-            var passwordInput = findChild(greeter, "passwordInput")
-            mouseClick(account, 1, 1)
+            select_user("lola")
             wait(0) // spin event loop to start any pending animations
+            var passwordInput = findChild(greeter, "passwordInput")
             tryCompare(passwordInput, "opacity", 1) // wait for opacity animation to be finished
             mouseClick(passwordInput, 1, 1)
             compare(unlockSpy.count, 0)
@@ -103,14 +119,23 @@
 
         function test_unlock_no_password() {
             unlockSpy.clear()
-            // Last one is the guest account for now. Replace with passwordless user from lightdm
-            var guestAccount = findChild(greeter, "username" + (greeter.model.count - 1))
-            mouseClick(guestAccount, guestAccount.width / 2, guestAccount.height / 2)
+            select_user("no-password")
             var passwordInput = findChild(greeter, "passwordInput")
             tryCompare(passwordInput, "opacity", 1)
             mouseClick(passwordInput, 1, 1)
             unlockSpy.wait()
             compare(unlockSpy.count, 1)
         }
+
+        function test_empty_name() {
+            for (var i = 0; i < greeter.model.count; i++) {
+                if (greeter.model.get(i).name == "empty-name") {
+                    compare(greeter.model.get(i).realName, greeter.model.get(i).name)
+                    return
+                }
+            }
+            // Never found empty-name...
+            throw new Error("QtQuickTest::fail")
+        }
     }
 }