Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/01-multiple-theme-engines into lp:ubuntu-ui-toolkit/staging

01-multiple-theme-engines
Merge into staging

Proposed by Zsombor Egri on 2015-03-05

Status:

Merged

Approved by:

Tim Peeters on 2015-04-02

Approved revision:

1448

Merged at revision:

1461

Proposed branch:

lp:~zsombi/ubuntu-ui-toolkit/01-multiple-theme-engines

Merge into:

lp:ubuntu-ui-toolkit/staging

Diff against target:

1386 lines (+616/-234)

23 files modified

modules/Ubuntu/Components/plugin/plugin.cpp (+3/-3)
modules/Ubuntu/Components/plugin/plugin.pro (+6/-4)
modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp (+7/-7)
modules/Ubuntu/Components/plugin/ucdefaulttheme.h (+6/-6)
modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+124/-0)
modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h (+53/-0)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+7/-4)
modules/Ubuntu/Components/plugin/uctheme.cpp (+57/-46)
modules/Ubuntu/Components/plugin/uctheme.h (+17/-10)
tests/resources/subtheming/Simple.qml (+45/-0)
tests/unit/tst_performance/StyledItemOldTheming.qml (+72/-0)
tests/unit/tst_performance/tst_performance.cpp (+4/-0)
tests/unit/tst_performance/tst_performance.pro (+2/-1)
tests/unit_x11/tst_components/tst_app_theming.qml (+54/-0)
tests/unit_x11/tst_components/tst_components.pro (+2/-2)
tests/unit_x11/tst_deprecated_theme_engine/Parent.qml (+14/-4)
tests/unit_x11/tst_deprecated_theme_engine/SimpleItem.qml (+20/-0)
tests/unit_x11/tst_deprecated_theme_engine/themes/CustomTheme/TestStyle.qml (+0/-1)
tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/TestStyle.qml (+0/-1)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+113/-113)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro (+9/-2)
tests/unit_x11/tst_theme_engine/TestApp.qml (+0/-29)
tests/unit_x11/unit_x11.pro (+1/-1)

To merge this branch:

bzr merge lp:~zsombi/ubuntu-ui-toolkit/01-multiple-theme-engines

High

Fix Released

Link a bug report

Related blueprints:

Implement Theme overrides from a component to be applied on all its sub-components (Undefined)

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-04-02
Tim Peeters		2015-03-05	Approve on 2015-04-02
Review via email: mp+251942@code.launchpad.net

Commit message

Separating Theme context property from theme engine, giving the possibility to use the theming engine by multiple instances. Preparations for deprecation. Theming unit tests fixed.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1539/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/01-multiple-theme-engines updated on 2015-03-11

1441. By Zsombor Egri on 2015-03-11: staging sync

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-11:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1540/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/01-multiple-theme-engines updated on 2015-03-13

1442. By Zsombor Egri on 2015-03-13: staging sync
1443. By Zsombor Egri on 2015-03-13: Rename ThemeSettings to DefaultTheme

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-13:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1550/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1563/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-03-23:

Update the copyright year in the files that you changed. At least plugin.cpp, ucdefaulttheme.cpp, ucdefaulttheme.h. Maybe more.

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-03-23:

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-03-23:

tests/resources/styleset/ <-- the name "styleset" is depreacted.

What is the goal of resources/styleset/Simple.qml? You are setting objectNames there as if it was used in some unit/AP test, but I don't see where you use it.

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-03-23:

795 === renamed directory 'tests/unit_x11/tst_theme_engine/AppTheme' => 'tests/unit_x11/tst_components/AppTheme'

why?

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-03-23:

836 + function test_0() {

Can you give this test a more useful name?

841 + function test_ambiance()
842 + {
843 + Theme.name = "Ubuntu.Components.Themes.Ambiance";
844 + }
845 +
846 + function test_reset()
847 + {
848 + Theme.name = undefined;
849 + }

These tests are setting values, but not checking anything with the new values.

review: Needs Fixing

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-03-23:

991 === modified file 'tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp'

Should this be renamed to tst_deprecated_theme_engine_test? Or will tests for the new themning go in there as well?

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-03-23:

> tests/resources/styleset/ <-- the name "styleset" is depreacted.
>
>
> What is the goal of resources/styleset/Simple.qml? You are setting objectNames
> there as if it was used in some unit/AP test, but I don't see where you use
> it.

I use this app to test the theming across this chain of MRs.

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-03-23:

> 795 === renamed directory 'tests/unit_x11/tst_theme_engine/AppTheme' =>
> 'tests/unit_x11/tst_components/AppTheme'
>
> why?

The C++ tests have the plugin linked statically with them. This makes the UCDeprecatedTheme::instance() to be called once all over the tests. This means that the plugin won't function properly like it would on an Application. This causes crash on the auto-theming, as it tries to delete a theme's palette which wasn't created with the same QML engine. The whole idea to initialize the UCTheme and UCDeprecatedTheme in this way is bad.

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-03-23:

> 836 + function test_0() {
>
> Can you give this test a more useful name?
>
>
> 841 + function test_ambiance()
> 842 + {
> 843 + Theme.name = "Ubuntu.Components.Themes.Ambiance";
> 844 + }
> 845 +
> 846 + function test_reset()
> 847 + {
> 848 + Theme.name = undefined;
> 849 + }
>
> These tests are setting values, but not checking anything with the new values.

Because those values will be set even though you'll get loads of binding loops on MainView. The test is actually to not to have any warnings when they're set. And there is no way to say no warnings, that's why we have that on the runtest.sh level.

Revision history for this message

Zsombor Egri (zsombi) wrote on 2015-03-23:

> 991 === modified file
> 'tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp'
>
> Should this be renamed to tst_deprecated_theme_engine_test? Or will tests for
> the new themning go in there as well?

The new theming tests will go to a separate test module, and these will keep doing the old tests. Not sure whether it is worth renaming it, but I will.

lp:~zsombi/ubuntu-ui-toolkit/01-multiple-theme-engines updated on 2015-03-23

1444. By Zsombor Egri on 2015-03-23: review comments applied
1445. By Zsombor Egri on 2015-03-23: staging sync
1446. By Zsombor Egri on 2015-03-23: funny branch divergence fix

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-03-23:

Thanks for the updates. Looks good.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-23:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1586/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/01-multiple-theme-engines updated on 2015-04-01

1447. By Zsombor Egri on 2015-04-01: staging merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1616/rebuild

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/01-multiple-theme-engines updated on 2015-04-02

1448. By Zsombor Egri on 2015-04-02: CI kick

Revision history for this message

Tim Peeters (tpeeters) wrote on 2015-04-02:

should be good. let's see if it autolands.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2015-04-02:

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-04-02:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1631/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Tom Mirmar

Ubuntu SDK team

Zsombor Egri

 === modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
 --- modules/Ubuntu/Components/plugin/plugin.cpp	2015-03-04 19:07:58 +0000
 +++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-04-02 11:34:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2012-2014 Canonical Ltd.
++ * Copyright 2012-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
@@ -13,7 +13,6 @@
   * 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: Juhapekka Piiroinen <juhapekka.piiroinen@canonical.com>
   */
  #include <QtQuick/private/qquickimagebase_p.h>
@@ -23,6 +22,7 @@
  #include "plugin.h"
  #include "uctheme.h"
++#include "ucdeprecatedtheme.h"
  #include <QtQml/QQmlContext>
  #include "i18n.h"
@@ -207,7 +207,7 @@
      // that can be accessed from any object
      context->setContextProperty("QuickUtils", &QuickUtils::instance());
--    UCTheme::instance().registerToContext(context);
++    UCDeprecatedTheme::instance().registerToContext(context);
      context->setContextProperty("i18n", &UbuntuI18n::instance());
      ContextPropertyChangeListener *i18nChangeListener =
 === modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
 --- modules/Ubuntu/Components/plugin/plugin.pro	2015-03-04 19:07:58 +0000
 +++ modules/Ubuntu/Components/plugin/plugin.pro	2015-04-02 11:34:06 +0000
@@ -26,7 +26,6 @@
  HEADERS += plugin.h \
      uctheme.h \
--    ucthemesettings.h \
      i18n.h \
      listener.h \
      ucscalingimageprovider.h \
@@ -79,11 +78,12 @@
      ucserviceproperties_p.h \
      privates/listitemdragarea.h \
      privates/listitemdraghandler.h \
--    ucnamespace.h
++    ucnamespace.h \
++    ucdeprecatedtheme.h \
++    ucdefaulttheme.h
  SOURCES += plugin.cpp \
      uctheme.cpp \
--    ucthemesettings.cpp \
      i18n.cpp \
      listener.cpp \
      ucscalingimageprovider.cpp \
@@ -126,7 +126,9 @@
      ucserviceproperties.cpp \
      privates/listitemdragarea.cpp \
      privates/listitemdraghandler.cpp \
--    ucnamespace.cpp
++    ucnamespace.cpp \
++    ucdeprecatedtheme.cpp \
++    ucdefaulttheme.cpp
  # adapters
  SOURCES += adapters/alarmsadapter_organizer.cpp
 === renamed file 'modules/Ubuntu/Components/plugin/ucthemesettings.cpp' => 'modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp'
 --- modules/Ubuntu/Components/plugin/ucthemesettings.cpp	2015-01-20 10:33:29 +0000
 +++ modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp	2015-04-02 11:34:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-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
@@ -17,7 +17,7 @@
   *          Florian Boucault <florian.boucault@canonical.com>
   */
--#include "ucthemesettings.h"
++#include "ucdefaulttheme.h"
  #include "uctheme.h"
  #include <QDebug>
@@ -34,7 +34,7 @@
  const QString THEME_KEY("theme");
  const QString DEFAULT_THEME("Ubuntu.Components.Themes.Ambiance");
--UCThemeSettings::UCThemeSettings(QObject *parent) :
++UCDefaultTheme::UCDefaultTheme(QObject *parent) :
      QObject(parent),
      m_settings(SETTINGS_FILE_FORMAT.arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)), QSettings::IniFormat)
+ {
@@ -51,11 +51,11 @@
+     }
      QObject::connect(&m_settingsFileWatcher, &QFileSystemWatcher::fileChanged,
--                     this, &UCThemeSettings::reloadSettings);
++                     this, &UCDefaultTheme::reloadSettings);
      reloadSettings();
+ }
--void UCThemeSettings::reloadSettings()
++void UCDefaultTheme::reloadSettings()
+ {
      m_settings.sync();
      m_settingsFileWatcher.addPath(m_settings.fileName());
@@ -67,12 +67,12 @@
+     }
+ }
--QString UCThemeSettings::themeName() const
++QString UCDefaultTheme::themeName() const
+ {
      return m_themeName;
+ }
--void UCThemeSettings::setThemeName(const QString &themeName)
++void UCDefaultTheme::setThemeName(const QString &themeName)
+ {
      if (themeName != m_themeName) {
          m_themeName = themeName;
 === renamed file 'modules/Ubuntu/Components/plugin/ucthemesettings.h' => 'modules/Ubuntu/Components/plugin/ucdefaulttheme.h'
 --- modules/Ubuntu/Components/plugin/ucthemesettings.h	2013-10-18 08:56:39 +0000
 +++ modules/Ubuntu/Components/plugin/ucdefaulttheme.h	2015-04-02 11:34:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-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
@@ -17,20 +17,20 @@
   *          Florian Boucault <florian.boucault@canonical.com>
   */
--#ifndef UCTHEMESETTINGS_H
--#define UCTHEMESETTINGS_H
++#ifndef UCDEFAULTTHEME_H
++#define UCDEFAULTTHEME_H
  #include <QtCore/QFileSystemWatcher>
  #include <QtCore/QSettings>
  #include <QtCore/QObject>
--class UCThemeSettings : public QObject
++class UCDefaultTheme : public QObject
+ {
      Q_OBJECT
      Q_PROPERTY(QString themeName READ themeName WRITE setThemeName NOTIFY themeNameChanged)
  public:
--    explicit UCThemeSettings(QObject *parent = 0);
++    explicit UCDefaultTheme(QObject *parent = 0);
      // getter/setters
      QString themeName() const;
@@ -47,4 +47,4 @@
      QString m_themeName;
  };
--#endif // UCTHEMESETTINGS_H
++#endif // UCDEFAULTTHEME_H
 === added file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp'
 --- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp	2015-04-02 11:34:06 +0000
@@ -0,0 +1,124 @@
++/*
++ * 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/>.
++ *
++ * Authors: Zsombor Egri <zsombor.egri@canonical.com>
++ */
++
++#include "ucdeprecatedtheme.h"
++#include "uctheme.h"
++#include "listener.h"
++#include <QtQml/QQmlComponent>
++#include <QtQml/QQmlContext>
++#include <QtQml/QQmlInfo>
++
++/*!
++    \qmltype Theme
++    \instantiates UCTheme
++    \inqmlmodule Ubuntu.Components 1.1
++    \ingroup theming
++    \brief The Theme class provides facilities to interact with the current theme.
++
++    A global instance is exposed as the \b Theme context property.
++
++    The theme defines the visual aspect of the Ubuntu components.
++
++    Example changing the current theme:
++
++    \qml
++    import QtQuick 2.4
++    import Ubuntu.Components 1.2
++
++    Item {
++        Button {
++            onClicked: Theme.name = "Ubuntu.Components.Themes.Ambiance"
++        }
++    }
++    \endqml
++
++    Example creating a style component:
++
++    \qml
++    import QtQuick 2.4
++    import Ubuntu.Components 1.2
++
++    StyledItem {
++        id: myItem
++        style: Theme.createStyleComponent("MyItemStyle.qml", myItem)
++    }
++    \endqml
++
++    \sa {StyledItem}
++*/
++UCDeprecatedTheme::UCDeprecatedTheme(QObject *parent)
++    : QObject(parent)
++{
++    connect(&UCTheme::defaultSet(), &UCTheme::nameChanged,
++            this, &UCDeprecatedTheme::nameChanged);
++    connect(&UCTheme::defaultSet(), &UCTheme::paletteChanged,
++            this, &UCDeprecatedTheme::paletteChanged);
++}
++
++/*!
++    \qmlproperty string Theme::name
++
++    The name of the current theme.
++*/
++QString UCDeprecatedTheme::name() const
++{
++    return UCTheme::defaultSet().name();
++}
++void UCDeprecatedTheme::setName(const QString& name)
++{
++    UCTheme::defaultSet().setName(name);
++}
++void UCDeprecatedTheme::resetName()
++{
++    UCTheme::defaultSet().resetName();
++}
++
++/*!
++    \qmlproperty Palette Theme::palette
++
++    The palette of the current theme.
++*/
++QObject* UCDeprecatedTheme::palette()
++{
++    return UCTheme::defaultSet().palette();
++}
++
++/*!
++    \qmlmethod Component Theme::createStyleComponent(string styleName, object parent)
++
++    Returns an instance of the style component named \a styleName.
++*/
++QQmlComponent* UCDeprecatedTheme::createStyleComponent(const QString& styleName, QObject* parent)
++{
++    return UCTheme::defaultSet().createStyleComponent(styleName, parent);
++}
++
++void UCDeprecatedTheme::registerToContext(QQmlContext* context)
++{
++    // add paths to engine search folder
++    UCTheme::defaultSet().m_engine = context->engine();
++    UCTheme::defaultSet().updateEnginePaths();
++
++    // register deprecated Theme property
++    context->setContextProperty("Theme", this);
++
++    ContextPropertyChangeListener *themeChangeListener =
++        new ContextPropertyChangeListener(context, "Theme");
++    QObject::connect(this, SIGNAL(nameChanged()),
++                     themeChangeListener, SLOT(updateContextProperty()));
++}
 === added file 'modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h'
 --- modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h	1970-01-01 00:00:00 +0000
 +++ modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h	2015-04-02 11:34:06 +0000
@@ -0,0 +1,53 @@
++/*
++ * 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/>.
++ *
++ * Authors: Zsombor Egri <zsombor.egri@canonical.com>
++ */
++
++#ifndef UCDEPRECATEDTHEME_H
++#define UCDEPRECATEDTHEME_H
++
++#include <QtCore/QObject>
++
++class QQmlComponent;
++class QQmlContext;
++class UCTheme;
++class UCDeprecatedTheme : public QObject
++{
++    Q_OBJECT
++    Q_PROPERTY(QString name READ name WRITE setName RESET resetName NOTIFY nameChanged)
++    Q_PROPERTY(QObject* palette READ palette NOTIFY paletteChanged)
++public:
++    static UCDeprecatedTheme& instance() {
++        static UCDeprecatedTheme instance;
++        return instance;
++    }
++    explicit UCDeprecatedTheme(QObject *parent = 0);
++
++    // getter/setters
++    QString name() const;
++    void setName(const QString& name);
++    void resetName();
++    QObject* palette();
++
++    Q_INVOKABLE QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent);
++    void registerToContext(QQmlContext* context);
++
++Q_SIGNALS:
++    void nameChanged();
++    void paletteChanged();
++};
++
++#endif // UCDEPRECATEDTHEME_H
 === modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
 --- modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-03-03 13:47:48 +0000
 +++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-04-02 11:34:06 +0000
@@ -15,7 +15,7 @@
   */
  #include "ucunits.h"
--#include "uctheme.h"
++#include "ucdeprecatedtheme.h"
  #include "uclistitem.h"
  #include "uclistitem_p.h"
  #include "uclistitemactions.h"
@@ -40,7 +40,8 @@
  QColor getPaletteColor(const char *profile, const char *color)
+ {
      QColor result;
--    QObject *palette = UCTheme::instance().palette();
++    // FIXME: use theme when available
++    QObject *palette = UCDeprecatedTheme::instance().palette();
      if (palette) {
          QObject *paletteProfile = palette->property(profile).value<QObject*>();
          if (paletteProfile) {
@@ -237,7 +238,8 @@
                       q, SLOT(_q_updateSwiping()), Qt::DirectConnection);
      // catch theme changes
--    QObject::connect(&UCTheme::instance(), SIGNAL(nameChanged()), q, SLOT(_q_updateThemedData()));
++    // FIXME: use theme when available
++    QObject::connect(&UCDeprecatedTheme::instance(), SIGNAL(nameChanged()), q, SLOT(_q_updateThemedData()));
      _q_updateThemedData();
      // watch grid unit size change and set implicit size
@@ -379,7 +381,8 @@
+         }
          delete implicitStyleComponent;
          Q_Q(UCListItem);
--        implicitStyleComponent = UCTheme::instance().createStyleComponent("ListItemStyle.qml", q);
++        // FIXME: use theme when available
++        implicitStyleComponent = UCDeprecatedTheme::instance().createStyleComponent("ListItemStyle.qml", q);
          if (implicitStyleComponent) {
              // set the objectnane for testing in tst_listitems.qml
              implicitStyleComponent->setObjectName("ListItemThemeStyle");
 === modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
 --- modules/Ubuntu/Components/plugin/uctheme.cpp	2015-03-03 13:47:48 +0000
 +++ modules/Ubuntu/Components/plugin/uctheme.cpp	2015-04-02 11:34:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-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
@@ -36,7 +36,7 @@
  #include <QtGui/QGuiApplication>
  #include <QtGui/QFont>
--/*!
++/*
      \qmltype Theme
      \instantiates UCTheme
      \inqmlmodule Ubuntu.Components 1.1
@@ -111,20 +111,23 @@
      return result;
+ }
--UCTheme::UCTheme(QObject *parent) :
--    QObject(parent),
--    m_palette(NULL),
--    m_engine(NULL),
--    m_engineUpdated(false)
--{
--    m_name = m_themeSettings.themeName();
--    QObject::connect(&m_themeSettings, &UCThemeSettings::themeNameChanged,
--                     this, &UCTheme::onThemeNameChanged);
--    updateThemePaths();
--
--    QObject::connect(this, SIGNAL(nameChanged()),
--                     this, SLOT(loadPalette()), Qt::UniqueConnection);
--
++UCTheme::UCTheme(QObject *parent)
++    : QObject(parent)
++    , m_name(UCTheme::defaultSet().m_name)
++    , m_palette(UCTheme::defaultSet().m_palette)
++    , m_engine(UCTheme::defaultSet().m_engine)
++    , m_defaultStyle(false)
++{
++    init();
++}
++
++UCTheme::UCTheme(bool defaultStyle, QObject *parent)
++    : QObject(parent)
++    , m_palette(NULL)
++    , m_engine(NULL)
++    , m_defaultStyle(defaultStyle)
++{
++    init();
      // set the default font
      QFont defaultFont;
      defaultFont.setFamily("Ubuntu");
@@ -133,9 +136,17 @@
      QGuiApplication::setFont(defaultFont);
+ }
++void UCTheme::init()
++{
++    m_name = m_defaultTheme.themeName();
++    QObject::connect(&m_defaultTheme, &UCDefaultTheme::themeNameChanged,
++                     this, &UCTheme::onThemeNameChanged);
++    updateThemePaths();
++}
++
  void UCTheme::updateEnginePaths()
+ {
--    if (!m_engine || m_engineUpdated) {
++    if (!m_engine) {
          return;
+     }
@@ -145,13 +156,12 @@
              m_engine->addImportPath(path);
+         }
+     }
--    m_engineUpdated = true;
+ }
  void UCTheme::onThemeNameChanged()
+ {
--    if (m_themeSettings.themeName() != m_name) {
--        m_name = m_themeSettings.themeName();
++    if (m_defaultTheme.themeName() != m_name) {
++        m_name = m_defaultTheme.themeName();
          updateThemePaths();
          Q_EMIT nameChanged();
+     }
@@ -186,7 +196,7 @@
+     }
+ }
--/*!
++/*
      \qmlproperty string Theme::name
      The name of the current theme.
@@ -195,19 +205,29 @@
+ {
      return m_name;
+ }
--
  void UCTheme::setName(const QString& name)
+ {
--    if (name != m_name) {
--        QObject::disconnect(&m_themeSettings, &UCThemeSettings::themeNameChanged,
++    if (name == m_name) {
++        return;
++    }
++    if (name.isEmpty()) {
++        init();
++    } else {
++        QObject::disconnect(&m_defaultTheme, &UCDefaultTheme::themeNameChanged,
                              this, &UCTheme::onThemeNameChanged);
          m_name = name;
          updateThemePaths();
--        Q_EMIT nameChanged();
+     }
++    updateEnginePaths();
++    Q_EMIT nameChanged();
++    loadPalette();
++}
++void UCTheme::resetName()
++{
++    setName(QString());
+ }
--/*!
++/*
      \qmlproperty Palette Theme::palette
      The palette of the current theme.
@@ -248,7 +268,7 @@
      return parentTheme;
+ }
--/*!
++/*
      \qmlmethod Component Theme::createStyleComponent(string styleName, object parent)
      Returns an instance of the style component named \a styleName.
@@ -283,22 +303,6 @@
      return component;
+ }
--void UCTheme::registerToContext(QQmlContext* context)
--{
--    // add paths to engine search folder
--    m_engine = context->engine();
--    updateEnginePaths();
--
--    // register Theme
--    context->setContextProperty("Theme", this);
--
--    ContextPropertyChangeListener *themeChangeListener =
--        new ContextPropertyChangeListener(context, "Theme");
--    QObject::connect(this, SIGNAL(nameChanged()),
--                     themeChangeListener, SLOT(updateContextProperty()));
--
--}
--
  void UCTheme::loadPalette(bool notify)
+ {
      if (!m_engine) {
@@ -307,8 +311,15 @@
      if (m_palette != NULL) {
          delete m_palette;
+     }
--    m_palette = QuickUtils::instance().createQmlObject(styleUrl("Palette.qml"), m_engine);
--    if (notify) {
--        Q_EMIT paletteChanged();
++    // theme may not have palette defined
++    QUrl paletteUrl = styleUrl("Palette.qml");
++    if (paletteUrl.isValid()) {
++        m_palette = QuickUtils::instance().createQmlObject(paletteUrl, m_engine);
++        if (notify) {
++            Q_EMIT paletteChanged();
++        }
++    } else {
++        // use the default palette if none defined
++        m_palette = defaultSet().m_palette;
+     }
+ }
 === modified file 'modules/Ubuntu/Components/plugin/uctheme.h'
 --- modules/Ubuntu/Components/plugin/uctheme.h	2014-11-24 15:08:26 +0000
 +++ modules/Ubuntu/Components/plugin/uctheme.h	2015-04-02 11:34:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-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
@@ -21,29 +21,31 @@
  #define UCTHEME_H
  #include <QtCore/QObject>
++#include <QtCore/QPointer>
  #include <QtCore/QUrl>
  #include <QtCore/QString>
  #include <QtQml/QQmlComponent>
--#include "ucthemesettings.h"
++#include "ucdefaulttheme.h"
  class UCTheme : public QObject
+ {
      Q_OBJECT
--    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
++    Q_PROPERTY(QString name READ name WRITE setName RESET resetName NOTIFY nameChanged)
      Q_PROPERTY(QObject* palette READ palette NOTIFY paletteChanged)
  public:
--    static UCTheme& instance() {
--        static UCTheme instance;
++    explicit UCTheme(QObject *parent = 0);
++    static UCTheme &defaultSet()
++    {
++        static UCTheme instance(true);
          return instance;
+     }
--    explicit UCTheme(QObject *parent = 0);
--
      // getter/setters
      QString name() const;
      void setName(const QString& name);
++    void resetName();
      QObject* palette();
      Q_INVOKABLE QQmlComponent* createStyleComponent(const QString& styleName, QObject* parent);
@@ -63,12 +65,17 @@
      void loadPalette(bool notify = true);
  private:
++    UCTheme(bool defaultStyle, QObject *parent = 0);
++    void init();
++
      QString m_name;
--    QObject* m_palette;
++    QPointer<QObject> m_palette; // the palette might be from the default style if the theme doesn't define palette
      QQmlEngine *m_engine;
      QList<QUrl> m_themePaths;
--    UCThemeSettings m_themeSettings;
--    bool m_engineUpdated;
++    UCDefaultTheme m_defaultTheme;
++    bool m_defaultStyle:1;
++
++    friend class UCDeprecatedTheme;
  };
  #endif // UCTHEME_H
 === added directory 'tests/resources/subtheming'
 === added file 'tests/resources/subtheming/Simple.qml'
 --- tests/resources/subtheming/Simple.qml	1970-01-01 00:00:00 +0000
 +++ tests/resources/subtheming/Simple.qml	2015-04-02 11:34:06 +0000
@@ -0,0 +1,45 @@
++/*
++ * 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.2
++
++StyledItem {
++    id: component1
++    objectName: "TopItem"
++    width: units.gu(50)
++    height: units.gu(100)
++
++    Column {
++        objectName: "Column"
++        anchors.fill: parent
++        TextField {
++            objectName: "OuterText"
++            property string styleName: Theme.name
++            onStyleNameChanged: print(objectName, styleName)
++        }
++        StyledItem {
++            objectName: "SuruDarkStyled"
++            width: parent.width
++            height: units.gu(10)
++            TextField {
++                objectName: "InnerText"
++                property string styleName: Theme.name
++                onStyleNameChanged: print(objectName, styleName)
++            }
++        }
++    }
++}
 === added file 'tests/unit/tst_performance/StyledItemOldTheming.qml'
 --- tests/unit/tst_performance/StyledItemOldTheming.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit/tst_performance/StyledItemOldTheming.qml	2015-04-02 11:34:06 +0000
@@ -0,0 +1,72 @@
++/*
++ * 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.2
++
++StyledItem {
++    id: component1
++    width: units.gu(50)
++    height: units.gu(100)
++
++    property string newTheme
++    onNewThemeChanged: Theme.name = newTheme
++
++    Column {
++        anchors.fill: parent
++        StyledItem {
++            id: component2
++            width: units.gu(40)
++            height: units.gu(80)
++
++            StyledItem {
++                id: component3
++                width: units.gu(40)
++                height: units.gu(80)
++                Item {
++                    anchors.fill: parent
++                    StyledItem {
++                        id: component4
++                        width: units.gu(40)
++                        height: units.gu(80)
++                    }
++                    Loader {
++                        id: loader1
++                        width: units.gu(30)
++                        height: units.gu(30)
++                        sourceComponent: dynamicItem
++                    }
++                }
++            }
++        }
++        Component {
++            id: dynamicItem
++            Item {
++                StyledItem {
++                    id: component5
++                    anchors.fill: parent
++                }
++            }
++        }
++
++        Loader {
++            id: loader2
++            width: units.gu(30)
++            height: units.gu(30)
++            sourceComponent: dynamicItem
++        }
++    }
++}
 === modified file 'tests/unit/tst_performance/tst_performance.cpp'
 --- tests/unit/tst_performance/tst_performance.cpp	2015-03-02 13:49:13 +0000
 +++ tests/unit/tst_performance/tst_performance.cpp	2015-04-02 11:34:06 +0000
@@ -69,6 +69,7 @@
          QTest::addColumn<QString>("document");
          QTest::addColumn<QUrl>("theme");
++        QTest::newRow("old theming") << "StyledItemOldTheming.qml" << QUrl("Ubuntu.Components.Themes.SuruDark");
          QTest::newRow("grid with Rectangle") << "RectangleGrid.qml" << QUrl();
          QTest::newRow("grid with Text") << "TextGrid.qml" << QUrl();
          QTest::newRow("grid with Label") << "LabelGrid.qml" << QUrl();
@@ -95,6 +96,9 @@
          QQuickItem *root = 0;
          QBENCHMARK {
              root = loadDocument(document);
++            if (root && theme.isValid()) {
++                root->setProperty("newTheme", theme.toString());
++            }
+         }
          if (root)
              delete root;
 === modified file 'tests/unit/tst_performance/tst_performance.pro'
 --- tests/unit/tst_performance/tst_performance.pro	2015-03-02 13:39:03 +0000
 +++ tests/unit/tst_performance/tst_performance.pro	2015-04-02 11:34:06 +0000
@@ -25,4 +25,5 @@
      ListItemsEmptyList.qml \
      ListItemsBaseList.qml \
      ListItemWithInlineActionsList.qml \
--    ListItemWithActionsList.qml
++    ListItemWithActionsList.qml \
++    StyledItemOldTheming.qml
 === renamed directory 'tests/unit_x11/tst_theme_engine/AppTheme' => 'tests/unit_x11/tst_components/AppTheme'
 === added file 'tests/unit_x11/tst_components/tst_app_theming.qml'
 --- tests/unit_x11/tst_components/tst_app_theming.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit_x11/tst_components/tst_app_theming.qml	2015-04-02 11:34:06 +0000
@@ -0,0 +1,54 @@
++/*
++ * 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.2
++import QtTest 1.0
++import Ubuntu.Test 1.0
++
++MainView {
++    id: main
++    width: units.gu(40)
++    height: units.gu(71)
++
++    Component.onCompleted: Theme.name = "AppTheme"
++
++    Label {
++        id: testLabel
++    }
++
++    UbuntuTestCase {
++        name: "AppTheming"
++        when: windowShown
++
++        function test_app_theme_defaults() {
++            compare(main.backgroundColor, "#a21e1c", "Theme not loaded?");
++            compare(testLabel.color, "#add8e6", "Label color not from application theme.");
++        }
++
++        // the following tests should give binding loops which are captured by the runtest.sh
++        // and will report failure if received
++        function test_no_binding_loop_when_set_to_ambiance()
++        {
++            Theme.name = "Ubuntu.Components.Themes.Ambiance";
++        }
++
++        function test_reset_theme_should_not_give_binding_loops()
++        {
++            Theme.name = undefined;
++        }
++    }
++}
 === modified file 'tests/unit_x11/tst_components/tst_components.pro'
 --- tests/unit_x11/tst_components/tst_components.pro	2015-03-24 16:51:39 +0000
 +++ tests/unit_x11/tst_components/tst_components.pro	2015-04-02 11:34:06 +0000
@@ -7,5 +7,5 @@
  SOURCES += tst_components.cpp tabsmodel.cpp
  HEADERS += tabsmodel.h
--OTHER_FILES += $$system(ls *.qml) \
--    tst_stress_alarmmodel.qml
++OTHER_FILES += $$system(ls *.qml)
++OTHER_FILES += $$system(ls AppTheme/*)
 === renamed directory 'tests/unit_x11/tst_theme_engine' => 'tests/unit_x11/tst_deprecated_theme_engine'
 === modified file 'tests/unit_x11/tst_deprecated_theme_engine/Parent.qml'
 --- tests/unit_x11/tst_theme_engine/Parent.qml	2015-03-03 13:20:06 +0000
 +++ tests/unit_x11/tst_deprecated_theme_engine/Parent.qml	2015-04-02 11:34:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-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
@@ -14,7 +14,17 @@
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
--import QtQuick 2.0
--
--Item {
++import QtQuick 2.4
++import Ubuntu.Components 1.2
++
++StyledItem {
++    id: item
++    property string styleDocument
++    onStyleDocumentChanged: style = Theme.createStyleComponent(styleDocument, item)
++
++    property string themeName
++    onThemeNameChanged: Theme.name = themeName;
++
++    // make sure we start with Ambiance theme by invoking resetName()
++    Component.onCompleted: Theme.name = undefined
+ }
 === added file 'tests/unit_x11/tst_deprecated_theme_engine/SimpleItem.qml'
 --- tests/unit_x11/tst_deprecated_theme_engine/SimpleItem.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit_x11/tst_deprecated_theme_engine/SimpleItem.qml	2015-04-02 11:34:06 +0000
@@ -0,0 +1,20 @@
++/*
++ * 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
++
++Item {
++}
 === renamed directory 'tests/resources/themes' => 'tests/unit_x11/tst_deprecated_theme_engine/themes'
 === modified file 'tests/unit_x11/tst_deprecated_theme_engine/themes/CustomTheme/TestStyle.qml'
 --- tests/resources/themes/CustomTheme/TestStyle.qml	2015-03-03 13:20:06 +0000
 +++ tests/unit_x11/tst_deprecated_theme_engine/themes/CustomTheme/TestStyle.qml	2015-04-02 11:34:06 +0000
@@ -18,5 +18,4 @@
  import TestTheme 1.0 as Parent
  Parent.TestStyle {
--    Component.onCompleted: console.log("CUSTOMTHEME")
+ }
 === modified file 'tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/TestStyle.qml'
 --- tests/resources/themes/TestModule/TestTheme/TestStyle.qml	2015-03-03 13:20:06 +0000
 +++ tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/TestStyle.qml	2015-04-02 11:34:06 +0000
@@ -18,5 +18,4 @@
  import Ubuntu.Components.Themes.Ambiance 0.1
  Item {
--    Component.onCompleted: console.log("PARENT")
+ }
 === renamed file 'tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp' => 'tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp'
 --- tests/unit_x11/tst_theme_engine/tst_theme_enginetest.cpp	2014-12-04 07:18:58 +0000
 +++ tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp	2015-04-02 11:34:06 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-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
@@ -18,14 +18,51 @@
  #include <QtCore/QString>
  #include <QtTest/QtTest>
  #include <QtQml/QQmlEngine>
++#include <QtQml/QQmlContext>
  #include <QtQml/QQmlComponent>
--#include "uctheme.h"
++#include "ucdeprecatedtheme.h"
  #include "uctestcase.h"
  #include <private/qquicktext_p.h>
  Q_DECLARE_METATYPE(QList<QQmlError>)
--class tst_UCTheme : public QObject
++class ThemeTestCase : public UbuntuTestCase
++{
++    Q_OBJECT
++public:
++    ThemeTestCase(const QString& file, QWindow* parent = 0)
++        : UbuntuTestCase(file, parent)
++    {
++    }
++
++    ~ThemeTestCase()
++    {
++        // restore theme before quitting
++        if (!rootContext()) {
++            return;
++        }
++        UCDeprecatedTheme *theme = rootContext()->contextProperty("Theme").value<UCDeprecatedTheme*>();
++        if (theme) {
++            theme->resetName();
++        } else {
++            qWarning() << "No theme instance found!";
++        }
++    }
++
++    void setTheme(const QString &theme)
++    {
++        rootObject()->setProperty("themeName", theme);
++        QTest::waitForEvents();
++    }
++
++    void setStyle(const QString &style)
++    {
++        rootObject()->setProperty("styleDocument", style);
++        QTest::waitForEvents();
++    }
++};
++
++class tst_UCDeprecatedTheme : public QObject
+ {
      Q_OBJECT
  private:
@@ -44,171 +81,133 @@
      void testThemesRelativePathWithParentXDGDATA();
      void testThemesRelativePathWithParentNoVariablesSet();
      void testThemesRelativePathWithParentOneXDGPathSet();
--    void testAppTheme();
      void testNoImportPathSet();
      void testBogusImportPathSet();
      void testMultipleImportPathsSet();
  };
--void tst_UCTheme::initTestCase()
++void tst_UCDeprecatedTheme::initTestCase()
+ {
      m_xdgDataPath = QLatin1String(getenv("XDG_DATA_DIRS"));
+ }
--void tst_UCTheme::cleanupTestCase()
++void tst_UCDeprecatedTheme::cleanupTestCase()
+ {
      qputenv("XDG_DATA_DIRS", m_xdgDataPath.toLocal8Bit());
+ }
--void tst_UCTheme::testInstance()
++void tst_UCDeprecatedTheme::testInstance()
+ {
--    UCTheme::instance();
++    UCDeprecatedTheme::instance();
+ }
--void tst_UCTheme::testNameDefault()
++void tst_UCDeprecatedTheme::testNameDefault()
+ {
--    UCTheme theme;
++    UCDeprecatedTheme theme;
      QCOMPARE(theme.name(), QString("Ubuntu.Components.Themes.Ambiance"));
+ }
--void tst_UCTheme::testNameSet()
++void tst_UCDeprecatedTheme::testNameSet()
+ {
      QTest::ignoreMessage(QtWarningMsg, "Theme not found: \"MyBeautifulTheme\"");
--    UCTheme theme;
++    UCDeprecatedTheme theme;
      theme.setName("MyBeautifulTheme");
      QCOMPARE(theme.name(), QString("MyBeautifulTheme"));
+ }
--void tst_UCTheme::testCreateStyleComponent()
++void tst_UCDeprecatedTheme::testCreateStyleComponent()
+ {
      QFETCH(QString, styleName);
      QFETCH(QString, parentName);
      QFETCH(bool, success);
--    if (parentName.isEmpty())
++    if (parentName == "SimpleItem.qml")
          QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready");
      else if (styleName == "NotExistingTestStyle.qml")
--        UbuntuTestCase::ignoreWarning(parentName, 19, 1, "QML Item: Warning: Style NotExistingTestStyle.qml not found in theme TestModule.TestTheme");
++        ThemeTestCase::ignoreWarning(parentName, 20, 1, "QML Parent: Warning: Style NotExistingTestStyle.qml not found in theme TestModule.TestTheme");
      qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", ".");
--    UCTheme theme;
--    theme.setName("TestModule.TestTheme");
--    QQmlEngine engine;
--    QQmlComponent parentComponent(&engine, parentName);
--    QObject* parent = parentComponent.create();
--    QQmlComponent* component = theme.createStyleComponent(styleName, parent);
--
--    QCOMPARE(component != NULL, success);
++    QScopedPointer<ThemeTestCase> view(new ThemeTestCase(parentName));
++    QVERIFY(view);
++    view->setTheme("TestModule.TestTheme");
++    view->setStyle(styleName);
++    QQmlComponent *style = view->rootObject()->property("style").value<QQmlComponent*>();
++    QCOMPARE(style != NULL, success);
+ }
--void tst_UCTheme::testCreateStyleComponent_data() {
++void tst_UCDeprecatedTheme::testCreateStyleComponent_data() {
      QTest::addColumn<QString>("styleName");
      QTest::addColumn<QString>("parentName");
      QTest::addColumn<bool>("success");
      QTest::newRow("Existing style") << "TestStyle.qml" << "Parent.qml" << true;
      QTest::newRow("Non existing style") << "NotExistingTestStyle.qml" << "Parent.qml" << false;
--    QTest::newRow("No parent") << "TestStyle.qml" << "" << false;
+ }
--void tst_UCTheme::testThemesRelativePath()
++void tst_UCDeprecatedTheme::testThemesRelativePath()
+ {
      qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "../tst_theme_engine");
--    UCTheme theme;
--    theme.setName("TestModule.TestTheme");
--    QQmlEngine engine;
--    QQmlComponent parentComponent(&engine, "Parent.qml");
--    QObject* parent = parentComponent.create();
--    QQmlComponent* component = theme.createStyleComponent("TestStyle.qml", parent);
--
--    QCOMPARE(component != NULL, true);
--    QCOMPARE(component->status(), QQmlComponent::Ready);
--}
--
--void tst_UCTheme::testThemesRelativePathWithParent()
--{
--    QSKIP("https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1248982");
--    qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "../../resources/themes:../../resources/themes/TestModule");
--
--    UCTheme theme;
--    theme.setName("CustomTheme");
--    QQmlEngine engine;
--    theme.registerToContext(engine.rootContext());
--    QQmlComponent parentComponent(&engine, "Parent.qml");
--    QObject* parent = parentComponent.create();
--    QQmlComponent* component = theme.createStyleComponent("TestStyle.qml", parent);
--
--    QCOMPARE(component != NULL, true);
--    QCOMPARE(component->status(), QQmlComponent::Ready);
--}
--
--void tst_UCTheme::testThemesRelativePathWithParentXDGDATA()
--{
--    QSKIP("https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1248982");
++    QScopedPointer<ThemeTestCase> view(new ThemeTestCase("Parent.qml"));
++    QVERIFY(view);
++    view->setTheme("TestModule.TestTheme");
++    view->setStyle("TestStyle.qml");
++    QQmlComponent *style = view->rootObject()->property("style").value<QQmlComponent*>();
++    QCOMPARE(style != NULL, true);
++}
++
++void tst_UCDeprecatedTheme::testThemesRelativePathWithParent()
++{
++    qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "./themes:./themes/TestModule");
++
++    QScopedPointer<ThemeTestCase> view(new ThemeTestCase("Parent.qml"));
++    QVERIFY(view);
++    view->setTheme("CustomTheme");
++    view->setStyle("TestStyle.qml");
++    QQmlComponent *style = view->rootObject()->property("style").value<QQmlComponent*>();
++    QCOMPARE(style != NULL, true);
++}
++
++void tst_UCDeprecatedTheme::testThemesRelativePathWithParentXDGDATA()
++{
      qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
--    qputenv("XDG_DATA_DIRS", "../../resources/themes:../../resources/themes/TestModule");
--
--    UCTheme theme;
--    theme.setName("CustomTheme");
--    QQmlEngine engine;
--    theme.registerToContext(engine.rootContext());
--    QQmlComponent parentComponent(&engine, "Parent.qml");
--    QObject* parent = parentComponent.create();
--    QQmlComponent* component = theme.createStyleComponent("TestStyle.qml", parent);
--
--    QCOMPARE(component != NULL, true);
--    QCOMPARE(component->status(), QQmlComponent::Ready);
++    qputenv("XDG_DATA_DIRS", "./themes:./themes/TestModule");
++
++    QScopedPointer<ThemeTestCase> view(new ThemeTestCase("Parent.qml"));
++    QVERIFY(view);
++    view->setTheme("CustomTheme");
++    view->setStyle("TestStyle.qml");
++    QQmlComponent *style = view->rootObject()->property("style").value<QQmlComponent*>();
++    QCOMPARE(style != NULL, true);
+ }
--void tst_UCTheme::testThemesRelativePathWithParentNoVariablesSet()
++void tst_UCDeprecatedTheme::testThemesRelativePathWithParentNoVariablesSet()
+ {
--    UbuntuTestCase::ignoreWarning("Parent.qml", 19, 1, "QML Item: Warning: Style TestStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance");
++    ThemeTestCase::ignoreWarning("Parent.qml", 20, 1, "QML Parent: Warning: Style TestStyle.qml not found in theme Ubuntu.Components.Themes.Ambiance");
      qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
      qputenv("XDG_DATA_DIRS", "");
--    UCTheme theme;
--    QQmlEngine engine;
--    qRegisterMetaType<QList <QQmlError> >();
--    QSignalSpy spy(&engine, SIGNAL(warnings(QList<QQmlError>)));
--    theme.registerToContext(engine.rootContext());
--    QQmlComponent parentComponent(&engine, "Parent.qml");
--    QObject* parent = parentComponent.create();
--    QQmlComponent* component = theme.createStyleComponent("TestStyle.qml", parent);
--    // warning about TestStyle not defined in Ubuntu.Components.Themes.Ambiance should be shown
--    QCOMPARE(spy.count(), 1);
--    QCOMPARE(component == NULL, true);
++    QScopedPointer<ThemeTestCase> view(new ThemeTestCase("Parent.qml"));
++    QVERIFY(view);
++    view->setStyle("TestStyle.qml");
+ }
--void tst_UCTheme::testThemesRelativePathWithParentOneXDGPathSet()
++void tst_UCDeprecatedTheme::testThemesRelativePathWithParentOneXDGPathSet()
+ {
      qputenv("UBUNTU_UI_TOOLKIT_THEMES_PATH", "");
      qputenv("XDG_DATA_DIRS", "../tst_theme_engine");
--    UCTheme theme;
--    theme.setName("TestModule.TestTheme");
--    QQmlEngine engine;
--    QQmlComponent parentComponent(&engine, "Parent.qml");
--    QObject* parent = parentComponent.create();
--    QQmlComponent* component = theme.createStyleComponent("TestStyle.qml", parent);
--
--    QCOMPARE(component != NULL, true);
--    QCOMPARE(component->status(), QQmlComponent::Ready);
--}
--
--void tst_UCTheme::testAppTheme()
--{
--    QScopedPointer<UbuntuTestCase> test(new UbuntuTestCase("TestApp.qml"));
--    QColor backgroundColor = test->rootObject()->property("backgroundColor").value<QColor>();
--    QCOMPARE(backgroundColor, QColor("#A21E1C"));
--    QQuickText *label = test->findItem<QQuickText*>("test_label");
--    QVERIFY(label);
--    QCOMPARE(label->color(), QColor("lightblue"));
--}
--
--void tst_UCTheme::testNoImportPathSet()
++    QScopedPointer<ThemeTestCase> view(new ThemeTestCase("Parent.qml"));
++    QVERIFY(view);
++    view->setTheme("TestModule.TestTheme");
++    view->setStyle("TestStyle.qml");
++    QQmlComponent *style = view->rootObject()->property("style").value<QQmlComponent*>();
++    QCOMPARE(style != NULL, true);
++}
++
++void tst_UCDeprecatedTheme::testNoImportPathSet()
+ {
      if (!QFile(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) + "/Ubuntu/Components").exists())
          QSKIP("This can only be tested if the UITK is installed");
@@ -217,11 +216,11 @@
      qputenv("XDG_DATA_DIRS", "");
      qputenv("QML2_IMPORT_PATH", "");
--    UCTheme theme;
++    UCDeprecatedTheme theme;
      QCOMPARE(theme.name(), QString("Ubuntu.Components.Themes.Ambiance"));
+ }
--void tst_UCTheme::testBogusImportPathSet()
++void tst_UCDeprecatedTheme::testBogusImportPathSet()
+ {
      if (!QFile(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) + "/Ubuntu/Components").exists())
          QSKIP("This can only be tested if the UITK is installed");
@@ -230,11 +229,11 @@
      qputenv("XDG_DATA_DIRS", "");
      qputenv("QML2_IMPORT_PATH", "/no/plugins/here");
--    UCTheme theme;
++    UCDeprecatedTheme theme;
      QCOMPARE(theme.name(), QString("Ubuntu.Components.Themes.Ambiance"));
+ }
--void tst_UCTheme::testMultipleImportPathsSet()
++void tst_UCDeprecatedTheme::testMultipleImportPathsSet()
+ {
      if (!QFile(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath) + "/Ubuntu/Components").exists())
          QSKIP("This can only be tested if the UITK is installed");
@@ -243,10 +242,11 @@
      qputenv("XDG_DATA_DIRS", "");
      qputenv("QML2_IMPORT_PATH", "/no/plugins/here:.");
--    UCTheme theme;
--    theme.setName("TestModule.TestTheme");
++    QScopedPointer<ThemeTestCase> view(new ThemeTestCase("Parent.qml"));
++    QVERIFY(view);
++    view->setTheme("TestModule.TestTheme");
+ }
--QTEST_MAIN(tst_UCTheme)
++QTEST_MAIN(tst_UCDeprecatedTheme)
--#include "tst_theme_enginetest.moc"
++#include "tst_deprecated_theme_engine.moc"
 === renamed file 'tests/unit_x11/tst_theme_engine/tst_theme_engine.pro' => 'tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro'
 --- tests/unit_x11/tst_theme_engine/tst_theme_engine.pro	2014-12-04 07:18:58 +0000
 +++ tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro	2015-04-02 11:34:06 +0000
@@ -1,7 +1,14 @@
  include(../test-include.pri)
  QT += quick-private gui-private
--SOURCES += tst_theme_enginetest.cpp
++SOURCES += tst_deprecated_theme_engine.cpp
  OTHER_FILES += \
      TestStyle.qml \
--    TestApp.qml
++    TestApp.qml \
++    Parent.qml \
++    SimpleItem.qml \
++    themes/CustomTheme/TestStyle.qml \
++    themes/CustomTheme/parent_theme \
++    themes/TestModule/TestTheme/TestStyle.qml \
++    themes/TestModule/TestTheme/qmldir \
++    themes/TestModule/TestTheme/parent_theme
 === removed file 'tests/unit_x11/tst_theme_engine/TestApp.qml'
 --- tests/unit_x11/tst_theme_engine/TestApp.qml	2015-03-03 13:20:06 +0000
 +++ tests/unit_x11/tst_theme_engine/TestApp.qml	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
--/*
-- * 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
--
--MainView {
--    width: units.gu(40)
--    height: units.gu(71)
--
--    Component.onCompleted: Theme.name = "AppTheme"
--
--    Label {
--        objectName: "test_label"
--    }
--}
 === modified file 'tests/unit_x11/unit_x11.pro'
 --- tests/unit_x11/unit_x11.pro	2015-02-18 11:39:07 +0000
 +++ tests/unit_x11/unit_x11.pro	2015-04-02 11:34:06 +0000
@@ -8,7 +8,7 @@
      tst_inversemousearea \
      tst_recreateview \
      tst_statesaver \
--    tst_theme_engine \
++    tst_deprecated_theme_engine \
      tst_orientation \
      tst_layouts \
      tst_mousefilters \

Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/01-multiple-theme-engines into lp:ubuntu-ui-toolkit/staging

Commit message

Description of the change

Preview Diff

Subscribers