Merge lp:~zsombi/ubuntu-ui-toolkit/05-palettechanges into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Introducing PaletteChanges component to customize palette values. It can only be assigned to StyleSet component.

[lp:~zsombi/ubuntu-ui-toolkit/05-palettechanges]

1444. By Zsombor Egri on 2015-03-12

prereq sync

1445. By Zsombor Egri on 2015-03-12

tests added, more featuires to come

1446. By Zsombor Egri on 2015-03-13

prereq sync

1447. By Zsombor Egri on 2015-03-16

switchColors and explicit properties added; test cases covering both implemented

1448. By Zsombor Egri on 2015-03-16

API complete

1449. By Zsombor Egri on 2015-03-16

propertychanges reverted to original

1450. By Zsombor Egri on 2015-03-16

component renamed to PaletteSettings, not to be confused with PropertyChanges derivates

1451. By Zsombor Egri on 2015-03-16

documentation updated

1452. By Zsombor Egri on 2015-03-17

prereq sync

Unmerged revisions

1452. By Zsombor Egri on 2015-03-17

prereq sync

1451. By Zsombor Egri on 2015-03-16

documentation updated

1450. By Zsombor Egri on 2015-03-16

component renamed to PaletteSettings, not to be confused with PropertyChanges derivates

1449. By Zsombor Egri on 2015-03-16

propertychanges reverted to original

1448. By Zsombor Egri on 2015-03-16

API complete

1447. By Zsombor Egri on 2015-03-16

switchColors and explicit properties added; test cases covering both implemented

1446. By Zsombor Egri on 2015-03-13

prereq sync

1445. By Zsombor Egri on 2015-03-12

tests added, more featuires to come

1444. By Zsombor Egri on 2015-03-12

prereq sync

1443. By Zsombor Egri on 2015-03-12

change implementation

=== modified file 'components.api'
--- components.api	2015-03-17 16:55:26 +0000
+++ components.api	2015-03-17 16:55:27 +0000
@@ -1016,6 +1016,10 @@
     prototype: "QObject"
     exports: ["Ubuntu 1.2"]
     name: "CaptionsStyle"
+    name: "UCPaletteSettings"
+    prototype: "QObject"
+    exports: ["PaletteSettings 1.3"]
+    Property { name: "explicit"; type: "bool" }
     name: "UCQQuickImageExtension"
     prototype: "QQuickImageBase"
     exports: ["QQuickImageBase 0.1", "QQuickImageBase 1.0"]
@@ -1065,6 +1069,7 @@
     Property { name: "parentTheme"; type: "UCTheme"; isReadonly: true; isPointer: true }
     Property { name: "name"; type: "string" }
     Property { name: "palette"; type: "QObject"; isReadonly: true; isPointer: true }
+    Property { name: "paletteSettings"; type: "UCPaletteSettings"; isPointer: true }
     Method {
     name: "createStyleComponent"
     Parameter { name: "styleName"; type: "string" }

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2015-03-17 16:55:26 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-03-17 16:55:27 +0000
@@ -24,6 +24,7 @@
 #include "plugin.h"
 #include "uctheme.h"
 #include "ucdeprecatedtheme.h"
+#include "ucpalettesettings.h"
 
 #include <QtQml/QQmlContext>
 #include "i18n.h"
@@ -194,6 +195,7 @@
     // register 1.3 API
     qmlRegisterType<UCTheme>(uri, 1, 3, "ThemeSettings");
     qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItemBase");
+    qmlRegisterCustomType<UCPaletteSettings>(uri, 1, 3, "PaletteSettings", new UCPaletteSettingsParser);
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2015-03-17 16:55:26 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2015-03-17 16:55:27 +0000
@@ -80,7 +80,8 @@
     privates/listitemdraghandler.h \
     ucnamespace.h \
     ucdeprecatedtheme.h \
-    ucdefaulttheme.h
+    ucdefaulttheme.h \
+    ucpalettesettings.h
 
 SOURCES += plugin.cpp \
     uctheme.cpp \
@@ -128,7 +129,8 @@
     privates/listitemdraghandler.cpp \
     ucnamespace.cpp \
     ucdeprecatedtheme.cpp \
-    ucdefaulttheme.cpp
+    ucdefaulttheme.cpp \
+    ucpalettesettings.cpp
 
 # adapters
 SOURCES += adapters/alarmsadapter_organizer.cpp

=== added file 'modules/Ubuntu/Components/plugin/ucpalettesettings.cpp'
--- modules/Ubuntu/Components/plugin/ucpalettesettings.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/ucpalettesettings.cpp	2015-03-17 16:55:27 +0000
@@ -0,0 +1,297 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#include "ucpalettesettings.h"
+#include "i18n.h"
+#include "uctheme.h"
+#include "propertychange_p.h"
+
+#include <QtQml/QQmlInfo>
+#include <QtQml/QQmlProperty>
+
+void UCPaletteSettingsParser::verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings)
+{
+    Q_FOREACH(const QV4::CompiledData::Binding *binding, bindings) {
+        verifyProperty(qmlUnit, binding);
+    }
+}
+
+void UCPaletteSettingsParser::applyBindings(QObject *obj, QQmlCompiledData *cdata, const QList<const QV4::CompiledData::Binding *> &bindings)
+{
+    UCPaletteSettings *changes = static_cast<UCPaletteSettings*>(obj);
+    if (!changes->palette()) {
+        qmlInfo(changes->theme()) << UbuntuI18n::instance().tr("ThemeSettings does not define a palette.");
+        return;
+    }
+
+    Q_FOREACH(const QV4::CompiledData::Binding *binding, bindings) {
+        changes->applyProperty(NULL, QString(), cdata->compilationUnit->data, binding);
+    }
+
+    changes->m_cdata = cdata;
+    changes->m_decoded = true;
+}
+
+void UCPaletteSettingsParser::verifyProperty(const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding)
+{
+    if (binding->type == QV4::CompiledData::Binding::Type_Object) {
+        error(qmlUnit->objectAt(binding->value.objectIndex), UbuntuI18n::instance().tr("PaletteSettings does not support creating state-specific objects."));
+        return;
+    }
+
+    if (binding->type == QV4::CompiledData::Binding::Type_GroupProperty
+            || binding->type == QV4::CompiledData::Binding::Type_AttachedProperty) {
+        const QV4::CompiledData::Object *subObj = qmlUnit->objectAt(binding->value.objectIndex);
+        const QV4::CompiledData::Binding *subBinding = subObj->bindingTable();
+        for (quint32 i = 0; i < subObj->nBindings; ++i, ++subBinding) {
+            verifyProperty(qmlUnit, subBinding);
+        }
+    }
+}
+
+void UCPaletteSettings::applyProperty(QObject *paletteSet, const QString &propertyPrefix, const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding)
+{
+    QString propertyName = propertyPrefix + qmlUnit->stringAt(binding->propertyNameIndex);
+
+    if (binding->type == QV4::CompiledData::Binding::Type_GroupProperty
+            || binding->type == QV4::CompiledData::Binding::Type_AttachedProperty) {
+
+        // check if the palette has this value set
+        int propIndex = palette()->metaObject()->indexOfProperty(propertyName.toUtf8());
+        if (propIndex < 0) {
+            qmlInfo(this) << UbuntuI18n::instance().tr("Palette has no valueset %1").arg(propertyName);
+            return;
+        }
+
+        QString pre = propertyName + QLatin1Char('.');
+        const QV4::CompiledData::Object *subObj = qmlUnit->objectAt(binding->value.objectIndex);
+        const QV4::CompiledData::Binding *subBinding = subObj->bindingTable();
+        for (quint32 i = 0; i < subObj->nBindings; ++i, ++subBinding) {
+            applyProperty(valueSet(propertyName), pre, qmlUnit, subBinding);
+        }
+        return;
+    }
+
+    // check if palette has the given property
+    if (!paletteSet) {
+        qmlInfo(this) << UbuntuI18n::instance().tr("Palette has no property called '%1'.").arg(propertyName);
+        return;
+    }
+    if (paletteSet->metaObject()->indexOfProperty(qmlUnit->stringAt(binding->propertyNameIndex).toUtf8()) < 0) {
+        qmlInfo(this) << UbuntuI18n::instance().tr("Palette has no property called '%1'.").arg(propertyName);
+        return;
+    }
+
+    switch (binding->type) {
+    case QV4::CompiledData::Binding::Type_Script:
+    {
+        QString expression = binding->valueAsScriptString(qmlUnit);
+        QUrl url = QUrl();
+        int line = -1;
+        int column = -1;
+
+        QQmlData *ddata = QQmlData::get(this);
+        if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty()) {
+            url = ddata->outerContext->url;
+            line = ddata->lineNumber;
+            column = ddata->columnNumber;
+        }
+        m_expressions << Expression(propertyName, binding->value.compiledScriptIndex, expression, url, line, column);
+        break;
+    }
+    case QV4::CompiledData::Binding::Type_String:
+    {
+        m_values << qMakePair(propertyName, binding->valueAsString(qmlUnit));
+        break;
+    }
+    default:
+        qmlInfo(this) << UbuntuI18n::instance().tr("Not a valid color value.");
+        break;
+    }
+}
+
+
+/******************************************************************************
+ * PaletteSettings
+ */
+/*!
+ * \qmltype PaletteSettings
+ * \instantiates UCPaletteSettings
+ * \inqmlmodule Ubuntu.Components 1.3
+ * \since Ubuntu.Components 1.3
+ * \ingroup theming
+ * \brief The component is used to apply changes on a ThemeSettings individual
+ * palette values.
+ *
+ * The component provides the ability to configure different palette values of a
+ * theme. It can only contain palette value properties.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * StyledItem {
+ *     theme: ThemeSettings {
+ *         name: "Ubuntu.Components.Themes.Ambiance"
+ *         PaletteSettings {
+ *             normal.background: "#ABFFAB"
+ *             selected.base: Qt.rgba(1, 0.3, 0.8, 1)
+ *         }
+ *     }
+ * }
+ * \endqml
+ * This example creates a styled item with Ambiance theme having the \c normal.background
+ * and the \c selected.base palette values modified.
+ *
+ * The component can be declared only inside a ThemeSettings, and there can be only
+ * one PaletteSettings instance declared per ThemeSettings component.
+ *
+ * Palette settings are applied on component completion as well as when the palette
+ * property is changed. In the following example the palette values are set to
+ * the given values whenever the theme name is changed
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * StyledItem {
+ *     theme: ThemeSettings {
+ *         // bind to parent theme name to make sure the parent theme is always used
+ *         name: parentTheme ? parentTheme.name : undefined
+ *         PaletteSettings {
+ *             normal.background: "#ABFFAB"
+ *             selected.base: parentTheme ? parentTheme.palette.normal.base : "#00FFCC"
+ *         }
+ *     }
+ * }
+ * \endqml
+ */
+
+/*!
+ * \qmlproperty bool PaletteSettings::explicit
+ * The property drives the way the property bindings are evaluated. If explicit
+ * is set to true, any potential bindings will be interpreted as once-off assignments
+ * that occur when the settings are applied.
+ *
+ * In the following example, the addition of explicit prevents \c selected.base
+ * from being bound to \c parentTheme.palette.normal.base. Instead, it is assigned
+ * the value of \c parentTheme.palette.normal.base at the time the palette settings
+ * are applied - which is the time the theme palette is changed. This means that
+ * in case \c parentTheme.palette.normal.base is changed, the change will not be
+ * applied on the current theme palette.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * StyledItem {
+ *     theme: ThemeSettings {
+ *         // bind to parent theme name to make sure the parent theme is always used
+ *         name: parentTheme ? parentTheme.name : undefined
+ *         PaletteSettings {
+ *             explicit: true
+ *             normal.background: "#ABFFAB"
+ *             selected.base: parentTheme ? parentTheme.palette.normal.base : "#00FFCC"
+ *         }
+ *     }
+ * }
+ * \endqml
+ *
+ * The property defaults to \c false.
+ */
+
+UCPaletteSettings::UCPaletteSettings(QObject *parent)
+    : QObject(parent)
+    , m_decoded(false)
+    , m_explicit(false)
+{
+}
+
+void UCPaletteSettings::classBegin()
+{
+    if (!qobject_cast<UCTheme*>(parent())) {
+        qmlInfo(this) << UbuntuI18n::instance().tr("PaletteSettings can only be declared in ThemeSettings components.");
+    } else {
+        connect(theme(), &UCTheme::paletteChanged, this, &UCPaletteSettings::_q_applyPaletteSettings);
+    }
+}
+void UCPaletteSettings::componentComplete()
+{
+    if (palette() && m_decoded) {
+        _q_applyPaletteSettings();
+    }
+}
+
+UCTheme *UCPaletteSettings::theme()
+{
+    return qobject_cast<UCTheme*>(parent());
+}
+QObject *UCPaletteSettings::palette()
+{
+    UCTheme *set = theme();
+    return set ? set->palette() : NULL;
+}
+
+QObject *UCPaletteSettings::valueSet(const QString &name)
+{
+    QObject *stylePalette = palette();
+    return stylePalette ? stylePalette->property(name.toLocal8Bit()).value<QObject*>() : NULL;
+}
+
+void UCPaletteSettings::_q_applyPaletteSettings()
+{
+    // first, apply the value changes
+    QObject *object = palette();
+    QQmlContext *context = qmlContext(object);
+    for (int i = 0; i < m_values.count(); i++) {
+        QQmlProperty::write(object, m_values[i].first, m_values[i].second, context);
+    }
+
+    // override context to use this context
+    context = qmlContext(this);
+    // then apply expressions/bindings
+    for (int ii = 0; ii < m_expressions.count(); ii++) {
+        Expression e = m_expressions[ii];
+        QQmlProperty prop(object, e.name, qmlContext(object));
+        if (!prop.isValid()) {
+            continue;
+        }
+
+        // create a binding object from the expression using the palette context
+        QQmlContextData *cdata = QQmlContextData::get(context);
+        QQmlBinding *newBinding = 0;
+        if (e.id != QQmlBinding::Invalid) {
+            QV4::Scope scope(QQmlEnginePrivate::getV4Engine(qmlEngine(this)));
+            QV4::ScopedValue function(scope, QV4::QmlBindingWrapper::createQmlCallableForFunction(cdata, object, m_cdata->compilationUnit->runtimeFunctions[e.id]));
+            newBinding = new QQmlBinding(function, object, cdata);
+        }
+        if (!newBinding) {
+            newBinding = new QQmlBinding(e.expression, object, cdata, e.url.toString(), e.line, e.column);
+        }
+
+        if (m_explicit) {
+            // in this case, we don't want to assign a binding, per se,
+            // so we evaluate the expression and assign the result.
+            prop.write(newBinding->evaluate());
+            newBinding->destroy();
+        } else {
+            newBinding->setTarget(prop);
+            QQmlAbstractBinding *prevBinding = QQmlPropertyPrivate::setBinding(prop, newBinding);
+            if (prevBinding && prevBinding != newBinding) {
+                prevBinding->destroy();
+            }
+        }
+    }
+}

=== added file 'modules/Ubuntu/Components/plugin/ucpalettesettings.h'
--- modules/Ubuntu/Components/plugin/ucpalettesettings.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/ucpalettesettings.h	2015-03-17 16:55:27 +0000
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Zsombor Egri <[e-mail]>
+ */
+
+#ifndef UCPALETTESETTINGS_H
+#define UCPALETTESETTINGS_H
+
+#include <QtCore/QObject>
+
+#define foreach Q_FOREACH
+#include <QtQml/private/qqmlcustomparser_p.h>
+#include <private/qv4engine_p.h>
+#include <private/qpodvector_p.h>
+#undef foreach
+#include <QtQml/private/qqmlcompiler_p.h>
+
+class UCPaletteSettingsParser;
+
+class UCTheme;
+class UCPaletteSettings : public QObject, public QQmlParserStatus
+{
+    Q_OBJECT
+    Q_INTERFACES(QQmlParserStatus)
+    Q_PROPERTY(bool explicit MEMBER m_explicit NOTIFY explicitChanged FINAL)
+public:
+    explicit UCPaletteSettings(QObject *parent = 0);
+
+    UCTheme *theme();
+    QObject *palette();
+    QObject *valueSet(const QString &name);
+
+    void applyProperty(QObject *valueSet, const QString &propertyPrefix, const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding);
+
+Q_SIGNALS:
+    void explicitChanged();
+
+private Q_SLOTS:
+    void _q_applyPaletteSettings();
+
+protected:
+    void classBegin();
+    void componentComplete();
+
+private:
+
+    class Expression {
+    public:
+        Expression(const QString &name, QQmlBinding::Identifier id, const QString& expr,
+                         const QUrl &url, int line, int column)
+            : name(name), id(id), expression(expr), url(url), line(line), column(column) {}
+        QString name;
+        QQmlBinding::Identifier id;
+        QString expression;
+        QUrl url;
+        int line;
+        int column;
+    };
+
+    bool m_decoded:1;
+    bool m_explicit:1;
+    QList< QPair<QString, QString> > m_values;
+    QList<Expression> m_expressions;
+    // from parser
+    QQmlRefPointer<QQmlCompiledData> m_cdata;
+
+    friend class UCPaletteSettingsParser;
+};
+
+class UCPaletteSettingsParser : public QQmlCustomParser
+{
+public:
+    UCPaletteSettingsParser() : QQmlCustomParser(QQmlCustomParser::AcceptsSignalHandlers) {}
+
+    virtual void verifyBindings(const QV4::CompiledData::Unit *qmlUnit, const QList<const QV4::CompiledData::Binding *> &bindings);
+    virtual void applyBindings(QObject *obj, QQmlCompiledData *cdata, const QList<const QV4::CompiledData::Binding *> &bindings);
+
+private:
+    void verifyProperty(const QV4::CompiledData::Unit *qmlUnit, const QV4::CompiledData::Binding *binding);
+};
+
+#endif // UCPALETTESETTINGS_H

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2015-03-17 16:55:26 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2015-03-17 16:55:27 +0000
@@ -23,6 +23,7 @@
 #include "i18n.h"
 #include "ucfontutils.h"
 #include "ucstyleditembase_p.h"
+#include "ucpalettesettings.h"
 
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlinfo.h>
@@ -84,7 +85,7 @@
 
     When declared, the ThemeSettings's name points to the system defined theme. There
     can be cases when the parent defined style set is needed but with small modifications.
-    In these situations the \l parent property can be used to get the parent
+    In these situations the \l parentTheme property can be used to get the parent
     style set, and so the name can be bound to the parent's name.
     \qml
     import QtQuick 2.4
@@ -318,6 +319,29 @@
     return m_palette;
 }
 
+/*!
+ * \qmlproperty PaletteSettings ThemeSettings::paletteSettings
+ * The property holds the PaletteSettings component applied on the theme. When
+ * set, the palette values will be applied on the style palette value sets.
+ * Defaults to null.
+ */
+UCPaletteSettings *UCTheme::paletteSettings() const
+{
+    return m_paletteSettings;
+}
+void UCTheme::setPaletteSettings(UCPaletteSettings *paletteSettings)
+{
+    if (m_paletteSettings == paletteSettings) {
+        return;
+    }
+    if (m_paletteSettings && paletteSettings && paletteSettings->parent() == this) {
+        qmlInfo(this) << UbuntuI18n::instance().tr("ThemeSettings can have only one PaletteSettings set.");
+    } else {
+        m_paletteSettings = paletteSettings;
+        Q_EMIT paletteSettingsChanged();
+    }
+}
+
 QUrl UCTheme::styleUrl(const QString& styleName)
 {
     Q_FOREACH (const QUrl& themePath, m_themePaths) {

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.h'
--- modules/Ubuntu/Components/plugin/uctheme.h	2015-03-17 16:55:26 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.h	2015-03-17 16:55:27 +0000
@@ -29,6 +29,7 @@
 
 #include "ucdefaulttheme.h"
 
+class UCPaletteSettings;
 class UCStyledItemBase;
 class UCTheme : public QObject, public QQmlParserStatus
 {
@@ -37,6 +38,8 @@
     Q_PROPERTY(UCTheme *parentTheme READ parentTheme NOTIFY parentThemeChanged)
     Q_PROPERTY(QString name READ name WRITE setName RESET resetName NOTIFY nameChanged)
     Q_PROPERTY(QObject* palette READ palette NOTIFY paletteChanged)
+    Q_PROPERTY(UCPaletteSettings *paletteSettings READ paletteSettings WRITE setPaletteSettings NOTIFY paletteSettingsChanged)
+    Q_CLASSINFO("DefaultProperty", "paletteSettings")
 public:
     explicit UCTheme(QObject *parent = 0);
     static UCTheme &defaultTheme()
@@ -51,6 +54,8 @@
     void setName(const QString& name);
     void resetName();
     QObject* palette();
+    UCPaletteSettings *paletteSettings() const;
+    void setPaletteSettings(UCPaletteSettings *paletteSettings);
 
     Q_INVOKABLE QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent);
     static void registerToContext(QQmlContext* context);
@@ -62,6 +67,7 @@
     void parentThemeChanged();
     void nameChanged();
     void paletteChanged();
+    void paletteSettingsChanged();
 
 protected:
     void classBegin();
@@ -83,6 +89,7 @@
 
     QString m_name;
     QPointer<QObject> m_palette; // the palette might be from the default style if the theme doesn't define palette
+    QPointer<UCPaletteSettings> m_paletteSettings;
     QQmlEngine *m_engine;
     QList<QUrl> m_themePaths;
     UCDefaultTheme m_defaultTheme;

=== modified file 'tests/resources/styleset/Simple.qml'
--- tests/resources/styleset/Simple.qml	2015-03-17 16:55:26 +0000
+++ tests/resources/styleset/Simple.qml	2015-03-17 16:55:27 +0000
@@ -38,11 +38,33 @@
             objectName: "OuterText"
             property string styleName: theme.name
             onStyleNameChanged: print(objectName, styleName)
+            Connections {
+                target: theme
+                onPaletteChanged: {
+                    print("TextField:", styleSet.name)
+                    print("normal.foregroundText", styleSet.palette.normal.foregroundText)
+                    print("normal.overlayText", styleSet.palette.normal.overlayText)
+                    print("selected.foregroundText", styleSet.palette.selected.foregroundText)
+                    print("selected.overlayText", styleSet.palette.selected.overlayText)
+                }
+            }
         }
         StyledItem {
             objectName: "SuruDarkStyled"
             width: parent.width
             height: units.gu(10)
+            theme: ThemeSettings {
+                name: "Ubuntu.Components.Themes.SuruDark"
+                // override normal.foregroundText
+                PaletteChanges {
+                    normal.foregroundText: UbuntuColors.blue
+                    normal.overlayText: "blue"
+                    selected.foregroundText: Qt.rgba(0, 0, 1, 1)
+                    selected.overlayText: normal.overlayText
+                    selected.foreground: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
+                }
+            }
+
             TextField {
                 objectName: "InnerText"
                 property string styleName: theme.name

=== added file 'tests/unit_x11/tst_subtheming/ChangeDefaultPaletteInChildren.qml'
--- tests/unit_x11/tst_subtheming/ChangeDefaultPaletteInChildren.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/ChangeDefaultPaletteInChildren.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    Loader {
+        objectName: "loader"
+        anchors.fill: parent
+        sourceComponent: dynamicItem
+    }
+
+    Component {
+        id: dynamicItem
+        StyledItem {
+            theme.paletteSettings: PaletteSettings {
+                normal.background: "blue"
+            }
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_subtheming/ChangePaletteValueWhenParentChanges.qml'
--- tests/unit_x11/tst_subtheming/ChangePaletteValueWhenParentChanges.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/ChangePaletteValueWhenParentChanges.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+// the style of the root object will be changed
+StyledItem {
+    StyledItem {
+        theme: ThemeSettings {
+            objectName: "firstTheme"
+            name: parentTheme.name
+            PaletteSettings{
+                normal.background: "blue"
+            }
+        }
+    }
+}
+

=== added file 'tests/unit_x11/tst_subtheming/ExplicitPaletteSettings.qml'
--- tests/unit_x11/tst_subtheming/ExplicitPaletteSettings.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/ExplicitPaletteSettings.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: main
+    width: units.gu(40)
+    height: units.gu(71)
+
+    property color color: "red"
+
+    theme: ThemeSettings {
+        objectName: "testSet"
+        PaletteSettings {
+            explicit: true
+            normal.background: main.color
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/ImplicitPaletteSettings.qml'
--- tests/unit_x11/tst_subtheming/ImplicitPaletteSettings.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/ImplicitPaletteSettings.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: main
+    width: units.gu(40)
+    height: units.gu(71)
+
+    property color color: "red"
+
+    theme: ThemeSettings {
+        objectName: "testSet"
+        PaletteSettings {
+            explicit: false
+            normal.background: main.color
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/InvalidPaletteSettings1.qml'
--- tests/unit_x11/tst_subtheming/InvalidPaletteSettings1.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/InvalidPaletteSettings1.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    theme: ThemeSettings {
+        PaletteSettings{
+            invalid: 1
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/InvalidPaletteSettings2.qml'
--- tests/unit_x11/tst_subtheming/InvalidPaletteSettings2.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/InvalidPaletteSettings2.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    theme: ThemeSettings {
+        PaletteSettings{
+            normal.invalid: 1
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/InvalidPaletteSettings3.qml'
--- tests/unit_x11/tst_subtheming/InvalidPaletteSettings3.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/InvalidPaletteSettings3.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    theme: ThemeSettings {
+        PaletteSettings{
+            normal.background: 1
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/InvalidPaletteSettings4.qml'
--- tests/unit_x11/tst_subtheming/InvalidPaletteSettings4.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/InvalidPaletteSettings4.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    theme: ThemeSettings {
+        PaletteSettings{
+            normal.background: 1.2
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/InvalidPaletteSettings5.qml'
--- tests/unit_x11/tst_subtheming/InvalidPaletteSettings5.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/InvalidPaletteSettings5.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    theme: ThemeSettings {
+        PaletteSettings{
+            normal.background: true
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/InvalidPaletteSettings6.qml'
--- tests/unit_x11/tst_subtheming/InvalidPaletteSettings6.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/InvalidPaletteSettings6.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    property int value: 10
+    theme: ThemeSettings {
+        PaletteSettings{
+            normal.background: value
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/MorePaletteSettingsInTheme.qml'
--- tests/unit_x11/tst_subtheming/MorePaletteSettingsInTheme.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/MorePaletteSettingsInTheme.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    theme: ThemeSettings {
+        PaletteSettings{
+        }
+        PaletteSettings{
+        }
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/SameNamedPaletteSettings.qml'
--- tests/unit_x11/tst_subtheming/SameNamedPaletteSettings.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/SameNamedPaletteSettings.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    StyledItem {
+        theme: ThemeSettings {
+            objectName: "firstTheme"
+            name: "Ubuntu.Components.Themes.SuruDark"
+            PaletteSettings{
+                normal.background: UbuntuColors.red
+            }
+        }
+    }
+    StyledItem {
+        theme: ThemeSettings {
+            objectName: "secondTheme"
+            name: "Ubuntu.Components.Themes.SuruDark"
+        }
+    }
+
+}
+

=== added file 'tests/unit_x11/tst_subtheming/WrongPaletteSettingsDeclaration.qml'
--- tests/unit_x11/tst_subtheming/WrongPaletteSettingsDeclaration.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/WrongPaletteSettingsDeclaration.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+StyledItem {
+    id: item
+    theme: ThemeSettings {}
+
+    PaletteSettings{
+        objectName: "testChange"
+    }
+}

=== added file 'tests/unit_x11/tst_subtheming/themes/CustomTheme/Palette.qml'
--- tests/unit_x11/tst_subtheming/themes/CustomTheme/Palette.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_subtheming/themes/CustomTheme/Palette.qml	2015-03-17 16:55:27 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Themes.Ambiance 1.1 as Suru
+
+Suru.Palette {
+    normal.selection: "#A21E1C"
+    selected.selection: "#1C1EA2"
+    selected.base: "lightblue"
+    selected.baseText: "pink"
+    selected.overlay: "#ABCDEF"
+    selected.overlayText: "#FEDCBA"
+    selected.fieldText: UbuntuColors.red
+}

=== modified file 'tests/unit_x11/tst_subtheming/themes/CustomTheme/parent_theme'
--- tests/unit_x11/tst_subtheming/themes/CustomTheme/parent_theme	2015-03-17 16:55:26 +0000
+++ tests/unit_x11/tst_subtheming/themes/CustomTheme/parent_theme	2015-03-17 16:55:27 +0000
@@ -1,1 +1,1 @@
-TestTheme
+Ubuntu.Components.Themes.Ambiance

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.cpp'
--- tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-03-17 16:55:26 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.cpp	2015-03-17 16:55:27 +0000
@@ -23,6 +23,7 @@
 #include "uctheme.h"
 #include "uctestcase.h"
 #include "ucstyleditembase_p.h"
+#include "ucpalettesettings.h"
 
 class ThemeTestCase : public UbuntuTestCase
 {
@@ -489,6 +490,113 @@
         QCOMPARE(UCStyledItemBasePrivate::get(main)->getTheme()->name(),
                  UCStyledItemBasePrivate::get(test)->getTheme()->name());
     }
+
+    // PaletteSettings tests
+
+    void test_palettesettings_api_data()
+    {
+        QTest::addColumn<QString>("test");
+        QTest::addColumn<int>("line");
+        QTest::addColumn<int>("column");
+        QTest::addColumn<QString>("warning");
+
+        QTest::newRow("Wrong PalettChanges ownership")
+                << "WrongPaletteSettingsDeclaration.qml" << 24 << 5
+                << "QML PaletteSettings: PaletteSettings can only be declared in ThemeSettings components.";
+        QTest::newRow("More PalettChanges in ThemeSettings")
+                << "MorePaletteSettingsInTheme.qml" << 22 << 12
+                << "QML ThemeSettings: ThemeSettings can have only one PaletteSettings set.";
+        QTest::newRow("Invalid Palette property")
+                << "InvalidPaletteSettings1.qml" << 23 << 9
+                << "QML PaletteSettings: Palette has no property called 'invalid'.";
+        QTest::newRow("Invalid PaletteValues property")
+                << "InvalidPaletteSettings2.qml" << 23 << 9
+                << "QML PaletteSettings: Palette has no property called 'normal.invalid'.";
+        QTest::newRow("Invalid property type - int.")
+                << "InvalidPaletteSettings3.qml" << 23 << 9
+                << "QML PaletteSettings: Not a valid color value.";
+        QTest::newRow("Invalid property type - real.")
+                << "InvalidPaletteSettings4.qml" << 23 << 9
+                << "QML PaletteSettings: Not a valid color value.";
+        QTest::newRow("Invalid property type - bool.")
+                << "InvalidPaletteSettings5.qml" << 23 << 9
+                << "QML PaletteSettings: Not a valid color value.";
+        QTest::newRow("Invalid property binding result.")
+                << "InvalidPaletteSettings6.qml" << 25 << 32
+                << "Unable to assign int to QColor";
+    }
+    void test_palettesettings_api()
+    {
+        QFETCH(QString, test);
+        QFETCH(int, line);
+        QFETCH(int, column);
+        QFETCH(QString, warning);
+
+        ThemeTestCase::ignoreWarning(test, line, column, warning);
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase(test));
+    }
+
+    void test_no_change_in_other_suru_dark()
+    {
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("SameNamedPaletteSettings.qml"));
+        UCTheme *firstTheme = view->findItem<UCTheme*>("firstTheme");
+        UCTheme *secondTheme = view->findItem<UCTheme*>("secondTheme");
+        QVERIFY(firstTheme->getPaletteColor("normal", "background") != secondTheme->getPaletteColor("normal", "background"));
+    }
+
+    void test_keep_palette_value_when_theme_changes()
+    {
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("ChangePaletteValueWhenParentChanges.qml"));
+        UCTheme *firstTheme = view->findItem<UCTheme*>("firstTheme");
+
+        QCOMPARE(firstTheme->getPaletteColor("normal", "background"), QColor("blue"));
+        // change the theme
+        view->setGlobalTheme("Ubuntu.Components.Themes.SuruDark");
+        QTest::waitForEvents();
+        QCOMPARE(firstTheme->getPaletteColor("normal", "background"), QColor("blue"));
+    }
+
+    void test_change_default_palette_in_children_kept_after_child_deletion()
+    {
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase("ChangeDefaultPaletteInChildren.qml"));
+        QQuickItem *loader = view->findItem<QQuickItem*>("loader");
+        UCStyledItemBase *main = qobject_cast<UCStyledItemBase*>(view->rootObject());
+        UCTheme *mainSet = UCStyledItemBasePrivate::get(main)->getTheme();
+        QQuickItem *item = loader->property("item").value<QQuickItem*>();
+        QVERIFY(item);
+
+        QCOMPARE(mainSet->getPaletteColor("normal", "background"), QColor("blue"));
+        // unload component
+        QSignalSpy itemSpy(item, SIGNAL(destroyed()));
+        loader->setProperty("sourceComponent", QVariant());
+        itemSpy.wait();
+        // palette stays!
+        QCOMPARE(mainSet->getPaletteColor("normal", "background"), QColor("blue"));
+    }
+
+    void test_explicit_palettesettings_data()
+    {
+        QTest::addColumn<QString>("test");
+        QTest::addColumn<QColor>("color");
+        QTest::addColumn<QColor>("expected");
+
+        QTest::newRow("explicit: false") << "ImplicitPaletteSettings.qml" << QColor("blue") << QColor("blue");
+        QTest::newRow("explicit: true")  << "ExplicitPaletteSettings.qml" << QColor("blue") << QColor("red");
+    }
+    void test_explicit_palettesettings()
+    {
+        QFETCH(QString, test);
+        QFETCH(QColor, color);
+        QFETCH(QColor, expected);
+
+        QScopedPointer<ThemeTestCase> view(new ThemeTestCase(test));
+        UCStyledItemBase *main = qobject_cast<UCStyledItemBase*>(view->rootObject());
+        UCTheme *theme = view->findItem<UCTheme*>("testSet");
+        // set the main color
+        main->setProperty("color", color);
+        QColor paletteColor = theme->getPaletteColor("normal", "background");
+        QCOMPARE(paletteColor, expected);
+    }
 };
 
 QTEST_MAIN(tst_Subtheming)

=== modified file 'tests/unit_x11/tst_subtheming/tst_subtheming.pro'
--- tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-03-17 16:55:26 +0000
+++ tests/unit_x11/tst_subtheming/tst_subtheming.pro	2015-03-17 16:55:27 +0000
@@ -5,9 +5,8 @@
 OTHER_FILES += \
     TestStyle.qml \
     SimpleItem.qml \
-    themes/AppTheme/Palette.qml \
-    themes/AppTheme/parent_theme \
     themes/CustomTheme/TestStyle.qml \
+    themes/CustomTheme/Palette.qml \
     themes/CustomTheme/parent_theme \
     themes/TestModule/TestTheme/TestStyle.qml \
     themes/TestModule/TestTheme/qmldir \
@@ -16,5 +15,18 @@
     ParentChanges.qml \
     TestMain.qml \
     TestStyleChange.qml \
-    DifferentThemes.qml
+    DifferentThemes.qml \
+    ChangePaletteValueWhenParentChanges.qml \
+    ChangeDefaultPaletteInChildren.qml \
+    ImplicitPaletteSettings.qml \
+    ExplicitPaletteSettings.qml \
+    InvalidPaletteSettings1.qml \
+    InvalidPaletteSettings2.qml \
+    InvalidPaletteSettings3.qml \
+    InvalidPaletteSettings4.qml \
+    InvalidPaletteSettings5.qml \
+    InvalidPaletteSettings6.qml \
+    MorePaletteSettingsInTheme.qml \
+    SameNamedPaletteSettings.qml \
+    WrongPaletteSettingsDeclaration.qml