Merge lp:~unity-team/ubuntu-system-settings/welcome-wizard into lp:ubuntu-system-settings

[Michael Terry]

Add disabled skeleton of a "Welcome to Ubuntu" wizard for first-time boot. Will be enabled when it is more complete.

Add disabled skeleton of a "Welcome to Ubuntu" wizard for first-time boot. Will be enabled when it is more complete.

This builds a new executable (system-settings-wizard -- why aren't the executables ubuntu- namespaced like the packages and desktop files?). It adds an upstart job to get started one time before unity8 (except the packaging disables that job because we're not ready to go live yet).

The eventual experience and some mockups are documented here:
https://docs.google.com/a/canonical.com/document/d/1JHFd_6mYdUTd0RpR-Sm7-WnX-06rY8r58K3Cz32mhJg/edit#heading=h.a99ud9r7cofq

To test on desktop:
debuild
./wizard/test.sh

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:497
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/506/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/10
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/10/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/9

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/506/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thank you for your work, could you do a summary of the changes/what's the intend? How do you test the current version? (e.g what do you install/run)?

Some first review comments:

- why do you add an "account" plugin? that icon is not in the design from https://wiki.ubuntu.com/SystemSettings and is not working

Is the intend to provide bindings to access accountsservice? If so we probably don't need a new directory for it, nor a .settings (which adds an icon in the settings grid)

- there is a conflict in po/CMakefile.list, that needs to be rebased on trunk

* main.cpp : start_xsession() seems really hackish, don't we have a libupstart we can use for those things rather than doing system() calls? doing a stop of the osk first seems wrong as well

* the __<name> variable are not easy to read/type and we don't use that convention in system settings ... could you get ride of that (or make an argument on why we should have it ;-)

review: Needs Fixing

[Andrea Cimitan (cimi)]

> Thank you for your work, could you do a summary of the changes/what's the
> intend? How do you test the current version? (e.g what do you install/run)?
>
>
> Some first review comments:
>
> - why do you add an "account" plugin? that icon is not in the design from
> https://wiki.ubuntu.com/SystemSettings and is not working
>
> Is the intend to provide bindings to access accountsservice? If so we probably
> don't need a new directory for it, nor a .settings (which adds an icon in the
> settings grid)
>
We need a way to edit/add/remove users on at least tablet and desktop. The plugin is meant to do that, even for the moment it's limited to change names. I imagine we will have a page on the system settings to edit the users indeed.
Icon will get updated when we'll add that page I believe, in the meanwhile it's there as a placeholder but it's hidden to the user

> - there is a conflict in po/CMakefile.list, that needs to be rebased on trunk
>
> * main.cpp : start_xsession() seems really hackish, don't we have a libupstart
> we can use for those things rather than doing system() calls? doing a stop of
> the osk first seems wrong as well
>
> * the __<name> variable are not easy to read/type and we don't use that
> convention in system settings ... could you get ride of that (or make an
> argument on why we should have it ;-)

[lp:~unity-team/ubuntu-system-settings/welcome-wizard]

498. By Michael Terry on 2013-12-02

Merge from trunk

[Michael Terry (mterry)]

> - there is a conflict in po/CMakefile.list, that needs to be rebased on trunk

Fixed.

> * main.cpp : start_xsession() seems really hackish, don't we have a libupstart we can use for those things rather than doing system() calls? doing a stop of the osk first seems wrong as well

Eh, it's a bit hackish, agreed. I use system() because libupstart's API is a pain. :) That whole section is temporary until we figure out exactly how we want to handle the handover. And once we split unity8-greeter out, the wizard will be inserted into the upstart workflow in a different place anyway.

Stopping the OSK is a workaround for an OSK bug. It seemed to be a known bug at the time of writing the workaround. I'd have to investigate to see if it's still a problem. But this code was written at the time of Mir being enabled by default, so things have likely changed.

Anyway, my point is that start_xsession is a known pile of hacks, to be replaced by better code. If you accept that welcome-wizard will be improved incrementally, please overlook this section of code.

> * the __<name> variable are not easy to read/type and we don't use that
> convention in system settings ... could you get ride of that (or make an
> argument on why we should have it ;-)

What's the convention for marking non-public variables? It looks like you just don't bother?

[Sebastien Bacher (seb128)]

> We need a way to edit/add/remove users on at least tablet and desktop. The plugin is meant to do that, even
> for the moment it's limited to change names. I imagine we will have a page on the system settings to edit
> the users indeed.
> Icon will get updated when we'll add that page I believe, in the meanwhile it's there as a placeholder but
> it's hidden to the user

Having a plugin to handle account changes is fine, that should be a backend (like for other panels), no a panel with a .settings. Not that in the current version the placeholder is not hidden to the user, that merge is adding an account icon in the settings grid which is not in the design, duplicating an icon (next to online account) and giving an empty/not working page when clicked

> If you accept that welcome-wizard will be improved incrementally, please overlook this section of code.

Ok, fair enough. If we workaround an OSK bug I would like at least a bug reference in a code comment though...

> What's the convention for marking non-public variables? It looks like you just don't bother?

Right, those sources are standalone UIs, not re-usable components, so by definition everything is private to that only user...

BTW I would still welcome tips on how to actually run/test that code on a desktop (or do I need to build a package and install it on the device to test?)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:498
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/529/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/33
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/33/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/32

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/529/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

> > We need a way to edit/add/remove users on at least tablet and desktop. The
> plugin is meant to do that, even
> > for the moment it's limited to change names. I imagine we will have a page
> on the system settings to edit
> > the users indeed.
> > Icon will get updated when we'll add that page I believe, in the meanwhile
> it's there as a placeholder but
> > it's hidden to the user
>
> Having a plugin to handle account changes is fine, that should be a backend
> (like for other panels), no a panel with a .settings. Not that in the current
> version the placeholder is not hidden to the user, that merge is adding an
> account icon in the settings grid which is not in the design, duplicating an
> icon (next to online account) and giving an empty/not working page when
> clicked
>

I think it wasn't when I did the original work, I'll work on it.
>
> > If you accept that welcome-wizard will be improved incrementally, please
> overlook this section of code.
>
> Ok, fair enough. If we workaround an OSK bug I would like at least a bug
> reference in a code comment though...
>
>
> > What's the convention for marking non-public variables? It looks like you
> just don't bother?
>
> Right, those sources are standalone UIs, not re-usable components, so by
> definition everything is private to that only user...
>
>
> BTW I would still welcome tips on how to actually run/test that code on a
> desktop (or do I need to build a package and install it on the device to
> test?)

[lp:~unity-team/ubuntu-system-settings/welcome-wizard]

499. By Andrea Cimitan on 2013-12-02

Remove panel

500. By Michael Terry on 2013-12-02

Add simple testing script to make running on desktop easier

501. By Michael Terry on 2013-12-02

Drop __ prefix for private variables

502. By Michael Terry on 2013-12-02

Expand OSK maliit-server restart bug comment

[Michael Terry (mterry)]

OK, Cimi added a commit to address your plugin comment.

I've expanded the OSK bug comment (basically saying it used to be a bug, needs to be re-investigated, but likely won't matter for the way we eventually will launch the wizard).

I've also taken out the __ prefixes and added a script to the source to test the wizard locally. And added a comment to this merge describing how to use it (basically just build locally and run the script).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/532/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/35

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/532/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for the update, that looks mostly good (let's not nitpick on UI/code for the first landing, we can fix stuff once the basis are in), some things to fix though:

- there is a conflicts in debian/rules (we merged autopilots support which change it as well), can you rebase again?

- trying to run it on my desktop gives a ""Unity.Application" is not installed" error ... is that a missing depends? (why is that import needed in the main source?)

- running "make pot" in po/ gives an error

"extractsettingsinfo: error: argument files: can't open '../plugins/orientation-lock//orientation-lock.settings'"

review: Needs Fixing

[Iain Lane (laney)]

Can you reassure about the technical debt we'd be introducing here by explaining what the eventual plan for launching the wizard is and why it can't be done like that straight away?

A small review

  - I think it's best if you don't update the translation templates here; it's likely to lead to conflicts (we usually do them in separate MPs)
  - 2774 + anchors {
    2775 + fill: parent
    2776 + topMargin: topMargin
    2777 + leftMargin: leftMargin
    2778 + rightMargin: rightMargin
    2779 + bottomMargin: bottomMargin
    2780 + }

    Is it necessary to set the margins if you fill: parent? (It might be, just checking)
  - Feels like it would be nicer to add wizard/qml to the import path rather than importing a relative path.
  - Thanks for the accounts plugin; do you think it could be generalised and used everywhere we use AS in u-s-s? Not necessarily a blocker for this.
  - Please wrap at 80 columns.

review: Needs Information

[Iain Lane (laney)]

also our convention for member variables is to prefix them with "m_"

[Michael Terry (mterry)]

> - there is a conflicts in debian/rules (we merged autopilots support which change it as well), can you rebase again?

Fixed.

> - trying to run it on my desktop gives a ""Unity.Application" is not installed" error ... is that a missing depends? (why is that import needed in the main source?)

Unity.Application contains the OSKController qml item. There is a mock for it in the source that I've added. Run debuild, then run wizard/test.sh to run the wizard locally.

> - running "make pot" in po/ gives an error
>
> "extractsettingsinfo: error: argument files: can't open '../plugins/orientation-lock//orientation-lock.settings'"

Fixed.

> - I think it's best if you don't update the translation templates here; it's likely to lead to conflicts (we usually do them in separate MPs)

Fixed.

> Is it necessary to set the margins if you fill: parent? (It might be, just checking)

Yes. We could re-organize the hierarchy to move some margins into the parent. But the way it is now, you need to specify both. I don't think it's a big deal, but if you like, we can move things around.

> - Feels like it would be nicer to add wizard/qml to the import path rather than importing a relative path.

I tried to add the qrc:/qml to the import path, which the docs say should work, but I couldn't get it to find the Components subdirectory. Instead, I just specified "qrc:/qml/Components" instead of "../Components" which worked fine.

> - Thanks for the accounts plugin; do you think it could be generalised and used everywhere we use AS in u-s-s? Not necessarily a blocker for this.

Sure. Over time, functionality could be moved into it.

> - Please wrap at 80 columns.

You mean in the qml files? OK, fixed, with the exception of translated strings, which xgettext doesn't pick up if split over lines.

> also our convention for member variables is to prefix them with "m_"

I thought I did?

> Can you reassure about the technical debt we'd be introducing here by explaining what the eventual plan for launching the wizard is and why it can't be done like that straight away?

I wouldn't say technical debt, just incomplete code. It has to be fixed before enabling for the user, so it's not like we're taking a temporary shortcut.

The deal with launching is that once the greeter is split out from the user unity8 process, it needs to be launched from a system upstart job, rather than the user upstart job in this branch. Plus, the transition between the wizard and the greeter will be controlled by unity-system-compositor then.

These are just moving parts that we'll have to wait to settle before really finalizing it here.

OK, I think that's all the review comments addressed? Please re-review.

[lp:~unity-team/ubuntu-system-settings/welcome-wizard]

503. By Michael Terry on 2013-12-31

Merge from trunk

504. By Michael Terry on 2013-12-31

Restore pot file to trunk; updating it will be separate MP

505. By Michael Terry on 2013-12-31

Shorten the SIM page title

506. By Michael Terry on 2013-12-31

Use full qrc url for Component folder and wrap qml at 80 columns, except for translated strings

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:506
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/566/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/82
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/69

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/566/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for the update. Laney added a library for accountsservice (see https://code.launchpad.net/~laney/ubuntu-system-settings/as-library/+merge/200646) ... could you update your code to use that one (see https://code.launchpad.net/~laney/ubuntu-system-settings/private-as-background/+merge/200648 for an example of client)

review: Needs Fixing

[Andrea Cimitan (cimi)]

> Thanks for the update. Laney added a library for accountsservice (see
> https://code.launchpad.net/~laney/ubuntu-system-settings/as-
> library/+merge/200646) ... could you update your code to use that one (see
> https://code.launchpad.net/~laney/ubuntu-system-settings/private-as-
> background/+merge/200648 for an example of client)
I'll do it

[Sebastien Bacher (seb128)]

Is there any news of the changes there?

[lp:~unity-team/ubuntu-system-settings/welcome-wizard]

507. By Michael Terry on 2014-02-13

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/637/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/141
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/140

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/637/rebuild

review: Approve (continuous-integration)

[lp:~unity-team/ubuntu-system-settings/welcome-wizard]

508. By Michael Terry on 2014-02-20

Drop name screen and associated (redundant) AccountsService plugin

[Michael Terry (mterry)]

OK, dropped the account plugin entirely, because new designs don't have "About you" page at all (not needed for phone, though we should eventually add something similar back for tablet/desktop). When we do add it back, we can use the proper library.

Ready for review again, I think.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/653/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3375/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/156
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2972/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3377
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3377/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3032
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3032/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5428
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4152

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/653/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:508
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/656/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3386
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3040
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/172
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/160
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/159
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3388
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3388/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3042
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3042/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5437
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4166

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/656/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Seems fine to me, it's not very useful in the current form but it's not exposed in a visible way either and it gives us a basis to iterate and review changes, let's get it in then!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-22 04:06:41 +0000
+++ CMakeLists.txt	2014-02-20 21:25:07 +0000
@@ -68,6 +68,7 @@
 add_subdirectory(plugins)
 add_subdirectory(src)
 add_subdirectory(tests)
+add_subdirectory(wizard)
 
 configure_file(ubuntu-system-settings.desktop.in ubuntu-system-settings.desktop @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-system-settings.desktop DESTINATION share/applications)

=== modified file 'debian/rules'
--- debian/rules	2013-12-05 17:40:46 +0000
+++ debian/rules	2014-02-20 21:25:07 +0000
@@ -8,6 +8,7 @@
 include /usr/share/dpkg/architecture.mk
 
 override_dh_install:
+	rm -r debian/tmp/usr/share/upstart # not ready yet; also, do not enable wizard without tests!
 	cd tests/autopilot; \
 	set -ex; for python in $(shell pyversions -r); do \
 		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \

=== modified file 'debian/ubuntu-system-settings.install'
--- debian/ubuntu-system-settings.install	2014-01-30 16:28:59 +0000
+++ debian/ubuntu-system-settings.install	2014-02-20 21:25:07 +0000
@@ -4,4 +4,5 @@
 usr/share/glib-2.0
 usr/share/locale
 usr/share/ubuntu/settings/system
+#usr/share/upstart
 usr/share/url-dispatcher

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2013-11-18 13:57:43 +0000
+++ po/CMakeLists.txt	2014-02-20 21:25:07 +0000
@@ -1,8 +1,15 @@
-file(GLOB SOURCECODE "${CMAKE_SOURCE_DIR}/plugins/*/*.qml" "${CMAKE_SOURCE_DIR}/src/qml/*.qml")
-file(GLOB SETTINGSFILES "${CMAKE_SOURCE_DIR}/plugins/*/*.settings")
+file(GLOB CPPFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+                   "${CMAKE_SOURCE_DIR}/src/*.cpp")
+file(GLOB QMLFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+                   "${CMAKE_SOURCE_DIR}/plugins/*/*.qml"
+                   "${CMAKE_SOURCE_DIR}/src/qml/*.qml"
+                   "${CMAKE_SOURCE_DIR}/wizard/qml/*/*.qml")
+file(GLOB SETTINGSFILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+                        "${CMAKE_SOURCE_DIR}/plugins/*/*.settings")
 
 add_custom_command(OUTPUT settings.js
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/extractsettingsinfo ${SETTINGSFILES} -o ${CMAKE_CURRENT_BINARY_DIR}/settings.js
+    COMMAND ./extractsettingsinfo ${SETTINGSFILES} -o ${CMAKE_CURRENT_BINARY_DIR}/settings.js
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
     DEPENDS ${SETTINGSFILES}
 )
 
@@ -11,16 +18,30 @@
 #  DEPENDS ${CMAKE_SOURCE_DIR}/ubuntu-system-settings.desktop
 #)
 
-
-add_custom_target(pot
-    COMMAND ${XGETTEXT_BIN} -o ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-system-settings.pot
-    -copyright=\"Canonical Ltd. \"
-    --package-name ubuntu-system-settings
-    --qt --c++ --add-comments=TRANSLATORS
-    --keyword=tr --keyword=tr:1,2 --from-code=UTF-8
-    ${SOURCECODE} ${DESKTOPFILE} settings.js
-    DEPENDS ${SOURCECODE} settings.js #desktop.js
-)
+add_custom_target(pot-qml
+    COMMAND ${XGETTEXT_BIN} -o ubuntu-system-settings.pot
+                            --copyright=\"Canonical Ltd.\"
+                            --package-name ubuntu-system-settings
+                            --qt --c++ --add-comments=TRANSLATORS
+                            --keyword=tr --keyword=tr:1,2 --from-code=UTF-8
+                            ${QMLFILES} "${CMAKE_CURRENT_BINARY_DIR}/settings.js"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    DEPENDS ${QMLFILES} "${CMAKE_CURRENT_BINARY_DIR}/settings.js" #desktop.js
+)
+
+add_custom_target(pot-cpp
+    COMMAND ${XGETTEXT_BIN} -o ubuntu-system-settings.pot
+                            --join-existing
+                            --copyright=\"Canonical Ltd.\"
+                            --package-name ubuntu-system-settings
+                            --qt --c++ --add-comments=TRANSLATORS
+                            --keyword=_ --from-code=UTF-8
+                            ${CPPFILES}
+    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+    DEPENDS pot-qml ${CPPFILES}
+)
+
+add_custom_target(pot DEPENDS pot-qml pot-cpp)
 
 set(languages "ar;ast;be;bg;bs;ca;cs;de;el;en_AU;en_GB;eo;es;fa;fi;fr;gl;gu;he;hi;hr;hu;id;it;km;ko;lo;lv;ms;my;nb;pl;pt_BR;pt;ru;shn;sl;sv;tr;ug;uk;xh;zh_CN;zh_HK;zh_TW")
 foreach(i ${languages})

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-01-31 15:07:01 +0000
+++ src/CMakeLists.txt	2014-02-20 21:25:07 +0000
@@ -36,9 +36,3 @@
 qt5_use_modules(uss-accountsservice Core Qml DBus)
 set_target_properties(uss-accountsservice PROPERTIES VERSION 0.0 SOVERSION 0.0)
 install(TARGETS uss-accountsservice LIBRARY DESTINATION ${PLUGIN_MODULE_DIR} NAMELINK_SKIP)
-
-add_custom_target(po COMMAND
-${XGETTEXT_BIN} -o ${CMAKE_SOURCE_DIR}/po/ubuntu-system-settings.pot -d ubuntu-system-settings
---keyword=_ ${USS_SOURCES}
-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)

=== added directory 'tests/mocks'
=== added directory 'tests/mocks/Unity'
=== added directory 'tests/mocks/Unity/Application'
=== added file 'tests/mocks/Unity/Application/OSKController.qml'
--- tests/mocks/Unity/Application/OSKController.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/OSKController.qml	2014-02-20 21:25:07 +0000
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0;
+
+Item {
+}

=== added file 'tests/mocks/Unity/Application/qmldir'
--- tests/mocks/Unity/Application/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Application/qmldir	2014-02-20 21:25:07 +0000
@@ -0,0 +1,2 @@
+module Unity.Application
+OSKController 0.1 OSKController.qml

=== added directory 'wizard'
=== added file 'wizard/CMakeLists.txt'
--- wizard/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ wizard/CMakeLists.txt	2014-02-20 21:25:07 +0000
@@ -0,0 +1,18 @@
+add_definitions(-DI18N_DOMAIN="ubuntu-system-settings")
+add_definitions(-DPLUGIN_PRIVATE_MODULE_DIR="${PLUGIN_PRIVATE_MODULE_DIR}")
+add_definitions(-DPLUGIN_MANIFEST_DIR="${PLUGIN_MANIFEST_DIR}")
+add_definitions(-DPLUGIN_QML_DIR="${PLUGIN_QML_DIR}")
+add_definitions(-DPLUGIN_MODULE_DIR="${PLUGIN_MODULE_DIR}")
+
+set(WIZARD_SOURCES
+    main.cpp
+)
+
+QT5_ADD_RESOURCES(system-settings-wizard-resources ui.qrc)
+
+add_executable(system-settings-wizard ${WIZARD_SOURCES} ${system-settings-wizard-resources})
+
+qt5_use_modules(system-settings-wizard Core Gui Quick Qml)
+
+install(TARGETS system-settings-wizard RUNTIME DESTINATION bin)
+install(FILES ubuntu-system-settings-wizard.conf DESTINATION share/upstart)

=== added file 'wizard/main.cpp'
--- wizard/main.cpp	1970-01-01 00:00:00 +0000
+++ wizard/main.cpp	2014-02-20 21:25:07 +0000
@@ -0,0 +1,64 @@
+/*
+ * This file is part of system-settings
+ *
+ * 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 version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ */
+
+#include <libintl.h>
+#include <QGuiApplication>
+#include <QQmlContext>
+#include <QUrl>
+#include <QQuickView>
+#include <QtQml>
+
+void start_xsession()
+{
+    // When we get a request to stop, we don't quit but rather start xsession
+    // in the background.  When xsession finishes loading, we'll be stopped
+    // by upstart.
+
+    // But first, stop maliit-server, it needs to be started by unity8.
+    // This was an OSK bug in October, need to discover if it is still a
+    // problem, especially once we become a system upstart job.
+    if (system("stop maliit-server") != 0)
+    {} // ignore any errors
+
+    // Now resume starting xsession, which we interrupted with our upstart job
+    QString command = "initctl emit xsession";
+    command += " SESSION=" + qgetenv("DESKTOP_SESSION");
+    command += " SESSIONTYPE=" + qgetenv("SESSIONTYPE");
+    command += " &";
+    if (system(command.toLatin1().data()) != 0)
+        QGuiApplication::quit(); // just quit if we can't start xsession
+}
+
+int main(int argc, char **argv)
+{
+    QGuiApplication app(argc, argv);
+
+    bindtextdomain(I18N_DOMAIN, NULL);
+    textdomain(I18N_DOMAIN);
+
+    QQuickView view;
+    QObject::connect(view.engine(), &QQmlEngine::quit, start_xsession);
+    view.setResizeMode(QQuickView::SizeRootObjectToView);
+    view.engine()->addImportPath(PLUGIN_PRIVATE_MODULE_DIR);
+    view.engine()->addImportPath(PLUGIN_QML_DIR);
+    view.setSource(QUrl("qrc:/qml/main.qml"));
+    view.show();
+//    view.showFullScreen();
+
+    return app.exec();
+}

=== added directory 'wizard/qml'
=== added directory 'wizard/qml/Components'
=== added file 'wizard/qml/Components/Page.qml'
--- wizard/qml/Components/Page.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Components/Page.qml	2014-02-20 21:25:07 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Page {
+    readonly property real buttonMargin: units.gu(2)
+    readonly property real buttonWidth: (width - buttonMargin * 2) / 2 -
+                                        buttonMargin / 2
+    readonly property real topMargin: units.gu(5)
+    readonly property real leftMargin: units.gu(3)
+    readonly property real rightMargin: units.gu(3)
+    readonly property real bottomMargin: backButton.height + buttonMargin * 2
+
+    property bool hasBackButton: true
+    property alias forwardButtonSourceComponent: forwardButton.sourceComponent
+
+    visible: false
+    tools: ToolbarItems {
+        back: null
+    }
+
+    Button {
+        id: backButton
+        width: buttonWidth
+        anchors {
+            left: parent.left
+            bottom: parent.bottom
+            leftMargin: buttonMargin
+            bottomMargin: buttonMargin
+        }
+        z: 1
+        text: i18n.tr("Back")
+        visible: pageStack.depth > 1 && hasBackButton
+        gradient: UbuntuColors.greyGradient
+
+        onClicked: pageStack.pop()
+    }
+
+    Loader {
+        id: forwardButton
+        width: buttonWidth
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
+            rightMargin: buttonMargin
+            bottomMargin: buttonMargin
+        }
+        z: 1
+    }
+}

=== added directory 'wizard/qml/Pages'
=== added file 'wizard/qml/Pages/LocationPage.qml'
--- wizard/qml/Pages/LocationPage.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/LocationPage.qml	2014-02-20 21:25:07 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "qrc:/qml/Components" as LocalComponents
+
+LocalComponents.Page {
+    title: i18n.tr("Your phone settings")
+    forwardButtonSourceComponent: forwardButton
+
+    Item {
+        id: content
+        anchors {
+            fill: parent
+            topMargin: topMargin
+            leftMargin: leftMargin
+            rightMargin: rightMargin
+            bottomMargin: bottomMargin
+        }
+
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+            fontSize: "large"
+            text: i18n.tr("Your phone is setup to automatically report errors to Canonical. This can be disabled in system settings.") +
+                  "\n\n" +
+                  i18n.tr("Your phone is setup to detect your location. This can be disabled in system settings.")
+        }
+    }
+
+    Component {
+        id: forwardButton
+        Button {
+            text: i18n.tr("Continue")
+            onClicked: pageStack.push(Qt.resolvedUrl("SetupCompletePage.qml"))
+        }
+    }
+}

=== added file 'wizard/qml/Pages/SetupCompletePage.qml'
--- wizard/qml/Pages/SetupCompletePage.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/SetupCompletePage.qml	2014-02-20 21:25:07 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "qrc:/qml/Components" as LocalComponents
+
+LocalComponents.Page {
+    title: i18n.tr("That’s it!")
+    forwardButtonSourceComponent: forwardButton
+
+    Item {
+        id: content
+        anchors {
+            fill: parent
+            topMargin: topMargin
+            leftMargin: leftMargin
+            rightMargin: rightMargin
+            bottomMargin: bottomMargin
+        }
+
+        Label {
+            width: parent.width
+            wrapMode: Text.WordWrap
+            fontSize: "large"
+            text: i18n.tr("It’s great to have you in the Ubuntu Community.") +
+                  "\n\n" +
+                  i18n.tr("You’re now ready to enjoy your new phone.")
+        }
+    }
+    Component {
+        id: forwardButton
+        Button {
+            text: i18n.tr("Finish")
+            onClicked: pageStack.push(Qt.resolvedUrl("SpinnerPage.qml"))
+        }
+    }
+}

=== added file 'wizard/qml/Pages/SimCardPage.qml'
--- wizard/qml/Pages/SimCardPage.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/SimCardPage.qml	2014-02-20 21:25:07 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "qrc:/qml/Components" as LocalComponents
+
+LocalComponents.Page {
+    title: i18n.tr("No SIM installed")
+    forwardButtonSourceComponent: forwardButton
+
+    Item {
+        id: content
+        anchors {
+            fill: parent
+            topMargin: topMargin
+            rightMargin: rightMargin
+            bottomMargin: bottomMargin
+        }
+
+        Image {
+            id: image
+            anchors {
+                top: parent.top
+                left: parent.left
+                leftMargin: units.gu(2.5)
+            }
+            source: "data/[e-mail]"
+            height: units.gu(9)
+            width: units.gu(12.5)
+        }
+
+        Label {
+            anchors {
+                top: image.bottom
+                left: parent.left
+                topMargin: units.gu(2)
+                leftMargin: leftMargin
+            }
+            width: content.width
+            wrapMode: Text.WordWrap
+            fontSize: "large"
+            text: i18n.tr("You need a valid SIM to use telephone and SMS features.")
+        }
+    }
+
+    Component {
+        id: forwardButton
+        Button {
+            text: i18n.tr("Skip")
+            onClicked: pageStack.push(Qt.resolvedUrl("WiFiPage.qml"))
+        }
+    }
+}

=== added file 'wizard/qml/Pages/SpinnerPage.qml'
--- wizard/qml/Pages/SpinnerPage.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/SpinnerPage.qml	2014-02-20 21:25:07 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "qrc:/qml/Components" as LocalComponents
+
+LocalComponents.Page {
+    title: i18n.tr("That’s it!")
+
+    hasBackButton: false
+
+    Component.onCompleted: Qt.quit()
+
+    Item {
+        id: content
+        anchors {
+            fill: parent
+            topMargin: topMargin
+            leftMargin: leftMargin
+            rightMargin: rightMargin
+            bottomMargin: bottomMargin
+        }
+
+        ActivityIndicator {
+            id: spinner
+            anchors.centerIn: parent
+            running: true
+        }
+    }
+}

=== added file 'wizard/qml/Pages/WelcomePage.qml'
--- wizard/qml/Pages/WelcomePage.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/WelcomePage.qml	2014-02-20 21:25:07 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.SystemSettings.LanguagePlugin 1.0
+import "qrc:/qml/Components" as LocalComponents
+
+LocalComponents.Page {
+    title: i18n.tr("Hello!")
+    forwardButtonSourceComponent: forwardButton
+
+    readonly property bool simCardPresent: false // TODO: implement this
+
+    UbuntuLanguagePlugin {
+        id: plugin
+    }
+
+    Item {
+        id: content
+        anchors {
+            fill: parent
+            topMargin: topMargin
+            leftMargin: leftMargin
+            rightMargin: rightMargin
+            bottomMargin: bottomMargin
+        }
+
+        Column {
+            id: column
+            spacing: units.gu(2)
+
+            Label {
+                id: label
+                width: content.width
+                wrapMode: Text.WordWrap
+                fontSize: "large"
+                text: i18n.tr("Welcome to Ubuntu.") + "\n" +
+                      i18n.tr("Let’s get started.")
+            }
+
+            OptionSelector {
+                id: languageList
+                text: i18n.tr("Select your language")
+                model: plugin.languageNames
+                selectedIndex: plugin.currentLanguage
+                onSelectedIndexChanged: {
+                    i18n.language = plugin.languageCodes[selectedIndex]
+                    i18n.domain = i18n.domain
+                }
+                containerHeight: content.height - label.height
+                                 - column.spacing - units.gu(4)
+            }
+        }
+    }
+
+    Component {
+        id: forwardButton
+        Button {
+            text: i18n.tr("Start")
+            onClicked: {
+                plugin.currentLanguage = languageList.selectedIndex
+                pageStack.push(Qt.resolvedUrl(simCardPresent
+                                              ? "LocationPage.qml"
+                                              : "SimCardPage.qml"))
+            }
+        }
+    }
+}

=== added file 'wizard/qml/Pages/WiFiPage.qml'
--- wizard/qml/Pages/WiFiPage.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/WiFiPage.qml	2014-02-20 21:25:07 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import "qrc:/qml/Components" as LocalComponents
+
+LocalComponents.Page {
+    title: i18n.tr("Connect to Wi-Fi")
+    forwardButtonSourceComponent: forwardButton
+
+    Item {
+        id: content
+        anchors {
+            fill: parent
+            topMargin: topMargin
+            leftMargin: leftMargin
+            rightMargin: rightMargin
+            bottomMargin: bottomMargin
+        }
+    }
+
+    Component {
+        id: forwardButton
+        Button {
+            text: i18n.tr("Connect")
+            onClicked: pageStack.push(Qt.resolvedUrl("LocationPage.qml"))
+        }
+    }
+}

=== added directory 'wizard/qml/Pages/data'
=== added file 'wizard/qml/Pages/data/[e-mail]'
Binary files wizard/qml/Pages/data/[e-mail]	1970-01-01 00:00:00 +0000 and wizard/qml/Pages/data/[e-mail]	2014-02-20 21:25:07 +0000 differ
=== added file 'wizard/qml/main.qml'
--- wizard/qml/main.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/main.qml	2014-02-20 21:25:07 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import GSettings 1.0
+import Ubuntu.Components 0.1
+import Unity.Application 0.1
+
+MainView {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    headerColor: "#57365E"
+    backgroundColor: "#A55263"
+    footerColor: "#D75669"
+
+    Component.onCompleted: {
+        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
+        i18n.domain = "ubuntu-system-settings"
+    }
+
+    OSKController {
+        anchors.fill: parent
+    }
+
+    GSettings {
+        id: background
+        schema.id: "org.gnome.desktop.background"
+    }
+
+    Image {
+        id: image
+        anchors.fill: parent
+        source: background.pictureUri
+        fillMode: Image.PreserveAspectCrop
+        visible: status === Image.Ready
+    }
+
+    PageStack {
+        id: pageStack
+        Component.onCompleted: push(Qt.resolvedUrl("Pages/WelcomePage.qml"))
+    }
+}

=== added file 'wizard/test.sh'
--- wizard/test.sh	1970-01-01 00:00:00 +0000
+++ wizard/test.sh	2014-02-20 21:25:07 +0000
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+TOPDIR=$(readlink -e "$(dirname ${0})/..")
+
+LOCAL_PRIVATE_DIR=$(ls -d ${TOPDIR}/debian/tmp/usr/lib/*/ubuntu-system-settings/private)
+if [ -n ${LOCAL_PRIVATE_DIR} ]; then
+    echo "Testing against locally built version"
+    export QML2_IMPORT_PATH=${LOCAL_PRIVATE_DIR}:${QML2_IMPORT_PATH}
+    export PATH=${TOPDIR}/debian/tmp/usr/bin:${PATH}
+else
+    echo "Testing against system version"
+fi
+
+export QML2_IMPORT_PATH=${TOPDIR}/tests/mocks:${QML2_IMPORT_PATH}
+
+system-settings-wizard

=== added file 'wizard/ubuntu-system-settings-wizard.conf'
--- wizard/ubuntu-system-settings-wizard.conf	1970-01-01 00:00:00 +0000
+++ wizard/ubuntu-system-settings-wizard.conf	2014-02-20 21:25:07 +0000
@@ -0,0 +1,22 @@
+description "Welcome to Ubuntu"
+author "Michael Terry <[e-mail]>"
+
+start on starting xsession-init
+stop on desktop-start
+task
+
+env RUN_FILE=".config/ubuntu-system-settings/wizard-has-run"
+
+pre-start script
+  [ -e $HOME/$RUN_FILE ] && stop || true
+  start maliit-server # we need OSK for "About you" page
+end script
+
+exec ubuntu-touch-session system-settings-wizard
+
+post-stop script
+  if ! [ -e $HOME/$RUN_FILE ]; then
+    mkdir -p $(dirname $HOME/$RUN_FILE)
+    touch $HOME/$RUN_FILE
+  fi
+end script

=== added file 'wizard/ui.qrc'
--- wizard/ui.qrc	1970-01-01 00:00:00 +0000
+++ wizard/ui.qrc	2014-02-20 21:25:07 +0000
@@ -0,0 +1,13 @@
+<RCC>
+    <qresource prefix="/">
+        <file>qml/main.qml</file>
+        <file>qml/Components/Page.qml</file>
+        <file>qml/Pages/LocationPage.qml</file>
+        <file>qml/Pages/SetupCompletePage.qml</file>
+        <file>qml/Pages/SimCardPage.qml</file>
+        <file>qml/Pages/SpinnerPage.qml</file>
+        <file>qml/Pages/WelcomePage.qml</file>
+        <file>qml/Pages/WiFiPage.qml</file>
+        <file>qml/Pages/data/[e-mail]</file>
+    </qresource>
+</RCC>