Merge lp:~mterry/unity/phablet-greeter-lightdm into lp:unity/phablet

[Michael Terry]

Add LightDM plugin that currently only has mock contents.

This is the start of integrating the phablet greeter into the LightDM workflow. This branch does not expose all of the functionality of LightDM, but just replaces the basics that the demo had (no-password login, simple one-password login, user backgrounds, and demo infographics).

I added a mock liblightdm library, for use during testing. It contains all the same demo test data that we currently use.

Actual integration with LightDM is only half-functional right now. Not only is a subset of LightDM's features supported (which is fine, since the phablet doesn't need to support them all), but we can't even communicate with LightDM under normal circumstances, because the greeter isn't yet a separate process. I will fix that with a future branch.

There is one feature in the mock library that is not currently even in liblightdm-qt5: the infographics. For now, I added support in the mock library for the demo infographics. But we'll have to decide how we really want to support those down the road.

[PS Jenkins bot (ps-jenkins)]

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

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/427/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/188
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/428
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/303
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/303/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/307
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/891

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/465/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/236/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/466/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/465/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/341/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/345/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Hey:

> Text conflict in Greeter/Greeter.qml
> Text conflict in run
> 2 conflicts encountered.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/521/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/312/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/522/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/521/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/397/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/401/console

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

I've fixed conflict, please review again, thanks!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:478
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/529/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/323/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/530/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/529/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/405/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/409/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:481
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/530/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/531
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/531/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/406
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/406/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/410
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1020

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:481
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/531/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/325
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/532
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/532/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/531
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/407
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/411
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1023

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:481
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/533/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/327
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/534
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/534/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/409
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/409/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/413
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1024

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

- Breaks autopilot tests (tries to call "env -testability" instead of "qml-phone-shell -testability"
- When I run qml-phone-shell manually, it seems to make use of my real login data from LightDM, which is cool. However, it doesn't work. Neither the correct nor a wrong password have any effect.
- I have a user where I don't have filled in all the details like "Real name". Instead of just showing the username it adds an empty (invisible) item to the list.

review: Needs Fixing

[Michael Terry (mterry)]

mzanetti:

1) I just now fixed the env/autopilot issue.

2) The ./run script correctly sets LD_LIBRARY_PATH to point at the mock data. If you are running it manually, please use the ./run script.

3) I've updated the branch to fix the empty real name issue (and added a test). Note that this branch is missing a whole lot of features in the multi-user case. It's meant as a starting point, not full functionality.

Please review again, thanks!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:483
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/568/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/363
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/569
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/569/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/568
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/444
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/444/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/448
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1064

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

review: Approve (continuous-integration)

[Michael Terry (mterry)]

Just for context, it's expected that when running against your normal user data, logging in won't work. That's because it can't talk to the lightdm daemon (because the lightdm daemon didn't spawn it).

A future branch will effect the process split so that we can run against the system lightdm daemon. Though it still won't work for a casual "let me launch the greeter and try logging in" -- you'll still need to install it to the system and then test against lightdm.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:484
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/569/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/364/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/570
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/570/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/569
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/445
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/445/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1066

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:485
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/570/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/571
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/571/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/446
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/446/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1067

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Can you please also add liblightdm-qt5-2-dev to the ./build script?

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> Can you please also add liblightdm-qt5-2-dev to the ./build script?

same for run_on_device -s

[Michael Zanetti (mzanetti)]

1447 - wait(0) // spin event loop to start any pending animations

This needs to stay. Otherwise, every once in a while on Jenkins, the test will be faster than the animation starting which messes up with the following expectations.

review: Needs Fixing

[Michael Zanetti (mzanetti)]

378 +QString
379 +Greeter::authenticationUser() const

Btw... this is not Qt'ish... Qt coding style (which we follow) has return values on the same line.

review: Needs Fixing

[Albert Astals Cid (aacid)]

Actually for ./run_on_device we depend on build-dep (which breaks sometimes), so no need to add the dependency unless we decide to move ./run_on_device to do the same ./build does

[Michael Zanetti (mzanetti)]

582 + Q_DISABLE_COPY(LightDM)

QObjects have a private copy ctor by default

972 + roles[1000] = "infographic"; // WARNING: Not a LightDM role

Please define an enum with Qt:UserRole + 1000 or something.

1073 + engine->rootContext()->setContextProperty("lightDM", &LightDM::instance());

I guess LightDM::instance() returns a pointer. Do we really need a reference to a pointer here?

1257 + env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/LightDM/mock

hmm... not sure we really need this. seems fishy... also mocks should live in /tests somehere and not within the real plugins.

review: Needs Fixing

[Albert Astals Cid (aacid)]

Doesn't merge cleanly anymore

review: Needs Fixing

[Michael Terry (mterry)]

> Can you please also add liblightdm-qt5-2-dev to the ./build script?

Fixed.

> wait(0) // spin event loop to start any pending animations

Shouldn't this be in all the greeter tests then, instead of just one? And shouldn't the following 'tryCompare(passwordInput, "opacity", 1)' be enough of a wait?

Regardless, added it back.

> Qt coding style (which we follow) has return values on the same line.

Fixed. I got fooled by the coding style of the Unity plugin, which doesn't do this.

> QObjects have a private copy ctor by default

Fixed. I think I had copy-pasted that header from LightDM. So what does Q_DISABLE_COPY do then?

> Please define an enum with Qt:UserRole + 1000 or something.

Fixed, added a define for it. Can't use a straight enum, since that class doesn't have its own header (uses the system header from liblightdm).

> I guess LightDM::instance() returns a pointer. Do we really need a reference to a pointer here?

No, it returns a ref instance. Is that not-compliant with current style?

> hmm... not sure we really need this. seems fishy... also mocks should live in /tests somehere and not within the real plugins.

We do need it, for the qmluitests to be able to use a known data set. I've moved the mock library to /tests/mocks

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:486
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/595/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/393
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/596
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/596/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/595/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/471
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/471/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/475/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:487
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/596/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/394
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/597
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/597/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/596
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/472
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/472/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/476
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1100

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

review: Approve (continuous-integration)

[Michael Terry (mterry)]

Hmm.. This will break the tablet images because no one can log in, eh?

I should add a line to always point at the mock even during real runs until my split branch lands, and we can have a proper LightDM session.

[Michael Zanetti (mzanetti)]

> > wait(0) // spin event loop to start any pending animations
>
> Shouldn't this be in all the greeter tests then, instead of just one? And
> shouldn't the following 'tryCompare(passwordInput, "opacity", 1)' be enough of
> a wait?

This is just to make sure the animation has actually started before the tryCompare() jumps in to wait for it to be finished. Otherwise the tryCompare could do the check before it even started and pass immediately.

> > QObjects have a private copy ctor by default
>
> Fixed. I think I had copy-pasted that header from LightDM. So what does
> Q_DISABLE_COPY do then?

you can use this to disable copying of non-QObjects, like QGadgets, QStrings and other classes not inheriting QObject. Besides, this is what is used inside the Q_OBJECT macro.

> > Please define an enum with Qt:UserRole + 1000 or something.
>
> Fixed, added a define for it. Can't use a straight enum, since that class
> doesn't have its own header (uses the system header from liblightdm).

Not totally happy with defines, but I guess better than random numbers. Ok. fine with me.

>
> > I guess LightDM::instance() returns a pointer. Do we really need a reference
> to a pointer here?
>
> No, it returns a ref instance. Is that not-compliant with current style?

There are various reasons for not returning refs. The main ones are:
- make it easier to keep binary compatibility. (does not really apply here - mentioning it for completeness)
- Readability/Consistency. Qt's data structures are all implicitly shared. Returning copies is cheap, so in Qt we either return a Pointer or a copy.

In general you will not find that all over the Qt codebase. As you can see what happened with me, it confuses long-term Qt people too. If possible I'd prefer to have instance() returning a pointer. (Sorry for noticing that late)

>
> > hmm... not sure we really need this. seems fishy... also mocks should live
> in /tests somehere and not within the real plugins.
>
> We do need it, for the qmluitests to be able to use a known data set. I've
> moved the mock library to /tests/mocks

Thanks.

[Michael Zanetti (mzanetti)]

> Hmm.. This will break the tablet images because no one can log in, eh?
>
> I should add a line to always point at the mock even during real runs until my
> split branch lands, and we can have a proper LightDM session.

Wouldn't there be a user phablet with password phablet?

Anyways, I agree better using the mocks until it works for real.

[Michael Terry (mterry)]

I made instance() return a pointer and made the shell always use the mock library, even when running on the real system.

To do this, I just made the liblightdm-qt5-2 library be static and included it in the LightDM plugin. This means that there are a few pointless LD_LIBRARY_PATH statements, but they will become useful as soon as the binary is split out again.

I've added TODO lines in the CMakeLists.txt to document that the library will not be static forever.

> Wouldn't there be a user phablet with password phablet?
>
> Anyways, I agree better using the mocks until it works for real.

The tablet might have a user phablet with password phablet, but you wouldn't be able to actually login as that user until we are a separate process.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:489
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/630/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/436/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/632/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/630/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/506/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/510/console

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

review: Needs Fixing (continuous-integration)

[Michael Zanetti (mzanetti)]

ok. looks good now. Just a few merge conflicts and we can land it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:490
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/636/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/442/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/638/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/636/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/512/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/516/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Sorry I came so late to this review, I have some remarks:

===========

284 + env LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks

304 -Architecture: all
305 +Architecture: any

315 +usr/lib/qml-phone-shell/mocks

836 +export LD_LIBRARY_PATH=$PWD/../unity_build/build/lib:$PWD/builddir/tests/mocks

860 + oldlibpath = os.environ.get('LD_LIBRARY_PATH', '')
861 + libpath = os.path.abspath('../../builddir/tests/mocks') + ':' + oldlibpath
862 + os.environ['LD_LIBRARY_PATH'] = libpath

865 + os.environ['LD_LIBRARY_PATH'] = oldlibpath

868 + oldlibpath = os.environ.get('LD_LIBRARY_PATH', '')
869 + libpath = '/usr/lib/qml-phone-shell/mocks:' + oldlibpath
870 + os.environ['LD_LIBRARY_PATH'] = libpath

877 + os.environ['LD_LIBRARY_PATH'] = oldlibpath

Please don't do that, we've built a way of using mock plugins in lieu of missing real implementations in soon-to-be-merged lp:~dandrader/unity/phablet_remove_fakes_from_qml. You just build your plugin in /tests/mocks and install it in ${SHELL_APP_DIR}/plugins/mocks - it will get picked up as fall back. Because this is still needed in the device images, please package with qml-phone-shell, not -fake-env like the fake Ubuntu.Application is.

===========

658 + qmlRegisterUncreatableType<LightDM>(uri, 0, 1, "LightDM", "Type is not instantiable");

665 + engine->rootContext()->setContextProperty("lightDM", LightDM::instance());

Please use registerSingletonType() instead [1].

===========

397 +#include <QLightDM/Greeter>
398 +#include "greeter.h"

739 +#include <QSortFilterProxyModel>
740 +#include "usersmodel.h"

Please include self as the first one and use <QtCore/QSortFilterProxyModel>.

===========

488 +class Q_DECL_EXPORT Greeter : public QObject

Q_DECL_EXPORT shouldn't be needed, it's a plugin not a shared lib?

===========

742 +// First, we define an internal class that wraps LightDM's UsersModel. This
743 +// class will modify some of the data coming from LightDM. For example, we
744 +// modify any empty Real Names into just normal Names.

Why is that? Why not do the mangling straight in the UsersModel and avoid the wrapping?

===========

957 +# Link to liblightdm's headers for moc's sake
958 +execute_process(COMMAND ln -sf "${LIBLIGHTDM_INCLUDEDIR}/lightdm-qt5-2/QLightDM/greeter.h" "${CMAKE_CURRENT_SOURCE_DIR}/lightdm-greeter.h"
959 + COMMAND ln -sf "${LIBLIGHTDM_INCLUDEDIR}/lightdm-qt5-2/QLightDM/usersmodel.h" "${CMAKE_CURRENT_SOURCE_DIR}/lightdm-usersmodel.h"
960 + )

1181 +#include "moc_lightdm-greeter.cpp"

1364 +#include "moc_lightdm-usersmodel.cpp"

No need for those - automoc seemed to work just fine here without all that?

===========

Packaging is bad:

cp: cannot stat `debian/tmp/usr/lib/qml-phone-shell/mocks': No such file or directory

===========

Again, sorry for the late review, but we should be really close...

[1] http://qt-project.org/doc/qt-5.0/qtqml/qqmlengine.html#qmlRegisterSingletonType

review: Needs Fixing

[Michael Terry (mterry)]

As for the remove_fakes_from_qml branch, I merged it in (so it is now a prerequisite of this branch), but I'm actually going a different route for this first round. Until we separate out the greeter process, I'm just building the mock into the real plugin. Once we have a separate process, we can use both a real and a mock plugin.

> Please use registerSingletonType() instead [1].

Done.

> Please include self as the first one and use <QtCore/QSortFilterProxyModel>.

Done.

> Q_DECL_EXPORT shouldn't be needed, it's a plugin not a shared lib?

Dropped.

> Why is that? Why not do the mangling straight in the UsersModel and avoid the wrapping?

I added a comment to the source to explain why. It's because the QSortFilterProxyModel does not use the data() function to sort, but rather goes directly to its source model. So when we are mangling real names, it would not sort on the resulting name like we want.

> No need for those - automoc seemed to work just fine here without all that?

It will build, but will not run due to missing QObject meta symbols.

> cp: cannot stat `debian/tmp/usr/lib/qml-phone-shell/mocks': No such file or directory

Fixed.

Thanks for the reviews, everyone. I'm very rusty on Qt and our project conventions.

[PS Jenkins bot (ps-jenkins)]

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

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/663/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/472/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/665/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/663/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/539/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/543/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/665/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/474/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/667/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/665/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/541/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/545/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:496
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/669/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/478/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/671/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/669/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/545/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/549/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:497
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/673/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/482/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/675/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/673/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/549/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/553/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:499
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/681/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/492/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/683/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/681/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/557/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/561/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

/tmp/buildd/qml-phone-shell-1.71/plugins/LightDM/lightdm-greeter.h: bad whitespace in lines 35, 45, 64

review: Needs Fixing

[Michael Terry (mterry)]

> /tmp/buildd/qml-phone-shell-1.71/plugins/LightDM/lightdm-greeter.h: bad whitespace in lines 35, 45, 64

Fixed (as well as another conflict with trunk). Sorry I missed this, but apparently "alltests" doesn't run the whitespace test anymore? I had to run the "test" target to get those tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:500
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/708/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/526/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/710/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/708/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/584/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/588/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:501
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/717/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/539/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/719/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/717/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/593/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/597/console

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in tests/qmltests/CMakeLists.txt

review: Needs Fixing

[Michał Sawicz (saviq)]

Please remerge...

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:501
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/720/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/544/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/722/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/720/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/596/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/600/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/741/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/571/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/743/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/741/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/617/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/621/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:503
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/743/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/574
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/745
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/743
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/619
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/619/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/623
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1288

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:505
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/778/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/659/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/654/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/658/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:506
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/780/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/661
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/656
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/656/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/660
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1328

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

This introduces the following warnings:
file:///home/phablet/shell/Shell.qml:125:9: QML QQuickImage: Cannot open: file:///home/phablet/shell/*
file:///home/phablet/shell/Shell.qml:125:9: QML QQuickImage: Cannot open: file:///home/phablet/shell/*
file:///home/phablet/shell/Components/CrossFadeImage.qml:102:5: QML QQuickImage: Cannot open: file:///home/phablet/shell/*

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/813/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/707
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/689
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/689/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1367

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/816/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/712
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/692
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/692/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1373

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Do we really need the files copied from liblightdm? Can't we use the library or something?

review: Needs Information

[Michael Terry (mterry)]

Albert, there are two relevant branches for LightDM.

This one gets us to a point where we are using a LightDM-like API. The other [1] will get us to the point where we actually use LightDM.

We can't merge the second until we are ready to use LightDM on the phablet image, which is blocked on Mir being used on the phablet image. But this branch can be merged now.

As for copying files from liblightdm, we are only copying a couple headers for use in the mock. In this branch, the LightDM plugin is really one big mock. In the split branch [1], there is both a real LightDM plugin and a mock one. But this branch just has the mock one which is used as if it were a real one.

[1] https://code.launchpad.net/~mterry/unity/phablet-split/+merge/161516

[Albert Astals Cid (aacid)]

Works for me if we accept the fake lightdm plugin. Michael? Michał? What do you think?

review: Approve

[Michał Sawicz (saviq)]

Generally, why wouldn't the Qt plugin be part of liblightdm-qt?

Is there a reason for the LightDM class? I'd just expose Greeter and Users as singletons directly - and you don't need the instance() method, 'cause the singleton provider function is static.

Please use a named import - "import LightDM 0.1 as YourPreferredName".

We should have a "background" and "infographic" properties instead of the selected(uid) signals and accessing the model directly - but that's unrelated, so let's leave it for now.

==========
 119 + property bool noPasswordNeeded: false

This seems like it could be a Greeter::passwordless property?

==========
 203 + if (!userList.currentItem)
 204 + return;

Please wrap all if() blocks in curly braces.

==========
 454 + void showMessage(QString text, bool isError);
 455 + void showPrompt(QString text, bool isSecret);
 456 + void authenticationComplete();

You didn't use the string provided by showPrompt(), but anyway do you think we could instead have Greeter::prompt, Greeter::promptType properties - seems more QML-ish. I'd rather have a Greeter::status and/or corresponding properties that would change accordingly instead of those signals. QML interfaces should make much more use of properties rather than signals, to facilitate property binding and declarative approach.

==========
 376 +void Greeter::respond(const QString &response)
 377 +{
 378 + m_greeter->respond(response);
 379 +}

The Greeter::respond name is weird, could we maybe have a better name here? Or at least explain what's happening?

==========
Not finished yet...

review: Needs Fixing

[Michał Sawicz (saviq)]

OK the above is all.

[Michael Terry (mterry)]

> Generally, why wouldn't the Qt plugin be part of liblightdm-qt?

Because not all potential Qt greeters are the same. liblightdm-qt provides the bare data, this Qml plugin mangles that data in certain ways (sorts it by realName, strips colons from prompt strings, modifies realName to be name if empty, etc) that other Qt greeters may not want.

> Is there a reason for the LightDM class? I'd just expose
> Greeter and Users as singletons directly - and you don't
> need the instance() method, 'cause the singleton provider
> function is static.

The only reason was as a namespace. I'm now exposing Greeters and Users as singletons and have dropped the LightDM class.

> Please use a named import - "import LightDM 0.1 as YourPreferredName".

Ah, which provides the namespace we lose from above. Why is the named import the preferred way to do that? I don't see many other named imports in the code.

> This seems like it could be a Greeter::passwordless property?

Done. I've not moved this field into the plugin directly as Greeter::promptless.

> Please wrap all if() blocks in curly braces.

Done.

> You didn't use the string provided by showPrompt()

Yes, intentionally. I didn't want to complicate this merge by adding new features or fixing bugs. Anyway, that's a multi-user feature and as such, it isn't necessary for 1.0.

> but anyway do you think we could instead have Greeter::prompt,
> Greeter::promptType properties - seems more QML-ish. I'd
> rather have a Greeter::status and/or corresponding properties
> that would change accordingly instead of those signals. QML
> interfaces should make much more use of properties rather than
> signals, to facilitate property binding and declarative approach.

Adding prompt or promptType properties is problematic because we will need to support multiple prompts in the future. So we may have 1 or more prompt boxes to show the user, potentially of different types.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:511
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/831/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/734
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/707
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/707/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/711
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1396

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

review: Approve (continuous-integration)

[Michael Terry (mterry)]

> The Greeter::respond name is weird, could we maybe have
> a better name here? Or at least explain what's happening?

Sorry, missed this question in my previous reply.

"respond" is inherited from liblightdm's terminology. It's what happens when the user enters a password. The greeter "responds" to the system's prompt.

[Michał Sawicz (saviq)]

W dniu 02.05.2013 12:29, Michael Terry pisze:
>> > Please use a named import - "import LightDM 0.1 as YourPreferredName".
> Ah, which provides the namespace we lose from above. Why is the named import the preferred way to do that? I don't see many other named imports in the code.

The result is the same, but there's simply less code :), and there
should be more of them, I agree.

>> > You didn't use the string provided by showPrompt()
> Yes, intentionally. I didn't want to complicate this merge by adding new features or fixing bugs. Anyway, that's a multi-user feature and as such, it isn't necessary for 1.0.

OK.

>> > but anyway do you think we could instead have Greeter::prompt,
>> > Greeter::promptType properties - seems more QML-ish. I'd
>> > rather have a Greeter::status and/or corresponding properties
>> > that would change accordingly instead of those signals. QML
>> > interfaces should make much more use of properties rather than
>> > signals, to facilitate property binding and declarative approach.
> Adding prompt or promptType properties is problematic because we will need to support multiple prompts in the future. So we may have 1 or more prompt boxes to show the user, potentially of different types.

Yeah, we'll have to revisit when the time comes.

One last thing for now - instead of all the .get(currentIndex).*, could
we have corresponding readonly properties on the delegate and use
"userList.currentItem.background" etc?

--
Michał Sawicz <email address hidden>
Canonical Services Ltd.

[Michael Terry (mterry)]

> One last thing for now - instead of all the .get(currentIndex).*, could
> we have corresponding readonly properties on the delegate and use
> "userList.currentItem.background" etc?

Done. Except I didn't change uses outside the Greeter component (i.e. the one use in Shell.qml to get the backgroundPath. It didn't seem appropriate to expose the inner details of the userList outside Greeter.

[Michael Terry (mterry)]

Using currentItem actually caused a few problems. The prompt changed too early (before scrolling) and it had an off-by-one error (guest button would appear after switching away from guest).

This is because when you click on a user and we start authentication, the previous user is still the currentItem, but the new user is the currentIndex.

I also added some code to use the default background if no background is defined by LightDM.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:512
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/836/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/740
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/712
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/712/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/716
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1403/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/839/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/743
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/715
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/715/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/719
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1408

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/848/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/760
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/724
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/724/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/728

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

review: Approve (continuous-integration)

[Michael Terry (mterry)]

Last week, Saviq noticed that in tablet mode, my branch made switching between users noticeably slow. It turns out this was due to the expensive get() method on our QSortFilterProxyModelQML implementation. It mapped all the role names to all the values and returned the whole mapping each time. When usually callers were just interested in one piece of data.

So I added a version that took a role enum value and returned just one point of data. This fixed the speed problems. But there are two oddities with my version that I'm hoping a Qml expert will be able to solve:

1) When I first had the get-one-role method return a QVariant, Qml treated it as an object instead of unboxing it to a native type. Is there a trick to get it to do that, like it does for QVariantMap? So I named the method getString() since that's all I needed for now and it avoided the problem.

2) I wanted to have Qml ask for a role by enum rather than role string because that would be one less lookup for the method to do. But without exposing the liblightdm object, I couldn't find a way to "proxy" the enumeration from the liblightdm UserModel class to our thin wrapper around it. Q_ENUMS can point to another class's enumeration, but it doesn't seem to expose it to Qml like I'd expect. Same for declaring a typedef in our wrapper. So I ended up just copying the enumeration.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:516
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/854/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/775
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/730
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/730/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/734

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

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

The getString seems a bit weird, i think using a roleName (as in the roleNames() function) would be the "declarative way". Saviq?

review: Needs Information

[Michał Sawicz (saviq)]

Generally I find this weird that QSortFilterProxyModelQML::get(int row) would be so slow, we need to fix that.

I agree with Albert that all this is non-declarative and would like to later see a way to fix that, too.

Ad 1.:
Q_INVOKABLE QVariant data(int row, int role);

QVariant
QSortFilterProxyModelQML::data(int row, int role)
{
    return index(row, 0).data(role);
}

Seems to work just fine here.

Ad 2.:
I'm generally of the opinion that enums should be wrapped in separate non-creatable classes used just for that - exposing enums. We could do that in our fake plugin, but would later require changing the QLightDM API.
For copying, I'd go with at least:

    enum UserModelRoles {NameRole = QLightDM::UsersModel::NameRole,
                         RealNameRole = QLightDM::UsersModel::RealNameRole,
                         LoggedInRole = QLightDM::UsersModel::LoggedInRole,
                         BackgroundRole = QLightDM::UsersModel::BackgroundRole,
                         SessionRole = QLightDM::UsersModel::SessionRole,
                         HasMessagesRole = QLightDM::UsersModel::HasMessagesRole,
                         ImagePathRole = QLightDM::UsersModel::ImagePathRole,
                         BackgroundPathRole = QLightDM::UsersModel::BackgroundPathRole,
                         InfographicRole = QLightDM::UsersModel::InfographicRole // WARNING: not a real lightdm role
    };

This would ensure that we're not mismatching them.

I also just found some references to greeterContentLoader inside GreeterContent.qml which we need to fix later - components should not access objects outside of their scope if possible.

[Michał Sawicz (saviq)]

A potentially better way to expose those enums would be to expose the original QLightDM::UsersModel in our plugin, uncreatable, under a different name.

[Michał Sawicz (saviq)]

A slightly (only _slightly_) more QML-friendly approach would be to go back to putting the values on the delegate properties, but react onIndexChanged and ListView::itemAt().

[Michał Sawicz (saviq)]

OK we know now why it was so slow - every call to get() would asynchronously create a QPixmap of the background. We've discussed that that's unacceptable and we should get rid of the get() method altogether from QSortFilterProxyModel (Albert added a workitem to a client-1303-unity-ui-dash blueprint).

Adding the data(int, int) method would be safe, but could lead to us abusing it as it adds to ListModel API and we might end up expecting that to be implemented.

The approach I mentioned in my previous comment should let us get rid of that assumption and the added method.

review: Needs Fixing

[Michał Sawicz (saviq)]

s/asynchronously/synchronously/

[Michael Terry (mterry)]

Since itemAt() takes an x,y pair not an index, Saviq and I agreed it's not quite suitable here.

But I did use a QVariant successfully, not sure how I got that wrong before.

And I expose liblightdm's user model object as "UserRoles" for its enum.

Should be good now. (Apart from lingering unhappiness about using role indexes at all.)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:518
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/863/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/739
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/739/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/743

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:518
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/879/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/808/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/755/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/759/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:519
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/890/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/821/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/766
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/766/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/770

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Hey, there's a small conflict now after we've dropped ::get(int)...

review: Needs Fixing

[Michał Sawicz (saviq)]

Could you also please add tests for the ::data method?

[Michał Sawicz (saviq)]

Otherwise it's good! Definitely too long in the making, though...

[Michael Terry (mterry)]

Fixed conflict and added test for ::data.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:521
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/896/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/830
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/772
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/772/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/776

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:521
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/897/
Executed test runs:
    UNSTABLE: http://s-jenkins:8080/job/unity-phablet-qmluitests/831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/773
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/773/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/777

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Object UsersModel(0x6b4c30) has no method 'get'

review: Needs Fixing

[Michał Sawicz (saviq)]

You need to fix the tests to use data(), too.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:523
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/905/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/844
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/781
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/781/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1432

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

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Yes!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'Greeter/Greeter.qml'
--- Greeter/Greeter.qml	2013-04-09 00:39:33 +0000
+++ Greeter/Greeter.qml	2013-05-13 15:26:27 +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,13 @@
     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
 
         source: required ? "GreeterContent.qml" : ""
 

=== modified file 'Greeter/GreeterContent.qml'
--- Greeter/GreeterContent.qml	2013-04-05 11:03:11 +0000
+++ Greeter/GreeterContent.qml	2013-05-13 15:26:27 +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)
@@ -109,6 +110,6 @@
             right: narrowMode ? undefined : parent.right
             rightMargin: narrowMode ? 0 : units.gu(-6)
         }
-        source: narrowMode ? "graphics/infographic_tweeter_cut.png" : userList.get(greeterContentLoader.currentIndex).infographic ? userList.get(greeterContentLoader.currentIndex).infographic : ""
+        source: narrowMode ? "graphics/infographic_tweeter_cut.png" : loginLoader.item.userList.model.data(currentIndex, LightDM.UserRoles.InfographicRole) ? loginLoader.item.userList.model.data(currentIndex, LightDM.UserRoles.InfographicRole) : ""
     }
 }

=== modified file 'Greeter/LoginList.qml'
--- Greeter/LoginList.qml	2013-04-12 05:54:57 +0000
+++ Greeter/LoginList.qml	2013-05-13 15:26:27 +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 = "";
+        }
+    }
 }

=== modified file 'Shell.qml'
--- Shell.qml	2013-05-02 22:07:11 +0000
+++ Shell.qml	2013-05-13 15:26:27 +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-13 15:26:27 +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-13 15:26:27 +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-13 15:26:27 +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-13 15:26:27 +0000
@@ -0,0 +1,45 @@
+# 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
+    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
+    )
+
+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-13 15:26:27 +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-13 15:26:27 +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/lightdm-greeter.cpp'
--- plugins/LightDM/lightdm-greeter.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/lightdm-greeter.cpp	2013-05-13 15:26:27 +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-13 15:26:27 +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-usersmodel.cpp'
--- plugins/LightDM/lightdm-usersmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/lightdm-usersmodel.cpp	2013-05-13 15:26:27 +0000
@@ -0,0 +1,178 @@
+/*
+ * 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;
+    QString infographic;
+};
+
+const Entry fake_entries[] =
+{
+    { "anna",         "Anna Olson",   "*", 0, false, false, 0, 0 },
+    { "lois",         "Lois Mcqueen", "*", 0, false, false, 0, 0 },
+    { "lola",         "Lola Chang",   "*", 0, false, false, 0, 0 },
+    { "toomas",       "Toomas Vilms", "*", 0, false, false, 0, 0 },
+    { "empty-name",   "",             "*", 0, false, false, 0, 0 },
+    { "no-password",  "Guest",        "*", 0, false, false, 0, 0 },
+    { "",             "",             0,   0, false, false, 0, 0 }
+};
+
+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/backgrounds/");
+    QStringList backgrounds = bgdir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+    QDir infodir = QDir("/usr/share/demo-assets/shell/infographics/");
+    QStringList infographics = infodir.entryList(QDir::Files | QDir::NoDotAndDotDot);
+
+    for (int i = 0, j = 0, k = 0; fake_entries[i].username != ""; i++) {
+        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;
+                }
+            }
+        }
+        if (!infographics.isEmpty()) {
+            entry.infographic = infodir.filePath(infographics[k++]);
+            if (k >= infographics.length()) {
+                k = 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";
+    roles[InfographicRole] = "infographic";
+    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 "";
+    case UsersModel::InfographicRole:
+        return d->entries[row].infographic;
+    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-13 15:26:27 +0000
@@ -0,0 +1,67 @@
+/*
+ * 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,
+                         InfographicRole // WARNING: not a real lightdm role
+    };
+
+    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-13 15:26:27 +0000
@@ -0,0 +1,47 @@
+/*
+ * 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 <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();
+}
+
+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");
+}

=== added file 'plugins/LightDM/plugin.h'
--- plugins/LightDM/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/plugin.h	2013-05-13 15:26:27 +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-13 15:26:27 +0000
@@ -0,0 +1,2 @@
+module LightDM
+plugin LightDM-qml

=== added file 'plugins/LightDM/usersmodel.cpp'
--- plugins/LightDM/usersmodel.cpp	1970-01-01 00:00:00 +0000
+++ plugins/LightDM/usersmodel.cpp	2013-05-13 15:26:27 +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-13 15:26:27 +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-13 15:26:27 +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-13 15:26:27 +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-13 15:26:27 +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/plugins/Utils/qsortfilterproxymodeltest.cpp'
--- tests/plugins/Utils/qsortfilterproxymodeltest.cpp	2013-05-08 09:51:55 +0000
+++ tests/plugins/Utils/qsortfilterproxymodeltest.cpp	2013-05-13 15:26:27 +0000
@@ -263,6 +263,26 @@
         proxy.setModel(&model);
         QCOMPARE(spyOnModelChanged.count(), 3);
     }
+
+    void testData() {
+        QSortFilterProxyModelQML proxy;
+        MockListModel model, model2;
+
+        QStringList rows;
+        rows << "a" << "c" << "b";
+        model.appendRows(rows);
+
+        proxy.setModel(&model);
+        proxy.sort(0);
+
+        QCOMPARE(proxy.data(-1, Qt::DisplayRole), QVariant());
+        QCOMPARE(proxy.data(3, Qt::DisplayRole), QVariant());
+        QCOMPARE(proxy.data(0, Qt::DisplayRole - 1), QVariant());
+        QCOMPARE(proxy.data(0, Qt::DisplayRole + 1), QVariant());
+        QCOMPARE(proxy.data(0, Qt::DisplayRole), QVariant("a"));
+        QCOMPARE(proxy.data(1, Qt::DisplayRole), QVariant("b"));
+        QCOMPARE(proxy.data(2, Qt::DisplayRole), QVariant("c"));
+    }
 };
 
 QTEST_MAIN(QSortFilterProxyModelTest)

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-05-09 07:01:25 +0000
+++ tests/qmltests/CMakeLists.txt	2013-05-13 15:26:27 +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)

=== 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-13 15:26:27 +0000
@@ -19,6 +19,7 @@
 import ".."
 import "../../../Greeter"
 import Ubuntu.Components 0.1
+import LightDM 0.1 as LightDM
 import Unity.Test 0.1 as UT
 
 Item {
@@ -46,53 +47,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.data(i, LightDM.UserRoles.NameRole) == 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 }
+                data[i] = {tag: greeter.model.data(i, LightDM.UserRoles.NameRole), username: "username"+i, uid: i }
             }
-            data[greeter.model.count] = {tag: greeter.model.get(0).name, username: "username0", uid: 0 }
+            // We add first name last in data to guarantee a selected signal
+            data[greeter.model.count] = {tag: greeter.model.data(0, LightDM.UserRoles.NameRole), 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 +120,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.data(i, LightDM.UserRoles.NameRole) == "empty-name") {
+                    compare(greeter.model.data(i, LightDM.UserRoles.RealNameRole), greeter.model.data(i, LightDM.UserRoles.NameRole))
+                    return
+                }
+            }
+            // Never found empty-name...
+            throw new Error("QtQuickTest::fail")
+        }
     }
 }