Merge lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1429163-nopy2 into lp:ubuntu-ui-toolkit

[Leo Arias]

Removed python2 support from autopilot tests and helpers.

[lp:~canonical-platform-qa/ubuntu-ui-toolkit/fix1429163-nopy2]

1476. By Leo Arias on 2015-04-14

Remove py2 from the makefiles.

Unmerged revisions

=== modified file 'components.api'
--- components.api	2015-03-10 13:58:52 +0000
+++ components.api	2015-04-14 21:04:03 +0000
@@ -246,7 +246,12 @@
     property Flickable flickable
     property list<Action> actions
 Page 1.1
-Page10
+Toolkit10.Page
+    readonly property PageHeadConfiguration head
+Page 1.3
+PageTreeNode
+    property string title
+    property Flickable flickable
     readonly property PageHeadConfiguration head
 PageHeadConfiguration 1.1
 Object
@@ -256,6 +261,10 @@
     property string preset
     readonly property PageHeadSections sections
     property color foregroundColor
+PageHeadConfiguration 1.3
+Toolkit12.PageHeadConfiguration
+    property bool locked
+    property bool visible
 PageHeadSections 1.1
 QtObject
     property bool enabled
@@ -692,6 +701,7 @@
     function tryCompareFunction(func, expectedResult, timeout)
     function typeString(string)
     function warningFormat(line, column, message)
+    function waitForHeaderAnimation(mainView)
 plugins.qmltypes
     name: "FilterBehavior"
     prototype: "QObject"
@@ -1045,6 +1055,8 @@
     prototype: "QQuickItem"
     exports: [
     Property { name: "activeFocusOnPress"; revision: 1; type: "bool" }
+    Property { name: "theme"; revision: 2; type: "UCTheme"; isPointer: true }
+    Signal { name: "themeChanged"; revision: 2 }
     Method {
     name: "requestFocus"
     Parameter { name: "reason"; type: "Qt::FocusReason" }
@@ -1057,6 +1069,16 @@
     Property { name: "from"; type: "QPointF"; isReadonly: true }
     Property { name: "content"; type: "QPointF" }
     Property { name: "status"; type: "Status"; isReadonly: true }
+    name: "UCTheme"
+    prototype: "QObject"
+    exports: ["ThemeSettings 1.3"]
+    Property { name: "parentTheme"; type: "UCTheme"; isReadonly: true; isPointer: true }
+    Property { name: "name"; type: "string" }
+    Property { name: "palette"; type: "QObject"; isReadonly: true; isPointer: true }
+    Method {
+    name: "createStyleComponent"
+    Parameter { name: "styleName"; type: "string" }
+    Parameter { name: "parent"; type: "QObject"; isPointer: true }
     name: "UCUbuntuAnimation"
     prototype: "QObject"
     exports: ["UbuntuAnimation 0.1", "UbuntuAnimation 1.0"]

=== modified file 'debian/control'
--- debian/control	2015-03-24 10:24:18 +0000
+++ debian/control	2015-04-14 21:04:03 +0000
@@ -7,13 +7,10 @@
                libgles2-mesa-dev,
                libglib2.0-dev,
                python3:any,
-               python:any,
                qml-module-qtgraphicaleffects | libqt5qml-graphicaleffects,
-               qt5-default,
                qtbase5-dev,
                qtbase5-private-dev,
                qttools5-dev-tools,
-               qtbase5-dev-tools,
                libqt5sql5-sqlite,
                qtdeclarative5-dev-tools,
                qtdeclarative5-private-dev,
@@ -34,7 +31,6 @@
                qtmultimedia5-doc-html,
                unity-action-doc,
                devscripts,
-               libqt5organizer5,
                qtpim5-dev,
                language-pack-en-base,
                libdbus-1-dev,
@@ -47,7 +43,6 @@
                locales,
                suru-icon-theme,
                uuid-runtime,
-               python-autopilot (>= 1.4),
                python3-sphinx,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-ui-toolkit
@@ -144,13 +139,6 @@
          dpkg-dev,
          libqt5test5,
          libqt5widgets5,
-         python-autopilot (>= 1.4),
-         python-fixtures,
-         python-gi,
-         python-mock,
-         python-testscenarios,
-         python-testtools,
-         python-autopilot-trace,
          python3-fixtures,
          python3-gi,
          python3-testscenarios,

=== modified file 'debian/rules'
--- debian/rules	2015-01-23 18:11:22 +0000
+++ debian/rules	2015-04-14 21:04:03 +0000
@@ -4,6 +4,7 @@
 # export DH_VERBOSE=1
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 export QMAKEFEATURES=$(CURDIR)/features
+export QT_SELECT := qt5
 DEB_HOST_MULTI_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 

=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
--- debian/ubuntu-ui-toolkit-autopilot.install	2014-06-17 07:12:49 +0000
+++ debian/ubuntu-ui-toolkit-autopilot.install	2015-04-14 21:04:03 +0000
@@ -1,3 +1,2 @@
 usr/lib/python3
 usr/lib/*/ubuntu-ui-toolkit/launcher
-usr/lib/python2.7

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WebLink.qml'
--- examples/ubuntu-ui-toolkit-gallery/WebLink.qml	2015-03-03 13:20:06 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WebLink.qml	2015-04-14 21:04:03 +0000
@@ -27,4 +27,9 @@
     text: "<a href=\"%1\">%2</a>".arg(webLink.url).arg(webLink.label)
     linkColor: UbuntuColors.orange
     onLinkActivated: Qt.openUrlExternally(link)
+    MouseArea {
+        anchors.fill: webLink
+        cursorShape: Qt.PointingHandCursor
+        acceptedButtons: Qt.NoButton
+   }
 }

=== modified file 'modules/Ubuntu/Components/AppHeader.qml'
--- modules/Ubuntu/Components/AppHeader.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/AppHeader.qml	2015-04-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 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
@@ -60,7 +60,8 @@
         internal.movementEnded();
     }
 
-    visible: title || contents || tabsModel
+    // with PageHeadConfiguration 1.2, always be visible.
+    visible: title || contents || tabsModel || internal.newConfig
     onVisibleChanged: {
         internal.checkFlickableMargins();
     }
@@ -69,6 +70,9 @@
       Show the header
      */
     function show() {
+        if (internal.newConfig) {
+            header.config.visible = true;
+        }
         header.y = 0;
     }
 
@@ -76,7 +80,10 @@
       Hide the header
      */
     function hide() {
-        header.y = - header.height;
+        if (internal.newConfig) {
+            header.config.visible = false;
+        }
+        header.y = -header.height;
     }
 
     /*!
@@ -84,15 +91,22 @@
      */
     property string title: ""
     onTitleChanged: {
-        header.show();
+        // deprecated for new versions of PageHeadConfiguration
+        if (!internal.newConfig) {
+            header.show();
+        }
     }
 
     /*!
       The contents of the header. If this is set, \l title will be ignored.
+      DEPRECATED and replaced by Page.head.contents.
      */
     property Item contents: null
     onContentsChanged: {
-        header.show();
+        // deprecated for new versions of PageHeadConfiguration
+        if (!internal.newConfig) {
+            header.show();
+        }
     }
 
     /*!
@@ -151,9 +165,10 @@
      */
     property Flickable flickable: null
     onFlickableChanged: {
-        internal.checkFlickableMargins();
         internal.connectFlickable();
-        header.show();
+        if (!internal.newConfig || !header.config.locked) {
+            header.show();
+        }
     }
 
     /*!
@@ -163,12 +178,68 @@
 
     /*!
       Configuration of the header.
+      FIXME: Must be of type PageHeadConfiguration. Setting that as the property type
+      however will use the latest version (1.3) and a Page that uses an older
+      version (1.1) will no longer work.
      */
-    property PageHeadConfiguration config: null
+    property Object config: null
+    onConfigChanged: {
+        // set internal.newConfig because when we rely on the binding,
+        //  the value of newConfig may be updated after executing the code below.
+        internal.newConfig = config && config.hasOwnProperty("visible") &&
+                config.hasOwnProperty("locked");
+        internal.connectFlickable();
+
+        if (internal.newConfig && header.config.locked &&!header.config.visible) {
+            header.hide();
+        } else {
+            header.show();
+        }
+    }
+    Connections {
+        target: header.config
+        ignoreUnknownSignals: true // PageHeadConfiguration <1.2 lacks the signals below
+        onVisibleChanged: {
+            if (header.config.visible) {
+                header.show();
+            } else {
+                header.hide();
+            }
+            internal.checkFlickableMargins();
+        }
+        onLockedChanged: {
+            internal.connectFlickable();
+            if (!header.config.locked) {
+                internal.movementEnded();
+            }
+        }
+    }
+
+    /*!
+      The header is not fully opened or fully closed.
+
+      This property is true if the header is animating towards a fully
+      opened or fully closed state, or if the header is moving due to user
+      interaction with the flickable.
+
+      The value of moving is always false when using an old version of
+      PageHeadConfiguration (which does not have the visible property).
+
+      Used in tst_header_locked_visible.qml.
+    */
+    readonly property bool moving: internal.newConfig &&
+                                   ((config.visible && header.y !== 0) ||
+                                    (!config.visible && header.y !== -header.height))
 
     QtObject {
         id: internal
 
+        // This property is updated in header.onConfigChanged to ensure it
+        //  is updated before other functions are called in onConfigChanged.
+        property bool newConfig: header.config &&
+                                 header.config.hasOwnProperty("locked") &&
+                                 header.config.hasOwnProperty("visible")
+
         /*!
           Track the y-position inside the flickable.
          */
@@ -183,20 +254,26 @@
           Disconnect previous flickable, and connect the new one.
          */
         function connectFlickable() {
+            // Finish the current header movement in case the current
+            // flickable is disconnected while scrolling:
+            internal.movementEnded();
+
             if (previousFlickable) {
                 previousFlickable.contentYChanged.disconnect(internal.scrollContents);
                 previousFlickable.movementEnded.disconnect(internal.movementEnded);
                 previousFlickable.interactiveChanged.disconnect(internal.interactiveChanged);
+                previousFlickable = null;
             }
-            if (flickable) {
+            if (flickable && !(internal.newConfig && header.config.locked)) {
                 // Connect flicking to movements of the header
                 previousContentY = flickable.contentY;
                 flickable.contentYChanged.connect(internal.scrollContents);
                 flickable.movementEnded.connect(internal.movementEnded);
                 flickable.interactiveChanged.connect(internal.interactiveChanged);
                 flickable.contentHeightChanged.connect(internal.contentHeightChanged);
+                previousFlickable = flickable;
             }
-            previousFlickable = flickable;
+            internal.checkFlickableMargins();
         }
 
         /*!
@@ -216,9 +293,14 @@
           Fully show or hide the header, depending on its current y.
          */
         function movementEnded() {
-            if (flickable && flickable.contentY < 0) header.show();
-            else if (header.y < -header.height/2) header.hide();
-            else header.show();
+            if (!(internal.newConfig && header.config.locked)) {
+                if ( (flickable && flickable.contentY < 0) ||
+                        (header.y > -header.height/2)) {
+                    header.show();
+                } else {
+                    header.hide();
+                }
+            }
         }
 
         /*
@@ -241,13 +323,20 @@
          */
         function checkFlickableMargins() {
             if (header.flickable) {
-                var headerHeight = header.visible ? header.height : 0
+                var headerHeight = 0;
+                if (header.visible && !(internal.newConfig &&
+                                        header.config.locked &&
+                                        !header.config.visible)) {
+                    headerHeight = header.height;
+                }
+
                 if (flickable.topMargin !== headerHeight) {
+                    var oldContentY = flickable.contentY;
                     var previousHeaderHeight = flickable.topMargin;
                     flickable.topMargin = headerHeight;
                     // push down contents when header grows,
                     // pull up contents when header shrinks.
-                    flickable.contentY -= headerHeight - previousHeaderHeight;
+                    flickable.contentY = oldContentY - headerHeight + previousHeaderHeight;
                 }
             }
         }

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/MainView.qml	2015-04-14 21:04:03 +0000
@@ -125,6 +125,7 @@
         AppHeader {
             // This objectName is used in the MainView autopilot custom proxy object
             // in order to select the application header.
+            // Also used in tst_header_locked_visible.qml.
             objectName: "MainView_Header"
             id: headerItem
             property real bottomY: headerItem.y + headerItem.height
@@ -136,7 +137,7 @@
             flickable: internal.activePage ? internal.activePage.flickable : null
             pageStack: internal.activePage ? internal.activePage.pageStack : null
 
-            PageHeadConfiguration {
+            Toolkit.PageHeadConfiguration {
                 id: headerConfig
                 // for backwards compatibility with deprecated tools property
                 actions: internal.activePage ?

=== modified file 'modules/Ubuntu/Components/MainView12.qml'
--- modules/Ubuntu/Components/MainView12.qml	2015-03-03 12:53:42 +0000
+++ modules/Ubuntu/Components/MainView12.qml	2015-04-14 21:04:03 +0000
@@ -69,6 +69,7 @@
         AppHeader {
             // This objectName is used in the MainView autopilot custom proxy object
             // in order to select the application header.
+            // Also used in tst_header_locked_visible.qml.
             objectName: "MainView_Header"
             id: headerItem
             property real bottomY: headerItem.y + headerItem.height
@@ -80,10 +81,11 @@
             flickable: internal.activePage ? internal.activePage.flickable : null
             pageStack: internal.activePage ? internal.activePage.pageStack : null
 
-            contents: internal.activePage ?
+            contents: internal.activePage &&
+                      internal.activePage.hasOwnProperty("__customHeaderContents") ?
                           internal.activePage.__customHeaderContents : null
 
-            PageHeadConfiguration {
+            Toolkit.PageHeadConfiguration {
                 id: defaultConfig
                 // Used when there is no active Page, or a Page 1.0 is used which
                 // does not have a PageHeadConfiguration.
@@ -114,9 +116,13 @@
             target: Qt.application
             onActiveChanged: {
                 if (Qt.application.active) {
-                    headerItem.animate = false;
-                    headerItem.show();
-                    headerItem.animate = true;
+                    if (!(headerItem.config &&
+                          headerItem.config.hasOwnProperty("locked") &&
+                          headerItem.locked)) {
+                        headerItem.animate = false;
+                        headerItem.show();
+                        headerItem.animate = true;
+                    }
                 }
             }
         }
@@ -127,11 +133,15 @@
 
         // Even when using MainView 1.1, we still support Page 1.0.
         // PageBase (=Page 1.0) is the superclass of Page 1.1.
-        property PageBase activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
+        property Item activePage: isPage(mainView.activeLeafNode) ? mainView.activeLeafNode : null
 
         function isPage(item) {
-            return item && item.hasOwnProperty("__isPageTreeNode") && item.__isPageTreeNode &&
-                    item.hasOwnProperty("title") && item.hasOwnProperty("tools");
+            return item && item.hasOwnProperty("__isPageTreeNode") &&
+                    item.__isPageTreeNode &&
+                    item.hasOwnProperty("title") &&
+                    item.hasOwnProperty("flickable") &&
+                    item.hasOwnProperty("active") &&
+                    item.hasOwnProperty("pageStack")
         }
     }
 

=== modified file 'modules/Ubuntu/Components/Page10.qml'
--- modules/Ubuntu/Components/Page10.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Page10.qml	2015-04-14 21:04:03 +0000
@@ -15,7 +15,8 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.0 as Toolkit
+import "pageUtils.js" as Utils
 
 /*!
   \internal
@@ -53,7 +54,7 @@
      */
     property Item __customHeaderContents: null
 
-    property Flickable flickable: internal.getFlickableChild(page)
+    property Flickable flickable: Utils.getFlickableChild(page)
 
     /*! \internal */
     onActiveChanged: {
@@ -95,34 +96,5 @@
             when: internal.header && !internal.header.useDeprecatedToolbar &&
                   page.tools !== null
         }
-
-        function isVerticalFlickable(object) {
-            if (object && object.hasOwnProperty("flickableDirection") && object.hasOwnProperty("contentHeight")) {
-                var direction = object.flickableDirection;
-                if ( ((direction === Flickable.AutoFlickDirection) && (object.contentHeight !== object.height) )
-                        || direction === Flickable.VerticalFlick
-                        || direction === Flickable.HorizontalAndVerticalFlick) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /*!
-          Return the first flickable child of this page.
-         */
-        function getFlickableChild(item) {
-            if (item && item.hasOwnProperty("children")) {
-                for (var i=0; i < item.children.length; i++) {
-                    var child = item.children[i];
-                    if (internal.isVerticalFlickable(child)) {
-                        if (child.anchors.top === page.top || child.anchors.fill === page) {
-                            return item.children[i];
-                        }
-                    }
-                }
-            }
-            return null;
-        }
     }
 }

=== modified file 'modules/Ubuntu/Components/Page11.qml'
--- modules/Ubuntu/Components/Page11.qml	2015-03-03 12:53:42 +0000
+++ modules/Ubuntu/Components/Page11.qml	2015-04-14 21:04:03 +0000
@@ -15,16 +15,18 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.0 as Toolkit10
+import Ubuntu.Components 1.1 as Toolkit11
 
 /*! \internal */
 // Documentation in Page.qdoc
-Page10 {
+Toolkit10.Page {
     id: page
     /*!
       \qmlproperty PageHeadConfiguration head
      */
     readonly property alias head: headerConfig
-    PageHeadConfiguration {
+    Toolkit11.PageHeadConfiguration {
         id: headerConfig
     }
 
@@ -32,7 +34,7 @@
         print("Page.tools is a deprecated property. Please use Page.head instead.");
     }
 
-    Object {
+    Toolkit11.Object {
         id: internal
 
         // Note: The bindings below need to check whether headerConfig.contents

=== added file 'modules/Ubuntu/Components/Page13.qml'
--- modules/Ubuntu/Components/Page13.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Page13.qml	2015-04-14 21:04:03 +0000
@@ -0,0 +1,84 @@
+/*
+ * 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 as Toolkit13
+import "pageUtils.js" as Utils
+
+/*!
+  \internal
+  Documentation is in Page.qdoc
+*/
+PageTreeNode {
+    id: page
+    anchors {
+        left: parent ? parent.left : undefined
+        bottom: parent ? parent.bottom : undefined
+    }
+    // Set width and height so that a parent Loader can be automatically resized
+    // to the size of the loaded Page.
+    width: parentNode ? parentNode.width - page.x : undefined
+    height: parentNode ? page.flickable ? parentNode.height : parentNode.height - internal.headerHeight : undefined
+
+    isLeaf: true
+    property string title: parentNode && parentNode.hasOwnProperty("title") ? parentNode.title : ""
+    property Flickable flickable: Utils.getFlickableChild(page)
+
+    /*!
+      \qmlproperty PageHeadConfiguration head
+     */
+    readonly property alias head: headerConfig
+    Toolkit13.PageHeadConfiguration {
+        id: headerConfig
+    }
+
+    Object {
+        id: internal
+
+        property AppHeader header: page.__propagated && page.__propagated.header ? page.__propagated.header : null
+        // Used to position the Page when there is no flickable.
+        // When there is a flickable, the header will automatically position it.
+        property real headerHeight: internal.header && internal.header.visible ? internal.header.height : 0
+
+        // Note: The bindings below need to check whether headerConfig.contents
+        // is valid in the "value", even when that is required in the Binding's "when"
+        // property, to avoid TypeErrors while/after a page becomes (in)active.
+        //
+        // Note 2: contents.parent binding is made by PageHeadStyle.
+        property bool hasParent: headerConfig.contents &&
+                                 headerConfig.contents.parent
+
+        Binding {
+            target: headerConfig.contents
+            property: "visible"
+            value: page.active
+            when: headerConfig.contents
+        }
+        Binding {
+            target: headerConfig.contents
+            property: "anchors.verticalCenter"
+            value: internal.hasParent ? headerConfig.contents.parent.verticalCenter :
+                                        undefined
+            when: headerConfig.contents
+        }
+        Binding {
+            target: headerConfig.contents
+            property: "anchors.left"
+            value: internal.hasParent ? headerConfig.contents.parent.left : undefined
+            when: headerConfig.contents
+        }
+    }
+}

=== added file 'modules/Ubuntu/Components/PageHeadConfiguration.qdoc'
--- modules/Ubuntu/Components/PageHeadConfiguration.qdoc	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration.qdoc	2015-04-14 21:04:03 +0000
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2014-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/>.
+ */
+
+/*!
+    \qmltype PageHeadConfiguration
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \since Ubuntu.Components 1.1
+    \brief Page.head is used to configure the header for a \l Page.
+
+    For examples how to use Page.head, see \l Page.
+ */
+
+/*!
+  List of actions to show in the header.
+
+  Example:
+  \qml
+    Page {
+        title: "Custom header actions"
+        head.actions: [
+            Action {
+                iconName: "save"
+                text: i18n.tr("Save")
+            },
+            Action {
+                iconName: "add"
+                text: i18n.tr("Add")
+            }
+        ]
+    }
+  \endqml
+  \qmlproperty list<Action> PageHeadConfiguration::actions
+ */
+
+/*!
+  \qmlproperty Action PageHeadConfiguration::backAction
+  Overrides the default \l PageStack back button and the
+  \l Tabs drawer button in the header.
+
+  Example:
+  \qml
+    Page {
+        title: "Back Action Page"
+        head.backAction: Action {
+            iconName: "close"
+            onTriggered: {
+                console.log("Run custom back action")
+            }
+        }
+    }
+  \endqml
+ */
+
+/*!
+  \qmlproperty Item PageHeadConfiguration::contents
+  Set this property to show this Item in the header instead of
+  the title. Use a \l TextField here for implementing search in header.
+
+  The parent of this Item will be binded while the \l Page is active.
+  The header contents will automatically be anchored to the left and
+  vertically centered inside the header.
+
+  Example:
+  \qml
+    Page {
+        title: "Invisible title"
+        head.contents: Rectangle {
+            color: UbuntuColors.orange
+            height: units.gu(5)
+            width: parent ? parent.width - units.gu(2) : undefined
+        }
+    }
+  \endqml
+
+  See \l PageHeadState for an example that shows how search mode can
+  be implemented.
+ */
+
+// FIXME: The example below can be much simplified using PageHeadState
+//  when bug #1345775 has been fixed.
+/*!
+  \qmlproperty string PageHeadConfiguration::preset
+  Choose a preset for the header visuals and behavior.
+  The default is an empty string "".
+  By setting this to "select", title will be hidden and
+  actions will be represented by icons with a label.
+
+  Example:
+  \qml
+    import QtQuick 2.4
+    import Ubuntu.Components 1.2
+
+    MainView {
+        id: mainView
+        width: units.gu(40)
+        height: units.gu(50)
+
+        Page {
+            id: page
+            title: "Demo"
+
+            state: "default"
+            states: [
+                PageHeadState {
+                    name: "default"
+                    head: page.head
+                    actions: [
+                        Action {
+                            iconName: "contact"
+                            text: "Contact"
+                        }
+                    ]
+                },
+                State {
+                    id: selectState
+                    name: "select"
+
+                    property Action leaveSelect: Action {
+                        iconName: "back"
+                        text: "Back"
+                        onTriggered: page.state = "default"
+                    }
+                    property list<Action> actions: [
+                        Action {
+                            iconName: "select"
+                            text: "Select All"
+                        },
+                        Action {
+                            iconName: "delete"
+                            text: "Delete"
+                        }
+                    ]
+                    PropertyChanges {
+                        target: page.head
+                        backAction: selectState.leaveSelect
+                        actions: selectState.actions
+                        preset: "select"
+                    }
+                }
+            ]
+
+            Label {
+                anchors.centerIn: parent
+                text: "Use back button to leave selection mode."
+                visible: page.state == "select"
+            }
+
+            Button {
+                anchors.centerIn: parent
+                onClicked: page.state = "select"
+                visible: page.state != "select"
+                text: "selection mode"
+            }
+        }
+    }
+  \endqml
+ */
+
+/*!
+  \qmlproperty PageHeadSections PageHeadConfiguration::sections
+  Defines the sections in the page header divider.
+ */
+
+/*!
+  \qmlproperty color PageHeadConfiguration::foregroundColor
+  The color of the text and icons.
+ */
+
+/*!
+  \qmlproperty bool PageHeadConfiguration::locked
+  \since 1.2
+  When the \l Page is active, the locked property controls the behavior
+  of the header. A locked header stays visible or invisible, depending
+  on the value of the \l visible property. An unlocked header automatically
+  shows and hides if the \l Page has a flickable in which the user
+  scrolls up or down.
+  Default value: false
+ */
+
+/*!
+  \qmlproperty bool PageHeadConfiguration::visible
+  \since 1.2
+  Update the value of the visible property to show or hide the header.
+  This works both when the header is \l locked and unlocked. An unlocked
+  header can also become visible or hidden when the user scrolls the
+  active \l Page's flickable. The value of the visible property will be
+  updated at the end of the showing/hiding animation of the header.
+ */

=== renamed file 'modules/Ubuntu/Components/PageHeadConfiguration.qml' => 'modules/Ubuntu/Components/PageHeadConfiguration11.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration11.qml	2015-04-14 21:04:03 +0000
@@ -15,92 +15,24 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.1
 
 /*!
-    \qmltype PageHeadConfiguration
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \since Ubuntu.Components 1.1
-    \brief Page.head is used to configure the header for a \l Page.
-
-    For examples how to use Page.head, see \l Page.
+  \internal
+  Documented in PageHeadConfiguration.qdoc
  */
 Object {
     // To be used inside a Page only.
     id: headerConfig
 
-    /*!
-      List of actions to show in the header.
-
-      Example:
-      \qml
-        Page {
-            title: "Custom header actions"
-            head.actions: [
-                Action {
-                    iconName: "save"
-                    text: i18n.tr("Save")
-                },
-                Action {
-                    iconName: "add"
-                    text: i18n.tr("Add")
-                }
-            ]
-        }
-      \endqml
-     */
     property list<Action> actions
-
-    /*!
-      Overrides the default \l PageStack back button and the
-      \l Tabs drawer button in the header.
-
-      Example:
-      \qml
-        Page {
-            title: "Back Action Page"
-            head.backAction: Action {
-                iconName: "close"
-                onTriggered: {
-                    console.log("Run custom back action")
-                }
-            }
-        }
-     \endqml
-     */
     property Action backAction: null
-
-    /*!
-      Set this property to show this Item in the header instead of
-      the title. Use a \l TextField here for implementing search in header.
-
-      The parent of this Item will be binded while the \l Page is active.
-      The header contents will automatically be anchored to the left and
-      vertically centered inside the header.
-
-      Example:
-      \qml
-        Page {
-            title: "Invisible title"
-            head.contents: Rectangle {
-                color: UbuntuColors.orange
-                height: units.gu(5)
-                width: parent ? parent.width - units.gu(2) : undefined
-            }
-        }
-      \endqml
-
-      See \l PageHeadState for an example that shows how search mode can
-      be implemented.
-     */
     property Item contents: null
 
     QtObject {
         id: internal
         property Item oldContents: null
     }
-
     onContentsChanged: {
         if (internal.oldContents) {
             // FIX: bug #1341814 and #1400297
@@ -111,97 +43,13 @@
         internal.oldContents = contents;
     }
 
-    // FIXME: The example below can be much simplified using PageHeadState
-    //  when bug #1345775 has been fixed.
-    /*!
-      Choose a preset for the header visuals and behavior.
-      The default is an empty string "".
-      By setting this to "select", title will be hidden and
-      actions will be represented by icons with a label.
-
-      Example:
-      \qml
-        import QtQuick 2.4
-        import Ubuntu.Components 1.2
-
-        MainView {
-            id: mainView
-            width: units.gu(40)
-            height: units.gu(50)
-
-            Page {
-                id: page
-                title: "Demo"
-
-                state: "default"
-                states: [
-                    PageHeadState {
-                        name: "default"
-                        head: page.head
-                        actions: [
-                            Action {
-                                iconName: "contact"
-                                text: "Contact"
-                            }
-                        ]
-                    },
-                    State {
-                        id: selectState
-                        name: "select"
-
-                        property Action leaveSelect: Action {
-                            iconName: "back"
-                            text: "Back"
-                            onTriggered: page.state = "default"
-                        }
-                        property list<Action> actions: [
-                            Action {
-                                iconName: "select"
-                                text: "Select All"
-                            },
-                            Action {
-                                iconName: "delete"
-                                text: "Delete"
-                            }
-                        ]
-                        PropertyChanges {
-                            target: page.head
-                            backAction: selectState.leaveSelect
-                            actions: selectState.actions
-                            preset: "select"
-                        }
-                    }
-                ]
-
-                Label {
-                    anchors.centerIn: parent
-                    text: "Use back button to leave selection mode."
-                    visible: page.state == "select"
-                }
-
-                Button {
-                    anchors.centerIn: parent
-                    onClicked: page.state = "select"
-                    visible: page.state != "select"
-                    text: "selection mode"
-                }
-            }
-        }
-      \endqml
-     */
     property string preset: ""
-
     /*!
       \qmlproperty PageHeadSections sections
-      Defines the sections in the page header divider.
      */
     readonly property alias sections: headSections
     PageHeadSections {
         id: headSections
     }
-
-    /*!
-      The color of the text and icons.
-     */
     property color foregroundColor: Theme.palette.selected.backgroundText
 }

=== added file 'modules/Ubuntu/Components/PageHeadConfiguration13.qml'
--- modules/Ubuntu/Components/PageHeadConfiguration13.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/PageHeadConfiguration13.qml	2015-04-14 21:04:03 +0000
@@ -0,0 +1,30 @@
+/*
+ * 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 Ubuntu.Components 1.2 as Toolkit12
+
+/*!
+  \internal
+  documented in PageHeadConfiguration.qdoc
+ */
+Toolkit12.PageHeadConfiguration {
+    id: headerConfig
+
+    property bool locked: false
+
+    // auto-updated by AppHeader, but may be set by the developer
+    property bool visible
+}

=== modified file 'modules/Ubuntu/Components/StyledItem.qml'
--- modules/Ubuntu/Components/StyledItem.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/StyledItem.qml	2015-04-14 21:04:03 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmlabstract StyledItem

=== modified file 'modules/Ubuntu/Components/Styles/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Styles/PageHeadStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Styles/PageHeadStyle.qml	2015-04-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-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
@@ -25,8 +25,8 @@
   */
 Item {
     /*!
-      The height of the headercontents, which is the full height of
-      the header minus the separators shown at the bottom of it.
+      The height of the header excluding the height of the bottom divider and
+      the (optional) row that displays the sections.
      */
     property real contentHeight
 

=== modified file 'modules/Ubuntu/Components/Tab.qml'
--- modules/Ubuntu/Components/Tab.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Tab.qml	2015-04-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3 as Toolkit
 
 /*!
     \qmltype Tab
@@ -137,7 +138,7 @@
       \internal
       */
     property alias __protected: internal
-    QtObject {
+    Object {
         id: internal
         /*
           Specifies the index of the Tab in Tabs.
@@ -164,5 +165,22 @@
           component stack  (children) change.
           */
         property bool removedFromTabs: false
+
+        /*!
+          Triggering this action will select the tab. Used by the tabs OverflowPanel.
+         */
+        property alias action: selectTabAction
+        Toolkit.Action {
+            id: selectTabAction
+            text: tab.title
+            objectName: "select_tab_"+index
+            iconSource: tab.iconSource
+            onTriggered: {
+                if (internal.index < 0) return;
+                if (tab.parentNode && tab.parentNode.hasOwnProperty("selectedTabIndex")) {
+                    tab.parentNode.selectedTabIndex = internal.index;
+                }
+            }
+        }
     }
 }

=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2015-04-14 21:04:03 +0000
@@ -310,7 +310,10 @@
             if (tabBar && tabBar.__styleInstance && tabBar.__styleInstance.hasOwnProperty("sync")) {
                 tabBar.__styleInstance.sync();
             }
-            if (tabs.active && internal.header) {
+            if ((tabs.active && internal.header) &&
+                    !(internal.header.config &&
+                      internal.header.config.hasOwnProperty("locked") &&
+                      internal.header.config.locked)) {
                 internal.header.show();
             }
             // deprecated, however use it till we remove it completely

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml	2015-03-03 12:53:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml	2015-04-14 21:04:03 +0000
@@ -15,6 +15,9 @@
  */
 import QtQuick 2.4
 
+/*!
+  This component is DEPRECATED and no longer used. The divider is now a simple line.
+ */
 Item {
     id: dividerStyle
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml	2015-04-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -16,7 +16,125 @@
 
 import QtQuick 2.4
 import Ubuntu.Components.Popups 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.0 as ListItem
 
+/*!
+  \internal
+ */
 Popover {
+    id: overflow
+
+    /*!
+      The background color of the tabs panel and the actions overflow panel.
+     */
+    property color backgroundColor: styledItem.panelColor
+
+    /*!
+      The background color of the tapped item in the panel.
+     */
+    property color highlightColor: Theme.palette.selected.background
+
+    /*!
+      The foreground color (icon and text) of actions in the panel.
+     */
+    property color foregroundColor: Theme.palette.selected.backgroundText
+
     property bool square: true
+    callerMargin: -units.gu(1) + units.dp(4)
+    contentWidth: units.gu(20)
+
+    /*!
+      False implies the model is a list of Actions.
+      True implies the model is a ListModel with a 'tab' role,
+      and false implies that the model is a list of actions.
+    */
+    property bool tabsOverflow: false
+    // FIXME: In the input, generate a list of actions from the Tabs
+    //  so that we no longer need to make a distinction between the tabs ListModel
+    //  and a list of Actions.
+    property var model: null
+
+    Binding {
+        target: overflow.__foreground.__styleInstance
+        property: "color"
+        value: overflow.backgroundColor
+        when: overflow.__foreground &&
+              overflow.__foreground.__styleInstance
+    }
+
+    Column {
+        anchors {
+            left: parent.left
+            top: parent.top
+            right: parent.right
+        }
+        Repeater {
+            id: overflowRepeater
+            model: overflow.model
+            AbstractButton {
+                action: overflow.tabsOverflow ? tab.__protected.action
+                                              : modelData
+
+                // These objectNames are used in the CPOs for header and tabs.
+                objectName: overflow.tabsOverflow ?
+                                "tabButton" + index :
+                                action.objectName + "_header_overflow_button"
+
+                // close after triggering the action.
+                onClicked: overflow.hide()
+
+                implicitHeight: units.gu(6) + bottomDividerLine.height
+                width: parent ? parent.width : units.gu(31)
+
+                Rectangle {
+                    visible: parent.pressed
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        top: parent.top
+                    }
+                    height: parent.height - bottomDividerLine.height
+                    color: overflow.highlightColor
+                }
+
+                Icon {
+                    id: actionIcon
+                    visible: !overflow.tabsOverflow
+                    source: action.iconSource
+                    color: overflow.foregroundColor
+                    anchors {
+                        verticalCenter: parent.verticalCenter
+                        verticalCenterOffset: units.dp(-1)
+                        left: parent.left
+                        leftMargin: units.gu(2)
+                    }
+                    width: units.gu(2)
+                    height: units.gu(2)
+                    opacity: action.enabled ? 1.0 : 0.5
+                }
+
+                Label {
+                    anchors {
+                        verticalCenter: parent.verticalCenter
+                        verticalCenterOffset: units.dp(-1)
+                        left: actionIcon.visible ? actionIcon.right : parent.left
+                        leftMargin: units.gu(2)
+                        right: parent.right
+                    }
+                    fontSize: overflow.tabsOverflow ? "medium" : "small"
+                    elide: Text.ElideRight
+                    text: action.text
+                    color: overflow.foregroundColor
+                    opacity: action.enabled ? 1.0 : 0.5
+                }
+
+                ListItem.ThinDivider {
+                    id: bottomDividerLine
+                    anchors.bottom: parent.bottom
+                    visible: index !== overflowRepeater.count - 1
+                }
+            }
+        }
+    }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml	2015-04-14 21:04:03 +0000
@@ -20,7 +20,7 @@
 AbstractButton {
     id: button
 
-    property real iconWidth: units.gu(2.5)
+    property real iconWidth: units.gu(2)
     property real iconHeight: iconWidth
 
     width: visible ? units.gu(5) : 0

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2015-03-04 09:09:39 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml	2015-04-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -22,9 +22,9 @@
 Style.PageHeadStyle {
     id: headerStyle
     objectName: "PageHeadStyle" // used in unit tests
-    contentHeight: units.gu(7)
+    contentHeight: units.gu(6)
     fontWeight: Font.Light
-    fontSize: "x-large"
+    fontSize: "large"
     textLeftMargin: units.gu(2)
     maximumNumberOfActions: 3
 
@@ -39,21 +39,6 @@
     property color titleColor: styledItem.config.foregroundColor
 
     /*!
-      The background color of the tabs panel and the actions overflow panel.
-     */
-    property color panelBackgroundColor: styledItem.panelColor
-
-    /*!
-      The background color of the tapped item in the panel.
-     */
-    property color panelHighlightColor: Theme.palette.selected.background
-
-    /*!
-      The foreground color (icon and text) of actions in the panel.
-     */
-    property color panelForegroundColor: Theme.palette.selected.backgroundText
-
-    /*!
       The text color of unselected sections and the section divider.
      */
     property color sectionColor: Theme.palette.selected.backgroundText
@@ -68,7 +53,12 @@
      */
     property color sectionHighlightColor: Theme.palette.selected.background
 
-    implicitHeight: headerStyle.contentHeight + divider.height
+    implicitHeight: headerStyle.contentHeight + divider.height + sectionsItem.height
+
+    /*!
+      The height of the row displaying the sections, if sections are specified.
+     */
+    property real sectionsHeight: units.gu(4)
 
     // FIXME: Workaround to get sectionsRepeater.count in autopilot tests,
     //  see also FIXME in AppHeader where this property is used.
@@ -83,50 +73,57 @@
     //  have a separator.
     property alias __separator_visible: divider.visible
 
-    StyledItem {
+    Rectangle {
         id: divider
         anchors {
+            left: parent.left
+            right: parent.right
             bottom: parent.bottom
+        }
+        height: units.dp(1)
+        color: styledItem.dividerColor
+    }
+
+    Item {
+        id: sectionsItem
+        anchors {
+            bottom: divider.top
             left: parent.left
             right: parent.right
         }
 
-        height: sectionsRow.visible ? units.gu(3) : units.gu(2)
-
-        // separatorSource and separatorBottomSource are needed for the deprecated
-        // HeadSeparatorImageStyle.
-        property url separatorSource: headerStyle.separatorSource
-        property url separatorBottomSource: headerStyle.separatorBottomSource
-
-        // backgroundColor is used in the new HeadDividerStyle
-        property color backgroundColor: styledItem.dividerColor
-
-        style: Theme.createStyleComponent("HeadDividerStyle.qml", divider)
+        visible: sectionsItem.sections.model !== undefined
+        height: visible ? headerStyle.sectionsHeight : 0
 
         property PageHeadSections sections: styledItem.config.sections
 
         Row {
             id: sectionsRow
-            anchors.centerIn: parent
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                horizontalCenter: parent.horizontalCenter
+            }
             width: childrenRect.width
-            height: parent.height
-            enabled: divider.sections.enabled
-            visible: divider.sections.model !== undefined
+            enabled: sectionsItem.sections.enabled
+            visible: sectionsItem.sections.model !== undefined
             opacity: enabled ? 1.0 : 0.5
 
             Repeater {
                 id: sectionsRepeater
-                model: divider.sections.model
+                model: sectionsItem.sections.model
                 objectName: "page_head_sections_repeater"
                 AbstractButton {
                     id: sectionButton
-                    anchors.verticalCenter: parent ? parent.verticalCenter : undefined
+                    anchors {
+                        top: parent.top
+                        bottom: parent.bottom
+                    }
                     objectName: "section_button_" + index
                     enabled: sectionsRow.enabled
-                    width: label.width + units.gu(4)
-                    height: sectionsRow.height + units.gu(2)
-                    property bool selected: index === divider.sections.selectedIndex
-                    onClicked: divider.sections.selectedIndex = index;
+                    width: label.width + units.gu(4) // FIXME: expose spacing as style property
+                    property bool selected: index === sectionsItem.sections.selectedIndex
+                    onClicked: sectionsItem.sections.selectedIndex = index;
 
                     Rectangle {
                         visible: parent.pressed
@@ -134,7 +131,6 @@
                             verticalCenter: parent.verticalCenter
                             left: parent.left
                             right: parent.right
-                            rightMargin: verticalDividerLine.width
                         }
                         height: sectionsRow.height
                         color: headerStyle.sectionHighlightColor
@@ -144,25 +140,24 @@
                         id: label
                         text: modelData
                         fontSize: "small"
-                        anchors.centerIn: sectionButton
+                        anchors.centerIn: parent
                         horizontalAlignment: Text.AlignHCenter
                         color: sectionButton.selected ?
                                    headerStyle.selectedSectionColor :
                                    headerStyle.sectionColor
                     }
 
-                    // vertical divider line
                     Rectangle {
-                        id: verticalDividerLine
+                        id: sectionLine
                         anchors {
-                            verticalCenter: parent.verticalCenter
+                            bottom: parent.bottom
+                            left: parent.left
                             right: parent.right
                         }
-                        height: units.dp(10)
-                        width: units.dp(1)
-                        visible: index < sectionsRepeater.model.length - 1
-                        color: headerStyle.sectionColor
-                        opacity: 0.2
+                        height: units.dp(2) // FIXME: Expose as style property
+                        color: sectionButton.selected ?
+                                   headerStyle.selectedSectionColor :
+                                   styledItem.dividerColor
                     }
                 }
             }
@@ -341,67 +336,8 @@
                     OverflowPanel {
                         id: tabsPopover
                         objectName: "tabsPopover"
-                        callerMargin: -units.gu(1) + units.dp(4)
-                        contentWidth: units.gu(20)
-
-                        Binding {
-                            target: tabsPopover.__foreground.__styleInstance
-                            property: "color"
-                            value: headerStyle.panelBackgroundColor
-                            when: tabsPopover.__foreground &&
-                                  tabsPopover.__foreground.__styleInstance
-                        }
-
-                        Column {
-                            anchors {
-                                left: parent.left
-                                top: parent.top
-                                right: parent.right
-                            }
-                            Repeater {
-                                model: styledItem.tabsModel
-                                AbstractButton {
-                                    objectName: "tabButton" + index
-                                    onClicked: {
-                                        styledItem.tabsModel.selectedIndex = index;
-                                        tabsPopover.hide();
-                                    }
-                                    implicitHeight: units.gu(6) + bottomDividerLine.height
-                                    width: parent ? parent.width : units.gu(31)
-
-                                    Rectangle {
-                                        visible: parent.pressed
-                                        anchors {
-                                            left: parent.left
-                                            right: parent.right
-                                            top: parent.top
-                                        }
-                                        height: parent.height - bottomDividerLine.height
-                                        color: headerStyle.panelHighlightColor
-                                    }
-
-                                    Label {
-                                        anchors {
-                                            verticalCenter: parent.verticalCenter
-                                            verticalCenterOffset: units.dp(-1)
-                                            left: parent.left
-                                            leftMargin: units.gu(2)
-                                            right: parent.right
-                                        }
-                                        fontSize: "medium"
-                                        elide: Text.ElideRight
-                                        text: tab.title // FIXME: only "title" doesn't work with i18n.tr(). Why not?
-                                        color: headerStyle.panelForegroundColor
-                                    }
-
-                                    ListItem.ThinDivider {
-                                        id: bottomDividerLine
-                                        anchors.bottom: parent.bottom
-                                        visible: index < styledItem.tabsModel.count - 1
-                                    }
-                                }
-                            }
-                        }
+                        tabsOverflow: true
+                        model: styledItem.tabsModel
                     }
                 }
             }
@@ -527,16 +463,6 @@
                     OverflowPanel {
                         id: actionsOverflowPopover
                         objectName: "actions_overflow_popover"
-                        callerMargin: -units.gu(1) + units.dp(4)
-                        contentWidth: units.gu(20)
-
-                        Binding {
-                            target: actionsOverflowPopover.__foreground.__styleInstance
-                            property: "color"
-                            value: headerStyle.panelBackgroundColor
-                            when: actionsOverflowPopover.__foreground &&
-                                  actionsOverflowPopover.__foreground.__styleInstance
-                        }
 
                         // Ensure the popover closes when actions change and
                         // the list item below may be destroyed before its
@@ -555,71 +481,9 @@
                             }
                         }
 
-                        Column {
-                            anchors {
-                                left: parent.left
-                                top: parent.top
-                                right: parent.right
-                            }
-                            Repeater {
-                                id: overflowRepeater
-                                model: numberOfSlots.requested - numberOfSlots.used
-                                AbstractButton {
-                                    action: actionsContainer.visibleActions[numberOfSlots.used + index]
-                                    objectName: action.objectName + "_header_overflow_button"
-                                    onClicked: actionsOverflowPopover.hide()
-                                    implicitHeight: units.gu(6) + bottomDividerLine.height
-                                    width: parent ? parent.width : units.gu(31)
-
-                                    Rectangle {
-                                        visible: parent.pressed
-                                        anchors {
-                                            left: parent.left
-                                            right: parent.right
-                                            top: parent.top
-                                        }
-                                        height: parent.height - bottomDividerLine.height
-                                        color: headerStyle.panelHighlightColor
-                                    }
-
-                                    Icon {
-                                        id: actionIcon
-                                        source: action.iconSource
-                                        color: headerStyle.panelForegroundColor
-                                        anchors {
-                                            verticalCenter: parent.verticalCenter
-                                            verticalCenterOffset: units.dp(-1)
-                                            left: parent.left
-                                            leftMargin: units.gu(2)
-                                        }
-                                        width: units.gu(2)
-                                        height: units.gu(2)
-                                        opacity: action.enabled ? 1.0 : 0.5
-                                    }
-
-                                    Label {
-                                        anchors {
-                                            verticalCenter: parent.verticalCenter
-                                            verticalCenterOffset: units.dp(-1)
-                                            left: actionIcon.right
-                                            leftMargin: units.gu(2)
-                                            right: parent.right
-                                        }
-                                        fontSize: "small"
-                                        elide: Text.ElideRight
-                                        text: action.text
-                                        color: headerStyle.panelForegroundColor
-                                        opacity: action.enabled ? 1.0 : 0.5
-                                    }
-
-                                    ListItem.ThinDivider {
-                                        id: bottomDividerLine
-                                        anchors.bottom: parent.bottom
-                                        visible: index !== overflowRepeater.count - 1
-                                    }
-                                }
-                            }
-                        }
+                        tabsOverflow: false
+                        model: actionsContainer.visibleActions.slice(numberOfSlots.used,
+                                                                     numberOfSlots.requested)
                     }
                 }
             }

=== added file 'modules/Ubuntu/Components/pageUtils.js'
--- modules/Ubuntu/Components/pageUtils.js	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/pageUtils.js	2015-04-14 21:04:03 +0000
@@ -0,0 +1,47 @@
+/*
+ * 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/>.
+ */
+
+/*!
+  Return true if the object is a Flickable that can be flicked in vertical direction.
+ */
+function isVerticalFlickable(object) {
+    if (object && object.hasOwnProperty("flickableDirection") && object.hasOwnProperty("contentHeight")) {
+        var direction = object.flickableDirection;
+        if ( ((direction === Flickable.AutoFlickDirection) && (object.contentHeight !== object.height) )
+                || direction === Flickable.VerticalFlick
+                || direction === Flickable.HorizontalAndVerticalFlick) {
+            return true;
+        }
+    }
+    return false;
+}
+
+/*!
+  Return the first child of the item that is flickable in the vertical direction.
+ */
+function getFlickableChild(item) {
+    if (item && item.hasOwnProperty("children")) {
+        for (var i=0; i < item.children.length; i++) {
+            var child = item.children[i];
+            if (isVerticalFlickable(child)) {
+                if (child.anchors.top === page.top || child.anchors.fill === page) {
+                    return item.children[i];
+                }
+            }
+        }
+    }
+    return null;
+}

=== 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-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2014 Canonical Ltd.
+ * 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
@@ -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 <[e-mail]>
  */
 
 #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"
@@ -189,6 +189,10 @@
     qmlRegisterSingletonType<UCNamespace>(uri, 1, 2, "Ubuntu", registerUbuntuNamespace);
     qmlRegisterType<UCUbuntuShape, 1>(uri, 1, 2, "UbuntuShape");
     qmlRegisterType<UCUbuntuShapeOverlay>(uri, 1, 2, "UbuntuShapeOverlay");
+
+    // register 1.3 API
+    qmlRegisterType<UCTheme>(uri, 1, 3, "ThemeSettings");
+    qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItemBase");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
@@ -207,7 +211,10 @@
     // that can be accessed from any object
     context->setContextProperty("QuickUtils", &QuickUtils::instance());
 
-    UCTheme::instance().registerToContext(context);
+    // register theme context property
+    UCTheme::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-14 21:04:03 +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

=== modified file 'modules/Ubuntu/Components/plugin/shaders/shape.vert'
--- modules/Ubuntu/Components/plugin/shaders/shape.vert	2015-01-29 17:16:40 +0000
+++ modules/Ubuntu/Components/plugin/shaders/shape.vert	2015-04-14 21:04:03 +0000
@@ -14,10 +14,10 @@
 //
 // Author: Loïc Molinari <[e-mail]>
 
-uniform mediump mat4 matrix;
+uniform highp mat4 matrix;  // mediump was interpreted as lowp on PowerVR Rogue G6200 (arale).
 uniform bool textured;
 
-attribute mediump vec4 positionAttrib;
+attribute highp vec4 positionAttrib;  // highp because of matrix precision qualifier.
 attribute mediump vec2 shapeCoordAttrib;
 attribute mediump vec4 sourceCoordAttrib;
 attribute lowp vec4 backgroundColorAttrib;

=== modified file 'modules/Ubuntu/Components/plugin/shaders/shapeoverlay.vert'
--- modules/Ubuntu/Components/plugin/shaders/shapeoverlay.vert	2015-01-29 18:08:38 +0000
+++ modules/Ubuntu/Components/plugin/shaders/shapeoverlay.vert	2015-04-14 21:04:03 +0000
@@ -14,10 +14,10 @@
 //
 // Author: Loïc Molinari <[e-mail]>
 
-uniform mediump mat4 matrix;
+uniform highp mat4 matrix;  // mediump was interpreted as lowp on PowerVR Rogue G6200 (arale).
 uniform bool textured;
 
-attribute mediump vec4 positionAttrib;
+attribute highp vec4 positionAttrib;  // highp because of matrix precision qualifier.
 attribute mediump vec2 shapeCoordAttrib;
 attribute mediump vec4 sourceCoordAttrib;
 attribute lowp vec4 backgroundColorAttrib;

=== 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-14 21:04:03 +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 <[e-mail]>
  */
 
-#include "ucthemesettings.h"
+#include "ucdefaulttheme.h"
 #include "uctheme.h"
 
 #include <QDebug>
@@ -34,12 +34,12 @@
 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)
 {
     // fundamental features rely on the default theme, so bail out if it's absent
-    if (UCTheme::pathFromThemeName(DEFAULT_THEME).isEmpty()) {
+    if (pathFromThemeName(DEFAULT_THEME).isEmpty()) {
         qWarning() << "Mandatory default theme" << DEFAULT_THEME << "missing!";
     }
 
@@ -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-14 21:04:03 +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 <[e-mail]>
  */
 
-#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-14 21:04:03 +0000
@@ -0,0 +1,122 @@
+/*
+ * 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 <[e-mail]>
+ */
+
+#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::defaultTheme(), &UCTheme::nameChanged,
+            this, &UCDeprecatedTheme::nameChanged);
+    connect(&UCTheme::defaultTheme(), &UCTheme::paletteChanged,
+            this, &UCDeprecatedTheme::paletteChanged);
+}
+
+/*!
+    \qmlproperty string Theme::name
+
+    The name of the current theme.
+*/
+QString UCDeprecatedTheme::name() const
+{
+    return UCTheme::defaultTheme().name();
+}
+void UCDeprecatedTheme::setName(const QString& name)
+{
+    UCTheme::defaultTheme().setName(name);
+}
+void UCDeprecatedTheme::resetName()
+{
+    UCTheme::defaultTheme().resetName();
+}
+
+/*!
+    \qmlproperty Palette Theme::palette
+
+    The palette of the current theme.
+*/
+QObject* UCDeprecatedTheme::palette()
+{
+    return UCTheme::defaultTheme().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::defaultTheme().createStyleComponent(styleName, parent);
+}
+
+void UCDeprecatedTheme::registerToContext(QQmlContext* context)
+{
+    UCTheme::defaultTheme().m_engine = context->engine();
+    UCTheme::defaultTheme().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-14 21:04:03 +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 <[e-mail]>
+ */
+
+#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-14 21:04:03 +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/ucstyleditembase.cpp'
--- modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-04-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -18,9 +18,13 @@
 
 #include "ucstyleditembase.h"
 #include "ucstyleditembase_p.h"
+#include "uctheme.h"
 
 UCStyledItemBasePrivate::UCStyledItemBasePrivate()
     : activeFocusOnPress(false)
+    , subthemingEnabled(true)
+    , theme(0)
+    , parentStyledItem(0)
 {
 }
 
@@ -32,6 +36,16 @@
 {
     Q_Q(UCStyledItemBase);
     q->setFlag(QQuickItem::ItemIsFocusScope);
+    QByteArray env = qgetenv("UITK_SUBTHEMING");
+    subthemingEnabled = (env.isEmpty() || env == QByteArrayLiteral("yes"));
+    if (!subthemingEnabled) {
+        // every theme will be using the default theme
+        theme = &UCTheme::defaultTheme();
+        QObject::connect(theme, &UCTheme::nameChanged, q, &UCStyledItemBase::themeChanged);
+    } else {
+        QObject::connect(&UCTheme::defaultTheme(), &UCTheme::nameChanged,
+                         q, &UCStyledItemBase::themeChanged);
+    }
 }
 
 
@@ -48,7 +62,7 @@
     if (!activeFocusOnPress) {
         return false;
     }
-    QQuickItem *pl = q->parentItem();
+    QQuickItem *pl = parentItem;
     while (pl) {
         UCStyledItemBase *scope = qobject_cast<UCStyledItemBase*>(pl);
         if (scope) {
@@ -168,6 +182,189 @@
     Q_EMIT activeFocusOnPressChanged();
 }
 
+/*!
+ * \qmlproperty ThemeSettings StyledItem::theme
+ * \since Ubuntu.Components 1.3
+ * The property configures the theme the component and all its sub-components
+ * will use. By default it is set to the closest ancestor StyledItem's theme
+ * if any, or to the system default theme.
+ */
+UCTheme *UCStyledItemBasePrivate::getTheme() const
+{
+    if (subthemingEnabled) {
+        if (theme) {
+            return theme;
+        } else if (!parentStyledItem.isNull()) {
+            return UCStyledItemBasePrivate::get(parentStyledItem)->getTheme();
+        }
+    }
+    return &UCTheme::defaultTheme();
+}
+void UCStyledItemBasePrivate::setTheme(UCTheme *newTheme)
+{
+    Q_Q(UCStyledItemBase);
+    if (theme == newTheme) {
+        return;
+    }
+
+    if (!subthemingEnabled) {
+        // no subtheming
+        if (newTheme) {
+            theme = newTheme;
+            UCTheme::defaultTheme().setName(theme->name());
+        } else {
+            UCTheme::defaultTheme().resetName();
+        }
+        return;
+    }
+
+    // disconnect from the previous set
+    UCTheme *connectedSet = theme ?
+                                theme :
+                                (!parentStyledItem ? &UCTheme::defaultTheme() : NULL);
+    if (connectedSet) {
+        QObject::disconnect(connectedSet, &UCTheme::nameChanged,
+                            q, &UCStyledItemBase::themeChanged);
+    }
+
+    UCTheme *prevSet = theme;
+
+    // resolve new theme
+    if (theme && newTheme) {
+        // no need to redo the parentStack, simply set the theme and leave
+        theme = newTheme;
+    } else {
+        theme = newTheme;
+        if (!newTheme) {
+            // redo the parent chanin
+            disconnectTillItem(0);
+            connectParents(0);
+        }
+    }
+
+    // connect to the new set
+    connectedSet = theme ?
+                    theme :
+                    (!parentStyledItem ? &UCTheme::defaultTheme() : NULL);
+    if (connectedSet) {
+        QObject::connect(connectedSet, &UCTheme::nameChanged,
+                         q, &UCStyledItemBase::themeChanged);
+    }
+    // detach previous set and attach the new one
+    if (prevSet) {
+        Q_EMIT prevSet->parentThemeChanged();
+    }
+    if (theme) {
+        // re-parent theme to make sure we have it
+        // for the entire lifetime of the styled item
+        theme->setParent(q);
+        Q_EMIT theme->parentThemeChanged();
+    }
+
+    Q_EMIT q->themeChanged();
+}
+void UCStyledItemBasePrivate::resetTheme()
+{
+    setTheme(NULL);
+}
+
+// link/unlink all ascendant items until we reach a StyledItem, returns true if the
+// theme change signal emission is justified
+bool UCStyledItemBasePrivate::connectParents(QQuickItem *fromItem)
+{
+    Q_Q(UCStyledItemBase);
+    QQuickItem *item = fromItem ? fromItem : parentItem;
+    while (item) {
+        // push the item onto the stack
+        parentStack.push(QPointer<QQuickItem>(item));
+        UCStyledItemBase *styledItem = qobject_cast<UCStyledItemBase*>(item);
+        if (styledItem) {
+            // this is the closest StyledItem, connect its themeChanged() signal
+            QObject::connect(styledItem, SIGNAL(themeChanged()),
+                             q, SLOT(_q_parentStyleChanged()), Qt::DirectConnection);
+            // set the current style set to the one in the parent's one if differs
+            return setParentStyled(styledItem);
+        } else {
+            // connect to the item's parentChanged() signal so we can detect when the parent changes
+            QObject::connect(item, SIGNAL(parentChanged(QQuickItem*)),
+                             q, SLOT(_q_ascendantChanged(QQuickItem*)), Qt::DirectConnection);
+        }
+        item = item->parentItem();
+    }
+    return false;
+}
+
+// set the used parent styled item's style; returns true if the parent styled got changed
+bool UCStyledItemBasePrivate::setParentStyled(UCStyledItemBase *styledItem)
+{
+    if (parentStyledItem == styledItem) {
+        return false;
+    }
+    parentStyledItem = styledItem;
+    if (theme) {
+        Q_EMIT theme->parentThemeChanged();
+    }
+    return (theme == NULL);
+}
+
+// disconnect parent stack till item is reached; all the stack if item == 0
+void UCStyledItemBasePrivate::disconnectTillItem(QQuickItem *item)
+{
+    if (!subthemingEnabled) {
+        return;
+    }
+    Q_Q(UCStyledItemBase);
+    while (!parentStack.isEmpty() && item != parentStack.top()) {
+        QPointer<QQuickItem> stackItem = parentStack.pop();
+        // the topmost item can be the only one which is a StyledItem
+        UCStyledItemBase *styledItem = qobject_cast<UCStyledItemBase*>(stackItem.data());
+        if (styledItem) {
+            QObject::disconnect(styledItem, SIGNAL(themeChanged()),
+                                q, SLOT(_q_parentStyleChanged()));
+        } else if (!stackItem.isNull()) {
+            QObject::disconnect(stackItem.data(), SIGNAL(parentChanged(QQuickItem*)),
+                                q, SLOT(_q_ascendantChanged(QQuickItem*)));
+        }
+    }
+}
+
+// captures ascendant change signal, the sender is the one which counts!
+void UCStyledItemBasePrivate::_q_ascendantChanged(QQuickItem *ascendant)
+{
+    Q_Q(UCStyledItemBase);
+    QQuickItem *sender = static_cast<QQuickItem*>(q->sender());
+    if (!sender) {
+        // cannot detect the sender, leave!
+        return;
+    }
+    if (ascendant) {
+        // disconnect from the previous ones
+        disconnectTillItem(sender);
+        // traverse ascendants till we reach a StyledItem or root and push them into the stack
+        if (connectParents(ascendant)) {
+            Q_EMIT q->themeChanged();
+        }
+    }
+}
+
+// syncs the ascendant StyledItem's style
+void UCStyledItemBasePrivate::_q_parentStyleChanged()
+{
+    // do not trigger themeChanged() on this item if we have a
+    // custom one, but resolve its eventual parent change!
+    if (theme) {
+        Q_EMIT theme->parentThemeChanged();
+        return;
+    }
+    Q_Q(UCStyledItemBase);
+    UCStyledItemBase *styledItem = static_cast<UCStyledItemBase*>(q->sender());
+    if (!styledItem) {
+        return;
+    }
+    setParentStyled(styledItem);
+    Q_EMIT q->themeChanged();
+}
+
 // grab pressed state and focus if it can be
 void UCStyledItemBase::mousePressEvent(QMouseEvent *event)
 {
@@ -194,4 +391,18 @@
     return QQuickItem::childMouseEventFilter(child, event);
 }
 
+// catch parent change event so we can lookup for the parent chain theme
+void UCStyledItemBase::itemChange(ItemChange change, const ItemChangeData &data)
+{
+    QQuickItem::itemChange(change, data);
+    Q_D(UCStyledItemBase);
+    if (change == ItemParentHasChanged && d->subthemingEnabled) {
+        if (!data.item) {
+            d->disconnectTillItem(0);
+        } else if (d->connectParents(0)) {
+            Q_EMIT themeChanged();
+        }
+    }
+}
+
 #include "moc_ucstyleditembase.cpp"

=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase.h'
--- modules/Ubuntu/Components/plugin/ucstyleditembase.h	2014-09-02 05:52:32 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase.h	2015-04-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -22,12 +22,14 @@
 #include <QtQuick/QQuickItem>
 
 class UCStyledItemBasePrivate;
+class UCTheme;
 class UCStyledItemBase : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(bool activeFocusOnPress
                READ activefocusOnPress WRITE setActiveFocusOnPress
                NOTIFY activeFocusOnPressChanged REVISION 1)
+    Q_PRIVATE_PROPERTY(d_func(), UCTheme *theme READ getTheme WRITE setTheme RESET resetTheme NOTIFY themeChanged REVISION 2)
 public:
     explicit UCStyledItemBase(QQuickItem *parent = 0);
 
@@ -39,15 +41,19 @@
 
 Q_SIGNALS:
     void activeFocusOnPressChanged();
+    Q_REVISION(2) void themeChanged();
 
 protected:
     UCStyledItemBase(UCStyledItemBasePrivate &, QQuickItem *parent);
 
     void mousePressEvent(QMouseEvent *event);
     bool childMouseEventFilter(QQuickItem *child, QEvent *event);
+    void itemChange(ItemChange, const ItemChangeData &);
 
 private:
     Q_DECLARE_PRIVATE(UCStyledItemBase)
+    Q_PRIVATE_SLOT(d_func(), void _q_ascendantChanged(QQuickItem*))
+    Q_PRIVATE_SLOT(d_func(), void _q_parentStyleChanged())
 };
 
 #endif // UCSTYLEDITEMBASE_H

=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase_p.h'
--- modules/Ubuntu/Components/plugin/ucstyleditembase_p.h	2014-08-20 12:56:51 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase_p.h	2015-04-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * 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
@@ -20,6 +20,7 @@
 #define UCSTYLEDITEMBASE_P_H
 
 #include <QtQuick/private/qquickitem_p.h>
+#include "ucstyleditembase.h"
 
 class QQuickMouseArea;
 class UCStyledItemBase;
@@ -32,6 +33,9 @@
         return item->d_func();
     }
 
+    void _q_ascendantChanged(QQuickItem *ascendant);
+    void _q_parentStyleChanged();
+
     UCStyledItemBasePrivate();
     virtual ~UCStyledItemBasePrivate();
     void init();
@@ -39,8 +43,22 @@
     virtual void setFocusable(bool focus);
     bool isParentFocusable();
 
+    UCTheme *getTheme() const;
+    void setTheme(UCTheme *styleSet);
+    void resetTheme();
+
 public:
     bool activeFocusOnPress:1;
+    bool subthemingEnabled:1;
+    UCTheme *theme;
+    QPointer<UCStyledItemBase> parentStyledItem;
+
+private:
+    QStack< QPointer<QQuickItem> > parentStack;
+
+    bool connectParents(QQuickItem *fromItem);
+    bool setParentStyled(UCStyledItemBase *styledItem);
+    void disconnectTillItem(QQuickItem *item);
 };
 
 #endif // UCSTYLEDITEMBASE_P_H

=== 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-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -22,12 +22,12 @@
 #include "quickutils.h"
 #include "i18n.h"
 #include "ucfontutils.h"
+#include "ucstyleditembase_p.h"
 
 #include <QtQml/qqml.h>
 #include <QtQml/qqmlinfo.h>
 #include <QtQml/QQmlEngine>
 #include <QtQml/QQmlContext>
-#include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QTextStream>
@@ -37,43 +37,100 @@
 #include <QtGui/QFont>
 
 /*!
-    \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}
-*/
+ * \qmltype ThemeSettings
+ * \instantiates UCTheme
+ * \inqmlmodule Ubuntu.Components 1.3
+ * \since Ubuntu.Components 1.3
+ * \ingroup theming
+ * \brief The ThemeSettings class provides facilities to define the theme of a
+ * StyledItem.
+ *
+ * A global instance is exposed as the \b theme context property.
+ *
+ * The theme defines the visual aspect of the Ubuntu components. An application
+ * can use one or more theme the same time. The ThemeSettings component provides
+ * abilities to change the theme used by the component and all its child components.
+ *
+ * Changing the theme of the entire application can be achieved by changing
+ * the name of the root StyledItem's, i.e. MainView's current theme.
+ *
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * MainView {
+ *     width: units.gu(40)
+ *     height: units.gu(71)
+ *
+ *     theme.name: "Ubuntu.Components.Themes.Ambiance"
+ * }
+ * \endqml
+ * By default, styled items inherit the theme they use from their closest styled
+ * item ancestor. In case the application uses MainView, all components will inherit
+ * the theme from the MainView.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * MainView {
+ *     width: units.gu(40)
+ *     height: units.gu(71)
+ *
+ *     Page {
+ *         title: "Style test"
+ *         Button {
+ *             text: theme.name == "Ubuntu.Components.Themes.Ambiance" ?
+ *                      "SuruDark" : "Ambiance"
+ *             onClicked: theme.name = (text == "Ambiance" ?
+ *                      "Ubuntu.Components.Themes.SuruDark" :
+ *                      "Ubuntu.Components.Themes.Ambiance")
+ *         }
+ *     }
+ * }
+ * \endqml
+ * \note In the example above the Button inherits the theme from Page, which
+ * inherits it from MainView. Therefore changing the theme name in this way will
+ * result in a change of the inherited theme. In case a different theme is desired,
+ * a new instance of the ThemeSettings must be created on the styled item desired.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * MainView {
+ *     width: units.gu(40)
+ *     height: units.gu(71)
+ *
+ *     Page {
+ *         title: "Style test"
+ *         theme: ThemeSettings{}
+ *         Button {
+ *             text: theme.name == "Ubuntu.Components.Themes.Ambiance" ?
+ *                      "SuruDark" : "Ambiance"
+ *             onClicked: theme.name = (text == "Ambiance" ?
+ *                      "Ubuntu.Components.Themes.SuruDark" :
+ *                      "Ubuntu.Components.Themes.Ambiance")
+ *         }
+ *     }
+ * }
+ * \endqml
+ *
+ * The \l createStyleComponent function can be used to create the style for a
+ * component. The following example will create the style with the inherited
+ * theme.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ * StyledItem {
+ *     id: myItem
+ *     style: theme.createStyleComponent("MyItemStyle.qml", myItem)
+ * }
+ * \endqml
+ * All styled toolkit components such as \l Button, \l CheckBox, \l Switch, etc.
+ * create their style in this way. Note that the style component must be part
+ * of the theme, otherwise the style creation will fail.
+ *
+ * \sa {StyledItem}
+ */
 
 const QString THEME_FOLDER_FORMAT("%1/%2/");
 const QString PARENT_THEME_FILE("parent_theme");
@@ -111,20 +168,53 @@
     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);
-
+QUrl pathFromThemeName(QString themeName)
+{
+    themeName.replace('.', '/');
+    QStringList pathList = themeSearchPath();
+    Q_FOREACH(const QString &path, pathList) {
+        QString themeFolder = THEME_FOLDER_FORMAT.arg(path, themeName);
+        // QUrl needs a trailing slash to understand it's a directory
+        QString absoluteThemeFolder = QDir(themeFolder).absolutePath().append('/');
+        if (QDir(absoluteThemeFolder).exists()) {
+            return QUrl::fromLocalFile(absoluteThemeFolder);
+        }
+    }
+    return QUrl();
+}
+
+QString parentThemeName(const QString& themeName)
+{
+    QString parentTheme;
+    QUrl themePath = pathFromThemeName(themeName);
+    if (!themePath.isValid()) {
+        qWarning() << qPrintable(UbuntuI18n::instance().tr("Theme not found: \"%1\"").arg(themeName));
+    } else {
+        QFile file(themePath.resolved(PARENT_THEME_FILE).toLocalFile());
+        if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            QTextStream in(&file);
+            parentTheme = in.readLine();
+        }
+    }
+    return parentTheme;
+}
+
+UCTheme::UCTheme(QObject *parent)
+    : QObject(parent)
+    , m_palette(UCTheme::defaultTheme().m_palette)
+    , m_engine(UCTheme::defaultTheme().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 +223,24 @@
     QGuiApplication::setFont(defaultFont);
 }
 
+void UCTheme::init()
+{
+    m_completed = false;
+    QObject::connect(&m_defaultTheme, &UCDefaultTheme::themeNameChanged,
+                     this, &UCTheme::_q_defaultThemeChanged);
+    updateThemePaths();
+}
+
+void UCTheme::classBegin()
+{
+    m_engine = qmlEngine(this);
+    updateEnginePaths();
+    loadPalette();
+}
+
 void UCTheme::updateEnginePaths()
 {
-    if (!m_engine || m_engineUpdated) {
+    if (!m_engine) {
         return;
     }
 
@@ -145,38 +250,19 @@
             m_engine->addImportPath(path);
         }
     }
-    m_engineUpdated = true;
-}
-
-void UCTheme::onThemeNameChanged()
-{
-    if (m_themeSettings.themeName() != m_name) {
-        m_name = m_themeSettings.themeName();
-        updateThemePaths();
-        Q_EMIT nameChanged();
-    }
-}
-
-QUrl UCTheme::pathFromThemeName(QString themeName)
-{
-    themeName.replace('.', '/');
-    QStringList pathList = themeSearchPath();
-    Q_FOREACH(const QString &path, pathList) {
-        QString themeFolder = THEME_FOLDER_FORMAT.arg(path, themeName);
-        // QUrl needs a trailing slash to understand it's a directory
-        QString absoluteThemeFolder = QDir(themeFolder).absolutePath().append('/');
-        if (QDir(absoluteThemeFolder).exists()) {
-            return QUrl::fromLocalFile(absoluteThemeFolder);
-        }
-    }
-    return QUrl();
+}
+
+void UCTheme::_q_defaultThemeChanged()
+{
+    updateThemePaths();
+    Q_EMIT nameChanged();
 }
 
 void UCTheme::updateThemePaths()
 {
     m_themePaths.clear();
 
-    QString themeName = m_name;
+    QString themeName = name();
     while (!themeName.isEmpty()) {
         QUrl themePath = pathFromThemeName(themeName);
         if (themePath.isValid()) {
@@ -187,31 +273,53 @@
 }
 
 /*!
-    \qmlproperty string Theme::name
+ * \qmlproperty ThemeSettings ThemeSettings::parentTheme
+ * \readonly
+ * The property specifies the parent ThemeSettings instance.
+ */
+UCTheme *UCTheme::parentTheme()
+{
+    UCStyledItemBase *owner = qobject_cast<UCStyledItemBase*>(parent());
+    UCStyledItemBasePrivate *pOwner = owner ? UCStyledItemBasePrivate::get(owner) : NULL;
+    if (pOwner && pOwner->theme == this && pOwner->parentStyledItem) {
+        return UCStyledItemBasePrivate::get(pOwner->parentStyledItem)->getTheme();
+    }
+    return NULL;
+}
 
-    The name of the current theme.
-*/
+/*!
+ * \qmlproperty string ThemeSettings::name
+ * The name of the current theme in dotted format i.e. "Ubuntu.Components.Themes.Ambiance".
+ */
 QString UCTheme::name() const
 {
-    return m_name;
+    return !m_name.isEmpty() ? m_name : m_defaultTheme.themeName();
 }
-
 void UCTheme::setName(const QString& name)
 {
-    if (name != m_name) {
-        QObject::disconnect(&m_themeSettings, &UCThemeSettings::themeNameChanged,
-                            this, &UCTheme::onThemeNameChanged);
-        m_name = name;
+    if (name == m_name) {
+        return;
+    }
+    m_name = name;
+    if (name.isEmpty()) {
+        init();
+    } else {
+        QObject::disconnect(&m_defaultTheme, &UCDefaultTheme::themeNameChanged,
+                            this, &UCTheme::_q_defaultThemeChanged);
         updateThemePaths();
-        Q_EMIT nameChanged();
     }
+    loadPalette();
+    Q_EMIT nameChanged();
+}
+void UCTheme::resetName()
+{
+    setName(QString());
 }
 
 /*!
-    \qmlproperty Palette Theme::palette
-
-    The palette of the current theme.
-*/
+ * \qmlproperty Palette ThemeSettings::palette
+ * The palette of the current theme.
+ */
 QObject* UCTheme::palette()
 {
     if (!m_palette) {
@@ -232,27 +340,25 @@
     return QUrl();
 }
 
-QString UCTheme::parentThemeName(const QString& themeName)
+// registers the default theme property to the root context
+void UCTheme::registerToContext(QQmlContext* context)
 {
-    QString parentTheme;
-    QUrl themePath = pathFromThemeName(themeName);
-    if (!themePath.isValid()) {
-        qWarning() << qPrintable(UbuntuI18n::instance().tr("Theme not found: \"%1\"").arg(themeName));
-    } else {
-        QFile file(themePath.resolved(PARENT_THEME_FILE).toLocalFile());
-        if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-            QTextStream in(&file);
-            parentTheme = in.readLine();
-        }
-    }
-    return parentTheme;
+    UCTheme *defaultTheme = &UCTheme::defaultTheme();
+    defaultTheme->m_engine = context->engine();
+    defaultTheme->updateEnginePaths();
+
+    context->setContextProperty("theme", defaultTheme);
+    ContextPropertyChangeListener *listener =
+        new ContextPropertyChangeListener(context, "theme");
+    QObject::connect(defaultTheme, &UCTheme::nameChanged,
+                     listener, &ContextPropertyChangeListener::updateContextProperty);
 }
 
 /*!
-    \qmlmethod Component Theme::createStyleComponent(string styleName, object parent)
-
-    Returns an instance of the style component named \a styleName.
-*/
+ * \qmlmethod Component ThemeSettings::createStyleComponent(string styleName, object parent)
+ * Returns an instance of the style component named \a styleName and parented
+ * to \a parent.
+ */
 QQmlComponent* UCTheme::createStyleComponent(const QString& styleName, QObject* parent)
 {
     QQmlComponent *component = NULL;
@@ -275,7 +381,7 @@
                 }
             } else {
                 qmlInfo(parent) <<
-                   UbuntuI18n::instance().tr(QString("Warning: Style %1 not found in theme %2").arg(styleName).arg(m_name));
+                   UbuntuI18n::instance().tr(QString("Warning: Style %1 not found in theme %2").arg(styleName).arg(name()));
             }
         }
     }
@@ -283,32 +389,23 @@
     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) {
         return;
     }
-    if (m_palette != NULL) {
+    if (!m_palette.isNull()) {
         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 = defaultTheme().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-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * 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
@@ -21,54 +21,74 @@
 #define UCTHEME_H
 
 #include <QtCore/QObject>
+#include <QtCore/QPointer>
 #include <QtCore/QUrl>
 #include <QtCore/QString>
 #include <QtQml/QQmlComponent>
-
-#include "ucthemesettings.h"
-
-class UCTheme : public QObject
+#include <QtQml/QQmlParserStatus>
+
+#include "ucdefaulttheme.h"
+
+class UCStyledItemBase;
+class UCTheme : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_INTERFACES(QQmlParserStatus)
+    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)
 public:
-    static UCTheme& instance() {
-        static UCTheme instance;
+    explicit UCTheme(QObject *parent = 0);
+    static UCTheme &defaultTheme()
+    {
+        static UCTheme instance(true);
         return instance;
     }
 
-    explicit UCTheme(QObject *parent = 0);
-
     // getter/setters
+    UCTheme *parentTheme();
     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);
-    static QUrl pathFromThemeName(QString themeName);
+    static void registerToContext(QQmlContext* context);
 
 Q_SIGNALS:
+    void parentThemeChanged();
     void nameChanged();
     void paletteChanged();
 
+protected:
+    void classBegin();
+    void componentComplete()
+    {
+        m_completed = true;
+    }
+
 private Q_SLOTS:
+    void _q_defaultThemeChanged();
+
+private:
+    UCTheme(bool defaultStyle, QObject *parent = 0);
+    void init();
     void updateEnginePaths();
-    void onThemeNameChanged();
     void updateThemePaths();
     QUrl styleUrl(const QString& styleName);
-    QString parentThemeName(const QString& themeName);
     void loadPalette(bool notify = true);
 
-private:
     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;
+    bool m_completed:1;
+
+    friend class UCDeprecatedTheme;
 };
 
+QUrl pathFromThemeName(QString themeName);
+
 #endif // UCTHEME_H

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2015-03-02 13:39:03 +0000
+++ modules/Ubuntu/Components/qmldir	2015-04-14 21:04:03 +0000
@@ -98,7 +98,7 @@
 UbuntuListView 1.1 UbuntuListView11.qml
 internal PageBase Page10.qml
 Page 1.1 Page11.qml
-PageHeadConfiguration 1.1 PageHeadConfiguration.qml
+PageHeadConfiguration 1.1 PageHeadConfiguration11.qml
 PageHeadSections 1.1 PageHeadSections.qml
 PageHeadState 1.1 PageHeadState.qml
 Icon 1.1 Icon11.qml
@@ -111,3 +111,7 @@
 #version 1.2
 MainView 1.2 MainView12.qml
 Captions 1.2 Captions.qml
+
+#version 1.3
+Page 1.3 Page13.qml
+PageHeadConfiguration 1.3 PageHeadConfiguration13.qml

=== modified file 'modules/Ubuntu/Test/UbuntuTestCase.qml'
--- modules/Ubuntu/Test/UbuntuTestCase.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Test/UbuntuTestCase.qml	2015-04-14 21:04:03 +0000
@@ -115,10 +115,10 @@
         var iy = 0;
 
         for (var step=0; step < steps; step++) {
-            if (ix < abs_dx) {
+            if (Math.abs(ix) < abs_dx) {
                 ix += step_dx;
             }
-            if (iy < abs_dy) {
+            if (Math.abs(iy) < abs_dy) {
                 iy += step_dy;
             }
             mouseMove(item, x + ix, y + iy, stepdelay);
@@ -237,4 +237,22 @@
     function warningFormat(line, column, message) {
         return util.callerFile() + ":" + line + ":" + column + ": " + message;
     }
+
+    /*!
+        Wait for animations of the header and the style inside the header to finish.
+        The MainView that has the header that may animate must be passed as an argument.
+     */
+    function waitForHeaderAnimation(mainView) {
+        var header = findChild(mainView, "MainView_Header");
+        verify(header !== null, "Could not find header.");
+        var headerStyle = findChild(header, "PageHeadStyle");
+        verify(headerStyle !== null, "Could not find header style.");
+
+        // Wait for the header to start to move:
+        wait(50);
+        // Wait for animation of the style inside the header (when pushing/popping):
+        tryCompareFunction(function(){ return headerStyle.animating }, false);
+        // Wait for the header to finish showing/hiding:
+        tryCompareFunction(function(){ return header.moving }, false);
+    }
 }

=== modified file 'modules/Ubuntu/Test/plugin/uctestcase.h'
--- modules/Ubuntu/Test/plugin/uctestcase.h	2014-10-06 14:18:35 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.h	2015-04-14 21:04:03 +0000
@@ -27,7 +27,6 @@
 class UbuntuTestCase : public QQuickView
 {
     Q_OBJECT
-
 public:
     UbuntuTestCase(const QString& file, QWindow* parent = 0);
     int warnings() const;

=== modified file 'push_to_phone.sh'
--- push_to_phone.sh	2015-02-24 15:50:34 +0000
+++ push_to_phone.sh	2015-04-14 21:04:03 +0000
@@ -84,7 +84,6 @@
 
 # Autopilot tests should always match the Toolkit
 adb push tests/autopilot/ubuntuuitoolkit/ $STONE/ap || exit 1
-echo cp -R ap/* /usr/lib/python2.7/dist-packages/ubuntuuitoolkit >> $RUN/copy.sh || exit 1
 echo cp -R ap/* /usr/lib/python3/dist-packages/ubuntuuitoolkit >> $RUN/copy.sh || exit 1
 adb push examples/ubuntu-ui-toolkit-gallery/ $STONE/ex >> $RUN/copy.sh || exit 1
 echo cp -R ex/* /usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2014-07-16 19:19:03 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+# Copyright (C) 2012, 2013, 2014, 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
@@ -73,7 +73,7 @@
 
     def __init__(self, *args):
         check_autopilot_version()
-        super(UbuntuUIToolkitCustomProxyObjectBase, self).__init__(*args)
+        super().__init__(*args)
         self.pointing_device = get_pointing_device()
 
     def is_flickable(self):

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2015-03-04 21:57:25 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+# Copyright (C) 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
@@ -64,6 +64,9 @@
             # so no need to wait.
             return
 
+        # Wait showing/hiding animation of the header.
+        self.moving.wait_for(False)
+
     @autopilot_logging.log_action(logger.info)
     def switch_to_section_by_index(self, index):
         """Select a section in the header divider
@@ -265,4 +268,4 @@
             'Header is an internal QML component of Ubuntu.Components and '
             'its API may change or be removed at any moment. Please use '
             'MainView and Page instead.')
-        super(Header, self).__init__(*args)
+        super().__init__(*args)

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2015-02-11 23:37:40 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+# Copyright (C) 2012, 2013, 2014, 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
@@ -42,7 +42,7 @@
 
     @classmethod
     def validate_dbus_object(cls, path, state):
-        if super(MainView, cls).validate_dbus_object(path, state):
+        if super().validate_dbus_object(path, state):
             # This covers MainView 0.1/1.0/1.1 and possible components
             # derived from MainView (e.g. "CustomMainView") that have
             # their own CPO.

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2014-08-26 16:29:26 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2015-04-14 21:04:03 +0000
@@ -34,7 +34,7 @@
     """TextField Autopilot custom proxy object."""
 
     def __init__(self, *args):
-        super(TextField, self).__init__(*args)
+        super().__init__(*args)
         self.keyboard = _common.get_keyboard()
 
     @autopilot_logging.log_action(logger.info)

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2015-03-10 11:49:27 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py	2015-04-14 21:04:03 +0000
@@ -113,9 +113,6 @@
 class ComposerSheet(_common.UbuntuUIToolkitCustomProxyObjectBase):
     """ComposerSheet Autopilot custom proxy object."""
 
-    def __init__(self, *args):
-        super(ComposerSheet, self).__init__(*args)
-
     @autopilot_logging.log_action(logger.info)
     def confirm(self):
         """Confirm the composer sheet."""

=== modified file 'tests/autopilot/ubuntuuitoolkit/base.py'
--- tests/autopilot/ubuntuuitoolkit/base.py	2014-12-01 11:03:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/base.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013, 2014 Canonical Ltd.
+# Copyright (C) 2013, 2014, 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
@@ -75,7 +75,7 @@
     """Autopilot test case for applications using the Ubuntu UI Toolkit."""
 
     def setUp(self):
-        super(UbuntuUIToolkitAppTestCase, self).setUp()
+        super().setUp()
         self.input_device_class = self._get_input_device_class()
 
     def _get_input_device_class(self):

=== modified file 'tests/autopilot/ubuntuuitoolkit/fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/fixture_setup.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014, 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
@@ -57,7 +57,7 @@
     def __init__(
             self, qml_file_contents=DEFAULT_QML_FILE_CONTENTS,
             desktop_file_dict=None):
-        super(FakeApplication, self).__init__()
+        super().__init__()
         self._qml_file_contents = qml_file_contents
         if desktop_file_dict is None:
             self._desktop_file_dict = copy.deepcopy(DEFAULT_DESKTOP_FILE_DICT)
@@ -65,7 +65,7 @@
             self._desktop_file_dict = copy.deepcopy(desktop_file_dict)
 
     def setUp(self):
-        super(FakeApplication, self).setUp()
+        super().setUp()
         self.qml_file_path, self.desktop_file_path = (
             self._create_test_application())
 
@@ -116,7 +116,7 @@
     """Set the value of initctl environment variables."""
 
     def __init__(self, global_=False, **kwargs):
-        super(InitctlEnvironmentVariable, self).__init__()
+        super().__init__()
         # Added one level of indirection to be able to spy the calls to
         # environment during tests.
         self.environment = environment
@@ -124,7 +124,7 @@
         self.global_ = global_
 
     def setUp(self):
-        super(InitctlEnvironmentVariable, self).setUp()
+        super().setUp()
         for variable, value in self.variables.items():
             self._add_variable_cleanup(variable)
             self.environment.set_initctl_env_var(
@@ -154,11 +154,11 @@
     should_copy_xauthority_file = True
 
     def __init__(self, directory=None):
-        super(FakeHome, self).__init__()
+        super().__init__()
         self.directory = directory
 
     def setUp(self):
-        super(FakeHome, self).setUp()
+        super().setUp()
         self.directory = self._make_directory_if_not_specified()
         if self.should_copy_xauthority_file:
             self._copy_xauthority_file(self.directory)
@@ -202,7 +202,7 @@
     _UNITYSHELL_LAUNCHER_HIDDEN_MODE = 1  # launcher hidden
 
     def setUp(self):
-        super(HideUnity7Launcher, self).setUp()
+        super().setUp()
         self._hide_launcher()
 
     def _hide_launcher(self):
@@ -232,14 +232,14 @@
 class SimulateDevice(fixtures.Fixture):
 
     def __init__(self, app_width, app_height, grid_unit_px):
-        super(SimulateDevice, self).__init__()
+        super().__init__()
         self.app_width = app_width
         self.app_height = app_height
         self.grid_unit_px = grid_unit_px
         self._screen = None
 
     def setUp(self):
-        super(SimulateDevice, self).setUp()
+        super().setUp()
         if self._is_geometry_larger_than_display(
                 self.app_width, self.app_height):
             scale_divisor = self._get_scale_divisor()

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2015-04-14 21:04:03 +0000
@@ -92,7 +92,7 @@
 """)
 
     def setUp(self):
-        super(UbuntuUIToolkitWithFakeAppRunningTestCase, self).setUp()
+        super().setUp()
         self.launch_application()
 
     def launch_application(self):
@@ -126,7 +126,7 @@
     """Base test case for self tests that define the QML on an string."""
 
     def setUp(self):
-        super(QMLStringAppTestCase, self).setUp()
+        super().setUp()
         self.assertThat(
             self.main_view.visible, Eventually(Equals(True)))
 
@@ -156,7 +156,7 @@
     desktop_file_path = None
 
     def setUp(self):
-        super(QMLFileAppTestCase, self).setUp()
+        super().setUp()
         self.pointing_device = Pointer(self.input_device_class.create())
         self.launch_application()
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py	2015-02-03 11:54:53 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py	2015-04-14 21:04:03 +0000
@@ -40,7 +40,7 @@
     ]
 
     def setUp(self):
-        super(HeaderActionsOverflowTestCase, self).setUp()
+        super().setUp()
         self.header = self.main_view.get_header()
 
     def test_click_header_overflow_action_must_close_popover(self):
@@ -71,7 +71,7 @@
         dir_path, 'test_header.HeaderContentsTestCase.qml')
 
     def setUp(self):
-        super(HeaderContentsTestCase, self).setUp()
+        super().setUp()
         self.header = self.main_view.get_header()
 
     def test_open_page_with_head_contents_must_change_header(self):

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py	2014-10-06 10:44:31 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014, 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
@@ -28,9 +28,6 @@
     test_qml_file_path = os.path.join(
         dir_path, 'test_popover.qml')
 
-    def setUp(self):
-        super(DialogScrollTestCase, self).setUp()
-
     def test_dialog_small(self):
         button = self.main_view.select_single(objectName='button_small')
         self.pointing_device.click_object(button)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-03-16 10:01:09 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014, 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
@@ -59,7 +59,7 @@
         return command_line
 
     def setUp(self):
-        super(CaretTextInputTestCase, self).setUp()
+        super().setUp()
         self.textfield = self.main_view.select_single(
             objectName=self.objectName)
         self.assertFalse(self.textfield.focus)
@@ -130,7 +130,7 @@
         return command_line
 
     def setUp(self):
-        super(InsertModeTextInputTestCase, self).setUp()
+        super().setUp()
         self.textfield = self.main_view.select_single(
             objectName=self.objectName)
         self.assertFalse(self.textfield.focus)

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_units.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_units.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_units.py	2015-04-14 21:04:03 +0000
@@ -0,0 +1,61 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 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/>.
+
+"""Tests for the Ubuntu UI Toolkit units helpers."""
+
+import logging
+import os
+import testscenarios
+import testtools
+
+import fixtures
+
+from ubuntuuitoolkit import (
+    fixture_setup,
+    units
+)
+
+
+logger = logging.getLogger(__name__)
+
+
+class UnitsTestCase(testscenarios.TestWithScenarios,
+                    testtools.TestCase):
+
+    WIDTH_IN_GU = 20
+
+    path = os.path.abspath(__file__)
+    dir_path = os.path.dirname(path)
+    test_qml_file_path = os.path.join(
+        dir_path, 'test_units.UnitsTestCase.qml')
+
+    scenarios = [
+        ('with default GRID_UNIT_PX', {'grid_unit_px': '',
+         'expected_pixels': 160}),
+        ('with GRID_UNIT_PX environment variable set', {'grid_unit_px': '10',
+         'expected_pixels': 200})
+    ]
+
+    def setUp(self):
+        self.useFixture(fixtures.EnvironmentVariable(
+            'GRID_UNIT_PX', self.grid_unit_px))
+        self.useFixture(fixture_setup.InitctlEnvironmentVariable(
+            global_=True, GRID_UNIT_PX=self.grid_unit_px))
+        super().setUp()
+
+    def test_gu(self):
+        pixels = units.gu(self.WIDTH_IN_GU)
+        self.assertEquals(pixels, self.expected_pixels)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py	2015-04-14 21:04:03 +0000
@@ -18,10 +18,7 @@
 
 from autopilot import input
 from testtools.matchers import GreaterThan, LessThan
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
@@ -75,7 +72,7 @@
     ]
 
     def setUp(self):
-        super(ToggleTestCase, self).setUp()
+        super().setUp()
         self.toggle = self.main_view.select_single(
             ubuntuuitoolkit.CheckBox, objectName=self.objectName)
         self.assertFalse(self.toggle.checked)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py	2014-04-17 01:11:03 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013, 2014 Canonical Ltd.
+# Copyright (C) 2013, 2014, 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,10 +18,7 @@
 
 import autopilot
 from autopilot import platform, input
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014, 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
@@ -82,7 +82,7 @@
 """)
 
     def setUp(self):
-        super(DatePickerBaseTestCase, self).setUp()
+        super().setUp()
         self.date_picker = self.main_view.select_single(
             pickers.DatePicker, objectName='datePicker')
         self.time_picker = self.main_view.select_single(

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py	2014-12-17 12:11:51 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013, 2014 Canonical Ltd.
+# Copyright (C) 2013, 2014, 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
@@ -25,9 +25,6 @@
     test_qml_file_path = os.path.join(
         dir_path, 'test_dialog.DialogTestCase.qml')
 
-    def setUp(self):
-        super(DialogTestCase, self).setUp()
-
     def test_dialog(self):
         open_button = self.main_view.wait_select_single('Button',
                                                         objectName='button')

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2015-04-14 21:04:03 +0000
@@ -14,10 +14,7 @@
 # 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/>.
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import testtools
 import ubuntuuitoolkit
@@ -143,7 +140,7 @@
 """)
 
     def setUp(self):
-        super(SwipeFlickableTestCase, self).setUp()
+        super().setUp()
         self.flickable = self.main_view.select_single(
             ubuntuuitoolkit.QQuickFlickable, objectName='flickable')
         self.label = self.main_view.select_single(

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2015-03-04 16:29:23 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2015-04-14 21:04:03 +0000
@@ -34,7 +34,7 @@
         'test_header.HideShowTestCase.qml')
 
     def setUp(self):
-        super(HideShowTestCase, self).setUp()
+        super().setUp()
         self.header = self.main_view.get_header()
 
     def test_ensure_header_visible_must_show_it_when_not_visible(self):
@@ -70,7 +70,7 @@
     ]
 
     def setUp(self):
-        super(ActionsTestCase, self).setUp()
+        super().setUp()
         self.header = self.main_view.get_header()
         self.label = self.app.select_single(
             'Label', objectName='clicked_label')
@@ -134,7 +134,7 @@
         dir_path, 'test_header.SectionsTestCase.qml')
 
     def setUp(self):
-        super(SectionsTestCase, self).setUp()
+        super().setUp()
         self.header = self.main_view.get_header()
         # initially, section 0 is selected
         self.assertEqual(self.header.get_selected_section_index(), 0)
@@ -162,7 +162,7 @@
         dir_path, 'test_header.DeprecatedHeaderSectionsTestCase.qml')
 
     def setUp(self):
-        super(DeprecatedHeaderSectionsTestCase, self).setUp()
+        super().setUp()
         self.header = self.main_view.get_header()
 
     def test_get_selection_index(self):

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py	2015-01-15 15:06:02 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py	2015-04-14 21:04:03 +0000
@@ -27,7 +27,7 @@
         dir_path, 'test_listitem.ListItemTestCase.qml')
 
     def setUp(self):
-        super(ListItemTestCase, self).setUp()
+        super().setUp()
         self.list_view = self.main_view.select_single(
             ubuntuuitoolkit.QQuickListView, objectName='test_view')
         self.test_listitem = self.main_view.select_single(

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2015-04-14 21:04:03 +0000
@@ -14,10 +14,7 @@
 # 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/>.
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import logging
 import os
@@ -121,7 +118,7 @@
 """)
 
     def setUp(self):
-        super(SwipeToDeleteTestCase, self).setUp()
+        super().setUp()
         self._item = self.main_view.select_single(
             listitems.Standard, objectName='listitem_standard')
         self.assertTrue(self._item.exists())
@@ -208,7 +205,7 @@
         dir_path, 'test_listitems.ExpandableTestCase.qml')
 
     def setUp(self):
-        super(ExpandableTestCase, self).setUp()
+        super().setUp()
         self.test_expandable = self.main_view.select_single(
             listitems.Expandable, objectName='expandable0')
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py	2015-04-14 21:04:03 +0000
@@ -14,10 +14,7 @@
 # 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/>.
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
@@ -179,7 +176,7 @@
     ]
 
     def setUp(self):
-        super(GoBackTestCase, self).setUp()
+        super().setUp()
         self.header = self.main_view.get_header()
         self.assertEqual(self.header.title, 'Page 0')
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013, 2014 Canonical Ltd.
+# Copyright (C) 2013, 2014, 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
@@ -68,7 +68,7 @@
 """)
 
     def setUp(self):
-        super(OptionSelectorCustomDelegateTestCase, self).setUp()
+        super().setUp()
         self.option_selector = self.main_view.select_single(
             ubuntuuitoolkit.OptionSelector,
             objectName="test_option_selector_collapsed")
@@ -151,7 +151,7 @@
 """)
 
     def setUp(self):
-        super(OptionSelectorTestCase, self).setUp()
+        super().setUp()
         self.option_selector = self.main_view.select_single(
             ubuntuuitoolkit.OptionSelector,
             objectName="option_selector")

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py	2015-04-14 21:04:03 +0000
@@ -139,7 +139,7 @@
 """)
 
     def setUp(self):
-        super(ComposerSheetTestCase, self).setUp()
+        super().setUp()
         self.label = self.main_view.select_single(
             'Label', objectName='actionLabel')
         self.assertEqual(self.label.text, 'No action taken.')

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_pull_to_refresh.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_pull_to_refresh.py	2014-09-22 13:19:47 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_pull_to_refresh.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014, 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
@@ -30,7 +30,7 @@
     test_qml_file_path = os.path.join(dir_path, 'test_pull_to_refresh.qml')
 
     def setUp(self):
-        super(PullToRefreshTestCase, self).setUp()
+        super().setUp()
         self.label = self.main_view.select_single(
             'Label', objectName='refreshedLabel')
         self.assertEqual(self.label.text, 'Not refreshed.')

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2015-03-18 17:06:21 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py	2015-04-14 21:04:03 +0000
@@ -14,10 +14,7 @@
 # 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/>.
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import os
 
@@ -76,7 +73,7 @@
 """)
 
     def setUp(self):
-        super(QQuickListViewTestCase, self).setUp()
+        super().setUp()
         self.list_view = self.main_view.select_single(
             ubuntuuitoolkit.QQuickListView, objectName='testListView')
         self.label = self.main_view.select_single(
@@ -206,7 +203,7 @@
 """)
 
     def setUp(self):
-        super(QQuickListViewOutOfViewTestCase, self).setUp()
+        super().setUp()
         self.list_view = self.main_view.select_single(
             ubuntuuitoolkit.QQuickListView, objectName='testListView')
         self.label = self.main_view.select_single(
@@ -238,7 +235,7 @@
         self.test_qml_file_path = os.path.join(
             dir_path, self.qml_file_name)
 
-        super(QQuickListViewDraggingBaseTestCase, self).setUp()
+        super().setUp()
         self.list_view = self.main_view.select_single(
             ubuntuuitoolkit.QQuickListView, objectName='test_view')
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py	2014-09-04 13:21:35 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2013, 2014 Canonical Ltd.
+# Copyright (C) 2013, 2014, 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
@@ -16,10 +16,7 @@
 
 import os
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py	2015-04-14 21:04:03 +0000
@@ -14,10 +14,7 @@
 # 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/>.
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 from autopilot import platform
 from testtools.matchers import GreaterThan
@@ -46,7 +43,7 @@
 """)
 
     def setUp(self):
-        super(TextAreaTestCase, self).setUp()
+        super().setUp()
         self.simple_text_area = self.main_view.select_single(
             ubuntuuitoolkit.TextArea, objectName='simple_text_area')
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py	2015-04-14 21:04:03 +0000
@@ -14,10 +14,7 @@
 # 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/>.
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 from autopilot import platform
 
@@ -52,7 +49,7 @@
 """)
 
     def setUp(self):
-        super(TextFieldTestCase, self).setUp()
+        super().setUp()
         self.simple_text_field = self.main_view.select_single(
             ubuntuuitoolkit.TextField, objectName='simple_text_field')
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py	2015-03-03 13:20:06 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py	2015-04-14 21:04:03 +0000
@@ -14,10 +14,7 @@
 # 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/>.
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
@@ -62,7 +59,7 @@
 """)
 
     def setUp(self):
-        super(ToolbarTestCase, self).setUp()
+        super().setUp()
         self.toolbar = self.main_view.get_toolbar()
         # toolbar may be opened or closed now, depending on whether
         # the application has been deactivated and resumed already

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2014-07-07 17:08:13 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+# Copyright (C) 2012, 2013, 2014, 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
@@ -45,7 +45,7 @@
             # the app.
             self.simulate_device()
 
-        super(GalleryTestCase, self).setUp()
+        super().setUp()
 
         if self.should_simulate_device():
             # XXX Currently we have no way to launch the application with a
@@ -133,7 +133,7 @@
         element.selected.wait_for(True)
 
     def tearDown(self):
-        super(GalleryTestCase, self).tearDown()
+        super().tearDown()
         # We can't delete the desktop file before we close the application,
         # so we save it on an attribute to be deleted on tear down.
         if self.local_desktop_file_path is not None:

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py	2014-07-30 18:47:37 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py	2015-04-14 21:04:03 +0000
@@ -56,7 +56,7 @@
     def setUp(self):
         # Reset the locale to English
         os.environ['LANGUAGE'] = 'en'
-        super(ButtonsTestCase, self).setUp()
+        super().setUp()
 
     def test_buttons(self):
         self.open_page('buttonsElement')

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-07-23 19:27:18 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+# Copyright (C) 2012, 2013, 2014, 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
@@ -26,7 +26,7 @@
     scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
 
     def setUp(self):
-        super(OptionSelectorTestCase, self).setUp()
+        super().setUp()
         self.open_page('optionSelectorsElement')
 
     def test_select_option_from_collapsed_optionselector(self):

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py	2014-08-22 17:26:11 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014, 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
@@ -25,7 +25,7 @@
     scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
 
     def setUp(self):
-        super(ScrollBarTestCase, self).setUp()
+        super().setUp()
         self.open_page('navigationElement')
         self.scrollbar = self.main_view.wait_select_single(
             'Scrollbar', objectName="TemplateScrollbar")

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2014-11-04 01:25:13 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+# Copyright (C) 2012, 2013, 2014, 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
@@ -56,7 +56,7 @@
         text_input_scenarios)
 
     def setUp(self):
-        super(WriteAndClearTextInputTestCase, self).setUp()
+        super().setUp()
         # Apply the user locale from the environment
         # The UITK does the same, so the test must be localized
         locale.setlocale(locale.LC_ALL, "")
@@ -83,7 +83,7 @@
     scenarios = ubuntu_scenarios.get_device_simulation_scenarios()
 
     def setUp(self):
-        super(DisabledTextInputTestCase, self).setUp()
+        super().setUp()
         self.open_page('textinputsElement')
 
     def test_textfield_disabled(self):

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py	2014-06-26 04:24:52 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013, 2014 Canonical Ltd.
+# Copyright (C) 2012, 2013, 2014, 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
@@ -40,7 +40,7 @@
         toggles_scenarios)
 
     def setUp(self):
-        super(EnabledTogglesTestCase, self).setUp()
+        super().setUp()
         self.open_page('togglesElement')
 
     def test_change_toggles_state(self):
@@ -71,7 +71,7 @@
         toggles_scenarios)
 
     def setUp(self):
-        super(DisabledTogglesTestCase, self).setUp()
+        super().setUp()
         self.open_page('togglesElement')
 
     def test_change_toggles_state(self):

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-08-28 21:34:46 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014, 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,12 +17,7 @@
 import os
 import tempfile
 
-try:
-    # Python 3.
-    from unittest import mock
-except ImportError:
-    # Python 2 add-on: python-mock.
-    import mock
+from unittest import mock
 import testscenarios
 import testtools
 from autopilot import (
@@ -408,7 +403,7 @@
         if platform.model() != 'Desktop':
             self.skipTest('Unity 7 runs only on desktop.')
         self.useFixture(fixture_setup.HideUnity7Launcher())
-        super(HideUnity7LauncherTestCase, self).setUp()
+        super().setUp()
 
     def test_maximized_application_must_use_all_screen_width(self):
         application = self.process_manager.get_running_applications()[0]
@@ -434,7 +429,7 @@
     """Fake display with fixed widht and height for use in tests."""
 
     def __init__(self, width, height):
-        super(FakeDisplay, self).__init__()
+        super().__init__()
         self.width = width
         self.height = height
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py	2014-11-19 11:59:31 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014, 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
@@ -30,9 +30,6 @@
         command_line.append('-touch')
         return command_line
 
-    def setUp(self):
-        super(LauncherTouchTestCase, self).setUp()
-
     def test_apparent_touch_screen(self):
         textfield = self.main_view.select_single(objectName="textarea")
         # Trigger handlers as a courtesy to a watching person
@@ -46,9 +43,6 @@
     test_qml_file_path = os.path.join(
         dir_path, 'test_launcher.testcase.qml')
 
-    def setUp(self):
-        super(LauncherQtTestTestCase, self).setUp()
-
     def test_can_run_qt_test_case(self):
         textfield = self.main_view.select_single(objectName="textarea")
         self.assertThat(textfield.text,

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_ubuntu_scenarios.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_ubuntu_scenarios.py	2014-07-08 05:52:48 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_ubuntu_scenarios.py	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2014 Canonical Ltd.
+# Copyright (C) 2014, 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,10 +14,7 @@
 # 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/>.
 
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import testtools
 

=== added file 'tests/autopilot/ubuntuuitoolkit/units.py'
--- tests/autopilot/ubuntuuitoolkit/units.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/units.py	2015-04-14 21:04:03 +0000
@@ -0,0 +1,38 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 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/>.
+
+"""Ubuntu UI Toolkit units helpers."""
+
+import os
+
+from ubuntuuitoolkit import environment
+
+
+ENV_GRID_UNIT_PX = 'GRID_UNIT_PX'
+DEFAULT_GRID_UNIT_PX = 8
+
+
+def get_grid_unit():
+    grid_unit_px = os.environ.get(ENV_GRID_UNIT_PX, None)
+    if not grid_unit_px and environment.is_initctl_env_var_set(
+            ENV_GRID_UNIT_PX):
+        grid_unit_px = environment.get_initctl_env_var(ENV_GRID_UNIT_PX)
+    return float(grid_unit_px or DEFAULT_GRID_UNIT_PX)
+
+
+def gu(value):
+    """"Return the number of pixels corresponding to value in grid units."""
+    return value * get_grid_unit()

=== modified file 'tests/license/checklicense.sh'
--- tests/license/checklicense.sh	2015-03-12 14:13:58 +0000
+++ tests/license/checklicense.sh	2015-04-14 21:04:03 +0000
@@ -1,6 +1,6 @@
-#!/usr/bin/env sh
+#!/bin/bash -e
 #
-# Copyright 2013 Canonical Ltd.
+# 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
@@ -13,25 +13,20 @@
 #
 # 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/>.
-#
-################################################################################
-PATTERN='\.(c(c|pp|xx)?|h(h|pp|xx)?|p(l|m)|php|py(|x)|java|js|css|vala|qml)$'
-SKIP='(Canonical|GENERATED FILE|Yahoo! Inc. All rights reserved)'
-COMMAND="licensecheck --noconf -r * --copyright -c $PATTERN"
-echo Executing $COMMAND
-RESULTS=$($COMMAND)
-RESULT=$?
-ERRORS=$(echo "$RESULTS" | egrep -v "$SKIP" | grep '*No copyright*')
-COUNT=$(echo "$ERRORS" | sed 's/^ *//g' | wc -l)
-if [ "$ERRORS" != "" ]; then
-    echo Found $COUNT license problems:
-    echo "$ERRORS"
-    return $RESULT
-elif [ "$RESULT" != 0 ]; then
-    echo License check with unknown cause:
-    echo "RESULTS"
-    return $RESULT
-elif [ "$ERRORS" = "" ]; then
+
+# Based on pbuilderjenkins license checking script.
+
+include_files="\.(c(c|pp|xx)?|h(h|pp|xx)?|p(l|m)|php|py(|x)|java|js|vala|qml)$"
+exclude_dirs="(3rd_party|qrc_|moc_)"
+allowed_licenses="(Canonical|Android|Google|Digia)"
+issues_count=`licensecheck --noconf -r * --copyright -m -c $include_files -i $exclude_dirs | egrep -v $allowed_licenses | wc -l`
+
+if [ $issues_count -eq 0 ]; then
     echo No license problems found.
     exit 0
+else
+    echo Found $issues_count license problems:
+    # Run it a second time to print a nice list of issues
+    licensecheck --noconf -r * --copyright -m -c $include_files -i $exclude_dirs | egrep -v $allowed_licenses
+    exit 1
 fi

=== removed file 'tests/resources/header/actions.qml'
--- tests/resources/header/actions.qml	2015-03-02 23:48:42 +0000
+++ tests/resources/header/actions.qml	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 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
- * 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
-
-MainView {
-    width: units.gu(50)
-    height: units.gu(70)
-
-    Page {
-        title: "Actions"
-        Label {
-            anchors.centerIn: parent
-            text: "New API"
-        }
-        head {
-            actions: [
-                Action {
-                    iconName: "settings"
-                    onTriggered: print("Trigger first action")
-                },
-                Action {
-                    iconName: "camera-flip"
-                    onTriggered: print("Trigger second action")
-                }
-            ]
-            backAction: Action {
-                iconName: "close"
-                onTriggered: print("Trigger custom back action")
-            }
-        }
-    }
-}

=== removed file 'tests/resources/header/backButton.qml'
--- tests/resources/header/backButton.qml	2015-03-02 23:48:42 +0000
+++ tests/resources/header/backButton.qml	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 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
- * 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
-
-MainView {
-    id: mainView
-    width: units.gu(50)
-    height: units.gu(70)
-
-    PageStack {
-        id: stack
-
-        Component.onCompleted: stack.push(firstPage)
-        Page {
-            id: firstPage
-            title: "Stack"
-            Button {
-                anchors.centerIn: parent
-                text: "Click me"
-                onTriggered: stack.push(pageOnStack)
-            }
-            head {
-                actions: Action {
-                    iconName: "settings"
-                    text: "Settings"
-                }
-            }
-        }
-
-        Page {
-            id: pageOnStack
-            visible: false
-            title: "Stacked page"
-            Label {
-                anchors.centerIn: parent
-                text: "Use back button to return"
-            }
-            head.actions: Action {
-                iconName: "info"
-                text: "information"
-            }
-        }
-    }
-}

=== removed file 'tests/resources/header/lockedToolbar.deprecated.qml'
--- tests/resources/header/lockedToolbar.deprecated.qml	2015-03-06 12:42:00 +0000
+++ tests/resources/header/lockedToolbar.deprecated.qml	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU 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(50)
-    height: units.gu(80)
-    id: mainView
-
-    Page {
-        id: page
-        title: "test page"
-        Label {
-            anchors.centerIn: parent
-            text: "testing the toolbar"
-        }
-        tools: ToolbarItems {
-            id: toolbarItems
-            ToolbarButton {
-                text: "action1"
-            }
-        }
-    }
-
-    ToolbarItems {
-        id: lockedTools
-        ToolbarButton {
-            text: "locked"
-        }
-        locked: true
-        opened: true
-    }
-
-    Component.onCompleted: {
-        page.tools = lockedTools;
-    }
-}

=== removed file 'tests/resources/header/sections.qml'
--- tests/resources/header/sections.qml	2015-03-02 23:48:42 +0000
+++ tests/resources/header/sections.qml	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 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
- * 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
-
-MainView {
-    id: mainView
-    width: units.gu(50)
-    height: units.gu(70)
-
-    Page {
-        title: "Sections"
-        id: sectionsPage
-        head {
-            sections {
-                model: ["navy", "lightblue", "brown"]
-            }
-        }
-        Rectangle {
-            anchors {
-                fill: parent
-                margins: units.gu(2)
-            }
-            color: sectionsPage.head.sections.model[sectionsPage.head.sections.selectedIndex]
-        }
-    }
-}

=== removed file 'tests/resources/navigation/simpleTabs.qml'
--- tests/resources/navigation/simpleTabs.qml	2015-03-06 12:42:00 +0000
+++ tests/resources/navigation/simpleTabs.qml	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright 2013 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: 800
-    height: 600
-    useDeprecatedToolbar: false
-
-    Tabs {
-        id: tabs
-        selectedTabIndex: 1
-
-        Tab {
-            title: i18n.tr("One")
-            page: Page {
-                Label {
-                    anchors.centerIn: parent
-                    text: i18n.tr("First page")
-                }
-                tools: ToolbarItems {
-                    ToolbarButton {
-                        text: "1111"
-                        iconSource: "call_icon.png"
-                    }
-                }
-            }
-        }
-        Tab {
-            title: i18n.tr("Two")
-            page: Page {
-                Label {
-                    anchors.centerIn: parent
-                    text: i18n.tr("Second page")
-                }
-                tools: ToolbarItems {
-                    ToolbarButton {
-                        text: "2222"
-                        iconSource: "call_icon.png"
-                    }
-                }
-            }
-        }
-    }
-}

=== 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-14 21:04:03 +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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+
+Item {
+    id: component1
+    objectName: "TopItem"
+    width: units.gu(50)
+    height: units.gu(100)
+
+    Column {
+        objectName: "Column"
+        anchors.fill: parent
+        Label {
+            text: "Hallo"
+        }
+        Button {
+            text: "Theme change"
+            onClicked: theme.name = "Ubuntu.Components.Themes.SuruDark"
+        }
+
+        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)
+            }
+        }
+    }
+}

=== modified file 'tests/uitk_test_plan.sh'
--- tests/uitk_test_plan.sh	2015-03-12 06:19:17 +0000
+++ tests/uitk_test_plan.sh	2015-04-14 21:04:03 +0000
@@ -53,7 +53,7 @@
     " music_app"
     " gallery_app"
     " filemanager"
-    " ubuntu_terminal_app"
+#    " ubuntu_terminal_app"
     " -n unity8"
     " ubuntu_clock_app"
 #    " -p dialer-app-autopilot dialer_app"
@@ -176,6 +176,8 @@
     network
     adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S reboot 2>&1|grep -v password"
     sleep_indicator 120
+    # Required for at least rtm-14.09/mako, phablet-click-test-setup fails otherwise and we don't need terminal
+    adb -s ${SERIALNUMBER} shell "echo ${PASSWORD}|sudo -S click unregister com.ubuntu.terminal 2>&1|grep -v password"
     echo -e "phablet-click-test-setup  \e[31m${DISTRO} ${SERIES}\e[0m"
     phablet-click-test-setup -s ${SERIALNUMBER} --distribution=${DISTRO} --series=${SERIES} 2>&1 || fatal_failure "phablet-click-test-setup has failed" 
     echo "Sleep after phablet-click-test-setup";

=== added file 'tests/unit/tst_components/tst_styleditem13.qml'
--- tests/unit/tst_components/tst_styleditem13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_components/tst_styleditem13.qml	2015-04-14 21:04:03 +0000
@@ -0,0 +1,35 @@
+/*
+ * 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 QtTest 1.0
+import Ubuntu.Components 1.3
+import QtQuick 2.4
+
+TestCase {
+     name: "StyledItemAPI"
+
+     StyledItem {
+         id: scope
+         StyledItem {
+             id: inner
+         }
+     }
+
+     function test_api() {
+         verify(scope.theme, "Null default theme");
+         compare(inner.theme, scope.theme, "default themes should be inherited!");
+     }
+}

=== 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-14 21:04:03 +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
+        }
+    }
+}

=== added file 'tests/unit/tst_performance/Styling.qml'
--- tests/unit/tst_performance/Styling.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/Styling.qml	2015-04-14 21:04:03 +0000
@@ -0,0 +1,76 @@
+/*
+ * 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: component1
+    width: units.gu(50)
+    height: units.gu(100)
+
+    property string newTheme
+    onNewThemeChanged: component3.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
+                        theme: ThemeSettings {
+                            name: "Ubuntu.Components.Themes.Ambiance"
+                        }
+
+                        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-14 21:04:03 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * 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
@@ -22,8 +22,6 @@
 #include <QtQuick/QQuickView>
 #include <QtQuick/QQuickItem>
 
-#include "uctheme.h"
-
 class tst_Performance : public QObject
 {
     Q_OBJECT
@@ -65,6 +63,35 @@
         delete quickView;
     }
 
+    void benchmark_theming_data()
+    {
+        QTest::addColumn<QString>("document");
+        QTest::addColumn<QUrl>("theme");
+        QTest::addColumn<QByteArray>("enableSubtheming");
+
+        QTest::newRow("old theming, subtheming disabled") << "StyledItemOldTheming.qml" << QUrl("Ubuntu.Components.Themes.SuruDark") << QByteArray("no");
+        QTest::newRow("old theming, subtheming enabled") << "StyledItemOldTheming.qml" << QUrl("Ubuntu.Components.Themes.SuruDark") << QByteArray("yes");
+        QTest::newRow("subtheming, no changes on themes") << "Styling.qml" << QUrl() << QByteArray("yes");
+        QTest::newRow("subtheming, change mid item") << "Styling.qml" << QUrl("Ubuntu.Components.Themes.SuruDark") << QByteArray("yes");
+    }
+    void benchmark_theming()
+    {
+        QFETCH(QString, document);
+        QFETCH(QUrl, theme);
+        QFETCH(QByteArray, enableSubtheming);
+
+        qputenv("UITK_SUBTHEMING", enableSubtheming);
+        QQuickItem *root = 0;
+        QBENCHMARK {
+            root = loadDocument(document);
+            if (root && theme.isValid()) {
+                root->setProperty("newTheme", theme.toString());
+            }
+        }
+        if (root)
+            delete root;
+    }
+
     void benchmark_GridOfComponents_data() {
         QTest::addColumn<QString>("document");
         QTest::addColumn<QUrl>("theme");
@@ -95,6 +122,9 @@
         QQuickItem *root = 0;
         QBENCHMARK {
             root = loadDocument(document);
+            if (root && theme.isValid()) {
+                root->setProperty("newTheme", theme.toString());
+            }
         }
         if (root)
             delete root;
@@ -115,7 +145,6 @@
             loadDocument(document);
         }
     }
-
 };
 
 QTEST_MAIN(tst_Performance)

=== 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-14 21:04:03 +0000
@@ -25,4 +25,6 @@
     ListItemsEmptyList.qml \
     ListItemsBaseList.qml \
     ListItemWithInlineActionsList.qml \
-    ListItemWithActionsList.qml
+    ListItemWithActionsList.qml \