Merge lp:~mterry/unity8/wizard-plugin into lp:unity8

[Michael Terry]

Convert the welcome wizard from a separate executable into a qml plugin (with a small C++ plugin for support).

- This changes the path for adding customized wizard pages (drops system-settings namespacing). I checked with cwayne, that support isn't being used yet. So that's safe to adjust while we're here.

- I did not change the path for the 'has the wizard run yet' marker, since that is being used in the wild. But I added a comment as to why we're using the phrase "ubuntu-system-settings" in that filename.

- I fleshed out unity8's support for changing the language on the fly, since that's now done in-process. I believe I caught all cases (anything that used a qml binding to i18n worked automatically, just had to catch the cases that were pulling from outside sources like infographics).

- If an incoming call happens during the wizard, we just bail out of it and the edge demo. I'm not sure what the ideal behavior is, but this is at least reasonable. There's nothing in the wizard that *needs* to be done.

- Making the wizard a plugin lets us drop the gap between the end of the wizard and the start of the shell. Yay!

Convert the welcome wizard from a separate executable into a qml plugin (with a small C++ plugin for support).

- This changes the path for adding customized wizard pages (drops system-settings namespacing). I checked with cwayne, that support isn't being used yet. So that's safe to adjust while we're here.

- I did not change the path for the 'has the wizard run yet' marker, since that is being used in the wild. But I added a comment as to why we're using the phrase "ubuntu-system-settings" in that filename.

- I fleshed out unity8's support for changing the language on the fly, since that's now done in-process. I believe I caught all cases (anything that used a qml binding to i18n worked automatically, just had to catch the cases that were pulling from outside sources like infographics).

- Making the wizard a plugin lets us drop the gap between the end of the wizard and the start of the shell. Yay!

- If an incoming call happens during the wizard, we just bail out of it and the edge demo. I'm not sure what the ideal behavior is, but this is at least reasonable. There's nothing in the wizard that *needs* to be done.

There are no tests in this branch. That will come in a later branch, but I'd like to avoid landing this without them. Still, please review in the meantime, so everything can land smoothly!

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 Yes:
  https://code.launchpad.net/~mterry/unity8/wizard-import/+merge/242245
  https://code.launchpad.net/~mterry/ubuntu-system-settings/drop-wizard/+merge/242244

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 Yes

 * Did you make sure that your branch does not contain spurious tags?
 Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
 I'm in that team

 * If you changed the UI, has there been a design review?
 NA

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1443
http://jenkins.qa.ubuntu.com/job/unity8-ci/4934/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/286
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16013

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4934/rebuild

review: Approve (continuous-integration)

[lp:~mterry/unity8/wizard-plugin]

1444. By Michael Terry on 2014-11-19

Only update language if it changed

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1444
http://jenkins.qa.ubuntu.com/job/unity8-ci/4935/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/100
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/100
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/287
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16018

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4935/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-plugin]

1445. By Michael Terry on 2014-11-21

Conflict with the wizard package, so both aren't installed at the same time

1446. By Michael Terry on 2014-11-21

And depend on ubuntu-system-settings itself for its plugins that the wizard uses

1447. By Michael Terry on 2014-11-21

Some more minor packaging cleanup

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1445
http://jenkins.qa.ubuntu.com/job/unity8-ci/4950/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/311
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/115
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/311
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/311/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16111

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4950/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1447
http://jenkins.qa.ubuntu.com/job/unity8-ci/4951/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/312
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/128
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/312
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/312/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16115

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4951/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-plugin]

1448. By Michael Terry on 2014-11-21

Don't undo clock date label binding, rather just force it to regenerate itself

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1448
http://jenkins.qa.ubuntu.com/job/unity8-ci/4953/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/314
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/118
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/314
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/314/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16119

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4953/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-plugin]

1449. By Michael Terry on 2014-11-24

Use a separate property rather than a special one-space value to signal when we have a valid HERE path

1450. By Michael Terry on 2014-11-24

Address review nits

[Michael Terry (mterry)]

OK, addressed all your comments (including the one on IRC about using " " as a special value for hereLicensePath).

Except for your question about the copyright for tests/mocks/QMenuModel/dbus-enums.h -- I copied that file directly from QMenuModel without modifying it, so I left the original copyright in place.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1449
http://jenkins.qa.ubuntu.com/job/unity8-ci/4965/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/335
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/306
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/335
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/335/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16186

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4965/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1450
http://jenkins.qa.ubuntu.com/job/unity8-ci/4967/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/337/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/132
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/307/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/337
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/337/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16191

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4967/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/wizard-plugin]

1451. By Michael Terry on 2014-11-28

Let hereLicensePath update from null to empty string

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1451
http://jenkins.qa.ubuntu.com/job/unity8-ci/4992/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/410
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/169/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/157
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/364
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/410
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16327

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4992/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, tested -tests branch
 * Did CI run pass? If not, please explain why.
AP
 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

[lp:~mterry/unity8/wizard-plugin]

1452. By Michael Terry on 2014-12-02

Merge from wizard-import

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-12-02 18:48:08 +0000
+++ CMakeLists.txt	2014-12-02 18:48:08 +0000
@@ -61,6 +61,11 @@
 set(SHELL_APP_DIR ${CMAKE_INSTALL_DATADIR}/unity8)
 set(SHELL_PRIVATE_LIBDIR ${CMAKE_INSTALL_LIBDIR}/unity8)
 
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugin_private_module_dir SystemSettings OUTPUT_VARIABLE USS_PRIVATE_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(USS_PRIVATE_PLUGINDIR STREQUAL "")
+    message(FATAL_ERROR "Could not determine USS private plugin installation dir.")
+endif()
+
 execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)
 if(SHELL_INSTALL_QML STREQUAL "")
     message(FATAL_ERROR "Could not determine plugin installation dir.")
@@ -117,7 +122,6 @@
 add_subdirectory(qml)
 add_subdirectory(tests)
 add_subdirectory(plugins)
-add_subdirectory(wizard)
 
 #
 # Data files

=== modified file 'build.sh'
--- build.sh	2014-10-27 08:58:17 +0000
+++ build.sh	2014-12-02 18:48:08 +0000
@@ -54,6 +54,7 @@
                          qtdeclarative5-unity-notifications-plugin \
                          qml-module-ubuntu-connectivity \
                          ubuntu-mobile-icons \
+                         ubuntu-system-settings \
                          unity-plugin-scopes \
                          xvfb \
         || exit 5

=== modified file 'debian/control'
--- debian/control	2014-12-02 18:48:08 +0000
+++ debian/control	2014-12-02 18:48:08 +0000
@@ -88,6 +88,7 @@
          qtdeclarative5-gsettings1.0,
          qtdeclarative5-qtmir-plugin (>= 0.4.4),
          qtdeclarative5-ubuntu-telephony0.1,
+         ubuntu-system-settings,
          unity-launcher-impl-4,
          unity8-common (= ${source:Version}),
          unity8-private (= ${binary:Version}),
@@ -102,6 +103,7 @@
         unity8-greeter (<< 7.89),
 Replaces: ubuntu-touch-session (<< 0.82~),
           unity8-greeter (<< 7.89),
+Conflicts: ubuntu-system-settings-wizard,
 Description: Unity 8 shell
  The Unity 8 shell is the primary user interface for Ubuntu devices.
 
@@ -192,15 +194,3 @@
 Depends: ${misc:Depends},
 Description: Documentation for Unity8
  The Unity 8 shell is the primary user interface for Ubuntu devices. (documentation)
-
-Package: ubuntu-system-settings-wizard
-Architecture: any
-Depends: unity8 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Recommends: qtdeclarative5-qtmir-plugin (>= 0.4),
-Breaks: ubuntu-system-settings (<< 0.4),
-Replaces: ubuntu-system-settings (<< 0.4),
-Description: Welcome Wizard for Ubuntu Touch
- This package contains the Welcome Wizard used on the Ubuntu Touch images,
- it's designed for phones, tablets and convergent devices.

=== modified file 'debian/rules'
--- debian/rules	2014-12-02 18:48:08 +0000
+++ debian/rules	2014-07-23 15:30:38 +0000
@@ -40,7 +40,7 @@
 
 # use private lib directories
 override_dh_makeshlibs:
-	dh_makeshlibs -Nunity8-private -Nunity8-fake-env -Nubuntu-system-settings-wizard
+	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
 
 # libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
 override_dh_shlibdeps:

=== removed file 'debian/ubuntu-system-settings-wizard.install'
--- debian/ubuntu-system-settings-wizard.install	2014-12-02 18:48:08 +0000
+++ debian/ubuntu-system-settings-wizard.install	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-usr/bin/system-settings-wizard
-usr/share/ubuntu/settings/wizard
-usr/share/upstart/sessions/ubuntu-system-settings-wizard*.conf
-usr/lib/*/ubuntu-system-settings/private/Ubuntu/SystemSettings/Wizard
-var/lib/polkit-1/localauthority/10-vendor.d/50-com.ubuntu.system-settings.wizard.pkla

=== removed file 'debian/ubuntu-system-settings-wizard.lintian-overrides'
--- debian/ubuntu-system-settings-wizard.lintian-overrides	2014-12-02 18:48:08 +0000
+++ debian/ubuntu-system-settings-wizard.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-ubuntu-system-settings-wizard: binary-without-manpage usr/bin/system-settings-wizard

=== modified file 'debian/unity8-common.install'
--- debian/unity8-common.install	2014-08-27 07:57:54 +0000
+++ debian/unity8-common.install	2014-12-02 18:48:08 +0000
@@ -3,3 +3,4 @@
 usr/share/unity8/Dash
 usr/share/unity8/Notifications
 usr/share/unity8/graphics
+var/lib/polkit-1/localauthority/10-vendor.d

=== modified file 'debian/unity8-private.install'
--- debian/unity8-private.install	2014-11-05 08:30:16 +0000
+++ debian/unity8-private.install	2014-12-02 18:48:08 +0000
@@ -9,6 +9,7 @@
 usr/lib/*/unity8/qml/Ubuntu
 usr/lib/*/unity8/qml/Unity
 usr/lib/*/unity8/qml/Utils
+usr/lib/*/unity8/qml/Wizard
 usr/lib/*/unity8/libUbuntuGestures*
 usr/share/accountsservice/interfaces
 usr/share/dbus-1/interfaces

=== modified file 'debian/unity8.install'
--- debian/unity8.install	2014-10-28 14:01:09 +0000
+++ debian/unity8.install	2014-12-02 18:48:08 +0000
@@ -10,4 +10,5 @@
 usr/share/unity8/Panel
 usr/share/unity8/Shell.qml
 usr/share/unity8/Stages
+usr/share/unity8/Wizard
 usr/share/url-dispatcher/urls/unity8-dash.url-dispatcher

=== modified file 'include/paths.h.in'
--- include/paths.h.in	2014-08-26 08:14:44 +0000
+++ include/paths.h.in	2014-12-02 18:48:08 +0000
@@ -71,9 +71,11 @@
     QStringList paths;
     if (isRunningInstalled()) {
         paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@");
+        paths << QString("@USS_PRIVATE_PLUGINDIR@");
         paths << QString("@SHELL_PLUGINDIR@");
         paths << QString("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");
     } else {
+        paths << QString("@USS_PRIVATE_PLUGINDIR@");
         paths << QString("@SHELL_PLUGINDIR@");
         paths << QString("@CMAKE_BINARY_DIR@/tests/mocks");
     }

=== modified file 'plugins/AccountsService/AccountsService.cpp'
--- plugins/AccountsService/AccountsService.cpp	2014-08-19 15:25:08 +0000
+++ plugins/AccountsService/AccountsService.cpp	2014-12-02 18:48:08 +0000
@@ -19,23 +19,28 @@
 #include "AccountsService.h"
 #include "AccountsServiceDBusAdaptor.h"
 
+#include <QFile>
 #include <QStringList>
 
 AccountsService::AccountsService(QObject* parent)
   : QObject(parent),
     m_service(new AccountsServiceDBusAdaptor(this)),
-    m_user(qgetenv("USER")),
+    m_user(""),
     m_demoEdges(false),
     m_enableLauncherWhileLocked(false),
     m_enableIndicatorsWhileLocked(false),
     m_statsWelcomeScreen(false),
     m_passwordDisplayHint(Keyboard),
-    m_failedLogins(0)
+    m_failedLogins(0),
+    m_hereEnabled(false),
+    m_hereLicensePath() // null means not set yet
 {
     connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
             this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
     connect(m_service, SIGNAL(maybeChanged(const QString &)),
             this, SLOT(maybeChanged(const QString &)));
+
+    setUser(qgetenv("USER"));
 }
 
 QString AccountsService::user() const
@@ -45,6 +50,9 @@
 
 void AccountsService::setUser(const QString &user)
 {
+    if (user.isEmpty() || m_user == user)
+        return;
+
     m_user = user;
     Q_EMIT userChanged();
 
@@ -55,6 +63,8 @@
     updateStatsWelcomeScreen();
     updatePasswordDisplayHint();
     updateFailedLogins();
+    updateHereEnabled();
+    updateHereLicensePath();
 }
 
 bool AccountsService::demoEdges() const
@@ -93,6 +103,26 @@
     return m_passwordDisplayHint;
 }
 
+bool AccountsService::hereEnabled() const
+{
+    return m_hereEnabled;
+}
+
+void AccountsService::setHereEnabled(bool enabled)
+{
+    m_service->setUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted", enabled);
+}
+
+QString AccountsService::hereLicensePath() const
+{
+    return m_hereLicensePath;
+}
+
+bool AccountsService::hereLicensePathValid() const
+{
+    return !m_hereLicensePath.isNull();
+}
+
 void AccountsService::updateDemoEdges()
 {
     auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
@@ -156,6 +186,28 @@
     }
 }
 
+void AccountsService::updateHereEnabled()
+{
+    bool hereEnabled = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseAccepted").toBool();
+    if (m_hereEnabled != hereEnabled) {
+        m_hereEnabled = hereEnabled;
+        Q_EMIT hereEnabledChanged();
+    }
+}
+
+void AccountsService::updateHereLicensePath()
+{
+    QString hereLicensePath = m_service->getUserProperty(m_user, "com.ubuntu.location.providers.here.AccountsService", "LicenseBasePath").toString();
+
+    if (hereLicensePath.isEmpty() || !QFile::exists(hereLicensePath))
+        hereLicensePath = "";
+
+    if (m_hereLicensePath.isNull() || m_hereLicensePath != hereLicensePath) {
+        m_hereLicensePath = hereLicensePath;
+        Q_EMIT hereLicensePathChanged();
+    }
+}
+
 uint AccountsService::failedLogins() const
 {
     return m_failedLogins;
@@ -195,6 +247,13 @@
         if (changed.contains("EnableIndicatorsWhileLocked")) {
             updateEnableIndicatorsWhileLocked();
         }
+    } else if (interface == "com.ubuntu.location.providers.here.AccountsService") {
+        if (changed.contains("LicenseAccepted")) {
+            updateHereEnabled();
+        }
+        if (changed.contains("LicenseBasePath")) {
+            updateHereLicensePath();
+        }
     }
 }
 

=== modified file 'plugins/AccountsService/AccountsService.h'
--- plugins/AccountsService/AccountsService.h	2014-08-19 15:03:48 +0000
+++ plugins/AccountsService/AccountsService.h	2014-12-02 18:48:08 +0000
@@ -55,6 +55,16 @@
                 READ failedLogins
                 WRITE setFailedLogins
                 NOTIFY failedLoginsChanged)
+    Q_PROPERTY(bool hereEnabled
+               READ hereEnabled
+               WRITE setHereEnabled
+               NOTIFY hereEnabledChanged)
+    Q_PROPERTY(QString hereLicensePath
+               READ hereLicensePath
+               NOTIFY hereLicensePathChanged)
+    Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
+               READ hereLicensePathValid
+               NOTIFY hereLicensePathChanged)
 
 public:
     enum PasswordDisplayHint {
@@ -75,6 +85,10 @@
     PasswordDisplayHint passwordDisplayHint() const;
     uint failedLogins() const;
     void setFailedLogins(uint failedLogins);
+    bool hereEnabled() const;
+    void setHereEnabled(bool enabled);
+    QString hereLicensePath() const;
+    bool hereLicensePathValid() const;
 
 Q_SIGNALS:
     void userChanged();
@@ -85,6 +99,8 @@
     void statsWelcomeScreenChanged();
     void passwordDisplayHintChanged();
     void failedLoginsChanged();
+    void hereEnabledChanged();
+    void hereLicensePathChanged();
 
 private Q_SLOTS:
     void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
@@ -98,6 +114,8 @@
     void updateStatsWelcomeScreen();
     void updatePasswordDisplayHint();
     void updateFailedLogins();
+    void updateHereEnabled();
+    void updateHereLicensePath();
 
     AccountsServiceDBusAdaptor *m_service;
     QString m_user;
@@ -108,6 +126,8 @@
     bool m_statsWelcomeScreen;
     PasswordDisplayHint m_passwordDisplayHint;
     uint m_failedLogins;
+    bool m_hereEnabled;
+    QString m_hereLicensePath;
 };
 
 #endif

=== modified file 'plugins/CMakeLists.txt'
--- plugins/CMakeLists.txt	2014-11-05 08:30:16 +0000
+++ plugins/CMakeLists.txt	2014-12-02 18:48:08 +0000
@@ -21,3 +21,4 @@
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(Utils)
+add_subdirectory(Wizard)

=== modified file 'plugins/Unity/Launcher/desktopfilehandler.cpp'
--- plugins/Unity/Launcher/desktopfilehandler.cpp	2014-11-04 12:53:48 +0000
+++ plugins/Unity/Launcher/desktopfilehandler.cpp	2014-12-02 18:48:08 +0000
@@ -110,7 +110,7 @@
     settings.beginGroup("Desktop Entry");
 
     // First try to find Name[xx_YY] and Name[xx] in .desktop file
-    QString locale = QLocale::system().name();
+    QString locale = QLocale().name();
     QString shortLocale = locale.split('_').first();
 
     if (locale != shortLocale && settings.contains(QString("Name[%1]").arg(locale))) {

=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
--- plugins/Unity/Launcher/launcheritem.cpp	2014-09-10 11:31:51 +0000
+++ plugins/Unity/Launcher/launcheritem.cpp	2014-12-02 18:48:08 +0000
@@ -60,6 +60,10 @@
 {
     if (m_name != name) {
         m_name = name;
+        QuickListEntry entry;
+        entry.setActionId("launch_item");
+        entry.setText(m_name);
+        m_quickList->updateAction(entry);
         Q_EMIT nameChanged(name);
     }
 }
@@ -86,12 +90,15 @@
 {
     if (m_pinned != pinned) {
         m_pinned = pinned;
-        QuickListEntry entry;
-        entry.setActionId("pin_item");
-        entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
-        m_quickList->updateAction(entry);
         Q_EMIT pinnedChanged(pinned);
     }
+
+    // Even if pinned status didn't change, we want to update text in case
+    // the locale has changed since we last set pinned status.
+    QuickListEntry entry;
+    entry.setActionId("pin_item");
+    entry.setText(pinned ? gettext("Unpin shortcut") : gettext("Pin shortcut"));
+    m_quickList->updateAction(entry);
 }
 
 bool LauncherItem::running() const

=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2014-10-21 20:24:10 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2014-12-02 18:48:08 +0000
@@ -370,6 +370,7 @@
             int idx = m_list.indexOf(item);
             item->setName(desktopFile.displayName());
             item->setIcon(desktopFile.icon());
+            item->setPinned(item->pinned()); // update pinned text if needed
             Q_EMIT dataChanged(index(idx), index(idx), QVector<int>() << RoleName << RoleIcon);
         }
     }

=== modified file 'plugins/Unity/Launcher/launchermodel.h'
--- plugins/Unity/Launcher/launchermodel.h	2014-10-15 11:59:20 +0000
+++ plugins/Unity/Launcher/launchermodel.h	2014-12-02 18:48:08 +0000
@@ -58,6 +58,7 @@
 
 public Q_SLOTS:
     void requestRemove(const QString &appId);
+    Q_INVOKABLE void refresh();
 
 private:
     void storeAppList();
@@ -68,7 +69,6 @@
     void countChanged(const QString &appId, int count);
     void countVisibleChanged(const QString &appId, int count);
     void progressChanged(const QString &appId, int progress);
-    void refresh();
 
     void applicationAdded(const QModelIndex &parent, int row);
     void applicationRemoved(const QModelIndex &parent, int row);

=== renamed directory 'wizard' => 'plugins/Wizard'
=== renamed file 'wizard/50-com.ubuntu.system-settings.wizard.pkla' => 'plugins/Wizard/50-com.canonical.unity.wizard.pkla'
=== modified file 'plugins/Wizard/CMakeLists.txt'
--- wizard/CMakeLists.txt	2014-12-02 18:48:08 +0000
+++ plugins/Wizard/CMakeLists.txt	2014-12-02 18:48:08 +0000
@@ -1,65 +1,11 @@
-# This file uses a lot of namespacing like "ubuntu-system-settings" instead of
-# "unity8".  This is because we have imported it from ubuntu-system-settings
-# and haven't fully integrated it yet.
-
-include_directories(
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
-)
-
-set(PLUGIN_MANIFEST_DIR_BASE share/ubuntu/settings/system)
-set(PLUGIN_MODULE_DIR_BASE ubuntu-system-settings)
-set(PLUGIN_PRIVATE_MODULE_DIR_BASE "${PLUGIN_MODULE_DIR_BASE}/private")
-set(PLUGIN_QML_DIR_BASE share/ubuntu/settings/system/qml-plugins)
-
-set(PLUGIN_MANIFEST_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_MANIFEST_DIR_BASE}")
-set(PLUGIN_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${PLUGIN_MODULE_DIR_BASE}")
-set(PLUGIN_PRIVATE_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${PLUGIN_PRIVATE_MODULE_DIR_BASE}")
-set(PLUGIN_QML_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_QML_DIR_BASE}")
-
-add_definitions(-DI18N_DOMAIN="unity8")
-add_definitions(-DPLUGIN_MANIFEST_DIR="${PLUGIN_MANIFEST_DIR}")
-add_definitions(-DPLUGIN_MODULE_DIR="${PLUGIN_MODULE_DIR}")
-add_definitions(-DPLUGIN_PRIVATE_MODULE_DIR="${PLUGIN_PRIVATE_MODULE_DIR}")
-add_definitions(-DPLUGIN_QML_DIR="${PLUGIN_QML_DIR}")
-
-execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir unity-shell-api OUTPUT_VARIABLE SHELL_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
-if(SHELL_PLUGINDIR STREQUAL "")
-    message(FATAL_ERROR "Could not determine plugin import dir.")
-endif()
-
-add_definitions(-DSHELL_PLUGINDIR="${SHELL_PLUGINDIR}")
-
-set(WIZARD_ROOT "${CMAKE_INSTALL_PREFIX}/share")
-add_definitions(-DWIZARD_ROOT="${WIZARD_ROOT}")
-
-file(GLOB_RECURSE QML_FILES
-    qml/*
-)
-
-set(WIZARD_SOURCES
-    main.cpp
+add_library(Wizard-qml MODULE
+    plugin.cpp
     PageList.cpp
-)
-
-add_executable(system-settings-wizard
-    ${WIZARD_SOURCES}
-    ${system-settings-wizard-resources}
-    ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree
-)
-
-qt5_use_modules(system-settings-wizard Core Gui Quick Qml)
-
-add_subdirectory(Unity)
-add_subdirectory(Utils)
-
-install(TARGETS system-settings-wizard RUNTIME DESTINATION bin)
-install(FILES ubuntu-system-settings-wizard.conf
-              ubuntu-system-settings-wizard-cleanup.conf
-              ubuntu-system-settings-wizard-set-lang.conf
-        DESTINATION share/upstart/sessions)
+    System.cpp
+)
+
+qt5_use_modules(Wizard-qml DBus Qml)
+add_unity8_plugin(Wizard 0.1 Wizard TARGETS Wizard-qml)
 
 set(POLKIT_LIB_DIR "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/polkit-1")
-install(FILES 50-com.ubuntu.system-settings.wizard.pkla DESTINATION ${POLKIT_LIB_DIR}/localauthority/10-vendor.d)
-
-install(DIRECTORY qml DESTINATION ${WIZARD_ROOT}/ubuntu/settings/wizard)
+install(FILES 50-com.canonical.unity.wizard.pkla DESTINATION ${POLKIT_LIB_DIR}/localauthority/10-vendor.d)

=== modified file 'plugins/Wizard/PageList.cpp'
--- wizard/PageList.cpp	2014-12-02 18:48:08 +0000
+++ plugins/Wizard/PageList.cpp	2014-12-02 18:48:08 +0000
@@ -1,6 +1,4 @@
 /*
- * This file is part of system-settings
- *
  * Copyright (C) 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -19,7 +17,7 @@
 /**
  * This class lets the list of wizard pages be dynamic.
  * - To add new ones, drop them into
- *   $XDG_DATA_DIRS/ubuntu/settings/wizard/qml/Pages with a numbered prefix,
+ *   $XDG_DATA_DIRS/Wizard/Pages with a numbered prefix,
  *   like "21-custom-page.qml".  The number determines the order in the page
  *   sequence that your page will appear.
  * - To disable an existing page, add a file like "21-custom-page.qml.disabled"
@@ -32,10 +30,11 @@
  */
 
 #include "PageList.h"
+#include <paths.h>
 #include <QDir>
+#include <QSet>
 #include <QStandardPaths>
 
-#include <QDebug>
 PageList::PageList(QObject *parent)
     : QObject(parent),
       m_index(-1),
@@ -44,14 +43,16 @@
     QString qmlSuffix = ".qml";
     QString disabledSuffix = ".disabled";
     QSet<QString> disabledPages;
-    QStringList dataDirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+    QStringList dataDirs;
 
-    QString rootDir = qgetenv("UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT"); // for testing
-    if (!rootDir.isEmpty())
-        dataDirs = QStringList() << rootDir;
+    if (!isRunningInstalled() && getenv("UNITY_TEST_ENV") == nullptr) {
+        dataDirs = QStringList() << qmlDirectory();
+    } else {
+        dataDirs = shellDataDirs();
+    }
 
     Q_FOREACH(const QString &dataDir, dataDirs) {
-        QDir dir(dataDir + "/ubuntu/settings/wizard/qml/Pages");
+        QDir dir(dataDir + "/Wizard/Pages");
         QStringList entries = dir.entryList(QStringList("[0-9]*"), QDir::Files | QDir::Readable);
         Q_FOREACH(const QString &entry, entries) {
             if (!m_pages.contains(entry) && entry.endsWith(qmlSuffix))

=== modified file 'plugins/Wizard/PageList.h'
--- wizard/PageList.h	2014-12-02 18:48:08 +0000
+++ plugins/Wizard/PageList.h	2014-12-02 18:48:08 +0000
@@ -1,6 +1,4 @@
 /*
- * This file is part of system-settings
- *
  * Copyright (C) 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -16,8 +14,8 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PAGELIST_H
-#define PAGEList_H
+#ifndef WIZARD_PAGELIST_H
+#define WIZARD_PAGELIST_H
 
 #include <QMap>
 #include <QObject>
@@ -52,4 +50,4 @@
     QMap<QString, QString> m_pages;
 };
 
-#endif // PAGELIST_H
+#endif // WIZARD_PAGELIST_H

=== renamed file 'wizard/Utils/system.cpp' => 'plugins/Wizard/System.cpp'
--- wizard/Utils/system.cpp	2014-12-02 18:48:08 +0000
+++ plugins/Wizard/System.cpp	2014-12-02 18:48:08 +0000
@@ -1,6 +1,4 @@
 /*
- * This file is part of system-settings
- *
  * Copyright (C) 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -16,103 +14,86 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "system.h"
+#include "System.h"
+
 #include <QDBusInterface>
-#include <QDBusPendingCall>
-#include <QDBusPendingReply>
+#include <QDBusMetaType>
+#include <QDir>
 #include <QFile>
+#include <QLocale>
+#include <QMap>
 #include <QProcess>
-#include <unistd.h>
-
-#define HERE_IFACE   "com.ubuntu.location.providers.here.AccountsService"
-#define ENABLED_PROP "LicenseAccepted"
-#define PATH_PROP    "LicenseBasePath"
 
 System::System()
     : QObject(),
-      m_accounts(nullptr),
-      m_hereEnabled(false),
-      m_hereLicensePath(" ") // use a single space to indicate it is unasssigned
-{
-    m_accounts = new QDBusInterface("org.freedesktop.Accounts",
-                                    "/org/freedesktop/Accounts/User" + QString::number(geteuid()),
-                                    "org.freedesktop.DBus.Properties",
-                                    QDBusConnection::systemBus(),
-                                    this);
-
-    m_accounts->connection().connect(m_accounts->service(),
-                                     m_accounts->path(),
-                                     m_accounts->interface(),
-                                     "PropertiesChanged",
-                                     this,
-                                     SLOT(propertiesChanged(QString, QVariantMap, QStringList)));
-
-    QDBusPendingCall call = m_accounts->asyncCall("Get", HERE_IFACE, PATH_PROP);
-    QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
-    QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher *)),
-                     this, SLOT(getHereLicensePathFinished(QDBusPendingCallWatcher *)));
-}
-
-void System::propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid)
-{
-    if (interface == HERE_IFACE) {
-        if (changed.contains(ENABLED_PROP)) {
-            m_hereEnabled = changed[ENABLED_PROP].toBool();
-            Q_EMIT hereEnabledChanged();
-        } else if (invalid.contains(ENABLED_PROP)) {
-            QDBusPendingCall call = m_accounts->asyncCall("Get", HERE_IFACE, ENABLED_PROP);
-            QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(call, this);
-            QObject::connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher *)),
-                             this, SLOT(getHereEnabledFinished(QDBusPendingCallWatcher *)));
-        }
-    }
-}
-
-void System::getHereEnabledFinished(QDBusPendingCallWatcher *watcher)
-{
-    QDBusPendingReply<QVariant> reply = *watcher;
-    if (!reply.isError()) {
-        QVariant value = reply.argumentAt<0>();
-        m_hereEnabled = value.toBool();
-        Q_EMIT hereEnabledChanged();
-    }
-    watcher->deleteLater();
-}
-
-void System::getHereLicensePathFinished(QDBusPendingCallWatcher *watcher)
-{
-    QDBusPendingReply<QVariant> reply = *watcher;
-
-    m_hereLicensePath = "";
-
-    if (!reply.isError()) {
-        QVariant value = reply.argumentAt<0>();
-        if (QFile::exists(value.toString())) {
-            m_hereLicensePath = value.toString();
-        }
-    }
-
-    Q_EMIT hereLicensePathChanged();
-
-    watcher->deleteLater();
-}
-
-bool System::hereEnabled() const
-{
-    return m_hereEnabled;
-}
-
-void System::setHereEnabled(bool enabled)
-{
-    m_accounts->asyncCall("Set", HERE_IFACE, ENABLED_PROP, QVariant::fromValue(QDBusVariant(enabled)));
-}
-
-QString System::hereLicensePath() const
-{
-    return m_hereLicensePath;
-}
-
-void System::updateSessionLanguage()
-{
-    QProcess::startDetached("sh -c \"initctl start ubuntu-system-settings-wizard-set-lang; initctl emit --no-wait indicator-services-start; initctl start --no-wait maliit-server\"");
+      m_fsWatcher()
+{
+    // Register the argument needed for UpdateActivationEnvironment below
+    qDBusRegisterMetaType<QMap<QString,QString>>();
+
+    m_fsWatcher.addPath(wizardEnabledPath());
+    connect(&m_fsWatcher, SIGNAL(fileChanged(const QString &)),
+            this, SIGNAL(wizardEnabledChanged()));
+}
+
+QString System::wizardEnabledPath()
+{
+    // Uses ubuntu-system-settings namespace for historic compatibility reasons
+    return QDir::home().filePath(".config/ubuntu-system-settings/wizard-has-run");
+}
+
+bool System::wizardEnabled() const
+{
+    return !QFile::exists(wizardEnabledPath());
+}
+
+void System::setWizardEnabled(bool enabled)
+{
+    if (wizardEnabled() == enabled)
+        return;
+
+    if (enabled) {
+        QFile::remove(wizardEnabledPath());
+    } else {
+        QDir(wizardEnabledPath()).mkpath("..");
+        QFile(wizardEnabledPath()).open(QIODevice::WriteOnly);
+        m_fsWatcher.addPath(wizardEnabledPath());
+        wizardEnabledChanged();
+    }
+}
+
+void System::setSessionVariable(const QString &variable, const QString &value)
+{
+    // We need to update both upstart's and DBus's environment
+    QProcess::execute(QString("initctl set-env --global %1=%2").arg(variable, value));
+
+    QDBusInterface iface("org.freedesktop.DBus",
+                         "/org/freedesktop/DBus",
+                         "org.freedesktop.DBus",
+                         QDBusConnection::sessionBus());
+
+    QMap<QString,QString> valueMap;
+    valueMap.insert(variable, value);
+    iface.call("UpdateActivationEnvironment", QVariant::fromValue(valueMap));
+}
+
+void System::updateSessionLanguage(const QString &locale)
+{
+    QString language = locale.split(".")[0];
+
+    setSessionVariable("LANGUAGE", language);
+    setSessionVariable("LANG", locale);
+    setSessionVariable("LC_ALL", locale);
+
+    // QLocale caches the default locale on startup, and Qt uses that cached
+    // copy when formatting dates.  So manually update it here.
+    QLocale::setDefault(QLocale(locale));
+
+    // Restart bits of the session to pick up new language.
+    QProcess::startDetached("sh -c \"initctl emit indicator-services-end; \
+                                     initctl stop scope-registry; \
+                                     initctl stop smart-scopes-proxy; \
+                                     initctl emit --no-wait indicator-services-start; \
+                                     initctl restart --no-wait maliit-server; \
+                                     initctl restart --no-wait unity8-dash\"");
 }

=== renamed file 'wizard/Utils/system.h' => 'plugins/Wizard/System.h'
--- wizard/Utils/system.h	2014-12-02 18:48:08 +0000
+++ plugins/Wizard/System.h	2014-12-02 18:48:08 +0000
@@ -1,6 +1,4 @@
 /*
- * This file is part of system-settings
- *
  * Copyright (C) 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -16,42 +14,37 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef WIZARD_SYSTEM_H
+#define WIZARD_SYSTEM_H
+
+#include <QFileSystemWatcher>
 #include <QObject>
 #include <QString>
 
-class QDBusInterface;
-class QDBusPendingCallWatcher;
-
 class System : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(bool hereEnabled READ hereEnabled WRITE setHereEnabled NOTIFY hereEnabledChanged)
-    Q_PROPERTY(QString hereLicensePath READ hereLicensePath NOTIFY hereLicensePathChanged)
+    Q_PROPERTY(bool wizardEnabled READ wizardEnabled WRITE setWizardEnabled NOTIFY wizardEnabledChanged)
 
 public:
     System();
 
-    bool hereEnabled() const;
-    void setHereEnabled(bool enabled);
-
-    QString hereLicensePath() const;
+    bool wizardEnabled() const;
+    void setWizardEnabled(bool enabled);
 
 public Q_SLOTS:
-    void updateSessionLanguage();
+    void updateSessionLanguage(const QString &locale);
 
 Q_SIGNALS:
-    void hereEnabledChanged();
-    void hereLicensePathChanged();
-
-private Q_SLOTS:
-    void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
-    void getHereEnabledFinished(QDBusPendingCallWatcher *watcher);
-    void getHereLicensePathFinished(QDBusPendingCallWatcher *watcher);
+    void wizardEnabledChanged();
 
 private:
     Q_DISABLE_COPY(System)
 
-    QDBusInterface *m_accounts;
-    bool m_hereEnabled;
-    QString m_hereLicensePath;
+    static QString wizardEnabledPath();
+    static void setSessionVariable(const QString &variable, const QString &value);
+
+    QFileSystemWatcher m_fsWatcher;
 };
+
+#endif

=== added file 'plugins/Wizard/Wizard.qmltypes'
--- plugins/Wizard/Wizard.qmltypes	1970-01-01 00:00:00 +0000
+++ plugins/Wizard/Wizard.qmltypes	2014-12-02 18:48:08 +0000
@@ -0,0 +1,36 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable Wizard 0.1 plugins'
+
+Module {
+    Component {
+        name: "PageList"
+        prototype: "QObject"
+        exports: ["Wizard/PageList 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "index"; type: "int"; isReadonly: true }
+        Property { name: "numPages"; type: "int"; isReadonly: true }
+        Method { name: "prev"; type: "string" }
+        Method { name: "next"; type: "string" }
+    }
+    Component {
+        name: "System"
+        prototype: "QObject"
+        exports: ["Wizard/System 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "wizardEnabled"; type: "bool" }
+        Method {
+            name: "updateSessionLanguage"
+            Parameter { name: "locale"; type: "string" }
+        }
+    }
+}
+

=== added file 'plugins/Wizard/plugin.cpp'
--- plugins/Wizard/plugin.cpp	1970-01-01 00:00:00 +0000
+++ plugins/Wizard/plugin.cpp	2014-12-02 18:48:08 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014 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 "plugin.h"
+#include "PageList.h"
+#include "System.h"
+
+#include <QtQml/qqml.h>
+
+static QObject *pagelist_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new PageList();
+}
+
+static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new System();
+}
+
+void WizardPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Wizard"));
+    qmlRegisterSingletonType<PageList>(uri, 0, 1, "PageList", pagelist_provider);
+    qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);
+}

=== added file 'plugins/Wizard/plugin.h'
--- plugins/Wizard/plugin.h	1970-01-01 00:00:00 +0000
+++ plugins/Wizard/plugin.h	2014-12-02 18:48:08 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2014 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/>.
+ */
+
+#ifndef WIZARD_PLUGIN_H
+#define WIZARD_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class WizardPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif

=== added file 'plugins/Wizard/qmldir'
--- plugins/Wizard/qmldir	1970-01-01 00:00:00 +0000
+++ plugins/Wizard/qmldir	2014-12-02 18:48:08 +0000
@@ -0,0 +1,3 @@
+module Wizard
+plugin Wizard-qml
+typeinfo Wizard.qmltypes

=== modified file 'qml/CMakeLists.txt'
--- qml/CMakeLists.txt	2014-10-28 11:06:31 +0000
+++ qml/CMakeLists.txt	2014-12-02 18:48:08 +0000
@@ -13,6 +13,7 @@
     Launcher
     Stages
     Notifications
+    Wizard
     )
 
 install(DIRECTORY ${QML_DIRS}

=== modified file 'qml/Components/Dialogs.qml'
--- qml/Components/Dialogs.qml	2014-10-31 09:38:22 +0000
+++ qml/Components/Dialogs.qml	2014-12-02 18:48:08 +0000
@@ -24,10 +24,6 @@
 Item {
     id: root
 
-    // Explicitly use the right domain for this widget because it might be used
-    // in other applications like the welcome wizard.
-    readonly property string domain: "unity8"
-
     function onPowerKeyPressed() {
         // FIXME: event.isAutoRepeat is always false on Nexus 4.
         // So we use powerKeyTimer.running to avoid the PowerOff key repeat
@@ -71,17 +67,17 @@
         id: logoutDialog
         Dialog {
             id: dialogueLogout
-            title: i18n.dtr(root.domain, "Log out")
-            text: i18n.dtr(root.domain, "Are you sure you want to log out?")
+            title: i18n.tr("Log out")
+            text: i18n.tr("Are you sure you want to log out?")
             Button {
-                text: i18n.dtr(root.domain, "No")
+                text: i18n.tr("No")
                 onClicked: {
                     PopupUtils.close(dialogueLogout);
                     d.dialogShown = false;
                 }
             }
             Button {
-                text: i18n.dtr(root.domain, "Yes")
+                text: i18n.tr("Yes")
                 onClicked: {
                     DBusUnitySessionService.Logout();
                     PopupUtils.close(dialogueLogout);
@@ -95,17 +91,17 @@
         id: shutdownDialog
         Dialog {
             id: dialogueShutdown
-            title: i18n.dtr(root.domain, "Shut down")
-            text: i18n.dtr(root.domain, "Are you sure you want to shut down?")
+            title: i18n.tr("Shut down")
+            text: i18n.tr("Are you sure you want to shut down?")
             Button {
-                text: i18n.dtr(root.domain, "No")
+                text: i18n.tr("No")
                 onClicked: {
                     PopupUtils.close(dialogueShutdown);
                     d.dialogShown = false;
                 }
             }
             Button {
-                text: i18n.dtr(root.domain, "Yes")
+                text: i18n.tr("Yes")
                 onClicked: {
                     dBusUnitySessionServiceConnection.closeAllApps();
                     DBusUnitySessionService.Shutdown();
@@ -120,17 +116,17 @@
         id: rebootDialog
         Dialog {
             id: dialogueReboot
-            title: i18n.dtr(root.domain, "Reboot")
-            text: i18n.dtr(root.domain, "Are you sure you want to reboot?")
+            title: i18n.tr("Reboot")
+            text: i18n.tr("Are you sure you want to reboot?")
             Button {
-                text: i18n.dtr(root.domain, "No")
+                text: i18n.tr("No")
                 onClicked: {
                     PopupUtils.close(dialogueReboot)
                     d.dialogShown = false;
                 }
             }
             Button {
-                text: i18n.dtr(root.domain, "Yes")
+                text: i18n.tr("Yes")
                 onClicked: {
                     dBusUnitySessionServiceConnection.closeAllApps();
                     DBusUnitySessionService.Reboot();
@@ -145,10 +141,10 @@
         id: powerDialog
         Dialog {
             id: dialoguePower
-            title: i18n.dtr(root.domain, "Power")
-            text: i18n.dtr(root.domain, "Are you sure you would like\nto power off?")
+            title: i18n.tr("Power")
+            text: i18n.tr("Are you sure you would like\nto power off?")
             Button {
-                text: i18n.dtr(root.domain, "Power off")
+                text: i18n.tr("Power off")
                 onClicked: {
                     dBusUnitySessionServiceConnection.closeAllApps();
                     PopupUtils.close(dialoguePower);
@@ -158,7 +154,7 @@
                 color: UbuntuColors.red
             }
             Button {
-                text: i18n.dtr(root.domain, "Restart")
+                text: i18n.tr("Restart")
                 onClicked: {
                     dBusUnitySessionServiceConnection.closeAllApps();
                     DBusUnitySessionService.Reboot();
@@ -168,7 +164,7 @@
                 color: UbuntuColors.green
             }
             Button {
-                text: i18n.dtr(root.domain, "Cancel")
+                text: i18n.tr("Cancel")
                 onClicked: {
                     PopupUtils.close(dialoguePower);
                     d.dialogShown = false;

=== modified file 'qml/Components/EdgeDemo.qml'
--- qml/Components/EdgeDemo.qml	2014-10-17 09:29:42 +0000
+++ qml/Components/EdgeDemo.qml	2014-12-02 18:48:08 +0000
@@ -17,6 +17,7 @@
 import AccountsService 0.1
 import LightDM 0.1 as LightDM
 import QtQuick 2.0
+import Ubuntu.Components 1.1
 
 Item {
     id: demo
@@ -61,11 +62,16 @@
         stagesEnabled = true
         panelEnabled = true
         panelContentEnabled = true
-        if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy()
-        if (d.topEdgeDemo)    d.topEdgeDemo.destroy()
-        if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy()
-        if (d.leftEdgeDemo)   d.leftEdgeDemo.destroy()
-        if (d.finalEdgeDemo)  d.finalEdgeDemo.destroy()
+
+        // Use a tiny delay for these destroy() calls because if a lot is
+        // happening at once (like creating and being destroyed in same event
+        // loop, as might happen when answering a call while demo is open),
+        // the destroy() call will be ignored.
+        if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy(1);
+        if (d.topEdgeDemo)    d.topEdgeDemo.destroy(1);
+        if (d.bottomEdgeDemo) d.bottomEdgeDemo.destroy(1);
+        if (d.leftEdgeDemo)   d.leftEdgeDemo.destroy(1);
+        if (d.finalEdgeDemo)  d.finalEdgeDemo.destroy(1);
     }
 
     function startDemo() {
@@ -97,12 +103,19 @@
         property bool showEdgeDemo: AccountsService.demoEdges
         property bool showEdgeDemoInGreeter: AccountsService.demoEdges // TODO: AccountsService.demoEdges as lightdm user
 
-        onShowEdgeDemoChanged: {
+        function restartDemo() {
             stopDemo()
             if (d.showEdgeDemo) {
                 startDemo()
             }
         }
+
+        onShowEdgeDemoChanged: restartDemo()
+    }
+
+    Connections {
+        target: i18n
+        onLanguageChanged: d.restartDemo()
     }
 
     function startRightEdgeDemo() {

=== modified file 'qml/Greeter/Clock.qml'
--- qml/Greeter/Clock.qml	2014-10-07 10:28:59 +0000
+++ qml/Greeter/Clock.qml	2014-12-02 18:48:08 +0000
@@ -34,6 +34,16 @@
         }
     }
 
+    Connections {
+        target: i18n
+        onLanguageChanged: {
+            if (visible) {
+                timeLabel.text = Qt.formatTime(clock.currentDate); // kicks time
+                clock.currentDate = new Date(); // kicks date
+            }
+        }
+    }
+
     Indicators.SharedUnityMenuModel {
         id: timeModel
         objectName: "timeModel"

=== modified file 'qml/Greeter/GreeterContent.qml'
--- qml/Greeter/GreeterContent.qml	2014-11-07 11:54:10 +0000
+++ qml/Greeter/GreeterContent.qml	2014-12-02 18:48:08 +0000
@@ -133,6 +133,11 @@
             onSelected: infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
         }
 
+        Connections {
+            target: i18n
+            onLanguageChanged: greeterContentLoader.infographicModel.readyForDataChange()
+        }
+
         anchors {
             verticalCenter: parent.verticalCenter
             left: narrowMode ? root.left : loginLoader.right

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2014-11-04 12:54:03 +0000
+++ qml/Launcher/Launcher.qml	2014-12-02 18:48:08 +0000
@@ -118,6 +118,11 @@
         onHint: hint();
     }
 
+    Connections {
+        target: i18n
+        onLanguageChanged: LauncherModel.refresh()
+    }
+
     SequentialAnimation {
         id: fadeOutAnimation
         ScriptAction {

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-12-02 09:26:10 +0000
+++ qml/Shell.qml	2014-12-02 18:48:08 +0000
@@ -37,6 +37,7 @@
 import "Notifications"
 import "Stages"
 import "Panel/Indicators"
+import "Wizard"
 import Unity.Notifications 1.0 as NotificationBackend
 import Unity.Session 0.1
 import Unity.DashCommunicator 0.1
@@ -236,6 +237,14 @@
             onApplicationAdded: {
                 if (greeter.shown && appId != "unity8-dash") {
                     greeter.startUnlock()
+
+                    // If this happens on first boot, we may be in edge
+                    // tutorial or wizard while receiving a call.  But a call
+                    // is more important than wizard so just bail out of those.
+                    if (edgeDemo.running) {
+                        edgeDemo.hideEdgeDemos();
+                        wizard.hide();
+                    }
                 }
                 if (greeter.narrowMode && greeter.hasLockedApp && appId === greeter.lockedApp) {
                     lockscreen.hide() // show locked app
@@ -354,6 +363,15 @@
         minPinLength: 4
         maxPinLength: 4
 
+        property string promptText
+        infoText: promptText !== "" ? i18n.tr("Enter %1").arg(promptText) :
+                  alphaNumeric ? i18n.tr("Enter passphrase") :
+                                 i18n.tr("Enter passcode")
+        errorText: promptText !== "" ? i18n.tr("Sorry, incorrect %1").arg(promptText) :
+                   alphaNumeric ? i18n.tr("Sorry, incorrect passphrase") + "\n" +
+                                  i18n.tr("Please re-enter") :
+                                  i18n.tr("Sorry, incorrect passcode")
+
         // FIXME: We *should* show emergency dialer if there is a SIM present,
         // regardless of whether the side stage is enabled.  But right now,
         // the assumption is that narrow screens are phones which have SIMs
@@ -407,20 +425,7 @@
                 return; // could happen if hideGreeter() comes in before we prompt
             }
             if (greeter.narrowMode) {
-                if (isDefaultPrompt) {
-                    if (lockscreen.alphaNumeric) {
-                        lockscreen.infoText = i18n.tr("Enter passphrase")
-                        lockscreen.errorText = i18n.tr("Sorry, incorrect passphrase") + "\n" +
-                                               i18n.tr("Please re-enter")
-                    } else {
-                        lockscreen.infoText = i18n.tr("Enter passcode")
-                        lockscreen.errorText = i18n.tr("Sorry, incorrect passcode")
-                    }
-                } else {
-                    lockscreen.infoText = i18n.tr("Enter %1").arg(text.toLowerCase())
-                    lockscreen.errorText = i18n.tr("Sorry, incorrect %1").arg(text.toLowerCase())
-                }
-
+                lockscreen.promptText = isDefaultPrompt ? "" : text.toLowerCase();
                 lockscreen.maybeShow();
             }
         }
@@ -748,6 +753,12 @@
             }
         }
 
+        Wizard {
+            id: wizard
+            anchors.fill: parent
+            background: shell.background
+        }
+
         Rectangle {
             id: modalNotificationBackground
 
@@ -809,7 +820,7 @@
         id: edgeDemo
         objectName: "edgeDemo"
         z: dialogs.z + 10
-        paused: Powerd.status === Powerd.Off // Saves power
+        paused: Powerd.status === Powerd.Off || wizard.active // Saves power
         greeter: greeter
         launcher: launcher
         panel: panel

=== renamed directory 'wizard/qml' => 'qml/Wizard'
=== renamed file 'wizard/qml/Components/CheckableSetting.qml' => 'qml/Wizard/CheckableSetting.qml'
--- wizard/qml/Components/CheckableSetting.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/CheckableSetting.qml	2014-12-02 18:48:08 +0000
@@ -15,7 +15,6 @@
  */
 
 import QtQuick 2.3
-import QMenuModel 0.1
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 

=== renamed file 'wizard/qml/Components/Page.qml' => 'qml/Wizard/Page.qml'
--- wizard/qml/Components/Page.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Page.qml	2014-12-02 18:48:08 +0000
@@ -16,7 +16,6 @@
 
 import QtQuick 2.3
 import Ubuntu.Components 1.1
-import "." as LocalComponents
 
 Item {
     readonly property real buttonMargin: units.gu(2)
@@ -76,7 +75,7 @@
         }
     }
 
-    LocalComponents.StackButton {
+    StackButton {
         id: backButton
         width: buttonWidth
         anchors {

=== renamed file 'wizard/qml/main.qml' => 'qml/Wizard/Pages.qml'
--- wizard/qml/main.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages.qml	2014-12-02 18:48:08 +0000
@@ -15,42 +15,30 @@
  */
 
 import QtQuick 2.3
-import GSettings 1.0
 import Ubuntu.Components 1.1
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
-import Unity.Application 0.1
-import Unity.Notifications 1.0 as NotificationBackend
-import Unity.Session 0.1
-import "Components"
-import "file:///usr/share/unity8/Notifications" as Notifications // FIXME This should become a module or go away
-import "file:///usr/share/unity8/Components" as UnityComponents
+import Wizard 0.1
+import "../Components"
 
 Item {
     id: root
-    width: units.gu(40)
-    height: units.gu(71)
     focus: true
 
+    // The background wallpaper to use
+    property string background
+
+    signal quit()
+
     // These should be set by a security page and we apply the settings when
     // the user exits the wizard.
     property int passwordMethod: UbuntuSecurityPrivacyPanel.Passcode
     property string password: ""
 
-    Component.onCompleted: {
-        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
-        // A visible selected background looks bad in ListItem widgets with our theme
-        Theme.palette.selected.background = "#00000000"
-        i18n.domain = "unity8"
-    }
-
     UbuntuSecurityPrivacyPanel {
         id: securityPrivacy
     }
 
     function quitWizard() {
-        // Immediately go to black to give quick feedback
-        blackCover.visible = true
-
         var errorMsg = securityPrivacy.setSecurity("", password, passwordMethod)
         if (errorMsg !== "") {
             // Ignore (but log) any errors, since we're past where the user set
@@ -59,188 +47,83 @@
             console.log("Error setting security method:", errorMsg)
         }
 
-        Qt.quit()
-    }
-
-    // This is just a little screen to immediately go to black once the wizard
-    // is done, to give quick feedback to the user.
-    Rectangle {
-        id: blackCover
-        color: "#000000"
-        anchors.fill: parent
-        z: 1
-        visible: false
-    }
-
-    MainView {
-        anchors.fill: parent
-        headerColor: "#57365E"
-        backgroundColor: "#A55263"
-        footerColor: "#D75669"
-        anchorToKeyboard: true
-        useDeprecatedToolbar: false
-
-        GSettings {
-            id: background
-            schema.id: "org.gnome.desktop.background"
-        }
-
-        Image {
-            id: image
-            // Use x/y/height/width instead of anchors so that we don't adjust
-            // the image when the OSK appears.
-            x: 0
-            y: 0
-            height: root.height
-            width: root.width
-            source: background.pictureUri
-            fillMode: Image.PreserveAspectCrop
-            visible: status === Image.Ready
-        }
-
-        PageStack {
-            id: pageStack
-
-            function next() {
-                // If we've opened any extra (non-main) pages, pop them before
-                // continuing so back button returns to the previous main page.
-                while (pageList.index < pageStack.depth - 1)
-                    pop()
-                load(pageList.next())
-            }
-
-            function prev() {
-                if (pageList.index >= pageStack.depth - 1)
-                    pageList.prev() // update pageList.index, but not for extra pages
+        quit();
+    }
+
+    MouseArea { // eat anything that gets past widgets
+        anchors.fill: parent
+    }
+
+    Image {
+        id: image
+        // Use x/y/height/width instead of anchors so that we don't adjust
+        // the image when the OSK appears.
+        x: 0
+        y: 0
+        height: root.height
+        width: root.width
+        sourceSize.height: height
+        sourceSize.width: width
+        source: root.background
+        fillMode: Image.PreserveAspectCrop
+        visible: status === Image.Ready
+    }
+
+    PageStack {
+        id: pageStack
+        anchors.fill: parent
+
+        function next() {
+            // If we've opened any extra (non-main) pages, pop them before
+            // continuing so back button returns to the previous main page.
+            while (PageList.index < pageStack.depth - 1)
                 pop()
-                if (!currentPage || currentPage.opacity === 0) { // undo skipped pages
-                    prev()
+            load(PageList.next())
+        }
+
+        function prev() {
+            if (PageList.index >= pageStack.depth - 1)
+                PageList.prev() // update PageList.index, but not for extra pages
+            pop()
+            if (!currentPage || currentPage.opacity === 0) { // undo skipped pages
+                prev()
+            } else {
+                currentPage.enabled = true
+            }
+        }
+
+        function load(path) {
+            if (currentPage) {
+                currentPage.enabled = false
+            }
+
+            // First load it invisible, check that we should actually use
+            // this page, and either skip it or continue.
+            push(path, {"opacity": 0, "enabled": false})
+
+            // Check for immediate skip or not.  We may have to wait for
+            // skipValid to be assigned (see Connections object below)
+            checkSkip()
+        }
+
+        function checkSkip() {
+            if (!currentPage) { // may have had a parse error
+                next()
+            } else if (currentPage.skipValid) {
+                if (currentPage.skip) {
+                    next()
                 } else {
+                    currentPage.opacity = 1
                     currentPage.enabled = true
                 }
             }
-
-            function load(path) {
-                if (currentPage) {
-                    currentPage.enabled = false
-                }
-
-                // First load it invisible, check that we should actually use
-                // this page, and either skip it or continue.
-                push(path, {"opacity": 0, "enabled": false})
-
-                // Check for immediate skip or not.  We may have to wait for
-                // skipValid to be assigned (see Connections object below)
-                _checkSkip()
-            }
-
-            function _checkSkip() {
-                if (!currentPage) { // may have had a parse error
-                    next()
-                } else if (currentPage.skipValid) {
-                    if (currentPage.skip) {
-                        next()
-                    } else {
-                        currentPage.opacity = 1
-                        currentPage.enabled = true
-                    }
-                }
-            }
-
-            Connections {
-                target: pageStack.currentPage
-                onSkipValidChanged: pageStack._checkSkip()
-            }
-
-            Component.onCompleted: next()
-        }
-    }
-
-    Rectangle {
-        id: modalNotificationBackground
-        visible: notifications.useModal && (notifications.state == "narrow")
-        anchors.fill: parent
-        color: "#80000000"
-
-        MouseArea {
-            anchors.fill: parent
-        }
-    }
-
-    InputMethod {
-        anchors.fill: parent
-    }
-
-    Notifications.Notifications {
-        id: notifications
-        model: NotificationBackend.Model
-        margin: units.gu(1)
-        anchors {
-            top: parent.top
-            right: parent.right
-            bottom: parent.bottom
-        }
-        states: [
-            State {
-                name: "narrow"
-                when: parent.width <= units.gu(60)
-                AnchorChanges { target: notifications; anchors.left: parent.left }
-            },
-            State {
-                name: "wide"
-                when: parent.width > units.gu(60)
-                AnchorChanges { target: notifications; anchors.left: undefined }
-                PropertyChanges { target: notifications; width: units.gu(38) }
-            }
-        ]
-    }
-
-    UnityComponents.Dialogs {
-        id: dialogs
-        anchors.fill: parent
-        z: 10
-        onPowerOffClicked: {
-            shutdownFadeOutRectangle.enabled = true;
-            shutdownFadeOutRectangle.visible = true;
-            shutdownFadeOut.start();
-        }
-    }
-
-    Rectangle {
-        id: shutdownFadeOutRectangle
-        z: dialogs.z + 10
-        enabled: false
-        visible: false
-        color: "black"
-        anchors.fill: parent
-        opacity: 0.0
-        NumberAnimation on opacity {
-            id: shutdownFadeOut
-            from: 0.0
-            to: 1.0
-            onStopped: {
-                if (shutdownFadeOutRectangle.enabled && shutdownFadeOutRectangle.visible) {
-                    DBusUnitySessionService.Shutdown();
-                }
-            }
-        }
-    }
-
-    Keys.onPressed: {
-        if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
-            dialogs.onPowerKeyPressed();
-            event.accepted = true;
-        } else {
-            event.accepted = false;
-        }
-    }
-
-    Keys.onReleased: {
-        if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
-            dialogs.onPowerKeyReleased();
-            event.accepted = true;
-        } else {
-            event.accepted = false;
-        }
+        }
+
+        Connections {
+            target: pageStack.currentPage
+            onSkipValidChanged: pageStack.checkSkip()
+        }
+
+        Component.onCompleted: next()
     }
 }

=== modified file 'qml/Wizard/Pages/10-welcome.qml'
--- wizard/qml/Pages/10-welcome.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages/10-welcome.qml	2014-12-02 18:48:08 +0000
@@ -18,8 +18,8 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1
 import Ubuntu.SystemSettings.LanguagePlugin 1.0
-import Ubuntu.SystemSettings.Wizard.Utils 0.1
-import "../Components" as LocalComponents
+import Wizard 0.1
+import ".." as LocalComponents
 
 LocalComponents.Page {
     title: i18n.tr("Hi!")
@@ -72,7 +72,6 @@
                         listview.currentIndex = index
                         combo.expanded = false
                         i18n.language = plugin.languageCodes[index]
-                        i18n.domain = i18n.domain
                     }
                 }
             }
@@ -84,8 +83,11 @@
         LocalComponents.StackButton {
             text: i18n.tr("Continue")
             onClicked: {
-                plugin.currentLanguage = listview.currentIndex
-                System.updateSessionLanguage()
+                if (plugin.currentLanguage !== listview.currentIndex) {
+                    plugin.currentLanguage = listview.currentIndex;
+                    System.updateSessionLanguage(plugin.languageCodes[listview.currentIndex]);
+                    i18n.language = i18n.language; // re-notify of change after above call (for qlocale change)
+                }
                 pageStack.next()
             }
         }

=== modified file 'qml/Wizard/Pages/20-sim.qml'
--- wizard/qml/Pages/20-sim.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages/20-sim.qml	2014-12-02 18:48:08 +0000
@@ -17,7 +17,7 @@
 import QtQuick 2.0
 import MeeGo.QOfono 0.2
 import Ubuntu.Components 0.1
-import "../Components" as LocalComponents
+import ".." as LocalComponents
 
 LocalComponents.Page {
     title: i18n.tr("Add a SIM card and restart your device")

=== modified file 'qml/Wizard/Pages/30-passwd-type.qml'
--- wizard/qml/Pages/30-passwd-type.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages/30-passwd-type.qml	2014-12-02 18:48:08 +0000
@@ -18,7 +18,7 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
-import "../Components" as LocalComponents
+import ".." as LocalComponents
 
 /**
  * One quirk with this page: we don't actually set the password.  We avoid
@@ -77,6 +77,7 @@
             expanded: true
             anchors.left: parent.left
             anchors.right: parent.right
+            property color originalBackground
 
             model: ["", "", ""] // otherwise the delegate will show the text itself and we only want subText
 
@@ -103,6 +104,17 @@
             }
 
             style: Item {}
+
+            Component.onCompleted: {
+                // A visible selected background looks bad in ListItem widgets with our theme
+                originalBackground = Theme.palette.selected.background
+                Theme.palette.selected.background = "transparent"
+            }
+
+            Component.onDestruction: {
+                // Restore original theme background
+                Theme.palette.selected.background = originalBackground
+            }
         }
     }
 

=== modified file 'qml/Wizard/Pages/40-wifi.qml'
--- wizard/qml/Pages/40-wifi.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages/40-wifi.qml	2014-12-02 18:48:08 +0000
@@ -18,9 +18,8 @@
 import QMenuModel 0.1 as QMenuModel
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
-import Ubuntu.SystemSettings.Wizard.Utils 0.1
 import Ubuntu.Settings.Menus 0.1 as Menus
-import "../Components" as LocalComponents
+import ".." as LocalComponents
 
 LocalComponents.Page {
     id: wifiPage

=== modified file 'qml/Wizard/Pages/50-location.qml'
--- wizard/qml/Pages/50-location.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages/50-location.qml	2014-12-02 18:48:08 +0000
@@ -15,20 +15,20 @@
  */
 
 import QtQuick 2.3
+import AccountsService 0.1
 import QMenuModel 0.1 as QMenuModel
 import Qt.labs.folderlistmodel 2.1
 import Ubuntu.Components 1.1
-import Ubuntu.SystemSettings.Wizard.Utils 0.1
-import "../Components" as LocalComponents
+import ".." as LocalComponents
 
 LocalComponents.Page {
     title: i18n.tr("Location")
     forwardButtonSourceComponent: forwardButton
 
-    property bool pathSet: System.hereLicensePath !== " " // single space means it's unassigned
+    property bool pathSet: AccountsService.hereLicensePathValid
     property bool countSet: false
-    skipValid: pathSet && (System.hereLicensePath === "" || countSet)
-    skip: skipValid && (System.hereLicensePath === "" || termsModel.count === 0)
+    skipValid: pathSet && (AccountsService.hereLicensePath === "" || countSet)
+    skip: skipValid && (AccountsService.hereLicensePath === "" || termsModel.count === 0)
 
     Connections {
         target: termsModel
@@ -37,7 +37,7 @@
 
     FolderListModel {
         id: termsModel
-        folder: System.hereLicensePath
+        folder: AccountsService.hereLicensePath
         nameFilters: ["*.html"]
         showDirs: false
         showOnlyReadable: true
@@ -141,7 +141,7 @@
                 if (locationActionGroup.gps.state != gpsOn) {
                     locationActionGroup.gps.activate();
                 }
-                System.hereEnabled = hereOn;
+                AccountsService.hereEnabled = hereOn;
                 pageStack.next()
             }
         }

=== modified file 'qml/Wizard/Pages/60-reporting.qml'
--- wizard/qml/Pages/60-reporting.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages/60-reporting.qml	2014-12-02 18:48:08 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import "../Components" as LocalComponents
+import ".." as LocalComponents
 
 LocalComponents.Page {
     title: i18n.tr("Improving your experience")

=== modified file 'qml/Wizard/Pages/80-finished.qml'
--- wizard/qml/Pages/80-finished.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages/80-finished.qml	2014-12-02 18:48:08 +0000
@@ -16,7 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import "../Components" as LocalComponents
+import ".." as LocalComponents
 
 LocalComponents.Page {
     title: i18n.tr("All done")

=== modified file 'qml/Wizard/Pages/here-terms.qml'
--- wizard/qml/Pages/here-terms.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages/here-terms.qml	2014-12-02 18:48:08 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.3
+import AccountsService 0.1
 import Qt.labs.folderlistmodel 2.1
 import Ubuntu.Components 1.1
-import Ubuntu.SystemSettings.Wizard.Utils 0.1
 import Ubuntu.Web 0.2
-import "../Components" as LocalComponents
+import ".." as LocalComponents
 
 LocalComponents.Page {
     title: i18n.tr("Terms & Conditions")
@@ -27,7 +27,7 @@
 
     FolderListModel {
         id: termsModel
-        folder: System.hereLicensePath
+        folder: AccountsService.hereLicensePath
         nameFilters: ["*.html"]
         showDirs: false
         showOnlyReadable: true
@@ -73,7 +73,7 @@
 
     function loadFileContent() {
         var xhr = new XMLHttpRequest
-        xhr.open("GET", System.hereLicensePath + "/" + determineFileName())
+        xhr.open("GET", AccountsService.hereLicensePath + "/" + determineFileName())
         xhr.onreadystatechange = function() {
             if (xhr.readyState == XMLHttpRequest.DONE) {
                 termsLabel.text = xhr.responseText

=== modified file 'qml/Wizard/Pages/passwd-confirm.qml'
--- wizard/qml/Pages/passwd-confirm.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages/passwd-confirm.qml	2014-12-02 18:48:08 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.3
 import Ubuntu.Components 1.1
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
-import "../Components" as LocalComponents
-import "file:///usr/share/unity8/Components" as UnityComponents
+import ".." as LocalComponents
+import "../../Components" as UnityComponents
 
 /**
  * See the main passwd-type page for an explanation of why we don't actually

=== modified file 'qml/Wizard/Pages/passwd-set.qml'
--- wizard/qml/Pages/passwd-set.qml	2014-12-02 18:48:08 +0000
+++ qml/Wizard/Pages/passwd-set.qml	2014-12-02 18:48:08 +0000
@@ -17,8 +17,8 @@
 import QtQuick 2.3
 import Ubuntu.Components 1.1
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
-import "../Components" as LocalComponents
-import "file:///usr/share/unity8/Components" as UnityComponents
+import ".." as LocalComponents
+import "../../Components" as UnityComponents
 
 /**
  * See the main passwd-type page for an explanation of why we don't actually

=== renamed file 'wizard/qml/Components/StackButton.qml' => 'qml/Wizard/StackButton.qml'
=== added file 'qml/Wizard/Wizard.qml'
--- qml/Wizard/Wizard.qml	1970-01-01 00:00:00 +0000
+++ qml/Wizard/Wizard.qml	2014-12-02 18:48:08 +0000
@@ -0,0 +1,55 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+import Wizard 0.1
+import "../Components"
+
+Showable {
+    id: root
+
+    // The background wallpaper to use
+    property string background
+
+    readonly property alias active: loader.active
+
+    hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
+
+    onRequiredChanged: {
+        if (!required) {
+            System.wizardEnabled = false;
+        }
+    }
+
+    Loader {
+        id: loader
+        anchors.fill: parent
+        active: System.wizardEnabled
+        source: "Pages.qml"
+
+        Binding {
+            target: loader.item
+            property: "background"
+            value: root.background
+        }
+
+        Connections {
+            target: loader.item
+            onQuit: root.hide()
+        }
+    }
+}

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-12-02 18:48:08 +0000
+++ tests/CMakeLists.txt	2014-10-01 13:20:32 +0000
@@ -14,4 +14,3 @@
 add_subdirectory(plugins)
 add_subdirectory(utils)
 add_subdirectory(uqmlscene)
-add_subdirectory(wizard)

=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
--- tests/mocks/AccountsService/AccountsService.cpp	2014-10-05 20:54:11 +0000
+++ tests/mocks/AccountsService/AccountsService.cpp	2014-12-02 18:48:08 +0000
@@ -27,7 +27,9 @@
     m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),
     m_statsWelcomeScreen(true),
     m_failedLogins(0),
-    m_demoEdges(false)
+    m_demoEdges(false),
+    m_hereEnabled(false),
+    m_hereLicensePath("")
 {
 }
 
@@ -116,3 +118,31 @@
     m_failedLogins = failedLogins;
     failedLoginsChanged();
 }
+
+bool AccountsService::hereEnabled() const
+{
+    return m_hereEnabled;
+}
+
+void AccountsService::setHereEnabled(bool enabled)
+{
+    m_hereEnabled = enabled;
+    hereEnabledChanged();
+}
+
+QString AccountsService::hereLicensePath() const
+{
+    return m_hereLicensePath;
+}
+
+void AccountsService::setHereLicensePath(const QString &path)
+{
+    // Path should always be valid (this code is all synchronous)
+    m_hereLicensePath = path.isNull() ? "" : path;
+    hereLicensePathChanged();
+}
+
+bool AccountsService::hereLicensePathValid() const
+{
+    return !m_hereLicensePath.isNull();
+}

=== modified file 'tests/mocks/AccountsService/AccountsService.h'
--- tests/mocks/AccountsService/AccountsService.h	2014-10-05 20:54:11 +0000
+++ tests/mocks/AccountsService/AccountsService.h	2014-12-02 18:48:08 +0000
@@ -59,6 +59,17 @@
                 READ failedLogins
                 WRITE setFailedLogins
                 NOTIFY failedLoginsChanged)
+    Q_PROPERTY(bool hereEnabled
+               READ hereEnabled
+               WRITE setHereEnabled
+               NOTIFY hereEnabledChanged)
+    Q_PROPERTY(QString hereLicensePath
+               READ hereLicensePath
+               WRITE setHereLicensePath // only available in mock
+               NOTIFY hereLicensePathChanged)
+    Q_PROPERTY(bool hereLicensePathValid // qml sees a null string as "", so we use proxy setting for that
+               READ hereLicensePathValid
+               NOTIFY hereLicensePathChanged)
 
 public:
     enum PasswordDisplayHint {
@@ -83,6 +94,11 @@
     PasswordDisplayHint passwordDisplayHint() const;
     uint failedLogins() const;
     void setFailedLogins(uint failedLogins);
+    bool hereEnabled() const;
+    void setHereEnabled(bool enabled);
+    QString hereLicensePath() const;
+    void setHereLicensePath(const QString &path);
+    bool hereLicensePathValid() const;
 
 Q_SIGNALS:
     void userChanged();
@@ -93,6 +109,8 @@
     void statsWelcomeScreenChanged();
     void passwordDisplayHintChanged();
     void failedLoginsChanged();
+    void hereEnabledChanged();
+    void hereLicensePathChanged();
 
 private:
     bool m_enableLauncherWhileLocked;
@@ -102,6 +120,8 @@
     bool m_statsWelcomeScreen;
     uint m_failedLogins;
     bool m_demoEdges;
+    bool m_hereEnabled;
+    QString m_hereLicensePath;
 };
 
 #endif

=== modified file 'tests/mocks/CMakeLists.txt'
--- tests/mocks/CMakeLists.txt	2014-10-28 11:06:31 +0000
+++ tests/mocks/CMakeLists.txt	2014-12-02 18:48:08 +0000
@@ -37,6 +37,7 @@
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(QtMultimedia)
+add_subdirectory(Wizard)
 
 install(
   DIRECTORY data

=== modified file 'tests/mocks/QMenuModel/CMakeLists.txt'
--- tests/mocks/QMenuModel/CMakeLists.txt	2014-05-02 22:57:21 +0000
+++ tests/mocks/QMenuModel/CMakeLists.txt	2014-12-02 18:48:08 +0000
@@ -5,6 +5,7 @@
 
 set(QMenuModelQml_SOURCES
   actionstateparser.cpp
+  dbus-enums.h
   plugin.cpp
   unitymenumodel.cpp
 )

=== added file 'tests/mocks/QMenuModel/dbus-enums.h'
--- tests/mocks/QMenuModel/dbus-enums.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/QMenuModel/dbus-enums.h	2014-12-02 18:48:08 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2012 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *      Olivier Tilloy <[e-mail]>
+ */
+
+#ifndef __DBUS_ENUMS__
+#define __DBUS_ENUMS__
+
+#include <QObject>
+
+// This class acts as a namespace only, with the addition that its enums
+// are registered to be exposed on the QML side.
+class DBusEnums : public QObject
+{
+    Q_OBJECT
+
+    Q_ENUMS(BusType)
+    Q_ENUMS(ConnectionStatus)
+
+public:
+    enum BusType {
+        None = 0,
+        SessionBus,
+        SystemBus,
+        LastBusType
+    };
+
+    enum ConnectionStatus {
+        Disconnected = 0,
+        Connecting,
+        Connected
+    };
+
+private:
+    DBusEnums() {}
+};
+
+#endif // __DBUS_ENUMS__

=== modified file 'tests/mocks/QMenuModel/plugin.cpp'
--- tests/mocks/QMenuModel/plugin.cpp	2013-11-19 17:01:25 +0000
+++ tests/mocks/QMenuModel/plugin.cpp	2014-12-02 18:48:08 +0000
@@ -19,12 +19,15 @@
 #include "plugin.h"
 #include "unitymenumodel.h"
 #include "actionstateparser.h"
+#include "dbus-enums.h"
 
 #include <QtQml/qqml.h>
 
 void QMenuModelPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("QMenuModel"));
+    qmlRegisterUncreatableType<DBusEnums>(uri, 0, 1, "DBus",
+                                          "DBus is only a namespace");
     qmlRegisterType<UnityMenuModel>(uri, 0, 1, "UnityMenuModel");
     qmlRegisterType<ActionStateParser>(uri, 0, 1, "ActionStateParser");
 }

=== added directory 'tests/mocks/Wizard'
=== added file 'tests/mocks/Wizard/CMakeLists.txt'
--- tests/mocks/Wizard/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Wizard/CMakeLists.txt	2014-12-02 18:48:08 +0000
@@ -0,0 +1,12 @@
+include_directories(
+    ${CMAKE_SOURCE_DIR}/plugins/Wizard
+)
+
+add_library(MockWizard-qml MODULE
+    mockplugin.cpp
+    MockSystem.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
+)
+
+qt5_use_modules(MockWizard-qml Qml)
+add_unity8_mock(Wizard 0.1 Wizard TARGETS MockWizard-qml)

=== added file 'tests/mocks/Wizard/MockSystem.cpp'
--- tests/mocks/Wizard/MockSystem.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Wizard/MockSystem.cpp	2014-12-02 18:48:08 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2014 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 "MockSystem.h"
+
+MockSystem::MockSystem()
+    : QObject(),
+      m_wizardEnabled(false)
+{
+}
+
+bool MockSystem::wizardEnabled() const
+{
+    return m_wizardEnabled;
+}
+
+void MockSystem::setWizardEnabled(bool enabled)
+{
+    m_wizardEnabled = enabled;
+    Q_EMIT wizardEnabledChanged();
+}
+
+void MockSystem::updateSessionLanguage(const QString &)
+{
+}

=== added file 'tests/mocks/Wizard/MockSystem.h'
--- tests/mocks/Wizard/MockSystem.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Wizard/MockSystem.h	2014-12-02 18:48:08 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 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/>.
+ */
+
+#ifndef WIZARD_MOCK_SYSTEM_H
+#define WIZARD_MOCK_SYSTEM_H
+
+#include <QObject>
+#include <QString>
+
+class MockSystem : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool wizardEnabled READ wizardEnabled WRITE setWizardEnabled NOTIFY wizardEnabledChanged)
+
+public:
+    MockSystem();
+
+    bool wizardEnabled() const;
+    void setWizardEnabled(bool enabled);
+
+public Q_SLOTS:
+    void updateSessionLanguage(const QString &locale);
+
+Q_SIGNALS:
+    void wizardEnabledChanged();
+
+private:
+    Q_DISABLE_COPY(MockSystem)
+
+    bool m_wizardEnabled;
+};
+
+#endif

=== added file 'tests/mocks/Wizard/Wizard.qmltypes'
--- tests/mocks/Wizard/Wizard.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Wizard/Wizard.qmltypes	2014-12-02 18:48:08 +0000
@@ -0,0 +1,36 @@
+import QtQuick.tooling 1.1
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable Wizard 0.1 tests/mocks'
+
+Module {
+    Component {
+        name: "MockSystem"
+        prototype: "QObject"
+        exports: ["Wizard/System 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "wizardEnabled"; type: "bool" }
+        Method {
+            name: "updateSessionLanguage"
+            Parameter { name: "locale"; type: "string" }
+        }
+    }
+    Component {
+        name: "PageList"
+        prototype: "QObject"
+        exports: ["Wizard/PageList 0.1"]
+        isCreatable: false
+        isSingleton: true
+        exportMetaObjectRevisions: [0]
+        Property { name: "index"; type: "int"; isReadonly: true }
+        Property { name: "numPages"; type: "int"; isReadonly: true }
+        Method { name: "prev"; type: "string" }
+        Method { name: "next"; type: "string" }
+    }
+}
+

=== added file 'tests/mocks/Wizard/mockplugin.cpp'
--- tests/mocks/Wizard/mockplugin.cpp	1970-01-01 00:00:00 +0000
+++ tests/mocks/Wizard/mockplugin.cpp	2014-12-02 18:48:08 +0000
@@ -0,0 +1,42 @@
+/*
+ * 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/>.
+ */
+
+#include "mockplugin.h"
+#include "MockSystem.h"
+#include "PageList.h"
+
+#include <QtQml/qqml.h>
+
+static QObject *pagelist_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new PageList();
+}
+
+static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+    return new MockSystem();
+}
+
+void MockWizardPlugin::registerTypes(const char *uri)
+{
+    Q_ASSERT(uri == QLatin1String("Wizard"));
+    qmlRegisterSingletonType<PageList>(uri, 0, 1, "PageList", pagelist_provider);
+    qmlRegisterSingletonType<MockSystem>(uri, 0, 1, "System", system_provider);
+}

=== added file 'tests/mocks/Wizard/mockplugin.h'
--- tests/mocks/Wizard/mockplugin.h	1970-01-01 00:00:00 +0000
+++ tests/mocks/Wizard/mockplugin.h	2014-12-02 18:48:08 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2014 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/>.
+ */
+
+#ifndef MOCK_WIZARD_PLUGIN_H
+#define MOCK_WIZARD_PLUGIN_H
+
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlExtensionPlugin>
+
+class MockWizardPlugin : public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+#endif

=== added file 'tests/mocks/Wizard/qmldir'
--- tests/mocks/Wizard/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/Wizard/qmldir	2014-12-02 18:48:08 +0000
@@ -0,0 +1,3 @@
+module Wizard
+plugin MockWizard-qml
+typeinfo Wizard.qmltypes

=== modified file 'tests/plugins/CMakeLists.txt'
--- tests/plugins/CMakeLists.txt	2014-06-11 15:36:51 +0000
+++ tests/plugins/CMakeLists.txt	2014-12-02 18:48:08 +0000
@@ -4,3 +4,4 @@
 add_subdirectory(Ubuntu)
 add_subdirectory(Unity)
 add_subdirectory(Utils)
+add_subdirectory(Wizard)

=== renamed directory 'tests/wizard' => 'tests/plugins/Wizard'
=== modified file 'tests/plugins/Wizard/CMakeLists.txt'
--- tests/wizard/CMakeLists.txt	2014-12-02 18:48:08 +0000
+++ tests/plugins/Wizard/CMakeLists.txt	2014-12-02 18:48:08 +0000
@@ -1,5 +1,12 @@
-add_executable(tst-pagelist tst_pagelist.cpp ${CMAKE_SOURCE_DIR}/wizard/PageList.cpp)
-set_target_properties(tst-pagelist PROPERTIES
-                      INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_SOURCE_DIR}/wizard")
-qt5_use_modules(tst-pagelist Core Test)
-add_test(tst-pagelist tst-pagelist)
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/plugins/Wizard
+)
+
+add_executable(tst-pagelist
+    tst_pagelist.cpp
+    ${CMAKE_SOURCE_DIR}/plugins/Wizard/PageList.cpp
+)
+qt5_use_modules(tst-pagelist Core Qml Test)
+
+add_test(NAME pagelisttest COMMAND env UNITY_TEST_ENV=1 ${CMAKE_CURRENT_BINARY_DIR}/tst-pagelist)

=== modified file 'tests/plugins/Wizard/tst_pagelist.cpp'
--- tests/wizard/tst_pagelist.cpp	2014-12-02 18:48:08 +0000
+++ tests/plugins/Wizard/tst_pagelist.cpp	2014-12-02 18:48:08 +0000
@@ -1,6 +1,4 @@
 /*
- * This file is part of system-settings
- *
  * Copyright (C) 2014 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
@@ -23,7 +21,7 @@
 #include <QTemporaryDir>
 #include <QTest>
 
-#define PAGES_PATH "ubuntu/settings/wizard/qml/Pages"
+#define PAGES_PATH "Wizard/Pages"
 
 class PageListTest: public QObject
 {

=== removed directory 'wizard/Unity'
=== removed directory 'wizard/Unity/Application'
=== removed file 'wizard/Unity/Application/CMakeLists.txt'
--- wizard/Unity/Application/CMakeLists.txt	2014-12-02 18:48:08 +0000
+++ wizard/Unity/Application/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-# This is just a small fake Unity.Application for non-Mir environments
-set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Wizard/NonMir/Unity/Application)
-install(FILES qmldir OSKController.qml DESTINATION ${PLUG_DIR})

=== removed file 'wizard/Unity/Application/OSKController.qml'
--- wizard/Unity/Application/OSKController.qml	2014-12-02 18:48:08 +0000
+++ wizard/Unity/Application/OSKController.qml	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-/*
- * 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 {
-}

=== removed file 'wizard/Unity/Application/qmldir'
--- wizard/Unity/Application/qmldir	2014-12-02 18:48:08 +0000
+++ wizard/Unity/Application/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module Unity.Application
-OSKController 0.1 OSKController.qml

=== removed file 'wizard/Unity/CMakeLists.txt'
--- wizard/Unity/CMakeLists.txt	2014-12-02 18:48:08 +0000
+++ wizard/Unity/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-add_subdirectory(Application)

=== removed directory 'wizard/Utils'
=== removed file 'wizard/Utils/CMakeLists.txt'
--- wizard/Utils/CMakeLists.txt	2014-12-02 18:48:08 +0000
+++ wizard/Utils/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
-)
-
-set(QMLPLUGIN_SRC
-    qsortfilterproxymodelqml.cpp
-    plugin.cpp
-    system.cpp
-    )
-
-add_library(WizardUtils-qml SHARED
-    ${QMLPLUGIN_SRC}
-    )
-
-# Because this is an internal support library, we want
-# to expose all symbols in it. Consider changing this
-# either to a static library or just using the
-# files directly in targets.
-set_target_properties(WizardUtils-qml PROPERTIES COMPILE_FLAGS -fvisibility=default)
-
-qt5_use_modules(WizardUtils-qml DBus Qml Quick)
-
-set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/Wizard/Utils)
-install(FILES qmldir DESTINATION ${PLUG_DIR})
-install(TARGETS WizardUtils-qml DESTINATION ${PLUG_DIR})

=== removed file 'wizard/Utils/plugin.cpp'
--- wizard/Utils/plugin.cpp	2014-12-02 18:48:08 +0000
+++ wizard/Utils/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2014 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/>.
- */
-
-// Qt
-#include <QtQml/qqml.h>
-#include <QQmlContext>
-#include <QDebug>
-// self
-#include "plugin.h"
-
-// local
-#include "qsortfilterproxymodelqml.h"
-#include "system.h"
-
-static QObject *system_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine)
-    Q_UNUSED(scriptEngine)
-    return new System();
-}
-
-void UtilsPlugin::registerTypes(const char *uri)
-{
-    Q_ASSERT(uri == QLatin1String("Ubuntu.SystemSettings.Wizard.Utils"));
-    qmlRegisterType<QAbstractItemModel>();
-    qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
-    qmlRegisterSingletonType<System>(uri, 0, 1, "System", system_provider);
-}

=== removed file 'wizard/Utils/plugin.h'
--- wizard/Utils/plugin.h	2014-12-02 18:48:08 +0000
+++ wizard/Utils/plugin.h	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2014 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/>.
- *
- */
-
-#ifndef UTILS_PLUGIN_H
-#define UTILS_PLUGIN_H
-
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlExtensionPlugin>
-
-class UtilsPlugin : public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
-
-public:
-    void registerTypes(const char *uri);
-};
-
-#endif

=== removed file 'wizard/Utils/qmldir'
--- wizard/Utils/qmldir	2014-12-02 18:48:08 +0000
+++ wizard/Utils/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module Ubuntu.SystemSettings.Wizard.Utils
-plugin WizardUtils-qml

=== removed file 'wizard/Utils/qsortfilterproxymodelqml.cpp'
--- wizard/Utils/qsortfilterproxymodelqml.cpp	2014-12-02 18:48:08 +0000
+++ wizard/Utils/qsortfilterproxymodelqml.cpp	1970-01-01 00:00:00 +0000
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2012 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/>.
- */
-
-// self
-#include "qsortfilterproxymodelqml.h"
-
-// Qt
-#include <QDebug>
-
-QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)
-    : QSortFilterProxyModel(parent)
-    , m_invertMatch(false)
-{
-    connect(this, SIGNAL(modelReset()), SIGNAL(countChanged()));
-    connect(this, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(countChanged()));
-    connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(countChanged()));
-}
-
-/*
- * Enter row index of filtered/sorted model, returns row index of source model
- */
-int QSortFilterProxyModelQML::mapRowToSource(int row)
-{
-    if (sourceModel() == NULL)
-        return -1;
-
-    return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
-}
-
-QHash<int, QByteArray> QSortFilterProxyModelQML::roleNames() const
-{
-    return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();
-}
-
-void
-QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
-{
-    if (itemModel == NULL) {
-        return;
-    }
-
-    if (itemModel != sourceModel()) {
-        if (sourceModel() != NULL) {
-            sourceModel()->disconnect(this);
-        }
-
-        setSourceModel(itemModel);
-
-        connect(itemModel, SIGNAL(modelReset()), SIGNAL(totalCountChanged()));
-        connect(itemModel, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(totalCountChanged()));
-        connect(itemModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(totalCountChanged()));
-
-        Q_EMIT totalCountChanged();
-        Q_EMIT modelChanged();
-    }
-}
-
-QVariantMap
-QSortFilterProxyModelQML::get(int row)
-{
-    QVariantMap res;
-    const QHash<int, QByteArray> roles = roleNames();
-    auto it = roles.begin();
-    for ( ; it != roles.end(); ++it) {
-        res[*it] = data(row, it.key());
-    }
-    return res;
-}
-
-QVariant
-QSortFilterProxyModelQML::data(int row, int role)
-{
-    if (sourceModel() == NULL) {
-        return QVariant();
-    }
-
-    return index(row, 0).data(role);
-}
-
-int
-QSortFilterProxyModelQML::totalCount() const
-{
-    if (sourceModel() != NULL) {
-        return sourceModel()->rowCount();
-    } else {
-        return 0;
-    }
-}
-
-int
-QSortFilterProxyModelQML::count()
-{
-    return rowCount();
-}
-
-bool
-QSortFilterProxyModelQML::invertMatch() const
-{
-    return m_invertMatch;
-}
-
-void
-QSortFilterProxyModelQML::setInvertMatch(bool invertMatch)
-{
-    if (invertMatch != m_invertMatch) {
-        m_invertMatch = invertMatch;
-        Q_EMIT invertMatchChanged(invertMatch);
-        invalidateFilter();
-    }
-}
-
-bool
-QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
-                                           const QModelIndex &sourceParent) const
-{
-    // If there's no regexp set, always accept all rows indepenently of the invertMatch setting
-    if (filterRegExp().isEmpty()) {
-        return true;
-    }
-
-    bool result = QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
-    return (m_invertMatch) ? !result : result;
-}
-
-int
-QSortFilterProxyModelQML::findFirst(int role, const QVariant& value) const
-{
-    QModelIndexList matches = match(index(0, 0), role, value, 1, Qt::MatchExactly);
-    if (!matches.isEmpty()) {
-        return matches.first().row();
-    } else {
-        return -1;
-    }
-}
-
-int
-QSortFilterProxyModelQML::mapFromSource(int row)
-{
-    if (sourceModel() != NULL) {
-        return QSortFilterProxyModel::mapFromSource(sourceModel()->index(row, 0)).row();
-    } else {
-        return -1;
-    }
-}
-
-int
-QSortFilterProxyModelQML::mapToSource(int row)
-{
-    if (sourceModel() != NULL) {
-        return QSortFilterProxyModel::mapToSource(index(row, 0)).row();
-    } else {
-        return -1;
-    }
-}

=== removed file 'wizard/Utils/qsortfilterproxymodelqml.h'
--- wizard/Utils/qsortfilterproxymodelqml.h	2014-12-02 18:48:08 +0000
+++ wizard/Utils/qsortfilterproxymodelqml.h	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2012 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/>.
- */
-
-#ifndef QSORTFILTERPROXYMODELQML_H
-#define QSORTFILTERPROXYMODELQML_H
-
-#include <QSortFilterProxyModel>
-
-class QSortFilterProxyModelQML : public QSortFilterProxyModel
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setModel NOTIFY modelChanged)
-    Q_PROPERTY(int totalCount READ totalCount NOTIFY totalCountChanged)
-    Q_PROPERTY(int count READ count NOTIFY countChanged)
-    Q_PROPERTY(bool invertMatch READ invertMatch WRITE setInvertMatch NOTIFY invertMatchChanged)
-
-public:
-    explicit QSortFilterProxyModelQML(QObject *parent = 0);
-
-    Q_INVOKABLE QVariantMap get(int row); // Use with caution, it can be slow to query all the roles
-    Q_INVOKABLE QVariant data(int row, int role);
-    Q_INVOKABLE int count();
-    Q_INVOKABLE int findFirst(int role, const QVariant& value) const;
-    Q_INVOKABLE int mapRowToSource(int row);
-    virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
-
-    /* getters */
-    int totalCount() const;
-    bool invertMatch() const;
-    QHash<int, QByteArray> roleNames() const;
-
-    /* setters */
-    void setModel(QAbstractItemModel *model);
-    void setInvertMatch(bool invertMatch);
-
-    Q_INVOKABLE int mapFromSource(int row);
-    Q_INVOKABLE int mapToSource(int row);
-
-Q_SIGNALS:
-    void totalCountChanged();
-    void countChanged();
-    void invertMatchChanged(bool);
-    void modelChanged();
-
-private:
-    bool m_invertMatch;
-};
-
-#endif // QSORTFILTERPROXYMODELQML_H

=== removed file 'wizard/main.cpp'
--- wizard/main.cpp	2014-12-02 18:48:08 +0000
+++ wizard/main.cpp	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-/*
- * This file is part of system-settings
- *
- * Copyright (C) 2014 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 <csignal>
-#include <libintl.h>
-#include <qpa/qplatformnativeinterface.h>
-#include <QDebug>
-#include <QGuiApplication>
-#include <QLibrary>
-#include <QObject>
-#include <QProcess>
-#include <QQmlContext>
-#include <QQmlEngine>
-#include <QQuickItem>
-#include <QQuickView>
-#include <QTimer>
-
-#include "PageList.h"
-
-void handleQuit()
-{
-    QProcess::startDetached("initctl start ubuntu-system-settings-wizard-cleanup");
-}
-
-int main(int argc, const char *argv[])
-{
-    bool isMirServer = false;
-    if (qgetenv("QT_QPA_PLATFORM") == "ubuntumirclient") {
-        setenv("QT_QPA_PLATFORM", "mirserver", 1 /* overwrite */);
-        isMirServer = true;
-    }
-
-    QGuiApplication::setApplicationName("System Settings Wizard");
-    QGuiApplication *application = new QGuiApplication(argc, (char**)argv);
-
-    bindtextdomain(I18N_DOMAIN, NULL);
-    textdomain(I18N_DOMAIN);
-
-    QQuickView* view = new QQuickView();
-    view->setResizeMode(QQuickView::SizeRootObjectToView);
-    view->setTitle("Welcome Wizard");
-
-    QString rootDir = qgetenv("UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT"); // for testing
-    if (rootDir.isEmpty())
-        rootDir = WIZARD_ROOT;
-
-    QString modulesDir = qgetenv("UBUNTU_SYSTEM_SETTINGS_WIZARD_MODULES"); // for testing
-    if (modulesDir.isEmpty())
-        modulesDir = PLUGIN_PRIVATE_MODULE_DIR;
-
-    if (!isMirServer) {
-        view->engine()->addImportPath(modulesDir + "/Ubuntu/SystemSettings/Wizard/NonMir");
-    }
-    view->engine()->addImportPath(modulesDir);
-    view->engine()->addImportPath(PLUGIN_QML_DIR);
-    view->engine()->addImportPath(SHELL_PLUGINDIR);
-
-    PageList pageList;
-    view->rootContext()->setContextProperty("pageList", &pageList);
-    view->setSource(QUrl(rootDir + "/ubuntu/settings/wizard/qml/main.qml"));
-    view->setColor("transparent");
-
-    QObject::connect(view->engine(), &QQmlEngine::quit, handleQuit);
-
-    if (isMirServer) {
-        view->showFullScreen();
-    } else {
-        view->show();
-    }
-
-    int result = application->exec();
-
-    delete view;
-    delete application;
-    return result;
-}
-
-#include "main.moc"

=== removed directory 'wizard/qml/Components'
=== removed file 'wizard/qml/Components/InputMethod.qml'
--- wizard/qml/Components/InputMethod.qml	2014-12-02 18:48:08 +0000
+++ wizard/qml/Components/InputMethod.qml	1970-01-01 00:00:00 +0000
@@ -1,113 +0,0 @@
-/*
- * Copyright (C) 2014 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 Unity.Application 0.1
-import Ubuntu.Components 0.1
-
-// TODO: try to share this code with that from the unity8 shell
-
-Item {
-    id: root
-
-    Connections {
-        target: SurfaceManager
-        onSurfaceCreated: {
-            if (surface.type == MirSurfaceItem.InputMethod) {
-                root.surface = surface;
-            }
-        }
-
-        onSurfaceDestroyed: {
-            if (root.surface == surface) {
-                root.surface = null;
-                surface.parent = null;
-            }
-            if (!surface.parent) {
-                // there's no one displaying it. delete it right away
-                surface.release();
-            }
-        }
-    }
-
-    property var surface: null
-
-    property int transitionDuration: UbuntuAnimation.FastDuration
-
-    state: {
-        if (surface && surface.state != MirSurfaceItem.Minimized) {
-            return "shown";
-        } else {
-            return "hidden";
-        }
-    }
-
-    states: [
-        State {
-            name: "shown"
-            PropertyChanges {
-                target: root
-                visible: true
-                y: 0
-            }
-        },
-        State {
-            name: "hidden"
-            PropertyChanges {
-                target: root
-                visible: false
-                // half-way down because the vkb occupies only the lower half of the surface
-                // TODO: consider keyboard rotation
-                y: root.parent.height / 2.0
-            }
-        }
-    ]
-
-    transitions: [
-        Transition {
-            from: "*"; to: "*"
-            PropertyAction { property: "visible"; value: true }
-            UbuntuNumberAnimation { property: "y"; duration: transitionDuration }
-        }
-    ]
-
-    Connections {
-        target: surface
-        ignoreUnknownSignals: true // don't wanna spam the log when surface is null
-        onStateChanged: {
-            if (state == MirSurfaceItem.Minimized) {
-                root.hide();
-            } else if (state == MirSurfaceItem.Maximized) {
-                root.show();
-            }
-        }
-    }
-
-    onSurfaceChanged: {
-        if (surface) {
-            surface.parent = root;
-            surface.anchors.fill = root;
-        }
-    }
-
-    Component.onDestruction: {
-        if (surface) {
-            surface.parent = null;
-            surface.release();
-            surface = null;
-        }
-    }
-}

=== removed file 'wizard/test.sh'
--- wizard/test.sh	2014-12-02 18:48:08 +0000
+++ wizard/test.sh	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/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 UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT="${TOPDIR}/debian/tmp/usr/share"
-    export UBUNTU_SYSTEM_SETTINGS_WIZARD_MODULES="${LOCAL_PRIVATE_DIR}"
-    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}
-
-exec system-settings-wizard

=== removed file 'wizard/ubuntu-system-settings-wizard-cleanup.conf'
--- wizard/ubuntu-system-settings-wizard-cleanup.conf	2014-12-02 18:48:08 +0000
+++ wizard/ubuntu-system-settings-wizard-cleanup.conf	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-description "Welcome to Ubuntu Cleanup"
-author "Michael Terry <[e-mail]>"
-
-# These are all tasks that need to be completed only if the wizard was
-# intentionally stopped (i.e. the user clicked 'Finish' at the end)
-
-task
-
-# If you change this, also change it in the main upstart job
-env RUN_FILE=".config/ubuntu-system-settings/wizard-has-run"
-
-script
-    # Don't run again in the future.  We do this here, rather than in the main
-    # job because we only want to run this code if user actually clicked on the
-    # "Finish" button.
-    mkdir -p $(dirname "$HOME/$RUN_FILE")
-    touch "$HOME/$RUN_FILE" || true
-
-    stop ubuntu-system-settings-wizard
-end script

=== removed file 'wizard/ubuntu-system-settings-wizard-set-lang.conf'
--- wizard/ubuntu-system-settings-wizard-set-lang.conf	2014-12-02 18:48:08 +0000
+++ wizard/ubuntu-system-settings-wizard-set-lang.conf	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-description "Welcome to Ubuntu Cleanup"
-author "Michael Terry <[e-mail]>"
-
-# This job updates the system idea of what language is configured.  It adjusts
-# the upstart env and the DBus activation env.  It also stops indicators and
-# the OSK so that they can be restarted with the new env.
-
-task
-
-script
-    setenv() {
-        initctl set-env --global $1=$2
-        gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'$1': '$2'}"
-    }
-
-    UID=$(id -u)
-
-    # Change upstart's ideas about locales
-    LANGUAGE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User$UID --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User Language | cut -d\' -f2)
-    setenv LANGUAGE $LANGUAGE
-    echo "Set language for $USER_PATH as $LANGUAGE"
-    LOCALE=$(gdbus call --system --dest org.freedesktop.Accounts --object-path /org/freedesktop/Accounts/User$UID --method org.freedesktop.DBus.Properties.Get org.freedesktop.Accounts.User FormatsLocale | cut -d\' -f2)
-    setenv LC_ALL $LOCALE
-    setenv LANG $LOCALE
-    echo "Set locale as $LOCALE"
-
-    # Stop any indicators and OSK so they will be restarted with new environment
-    initctl emit indicator-services-end
-    stop maliit-server || true
-end script

=== removed file 'wizard/ubuntu-system-settings-wizard.conf'
--- wizard/ubuntu-system-settings-wizard.conf	2014-12-02 18:48:08 +0000
+++ wizard/ubuntu-system-settings-wizard.conf	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-description "Welcome to Ubuntu"
-author "Michael Terry <[e-mail]>"
-
-start on starting unity8
-task
-
-expect stop
-
-# If you change this, also change it in the cleanup upstart job
-env RUN_FILE=".config/ubuntu-system-settings/wizard-has-run"
-
-pre-start script
-    if [ -e "$HOME/$RUN_FILE" ]; then
-        initctl set-env WIZARD_SKIPPED=true
-        stop
-    else
-        # Stop unity8, we'll start it again in post-stop (this avoids a race
-        # between post-stop and unity8 unpausing)
-        stop --no-wait $JOB
-
-        # Tell unity-mir to raise SIGSTOP after we start
-        initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
-
-        if [ -n "$MIR_SOCKET" ]; then
-            initctl set-env --global WIZARD_ORIG_MIR_SOCKET=$MIR_SOCKET
-
-            # Point wizard at unity-system-compositor
-            MIR_SERVER_FILE=$XDG_RUNTIME_DIR/wizard_socket
-            initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
-            initctl set-env MIR_SERVER_HOST_SOCKET=$MIR_SOCKET
-
-            # Remove the socket if still there
-            if [ -S "$MIR_SERVER_FILE" ]; then
-                rm "$MIR_SERVER_FILE"
-            fi
-
-            # Point future jobs in this session to our Mir socket instead of
-            # unity-system-compositor's socket.
-            initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
-            gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
-        fi
-    fi
-end script
-
-exec system-settings-wizard
-
-post-stop script
-    if [ -n "$WIZARD_SKIPPED" ]; then
-        exit
-    fi
-
-    setenv() {
-        initctl set-env --global $1=$2
-        gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'$1': '$2'}"
-    }
-
-    echo "Ending wizard"
-
-    if [ -S "$MIR_SERVER_FILE" ]; then
-        rm -f "$MIR_SERVER_FILE"
-    fi
-
-    # Undo changes to global variables
-    if [ -n "$WIZARD_ORIG_MIR_SOCKET" ]; then
-        echo "Resetting MIR_SOCKET to $WIZARD_ORIG_MIR_SOCKET"
-        setenv MIR_SOCKET $WIZARD_ORIG_MIR_SOCKET
-    fi
-
-    # Stop any indicators and OSK so they will be restarted with new environment
-    initctl emit indicator-services-end
-    stop maliit-server || true
-
-    # And finally, resume unity8
-    start --no-wait $JOB || true
-end script