Merge lp:~bzoltan/ubuntu-ui-toolkit/landing_2015-04-17 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

Landing branch 2015-04-17

Landing branch 2015-04-17

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1482
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2195/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2309/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/810/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2307/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/971/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2195/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bzoltan/ubuntu-ui-toolkit/landing_2015-04-17]

1483. By Zoltan Balogh on 2015-04-17

Pull from the staging #1485

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1483
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2196/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2326/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/812/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-vivid-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2324/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/973/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2196/rebuild

review: Needs Fixing (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2015-02-27 13:47:29 +0000
+++ .bzrignore	2015-04-17 15:45:47 +0000
@@ -1,8 +1,12 @@
-Makefile
-modules/Makefile.ubuntu-ui-toolkit
-modules/Ubuntu/Components/Makefile.ubuntu-ui-toolkit
-modules/Ubuntu/Components/plugin/Makefile.ubuntu-ui-toolkit
+Makefile*
+modules/Makefile*
+modules/Ubuntu/Components/Makefile*
+modules/Ubuntu/Components/plugin/Makefile*
 modules/Ubuntu/Components/plugin/qrc_plugin.cpp
+modules/Ubuntu/Components/Themes/Makefile*
+modules/Ubuntu/Components/Layouts/Makefile*
+modules/Ubuntu/Components/PerformanceMetrics/Makefile*
+modules/Ubuntu/Test/Makefile*
 documentation/html/*
 *.moc
 moc_*.cpp

=== modified file 'components.api'
--- components.api	2015-03-10 13:58:52 +0000
+++ components.api	2015-04-17 15:45:47 +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
@@ -420,13 +429,13 @@
     property bool refreshing
     signal refresh()
 Scrollbar 0.1 1.0
-StyledItem
+Toolkit.StyledItem
     property Flickable flickableItem
     property int align
     property bool __interactive
     property internal __private
 Slider 0.1 1.0
-StyledItem
+Toolkit.StyledItem
     property real minimumValue
     property real maximumValue
     property real value
@@ -435,10 +444,6 @@
     signal touched(bool onThumb)
     function formatValue(v)
     property internal __internals
-StyledItem 0.1 1.0 1.1
-StyledItemBase
-    property Component style
-    readonly property Item __styleInstance
 ComboButtonStyle 1.1
 Item
     property real dropDownWidth
@@ -475,7 +480,7 @@
     readonly property int index
     property internal __protected
 TabBar 0.1 1.0
-StyledItem
+Toolkit.StyledItem
     property Item tabsItem
     property var model
     readonly property bool pressed
@@ -494,7 +499,7 @@
     signal modelChanged()
     property var __model
 TextArea 0.1 1.0
-StyledItem
+Ubuntu.StyledItem
     property bool highlighted
     property string placeholderText
     readonly property string displayText
@@ -617,11 +622,11 @@
     function undo()
     function remove(start, end)
     function getText(start, end)
-Palette 0.1
+Palette 0.1 1.0
 QtObject
     property PaletteValues normal
     property PaletteValues selected
-PaletteValues 0.1
+PaletteValues 0.1 1.0
 QtObject
     property color background
     property color backgroundText
@@ -692,6 +697,7 @@
     function tryCompareFunction(func, expectedResult, timeout)
     function typeString(string)
     function warningFormat(line, column, message)
+    function waitForHeaderAnimation(mainView)
 plugins.qmltypes
     name: "FilterBehavior"
     prototype: "QObject"
@@ -943,8 +949,6 @@
     Property { name: "action"; type: "UCAction"; isPointer: true }
     Property { name: "listItemData"; type: "QObject"; isList: true; isReadonly: true }
     Property { name: "listItemChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-    Property { name: "style"; type: "QQmlComponent"; isPointer: true }
-    Property { name: "__styleInstance"; type: "QQuickItem"; isReadonly: true; isPointer: true }
     Signal { name: "clicked" }
     Signal { name: "pressAndHold" }
     Signal { name: "contentMovementStarted" }
@@ -961,11 +965,13 @@
     Property { name: "colorTo"; type: "QColor" }
     name: "UCListItemStyle"
     prototype: "QQuickItem"
-    exports: ["Ubuntu.Components.Styles/ListItemStyle 1.2"]
+    exports: [
     Property { name: "snapAnimation"; type: "QQuickAbstractAnimation"; isPointer: true }
     Property { name: "dropAnimation"; type: "QQuickPropertyAnimation"; isPointer: true }
     Property { name: "animatePanels"; type: "bool"; isReadonly: true }
     Property { name: "dragPanel"; type: "QQuickItem"; isPointer: true }
+    Property { name: "listItemIndex"; revision: 1; type: "int"; isReadonly: true }
+    Signal { name: "listItemIndexChanged"; revision: 1 }
     Method {
     name: "swipeEvent"
     Parameter { name: "event"; type: "UCSwipeEvent"; isPointer: true }
@@ -1045,6 +1051,12 @@
     prototype: "QQuickItem"
     exports: [
     Property { name: "activeFocusOnPress"; revision: 1; type: "bool" }
+    Property { name: "style"; type: "QQmlComponent"; isPointer: true }
+    Property { name: "__styleInstance"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+    Property { name: "theme"; revision: 2; type: "UCTheme"; isPointer: true }
+    Signal { name: "styleInstanceChanged" }
+    Signal { name: "activeFocusOnPressChanged"; revision: 1 }
+    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"; 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"]
@@ -1070,13 +1092,14 @@
     name: "UCUbuntuShape"
     prototype: "QQuickItem"
     exports: [
+    name: "Aspect"
     name: "BackgroundMode"
     name: "HAlignment"
     name: "VAlignment"
     name: "FillMode"
     name: "WrapMode"
     Property { name: "radius"; type: "string" }
-    Property { name: "borderSource"; type: "string" }
+    Property { name: "aspect"; revision: 1; type: "Aspect" }
     Property { name: "source"; revision: 1; type: "QVariant" }
     Property { name: "sourceOpacity"; revision: 1; type: "double" }
     Property { name: "sourceFillMode"; revision: 1; type: "FillMode" }
@@ -1089,12 +1112,14 @@
     Property { name: "backgroundColor"; revision: 1; type: "QColor" }
     Property { name: "secondaryBackgroundColor"; revision: 1; type: "QColor" }
     Property { name: "backgroundMode"; revision: 1; type: "BackgroundMode" }
+    Property { name: "borderSource"; type: "string" }
     Property { name: "color"; type: "QColor" }
     Property { name: "gradientColor"; type: "QColor" }
     Property { name: "image"; type: "QVariant" }
     Property { name: "stretched"; type: "bool" }
     Property { name: "horizontalAlignment"; type: "HAlignment" }
     Property { name: "verticalAlignment"; type: "VAlignment" }
+    Signal { name: "aspectChanged"; revision: 1 }
     Signal { name: "sourceChanged"; revision: 1 }
     Signal { name: "sourceOpacityChanged"; revision: 1 }
     Signal { name: "sourceFillModeChanged"; revision: 1 }

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-27 12:35:56 +0000
+++ debian/changelog	2015-04-17 15:45:47 +0000
@@ -1,3 +1,59 @@
+ubuntu-ui-toolkit (1.2.1485+15.04.20150327-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Christian Dywan]   
+  * Use activeFocus rather than focus to determine that Text* has focus. 
+    Fixes LP: #1378231
+  
+  [ Leo Arias ]   
+  * Added a grids unit helper for autopilot tests.
+  * Make it possible to overwrite the bottom margin for the flickable autopilot
+    helper. Fixes  LP: #1401517.
+  * Removed python2 support from autopilot tests and helpers. Fixes LP: #1429163 
+ 
+  [ Loïc Molinari ]   
+  * Bumped matrix precision in vertex shaders. mediump, which should actually be
+    enough, was interpreted as lowp on arale (PowerVR Rogue G6200).
+  * Fixed build.
+  * Synchronized license checking script with PBuilder Jenkins.
+    Fixes  LP: #1441580.
+  * [UbuntuShape] Added support for resolution independent rendering. 
+    Fixes  LP: #1427253.
+  * Updated unknown Makefiles in .bzrignore.
+  
+  [ Sebastien Bacher ] 
+  * Change cursor when over the documentation urls to show they can be clicked.
+
+  [ Timo Jyrinki ]  
+  * Clean up cruft from build dependencies. Fixes  LP: #1441499.
+  * uitk_test_plan.sh: Remove terminal app before trying to run the tests.
+    Fixes  LP: #1434537.
+
+  [ Tim Peeters ] 
+  * Add UbuntuTestCase.waitForHeaderAnimation().
+  * Add visible and locked properties to Page.head.
+    Fixes LP: #1402054, LP: #1424592.
+  * Create Page 1.3.
+  * Merge header tests in resources with header unit tests.
+  * Move duplicate code for the overflows that was in PageHeadStyle twice
+    (for Tabs and Actions overflows) into OverflowPanel.
+  * New header visuals.
+  * Re-introduce the panel color properties to Ambience PageHeadStyle.
+
+  [ Zsombor Egri ]
+  * Applying sub-theming on toolkit.
+  * Introducing StyledItem.theme and ThemeSettings.parentTheme properties
+    into v1.3.
+  * Introducing ThemeSettings component, exported to UI Toolkit version 1.3.
+  * Make ThemeSettings.palette writable to configure individual colors as well
+    as Palette as a whole.
+  * Separating Theme context property from theme engine, giving the possibility 
+    to use the theming engine by multiple instances. Preparations for deprecation. 
+    Theming unit tests fixed. Fixes  LP: #1248982.
+  * Theming tutorial
+  * Remove extra StyledItem.qml layer for styled items, keep only UCStyledItemBase.
+
+ -- Zoltán Balogh <[e-mail]>  Fri, 17 Apr 2015 14:06:27 +0300
+
 ubuntu-ui-toolkit (1.2.1458+15.04.20150327-0ubuntu1) vivid; urgency=medium
 
   [ By Tim Peeters ]

=== modified file 'debian/control'
--- debian/control	2015-03-24 10:24:18 +0000
+++ debian/control	2015-04-17 15:45:47 +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/copyright'
--- debian/copyright	2013-07-30 09:12:35 +0000
+++ debian/copyright	2015-04-17 15:45:47 +0000
@@ -334,3 +334,26 @@
  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: modules/Ubuntu/Components/tools/3rd_party/edtaa3func.c
+Copyright: 2009-2012, Stefan Gustavson <[e-mail]>
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.

=== modified file 'debian/rules'
--- debian/rules	2015-01-23 18:11:22 +0000
+++ debian/rules	2015-04-17 15:45:47 +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-17 15:45:47 +0000
@@ -1,3 +1,2 @@
 usr/lib/python3
 usr/lib/*/ubuntu-ui-toolkit/launcher
-usr/lib/python2.7

=== added file 'documentation/images/surudark-theme.png'
Binary files documentation/images/surudark-theme.png	1970-01-01 00:00:00 +0000 and documentation/images/surudark-theme.png	2015-04-17 15:45:47 +0000 differ
=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2015-03-04 09:09:39 +0000
+++ documentation/overview.qdoc	2015-04-17 15:45:47 +0000
@@ -21,6 +21,7 @@
      \part General Topics
      \list
      \li \l{ubuntu-whatsnew.html}{What's new in version 1.2?}
+     \li \l{ubuntu-theming.html}{Styling} components
      \li \l{ubuntu-layouts.html}{Layouts} describes a flexible layouting engine
      to ease the development of responsive user interfaces.
      \li \l {Resolution Independence} describes the facilities that should be
@@ -84,6 +85,13 @@
      \endcode
      \annotatedlist theming
 
+     \part Theme module
+     Available through:
+     \code
+         import Ubuntu.Components.Themes 1.0
+     \endcode
+     \annotatedlist theme-module
+
      \part Style API
      The Style API defines the interface components use to style the visuals.
      Themes must make sure that these interfaces are all implemented.

=== added file 'documentation/ubuntu-theming.qdoc'
--- documentation/ubuntu-theming.qdoc	1970-01-01 00:00:00 +0000
+++ documentation/ubuntu-theming.qdoc	2015-04-17 15:45:47 +0000
@@ -0,0 +1,438 @@
+/*
+ * 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/>.
+ */
+
+/*!
+ * \page ubuntu-theming.html
+ * \title Styling - Introduction
+ * \nextpage Component styles, Style API
+ *
+ * The style defines the visuals, the implicit size of the component and may provide
+ * additional logic for a given component. Some components have fixed style API the
+ * component relies on, and yet some others do not have any restriction on hwat the
+ * style contains or does. Components relying on a well defined API provide these
+ * interfaces through Ubuntu.Components.Styles module, and styles must implement these
+ * interfaces.
+ *
+ * The implicit size of a component is driven by the style as well, but it is not
+ * mandatory for a style to provide those values, and components can override these
+ * values at any time. However each style component is anchor filled to the styled
+ * component and positioned to be under child components declared within the component
+ * itself.
+ *
+ * Styles can be declared as Components (like delegates), in a separate document
+ * loaded dynamically using a Loader or Qt.createComponent(), or can be grouped
+ * in themes. When declared in themes, with some exceptions, each component's style
+ * document name is compound of the component name having the \e Style word as postfix,
+ * followed by the typical QML file name extension. In this way the Button component's
+ * style is ButtonStyle. In addition to styles, themes can also provide custom palette
+ * values. There are two themes in Ubuntu, Ambiance and SuruDark themes, Ambiance
+ * being the default theme. Both themes are declared in separate modules, in \c
+ * Ubuntu.Components.Themes.Ambiance ans well as \c Ubuntu.Components.Themes.SuruDark.
+ * Application should define the theme name using this dotted name format.
+ *
+ * Applications can decide which theme they want to use or they can provide their
+ * own themes. Also, applications can use multiple themes or set custom palette values.
+ *
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * MainView {
+ *     width: units,gu(40)
+ *     height: units.gu(71)
+ *
+ *     theme.name: "Ubuntu.Components.Themes.SuruDark"
+ * }
+ * \endqml
+ */
+
+/*!
+ * \page ubuntu-theming-styles.html
+ * \title Component styles, Style API
+ * \nextpage Themes, theme types, theme structure
+ *
+ * \section2 Naming conventions
+ * With few exception, each toolkit component is having StyledItem as its base
+ * component. The component is aimed to be the base component for all styled
+ * elements in the toolkit. Modules providing additional  components to UI Toolkit
+ * can also use this component as base, especially if they want to provide styling
+ * capabilities.
+ *
+ * As mentioned, each styled component is having a style pair in a theme which is
+ * implemented in a document named using the component name adding the \e Style word.
+ * The \l {Button}'s style is implemented by \c ButtonStyle.qml document in the theme, and
+ * \l Button is loading this style from the theme:
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * AbstractButton {
+ *     id: button
+ *     // [...]
+ *     style: theme.createStyleComponent("ButtonStyle.qml", button)
+ * }
+ * \endqml
+ * Developers can override the style in two ways, depending on how they want to style
+ * the component:
+ * \list
+ *  \li 1. by overriding the style using an other style component from the theme, or
+ *  \li 2. by overriding the style with a custom style component.
+ * \endlist
+ * But let's see first how the styles are implemented.
+ *
+ * \section2 Creating styles
+ * As mentioned before, styles are not restricted to only provide visuals to a component or
+ * set of components, but can have also logic which drives the component functionality.
+ * These kind of styles must implement the given component's style API, listed in
+ * \c Ubuntu.Components.Styles module.
+ *
+ * A good example of such a style is the ListItemStyle. The ListItem drives the style
+ * animation through the \l ListItemStyle::animatePanels property, value being false when
+ * the style is loaded during component creation, i.e. when the component requires some
+ * visuals to be present at creation time. Also, ListItem informs the style when to
+ * execute leading or trailing panel \l {ListItemStyle::rebound}{rebound}s and provides
+ * the style the ability to overrule the \l {ListItemStyle::swipeEvent}{swipe} coordinates
+ * calculated by the ListItem. On the other hand, the style must inform the component
+ * about the position of the \l {ListItemStyle::dragPanel}{drag panel} so dragging
+ * (reordering of list items in a ListView) hot spot can be detected. A style implementation
+ * must use the API provided by ListItemStyle, otherwise ListItem will fail to function
+ * properly.
+ *
+ * Other styles are requested to provide additional \e content elements, which are then
+ * positioned by the styled component separately from the main visuals given by the style.
+ * A typical example of such a style API is the PullToRefresh component's style:
+ * \snippet Styles/PullToRefreshStyle.qml 0
+ * The default style implementation can be found under Ubuntu.Components.Themes.Ambiance
+ * theme \l {http://bazaar.launchpad.net/~ubuntu-sdk-team/ubuntu-ui-toolkit/trunk/view/head:/modules/Ubuntu/Components/Themes/Ambiance/PullToRefreshStyle.qml}
+ * {PullToRefreshStyle.qml}.
+ *
+ * Beside these, component styles may provide default values for colors, fonts, widths,
+ * margins, thicknesses.
+ *
+ * Each style component has a \c styledItem context property defined by the StyledItem,
+ * which points to the StyledItem instance that uses the style. Style implementations can
+ * access the actual styled item through this property.
+ *
+ * \section2 Overriding the default component style
+ *
+ * \section3 Override with a different style from the theme
+ * Returning back to the ways to override a component's style, overriding by using a different
+ * style from the theme can simply be done by calling the theme's \l{Theme::createStyleComponent}
+ * {createStyleComponent()} function with the alternative style document name as follows:
+ * \qml
+ * Button {
+ *     id: button
+ *     style: theme.createStyleComponent("SquaryButton.qml", button)
+ * }
+ * \endqml
+ * \note This assumes that the \c SquaryButton.qml document is present in the theme.
+ * This type of component styling makes sure the style will always have theme specific implementation
+ * or coloring, however it also requires the style document to be present in all the themes
+ * used by the application.
+ *
+ * \section3 Override with a custom component
+ * The other way is to override the style with a local component not present in any theme.
+ * The style component can be in-source (Component) or declared in a separate document,
+ * loaded dynamically with Loader or Qt.createComponent(). This kind of override will make
+ * sure the component will use the custom style no matter of the theme used. These styles
+ * however can still use the theme palette to be in sync with the theme coloring.
+ * \qml
+ * Button {
+ *     id: button
+ *     style: Rectangle {
+ *         implicitWidth: units.gu(12)
+ *         implicitHeight: units.gu(5)
+ *         color: styledItem.color
+ *         border {
+ *             width: units.dp(1)
+ *             color: styledItem.strokeColor
+ *         }
+ *         Label {
+ *             text: styledItem.text
+ *             font: styledItem.font
+ *         }
+ *     }
+ * }
+ * \endqml
+ */
+
+/*!
+ * \page ubuntu-theming-themes.html
+ * \title Themes, theme types, theme structure
+ * \nextpage Sub-theming
+ *
+ * A theme is a collection of style implementations. The style component names are
+ * typically built using the component name and the Style word, exceptions being
+ * documented per component.
+ *
+ * In addition to the styles the theme can provide palette values used by the style
+ * and components. The palette values are defined in \c Palette.qml file, which must
+ * either be derived from \l Palette component or from a parent theme's Palette.
+ *
+ * There are two types of themes, shared themes and application themes. These themes
+ * do not differ in structure but in the way they are exposed. Shared themes are
+ * located either under \b QML2_IMPORT_PATH or \b XDG_DATA_DIR. Application themes
+ * are located under the application's private folder, therefore they are typically
+ * serving the application styling needs, and cannot be shared. Shared themes are also
+ * presented as QML extension modules, giving the possibility for application themes
+ * to extend them.
+ *
+ * \note Yet there is no possibility to install shared themes into the system through
+ * app store, only by providing them as part of the system image.
+ *
+ * The system provides two shared themes, \b Ambiance and \b SuruDark, the latest derived
+ * from Ambiance theme. Both themes can be used as base theme in application themes,
+ * by importing the modules defining them. If you decide to create a shared theme
+ * that can be used also as base for custom or application themes, it is recommended
+ * to do the same approach as the system themes do.
+ *
+ * \section2 Theme structure
+ * \image surudark-theme.png
+ * The theme structure is similar to a QML extension module structure, and this applies
+ * to both shared and application themes. Contains component style documents, palette
+ * description document, \c qmldir file and a special file called \c parent_theme. All
+ * these files are optional in a theme depending on context.
+ *
+ * \c parent_theme is a special file which defines the theme the current one is derifed from.
+ * The parent theme must be a shared theme and its name must be specified in dotted format.
+ * For example SuruDark theme is located under \c{$QML2_IMPORT_PATH/Ubuntu/Components/Themes/SuruDark}
+ * folder. This means that the theme name is identified by the \b Ubuntu.Components.Themes.SuruDark
+ * dotted format.
+ *
+ * In addition to the files mentioned, themes can provide components supporting the styling
+ * (i.e. components providing common visuals in the style implementations). Style implementations
+ * can also provide additional APIs alongside the standard style API. These additional APIs are
+ * typically there to configure the style itself, or to turn on/off features provided by styles
+ * in derived themes.
+ *
+ * \section3 Standalone theme
+ * A standalone theme is a theme which defines all style documents and theme palette,
+ * and it is not derived from any theme. The only standalone theme UI Toolkit provides is
+ * the Ambiance theme. Both shared and application themes can be standalone themes, however
+ * Applications should make sure they implement all the styles used by the toolkit components
+ * used in the application. \c qmldir file presence is mandatory only if the theme is
+ * shared.
+ *
+ * \section3 Derived themes
+ * As the name suggests derived themes are themes which use other themes (standalone or derived ones)
+ * as base theme. These themes must have the \c parent_theme file to be present and to contain the
+ * name of the theme they are derived from. These themes do not have to provide palette configuration
+ * as long as they use the derived theme's palette values.
+ *
+ * Derived themes should only list those style components which overrule the derived style or
+ * extend the derived style. The only requirement is to use the same document name as the paren theme
+ * is having.
+ *
+ * Let's take SuruDark theme as en example. The theme is derived from Ambiance theme, and only
+ * extends few style components. When theming engine loads the style components, it looks
+ * after the styles starting from the current theme. If the style is not found there, it
+ * tries to look after the style in the parent themes until it finds one.
+ *
+ * The extended (or even overridden) style component documents must follow the naming
+ * convention, and must have the names implied by the components styled.
+ *
+ * SuruDark theme overrides the Ambiance theme's MainViewStyle, therefore declares the
+ * MainViewStyle.qml document, with the following content:
+ * \snippet Themes/SuruDark/MainViewStyle.qml 0
+ *
+ * The style imports the Ambiance theme module, and extends the Ambiance MainViewStyle
+ * component. The same is done in the other style components. However, Palette defines
+ * own values, and does not resuse Ambiance palette values.
+ * \snippet Themes/SuruDark/Palette.qml 0
+ *
+ * The same is done with TabBarStyle and OptionSelectorStyle components.
+ *
+ * \note If a theme derived from SuruDark wants to override style components not present
+ * in SuruDark, they must import the SuruDark's parent theme in the style component.
+ * As example, if FancyTheme would want to override the SwitchStyle, it would need to
+ * import Ambiance module in the component as SuruDark doesn't have that style component
+ * defined.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ * import Ubuntu.Components.Themes.Ambiance 1.2 as Ambiance
+ * Ambiance.SwitchStyle {
+ *     // [...]
+ * }
+ * \endqml
+ *
+ * \section2 Application themes
+ * Application themes can also be standalone or derived themes. Usually applications
+ * need slight differences on certain component styles, colors. These can be configured
+ * in multiple ways, depending on the needs of the application. Applications can decide
+ * to have their own theme, and override the palette value in the theme, or to use the
+ * system themes and override few color values from the theme palette.
+ *
+ * Let's take an example of an application which changes some palette values of SuruDark
+ * theme.
+ *
+ * First, the application has to define the theme, preferably in a separate folder (e.g.
+ * theme). The folder should contain a \c parent_theme file with the content
+ * \code
+ * Ubuntu.Components.Themes.SuruDark
+ * \endcode
+ * This will make sure theme engine will look after the style components that are not
+ * defined by the application theme inside the parent theme. Remember, the parent themes
+ * can have parent themes (in SuruDark case it is) in which case the style components
+ * will be looked up in all these themes.
+ *
+ * As next, the application can define the palette.
+ * \snippet customtheme/theme/Palette.qml 0
+ * Note that the palette uses the SuruDark palette as base, and changes few colors from it.
+ *
+ * The application can use its own theme in the following way:
+ * \snippet customtheme/main.qml 0
+ */
+
+/*!
+ * \page ubuntu-theming-subtheming.html
+ * \title Sub-theming
+ *
+ * There can be situations when an application has a design which combines styles from different
+ * themes, which would not be possible or would be hard to be combined in a theme. In these
+ * situations developers can use different themes in the components and its child components.
+ * This is called sub-theming, which was introduced in Ubuntu.Components v1.3.
+ * The only thing the application has to do is to define a ThemeSettings instance for the
+ * component which is desired to use a different theme.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Componenst 1.3
+ * MainView {
+ *     width: units.gu(40)
+ *     height: units.gu(71)
+ *
+ *     applicationName: "subthemed"
+ *
+ *     // make sure the main theme is Ambiance
+ *     theme.name: "Ubuntu.Components.Themes.Ambiance"
+ *
+ *     Component {
+ *         id: dialogComponent
+ *         Dialog {
+ *             id: dialog
+ *             title: "Input dialog"
+ *             // the dialog and its children will use SuruDark
+ *             theme: ThemeSettings {
+ *                 name: "Ubuntu.Components.Themes.SuruDark"
+ *             }
+ *             TextField {
+ *                 placeholderText: "enter text"
+ *             }
+ *             Button {
+ *                 text: "Close"
+ *                 onClicked: PopupUtils.close(dialog)
+ *             }
+ *         }
+ *     }
+ *
+ *     Button {
+ *         text: "Open dialog"
+ *         onClicked: PopupUtils.open(dialogComponent)
+ *     }
+ * }
+ * \endqml
+ *
+ * Another use-case is when a different palette set is needed in the application.
+ * One way to achieve that is to define a custom theme for the application, however
+ * that theme must be derived from one particular theme, so the application will be
+ * nailed to one given theme. If we want to have the same palette values to be used
+ * no matter of the component shape, we can override the palette values we want to
+ * change, by setting the theme palette to a \l Palette instance where only the desired
+ * palette values are changed. This can be combined with sub-theming, which will make
+ * sure that the palette values are applied only on a certain component sub-tree.
+ *
+ * The following example makes sure the Dialog and is child components will use a given
+ * palette value:
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ * import Ubuntu.Components.Themes 1.0
+ *
+ * MainView {
+ *     width: units.gu(40)
+ *     height: units.gu(71)
+ *
+ *     applicationName: "subthemed"
+ *
+ *     Component {
+ *         id: dialogComponent
+ *         Dialog {
+ *             id: dialog
+ *             title: "Input dialog"
+ *             // make sure the dialog and its children will use the same
+ *             // theme as the rest of the application
+ *             theme: ThemeSettings {
+ *                 name: parentTheme.name
+ *                 palette: Palette {
+ *                     id: config
+ *                     normal {
+ *                         foregroundText: UbuntuColors.blue
+ *                         overlayText: "#BAFEDC"
+ *                     }
+ *                     selected {
+ *                         fieldText: "brown"
+ *                         foregroundText: Qt.rgba(0, 0, 1, 1)
+ *                         overlayText: config.normal.overlayText
+ *                         foreground: UbuntuColors.green
+ *                     }
+ *                 }
+ *             }
+ *             TextField {
+ *                 placeholderText: "enter text"
+ *             }
+ *             Button {
+ *                 text: "Close"
+ *                 onClicked: PopupUtils.close(dialog)
+ *             }
+ *         }
+ *     }
+ *
+ *     Column {
+ *         spacing: units.gu(1)
+ *         Button {
+ *             text: "Set Ambiance theme"
+ *             onClicked: theme.name = "Ubuntu.Components.Themes.Ambiance"
+ *         }
+ *         Button {
+ *             text: "Set SuruDark theme"
+ *             onClicked: theme.name = "Ubuntu.Components.Themes.SuruDark"
+ *         }
+ *         Button {
+ *             text: "Open dialog"
+ *             onClicked: PopupUtils.open(dialogComponent)
+ *         }
+ *     }
+ * }
+ * \endqml
+ * \note Note the way the theme is changed! The first two buttons actually change the
+ * name of the theme they inherit, which is the application's theme. This means that
+ * the theme will actually be changed on the entire application, not only on the Button
+ * itself.
+ *
+ * The Dialog uses the \l {ThemeSettings::parentTheme}{parentTheme} property to load
+ * the same theme as its parent styled item is using, meaning that the Dialog will
+ * also load the same theme as the application does, and will change the loaded palette
+ * values with the ones defined in the \c config Palette instance, namely the \c
+ * foregroundText and \c overlayText of \c normal, as well as \c fieldText, \c foregroundText,
+ * \c overlayText and \c foreground on \c selected groups.
+ *
+ * \section1 That's it
+ * By now you should have learned what the styling means, what are the themes, what
+ * kind of themes toolkit has, how can you create shared or application themes, where should
+ * you store them, how to extend styles, how to use multiple themes in an application
+ * and how to set custom palette values runtime. If you have questions or need guidance,
+ * you can contact us on \b{#ubuntu-app-devel} IRC channel on freenode.
+ */

=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2015-03-03 13:47:48 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2015-04-17 15:45:47 +0000
@@ -11,7 +11,10 @@
 sourcedirs += ../modules/Ubuntu/Test
 headerdirs += ../modules/Ubuntu/Test/plugin
 exampledirs += snippets
-excludedirs = ../modules/Ubuntu/Components/Themes
+exampledirs += ../examples
+exampledirs += ../modules/Ubuntu/Components
+excludedirs += ../modules/Ubuntu/Components/Themes/Ambiance
+excludedirs += ../modules/Ubuntu/Components/Themes/SuruDark
 imagedirs = images
 sources.fileextensions = "*.qml *.qdoc *.cpp"
 headers.fileextensions = "*.h"

=== added file 'examples/customtheme/customtheme.pro'
--- examples/customtheme/customtheme.pro	1970-01-01 00:00:00 +0000
+++ examples/customtheme/customtheme.pro	2015-04-17 15:45:47 +0000
@@ -0,0 +1,18 @@
+TEMPLATE = aux
+
+filetypes = qml png svg js jpg qmlproject desktop
+
+OTHER_FILES = theme/parent_theme
+
+for(filetype, filetypes) {
+  OTHER_FILES += *.$$filetype
+  OTHER_FILES += theme/*.$$filetype
+}
+
+desktop_files.path = /usr/share/applications
+desktop_files.files = customtheme.desktop
+
+other_files.path = /usr/lib/ubuntu-ui-toolkit/examples/customtheme
+other_files.files = $$OTHER_FILES
+
+INSTALLS += other_files desktop_files

=== modified file 'examples/customtheme/main.qml'
--- examples/customtheme/main.qml	2015-03-03 13:47:48 +0000
+++ examples/customtheme/main.qml	2015-04-17 15:45:47 +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
@@ -13,32 +13,19 @@
  * 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.2
-
-/*!
-    \brief MainView with a Label and Button elements.
-*/
+//![0]
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 MainView {
     id: mainView
-    // objectName for functional testing purposes (autopilot-qt5)
     objectName: "mainView"
-
-    // Note! applicationName needs to match the "name" field of the click manifest
     applicationName: "customtheme"
 
-    /*
-     This property enables the application to change orientation
-     when the device is rotated. The default is false.
-    */
-    //automaticOrientation: true
-
     width: units.gu(100)
     height: units.gu(75)
 
-    Component.onCompleted: Theme.name = "theme"
+    theme.name: "theme"
 
     Page {
         title: i18n.tr("Theme sample")
@@ -51,31 +38,15 @@
             }
 
             Label {
-                text: i18n.tr("Theme.name:") + " " + Theme.name
-            }
-
-            Button {
-                width: parent.width
-                text: i18n.tr("Light background")
-
-                onClicked: {
-                    mainView.backgroundColor = "white";
-                }
-            }
-            Button {
-                width: parent.width
-                text: i18n.tr("Dark background")
-
-                onClicked: {
-                    mainView.backgroundColor = "blue";
-                }
-            }
+                text: i18n.tr("Theme.name:") + " " + theme.name
+            }
+
             Button {
                 width: parent.width
                 text: i18n.tr("Set Ambiance theme")
 
                 onClicked: {
-                    Theme.name = "Ubuntu.Components.Themes.Ambiance";
+                    theme.name = "Ubuntu.Components.Themes.Ambiance";
                 }
             }
             Button {
@@ -83,7 +54,7 @@
                 text: i18n.tr("Set SuruDark theme")
 
                 onClicked: {
-                    Theme.name = "Ubuntu.Components.Themes.SuruDark";
+                    theme.name = "Ubuntu.Components.Themes.SuruDark";
                 }
             }
             Button {
@@ -91,10 +62,10 @@
                 text: i18n.tr("Application theme")
 
                 onClicked: {
-                    Theme.name = "theme";
+                    theme.name = "theme";
                 }
             }
         }
     }
 }
-
+//![0]

=== modified file 'examples/customtheme/theme/Palette.qml'
--- examples/customtheme/theme/Palette.qml	2015-03-03 13:47:48 +0000
+++ examples/customtheme/theme/Palette.qml	2015-04-17 15:45:47 +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
@@ -14,11 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
-import Ubuntu.Components 1.2
+//![0]
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Themes.SuruDark 1.1 as Suru
 
 Suru.Palette {
     normal.background: "#A21E1C"
     selected.backgroundText: "lightblue"
 }
+//![0]

=== modified file 'examples/examples.pro'
--- examples/examples.pro	2013-09-12 06:14:08 +0000
+++ examples/examples.pro	2015-04-17 15:45:47 +0000
@@ -4,7 +4,8 @@
     ubuntu-ui-toolkit-gallery\
     locale \
     unit-converter \
-    calculator
+    calculator \
+    customtheme
 
 
 #examples = jokes unit-converter

=== modified file 'examples/locale/locale.qml'
--- examples/locale/locale.qml	2015-03-03 13:47:48 +0000
+++ examples/locale/locale.qml	2015-04-17 15:45:47 +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
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 /*!
@@ -89,7 +89,7 @@
                 highlight: Rectangle {
                     height: units.gu(2)
                     width: view.width
-                    color: Theme.palette.selected.background
+                    color: theme.palette.selected.background
                 }
             }
         }
@@ -100,7 +100,7 @@
                 leftMargin: units.gu(0.5)
                 bottom: parent.bottom
             }
-            color: Theme.palette.normal.base
+            color: theme.palette.normal.base
             width: parent.width
             Column {
                 anchors.fill: parent

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2015-03-11 17:10:20 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Template {
@@ -207,7 +207,7 @@
             confirmRemoval: (index % 2)
             backgroundIndicator: Rectangle {
                 anchors.fill: parent
-                color: Theme.palette.normal.base
+                color: theme.palette.normal.base
             }
         }
 

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Pickers.qml'
--- examples/ubuntu-ui-toolkit-gallery/Pickers.qml	2015-03-11 17:10:20 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Pickers.qml	2015-04-17 15:45:47 +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
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Pickers 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Pickers 1.0
 
 Template {
     objectName: "pickersTemplate"
@@ -158,7 +158,7 @@
                         width: height
                         height: units.gu(3)
                         radius: width / 2
-                        color: Theme.palette.normal.background
+                        color: theme.palette.normal.background
                         antialiasing: true
                         Label {
                             text: Math.round(selector.value)

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Styles.qml'
--- examples/ubuntu-ui-toolkit-gallery/Styles.qml	2015-03-03 13:47:48 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Styles.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.1
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "stylesTemplate"
@@ -43,6 +43,7 @@
     OptionSelector {
         model: [ 'Ambiance', 'SuruDark' ]
         expanded: true
-        onSelectedIndexChanged: Theme.name = 'Ubuntu.Components.Themes.%1'.arg(model[selectedIndex])
+        selectedIndex: (theme.name == 'Ubuntu.Components.Themes.SuruDark')
+        onSelectedIndexChanged: theme.name = 'Ubuntu.Components.Themes.%1'.arg(model[selectedIndex])
     }
 }

=== modified file 'examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml'
--- examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml	2015-03-03 16:21:20 +0000
+++ examples/ubuntu-ui-toolkit-gallery/UbuntuShape.qml	2015-04-17 15:45:47 +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
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
-import Ubuntu.Components 1.2
+import QtQuick 2.4
+import Ubuntu.Components 1.3
 
 Template {
     objectName: "ubuntuShapesTemplate"
@@ -71,27 +71,27 @@
             UbuntuShape {
                 objectName: "ubuntushape_radius_small"
 
-                backgroundColor: Theme.palette.normal.foreground
+                backgroundColor: theme.palette.normal.foreground
                 radius: "small"
 
                 Label {
                     anchors.centerIn: parent
                     text: "small"
                     fontSize: "x-small"
-                    color: Theme.palette.normal.foregroundText
+                    color: theme.palette.normal.foregroundText
                 }
             }
 
             UbuntuShape {
                 objectName: "ubuntushape_radius_medium"
-                backgroundColor: Theme.palette.normal.foreground
+                backgroundColor: theme.palette.normal.foreground
                 radius: "medium"
 
                 Label {
                     anchors.centerIn: parent
                     text: "medium"
                     fontSize: "x-small"
-                    color: Theme.palette.normal.foregroundText
+                    color: theme.palette.normal.foregroundText
                 }
             }
         }
@@ -103,7 +103,7 @@
 
             UbuntuShape {
                 objectName: "ubuntushape_sizes_15_6"
-                backgroundColor: Theme.palette.normal.foreground
+                backgroundColor: theme.palette.normal.foreground
                 width: units.gu(15)
                 height: units.gu(6)
                 anchors.verticalCenter: parent.verticalCenter
@@ -111,7 +111,7 @@
 
             UbuntuShape {
                 objectName: "ubuntushape_sizes_10_14"
-                backgroundColor: Theme.palette.normal.foreground
+                backgroundColor: theme.palette.normal.foreground
                 width: units.gu(10)
                 height: units.gu(14)
             }

=== 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-17 15:45:47 +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/10/Button.qml'
--- modules/Ubuntu/Components/10/Button.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/10/Button.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
    \internal
@@ -32,5 +32,5 @@
 
     property string iconPosition: "left"
 
-    style: Theme.createStyleComponent("ButtonStyle.qml", button)
+    style: theme.createStyleComponent("ButtonStyle.qml", button)
 }

=== modified file 'modules/Ubuntu/Components/11/Button.qml'
--- modules/Ubuntu/Components/11/Button.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/11/Button.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Button
@@ -121,5 +121,5 @@
     */
     property string iconPosition: "left"
 
-    style: Theme.createStyleComponent("ButtonStyle.qml", button)
+    style: theme.createStyleComponent("ButtonStyle.qml", button)
 }

=== modified file 'modules/Ubuntu/Components/ActivityIndicator.qml'
--- modules/Ubuntu/Components/ActivityIndicator.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ActivityIndicator.qml	2015-04-17 15:45:47 +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
@@ -55,5 +55,5 @@
     implicitWidth: units.gu(3)
     implicitHeight: units.gu(3)
 
-    style: Theme.createStyleComponent("ActivityIndicatorStyle.qml", indicator)
+    style: theme.createStyleComponent("ActivityIndicatorStyle.qml", indicator)
 }

=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
--- modules/Ubuntu/Components/AnimatedItem.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/AnimatedItem.qml	2015-04-17 15:45:47 +0000
@@ -25,8 +25,9 @@
 */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3 as Toolkit
 
-StyledItem {
+Toolkit.StyledItem {
     id: root
     /*!
       \deprecated

=== 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-17 15:45:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Components
+import Ubuntu.Components 1.3 as Components
 
 /*!
     \internal
@@ -23,7 +23,7 @@
     \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
 */
-StyledItem {
+Components.StyledItem {
     id: header
 
     anchors {
@@ -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,18 +323,25 @@
          */
         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;
                 }
             }
         }
     }
 
-    style: header.useDeprecatedToolbar ? Theme.createStyleComponent("HeaderStyle.qml", header) :
-                                         Theme.createStyleComponent("PageHeadStyle.qml", header)
+    style: header.useDeprecatedToolbar ? theme.createStyleComponent("HeaderStyle.qml", header) :
+                                         theme.createStyleComponent("PageHeadStyle.qml", header)
 }

=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
--- modules/Ubuntu/Components/CheckBox.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/CheckBox.qml	2015-04-17 15:45:47 +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
@@ -49,5 +49,5 @@
      */
     onTriggered: checked = !checked
 
-    style: Theme.createStyleComponent("CheckBoxStyle.qml", checkBox)
+    style: theme.createStyleComponent("CheckBoxStyle.qml", checkBox)
 }

=== modified file 'modules/Ubuntu/Components/ComboButton.qml'
--- modules/Ubuntu/Components/ComboButton.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ComboButton.qml	2015-04-17 15:45:47 +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
@@ -248,7 +248,7 @@
     property color dropdownColor: __styleInstance ? __styleInstance.defaultDropdownColor : color
 
 
-    style: Theme.createStyleComponent("ComboButtonStyle.qml", combo)
+    style: theme.createStyleComponent("ComboButtonStyle.qml", combo)
 
     Component.onCompleted: {
         // update mouse area to report clicks only on the main button area

=== modified file 'modules/Ubuntu/Components/Label.qml'
--- modules/Ubuntu/Components/Label.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Label.qml	2015-04-17 15:45:47 +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
@@ -55,5 +55,5 @@
     property string fontSize: "medium"
 
     font.pixelSize: FontUtils.sizeToPixels(fontSize)
-    color: Theme.palette.selected.backgroundText
+    color: theme.palette.selected.backgroundText
 }

=== modified file 'modules/Ubuntu/Components/ListItems/Caption.qml'
--- modules/Ubuntu/Components/ListItems/Caption.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/Caption.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Caption
@@ -52,7 +52,7 @@
         anchors.centerIn: parent
         width: parent.width - units.gu(1)
         wrapMode: Text.Wrap
-        color: Theme.palette.normal.backgroundText
+        color: theme.palette.normal.backgroundText
         horizontalAlignment: Text.AlignLeft
         fontSize: "small"
     }

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2015-04-17 15:45:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, 2013, 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Empty
@@ -291,7 +291,7 @@
             top: parent.top
         }
         height: emptyListItem.height - bottomDividerLine.height
-        color: Theme.palette.selected.background
+        color: theme.palette.selected.background
     }
 
     ThinDivider {

=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
--- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2015-04-17 15:45:47 +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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import "." as ListItem
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype ItemSelector
@@ -207,7 +207,7 @@
 
             readonly property url chevron: __styleInstance.chevron
             readonly property url tick: __styleInstance.tick
-            readonly property color themeColour: Theme.palette.selected.fieldText
+            readonly property color themeColour: theme.palette.selected.fieldText
             readonly property alias colourImage: itemSelector.colourImage
             property bool currentlyExpanded: expanded || multiSelection
 
@@ -216,7 +216,7 @@
                 right: parent.right
             }
             state: itemSelector.expanded ? "expanded" : "collapsed"
-            style: Theme.createStyleComponent("ListItemOptionSelectorStyle.qml", listContainer)
+            style: theme.createStyleComponent("ListItemOptionSelectorStyle.qml", listContainer)
 
             states: [ State {
                     name: "expanded"

=== modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml'
--- modules/Ubuntu/Components/ListItems/LabelVisual.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/LabelVisual.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 // internal helper class for text inside the list items.
 Label {
@@ -32,7 +32,7 @@
 
     fontSize: "medium"
     elide: Text.ElideRight
-    color: selected ? UbuntuColors.orange : secondary ? overlay ? Theme.palette.normal.overlayText : Theme.palette.normal.backgroundText
-                                                      : overlay ? Theme.palette.selected.overlayText : Theme.palette.selected.backgroundText
+    color: selected ? UbuntuColors.orange : secondary ? overlay ? theme.palette.normal.overlayText : theme.palette.normal.backgroundText
+                                                      : overlay ? theme.palette.selected.overlayText : theme.palette.selected.backgroundText
     opacity: label.enabled ? 1.0 : 0.5
 }

=== modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml'
--- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 // Internal helper class for the visuals of
 // the progression symbol.
@@ -25,5 +25,5 @@
     property bool showSplit: false
     property real splitMargin
 
-    style: Theme.createStyleComponent("ProgressionVisualStyle.qml", progressionVisual)
+    style: theme.createStyleComponent("ProgressionVisualStyle.qml", progressionVisual)
 }

=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
--- modules/Ubuntu/Components/ListItems/Standard.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Standard
@@ -172,7 +172,7 @@
             bottom: parent.bottom
             left: parent.left
         }
-        color: Theme.palette.selected.background
+        color: theme.palette.selected.background
     }
 
     Rectangle {
@@ -185,7 +185,7 @@
             bottom: parent.bottom
             right: parent.right
         }
-        color: Theme.palette.selected.background
+        color: theme.palette.selected.background
     }
 
     IconVisual {

=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
--- modules/Ubuntu/Components/ListItems/ThinDivider.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype ThinDivider
@@ -53,7 +53,7 @@
     // a private property to catch theme background color change
     // use private property instead of embedding it into a QtObject to avoid further
     // performance decrease
-    property bool __lightBackground: ColorUtils.luminance(Theme.palette.normal.background) > 0.85
+    property bool __lightBackground: ColorUtils.luminance(theme.palette.normal.background) > 0.85
     // use a gradient of 4 steps instead of instantiating two Rectangles for performance reasons
     gradient: Gradient {
         GradientStop { position: 0.0; color: __lightBackground ? Qt.rgba(0, 0, 0, 0.1) : Qt.rgba(0, 0, 0, 0.4) }

=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.****
@@ -262,7 +262,7 @@
 
             model: selector.values
             Rectangle {
-                color: Qt.lighter(Theme.palette.normal.base)
+                color: Qt.lighter(theme.palette.normal.base)
                 height: valueRepeater.valueHeight
                 width: parent.width
 

=== 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-17 15:45:47 +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-17 15:45:47 +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/MainViewBase.qml'
--- modules/Ubuntu/Components/MainViewBase.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/MainViewBase.qml	2015-04-17 15:45:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2015 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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.0
 
@@ -32,13 +32,13 @@
     // FIXME: Make sure that the theming is only in the background, and the style
     //  should not occlude contents of the MainView. When making changes here, make
     //  sure that bug https://bugs.launchpad.net/manhattan/+bug/1124076 does not come back.
-    StyledItem {
+    Toolkit.StyledItem {
         id: background
         anchors.fill: parent
-        style: Theme.createStyleComponent("MainViewStyle.qml", background)
+        style: theme.createStyleComponent("MainViewStyle.qml", background)
 
         property color headerColor: backgroundColor
-        property color backgroundColor: Theme.palette.normal.background
+        property color backgroundColor: theme.palette.normal.background
         property color footerColor: backgroundColor
 
         /*
@@ -48,12 +48,19 @@
 
           Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
          */
-        property string theme: (ColorUtils.luminance(backgroundColor) >= 0.85) ?
-                                   "Ambiance" : "SuruDark"
-        onThemeChanged: {
+
+        onBackgroundColorChanged: {
+            if (backgroundColor != theme.palette.normal.background) {
+                // custom color, proceed with auto-theming
+                autoThemeName = (ColorUtils.luminance(backgroundColor) >= 0.85) ?
+                                                   "Ambiance" : "SuruDark";
+            }
+        }
+        property string autoThemeName
+        onAutoThemeNameChanged: {
             // only change the theme if the current one is a system one.
-            if (theme !== "" && (Theme.name.search("Ubuntu.Components.Themes") >= 0)) {
-                Theme.name = "Ubuntu.Components.Themes.%1".arg(theme);
+            if (autoThemeName !== "" && (theme.name.search("Ubuntu.Components.Themes") == 0)) {
+                mainView.theme.name = "Ubuntu.Components.Themes.%1".arg(autoThemeName);
             }
         }
     }

=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
--- modules/Ubuntu/Components/OptionSelector.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/OptionSelector.qml	2015-04-17 15:45:47 +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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import "ListItems" as ListItem
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 
 /*!
     \qmltype OptionSelector
@@ -209,14 +209,14 @@
             visible: optionSelector.text !== "" ? true : false
         }
 
-        StyledItem {
+        Toolkit.StyledItem {
             id: listContainer
             objectName: "listContainer"
             activeFocusOnPress: true
 
             readonly property url chevron: __styleInstance.chevron
             readonly property url tick: __styleInstance.tick
-            readonly property color themeColour: Theme.palette.selected.fieldText
+            readonly property color themeColour: theme.palette.selected.fieldText
             readonly property alias colourImage: optionSelector.colourImage
             property bool currentlyExpanded: expanded || multiSelection
 
@@ -225,7 +225,7 @@
                 right: parent.right
             }
             state: optionSelector.expanded ? "expanded" : "collapsed"
-            style: Theme.createStyleComponent("OptionSelectorStyle.qml", listContainer)
+            style: theme.createStyleComponent("OptionSelectorStyle.qml", listContainer)
             states: [ State {
                     name: "expanded"
                     when: listContainer.currentlyExpanded

=== 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-17 15:45:47 +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-17 15:45:47 +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-17 15:45:47 +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-17 15:45:47 +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-17 15:45:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 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,92 +15,24 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
-    \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
+    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-17 15:45:47 +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/PageTreeNode.qml'
--- modules/Ubuntu/Components/PageTreeNode.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/PageTreeNode.qml	2015-04-17 15:45:47 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3 as Toolkit
 
 /*!
     \internal
@@ -26,7 +27,7 @@
     It is used to propagate properties such as \l header and \l toolbar from a
     \l MainView (the root node) to each \l Page (leaf node) in the tree.
 */
-StyledItem {
+Toolkit.StyledItem {
     id: node
 
     /*!

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Panel.qml	2015-04-17 15:45:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd.
+ * 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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Toolkit
+import Ubuntu.Components 1.3 as Toolkit
 
 /*!
     \qmltype Panel
@@ -55,7 +55,7 @@
 
                 Rectangle {
                     anchors.fill: parent
-                    color: Theme.palette.normal.overlay
+                    color: theme.palette.normal.overlay
 
                     Button {
                         anchors.centerIn: parent
@@ -109,7 +109,7 @@
         import Ubuntu.Components 1.2
 
         Rectangle {
-            color: Theme.palette.normal.background
+            color: theme.palette.normal.background
             width: units.gu(40)
             height: units.gu(40)
 
@@ -123,7 +123,7 @@
                 height: units.gu(8)
 
                 Rectangle {
-                    color: Theme.palette.normal.overlay
+                    color: theme.palette.normal.overlay
                     anchors.fill: parent
                     Rectangle {
                         width: units.gu(8)

=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype DatePicker
@@ -420,7 +420,7 @@
         }
     }
 
-    style: Theme.createStyleComponent("DatePickerStyle.qml", datePicker)
+    style: theme.createStyleComponent("DatePickerStyle.qml", datePicker)
     Binding {
         target: __styleInstance
         property: "view"

=== modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml'
--- modules/Ubuntu/Components/Pickers/Dialer.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/Dialer.qml	2015-04-17 15:45:47 +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
@@ -15,13 +15,14 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Dialer
     \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief Dialer is a phone dialer style picker component.
+    \deprecated
 
     The Dialer component is dedicated for value selection where the value is
     compound of several sections, i.e. hour, minute and second, or integral and
@@ -144,7 +145,7 @@
     implicitHeight: size
     activeFocusOnPress: true
 
-    style: Theme.createStyleComponent("DialerStyle.qml", dialer)
+    style: theme.createStyleComponent("DialerStyle.qml", dialer)
 
     Item {
         id: internal

=== modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml'
--- modules/Ubuntu/Components/Pickers/DialerHand.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHand.qml	2015-04-17 15:45:47 +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
@@ -15,13 +15,14 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype DialerHand
     \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief DialerHand represents a value selector on a Dialer.
+    \deprecated
 
     DialerHand components have meaning only if those are placed inside Dialer
     components. The dialer hand presents a value selection from the given dialer's
@@ -65,7 +66,7 @@
                 width: height
                 height: units.gu(3)
                 radius: width / 2
-                color: Theme.palette.normal.background
+                color: theme.palette.normal.background
                 antialiasing: true
                 Label {
                     text: Math.round(selector.value)
@@ -142,7 +143,7 @@
     width: parent.width
     height: parent.height
     activeFocusOnPress: true
-    style: Theme.createStyleComponent("DialerHandStyle.qml", dialerHand)
+    style: theme.createStyleComponent("DialerHandStyle.qml", dialerHand)
 
     /*! \internal */
     onParentChanged: {

=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
--- modules/Ubuntu/Components/Pickers/Picker.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/Picker.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Picker
@@ -159,7 +159,7 @@
     implicitHeight: units.gu(20)
     activeFocusOnPress: true
 
-    style: Theme.createStyleComponent("PickerStyle.qml", picker)
+    style: theme.createStyleComponent("PickerStyle.qml", picker)
 
     /*! \internal */
     property int __clickedIndex: -1

=== modified file 'modules/Ubuntu/Components/Pickers/PickerDelegate.qml'
--- modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype PickerDelegate
@@ -47,7 +47,7 @@
         internal.itemList.currentIndex = index;
     }
 
-    style: Theme.createStyleComponent("PickerDelegateStyle.qml", pickerDelegate)
+    style: theme.createStyleComponent("PickerDelegateStyle.qml", pickerDelegate)
 
     QtObject {
         id: internal

=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2015-04-17 15:45:47 +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
@@ -17,7 +17,7 @@
 pragma Singleton
 import QtQuick 2.4
 import QtQuick.Window 2.0
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0
 import Ubuntu.Components.Popups 1.0
 
@@ -200,7 +200,7 @@
 
             id: panel
             // no additional styling is needed
-            color: Theme.palette.normal.overlay
+            color: theme.palette.normal.overlay
             width: parent.width
             height: Qt.inputMethod.keyboardRectangle.height > 0 ? Qt.inputMethod.keyboardRectangle.height : units.gu(26)
             y: parent.height

=== modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml'
--- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0
 
 /*!
@@ -116,7 +116,7 @@
                 horizontalCenter: parent.horizontalCenter
             }
             wrapMode: Text.Wrap
-            color: Theme.palette.normal.overlayText
+            color: theme.palette.normal.overlayText
         }
         /*! \internal */
         onTriggered: popover.hide()

=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import "internalPopupUtils.js" as InternalPopupUtils
 
 /*!
@@ -213,6 +213,6 @@
             }
         }
 
-        style: Theme.createStyleComponent("DialogForegroundStyle.qml", foreground)
+        style: theme.createStyleComponent("DialogForegroundStyle.qml", foreground)
     }
 }

=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2015-04-17 15:45:47 +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
@@ -16,7 +16,7 @@
 
 import QtQuick 2.4
 import "internalPopupUtils.js" as InternalPopupUtils
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype Popover
@@ -37,7 +37,7 @@
         import Ubuntu.Components.Popups 1.0
 
         Rectangle {
-            color: Theme.palette.normal.background
+            color: theme.palette.normal.background
             width: units.gu(80)
             height: units.gu(80)
             Component {
@@ -237,7 +237,7 @@
         signal showCompleted()
         signal hideCompleted()
 
-        style: Theme.createStyleComponent("PopoverForegroundStyle.qml", foreground)
+        style: theme.createStyleComponent("PopoverForegroundStyle.qml", foreground)
     }
 
     QtObject {

=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
--- modules/Ubuntu/Components/Popups/SheetBase.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Popups/SheetBase.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype SheetBase
@@ -23,6 +23,7 @@
     \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief Parent class of different types of sheets. Not to be used directly.
+    \deprecated
 
     Examples: See subclasses.
     \b{Sheets are deprecated. Consider using \l Dialog, \l Popover or \l PageStack instead.}
@@ -108,6 +109,6 @@
             }
         }
 
-        style: Theme.createStyleComponent("SheetForegroundStyle.qml", sheet)
+        style: theme.createStyleComponent("SheetForegroundStyle.qml", sheet)
     }
 }

=== modified file 'modules/Ubuntu/Components/ProgressBar10.qml'
--- modules/Ubuntu/Components/ProgressBar10.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ProgressBar10.qml	2015-04-17 15:45:47 +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
@@ -64,5 +64,5 @@
     */
     property real value: 0.5
 
-    style: Theme.createStyleComponent("ProgressBarStyle.qml", progressBar)
+    style: theme.createStyleComponent("ProgressBarStyle.qml", progressBar)
 }

=== modified file 'modules/Ubuntu/Components/PullToRefresh.qml'
--- modules/Ubuntu/Components/PullToRefresh.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/PullToRefresh.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*!
     \qmltype PullToRefresh
@@ -222,7 +222,7 @@
       */
     signal refresh()
 
-    style: Theme.createStyleComponent("PullToRefreshStyle.qml", control)
+    style: theme.createStyleComponent("PullToRefreshStyle.qml", control)
     implicitHeight: __styleInstance.implicitHeight
     anchors {
         left: target.left

=== modified file 'modules/Ubuntu/Components/Scrollbar.qml'
--- modules/Ubuntu/Components/Scrollbar.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Scrollbar.qml	2015-04-17 15:45:47 +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 ScrollBar
@@ -58,7 +59,7 @@
     \endqml
   */
 
-StyledItem {
+Toolkit.StyledItem {
     id: scrollbar
 
     /*!
@@ -145,5 +146,5 @@
         }
     }
 
-    style: Theme.createStyleComponent("ScrollbarStyle.qml", scrollbar)
+    style: theme.createStyleComponent("ScrollbarStyle.qml", scrollbar)
 }

=== modified file 'modules/Ubuntu/Components/Slider.qml'
--- modules/Ubuntu/Components/Slider.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/Slider.qml	2015-04-17 15:45:47 +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
@@ -18,6 +18,7 @@
 
 import QtQuick 2.4
 import "mathUtils.js" as MathUtils
+import Ubuntu.Components 1.3 as Toolkit
 
 /*!
     \qmltype Slider
@@ -45,7 +46,7 @@
     }
     \endqml
 */
-StyledItem {
+Toolkit.StyledItem {
     id: slider
 
     /*!
@@ -206,5 +207,5 @@
         onLiveValueChanged: if (isPressed) slider.requestFocus(Qt.MouseFocusReason)
     }
 
-    style: Theme.createStyleComponent("SliderStyle.qml", slider)
+    style: theme.createStyleComponent("SliderStyle.qml", slider)
 }

=== removed file 'modules/Ubuntu/Components/StyledItem.qml'
--- modules/Ubuntu/Components/StyledItem.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/StyledItem.qml	1970-01-01 00:00:00 +0000
@@ -1,71 +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.4
-import Ubuntu.Components 1.2
-
-/*!
-    \qmlabstract StyledItem
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup theming
-    \brief The StyledItem class allows items to be styled by the theme.
-
-    StyledItem provides facilities for making an Item stylable by the theme.
-
-    In order to make an Item stylable by the theme, it is enough to make the Item
-    inherit from StyledItem and set its \l style property to be the result of the
-    appropriate call to Theme.createStyleComponent().
-
-    Example definition of a custom Item MyItem.qml:
-    \qml
-        StyledItem {
-            id: myItem
-            style: Theme.createStyleComponent("MyItemStyle.qml", myItem)
-        }
-    \endqml
-
-    The Component set on \l style is instantiated and placed below everything else
-    that the Item contains.
-
-    A reference to the Item being styled is accessible from the style and named
-    'styledItem'.
-
-    \sa {Theme}
-*/
-StyledItemBase {
-    id: styledItem
-
-    /*!
-       Component instantiated immediately and placed below everything else.
-    */
-    property Component style
-
-    /*!
-       \internal
-       Instance of the \l style.
-    */
-    readonly property Item __styleInstance: styleLoader.status == Loader.Ready ? styleLoader.item : null
-
-    implicitWidth: __styleInstance ? __styleInstance.implicitWidth : 0
-    implicitHeight: __styleInstance ? __styleInstance.implicitHeight : 0
-
-    Loader {
-        id: styleLoader
-        anchors.fill: parent
-        sourceComponent: style
-        property Item styledItem: 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-17 15:45:47 +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/Styles/PullToRefreshStyle.qml'
--- modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml	2015-03-03 12:53:42 +0000
+++ modules/Ubuntu/Components/Styles/PullToRefreshStyle.qml	2015-04-17 15:45:47 +0000
@@ -24,7 +24,7 @@
 
     The component defines the style API for the PullToRefresh component.
   */
-
+//![0]
 Item {
     /*!
       The property holds the style provided default content component. The value
@@ -46,3 +46,4 @@
       */
     property bool releaseToRefresh: false
 }
+//![0]

=== modified file 'modules/Ubuntu/Components/Switch.qml'
--- modules/Ubuntu/Components/Switch.qml	2015-03-05 09:35:06 +0000
+++ modules/Ubuntu/Components/Switch.qml	2015-04-17 15:45:47 +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
@@ -40,5 +40,5 @@
 */
 CheckBox {
     id: switchItem
-    style: Theme.createStyleComponent("SwitchStyle.qml", switchItem)
+    style: theme.createStyleComponent("SwitchStyle.qml", switchItem)
 }

=== 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-17 15:45:47 +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/TabBar.qml'
--- modules/Ubuntu/Components/TabBar.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/TabBar.qml	2015-04-17 15:45:47 +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
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3 as Toolkit
 
 /*!
     \qmltype TabBar
@@ -24,7 +25,7 @@
         This component does not need to be instantiated by the developer, it is
         automatically created by the \l Tabs.
 */
-StyledItem {
+Toolkit.StyledItem {
     id: tabBar
 
     /*!
@@ -97,7 +98,7 @@
     implicitHeight: units.gu(7.5)
     activeFocusOnPress: true
 
-    style: Theme.createStyleComponent("TabBarStyle.qml", tabBar)
+    style: theme.createStyleComponent("TabBarStyle.qml", tabBar)
 
     QtObject {
         id: internal

=== 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-17 15:45:47 +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/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2015-03-10 11:49:27 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Ubuntu
+import Ubuntu.Components 1.3 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 import "mathUtils.js" as MathUtils
 
@@ -92,7 +92,7 @@
     \note During text selection all interactive parent Flickables are turned off.
   */
 
-StyledItem {
+Ubuntu.StyledItem {
     id: control
     implicitWidth: units.gu(30)
     implicitHeight: (autoSize) ? internal.minimumSize : internal.linesHeight(4)
@@ -104,7 +104,7 @@
       text input. This property allows to control the highlight separately from
       the focused behavior.
       */
-    property bool highlighted: focus
+    property bool highlighted: activeFocus
     /*!
       Text that appears when there is no focus and no content in the component
       (hint text).
@@ -803,7 +803,7 @@
         }
         // hint is shown till user types something in the field
         visible: (editor.text == "") && !editor.inputMethodComposing
-        color: Theme.palette.normal.backgroundText
+        color: theme.palette.normal.backgroundText
         font: editor.font
         elide: Text.ElideRight
         wrapMode: Text.WordWrap
@@ -873,5 +873,5 @@
         }
     }
 
-    style: Theme.createStyleComponent("TextAreaStyle.qml", control)
+    style: theme.createStyleComponent("TextAreaStyle.qml", control)
 }

=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2015-03-18 15:51:07 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Ubuntu
+import Ubuntu.Components 1.3 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 
 Ubuntu.StyledItem {
@@ -41,7 +41,7 @@
                                            handler.main.cursorDelegate :
                                            __styleInstance.cursorDelegate
 
-    style: Theme.createStyleComponent("TextCursorStyle.qml", cursorItem);
+    style: theme.createStyleComponent("TextCursorStyle.qml", cursorItem);
 
     objectName: "textCursor"
     //Caret instance from the style.

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2015-03-10 11:49:27 +0000
+++ modules/Ubuntu/Components/TextField.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2 as Ubuntu
+import Ubuntu.Components 1.3 as Ubuntu
 import Ubuntu.Components.Popups 1.0
 
 /*!
@@ -110,7 +110,7 @@
       text input. This property allows to control the highlight separately from
       the focused behavior.
       */
-    property bool highlighted: focus
+    property bool highlighted: activeFocus
 
     /*!
       Text that appears when there is no content in the component.
@@ -949,7 +949,7 @@
         }
         // hint is shown till user types something in the field
         visible: (editor.text == "") && !editor.inputMethodComposing
-        color: Theme.palette.normal.backgroundText
+        color: theme.palette.normal.backgroundText
         font: editor.font
         elide: Text.ElideRight
     }
@@ -1019,5 +1019,5 @@
         cursorPosition = 0;
     }
 
-    style: Theme.createStyleComponent("TextFieldStyle.qml", control)
+    style: theme.createStyleComponent("TextFieldStyle.qml", control)
 }

=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2015-03-10 11:49:27 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 
 Popover {
@@ -96,7 +96,7 @@
                 width: Math.max(units.gu(5), implicitWidth) + units.gu(2)
                 height: units.gu(6)
                 action: actions[modelData]
-                style: Theme.createStyleComponent("ToolbarButtonStyle.qml", button)
+                style: theme.createStyleComponent("ToolbarButtonStyle.qml", button)
             }
         }
     }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2015-04-17 15:45:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: bubbleShape
@@ -28,7 +28,7 @@
     /*!
       The background color of the bubble.
      */
-    property color color: square ? Theme.palette.normal.background : Theme.palette.normal.overlay
+    property color color: square ? theme.palette.normal.background : theme.palette.normal.overlay
 
     property point target
     property string direction: "down"
@@ -111,7 +111,7 @@
     UbuntuShape {
         anchors.fill: parent
         borderSource: "none"
-        color: Theme.palette.normal.overlay
+        color: theme.palette.normal.overlay
         image: bubbleShape.clipContent ? shapeSource : null
         visible: !square
     }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2015-04-17 15:45:47 +0000
@@ -103,7 +103,7 @@
         visible: stroke && strokeBorder.status == Image.Ready
 
         property Item source: visible ? strokeBorder : null
-        property color keyColorOut: stroke ? strokeColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)
+        property color keyColorOut: stroke ? button.strokeColor : Qt.rgba(0.0, 0.0, 0.0, 0.0)
         property color keyColorIn: Qt.rgba(1.0, 1.0, 1.0, 1.0)
         property real threshold: 1.0
 
@@ -135,8 +135,8 @@
     UbuntuShape {
         id: backgroundPressed
         anchors.fill: parent
-        color: stroke ? strokeColor : background.color
-        gradientColor: stroke ? strokeColor : background.gradientColor
+        color: stroke ? button.strokeColor : background.color
+        gradientColor: stroke ? button.strokeColor : background.gradientColor
         borderSource: "radius_pressed.sci"
         opacity: button.pressed ? 1.0 : 0.0
         Behavior on opacity {
@@ -159,7 +159,7 @@
         /* Pick either a clear or dark text color depending on the luminance of the
            background color to maintain good contrast (works in most cases)
         */
-        textColor: ColorUtils.luminance(button.color) <= 0.85 && !(stroke && !pressed) ? "#FFFFFF" : "#888888"
+        textColor: ColorUtils.luminance(button.color) <= 0.85 && !(stroke && !button.pressed) ? "#FFFFFF" : "#888888"
         iconSource: button.iconSource
         iconPosition: button.iconPosition
         iconSize: units.gu(3)

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2015-03-05 19:34:59 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: checkBoxStyle
@@ -28,9 +28,9 @@
     /*!
       The background color when the checkbox is not checked.
      */
-    property color uncheckedBackgroundColor: Qt.rgba(Theme.palette.normal.foreground.r,
-                                                     Theme.palette.normal.foreground.g,
-                                                     Theme.palette.normal.foreground.b, 0.2)
+    property color uncheckedBackgroundColor: Qt.rgba(theme.palette.normal.foreground.r,
+                                                     theme.palette.normal.foreground.g,
+                                                     theme.palette.normal.foreground.b, 0.2)
 
     /*!
       The background color when the checkbox is checked.
@@ -45,7 +45,7 @@
     /*!
       The color of the icon.
      */
-    property color iconColor: Theme.palette.normal.foregroundText
+    property color iconColor: theme.palette.normal.foregroundText
 
     /*!
       The padding between the icon and the border of the thumb.

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialerHandStyle.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     // style API
@@ -52,7 +52,7 @@
         width: styledItem.hand.width
         height: styledItem.hand.height
         radius: units.gu(1)
-        color: styledItem.hand.visible ? Theme.palette.normal.baseText : "#00000000"
+        color: styledItem.hand.visible ? theme.palette.normal.baseText : "#00000000"
         antialiasing: true
     }
 

=== 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-17 15:45:47 +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/HeaderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2015-04-17 15:45:47 +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
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: headerStyle
@@ -38,7 +38,7 @@
 
     property int fontWeight: Font.Light
     property string fontSize: "x-large"
-    property color textColor: Theme.palette.selected.backgroundText
+    property color textColor: theme.palette.selected.backgroundText
     property real textLeftMargin: units.gu(2)
 
     implicitHeight: headerStyle.contentHeight + separator.height + separatorBottom.height

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-03-03 12:53:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemStyle.qml	2015-04-17 15:45:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2015 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,20 +15,17 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components.Styles 1.2 as Styles
-import Ubuntu.Components 1.2
+import Ubuntu.Components.Styles 1.3 as Styles
+import Ubuntu.Components 1.3
 
 Styles.ListItemStyle {
 
     id: listItemStyle
-    /*
-     * Take over the ListItem's index context property as repeater used in panel
-     * overrides the property.
-     */
-    readonly property int listItemIndex: index
 
     // anchoring
     anchors {
+        // do not anchor fill
+        fill: undefined
         top: parent ? parent.top : undefined
         bottom: parent ? parent.bottom : undefined
         bottomMargin: styledItem.divider.visible ? styledItem.divider.height : 0
@@ -85,7 +82,7 @@
 
                         Rectangle {
                             anchors.fill: parent
-                            color: Theme.palette.selected.background
+                            color: theme.palette.selected.background
                             visible: pressed
                         }
 
@@ -94,7 +91,7 @@
                             height: parent.height
                             sourceComponent: itemActions.delegate ? itemActions.delegate : defaultDelegate
                             property Action action: modelData
-                            property int index: index
+                            property int index: listItemIndex
                             property bool pressed: actionButton.pressed
                             onItemChanged: {
                                 // use action's objectName to identify the visualized action
@@ -168,7 +165,7 @@
         id: dragDelegate
         Item {
             id: dragPanel
-            objectName: "drag_panel" + index
+            objectName: "drag_panel" + listItemIndex
             anchors.fill: parent ? parent : undefined
             Icon {
                 objectName: "icon"

=== 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-17 15:45:47 +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-17 15:45:47 +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
@@ -15,12 +15,12 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 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
@@ -31,7 +31,7 @@
     Rectangle {
         visible: button.pressed
         anchors.fill: parent
-        color: Theme.palette.selected.background
+        color: theme.palette.selected.background
     }
 
     Icon {

=== 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-17 15:45:47 +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
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.0
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import Ubuntu.Components.Styles 1.2 as Style
@@ -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
 
@@ -38,25 +38,31 @@
      */
     property color titleColor: styledItem.config.foregroundColor
 
+    // FIXME: When the three panel color properties below are removed,
+    //  update unity8/Dash/PageHeader to use the new theming (currently
+    //  in progress) to set these colors.
     /*!
+      \deprecated
       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
+       \deprecated
+       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
+       \deprecated
+       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
+    property color sectionColor: theme.palette.selected.backgroundText
 
     /*!
       The text color of the selected section.
@@ -66,9 +72,14 @@
     /*!
       The background color of the pressed section.
      */
-    property color sectionHighlightColor: Theme.palette.selected.background
-
-    implicitHeight: headerStyle.contentHeight + divider.height
+    property color sectionHighlightColor: theme.palette.selected.background
+
+    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 +94,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 +152,6 @@
                             verticalCenter: parent.verticalCenter
                             left: parent.left
                             right: parent.right
-                            rightMargin: verticalDividerLine.width
                         }
                         height: sectionsRow.height
                         color: headerStyle.sectionHighlightColor
@@ -144,25 +161,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 +357,11 @@
                     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
+                        backgroundColor: headerStyle.panelBackgroundColor
+                        foregroundColor: headerStyle.panelForegroundColor
+                        highlightColor: headerStyle.panelHighlightColor
                     }
                 }
             }
@@ -527,16 +487,10 @@
                     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
-                        }
+                        backgroundColor: headerStyle.panelBackgroundColor
+                        foregroundColor: headerStyle.panelForegroundColor
+                        highlightColor: headerStyle.panelHighlightColor
 
                         // Ensure the popover closes when actions change and
                         // the list item below may be destroyed before its
@@ -555,71 +509,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)
                     }
                 }
             }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/Palette.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/Palette.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/Palette.qml	2015-04-17 15:45:47 +0000
@@ -19,7 +19,7 @@
 import Ubuntu.Components.Themes 0.1
 
 Palette {
-    normal: PaletteValues {
+    normal {
         background: "#EDEDED"
         backgroundText: "#81888888"
         base: Qt.rgba(0, 0, 0, 0.1)
@@ -28,13 +28,13 @@
         foregroundText: "#FFFFFF"
         overlay: "#FDFDFD"
         overlayText: UbuntuColors.lightGrey
-        field: "#FAFAFA"
+        field: "lightgray"
         fieldText: UbuntuColors.darkGrey
     }
-    selected: PaletteValues {
+    selected {
         background: Qt.rgba(0, 0, 0, 0.05)
         backgroundText: UbuntuColors.darkGrey
-        selection: foreground // unused
+        selection: selected.foreground // unused
         foreground: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
         foregroundText: UbuntuColors.darkGrey
         field: "#FFFFFF"

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PickerStyle.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.0
 
 Item {
@@ -59,7 +59,7 @@
     UbuntuShape {
         anchors.fill: parent
         radius: "medium"
-        color: Theme.palette.normal.overlay
+        color: theme.palette.normal.overlay
         image: shapeSource
     }
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2015-03-10 12:16:04 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ProgressBarStyle.qml	2015-04-17 15:45:47 +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
@@ -15,15 +15,15 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: progressBarStyle
 
     property color foregroundColor: UbuntuColors.orange
     property color foregroundTextColor: '#FFFFFF'
-    property color backgroundColor: Theme.palette.normal.base
-    property color backgroundTextColor: Theme.palette.normal.baseText
+    property color backgroundColor: theme.palette.normal.base
+    property color backgroundTextColor: theme.palette.normal.baseText
 
     property var progressBar: styledItem
 

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*
   The visuals handle both active and passive modes. This behavior is driven yet by
@@ -70,7 +70,7 @@
     property PropertyAnimation thumbConnectorFading: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
     property PropertyAnimation thumbFading: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
 
-    property color sliderColor: Theme.palette.normal.base
+    property color sliderColor: theme.palette.normal.base
     property real sliderRadius: units.gu(0.5)
     property color thumbConnectorColor: "white"
     property url forwardThumbReleased: (styledItem.align === Qt.AlignLeading || styledItem.align === Qt.AlignTrailing) ? "artwork/ScrollbarBottomIdle.png" : "artwork/ScrollbarRightIdle.png"

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2015-03-20 01:10:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 /*
   The default slider style consists of a bar and a thumb shape.
@@ -27,7 +27,7 @@
     id: sliderStyle
 
     property color foregroundColor: UbuntuColors.orange
-    property color backgroundColor: Theme.palette.normal.base
+    property color backgroundColor: theme.palette.normal.base
 
     property real thumbSpacing: units.gu(0)
     property Item bar: background
@@ -81,7 +81,7 @@
         width: units.gu(2)
         height: units.gu(2)
         opacity: 0.97
-        color: Theme.palette.normal.overlay
+        color: theme.palette.normal.overlay
     }
 
     BubbleShape {
@@ -117,7 +117,7 @@
             anchors.centerIn: parent
             text: styledItem.formatValue(SliderUtils.liveValue(styledItem))
             fontSize: "large"
-            color: Theme.palette.normal.overlayText
+            color: theme.palette.normal.overlayText
         }
     }
 }

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2015-04-17 15:45:47 +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
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: switchStyle
@@ -39,7 +39,7 @@
     /*!
       The background color of the switch.
      */
-    property color backgroundColor: Theme.palette.normal.base
+    property color backgroundColor: theme.palette.normal.base
 
     /*!
       The background color of the thumb when the switch is checked.
@@ -54,12 +54,12 @@
     /*!
       The foreground color of the icon that is currently selected.
      */
-    property color selectedIconColor: Theme.palette.normal.foregroundText
+    property color selectedIconColor: theme.palette.normal.foregroundText
 
    /*!
      The color of the icon that is not currently selected.
     */
-    property color unselectedIconColor: Theme.palette.normal.backgroundText
+    property color unselectedIconColor: theme.palette.normal.backgroundText
 
     /*!
       The source of the selected icon when the switch is checked.

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: tabBarStyle
@@ -25,8 +25,8 @@
     readonly property bool pressed: mouseArea.interacting
 
     // styling properties, public API
-    property color headerTextColor: Theme.palette.normal.backgroundText
-    property color headerTextSelectedColor: Theme.palette.selected.backgroundText
+    property color headerTextColor: theme.palette.normal.backgroundText
+    property color headerTextSelectedColor: theme.palette.selected.backgroundText
 
     // Don't start transitions because of updates to selectionMode before styledItem is completed.
     //  This fixes bug #1246792: "Disable tabs scrolling animations at startup"
@@ -42,7 +42,7 @@
 
     property string headerFontSize: "x-large"
     property int headerTextStyle: Text.Normal
-    property color headerTextStyleColor: Theme.palette.normal.backgroundText
+    property color headerTextStyleColor: theme.palette.normal.backgroundText
     property int headerFontWeight: Font.Light
     property real headerTextLeftMargin: units.gu(2)
     property real headerTextRightMargin: units.gu(2)

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2015-03-10 11:49:27 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2015-04-17 15:45:47 +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,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 // frame
 // FIXME: stabilize API
@@ -25,13 +25,13 @@
     // FIXME: needs type checking in themes to define the proper type to be used
     // if color type is used, alpha value gets lost
 
-    property color color: (styledItem.focus || styledItem.highlighted) ? Theme.palette.selected.fieldText : Theme.palette.normal.fieldText
-    property color selectedTextColor: Theme.palette.selected.foregroundText
-    property color selectionColor: Theme.palette.selected.foreground
+    property color color: (styledItem.activeFocus || styledItem.highlighted) ? theme.palette.selected.fieldText : theme.palette.normal.fieldText
+    property color selectedTextColor: theme.palette.selected.foregroundText
+    property color selectionColor: theme.palette.selected.foreground
     /*!
       Background fill color
       */
-    property color backgroundColor: (styledItem.focus || styledItem.highlighted) ? Theme.palette.selected.field : Theme.palette.normal.field
+    property color backgroundColor: (styledItem.activeFocus || styledItem.highlighted) ? theme.palette.selected.field : theme.palette.normal.field
     property color errorColor: UbuntuColors.orange
 
     /*!

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2015-04-17 15:45:47 +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
@@ -14,12 +14,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.4
-import Ubuntu.Components 1.2
+import Ubuntu.Components 1.3
 
 Item {
     id: visuals
     // styling properties
-    property color color: Theme.palette.normal.overlay
+    property color color: theme.palette.normal.overlay
 
     anchors.fill: parent
 

=== modified file 'modules/Ubuntu/Components/Themes/Palette.qml'
--- modules/Ubuntu/Components/Themes/Palette.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/Palette.qml	2015-04-17 15:45:47 +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
@@ -18,9 +18,9 @@
 
 /*!
     \qmltype Palette
-    \inqmlmodule Ubuntu.Components.Themes 0.1
-    \ingroup theming
-    \brief Palette of colors from the theme that widgets use to draw themselves.
+    \inqmlmodule Ubuntu.Components.Themes 1.0
+    \ingroup theme-module
+    \brief Provides the palette of colors from the theme that widgets use to draw themselves.
 
     Palette provides access to colors defined by the current theme. The actual
     color palette to use depends on the state of the widget being drawn.
@@ -37,11 +37,11 @@
     \qml
     Item {
         Rectangle {
-            color: Theme.palette.normal.base
+            color: theme.palette.normal.base
         }
 
         Text {
-            color: Theme.palette.normal.baseText
+            color: theme.palette.normal.baseText
         }
     }
     \endqml
@@ -50,10 +50,10 @@
     /*!
        Color palette to use when the widget is not in any particular state.
     */
-    property PaletteValues normal
+    property PaletteValues normal: PaletteValues{}
     /*!
        Color palette to use when the widget is selected, for example when
        a tab is the current one.
     */
-    property PaletteValues selected
+    property PaletteValues selected: PaletteValues{}
 }

=== modified file 'modules/Ubuntu/Components/Themes/PaletteValues.qml'
--- modules/Ubuntu/Components/Themes/PaletteValues.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/PaletteValues.qml	2015-04-17 15:45:47 +0000
@@ -18,8 +18,8 @@
 
 /*!
     \qmltype PaletteValues
-    \inqmlmodule Ubuntu.Components.Themes 0.1
-    \ingroup theming
+    \inqmlmodule Ubuntu.Components.Themes 1.0
+    \ingroup theme-module
     \brief Color values used for a given widget state.
 */
 QtObject {

=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml'
--- modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/MainViewStyle.qml	2015-04-17 15:45:47 +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
@@ -13,10 +13,11 @@
  * 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/>.
  */
-
+//![0]
 import QtQuick 2.4
 import Ubuntu.Components.Themes.Ambiance 0.1
 
 MainViewStyle {
     backgroundSource: ""
 }
+//![0]

=== modified file 'modules/Ubuntu/Components/Themes/SuruDark/Palette.qml'
--- modules/Ubuntu/Components/Themes/SuruDark/Palette.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Themes/SuruDark/Palette.qml	2015-04-17 15:45:47 +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
@@ -14,12 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+//![0]
 import QtQuick 2.4
-import Ubuntu.Components 1.2
-import Ubuntu.Components.Themes 0.1
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes 1.0
 
 Palette {
-    normal: PaletteValues {
+    normal {
         background: "#221E1C"
         backgroundText: "#33F3F3E7"
         base: "#19000000"
@@ -31,8 +32,8 @@
         field: "#19000000"
         fieldText: "#7F7F7F7F"
     }
-    selected: PaletteValues {
-        background: "#88D6D6D6" // FIXME: not from design
+    selected {
+        background: "#88D6D6D6"
         backgroundText: "#FFFFFF"
         selection: Qt.rgba(UbuntuColors.blue.r, UbuntuColors.blue.g, UbuntuColors.blue.b, 0.2)
         foreground: UbuntuColors.orange
@@ -41,3 +42,4 @@
         fieldText: "#888888"
     }
 }
+//![0]

=== modified file 'modules/Ubuntu/Components/Themes/qmldir'
--- modules/Ubuntu/Components/Themes/qmldir	2013-07-01 06:32:40 +0000
+++ modules/Ubuntu/Components/Themes/qmldir	2015-04-17 15:45:47 +0000
@@ -1,3 +1,7 @@
 module Ubuntu.Components.Themes
 Palette 0.1 Palette.qml
 PaletteValues 0.1 PaletteValues.qml
+
+#version 1.0
+Palette 1.0 Palette.qml
+PaletteValues 1.0 PaletteValues.qml

=== modified file 'modules/Ubuntu/Components/Toolbar.qml'
--- modules/Ubuntu/Components/Toolbar.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/Toolbar.qml	2015-04-17 15:45:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd.
+ * 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
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3 as Toolkit
 
 /*!
     \internal
@@ -117,7 +118,7 @@
         }
     }
 
-    StyledItem {
+    Toolkit.StyledItem {
         // FIXME:
         // All theming items go into the background because only the children
         //  of the Panel are being shown/hidden while the toolbar
@@ -134,7 +135,7 @@
         property bool opened: toolbar.opened
         property bool animating: toolbar.animating
 
-        style: Theme.createStyleComponent("ToolbarStyle.qml", background)
+        style: theme.createStyleComponent("ToolbarStyle.qml", background)
     }
 
     Item {

=== modified file 'modules/Ubuntu/Components/ToolbarButton.qml'
--- modules/Ubuntu/Components/ToolbarButton.qml	2015-03-03 13:47:48 +0000
+++ modules/Ubuntu/Components/ToolbarButton.qml	2015-04-17 15:45:47 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Canonical Ltd.
+ * 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
@@ -83,5 +83,5 @@
     height: parent ? parent.height : undefined
     width: units.gu(5)
 
-    style: Theme.createStyleComponent("ToolbarButtonStyle.qml", toolbarButton)
+    style: theme.createStyleComponent("ToolbarButtonStyle.qml", toolbarButton)
 }

=== 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-17 15:45:47 +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-17 15:45:47 +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"
@@ -135,7 +135,7 @@
     qmlRegisterType<UCAction>(uri, major, minor, "Action");
     qmlRegisterType<UCActionContext>(uri, major, minor, "ActionContext");
     qmlRegisterType<UCActionManager>(uri, major, minor, "ActionManager");
-    qmlRegisterType<UCStyledItemBase>(uri, major, minor, "StyledItemBase");
+    qmlRegisterType<UCStyledItemBase>(uri, major, minor, "StyledItem");
     qmlRegisterUncreatableType<UbuntuI18n>(uri, major, minor, "i18n", "Singleton object");
     qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, major, minor, "QQuickImageBase");