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

[Michael Terry]

Import wizard code from ubuntu-system-settings.

This branch does not guarantee it works, just that it builds and ships the right stuff. I wanted a baseline with as few changes as possible, so my actual changes to the code could be reviewed on their own.

Import wizard code from ubuntu-system-settings.

This branch does not guarantee it works, just that it builds and ships the right stuff. I wanted a baseline with as few changes as possible, so my actual changes to the code could be reviewed on their own.

This should not be landed without the 'wizard-plugin' (done) and 'wizard-tests' (not done yet) branches.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 Yesish. https://code.launchpad.net/~mterry/unity8/wizard-plugin/+merge/241912 will be needed to make actual functional use of this. But this is a baseline.

 It also expects https://code.launchpad.net/~mterry/ubuntu-system-settings/drop-wizard/+merge/242244 to be approved and in the same silo.

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 Yesish. It builds and ships.

 * 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 on that team.

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

[PS Jenkins bot (ps-jenkins)]

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

http://jenkins.qa.ubuntu.com/job/unity8-ci/4932/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/283
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/109
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/97
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/257
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/283
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/283/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16010

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4932/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?
Not of this, but following 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-import]

1436. By Michael Terry on 2014-12-02

Merge from trunk

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-11-26 08:30:12 +0000
+++ CMakeLists.txt	2014-12-02 18:43:43 +0000
@@ -117,6 +117,7 @@
 add_subdirectory(qml)
 add_subdirectory(tests)
 add_subdirectory(plugins)
+add_subdirectory(wizard)
 
 #
 # Data files

=== modified file 'debian/control'
--- debian/control	2014-12-02 09:25:23 +0000
+++ debian/control	2014-12-02 18:43:43 +0000
@@ -24,6 +24,7 @@
                libpulse-dev,
                libqmenumodel-dev (>= 0.2.8),
                libqt5xmlpatterns5-dev,
+               libsystemsettings-dev,
                libunity-api-dev (>= 7.93),
                libusermetricsoutput1-dev,
                libxcb1-dev,
@@ -191,3 +192,15 @@
 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-07-23 15:30:38 +0000
+++ debian/rules	2014-12-02 18:43:43 +0000
@@ -40,7 +40,7 @@
 
 # use private lib directories
 override_dh_makeshlibs:
-	dh_makeshlibs -Nunity8-private -Nunity8-fake-env
+	dh_makeshlibs -Nunity8-private -Nunity8-fake-env -Nubuntu-system-settings-wizard
 
 # libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
 override_dh_shlibdeps:

=== added file 'debian/ubuntu-system-settings-wizard.install'
--- debian/ubuntu-system-settings-wizard.install	1970-01-01 00:00:00 +0000
+++ debian/ubuntu-system-settings-wizard.install	2014-12-02 18:43:43 +0000
@@ -0,0 +1,5 @@
+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

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

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

=== added directory 'tests/wizard'
=== added file 'tests/wizard/CMakeLists.txt'
--- tests/wizard/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/wizard/CMakeLists.txt	2014-12-02 18:43:43 +0000
@@ -0,0 +1,5 @@
+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)

=== added file 'tests/wizard/tst_pagelist.cpp'
--- tests/wizard/tst_pagelist.cpp	1970-01-01 00:00:00 +0000
+++ tests/wizard/tst_pagelist.cpp	2014-12-02 18:43:43 +0000
@@ -0,0 +1,156 @@
+/*
+ * 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 "PageList.h"
+
+#include <QDebug>
+#include <QObject>
+#include <QTemporaryDir>
+#include <QTest>
+
+#define PAGES_PATH "ubuntu/settings/wizard/qml/Pages"
+
+class PageListTest: public QObject
+{
+    Q_OBJECT
+
+public:
+    PageListTest() {};
+
+private Q_SLOTS:
+    void testCollect();
+    void testIterate();
+    void testIgnoreNonNumbered();
+    void testIgnoreNonQml();
+    void testIgnoreDuplicates();
+    void testDisabled();
+
+private:
+    void fillRoot(const QTemporaryDir &root);
+    void makeFile(const QTemporaryDir &root, const QString &dir, const QString &filename);
+};
+
+void PageListTest::fillRoot(const QTemporaryDir &root)
+{
+    QVERIFY(root.isValid());
+    QDir rootDir = root.path();
+    QVERIFY(rootDir.mkpath(QString("a/") + PAGES_PATH));
+    QVERIFY(rootDir.mkpath(QString("b/") + PAGES_PATH));
+    QVERIFY(rootDir.mkpath(QString("c/") + PAGES_PATH));
+    qputenv("XDG_DATA_DIRS", QString(rootDir.path() + "/a:" +
+                                     rootDir.path() + "/b:" +
+                                     rootDir.path() + "/c").toLatin1());
+}
+
+void PageListTest::makeFile(const QTemporaryDir &root, const QString &dir, const QString &filename)
+{
+    QFile file(root.path() + "/" + dir + "/" + PAGES_PATH + "/" + filename);
+    QVERIFY(file.open(QIODevice::WriteOnly));
+    file.close();
+    QVERIFY(file.exists());
+}
+
+void PageListTest::testCollect()
+{
+    QTemporaryDir root;
+    fillRoot(root);
+    makeFile(root, "a", "3.qml");
+    makeFile(root, "b", "1.qml");
+    makeFile(root, "c", "2.qml");
+
+    PageList pageList;
+    QCOMPARE(pageList.entries(), QStringList() << "1.qml" << "2.qml" << "3.qml");
+    QCOMPARE(pageList.paths(), QStringList() << root.path() + "/b/" + PAGES_PATH + "/1.qml"
+                                             << root.path() + "/c/" + PAGES_PATH + "/2.qml"
+                                             << root.path() + "/a/" + PAGES_PATH + "/3.qml");
+}
+
+void PageListTest::testIterate()
+{
+    QTemporaryDir root;
+    fillRoot(root);
+    makeFile(root, "a", "1.qml");
+    makeFile(root, "a", "2.qml");
+    makeFile(root, "a", "3.qml");
+
+    PageList pageList;
+    QCOMPARE(pageList.index(), -1);
+    QCOMPARE(pageList.next(), root.path() + "/a/" + PAGES_PATH + "/1.qml");
+    QCOMPARE(pageList.prev(), QString());
+    QCOMPARE(pageList.next(), root.path() + "/a/" + PAGES_PATH + "/2.qml");
+    QCOMPARE(pageList.prev(), root.path() + "/a/" + PAGES_PATH + "/1.qml");
+    QCOMPARE(pageList.index(), 0);
+    QCOMPARE(pageList.next(), root.path() + "/a/" + PAGES_PATH + "/2.qml");
+    QCOMPARE(pageList.next(), root.path() + "/a/" + PAGES_PATH + "/3.qml");
+    QCOMPARE(pageList.index(), 2);
+    QCOMPARE(pageList.next(), QString());
+    QCOMPARE(pageList.index(), 2);
+}
+
+void PageListTest::testIgnoreNonNumbered()
+{
+    QTemporaryDir root;
+    fillRoot(root);
+    makeFile(root, "a", "1.qml");
+    makeFile(root, "a", "nope.qml");
+
+    PageList pageList;
+    QCOMPARE(pageList.entries(), QStringList() << "1.qml");
+}
+
+void PageListTest::testIgnoreNonQml()
+{
+    QTemporaryDir root;
+    fillRoot(root);
+    makeFile(root, "a", "1.qml");
+    makeFile(root, "a", "2");
+    makeFile(root, "a", "2.txt");
+
+    PageList pageList;
+    QCOMPARE(pageList.entries(), QStringList() << "1.qml");
+}
+
+void PageListTest::testIgnoreDuplicates()
+{
+    QTemporaryDir root;
+    fillRoot(root);
+    makeFile(root, "a", "1.qml");
+    makeFile(root, "b", "1.qml");
+
+    PageList pageList;
+    QCOMPARE(pageList.paths(), QStringList() << root.path() + "/a/" + PAGES_PATH + "/1.qml");
+}
+
+void PageListTest::testDisabled()
+{
+    QTemporaryDir root;
+    fillRoot(root);
+    makeFile(root, "a", "1.qml.disabled"); // before the fact
+    makeFile(root, "b", "1.qml");
+    makeFile(root, "b", "2.qml");
+    makeFile(root, "b", "2.qml.disabled"); // same dir
+    makeFile(root, "b", "3.qml");
+    makeFile(root, "b", "4.qml"); // only survivor
+    makeFile(root, "c", "3.qml.disabled"); // after the fact
+
+    PageList pageList;
+    QCOMPARE(pageList.entries(), QStringList() << "4.qml");
+}
+
+QTEST_MAIN(PageListTest)
+#include "tst_pagelist.moc"

=== added directory 'wizard'
=== added file 'wizard/50-com.ubuntu.system-settings.wizard.pkla'
--- wizard/50-com.ubuntu.system-settings.wizard.pkla	1970-01-01 00:00:00 +0000
+++ wizard/50-com.ubuntu.system-settings.wizard.pkla	2014-12-02 18:43:43 +0000
@@ -0,0 +1,6 @@
+[Allow welcome wizard to set AccountsService fields]
+Identity=unix-user:lightdm
+Action=org.freedesktop.accounts.user-administration
+ResultActive=yes
+ResultInactive=no
+ResultAny=no

=== added file 'wizard/CMakeLists.txt'
--- wizard/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ wizard/CMakeLists.txt	2014-12-02 18:43:43 +0000
@@ -0,0 +1,65 @@
+# 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
+    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)
+
+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)

=== added file 'wizard/PageList.cpp'
--- wizard/PageList.cpp	1970-01-01 00:00:00 +0000
+++ wizard/PageList.cpp	2014-12-02 18:43:43 +0000
@@ -0,0 +1,111 @@
+/*
+ * 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/>.
+ */
+
+/**
+ * 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,
+ *   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"
+ * - To go to the next page, use pageStack.next()
+ * - To go back to the previous page, use pageStack.prev()
+ * - To load a page outside of the normal flow (so that it doesn't affect the
+ *   back button), use pageStack.push(Qt.resolvedUrl("custom-page.qml")) in
+ *   your page.
+ * - See default pages for plenty of examples.
+ */
+
+#include "PageList.h"
+#include <QDir>
+#include <QStandardPaths>
+
+#include <QDebug>
+PageList::PageList(QObject *parent)
+    : QObject(parent),
+      m_index(-1),
+      m_pages()
+{
+    QString qmlSuffix = ".qml";
+    QString disabledSuffix = ".disabled";
+    QSet<QString> disabledPages;
+    QStringList dataDirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
+
+    QString rootDir = qgetenv("UBUNTU_SYSTEM_SETTINGS_WIZARD_ROOT"); // for testing
+    if (!rootDir.isEmpty())
+        dataDirs = QStringList() << rootDir;
+
+    Q_FOREACH(const QString &dataDir, dataDirs) {
+        QDir dir(dataDir + "/ubuntu/settings/wizard/qml/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))
+                m_pages.insert(entry, dir.absoluteFilePath(entry));
+            else if (entry.endsWith(qmlSuffix + disabledSuffix))
+                disabledPages.insert(entry.left(entry.size() - disabledSuffix.size()));
+        }
+    }
+
+    // Now remove any explicitly disabled entries
+    Q_FOREACH(const QString &page, disabledPages) {
+        m_pages.remove(page);
+    }
+}
+
+QStringList PageList::entries() const
+{
+    return m_pages.keys();
+}
+
+QStringList PageList::paths() const
+{
+    return m_pages.values();
+}
+
+int PageList::index() const
+{
+    return m_index;
+}
+
+int PageList::numPages() const
+{
+    return m_pages.size();
+}
+
+QString PageList::prev()
+{
+    if (m_index > 0)
+        return m_pages.values()[setIndex(m_index - 1)];
+    else
+        return QString();
+}
+
+QString PageList::next()
+{
+    if (m_index < m_pages.count() - 1)
+        return m_pages.values()[setIndex(m_index + 1)];
+    else
+        return QString();
+}
+
+int PageList::setIndex(int index)
+{
+    m_index = index;
+    Q_EMIT indexChanged();
+    return m_index;
+}

=== added file 'wizard/PageList.h'
--- wizard/PageList.h	1970-01-01 00:00:00 +0000
+++ wizard/PageList.h	2014-12-02 18:43:43 +0000
@@ -0,0 +1,55 @@
+/*
+ * 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/>.
+ */
+
+#ifndef PAGELIST_H
+#define PAGEList_H
+
+#include <QMap>
+#include <QObject>
+#include <QString>
+
+class PageList : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int index READ index NOTIFY indexChanged)
+    Q_PROPERTY(int numPages READ numPages NOTIFY numPagesChanged)
+
+public:
+    explicit PageList(QObject *parent = 0);
+
+    QStringList entries() const;
+    QStringList paths() const;
+    int index() const;
+    int numPages() const;
+
+public Q_SLOTS:
+    QString prev();
+    QString next();
+
+Q_SIGNALS:
+    void indexChanged();
+    void numPagesChanged(); // never emitted, just here to quiet Qml warnings
+
+private:
+    int setIndex(int index);
+
+    int m_index;
+    QMap<QString, QString> m_pages;
+};
+
+#endif // PAGELIST_H

=== added directory 'wizard/Unity'
=== added directory 'wizard/Unity/Application'
=== added file 'wizard/Unity/Application/CMakeLists.txt'
--- wizard/Unity/Application/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ wizard/Unity/Application/CMakeLists.txt	2014-12-02 18:43:43 +0000
@@ -0,0 +1,3 @@
+# 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})

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

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

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

=== added directory 'wizard/Utils'
=== added file 'wizard/Utils/CMakeLists.txt'
--- wizard/Utils/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ wizard/Utils/CMakeLists.txt	2014-12-02 18:43:43 +0000
@@ -0,0 +1,27 @@
+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})

=== added file 'wizard/Utils/plugin.cpp'
--- wizard/Utils/plugin.cpp	1970-01-01 00:00:00 +0000
+++ wizard/Utils/plugin.cpp	2014-12-02 18:43:43 +0000
@@ -0,0 +1,41 @@
+/*
+ * 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);
+}

=== added file 'wizard/Utils/plugin.h'
--- wizard/Utils/plugin.h	1970-01-01 00:00:00 +0000
+++ wizard/Utils/plugin.h	2014-12-02 18:43:43 +0000
@@ -0,0 +1,33 @@
+/*
+ * 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

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

=== added file 'wizard/Utils/qsortfilterproxymodelqml.cpp'
--- wizard/Utils/qsortfilterproxymodelqml.cpp	1970-01-01 00:00:00 +0000
+++ wizard/Utils/qsortfilterproxymodelqml.cpp	2014-12-02 18:43:43 +0000
@@ -0,0 +1,167 @@
+/*
+ * 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;
+    }
+}

=== added file 'wizard/Utils/qsortfilterproxymodelqml.h'
--- wizard/Utils/qsortfilterproxymodelqml.h	1970-01-01 00:00:00 +0000
+++ wizard/Utils/qsortfilterproxymodelqml.h	2014-12-02 18:43:43 +0000
@@ -0,0 +1,63 @@
+/*
+ * 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

=== added file 'wizard/Utils/system.cpp'
--- wizard/Utils/system.cpp	1970-01-01 00:00:00 +0000
+++ wizard/Utils/system.cpp	2014-12-02 18:43:43 +0000
@@ -0,0 +1,118 @@
+/*
+ * 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 "system.h"
+#include <QDBusInterface>
+#include <QDBusPendingCall>
+#include <QDBusPendingReply>
+#include <QFile>
+#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\"");
+}

=== added file 'wizard/Utils/system.h'
--- wizard/Utils/system.h	1970-01-01 00:00:00 +0000
+++ wizard/Utils/system.h	2014-12-02 18:43:43 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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 <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)
+
+public:
+    System();
+
+    bool hereEnabled() const;
+    void setHereEnabled(bool enabled);
+
+    QString hereLicensePath() const;
+
+public Q_SLOTS:
+    void updateSessionLanguage();
+
+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);
+
+private:
+    Q_DISABLE_COPY(System)
+
+    QDBusInterface *m_accounts;
+    bool m_hereEnabled;
+    QString m_hereLicensePath;
+};

=== added file 'wizard/main.cpp'
--- wizard/main.cpp	1970-01-01 00:00:00 +0000
+++ wizard/main.cpp	2014-12-02 18:43:43 +0000
@@ -0,0 +1,93 @@
+/*
+ * 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"

=== added directory 'wizard/qml'
=== added directory 'wizard/qml/Components'
=== added file 'wizard/qml/Components/CheckableSetting.qml'
--- wizard/qml/Components/CheckableSetting.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Components/CheckableSetting.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,85 @@
+/*
+ * 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.3
+import QMenuModel 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+ListItem.Empty {
+    id: listItem
+
+    property alias text: label.text
+    property bool checked: false
+    property real leftMargin
+    property real rightMargin
+
+    readonly property real labelOffset: label.x
+
+    signal linkActivated(string link)
+
+    implicitHeight: Math.max(label.height, checkBox.height)
+
+    Item {
+        anchors.fill: parent
+
+        CheckBox {
+            id: checkBox
+
+            anchors {
+                left: parent.left
+                top: parent.top
+                leftMargin: listItem.leftMargin
+            }
+
+            Component.onCompleted: {
+                checked = listItem.checked;
+            }
+
+            onClicked: {
+                listItem.checked = checked
+                listItem.triggered(listItem.checked)
+            }
+
+            Connections {
+                target: listItem
+                onCheckedChanged: checkBox.checked = listItem.checked
+            }
+
+            Connections {
+                target: listItem.__mouseArea
+                onClicked: {
+                    listItem.checked = !listItem.checked
+                    listItem.triggered(listItem.checked)
+                }
+            }
+        }
+
+        Label {
+            id: label
+            anchors {
+                left: checkBox.right
+                right: parent.right
+                verticalCenter: parent.verticalCenter
+                leftMargin: units.gu(2)
+                rightMargin: listItem.rightMargin
+            }
+            wrapMode: Text.Wrap
+            linkColor: Theme.palette.normal.foregroundText
+            onLinkActivated: listItem.linkActivated(link)
+        }
+    }
+}

=== added file 'wizard/qml/Components/InputMethod.qml'
--- wizard/qml/Components/InputMethod.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Components/InputMethod.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,113 @@
+/*
+ * 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;
+        }
+    }
+}

=== added file 'wizard/qml/Components/Page.qml'
--- wizard/qml/Components/Page.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Components/Page.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,107 @@
+/*
+ * 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 "." as LocalComponents
+
+Item {
+    readonly property real buttonMargin: units.gu(2)
+    readonly property real buttonWidth: (width - buttonMargin * 2) / 2 -
+                                        buttonMargin / 2
+    readonly property real topMargin: units.gu(8)
+    readonly property real leftMargin: units.gu(2)
+    readonly property real rightMargin: units.gu(2)
+
+    // If you want to skip a page, mark skipValid false while you figure out
+    // whether to skip, then set it to true once you've determined the value
+    // of the skip property.
+    property bool skipValid: true
+    property bool skip: false
+
+    property bool hasBackButton: true
+    property bool customBack: false
+    property alias forwardButtonSourceComponent: forwardButton.sourceComponent
+    property alias content: contentHolder
+
+    property string title: ""
+
+    signal backClicked()
+
+    visible: false
+    anchors.fill: parent
+
+    // We want larger than even fontSize: "x-large", so we use a Text instead
+    // of a Label.
+    Text {
+        id: titleLabel
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            topMargin: topMargin
+            leftMargin: leftMargin
+            rightMargin: rightMargin
+        }
+        wrapMode: Text.Wrap
+        text: title
+        color: Theme.palette.normal.baseText
+        font.pixelSize: units.gu(4)
+    }
+
+    Item {
+        id: contentHolder
+        anchors {
+            top: titleLabel.bottom
+            left: parent.left
+            right: parent.right
+            bottom: backButton.top
+            topMargin: units.gu(4)
+            leftMargin: leftMargin
+            rightMargin: rightMargin
+            bottomMargin: buttonMargin
+        }
+    }
+
+    LocalComponents.StackButton {
+        id: backButton
+        width: buttonWidth
+        anchors {
+            left: parent.left
+            bottom: parent.bottom
+            leftMargin: buttonMargin
+            bottomMargin: buttonMargin
+        }
+        z: 1
+        text: i18n.tr("Back")
+        visible: pageStack.depth > 1 && hasBackButton
+        backArrow: true
+
+        onClicked: customBack ? backClicked() : pageStack.prev()
+    }
+
+    Loader {
+        id: forwardButton
+        width: buttonWidth
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
+            rightMargin: buttonMargin
+            bottomMargin: buttonMargin
+        }
+        z: 1
+    }
+}

=== added file 'wizard/qml/Components/StackButton.qml'
--- wizard/qml/Components/StackButton.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Components/StackButton.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,47 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+
+AbstractButton {
+    id: stackButton
+
+    property string text
+
+    property bool backArrow: false
+
+    width: label.width
+    height: label.height + units.gu(4)
+
+    Label {
+        id: label
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+        anchors.right: parent.right
+        color: enabled ? Theme.palette.selected.backgroundText : Qt.darker(Theme.palette.selected.backgroundText, 1.5)
+        text: {
+            if (backArrow) {
+                // Translators: This is the arrow for "Back" buttons
+                return i18n.tr("〈  %1".arg(stackButton.text))
+            } else {
+                // Translators: This is the arrow for "Forward" buttons
+                return i18n.tr("%1  〉".arg(stackButton.text))
+            }
+        }
+        horizontalAlignment: backArrow ? Text.AlignLeft : Text.AlignRight
+    }
+}

=== added directory 'wizard/qml/Pages'
=== added file 'wizard/qml/Pages/10-welcome.qml'
--- wizard/qml/Pages/10-welcome.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/10-welcome.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,93 @@
+/*
+ * 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 Ubuntu.Components.ListItems 0.1
+import Ubuntu.SystemSettings.LanguagePlugin 1.0
+import Ubuntu.SystemSettings.Wizard.Utils 0.1
+import "../Components" as LocalComponents
+
+LocalComponents.Page {
+    title: i18n.tr("Hi!")
+    forwardButtonSourceComponent: forwardButton
+
+    UbuntuLanguagePlugin {
+        id: plugin
+    }
+
+    Column {
+        id: column
+        anchors.fill: content
+        spacing: units.gu(1)
+
+        Label {
+            id: label1
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            text: i18n.tr("Welcome to your Ubuntu phone.")
+        }
+
+        Label {
+            id: label2
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            text: i18n.tr("Let’s get started.")
+        }
+
+        Item { // spacer
+            height: units.gu(2)
+            width: units.gu(1) // needed else it will be ignored
+        }
+
+        ComboButton {
+            id: combo
+            anchors.left: parent.left
+            anchors.right: parent.right
+            text: listview.currentItem.text
+            onClicked: expanded = !expanded
+            expandedHeight: column.height - combo.y
+            UbuntuListView {
+                id: listview
+                model: plugin.languageNames
+                currentIndex: plugin.currentLanguage
+                delegate: Standard {
+                    text: modelData
+                    onClicked: {
+                        listview.currentIndex = index
+                        combo.expanded = false
+                        i18n.language = plugin.languageCodes[index]
+                        i18n.domain = i18n.domain
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: forwardButton
+        LocalComponents.StackButton {
+            text: i18n.tr("Continue")
+            onClicked: {
+                plugin.currentLanguage = listview.currentIndex
+                System.updateSessionLanguage()
+                pageStack.next()
+            }
+        }
+    }
+}

=== added file 'wizard/qml/Pages/20-sim.qml'
--- wizard/qml/Pages/20-sim.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/20-sim.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import MeeGo.QOfono 0.2
+import Ubuntu.Components 0.1
+import "../Components" as LocalComponents
+
+LocalComponents.Page {
+    title: i18n.tr("Add a SIM card and restart your device")
+    forwardButtonSourceComponent: forwardButton
+
+    // No need for skipValid, since OfonoManager does everything synchronously
+    skip: !manager.available || manager.modems.length === 0 || simManager0.present || simManager1.present
+
+    OfonoManager {
+        id: manager
+    }
+
+    // Ideally we would query the system more cleverly than hardcoding two
+    // modems.  But we don't yet have a more clever way.  :(
+    OfonoSimManager {
+        id: simManager0
+        modemPath: manager.modems.length >= 1 ? manager.modems[0] : ""
+    }
+
+    OfonoSimManager {
+        id: simManager1
+        modemPath: manager.modems.length >= 2 ? manager.modems[1] : ""
+    }
+
+    Column {
+        anchors.fill: content
+        spacing: units.gu(4)
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            text: i18n.tr("Without it, you won’t be able to make calls or use text messaging.")
+        }
+
+        Image {
+            id: image
+            source: "data/[e-mail]"
+            height: units.gu(6.5)
+            width: units.gu(9)
+        }
+    }
+
+    Component {
+        id: forwardButton
+        LocalComponents.StackButton {
+            text: i18n.tr("Skip")
+            onClicked: pageStack.next()
+        }
+    }
+}

=== added file 'wizard/qml/Pages/30-passwd-type.qml'
--- wizard/qml/Pages/30-passwd-type.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/30-passwd-type.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,119 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
+import Ubuntu.SystemSettings.SecurityPrivacy 1.0
+import "../Components" as LocalComponents
+
+/**
+ * One quirk with this page: we don't actually set the password.  We avoid
+ * doing it here because the user can come back to this page and change their
+ * answer.  We don't run as root, so if we did set the password immediately,
+ * we'd need to prompt for their previous password when they came back and
+ * changed their answer.  Which is silly UX.  So instead, we just keep track
+ * of their choice and set the password at the end (see main.qml).
+ * Setting the password shouldn't fail, since Ubuntu Touch has loose password
+ * requirements, but we'll check what we can here.  Ideally we'd be able to ask
+ * the system if a password is legal without actually setting that password.
+ */
+
+LocalComponents.Page {
+    id: passwdPage
+    title: i18n.tr("Lock security")
+    forwardButtonSourceComponent: forwardButton
+
+    function indexToMethod(index) {
+        if (index === 0)
+            return UbuntuSecurityPrivacyPanel.Swipe
+        else if (index === 1)
+            return UbuntuSecurityPrivacyPanel.Passcode
+        else
+            return UbuntuSecurityPrivacyPanel.Passphrase
+    }
+
+    function methodToIndex(method) {
+        if (method === UbuntuSecurityPrivacyPanel.Swipe)
+            return 0
+        else if (method === UbuntuSecurityPrivacyPanel.Passcode)
+            return 1
+        else
+            return 2
+    }
+
+    Connections {
+        target: root
+        onPasswordMethodChanged: selector.selectedIndex = methodToIndex(root.passwordMethod)
+    }
+
+    Column {
+        id: column
+        anchors.fill: content
+        spacing: units.gu(4)
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            text: i18n.tr("Please select how you’d like to unlock your phone.")
+        }
+
+        ItemSelector {
+            id: selector
+            expanded: true
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            model: ["", "", ""] // otherwise the delegate will show the text itself and we only want subText
+
+            selectedIndex: methodToIndex(root.passwordMethod)
+
+            delegate: OptionSelectorDelegate {
+                // use subText because we want the text to be small, and we have no other way to control it
+                subText: {
+                    var method = indexToMethod(index)
+                    var name = ""
+                    var desc = ""
+                    if (method === UbuntuSecurityPrivacyPanel.Swipe) {
+                        name = i18n.tr("Swipe")
+                        desc = i18n.tr("No security")
+                    } else if (method === UbuntuSecurityPrivacyPanel.Passcode) {
+                        name = i18n.tr("Passcode")
+                        desc = i18n.tr("4 digits only")
+                    } else {
+                        name = i18n.tr("Passphrase")
+                        desc = i18n.tr("Numbers and letters")
+                    }
+                    return "<b>%1</b> (%2)".arg(name).arg(desc)
+                }
+            }
+
+            style: Item {}
+        }
+    }
+
+    Component {
+        id: forwardButton
+        LocalComponents.StackButton {
+            text: i18n.tr("Continue")
+            onClicked: {
+                root.passwordMethod = indexToMethod(selector.selectedIndex)
+                pageStack.load(Qt.resolvedUrl("passwd-set.qml"))
+            }
+        }
+    }
+}

=== added file 'wizard/qml/Pages/40-wifi.qml'
--- wizard/qml/Pages/40-wifi.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/40-wifi.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import 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
+
+LocalComponents.Page {
+    id: wifiPage
+    title: i18n.tr("Connect to Wi‑Fi")
+    forwardButtonSourceComponent: forwardButton
+
+    readonly property bool connected: mainMenu.connectedAPs === 1
+
+    function getExtendedProperty(object, propertyName, defaultValue) {
+        if (object && object.hasOwnProperty(propertyName)) {
+            return object[propertyName];
+        }
+        return defaultValue;
+    }
+
+    QMenuModel.UnityMenuModel {
+        id: menuModel
+        busName: "com.canonical.indicator.network"
+        actions: { "indicator": "/com/canonical/indicator/network" }
+        menuObjectPath: "/com/canonical/indicator/network/phone_wifi_settings"
+    }
+
+    Component {
+        id: accessPointComponent
+        ListItem.Standard {
+            id: accessPoint
+            objectName: "accessPoint"
+
+            property QtObject menuData: null
+            property var unityMenuModel: menuModel
+            property var extendedData: menuData && menuData.ext || undefined
+            property var strengthAction: QMenuModel.UnityMenuAction {
+                model: unityMenuModel
+                index: menuIndex
+                name: getExtendedProperty(extendedData, "xCanonicalWifiApStrengthAction", "")
+            }
+            property bool checked: menuData && menuData.isToggled || false
+            property bool secure: getExtendedProperty(extendedData, "xCanonicalWifiApIsSecure", false)
+            property bool adHoc: getExtendedProperty(extendedData, "xCanonicalWifiApIsAdhoc", false)
+            property int signalStrength: strengthAction.valid ? strengthAction.state : 0
+            property int menuIndex: -1
+
+            function loadAttributes() {
+                if (!unityMenuModel || menuIndex == -1) return;
+                unityMenuModel.loadExtendedAttributes(menuIndex, {'x-canonical-wifi-ap-is-adhoc': 'bool',
+                                                                  'x-canonical-wifi-ap-is-secure': 'bool',
+                                                                  'x-canonical-wifi-ap-strength-action': 'string'});
+            }
+
+            signal activate()
+
+            text: menuData && menuData.label || ""
+            enabled: menuData && menuData.sensitive || false
+            iconName: {
+                var imageName = "nm-signal-100";
+
+                if (adHoc) {
+                    imageName = "nm-adhoc";
+                } else if (signalStrength == 0) {
+                    imageName = "nm-signal-00";
+                } else if (signalStrength <= 25) {
+                    imageName = "nm-signal-25";
+                } else if (signalStrength <= 50) {
+                    imageName = "nm-signal-50";
+                } else if (signalStrength <= 75) {
+                    imageName = "nm-signal-75";
+                }
+
+                if (secure) {
+                    imageName += "-secure";
+                }
+                return imageName;
+            }
+            iconFrame: false
+            control: CheckBox {
+                id: checkBoxActive
+
+                onClicked: {
+                    accessPoint.activate();
+                }
+            }
+            style: Rectangle {
+                color: "#4c000000"
+            }
+
+            Component.onCompleted: {
+                loadAttributes();
+            }
+            onUnityMenuModelChanged: {
+                loadAttributes();
+            }
+            onMenuIndexChanged: {
+                loadAttributes();
+            }
+            onCheckedChanged: {
+                // Can't rely on binding. Checked is assigned on click.
+                checkBoxActive.checked = checked;
+                if (checked) {
+                    mainMenu.connectedAPs++
+                } else {
+                    mainMenu.connectedAPs--
+                }
+            }
+            onActivate: unityMenuModel.activate(menuIndex);
+        }
+    }
+
+    Column {
+        id: column
+        spacing: units.gu(2)
+        anchors.top: content.top
+        anchors.bottom: content.bottom
+        anchors.left: wifiPage.left
+        anchors.right: wifiPage.right
+
+        Label {
+            id: label
+            anchors.left: parent.left
+            anchors.leftMargin: leftMargin
+            anchors.right: parent.right
+            anchors.rightMargin: rightMargin
+            fontSize: "small"
+            text: mainMenu.count > 0 ? i18n.tr("Available networks…")
+                                     : i18n.tr("No available networks.")
+        }
+
+        Flickable {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: column.height - label.height - column.spacing
+            contentHeight: contentItem.childrenRect.height
+            clip: true
+            flickDeceleration: 1500 * units.gridUnit / 8
+            maximumFlickVelocity: 2500 * units.gridUnit / 8
+            boundsBehavior: (contentHeight > height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+
+            Column {
+                anchors.left: parent.left
+                anchors.right: parent.right
+
+                Repeater {
+                    id: mainMenu
+
+                    // FIXME Check connection better https://bugs.launchpad.net/indicator-network/+bug/1349371
+                    property int connectedAPs: 0
+
+                    model: menuModel
+
+                    delegate: Loader {
+                        id: loader
+
+                        readonly property bool isAccessPoint: model.type === "unity.widgets.systemsettings.tablet.accesspoint"
+
+                        anchors.left: parent.left
+                        anchors.right: parent.right
+                        height: isAccessPoint ? units.gu(6) : 0
+                        asynchronous: true
+                        sourceComponent: isAccessPoint ? accessPointComponent : null
+
+                        onLoaded: {
+                            item.menuData = Qt.binding(function() { return model; });
+                            item.menuIndex = Qt.binding(function() { return index; });
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Component {
+        id: forwardButton
+        LocalComponents.StackButton {
+            text: (connected || mainMenu.count === 0) ? i18n.tr("Continue") : i18n.tr("Skip")
+            onClicked: pageStack.next()
+        }
+    }
+}

=== added file 'wizard/qml/Pages/50-location.qml'
--- wizard/qml/Pages/50-location.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/50-location.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2013,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.3
+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
+
+LocalComponents.Page {
+    title: i18n.tr("Location")
+    forwardButtonSourceComponent: forwardButton
+
+    property bool pathSet: System.hereLicensePath !== " " // single space means it's unassigned
+    property bool countSet: false
+    skipValid: pathSet && (System.hereLicensePath === "" || countSet)
+    skip: skipValid && (System.hereLicensePath === "" || termsModel.count === 0)
+
+    Connections {
+        target: termsModel
+        onCountChanged: if (pathSet) countSet = true
+    }
+
+    FolderListModel {
+        id: termsModel
+        folder: System.hereLicensePath
+        nameFilters: ["*.html"]
+        showDirs: false
+        showOnlyReadable: true
+    }
+
+    QMenuModel.QDBusActionGroup {
+        id: locationActionGroup
+        busType: QMenuModel.DBus.SessionBus
+        busName: "com.canonical.indicator.location"
+        objectPath: "/com/canonical/indicator/location"
+        property variant location: action("location-detection-enabled")
+        property variant gps: action("gps-detection-enabled")
+        Component.onCompleted: start()
+    }
+
+    Column {
+        id: column
+        anchors.fill: content
+        spacing: units.gu(3)
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            text: i18n.tr("Let the phone detect your location:")
+        }
+
+        LocalComponents.CheckableSetting {
+            id: gpsCheck
+            showDivider: false
+            text: i18n.tr("Using GPS only (less accurate)")
+            onTriggered: {
+                gpsCheck.checked = true;
+                hereCheck.checked = false;
+                nopeCheck.checked = false;
+            }
+        }
+
+        Column {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: childrenRect.height
+
+            LocalComponents.CheckableSetting {
+                id: hereCheck
+                showDivider: false
+                text: i18n.tr("Using GPS, anonymized Wi-Fi and cellular network info (recommended)")
+                checked: true
+                onTriggered: {
+                    gpsCheck.checked = false;
+                    hereCheck.checked = true;
+                    nopeCheck.checked = false;
+                }
+            }
+
+            Label {
+                anchors.left: parent.left
+                anchors.leftMargin: hereCheck.labelOffset
+                anchors.right: parent.right
+                wrapMode: Text.Wrap
+                linkColor: Theme.palette.normal.foregroundText
+                // TRANSLATORS: HERE is a trademark for Nokia's location service, you probably shouldn't translate it
+                text: i18n.tr("By selecting this option you agree to the Nokia HERE <a href='#'>terms and conditions</a>.")
+                onLinkActivated: pageStack.load(Qt.resolvedUrl("here-terms.qml"))
+            }
+        }
+
+        LocalComponents.CheckableSetting {
+            id: nopeCheck
+            showDivider: false
+            text: i18n.tr("Not at all")
+            onTriggered: {
+                gpsCheck.checked = false;
+                hereCheck.checked = false;
+                nopeCheck.checked = true;
+            }
+        }
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            text: i18n.tr("You can change your mind later in <b>System Settings</b>.")
+        }
+    }
+
+    Component {
+        id: forwardButton
+        LocalComponents.StackButton {
+            text: i18n.tr("Continue")
+            onClicked: {
+                var locationOn = gpsCheck.checked || hereCheck.checked;
+                var gpsOn = gpsCheck.checked || hereCheck.checked;
+                var hereOn = hereCheck.checked;
+
+                // location service doesn't currently listen to updateState
+                // requests, so we activate the actions if needed.
+                if (locationActionGroup.location.state != locationOn) {
+                    locationActionGroup.location.activate();
+                }
+                if (locationActionGroup.gps.state != gpsOn) {
+                    locationActionGroup.gps.activate();
+                }
+                System.hereEnabled = hereOn;
+                pageStack.next()
+            }
+        }
+    }
+}

=== added file 'wizard/qml/Pages/60-reporting.qml'
--- wizard/qml/Pages/60-reporting.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/60-reporting.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2013,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 Ubuntu.Components 0.1
+import "../Components" as LocalComponents
+
+LocalComponents.Page {
+    title: i18n.tr("Improving your experience")
+    forwardButtonSourceComponent: forwardButton
+
+    Column {
+        id: column
+        anchors.fill: content
+        spacing: units.gu(2)
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            text: i18n.tr("Your phone is set up to automatically report errors to Canonical and its partners, the makers of the operating system.")
+        }
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            text: i18n.tr("This can be disabled in <b>System Settings</b> under <b>Security &amp; Privacy</b>")
+        }
+    }
+
+    Component {
+        id: forwardButton
+        LocalComponents.StackButton {
+            text: i18n.tr("Continue")
+            onClicked: pageStack.next()
+        }
+    }
+}

=== added file 'wizard/qml/Pages/80-finished.qml'
--- wizard/qml/Pages/80-finished.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/80-finished.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2013,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 Ubuntu.Components 0.1
+import "../Components" as LocalComponents
+
+LocalComponents.Page {
+    title: i18n.tr("All done")
+    forwardButtonSourceComponent: forwardButton
+    hasBackButton: false
+
+    Column {
+        id: column
+        anchors.fill: content
+        spacing: units.gu(1)
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            fontSize: "large"
+            font.bold: true
+            text: i18n.tr("Nice work!")
+        }
+
+        Label {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            text: i18n.tr("Your phone is now ready to use.")
+        }
+    }
+
+    Component {
+        id: forwardButton
+        LocalComponents.StackButton {
+            text: i18n.tr("Finish")
+            onClicked: root.quitWizard()
+        }
+    }
+}

=== added directory 'wizard/qml/Pages/data'
=== added file 'wizard/qml/Pages/data/[e-mail]'
Binary files wizard/qml/Pages/data/[e-mail]	1970-01-01 00:00:00 +0000 and wizard/qml/Pages/data/[e-mail]	2014-12-02 18:43:43 +0000 differ
=== added file 'wizard/qml/Pages/here-terms.qml'
--- wizard/qml/Pages/here-terms.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/here-terms.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,117 @@
+/*
+ * 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.3
+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
+
+LocalComponents.Page {
+    title: i18n.tr("Terms & Conditions")
+    customBack: true
+
+    FolderListModel {
+        id: termsModel
+        folder: System.hereLicensePath
+        nameFilters: ["*.html"]
+        showDirs: false
+        showOnlyReadable: true
+        onCountChanged: loadFileContent()
+    }
+
+    function makeFileName(lang, country) {
+        return lang + "_" + country + ".html"
+    }
+
+    function defaultCountryForLanguage(lang) {
+        if (lang === "da") return "DK"
+        if (lang === "en") return "US"
+        if (lang === "ko") return "KR"
+        if (lang === "zh") return "CN"
+        return lang.toUpperCase()
+    }
+
+    function determineFileName() {
+        var codes = i18n.language.split(".")[0].split("_")
+        var defaultCountry = defaultCountryForLanguage(codes[0])
+        if (codes.count === 1)
+            codes = [codes[0], defaultCountry]
+        var perfectMatch = makeFileName(codes[0], codes[1])
+        var nearMatch = makeFileName(codes[0], defaultCountry)
+        var nearMatchExists = false
+
+        for (var i = 0; i < termsModel.count; i++) {
+            var fileName = termsModel.get(i, "fileName")
+            if (fileName == perfectMatch) {
+                return perfectMatch
+            } else if (fileName == nearMatch) {
+                nearMatchExists = true
+            }
+        }
+
+        if (nearMatchExists) {
+            return nearMatch
+        } else {
+            return makeFileName("en", "US")
+        }
+    }
+
+    function loadFileContent() {
+        var xhr = new XMLHttpRequest
+        xhr.open("GET", System.hereLicensePath + "/" + determineFileName())
+        xhr.onreadystatechange = function() {
+            if (xhr.readyState == XMLHttpRequest.DONE) {
+                termsLabel.text = xhr.responseText
+            }
+        }
+        xhr.send()
+    }
+
+    onBackClicked: {
+        if (webview.visible) {
+            termsLabel.visible = true
+        } else {
+            pageStack.prev()
+        }
+    }
+
+    Column {
+        id: column
+        anchors.fill: content
+
+        Label {
+            id: termsLabel
+            anchors.left: parent.left
+            anchors.right: parent.right
+            wrapMode: Text.Wrap
+            linkColor: Theme.palette.normal.foregroundText
+            onLinkActivated: {
+                webview.url = link
+                termsLabel.visible = false
+            }
+        }
+
+        WebView {
+            id: webview
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: parent.height
+            visible: !termsLabel.visible
+        }
+    }
+}

=== added file 'wizard/qml/Pages/passwd-confirm.qml'
--- wizard/qml/Pages/passwd-confirm.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/passwd-confirm.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,85 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.SystemSettings.SecurityPrivacy 1.0
+import "../Components" as LocalComponents
+import "file:///usr/share/unity8/Components" as UnityComponents
+
+/**
+ * See the main passwd-type page for an explanation of why we don't actually
+ * directly set the password here.
+ */
+
+LocalComponents.Page {
+    id: passwdSetPage
+    forwardButtonSourceComponent: forwardButton
+
+    skip: root.passwordMethod === UbuntuSecurityPrivacyPanel.Swipe
+
+    // If we are entering this page, clear any saved password and get focus
+    onEnabledChanged: if (enabled) lockscreen.clear(false)
+
+    UnityComponents.Lockscreen {
+        id: lockscreen
+        anchors {
+            fill: parent
+            topMargin: topMargin
+            leftMargin: leftMargin
+            rightMargin: rightMargin
+            bottomMargin: buttonMargin
+        }
+
+        infoText: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase ?
+                  i18n.tr("Confirm passphrase") :
+                  i18n.tr("Confirm passcode")
+
+        errorText: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase ?
+                  i18n.tr("Sorry, incorrect passphrase.") + "\n" + i18n.tr("Please try again.") :
+                  i18n.tr("Sorry, incorrect passcode.") + "\n" + i18n.tr("Please try again.")
+
+        showEmergencyCallButton: false
+        showCancelButton: false
+        alphaNumeric: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase
+        minPinLength: 4
+        maxPinLength: 4
+
+        onEntered: {
+            if (passphrase === root.password) {
+                confirmTimer.start()
+            } else {
+                clear(true)
+            }
+        }
+
+        Timer {
+            id: confirmTimer
+            interval: UbuntuAnimation.SnapDuration
+            onTriggered: pageStack.next()
+        }
+    }
+
+    Component {
+        id: forwardButton
+        LocalComponents.StackButton {
+            visible: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase
+            enabled: root.password === lockscreen.passphrase
+            text: i18n.tr("Continue")
+            onClicked: pageStack.next()
+        }
+    }
+}

=== added file 'wizard/qml/Pages/passwd-set.qml'
--- wizard/qml/Pages/passwd-set.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/Pages/passwd-set.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,93 @@
+/*
+ * 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.3
+import Ubuntu.Components 1.1
+import Ubuntu.SystemSettings.SecurityPrivacy 1.0
+import "../Components" as LocalComponents
+import "file:///usr/share/unity8/Components" as UnityComponents
+
+/**
+ * See the main passwd-type page for an explanation of why we don't actually
+ * directly set the password here.
+ */
+
+LocalComponents.Page {
+    id: passwdSetPage
+    forwardButtonSourceComponent: forwardButton
+
+    skip: root.passwordMethod === UbuntuSecurityPrivacyPanel.Swipe
+
+    // If we are entering this page, clear any saved password and get focus
+    onEnabledChanged: if (enabled) lockscreen.clear(false)
+
+    function confirm() {
+        root.password = lockscreen.passphrase;
+        confirmTimer.start()
+    }
+
+    Timer {
+        id: confirmTimer
+        interval: UbuntuAnimation.SnapDuration
+        onTriggered: pageStack.load(Qt.resolvedUrl("passwd-confirm.qml"));
+    }
+
+    UnityComponents.Lockscreen {
+        id: lockscreen
+        anchors {
+            fill: parent
+            topMargin: topMargin
+            leftMargin: leftMargin
+            rightMargin: rightMargin
+            bottomMargin: buttonMargin
+        }
+
+        infoText: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase ?
+                  i18n.tr("Enter passphrase") :
+                  i18n.tr("Choose your passcode")
+
+        // Note that the number four comes from PAM settings,
+        // which we don't have a good way to interrogate.  We
+        // only do this matching instead of PAM because we want
+        // to set the password via PAM in a different place
+        // than this page.  See comments at top of passwd-type file.
+        errorText: i18n.tr("Passphrase must be 4 characters long")
+
+        showEmergencyCallButton: false
+        showCancelButton: false
+        alphaNumeric: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase
+        minPinLength: 4
+        maxPinLength: 4
+
+        onEntered: {
+            if (passphrase.length >= 4) {
+                passwdSetPage.confirm();
+            } else {
+                lockscreen.clear(true)
+            }
+        }
+    }
+
+    Component {
+        id: forwardButton
+        LocalComponents.StackButton {
+            visible: root.passwordMethod === UbuntuSecurityPrivacyPanel.Passphrase
+            enabled: lockscreen.passphrase.length >= 4
+            text: i18n.tr("Continue")
+            onClicked: passwdSetPage.confirm()
+        }
+    }
+}

=== added file 'wizard/qml/main.qml'
--- wizard/qml/main.qml	1970-01-01 00:00:00 +0000
+++ wizard/qml/main.qml	2014-12-02 18:43:43 +0000
@@ -0,0 +1,246 @@
+/*
+ * 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 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
+
+Item {
+    id: root
+    width: units.gu(40)
+    height: units.gu(71)
+    focus: true
+
+    // 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
+            // the method.  Worst case, we just leave the user with a swipe
+            // security method and they fix it in the system settings.
+            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
+                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
+                    }
+                }
+            }
+
+            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;
+        }
+    }
+}

=== added file 'wizard/test.sh'
--- wizard/test.sh	1970-01-01 00:00:00 +0000
+++ wizard/test.sh	2014-12-02 18:43:43 +0000
@@ -0,0 +1,18 @@
+#!/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

=== added file 'wizard/ubuntu-system-settings-wizard-cleanup.conf'
--- wizard/ubuntu-system-settings-wizard-cleanup.conf	1970-01-01 00:00:00 +0000
+++ wizard/ubuntu-system-settings-wizard-cleanup.conf	2014-12-02 18:43:43 +0000
@@ -0,0 +1,20 @@
+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

=== added file 'wizard/ubuntu-system-settings-wizard-set-lang.conf'
--- wizard/ubuntu-system-settings-wizard-set-lang.conf	1970-01-01 00:00:00 +0000
+++ wizard/ubuntu-system-settings-wizard-set-lang.conf	2014-12-02 18:43:43 +0000
@@ -0,0 +1,30 @@
+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

=== added file 'wizard/ubuntu-system-settings-wizard.conf'
--- wizard/ubuntu-system-settings-wizard.conf	1970-01-01 00:00:00 +0000
+++ wizard/ubuntu-system-settings-wizard.conf	2014-12-02 18:43:43 +0000
@@ -0,0 +1,75 @@
+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