Merge lp:~unity-api-team/unity-scopes-shell/scope-settings into lp:unity-scopes-shell

[Pete Woods]

Add settings support

Add settings support

[lp:~unity-api-team/unity-scopes-shell/scope-settings]

151. By Pete Woods on 2014-06-26

Increase version requirement

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/138/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/138/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:151
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/139/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/36/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/139/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:152
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/140/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/37/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/37/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/140/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/unity-scopes-shell/scope-settings]

152. By Pete Woods on 2014-07-03

Merge trunk

153. By Pete Woods on 2014-07-03

Increment build deps

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:153
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/141/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/38/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/141/rebuild

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/unity-scopes-shell/scope-settings]

154. By Pete Woods on 2014-07-08

Implement the count method

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:154
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/143/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/40/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/40/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/143/rebuild

review: Needs Fixing (continuous-integration)

[Michal Hruby (mhr3)]

33 +pkg_check_modules(U1DB REQUIRED libu1db-qt5)

Missing in debian/control

[Michal Hruby (mhr3)]

110 + new SettingsModel(QDir::home().filePath(".local/share"), id(),
111 + scopeVariantToQVariant(settings_definitions), this));

Isn't the .local/share/scope_id just a symlink to /opt/... for click-packaged scopes? Can unity even write in there?

211 + QVariantMap data = it.toMap();

Can we rely on the data being valid? Shouldn't it check first that all the necessary keys are in there?

234 + m_timers[id] = timer;

A timer per-setting? Why's that needed?

review: Needs Information

[Pete Woods (pete-woods)]

> 110 + new
> SettingsModel(QDir::home().filePath(".local/share"), id(),
> 111 + scopeVariantToQVariant(settings_definitions),
> this));
>
> Isn't the .local/share/scope_id just a symlink to /opt/... for click-packaged
> scopes? Can unity even write in there?
>

This is the standard place for apps to write settings AFAIK. It's different to the path "~/.local/share/unity-scopes/ID". Confined scopes can't actually read/write this path either, so this prevents them from modifying their own settings.

> 211 + QVariantMap data = it.toMap();
>
> Can we rely on the data being valid? Shouldn't it check first that all the
> necessary keys are in there?
>
Yes. I removed the validation code because Michi performs all these checks in the scopes API itself.

> 234 + m_timers[id] = timer;
>
> A timer per-setting? Why's that needed?

The individual timers are used to avoid the need for a queue of changes, and generally keep the timing logic simple. Each timer just gets a cached version of the newest value of the setting it manages set as a property while it's active. Given there are only going to be < 10 of them, they shouldn't be an expensive overhead.

[lp:~unity-api-team/unity-scopes-shell/scope-settings]

155. By Pete Woods on 2014-07-09

Change timer type to VeryCoarseTimer

[Michal Hruby (mhr3)]

> Change timer type to VeryCoarseTimer

Ok, that makes me happier.

review: Approve

[lp:~unity-api-team/unity-scopes-shell/scope-settings]

156. By Pete Woods on 2014-07-09

Re-order to help with performance

157. By Pete Woods on 2014-07-10

Add missing build dependency

=== modified file 'debian/control'
--- debian/control	2014-06-26 08:16:37 +0000
+++ debian/control	2014-07-10 07:45:27 +0000
@@ -4,8 +4,9 @@
 Build-Depends: cmake,
                debhelper (>= 9),
                libunity-api-dev (>= 7.83),
-               libunity-scopes-dev (>= 0.5.1~),
+               libunity-scopes-dev (>= 0.5.2~),
                libgsettings-qt-dev (>= 0.1),
+               libu1db-qt5-dev,
                pkg-config,
                qt5-default,
                qtdeclarative5-dev,
 
=== modified file 'src/Unity/CMakeLists.txt'
--- src/Unity/CMakeLists.txt	2014-06-05 10:37:50 +0000
+++ src/Unity/CMakeLists.txt	2014-07-10 07:45:27 +0000
@@ -2,15 +2,17 @@
 include(Plugins)
 
 # Dependencies
-pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=1)
-pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.4.8)
+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=2)
+pkg_check_modules(SCOPESLIB REQUIRED libunity-scopes>=0.5.2)
 pkg_check_modules(GSETTINGSQT REQUIRED gsettings-qt)
+pkg_check_modules(U1DB REQUIRED libu1db-qt5)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${SCOPESLIB_INCLUDE_DIRS}
     ${GSETTINGSQT_INCLUDE_DIRS}
+    ${U1DB_INCLUDE_DIRS}
 )
 
 set(QMLPLUGIN_SRC
@@ -24,6 +26,7 @@
     resultsmodel.cpp
     scope.cpp
     scopes.cpp
+    settingsmodel.cpp
     utils.cpp
     plugin.cpp
     iconutils.cpp
@@ -37,6 +40,7 @@
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ResultsModelInterface.h
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ScopeInterface.h
     ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ScopesInterface.h
+    ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/SettingsModelInterface.h
 )
 
 add_library(Unity-qml SHARED ${QMLPLUGIN_SRC})
@@ -44,6 +48,7 @@
 target_link_libraries(Unity-qml
     ${SCOPESLIB_LDFLAGS}
     ${GSETTINGSQT_LDFLAGS}
+    ${U1DB_LDFLAGS}
     )
 
 qt5_use_modules(Unity-qml Qml Gui DBus)
 
=== modified file 'src/Unity/plugin.cpp'
--- src/Unity/plugin.cpp	2014-06-03 15:51:13 +0000
+++ src/Unity/plugin.cpp	2014-07-10 07:45:27 +0000
@@ -32,6 +32,7 @@
 #include "previewstack.h"
 #include "previewmodel.h"
 #include "previewwidgetmodel.h"
+#include "settingsmodel.h"
 
 void UnityPlugin::registerTypes(const char *uri)
 {
@@ -42,6 +43,7 @@
     qmlRegisterUncreatableType<unity::shell::scopes::ScopeInterface>(uri, 0, 2, "Scope", "Can't create Scope object in QML. Get them from Scopes instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::DepartmentInterface>(uri, 0, 2, "Department", "Can't create Department object in QML. Get them from Scope instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML. Get them from Scope instance.");
+    qmlRegisterUncreatableType<unity::shell::scopes::SettingsModelInterface>(uri, 0, 2, "Settings", "Can't create Settings object in QML. Get them from Scope instance.");
     qmlRegisterUncreatableType<scopes_ng::ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create new ResultsModel in QML. Get them from Categories instance.");
     qmlRegisterUncreatableType<unity::shell::scopes::PreviewModelInterface>(uri, 0, 2, "PreviewModel", "Can't create new PreviewModel in QML. Get them from PreviewStack instance.");
     qmlRegisterUncreatableType<scopes_ng::PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");
 
=== modified file 'src/Unity/scope.cpp'
--- src/Unity/scope.cpp	2014-06-25 17:00:21 +0000
+++ src/Unity/scope.cpp	2014-07-10 07:45:27 +0000
@@ -26,6 +26,7 @@
 #include "previewstack.h"
 #include "utils.h"
 #include "scopes.h"
+#include "settingsmodel.h"
 
 // Qt
 #include <QUrl>
@@ -533,6 +534,21 @@
     QVariant converted(scopeVariantToQVariant(scopes::Variant(m_scopeMetadata->appearance_attributes())));
     m_customizations = converted.toMap();
     Q_EMIT customizationsChanged();
+
+    try
+    {
+        scopes::Variant settings_definitions;
+        settings_definitions = m_scopeMetadata->settings_definitions();
+        m_settingsModel.reset(
+                new SettingsModel(QDir::home().filePath(".local/share"), id(),
+                        scopeVariantToQVariant(settings_definitions), this));
+    }
+    catch (unity::scopes::NotFoundException&)
+    {
+        // If there's no settings data
+        m_settingsModel.reset();
+    }
+    Q_EMIT settingsChanged();
 }
 
 QString Scope::id() const
@@ -599,6 +615,11 @@
     return m_categories;
 }
 
+unity::shell::scopes::SettingsModelInterface* Scope::settings() const
+{
+    return m_settingsModel.data();
+}
+
 /*
 Filters* Scope::filters() const
 {
 
=== modified file 'src/Unity/scope.h'
--- src/Unity/scope.h	2014-06-25 16:57:46 +0000
+++ src/Unity/scope.h	2014-07-10 07:45:27 +0000
@@ -47,6 +47,7 @@
 class Categories;
 class PushEvent;
 class PreviewStack;
+class SettingsModel;
 
 class CollectionController
 {
@@ -116,6 +117,7 @@
     QString shortcut() const override;
     bool searchInProgress() const override;
     unity::shell::scopes::CategoriesInterface* categories() const override;
+    unity::shell::scopes::SettingsModelInterface* settings() const override;
     QString searchQuery() const override;
     QString noResultsHint() const override;
     QString formFactor() const override;
@@ -189,6 +191,7 @@
     unity::scopes::Department::SCPtr m_lastRootDepartment;
     QGSettings* m_settings;
     Categories* m_categories;
+    QScopedPointer<SettingsModel> m_settingsModel;
     QSharedPointer<DepartmentNode> m_departmentTree;
     QTimer m_aggregatorTimer;
     QTimer m_clearTimer;
 
=== added file 'src/Unity/settingsmodel.cpp'
--- src/Unity/settingsmodel.cpp	1970-01-01 00:00:00 +0000
+++ src/Unity/settingsmodel.cpp	2014-07-10 07:45:27 +0000
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pete Woods <[e-mail]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "settingsmodel.h"
+#include "utils.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QTimer>
+
+using namespace scopes_ng;
+namespace sc = unity::scopes;
+
+static const QString SETTING_GROUP("default");
+
+static const QString SETTING_ID_PATTERN("%1-%2");
+
+SettingsModel::SettingsModel(const QDir& shareDir, const QString& scopeId,
+        const QVariant& settingsDefinitions, QObject* parent,
+        int settingsTimeout)
+        : SettingsModelInterface(parent), m_settingsTimeout(settingsTimeout)
+{
+    shareDir.mkdir(scopeId);
+    QDir databaseDir = shareDir.filePath(scopeId);
+    m_database.setPath(databaseDir.filePath("settings.db"));
+
+    for (const auto &it : settingsDefinitions.toList())
+    {
+        QVariantMap data = it.toMap();
+        QString id = data["id"].toString();
+        QString displayName = data["displayName"].toString();
+        QVariantMap properties = data["parameters"].toMap();
+        QString type = data["type"].toString();
+
+        QVariantMap defaults;
+        defaults["value"] = properties["defaultValue"];
+
+        QSharedPointer<U1db::Document> document(new U1db::Document);
+        document->setDocId(SETTING_ID_PATTERN.arg(SETTING_GROUP, id));
+        document->setDefaults(defaults);
+        document->setDatabase(&m_database);
+        document->setCreate(true);
+
+        m_documents[id] = document;
+
+        QSharedPointer<QTimer> timer(new QTimer());
+        timer->setProperty("setting_id", id);
+        timer->setSingleShot(true);
+        timer->setInterval(m_settingsTimeout);
+        timer->setTimerType(Qt::VeryCoarseTimer);
+        connect(timer.data(), SIGNAL(timeout()), this,
+                SLOT(settings_timeout()));
+        m_timers[id] = timer;
+
+        QSharedPointer<Data> setting(
+                new Data(id, displayName, type, properties));
+
+        m_data << setting;
+    }
+}
+
+QVariant SettingsModel::data(const QModelIndex& index, int role) const
+{
+    int row = index.row();
+    QVariant result;
+
+    if (row < m_data.size())
+    {
+        auto data = m_data[row];
+
+        switch (role)
+        {
+            case Roles::RoleSettingId:
+                result = data->id;
+                break;
+            case Roles::RoleDisplayName:
+                result = data->displayName;
+                break;
+            case Roles::RoleType:
+                result = data->type;
+                break;
+            case Roles::RoleProperties:
+                result = data->properties;
+                break;
+            case Roles::RoleValue:
+            {
+                QSharedPointer<U1db::Document> document = m_documents[data->id];
+                QVariantMap contents = document->getContents().toMap();
+                result = contents["value"];
+                break;
+            }
+            default:
+                break;
+        }
+    }
+
+    return result;
+}
+
+bool SettingsModel::setData(const QModelIndex &index, const QVariant &value,
+        int role)
+{
+    int row = index.row();
+    QVariant result;
+
+    if (row < m_data.size())
+    {
+        auto data = m_data[row];
+
+        switch (role)
+        {
+            case Roles::RoleValue:
+            {
+                QSharedPointer<QTimer> timer = m_timers[data->id];
+                timer->setProperty("value", value);
+                timer->start();
+
+                return true;
+            }
+            default:
+                break;
+        }
+    }
+
+    return false;
+}
+
+int SettingsModel::rowCount(const QModelIndex&) const
+{
+    return count();
+}
+
+int SettingsModel::count() const
+{
+    return m_data.size();
+}
+
+void SettingsModel::settings_timeout()
+{
+    QObject *timer = sender();
+    if (!timer)
+    {
+        return;
+    }
+
+    QString setting_id = timer->property("setting_id").toString();
+    QVariant value = timer->property("value");
+
+    QSharedPointer<U1db::Document> document = m_documents[setting_id];
+    QVariantMap map;
+    map["value"] = value;
+    document->setContents(map);
+}
 
=== added file 'src/Unity/settingsmodel.h'
--- src/Unity/settingsmodel.h	1970-01-01 00:00:00 +0000
+++ src/Unity/settingsmodel.h	2014-07-10 07:45:27 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *  Pete Woods <[e-mail]>
+ *
+ * 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 NG_PREVIEW_SETTTINGSMODEL_H_
+#define NG_PREVIEW_SETTTINGSMODEL_H_
+
+#include <libu1db-qt5/database.h>
+#include <libu1db-qt5/document.h>
+#include <unity/SymbolExport.h>
+#include <unity/shell/scopes/SettingsModelInterface.h>
+
+#include <QAbstractListModel>
+#include <QList>
+#include <QSharedPointer>
+
+QT_BEGIN_NAMESPACE
+class QDir;
+class QTimer;
+QT_END_NAMESPACE
+
+namespace scopes_ng
+{
+
+class Q_DECL_EXPORT SettingsModel: public unity::shell::scopes::SettingsModelInterface
+{
+Q_OBJECT
+
+    struct Data
+    {
+        QString id;
+        QString displayName;
+        QString type;
+        QVariant properties;
+
+        Data(QString const& id_, QString const& displayName_,
+                QString const& type_, QVariant const& properties_)
+                : id(id_), displayName(displayName_), type(type_), properties(
+                        properties_)
+        {
+        }
+    };
+
+public:
+    explicit SettingsModel(const QDir& shareDir, const QString& scopeId,
+            const QVariant& settingsDefinitions, QObject* parent = 0,
+            int settingsTimeout = 300);
+
+    QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const
+            override;
+
+    bool setData(const QModelIndex&index, const QVariant& value, int role =
+            Qt::EditRole) override;
+
+    int rowCount(const QModelIndex& parent = QModelIndex()) const override;
+
+    int count() const override;
+
+protected Q_SLOTS:
+    void settings_timeout();
+
+protected:
+    int m_settingsTimeout;
+
+    QList<QSharedPointer<Data>> m_data;
+
+    U1db::Database m_database;
+
+    QMap<QString, QSharedPointer<U1db::Document>> m_documents;
+
+    QMap<QString, QSharedPointer<QTimer>> m_timers;
+};
+
+}
+
+Q_DECLARE_METATYPE(scopes_ng::SettingsModel*)
+
+#endif /* NG_PREVIEW_SETTTINGSMODEL_H_ */
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-06-05 10:37:50 +0000
+++ tests/CMakeLists.txt	2014-07-10 07:45:27 +0000
@@ -51,4 +51,7 @@
     resultstest
     previewtest
     utilstest
+    settingstest
     )
+
+qt5_use_modules(settingstestExec Sql)
 
=== added file 'tests/settingstest.cpp'
--- tests/settingstest.cpp	1970-01-01 00:00:00 +0000
+++ tests/settingstest.cpp	2014-07-10 07:45:27 +0000
@@ -0,0 +1,311 @@
+/*
+ * 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/>.
+ *
+ * Authors:
+ *  Pete Woods <[e-mail]>
+ */
+
+#include <QJsonDocument>
+#include <QObject>
+#include <QTemporaryDir>
+#include <QTest>
+
+#include <settingsmodel.h>
+
+using namespace scopes_ng;
+using namespace unity::shell::scopes;
+
+namespace
+{
+
+const static QByteArray BOOLEAN_DEFINITION =
+        R"(
+[
+    {
+        "id": "enabledSetting",
+        "displayName": "Enabled",
+        "type": "boolean",
+        "parameters": {
+            "defaultValue": true
+        }
+    }
+]
+)";
+
+const static QByteArray LIST_DEFINITION =
+        R"(
+[
+    {
+        "id": "unitTempSetting",
+        "displayName": "Temperature Units",
+        "type": "list",
+        "parameters": {
+            "defaultValue": 1,
+            "values": ["Celcius", "Fahrenheit"]
+        }
+    }
+]
+)";
+
+const static QByteArray NUMBER_DEFINITION =
+        R"(
+[
+    {
+        "id": "ageSetting",
+        "displayName": "Age",
+        "type": "number",
+        "parameters": {
+            "defaultValue": 23
+        }
+    }
+]
+)";
+
+const static QByteArray STRING_DEFINITION =
+        R"(
+[
+    {
+        "id": "locationSetting",
+        "displayName": "Location",
+        "type": "string",
+        "parameters": {
+            "defaultValue": "London"
+        }
+    }
+]
+)";
+
+const static QByteArray MIXED_DEFINITION =
+        R"(
+[
+    {
+        "id": "locationSetting",
+        "displayName": "Location",
+        "type": "string",
+        "parameters": {
+            "defaultValue": "London"
+        }
+    },
+    {
+        "id": "unitTempSetting",
+        "displayName": "Temperature Units",
+        "type": "list",
+        "parameters": {
+            "defaultValue": 1,
+            "values": ["Celcius", "Fahrenheit"]
+        }
+    },
+    {
+        "id": "ageSetting",
+        "displayName": "Age",
+        "type": "number",
+        "parameters": {
+            "defaultValue": 23
+        }
+    },
+    {
+        "id": "enabledSetting",
+        "displayName": "Enabled",
+        "type": "boolean",
+        "parameters": {
+            "defaultValue": true
+        }
+    }
+]
+)";
+
+class SettingsTest: public QObject
+{
+Q_OBJECT
+private:
+    QScopedPointer<QTemporaryDir> tempDir;
+
+    QSharedPointer<SettingsModelInterface> settings;
+
+    void newSettingsModel(const QString& id, const QByteArray& json)
+    {
+        QJsonDocument doc = QJsonDocument::fromJson(json);
+        QVariant definitions = doc.toVariant();
+        settings.reset(
+                new SettingsModel(tempDir->path(), id, definitions, 0, 0));
+    }
+
+    void verifyData(int index, const QString& id, const QString& displayName,
+            const QString& type, const QVariant& properties)
+    {
+        QCOMPARE(
+                settings->data(settings->index(index),
+                        SettingsModelInterface::RoleSettingId), QVariant(id));
+        QCOMPARE(
+                settings->data(settings->index(index),
+                        SettingsModelInterface::RoleDisplayName),
+                QVariant(displayName));
+        QCOMPARE(
+                settings->data(settings->index(index),
+                        SettingsModelInterface::RoleType), QVariant(type));
+        QCOMPARE(
+                settings->data(settings->index(index),
+                        SettingsModelInterface::RoleProperties), properties);
+    }
+
+    void verifyValue(int index, const QVariant& value)
+    {
+        // Using this "TRY" macro repeatedly attempts the comparison until a timeout
+        QTRY_COMPARE(
+                settings->data(settings->index(index),
+                        SettingsModelInterface::RoleValue), value);
+    }
+
+    void setValue(int index, const QVariant& value)
+    {
+        QVERIFY(settings->setData(settings->index(index), value,
+                SettingsModelInterface::RoleValue));
+    }
+
+private Q_SLOTS:
+    void init()
+    {
+        tempDir.reset(new QTemporaryDir);
+    }
+
+    void testBooleanDefinition()
+    {
+        newSettingsModel("boolean", BOOLEAN_DEFINITION);
+        QCOMPARE(settings->rowCount(), 1);
+
+        // Check the various properties make it through
+        QVariantMap properties;
+        properties["defaultValue"] = true;
+        verifyData(0, "enabledSetting", "Enabled", "boolean", properties);
+
+        verifyValue(0, true);
+    }
+
+    void testListDefinition()
+    {
+        newSettingsModel("list", LIST_DEFINITION);
+        QCOMPARE(settings->rowCount(), 1);
+
+        // Check the various properties make it through
+        QVariantMap properties;
+        properties["defaultValue"] = 1;
+        properties["values"] = QVariantList() << "Celcius" << "Fahrenheit";
+        verifyData(0, "unitTempSetting", "Temperature Units", "list",
+                properties);
+
+        // Check the default value
+        verifyValue(0, 1);
+    }
+
+    void testNumberDefinition()
+    {
+        newSettingsModel("number", NUMBER_DEFINITION);
+        QCOMPARE(settings->rowCount(), 1);
+
+        // Check the various properties make it through
+        QVariantMap properties;
+        properties["defaultValue"] = 23;
+        verifyData(0, "ageSetting", "Age", "number", properties);
+
+        // Check the default value
+        verifyValue(0, 23);
+    }
+
+    void testStringDefinition()
+    {
+        newSettingsModel("string", STRING_DEFINITION);
+        QCOMPARE(settings->rowCount(), 1);
+
+        // Check the various properties make it through
+        QVariantMap properties;
+        properties["defaultValue"] = "London";
+        verifyData(0, "locationSetting", "Location", "string", properties);
+
+        // Check the default value
+        verifyValue(0, "London");
+    }
+
+    void testMixedDefinition()
+    {
+        newSettingsModel("mixed", MIXED_DEFINITION);
+        QCOMPARE(settings->rowCount(), 4);
+
+        {
+            QVariantMap properties;
+            properties["defaultValue"] = "London";
+            verifyData(0, "locationSetting", "Location", "string", properties);
+            verifyValue(0, "London");
+        }
+        {
+            QVariantMap properties;
+            properties["defaultValue"] = 1;
+            properties["values"] = QVariantList() << "Celcius" << "Fahrenheit";
+            verifyData(1, "unitTempSetting", "Temperature Units", "list",
+                    properties);
+            verifyValue(1, 1);
+        }
+        {
+            QVariantMap properties;
+            properties["defaultValue"] = 23;
+            verifyData(2, "ageSetting", "Age", "number", properties);
+            verifyValue(2, 23);
+        }
+        {
+            QVariantMap properties;
+            properties["defaultValue"] = true;
+            verifyData(3, "enabledSetting", "Enabled", "boolean", properties);
+            verifyValue(3, true);
+        }
+    }
+
+    void testUpdateValue()
+    {
+        // Create an initial settings model
+        newSettingsModel("update", MIXED_DEFINITION);
+
+        // Verify the initial values
+        verifyValue(0, "London");
+        verifyValue(1, 1);
+        verifyValue(2, 23);
+        verifyValue(3, true);
+
+        // Update the string value
+        setValue(0, "Banana");
+        verifyValue(0, "Banana");
+
+        // Update the list value
+        setValue(1, 0);
+        verifyValue(1, 0);
+
+        // Update the number value
+        setValue(2, 123);
+        verifyValue(2, 123);
+
+        // Update the boolean value
+        setValue(3, false);
+        verifyValue(3, false);
+
+        // Make a new settings model to check the settings were saved to disk
+        newSettingsModel("update", MIXED_DEFINITION);
+        verifyValue(0, "Banana");
+        verifyValue(1, 0);
+        verifyValue(2, 123);
+        verifyValue(3, false);
+    }
+};
+
+}
+QTEST_GUILESS_MAIN(SettingsTest)
+#include <settingstest.moc>
 
=== added directory 'tools'
=== added directory 'tools/settings'
=== added file 'tools/settings/Settings.qml'
--- tools/settings/Settings.qml	1970-01-01 00:00:00 +0000
+++ tools/settings/Settings.qml	2014-07-10 07:45:27 +0000
@@ -0,0 +1,68 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Unity 0.2
+
+MainView {
+    id: app
+    applicationName: "example"
+    width: units.gu(40)
+    height: units.gu(60)
+
+    Arguments {
+        id: args
+        defaultArgument.help: "Expects a scope ID"
+        defaultArgument.valueNames: ["SCOPE"]
+    }
+
+    Scopes {
+        id: scopes
+        onLoadedChanged: {
+            app.scope = scopes.getScope(args.defaultArgument.at(0))
+        }
+    }
+
+    property var scope: ListModel{}
+
+    function toFileName(type) {
+        return "widgets/" + type + "SettingsWidget.qml"
+    }
+
+    Page {
+        title: "Settings for " + scope.name
+
+        ListView {
+            anchors.fill: parent
+            spacing: units.gu(1)
+
+            model: scope.settings
+            delegate: Loader {
+                id: loader
+                source: toFileName(type)
+                onLoaded: {
+                    item.properties = properties
+                    item.value = value
+
+                    if (type != "boolean") {
+                        loader.width = parent.width
+                    }
+                    if (type == "list") {
+                        loader.height = units.gu(10)
+                    }
+
+                    itemValue = Qt.binding(function() { return item.value })
+                }
+                property var itemValue
+                onItemValueChanged: {
+                    if (value !== item.value) {
+                        value = item.value
+                    }
+                }
+            }
+            section.property: "displayName"
+            section.delegate: Text {
+                width: parent.width
+                text: section
+            }
+        }
+    }
+}
 
=== added file 'tools/settings/run.sh'
--- tools/settings/run.sh	1970-01-01 00:00:00 +0000
+++ tools/settings/run.sh	2014-07-10 07:45:27 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ "$#" -ne 1 ]; then
+  echo "ERROR: Usage $0 SCOPE_ID"
+  exit 1
+fi
+
+DIR="$(dirname "$0")"
+APP_ID="example" qmlscene "$DIR/Settings.qml" -- "$1"
 
=== added directory 'tools/settings/widgets'
=== added file 'tools/settings/widgets/booleanSettingsWidget.qml'
--- tools/settings/widgets/booleanSettingsWidget.qml	1970-01-01 00:00:00 +0000
+++ tools/settings/widgets/booleanSettingsWidget.qml	2014-07-10 07:45:27 +0000
@@ -0,0 +1,9 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+
+CheckBox {
+    id: box
+    property var properties
+    property alias value: box.checked
+}
 
=== added file 'tools/settings/widgets/listSettingsWidget.qml'
--- tools/settings/widgets/listSettingsWidget.qml	1970-01-01 00:00:00 +0000
+++ tools/settings/widgets/listSettingsWidget.qml	2014-07-10 07:45:27 +0000
@@ -0,0 +1,11 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+OptionSelector {
+    id: combo
+
+    property var properties
+    property alias value: combo.selectedIndex
+
+    model: properties["values"]
+}
 
=== added file 'tools/settings/widgets/numberSettingsWidget.qml'
--- tools/settings/widgets/numberSettingsWidget.qml	1970-01-01 00:00:00 +0000
+++ tools/settings/widgets/numberSettingsWidget.qml	2014-07-10 07:45:27 +0000
@@ -0,0 +1,10 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+
+TextField {
+    id: field
+    property var properties
+    property alias value: field.text
+    validator: DoubleValidator {}
+}
 
=== added file 'tools/settings/widgets/stringSettingsWidget.qml'
--- tools/settings/widgets/stringSettingsWidget.qml	1970-01-01 00:00:00 +0000
+++ tools/settings/widgets/stringSettingsWidget.qml	2014-07-10 07:45:27 +0000
@@ -0,0 +1,9 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+
+TextField {
+    id: field
+    property var properties
+    property alias value: field.text
+}