Merge lp:~bzoltan/ubuntu-ui-toolkit/landing-2015-09-04 into lp:ubuntu-ui-toolkit

[Zoltan Balogh]

Landing 2015.09.04

Landing 2015.09.04

[lp:~bzoltan/ubuntu-ui-toolkit/landing-2015-09-04]

1630. By Zoltan Balogh on 2015-09-07

Cope with different AbstractButton class name in 1.3

1631. By Zoltan Balogh on 2015-09-07

license fix

1632. By Zoltan Balogh on 2015-09-08

update

=== modified file '.bzrignore'
--- .bzrignore	2015-05-20 14:47:16 +0000
+++ .bzrignore	2015-09-08 04:09:38 +0000
@@ -1,25 +1,25 @@
+.obj
+.pch
+.qmake.cache
+.rcc
+qml
+
 Makefile*
-src/Makefile*
-src/Ubuntu/Components/Makefile*
-src/Ubuntu/Components/plugin/Makefile*
-src/Ubuntu/Components/plugin/qrc_plugin.cpp
-src/Ubuntu/Components/Themes/Makefile*
-src/Ubuntu/Components/Layouts/Makefile*
-src/Ubuntu/Components/PerformanceMetrics/Makefile*
-src/Ubuntu/Test/Makefile*
 documentation/html/*
 *.moc
 moc_*.cpp
 qrc_tst_*.cpp
 tests/test_tst_*.xml
 tests/tst_*.qml.xml
-tests/unit*/tst_*/tst_[^.]*
+tests/unit*/tst_*/tst_*
+tests/unit/tst_*/tst_*/tst_*
 tests/unit*/testparser/testparser
 plugins.qmltypes
 po/*.mo
 examples/ubuntu-ui-toolkit-gallery/po/*.mo
-tests/unit/tst_i18n/locale/en/LC_MESSAGES/*.mo
+tests/unit/tst_i18n/tst_*/*/share/locale/en/LC_MESSAGES/*.mo
+tests/unit/tst_i18n/*/share/locale/en/LC_MESSAGES/*.mo
+tests/unit/tst_units/dpr*/dpr*
 tests/apicheck/apicheck
 tests/launcher/launcher
 build_paths.inc
-tests/unit/tst_i18n/localizedApp/share/locale/en/LC_MESSAGES/localizedApp.mo
 
=== modified file '.qmake.conf'
--- .qmake.conf	2015-05-18 09:53:55 +0000
+++ .qmake.conf	2015-09-08 04:09:38 +0000
@@ -12,3 +12,7 @@
 
 ROOT_SOURCE_DIR=$$PWD
 ROOT_BUILD_DIR=$$shadowed($$PWD)
+
+exists($$PWD/../qt.pro) {
+    CONFIG += build_with_qt
+}
 
=== modified file 'components.api'
--- components.api	2015-08-12 09:55:50 +0000
+++ components.api	2015-09-08 04:09:38 +0000
@@ -4,10 +4,10 @@
     signal pressAndHold()
     property bool pressed
 Ubuntu.Components.AbstractButton 1.3: ActionItem
-    property bool hovered
+    readonly property bool hovered
     signal clicked()
     signal pressAndHold()
-    property bool pressed
+    readonly property bool pressed
 Ubuntu.Components.Action 1.3 1.0 0.1: QtObject
     property string description
     property bool enabled
@@ -43,14 +43,8 @@
     property string iconName
     property url iconSource
     signal triggered(var value)
-    function var trigger(var value)
-    property string text
-Ubuntu.Components.ActionItem 1.3: StyledItem
-    property Action action
-    property string iconName
-    property url iconSource
-    signal triggered(var value)
-    function var trigger(var value)
+    function trigger(var value)
+    function trigger()
     property string text
 Ubuntu.Components.ActionList 1.0 0.1: QtObject
     readonly property Action actions
@@ -82,6 +76,8 @@
     property bool onScreen
     property bool running
 Ubuntu.Components.AdaptivePageLayout 1.3: PageTreeNode
+    readonly property int columns
+    readonly property PageColumnsLayout layouts
     function var addPageToCurrentColumn(var sourcePage, var page, var properties)
     function var addPageToNextColumn(var sourcePage, var page, var properties)
     function var removePages(var page)
@@ -92,6 +88,7 @@
     property bool enabled
     readonly property int error
     property string message
+    signal statusChanged(Operation operation)
     function save()
     function cancel()
     function reset()
@@ -305,6 +302,9 @@
 Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase
     property FillMode fillMode
     property HAlignment horizontalAlignment
+    signal horizontalAlignmentChanged(HAlignment alignment)
+    signal verticalAlignmentChanged(VAlignment alignment)
+    signal mipmapChanged(bool )
     property bool mipmap
     readonly property double paintedHeight
     readonly property double paintedWidth
@@ -312,6 +312,9 @@
 Ubuntu.Components.ListItems.Divider 1.3: QQuickImageBase
     property FillMode fillMode
     property HAlignment horizontalAlignment
+    signal horizontalAlignmentChanged(HAlignment alignment)
+    signal verticalAlignmentChanged(VAlignment alignment)
+    signal mipmapChanged(bool )
     property bool mipmap
     readonly property double paintedHeight
     readonly property double paintedWidth
@@ -361,10 +364,11 @@
 Ubuntu.Components.FilterBehavior 1.1: QtObject
     property QRegExp pattern
     property string property
-Ubuntu.Components.Haptics 1.0 0.1: Object singleton
-    readonly property HapticsEffect effect
+Ubuntu.Components.Haptics 1.0 0.1: QtObject singleton
+    readonly property QtObject effect
     readonly property bool enabled
-    function var play(var customEffect)
+    function play(var customEffect)
+    function play()
 Ubuntu.Components.ListItems.Header 1.0 0.1: Item
     property string text
 Ubuntu.Components.Header 1.0 0.1: AppHeader
@@ -385,22 +389,6 @@
     property bool useDeprecatedToolbar
 Ubuntu.Components.ListItems.Header 1.3: Item
     property string text
-Ubuntu.Components.Header 1.3: AppHeader
-    property string _for_autopilot
-    property var actions
-    property bool animate
-    property QtObject config
-    property Item contents
-    property color dividerColor
-    property Flickable flickable
-    function var show()
-    function var hide()
-    readonly property bool moving
-    property var pageStack
-    property color panelColor
-    property var tabsModel
-    property string title
-    property bool useDeprecatedToolbar
 Ubuntu.Components.Icon 1.0 0.1: Item
     property color color
     property color keyColor
@@ -466,6 +454,7 @@
     property bool selected
     property ListItemActions trailingActions
 Ubuntu.Components.ListItem 1.3: ListItem
+    readonly property UCListItemExpansion expansion
 Ubuntu.Components.ListItemActions 1.2: QtObject
     readonly property Action actions
     default readonly property QtObject data
@@ -485,6 +474,7 @@
     readonly property bool animatePanels
     property Item dragPanel
     property PropertyAnimation dropAnimation
+    readonly property Flickable flickable 1.3
     readonly property int listItemIndex 1.3
     function swipeEvent(SwipeEvent event)
     function rebound()
@@ -528,6 +518,7 @@
     signal clicked(QQuickMouseEvent mouse, Item host)
     signal pressAndHold(QQuickMouseEvent mouse, Item host)
     signal doubleClicked(QQuickMouseEvent mouse, Item host)
+    signal positionChanged(QQuickMouseEvent mouse, Item host)
     signal entered(QQuickMouseEvent event, Item host)
     signal exited(QQuickMouseEvent event, Item host)
     property Priority priority
@@ -603,6 +594,14 @@
     property Flickable flickable
     readonly property PageHeadConfiguration head
     property string title
+Ubuntu.Components.PageColumn 1.3: QtObject
+    property bool fillWidth
+    property double maximumWidth
+    property double minimumWidth
+    property double preferredWidth
+Ubuntu.Components.PageColumnsLayout 1.3: QtObject
+    default readonly property PageColumn data
+    property bool when
 Ubuntu.Components.PageHeadConfiguration 1.1: Object
     readonly property Action actions
     property Action backAction
@@ -1222,14 +1221,16 @@
     property string iconName
     property url iconSource
     signal triggered(var value)
-    function var trigger(var value)
+    function trigger(var value)
+    function trigger()
     property string text
 Ubuntu.Components.ToolbarButton 1.3: StyledItem
     property Action action
     property string iconName
     property url iconSource
     signal triggered(var value)
-    function var trigger(var value)
+    function trigger(var value)
+    function trigger()
     property string text
 Ubuntu.Components.ToolbarItems 1.0 0.1: Item
     property Item back
@@ -1246,6 +1247,9 @@
 UCListItemDivider: Item
     property color colorFrom
     property color colorTo
+UCListItemExpansion: QtObject
+    property bool expanded
+    property double height
 UCStateSaverAttached: QtObject
     property bool enabled
     property string properties
@@ -1393,6 +1397,14 @@
     signal dragUpdated(ListItemDrag event)
     property bool selectMode
     property QList<int> selectedIndices
+Ubuntu.Components.ViewItems 1.3: ViewItems
+    property QList<int> expandedIndices
+    property int expansionFlags
+    signal expandedIndicesChanged(QList<int> indices)
+Ubuntu.Components.ViewItems.ExpansionFlag: Enum
+    CollapseOnOutsidePress
+    Exclusive
+    UnlockExpanded
 Ubuntu.Components.i18n 1.0 0.1: QtObject
     property string domain
     property string language
@@ -1405,3 +1417,4 @@
     function string dctr(string domain, string context, string text)
     function string tag(string text)
     function string tag(string context, string text)
+    function string relativeDateTime(QDateTime datetime)
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-08-24 20:49:45 +0000
+++ debian/changelog	2015-09-08 04:09:38 +0000
@@ -1,3 +1,61 @@
+ubuntu-ui-toolkit (1.3.1627+15.10.20150904-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Zsombor Egri ]
+  * Implement list item expansion.
+  * Turn AdaptivePageLayout page creation to be asynchronous.
+  * Fix ListItem swipe handling when gesture is initiated over an overlay 
+    MouseArea which does not accept pressed event. Fixes LP: #1484545
+  * AbstractButton to C++. Fixes LP: #1365471, LP: #1458028
+  * Haptics singleton moved to C++.
+  * ActionItem moved to C++.
+  * Making columns resizable in an AdaptivePageLayout.
+  * Introducing column configuration into AdaptivePageLayout.
+
+  [ Benjamin Zeller ]
+  * Fix build inside qt and shadowbuild.
+
+  [ Tim Peeters ]
+  * Remove old and unused header-related files, and update unit test filenames. 
+  * Don't unset the subheader style when Page.head changes because that unsets 
+    the parent of Page.head.contents. Fixes LP: #1488922
+  * Fix the theming of the MainView.
+  * Fix the background color of the overflow panel.
+
+  [ Christian Dywan ]
+  * Include change signals with arguments in .api.
+  * A public QML type with no version is an error. Rather than silently breaking
+    as QML does normally at least apicheck can make this fatal.
+  * UbuntuShape shouldn't emit redundant deprecation warnings. Fixes LP: #1481791
+  * Update .bzrignore to new upstream style layout. Fixes LP: #1433308
+  * Revert unnecessary change of Popover minimumWidth. Fixes LP: #1483708
+
+  [ Ken VanDine ]
+  * Fixed a few typos in the api docs for StateSaver.
+
+  [ Olivier Tilloy ]
+  * Take custom key indexes into account to allow sorting on custom roles. 
+    Fixes LP: #1485674
+
+  [ Albert Astals Cid ]
+  * Properly free shapeTextures[index] The old code assumes that the UbuntuShape 
+    will still be around when the opengl context is destroyed, but that seldom 
+    happens so connect the signal to a lambda that will be there and does the 
+    cleanup properly. Without this patch testDirectionalDragArea from unity8 was 
+    hitting the qFatal because it ran out of space in shapeTextures.
+
+  [ Richard Huddie ]
+  * Remove all usage of the autopilot simulated keyboard when the OSK is being 
+    used. Fixes LP: 31483668
+
+  [ Gerry Boland ]
+  * Compensate for Qt's device pixel ratio multiplier. 
+    Fixes: LP: #1207270, LP: #1275748, LP: #1468402
+
+  [ Nick Dedekind ]
+  * Added relative date time i18n.
+
+ -- Zoltán Balogh <[e-mail]>  Fri, 04 Sep 2015 19:25:03 +0300
+
 ubuntu-ui-toolkit (1.3.1603+15.10.20150824.1-0ubuntu1) wily; urgency=medium
 
   [ CI Train Bot ]
 
=== modified file 'debian/control'
--- debian/control	2015-07-10 05:40:21 +0000
+++ debian/control	2015-09-08 04:09:38 +0000
@@ -45,6 +45,11 @@
                suru-icon-theme,
                uuid-runtime,
                python3-sphinx,
+               libfontconfig1-dev,
+               libfreetype6-dev,
+               libmtdev-dev,
+               libudev-dev,
+               libxrender-dev
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-ui-toolkit
 # If you aren't a member of ~ubuntu-sdk-team but need to upload packaging
 
=== modified file 'documentation/documentation.pro'
--- documentation/documentation.pro	2015-06-02 15:47:45 +0000
+++ documentation/documentation.pro	2015-09-08 04:09:38 +0000
@@ -17,7 +17,7 @@
 generate_docs.commands = cd $$ROOT_SOURCE_DIR; SRC=$$ROOT_SOURCE_DIR/documentation BLD=$$ROOT_BUILD_DIR/documentation $$ROOT_SOURCE_DIR/documentation/docs.sh \'$$QDOC\' \'$$QHELPGENERATOR\' $$DOC_PATH
 
 #install the online docs only when building outside of Qt
-force_independent: {
+!build_with_qt{
     install_docs.files = $$shadowed($$ROOT_SOURCE_DIR)/documentation/html
     install_docs.path = /usr/share/ubuntu-ui-toolkit/doc
     install_docs.CONFIG += no_check_exist directory no_build
 
=== modified file 'documentation/ubuntu-ui-toolkit-common.qdocconf'
--- documentation/ubuntu-ui-toolkit-common.qdocconf	2015-07-24 18:00:54 +0000
+++ documentation/ubuntu-ui-toolkit-common.qdocconf	2015-09-08 04:09:38 +0000
@@ -26,7 +26,7 @@
 sources.fileextensions = "*.qml *.qdoc *.cpp *.js"
 headers.fileextensions = "*.h"
 # exclude qml files that have the component documented in a separate qdoc file
-excludefiles = $BLD/../src/Ubuntu/Components/MainView.qml
+excludefiles += $BLD/../src/Ubuntu/Components/1.3/PageWrapperUtils.js
 outputdir = $BLD/html
 outputformats = HTML
 version = 1.2
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-08-07 13:48:39 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml	2015-09-08 04:09:38 +0000
@@ -37,6 +37,28 @@
         anchors.fill: parent
         primaryPage: mainPage
 
+        layouts: [
+            PageColumnsLayout {
+                when: layout.width > units.gu(80)
+                PageColumn {
+                    minimumWidth: units.gu(30)
+                    maximumWidth: units.gu(50)
+                    preferredWidth: units.gu(40)
+                }
+                PageColumn {
+                    fillWidth: true
+                }
+            },
+            // configure single column mode so we can only size it to minimum 20 GU
+            PageColumnsLayout {
+                when: true
+                PageColumn {
+                    minimumWidth: units.gu(20)
+                    fillWidth: true
+                }
+            }
+        ]
+
         Page {
             id: mainPage
             title: "Ubuntu UI Toolkit"
@@ -74,9 +96,8 @@
                         selected: index === widgetList.currentIndex
                         onClicked: {
                             var source = Qt.resolvedUrl(model.source);
-                            var newPage = layout.addPageToNextColumn(mainPage, source);
+                            layout.addPageToNextColumn(mainPage, source, {title: model.label});
 
-                            newPage.title = model.label;
                             widgetList.currentIndex = index;
                         }
                     }
 
=== modified file 'features/ubuntu_enable_testing.prf'
--- features/ubuntu_enable_testing.prf	2015-05-19 07:55:27 +0000
+++ features/ubuntu_enable_testing.prf	2015-09-08 04:09:38 +0000
@@ -1,6 +1,6 @@
 instbase = $$ROOT_BUILD_DIR/qml
 
-force_independent: {
+!build_with_qt {
     # These bizarre rules copy the files to the build directory
 
     defineReplace(qmlModStripSrcDir) {
 
=== modified file 'features/ubuntu_qml_plugin.prf'
--- features/ubuntu_qml_plugin.prf	2015-07-30 13:47:23 +0000
+++ features/ubuntu_qml_plugin.prf	2015-09-08 04:09:38 +0000
@@ -1,64 +1,65 @@
 load(qml_plugin)
 CONFIG -= hide_symbols
 
-
 load(ubuntu_enable_testing)
 
 #hacky hacks to build the qmltypes
 
-#should be already set by the qml_plugin.prf, but lets be safe
-isEmpty(IMPORT_VERSION): error("Must set IMPORT_VERSION")
-
-load(resolve_target)
-
-qml1_target {
-    qmlplugindump = qml1plugindump
-    importpath.name = QML_IMPORT_PATH
-} else {
-    qmlplugindump = qmlplugindump
-    importpath.name = QML2_IMPORT_PATH
-}
-
-qtPrepareTool(QMLPLUGINDUMP, $$qmlplugindump)
-importpath.value =
-for(qmod, QTREPOS) {
-    qml1_target: \
-        qmod = $$qmod/imports
-    else: \
-        qmod = $$qmod/qml
-    exists($$qmod): importpath.value += $$shell_path($$qmod)
-}
-
-#add our path, somehow its not added automatically
-importpath.value += $$shell_path($$instbase)
-importpath.value = $$unique(importpath.value)
-
-membackend.name = ALARM_BACKEND
-membackend.value = memory
-
-qtAddToolEnv(QMLPLUGINDUMP, importpath)
-qtAddToolEnv(QMLPLUGINDUMP, membackend)
-
-TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )
-
-QMLTYPEFILE = $$instbase/$$TARGETPATH/plugins.qmltypes
-autobld_qmltypes.target = $$QMLTYPEFILE
-autobld_qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable $$replace(TARGETPATHBASE, /, .) $$IMPORT_VERSION > $$QMLTYPEFILE
-autobld_qmltypes.commands += && sed -i \'s?-1.-1\"?0.1\"?\' $$QMLTYPEFILE
-autobld_qmltypes.commands += && sed -i \'s?exportMetaObjectRevisions: \\[-1\\]?exportMetaObjectRevisions: [0,0]?\' $$QMLTYPEFILE
-autobld_qmltypes.depends = $$QMAKE_RESOLVED_TARGET
-
-autobld_install_qmltypes.files = $$QMLTYPEFILE
-autobld_install_qmltypes.depends = $$QMLTYPEFILE
-autobld_install_qmltypes.path  = $$[QT_INSTALL_QML]/$$TARGETPATH
-autobld_install_qmltypes.CONFIG += no_check_exist
-
-INSTALLS+=autobld_install_qmltypes
-QMAKE_EXTRA_TARGETS += autobld_qmltypes
+!build_with_qt{
+    #should be already set by the qml_plugin.prf, but lets be safe
+    isEmpty(IMPORT_VERSION): error("Must set IMPORT_VERSION")
+
+    load(resolve_target)
+
+    qml1_target {
+        qmlplugindump = qml1plugindump
+        importpath.name = QML_IMPORT_PATH
+    } else {
+        qmlplugindump = qmlplugindump
+        importpath.name = QML2_IMPORT_PATH
+    }
+
+    qtPrepareTool(QMLPLUGINDUMP, $$qmlplugindump)
+    importpath.value =
+    for(qmod, QTREPOS) {
+        qml1_target: \
+            qmod = $$qmod/imports
+        else: \
+            qmod = $$qmod/qml
+        exists($$qmod): importpath.value += $$shell_path($$qmod)
+    }
+
+    #add our path, somehow its not added automatically
+    importpath.value += $$shell_path($$instbase)
+    importpath.value = $$unique(importpath.value)
+
+    membackend.name = ALARM_BACKEND
+    membackend.value = memory
+
+    qtAddToolEnv(QMLPLUGINDUMP, importpath)
+    qtAddToolEnv(QMLPLUGINDUMP, membackend)
+
+    TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )
+
+    QMLTYPEFILE = $$instbase/$$TARGETPATH/plugins.qmltypes
+    autobld_qmltypes.target = $$QMLTYPEFILE
+    autobld_qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable $$replace(TARGETPATHBASE, /, .) $$IMPORT_VERSION > $$QMLTYPEFILE
+    autobld_qmltypes.commands += && sed -i \'s?-1.-1\"?0.1\"?\' $$QMLTYPEFILE
+    autobld_qmltypes.commands += && sed -i \'s?exportMetaObjectRevisions: \\[-1\\]?exportMetaObjectRevisions: [0,0]?\' $$QMLTYPEFILE
+    autobld_qmltypes.depends = $$QMAKE_RESOLVED_TARGET
+
+    autobld_install_qmltypes.files = $$QMLTYPEFILE
+    autobld_install_qmltypes.depends = $$QMLTYPEFILE
+    autobld_install_qmltypes.path  = $$[QT_INSTALL_QML]/$$TARGETPATH
+    autobld_install_qmltypes.CONFIG += no_check_exist
+
+    INSTALLS+=autobld_install_qmltypes
+    QMAKE_EXTRA_TARGETS += autobld_qmltypes
+}
 
 # when building against the system Qt we pick up the CXX_FLAGS for a release build
 # reset them to the default debug build flags
-force_independent: {
+!build_with_qt: {
     CONFIG(debug, debug|release)  {
         QMAKE_CFLAGS = $$QMAKE_CFLAGS_DEBUG
         QMAKE_CXXFLAGS = $$QMAKE_CXXFLAGS_DEBUG
 
=== modified file 'po/po.pro'
--- po/po.pro	2014-12-02 09:00:30 +0000
+++ po/po.pro	2015-09-08 04:09:38 +0000
@@ -30,7 +30,7 @@
   mo_file = $$replace(po_file,.po,.mo)
   system(msgfmt $$po_file -o $$mo_file)
   mo_name = $$replace(mo_file,.mo,)
-  mo_targetpath = $(INSTALL_ROOT)/usr/share/locale/$${mo_name}/LC_MESSAGES
+  mo_targetpath = $(INSTALL_ROOT)$$[QT_INSTALL_PREFIX]/share/locale/$${mo_name}/LC_MESSAGES
   mo_target = $${mo_targetpath}/ubuntu-ui-toolkit.mo
   !isEmpty(install_mo_commands): install_mo_commands += &&
   install_mo_commands += test -d $$mo_targetpath || mkdir -p $$mo_targetpath
 
=== modified file 'src/Ubuntu/Components/1.1/Haptics.qml'
--- src/Ubuntu/Components/1.1/Haptics.qml	2015-07-24 09:54:03 +0000
+++ src/Ubuntu/Components/1.1/Haptics.qml	2015-09-08 04:09:38 +0000
@@ -14,105 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-pragma Singleton
 import QtQuick 2.4
 import QtFeedback 5.0
 import Ubuntu.Components 1.1
 
-/*!
-  \qmltype Haptics
-  \inqmlmodule Ubuntu.Components 1.1
-  \ingroup ubuntu-services
-  \brief Singleton defining the haptics feedback used in components, where execution
-  of the feedback is controlled by the system settings.
-
-  Supports global feedback as well as custom feedback. Global feedback can be
-  configured through its properties, and \l play function will play the default
-  configuration, or a custom one if parameter is given.
-
-  Example of using Haptics:
-  \qml
-  import QtQuick 2.4
-  import Ubuntu.Components 1.2
-
-  Item {
-      implicitWidth: units.gu(20)
-      implicitHeight: units.gu(5)
-
-      Label {
-          text: "Press me"
-          anchors.fill: parent
-          horizontalAlignment: Text.AlignHCenter
-          verticalAlignment: Text.AlignVCenter
-      }
-      MouseArea {
-          anchors.fill: parent
-          onClicked: Haptics.play()
-      }
-  }
-  \endqml
-
-  Custom effects can be played as follows:
-  \qml
-  import QtQuick 2.4
-  import Ubuntu.Components 1.2
-
-  Item {
-      implicitWidth: units.gu(20)
-      implicitHeight: units.gu(5)
-
-      Label {
-          text: "Press me"
-          anchors.fill: parent
-          horizontalAlignment: Text.AlignHCenter
-          verticalAlignment: Text.AlignVCenter
-      }
-      MouseArea {
-          anchors.fill: parent
-          onClicked: Haptics.play({duration: 25, attackIntensity: 0.7})
-      }
-  }
-  \endqml
-
-  \note Though the \l effect property exposes \c start, \c stop and \c pause
-  functions, use those only if you want to have feedback independent on what the
-  system setting is.
- */
 Object {
-
-    /*!
-      \qmlproperty bool enabled
-      \readonly
-      The property specifies whether the haptics feedback is enabled or not by the system.
-      */
     readonly property alias enabled: vibra.otherVibrate
-
-    /*!
-      \qmlproperty HapticsEffect effect
-      The property defines the settings of the haptics effect used by the component.
-      The default setting is a haptics effect with a duration of 10 milliseconds
-      with an intensity of 1.0, having fading time of 50 millisecods and fading
-      intensity 0.0, and attack time of 50 milliseconds and with an intensity of
-      0.0.
-      */
     property alias effect: effect
 
-    /*!
-      \qmlmethod play([customEffect])
-      The function plays the feedback with the configuration specified in \l effect
-      if no parameter is given. Custom effect can be played by specifying the effect
-      properties in a JSON object in \c customEffect.
-
-      The function will exit unconditionaly if playing the effects is blocked by
-      system settings.
-
-      The function will not stop any ongoing haptics effect played, if that one
-      was a default haptics effect. In case of custom effects, the previous effect
-      will be stopped, and settings will be restored before the new haptics will
-      be played. The custom settings properties (the ones which are required to
-      be different from the ones defined in the \l effect) must be specified in
-      the parameter in a JSON object.
-      */
     function play(customEffect) {
         if (!vibra.otherVibrate) {
             return;
 
=== removed file 'src/Ubuntu/Components/1.2/ActionItem.qml'
--- src/Ubuntu/Components/1.2/ActionItem.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/ActionItem.qml	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright 2012 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 ActionItem
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief A visual representation of an Action. The API of ActionItem is a
-        copy of the API of \l Action, with additional properties to define
-        visual aspects of the ActionItem.
-
-        If \l action is set, the values of the other properties will by default
-        be identical to the \l Action's property values. Setting the other properties
-        will override the properties copied from the \l Action.
-
-        See \l ToolbarItems for examples of how to use \l ToolbarButton or other ActionItems
-        in a toolbar.
-*/
-StyledItem {
-    id: actionItem
-
-    /*!
-      The \l Action associated with this ActionItem. If action is set,
-      the values of the Action properties are copied to the values of
-      the ActionItem properties.
-     */
-    property Action action: null
-
-    visible: action ? action.visible : true
-    enabled: action ? action.enabled : true
-
-    /*!
-      The title of the actionItem.
-      Default value: action.text
-     */
-    property string text: action ? action.text : ""
-
-    /*!
-      The image associated with the actionItem.
-      Default value: action.iconSource.
-
-      This is the URL of any image file
-      If both iconSource and iconName are defined, iconName will be ignored.
-     */
-    property url iconSource: action ? action.iconSource : (iconName ? "image://theme/" + iconName : "")
-
-    /*!
-      The icon associated with the actionItem in the suru icon theme.
-      Default value: action.iconName.
-
-      \note The complete list of icons available in Ubuntu is not published yet.
-            For now please refer to the folders where the icon themes are installed:
-            \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/suru
-              \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
-            \endlist
-            These 2 separate icon themes will be merged soon.
-
-      If both iconSource and iconName are defined, iconName will be ignored.
-     */
-    property string iconName: action ? action.iconName : ""
-
-    /*!
-      Called when the actionItem is triggered.
-     */
-    signal triggered(var value)
-
-    /*!
-      If \l action is set, this will trigger it.
-    */
-    onTriggered: if (action) action.trigger(value)
-
-    /*!
-      Trigger this action item if it is enabled.
-     */
-    function trigger(value) {
-        var passingValue = value ? value : null
-        if (actionItem.enabled) actionItem.triggered(passingValue);
-    }
-}
 
=== modified file 'src/Ubuntu/Components/1.2/TextField.qml'
--- src/Ubuntu/Components/1.2/TextField.qml	2015-05-01 19:38:57 +0000
+++ src/Ubuntu/Components/1.2/TextField.qml	2015-09-08 04:09:38 +0000
@@ -99,7 +99,7 @@
     \note During text selection all interactive parent Flickables are turned off.
 */
 
-ActionItem {
+Ubuntu.ActionItem {
     id: control
 
     implicitWidth: units.gu(25)
 
=== modified file 'src/Ubuntu/Components/1.2/TextInputPopover.qml'
--- src/Ubuntu/Components/1.2/TextInputPopover.qml	2015-07-02 23:33:22 +0000
+++ src/Ubuntu/Components/1.2/TextInputPopover.qml	2015-09-08 04:09:38 +0000
@@ -88,6 +88,7 @@
                   action.text so we can get the proper button by text, action being not
                   accessible. https://bugs.launchpad.net/autopilot/+bug/1334599
                   */
+                // FIXME: AbstractButton has text property, which is getting the action.text, so no need to override!
                 property string text: action.text
                 width: Math.max(units.gu(5), implicitWidth) + units.gu(2)
                 height: units.gu(6)
 
=== modified file 'src/Ubuntu/Components/1.2/ToolbarButton.qml'
--- src/Ubuntu/Components/1.2/ToolbarButton.qml	2015-04-30 08:32:44 +0000
+++ src/Ubuntu/Components/1.2/ToolbarButton.qml	2015-09-08 04:09:38 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.2
 
 /*!
     \qmltype ToolbarButton
 
=== removed file 'src/Ubuntu/Components/1.3/AbstractButton.qml'
--- src/Ubuntu/Components/1.3/AbstractButton.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/AbstractButton.qml	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-/*
- * Copyright 2012 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
-
-/*!
-    \qmlabstract AbstractButton
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief The AbstractButton class defines the behavior of the button.
-
-    This class defines the behavior of the button: it defines the MouseArea
-    and the states.
-    All components deriving from this class support haptic feedback out of the box.
-*/
-ActionItem {
-    id: button
-
-    /*!
-      If an action is specified, the button's clicked signal will trigger the action.
-      Subclasses of AbstractButton can use other properties of action (for example
-      the text and iconName).
-      \qmlproperty Action action
-     */
-
-    /*!
-       This handler is called when there is a mouse click on the button
-       and the button is not disabled. If \b action is defined,
-       the action will be triggered.
-    */
-    signal clicked()
-
-    /*!
-      If a button is clicked, its triggered() signal will automatically be called.
-     */
-    onClicked: button.trigger()
-
-    Keys.onEnterPressed: clicked()
-    Keys.onReturnPressed: clicked()
-
-    /*!
-      This handler is called when there is a long press.
-     */
-    signal pressAndHold()
-
-    /*!
-      True if the user presses a mouse button in the button's mouse area.
-     */
-    property bool pressed: mouseArea.pressed
-
-    /*!
-      True if the mouse cursor hovers over the button's mouse area.
-     */
-    property bool hovered: __acceptEvents && mouseArea.containsMouse
-
-    /*!
-      \internal
-      Disable or enable signal emition by default.
-      Some classes want to emit the signal by themselves (ListItem.Standard)
-     */
-    property bool __acceptEvents: true
-
-    /*!
-      \internal
-      To get the properties of the mouse area in subclasses.
-     */
-    property alias __mouseArea: mouseArea
-
-    activeFocusOnPress: true
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        // if mouseArea is given a new value, disable defaultMouseArea
-        // as it might occlude the newly assigned mouse area.
-        hoverEnabled: true
-
-        // invoke Haptics singleton earlier than we press the button,
-        // so we give some time for the singleton to sync settings with the service
-        property bool hapticsEnabled: Haptics.enabled
-
-        onClicked: {
-            if (button.__acceptEvents) {
-                // FIXME (Vivid) call this in the style rather than from AbstractButton
-                Haptics.play();
-                button.clicked()
-            }
-        }
-        onPressAndHold: {
-            if (button.__acceptEvents) {
-                button.pressAndHold()
-            }
-        }
-    }
-}
 
=== removed file 'src/Ubuntu/Components/1.3/ActionItem.qml'
--- src/Ubuntu/Components/1.3/ActionItem.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/ActionItem.qml	1970-01-01 00:00:00 +0000
@@ -1,96 +0,0 @@
-/*
- * Copyright 2012 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
-
-/*!
-    \qmlabstract ActionItem
-    \inqmlmodule Ubuntu.Components 1.1
-    \ingroup ubuntu
-    \brief A visual representation of an Action. The API of ActionItem is a
-        copy of the API of \l Action, with additional properties to define
-        visual aspects of the ActionItem.
-
-        If \l action is set, the values of the other properties will by default
-        be identical to the \l Action's property values. Setting the other properties
-        will override the properties copied from the \l Action.
-
-        See \l ToolbarItems for examples of how to use \l ToolbarButton or other ActionItems
-        in a toolbar.
-*/
-StyledItem {
-    id: actionItem
-
-    /*!
-      The \l Action associated with this ActionItem. If action is set,
-      the values of the Action properties are copied to the values of
-      the ActionItem properties.
-     */
-    property Action action: null
-
-    visible: action ? action.visible : true
-    enabled: action ? action.enabled : true
-
-    /*!
-      The title of the actionItem.
-      Default value: action.text
-     */
-    property string text: action ? action.text : ""
-
-    /*!
-      The image associated with the actionItem.
-      Default value: action.iconSource.
-
-      This is the URL of any image file
-      If both iconSource and iconName are defined, iconName will be ignored.
-     */
-    property url iconSource: action ? action.iconSource : (iconName ? "image://theme/" + iconName : "")
-
-    /*!
-      The icon associated with the actionItem in the suru icon theme.
-      Default value: action.iconName.
-
-      \note The complete list of icons available in Ubuntu is not published yet.
-            For now please refer to the folders where the icon themes are installed:
-            \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/suru
-              \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
-            \endlist
-            These 2 separate icon themes will be merged soon.
-
-      If both iconSource and iconName are defined, iconName will be ignored.
-     */
-    property string iconName: action ? action.iconName : ""
-
-    /*!
-      Called when the actionItem is triggered.
-     */
-    signal triggered(var value)
-
-    /*!
-      If \l action is set, this will trigger it.
-    */
-    onTriggered: if (action) action.trigger(value)
-
-    /*!
-      Trigger this action item if it is enabled.
-     */
-    function trigger(value) {
-        var passingValue = value ? value : null
-        if (actionItem.enabled) actionItem.triggered(passingValue);
-    }
-}
 
=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-07-28 15:04:07 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2015-09-08 04:09:38 +0000
@@ -83,10 +83,85 @@
     }
   \endqml
 
+  \note Observe the use of the \c Page::pageStack property in the example above.
+  The same property is used to share the AdaptivePageLayout instance the Page is
+  used in, therefore the same page can be used in a PageStack or in an AdaptivePageLayout.
+  However implementations must make sure the desired PageStack or AdaptivePageLayout
+  function exists in the instance before using it.
+
   AdaptivePageLayout supports adaptive column handling. When the number of columns changes at
   runtime the pages are automatically rearranged.
 
-  \sa PageStack
+  By default the component splits the layout in two columns when the width of the
+  layout exceeds 80 grid units. The first column is sized to 40 grid unit width and
+  the second one to fill the rest of the remaining space. When the 80 grid unit breakpoint
+  is reached, the component will switch from one column to two, and vice versa.
+  These defaults can be overridden through the \l layouts property by defining the
+  possible layouts, their column sizing and the breakpoints when the layouts should
+  be activated. PageColumn configurations must appear in the same order (from left
+  to right) as the columns appear in the layout. If none of the layouts condition
+  is met, a one column layout will be used.
+
+  \qml
+    import QtQuick 2.4
+    import Ubuntu.Components 1.3
+
+    MainView {
+        width: units.gu(100)
+        height: units.gu(60)
+
+        AdaptivePageLayout {
+            anchors.fill: parent
+            primaryPage: page1
+            layouts: PageColumnsLayout {
+                when: width > units.gu(80)
+                // column #0
+                PageColumn {
+                    minimumWidth: units.gu(30)
+                    maximumWidth: units.gu(60)
+                    preferredWidth: units.gu(40)
+                }
+                // column #1
+                PageColumn {
+                    fillWidth: true
+                }
+            }
+
+            Page {
+                id: page1
+                title: "Main page"
+                Column {
+                    Button {
+                        text: "Add Page2 above " + page1.title
+                        onClicked: page1.pageStack.addPageToCurrentColumn(page1, page2)
+                    }
+                    Button {
+                        text: "Add Page3 next to " + page1.title
+                        onClicked: page1.pageStack.addPageToNextColumn(page1, page3)
+                    }
+                }
+            }
+            Page {
+                id: page2
+                title: "Page #2"
+            }
+            Page {
+                id: page3
+                title: "Page #3"
+            }
+        }
+    }
+  \endqml
+
+  A column is considered to be resizable if the \l PageColumn::minimumWidth and
+  \l PageColumn::maximumWidth configuration differs. This implies that if a column
+  is not meant to be resized, it should have \l PageColumn::minimumWidth and
+  \l PageColumn::maximumWidth set to the same value. In the example above, the
+  first column can be resized to a minimum of 30, and a maximum of 60 grid units,
+  and the preferred width is set to 40 grid units. This width is set every time
+  the layout is activated.
+
+  \sa PageStack, PageColumnsLayout, PageColumn
 */
 
 PageTreeNode {
@@ -113,12 +188,86 @@
     property Page primaryPage
 
     /*!
-      \qmlmethod Item addPageToCurrentColumn(Item sourcePage, var page[, var properties])
+      \qmlproperty int columns
+      \readonly
+      The property holds the number of columns shown in the layout.
+      */
+    readonly property alias columns: d.columns
+
+    /*!
+      The property holds the different layout configurations overriding the default
+      configurations. Defaults to an empty list.
+      \sa PageColumnsLayout
+      */
+    property list<PageColumnsLayout> layouts
+
+    /*!
+      \qmlmethod object addPageToCurrentColumn(Item sourcePage, var page[, var properties])
       Adds a \c page to the column the \c sourcePage resides in and removes all pages
       from the higher columns. \c page can be a Component or a file.
-      \c properties is a JSON object containing properties
-      to be set when page is created. \c sourcePage must be active. Returns the
-      instance of the page created.
+      \c properties is a JSON object containing properties to be set when page
+      is created. \c sourcePage must be active.
+
+      The function creates the new page asynchronously if the new \c page to be
+      added is a Component or a QML document. In this case the function returns
+      an incubator which can be used to track the page creation.For more about
+      incubation in QML and creating components asynchronously, see
+      \l {http://doc.qt.io/qt-5/qml-qtqml-component.html#incubateObject-method}
+      {Component.incubateObject()}.
+      The following example removes an element from the list model whenever the
+      page opened in the second column is closed. Note, the example must be run
+      on desktop or on a device with at least 90 grid units screen width.
+      \qml
+      import QtQuick 2.4
+      import Ubuntu.Components 1.3
+
+      MainView {
+          width: units.gu(90)
+          height: units.gu(70)
+
+          Component {
+              id: page2Component
+              Page {
+                  title: "Second Page"
+                  Button {
+                      text: "Close me"
+                      onClicked: pageStack.removePages(pageStack.primaryPage);
+                  }
+              }
+          }
+
+          AdaptivePageLayout {
+              id: pageLayout
+              anchors.fill: parent
+              primaryPage: Page {
+                  title: "Primary Page"
+                  ListView {
+                      id: listView
+                      anchors.fill: parent
+                      model: 10
+                      delegate: ListItem {
+                          Label { text: modelData }
+                          onClicked: {
+                              var incubator = pageLayout.addPageToNextColumn(pageLayout.primaryPage, page2Component);
+                              if (incubator && incubator.status == Component.Loading) {
+                                  incubator.onStatusChanged = function(status) {
+                                      if (status == Component.Ready) {
+                                          // connect page's destruction to decrement model
+                                          incubator.object.Component.destruction.connect(function() {
+                                              listView.model--;
+                                          });
+                                      }
+                                  }
+                              }
+                          }
+                      }
+                  }
+              }
+          }
+      }
+      \endqml
+
+      \sa {http://doc.qt.io/qt-5/qml-qtqml-component.html#incubateObject-method}{Component.incubateObject}
       */
     function addPageToCurrentColumn(sourcePage, page, properties) {
         var nextColumn = d.columnForPage(sourcePage) + 1;
@@ -138,6 +287,7 @@
       holds \c sourcePage) and all following columns, and then add \c page to the next column.
       If \c sourcePage is located in the
       rightmost column, the new page will be pushed to the same column as \c sourcePage.
+      The return value is the same as in \l addPageToCurrentColumn case.
       */
     function addPageToNextColumn(sourcePage, page, properties) {
         var nextColumn = d.columnForPage(sourcePage) + 1;
@@ -168,7 +318,12 @@
       */
 
     Component.onCompleted: {
-        d.relayout();
+        // check layout configuration
+        if (layouts.length > 0) {
+            d.prepareLayouts();
+        } else {
+            d.relayout();
+        }
         d.completed = true;
         if (primaryPage) {
             var wrapper = d.createWrapper(primaryPage);
@@ -183,6 +338,13 @@
             return;
         }
     }
+    onLayoutsChanged: {
+        if (d.completed) {
+            // only deal with this if the layouts array changes after completion
+            // to avoid unnecessary rendering
+            d.prepareLayouts();
+        }
+    }
 
     QtObject {
         id: d
@@ -190,7 +352,12 @@
         property bool completed: false
         property var tree: new Tree.Tree()
 
-        property int columns: layout.width >= units.gu(80) ? 2 : 1
+        property int columns: !layout.layouts.length ?
+                                  (layout.width >= units.gu(80) ? 2 : 1) :
+                                  (activeLayout ? activeLayout.data.length : 1)
+        property PageColumnsLayout activeLayout: null
+        property list<PageColumnsLayout> prevLayouts
+
         /*! internal */
         onColumnsChanged: {
             if (columns <= 0) {
@@ -201,11 +368,10 @@
         }
         property real defaultColumnWidth: units.gu(40)
         onDefaultColumnWidthChanged: body.applyMetrics()
-        property list<ColumnMetrics> columnMetrics
 
         function createWrapper(page, properties) {
             var wrapperComponent = Qt.createComponent("PageWrapper.qml");
-            var wrapperObject = wrapperComponent.createObject(hiddenPages);
+            var wrapperObject = wrapperComponent.createObject(hiddenPages, {synchronous: false});
             wrapperObject.pageStack = layout;
             wrapperObject.properties = properties;
             // set reference last because it will trigger creation of the object
@@ -221,7 +387,14 @@
             // replace page holder's child
             var holder = body.children[targetColumn];
             holder.detachCurrentPage();
-            holder.attachPage(pageWrapper)
+            if ((pageWrapper.incubator && pageWrapper.incubator.status == Component.Ready) || pageWrapper.object) {
+                holder.attachPage(pageWrapper);
+            } else {
+                // asynchronous, connect to page load completion and attach when page is available
+                pageWrapper.pageLoaded.connect(function () {
+                    holder.attachPage(pageWrapper);
+                });
+            }
         }
 
         function getWrapper(page) {
@@ -279,7 +452,7 @@
             newWrapper.parentPage = sourcePage;
             newWrapper.column = column;
             d.addWrappedPage(newWrapper);
-            return newWrapper.object;
+            return newWrapper.incubator;
         }
 
         // update the page for the specified column
@@ -301,6 +474,33 @@
             }
         }
 
+        // prepares layout management, listens on layout condition changes and performs re-layouting
+        function prepareLayouts() {
+            // disconnect from the previous layouts
+            for (var i = 0; i < prevLayouts.length; i++) {
+                prevLayouts[i].whenChanged.disconnect(updateLayout);
+            }
+            prevLayouts = layouts;
+            for (var i = 0; i < layouts.length; i++) {
+                layouts[i].whenChanged.connect(updateLayout);
+            }
+            // first time evaluation
+            updateLayout();
+        }
+
+        // function called when one of the layout condition is satisfied
+        function updateLayout() {
+            var newLayout = null;
+            for (var i = 0; i < layouts.length; i++) {
+                // get the first affirmative condition
+                if (layouts[i].when) {
+                    newLayout = layouts[i];
+                    break;
+                }
+            }
+            d.activeLayout = newLayout;
+        }
+
         // relayouts when column count changes
         function relayout() {
             if (body.children.length == d.columns) return;
@@ -357,8 +557,8 @@
     // default metrics
     Component {
         id: defaultMetrics
-        ColumnMetrics {
-            fillWidth: column == d.columns
+        PageColumn {
+            fillWidth: __column == d.columns
             minimumWidth: d.defaultColumnWidth
         }
     }
@@ -376,13 +576,12 @@
             property PageWrapper pageWrapper
             property int column
             property alias config: subHeader.config
-            property ColumnMetrics metrics: setDefaultMetrics()
+            property PageColumn metrics: getDefaultMetrics()
+            readonly property real dividerThickness: units.dp(1)
 
             Layout.fillWidth: metrics.fillWidth
             Layout.fillHeight: true
-            Layout.preferredWidth: metrics.maximumWidth > 0 ?
-                                       MathUtils.clamp(d.defaultColumnWidth, metrics.minimumWidth, metrics.maximumWidth) :
-                                       d.defaultColumnWidth
+            Layout.preferredWidth: MathUtils.clamp(metrics.preferredWidth, metrics.minimumWidth, metrics.maximumWidth)
             Layout.minimumWidth: metrics.minimumWidth
             Layout.maximumWidth: metrics.maximumWidth
 
@@ -396,7 +595,7 @@
                     bottom: parent.bottom
                     left: parent.left
                     right: parent.right
-                    rightMargin: verticalDivider.width
+                    rightMargin: dividerThickness
                 }
                 // we need to clip because the header does not have a background
                 clip: true
@@ -412,7 +611,7 @@
                 }
                 height: body.headerHeight
 
-                styleName: config ? "PageHeadStyle" : ""
+                styleName: "PageHeadStyle"
                 theme.version: Ubuntu.toolkitVersion
                 objectName: "Header" + column
 
@@ -457,9 +656,52 @@
                     top: parent.top
                     bottom: parent.bottom
                     right: parent.right
+                    rightMargin: dividerThickness
                 }
                 width: (column == (d.columns - 1)) || !pageWrapper ? 0 : units.dp(1)
-                color: subHeader.dividerColor
+                color: theme.palette.selected.background
+                MouseArea {
+                    id: resizerSensing
+                    objectName: "Divider"
+                    enabled: verticalDivider.width > 0
+                    anchors {
+                        fill: parent
+                        leftMargin: enabled ? -units.gu(1) : 0
+                        rightMargin: enabled ? -units.gu(1) : 0
+                    }
+                    cursorShape: Qt.SizeHorCursor
+                    drag {
+                        axis: Drag.XAxis
+                        target: resizer
+                        smoothed: false
+                        minimumX: holder.Layout.minimumWidth
+                        maximumX: holder.Layout.maximumWidth
+                    }
+                    onPressed: resizer.x = holder.Layout.preferredWidth
+                }
+                states: State {
+                    name: "active"
+                    when: resizerSensing.pressed
+                    PropertyChanges {
+                        target: verticalDivider
+                        color: Qt.darker(theme.palette.normal.background, 1.5)
+                    }
+                }
+                transitions: Transition {
+                    from: ""
+                    to: "*"
+                    reversible: true
+                    ColorAnimation {
+                        target: verticalDivider
+                        property: "color"
+                        duration: UbuntuAnimation.SlowDuration
+                    }
+                }
+            }
+            Item {
+                id: resizer
+                height: parent.height
+                onXChanged: holder.Layout.preferredWidth = x
             }
 
             function attachPage(page) {
@@ -488,9 +730,9 @@
                 return wrapper;
             }
 
-            function setDefaultMetrics() {
+            function getDefaultMetrics() {
                 var result = defaultMetrics.createObject(holder);
-                result.column = Qt.binding(function() { return holder.column + 1; });
+                result.__column = Qt.binding(function() { return holder.column + 1; });
                 return result;
             }
         }
@@ -545,15 +787,9 @@
             for (var i = 0; i < children.length; i++) {
                 var holder = children[i];
                 // search for the column metrics
-                var metrics = null;
-                for (var j = 0; j < d.columnMetrics.length; j++) {
-                    if (d.columnMetrics[j].column == (i + 1)) {
-                        metrics = d.columnMetrics[j];
-                        break;
-                    }
-                }
+                var metrics = d.activeLayout ? d.activeLayout.data[i] : null;
                 if (!metrics) {
-                    metrics = holder.setDefaultMetrics();
+                    metrics = holder.getDefaultMetrics();
                 }
                 holder.metrics = metrics;
                 updateHeaderHeight(0);
 
=== modified file 'src/Ubuntu/Components/1.3/AppHeader.qml'
--- src/Ubuntu/Components/1.3/AppHeader.qml	2015-08-03 15:02:42 +0000
+++ src/Ubuntu/Components/1.3/AppHeader.qml	2015-09-08 04:09:38 +0000
@@ -184,11 +184,6 @@
     }
 
     /*!
-      Set by \l MainView
-     */
-    property bool useDeprecatedToolbar: true
-
-    /*!
       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
@@ -355,5 +350,5 @@
     }
 
     theme.version: Components.Ubuntu.toolkitVersion
-    styleName: header.useDeprecatedToolbar ? "HeaderStyle" : "PageHeadStyle"
+    styleName: "PageHeadStyle"
 }
 
=== modified file 'src/Ubuntu/Components/1.3/Button.qml'
--- src/Ubuntu/Components/1.3/Button.qml	2015-05-26 15:05:46 +0000
+++ src/Ubuntu/Components/1.3/Button.qml	2015-09-08 04:09:38 +0000
@@ -105,7 +105,7 @@
     /*!
       The font used for the button's text.
     */
-    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
+    property font font: __styleInstance.defaultFont
 
     /*!
        The position of the icon relative to the text. Options
 
=== modified file 'src/Ubuntu/Components/1.3/ComboButton.qml'
--- src/Ubuntu/Components/1.3/ComboButton.qml	2015-05-21 10:50:35 +0000
+++ src/Ubuntu/Components/1.3/ComboButton.qml	2015-09-08 04:09:38 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.4
+import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 
 /*!
 
=== removed file 'src/Ubuntu/Components/1.3/Header.qml'
--- src/Ubuntu/Components/1.3/Header.qml	2015-04-25 08:54:58 +0000
+++ src/Ubuntu/Components/1.3/Header.qml	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.4
-
-/*!
-    \qmltype Header
-    \internal
-    \deprecated
-*/
-AppHeader {
-
-    /*!
-      \internal
-      We need this property so QML exposes this class as Header instead of
-      AppHeader. This way autopilot can select the deprecated header.
-    */
-    property string _for_autopilot
-
-    Component.onCompleted: {
-        print("WARNING: Header is an internal component of Ubuntu.Components and" +
-              "its API may change or be removed at any moment." +
-              "Please use MainView and Page instead."
-              );
-    }
-}
 
=== modified file 'src/Ubuntu/Components/1.3/MainView.qml'
--- src/Ubuntu/Components/1.3/MainView.qml	2015-08-10 15:35:04 +0000
+++ src/Ubuntu/Components/1.3/MainView.qml	2015-09-08 04:09:38 +0000
@@ -191,9 +191,6 @@
                         window.title = headerItem.title
                 }
             }
-
-            // Use of the deprecated toolbar is no longer supported in MainView 1.2.
-            useDeprecatedToolbar: false
         }
 
         Connections {
 
=== modified file 'src/Ubuntu/Components/1.3/MainViewBase.qml'
--- src/Ubuntu/Components/1.3/MainViewBase.qml	2015-08-06 22:32:02 +0000
+++ src/Ubuntu/Components/1.3/MainViewBase.qml	2015-09-08 04:09:38 +0000
@@ -28,6 +28,8 @@
 */
 PageTreeNode {
     id: mainView
+    styleName: "MainViewStyle"
+
     /*!
       The property holds the application's name, which must be the same as the
       desktop file's name.
@@ -53,7 +55,7 @@
 
       \sa backgroundColor, footerColor
     */
-    property alias headerColor: background.headerColor
+    property color headerColor: backgroundColor
 
     /*!
       \qmlproperty color MainView::backgroundColor
@@ -80,7 +82,7 @@
 
       \sa footerColor, headerColor
     */
-    property alias backgroundColor: background.backgroundColor
+    property color backgroundColor: theme.palette.normal.background
 
     /*!
       \qmlproperty color MainView::footerColor
@@ -88,22 +90,12 @@
 
       \sa backgroundColor, headerColor
     */
-    property alias footerColor: background.footerColor
-
-    // 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.
-    Toolkit.StyledItem {
-        id: background
-        anchors.fill: parent
-        // theme is inherited from PageTreeNode, no need to update versioning
-        styleName: "MainViewStyle"
-
-        // FIXME: Define the colors in MainViewStyle and get rid of the properties
-        //  in MainViewBase.
-        property color headerColor: backgroundColor
-        property color backgroundColor: theme.palette.normal.background
-        property color footerColor: backgroundColor
+    property color footerColor: backgroundColor
+
+    Toolkit.Object {
+        id: autoTheme
+        // FIXME: Define the background colors in MainViewStyle and get rid of the properties
+        //  in MainViewBase. That removes the need for auto-theming.
 
         /*
           As we don't know the order the property bindings and onXXXChanged signals are evaluated
@@ -113,18 +105,23 @@
           Qt bug: https://bugreports.qt-project.org/browse/QTBUG-11712
          */
 
-        onBackgroundColorChanged: {
-            if (backgroundColor != theme.palette.normal.background) {
-                // custom color, proceed with auto-theming
-                autoThemeName = (ColorUtils.luminance(backgroundColor) >= 0.85) ?
-                                                   "Ambiance" : "SuruDark";
+        Connections {
+            target: mainView
+
+            onBackgroundColorChanged: {
+                if (mainView.backgroundColor != theme.palette.normal.background) {
+                    // custom color, proceed with auto-theming
+                    autoTheme.themeName = (ColorUtils.luminance(backgroundColor) >= 0.85) ?
+                                "Ambiance" : "SuruDark";
+                }
             }
         }
-        property string autoThemeName
-        onAutoThemeNameChanged: {
+
+        property string themeName
+        onThemeNameChanged: {
             // only change the theme if the current one is a system one.
-            if (autoThemeName !== "" && (theme.name.search("Ubuntu.Components.Themes") == 0)) {
-                mainView.theme.name = "Ubuntu.Components.Themes.%1".arg(autoThemeName);
+            if (themeName !== "" && (theme.name.search("Ubuntu.Components.Themes") == 0)) {
+                mainView.theme.name = "Ubuntu.Components.Themes.%1".arg(themeName);
             }
         }
     }
 
=== renamed file 'src/Ubuntu/Components/1.3/ColumnMetrics.qml' => 'src/Ubuntu/Components/1.3/PageColumn.qml'
--- src/Ubuntu/Components/1.3/ColumnMetrics.qml	2015-06-24 16:16:13 +0000
+++ src/Ubuntu/Components/1.3/PageColumn.qml	2015-09-08 04:09:38 +0000
@@ -17,37 +17,42 @@
 import QtQuick 2.4
 
 /*!
-  \qmltype ColumnMetrics
+  \qmltype PageColumn
   \inqmlmodule Ubuntu.Components 1.3
   \since Ubuntu.Components 1.3
   \ingroup ubuntu
-  \brief Component configuring the metrics of a column in MultiColumnView.
-  \internal
+  \brief Component configuring the metrics of a column in AdaptivePageLayout.
 
   */
 QtObject {
     /*!
       1-based value identifying the column the metrics to be applied to.
+      \internal
       */
-    property int column
+    property int __column
 
     /*!
       Specifies whether the width of the column should fill the available space
-      of the MultiColumnView column or not. Defaults to \a false.
+      of the AdaptivePageLayout column or not. Defaults to \a false.
       */
     property bool fillWidth: false
 
     /*!
-      Specifies the minimum width of the column. If the value is greater than
-      \b MultiColumnView::defaultColumnWidth, the value will be set as width for
-      the column.
+      Specifies the minimum width of the column. Defaults to 0.
       */
     property real minimumWidth: 0
 
     /*!
-      Specifies the maximum width of the column. If the value is smaller than
-      \b MultiColumnView::defaultColumnWidth, the value will be set as width for
-      the column. A maximum value of 0 will be ignored.
+      Specifies the maximum width of the column. A maximum value of 0 will be ignored.
+      Defaults to the maximum positive value.
       */
     property real maximumWidth: Number.POSITIVE_INFINITY
+
+    /*!
+      Specifies the preferred width of the column when the layout is initialized.
+      Defaults to 0. AdaptivePageLayout clamps the given value between \l minimumWidth
+      and \l maximumWidth. The value must be set if the \l fillWidth and \l minimumWidth
+      are not set.
+      */
+    property real preferredWidth: 0
 }
 
=== added file 'src/Ubuntu/Components/1.3/PageColumnsLayout.qml'
--- src/Ubuntu/Components/1.3/PageColumnsLayout.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/1.3/PageColumnsLayout.qml	2015-09-08 04:09:38 +0000
@@ -0,0 +1,115 @@
+/*
+ * 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
+
+/*!
+  \qmltype PageColumnsLayout
+  \inqmlmodule Ubuntu.Components 1.3
+  \since Ubuntu.Components 1.3
+  \ingroup ubuntu
+  \brief Component configuring a layout in an AdaptivePageLayout component.
+
+  The component specifies the column configuration of a specific layout. The layout
+  will have as many columns as many PageColumn elements will be declared. The layout
+  will be activated when the \l when property evaluates to \c true. There can be
+  many layouts evaluated to true, only the first one evaluated to true in the
+  \l AdaptivePageLayout::layouts list will be activated.
+
+  \qml
+    import QtQuick 2.4
+    import Ubuntu.Components 1.3
+
+    MainView {
+        width: units.gu(100)
+        height: units.gu(60)
+
+        AdaptivePageLayout {
+            anchors.fill: parent
+            primaryPage: page1
+            layouts: [
+                PageColumnsLayout {
+                    when: width > units.gu(80)
+                    // column #0
+                    PageColumn {
+                        minimumWidth: units.gu(30)
+                        maximumWidth: units.gu(60)
+                        preferredWidth: units.gu(40)
+                    }
+                    // column #1
+                    PageColumn {
+                        fillWidth: true
+                    }
+                },
+                PageColumnsLayout {
+                    when: true
+                    PageColumn {
+                        fillWidth: true
+                        minimumWidth: units.gu(10)
+                    }
+                }
+            ]
+
+            Page {
+                id: page1
+                title: "Main page"
+                Column {
+                    Button {
+                        text: "Add Page2 above " + page1.title
+                        onClicked: page1.pageStack.addPageToCurrentColumn(page1, page2)
+                    }
+                    Button {
+                        text: "Add Page3 next to " + page1.title
+                        onClicked: page1.pageStack.addPageToNextColumn(page1, page3)
+                    }
+                }
+            }
+            Page {
+                id: page2
+                title: "Page #2"
+            }
+            Page {
+                id: page3
+                title: "Page #3"
+            }
+        }
+    }
+  \endqml
+  In the example above the second PageColumnLayout's condition is always set to
+  true, which means that that the layout will be always active unless the first
+  layout's condition evaluates to true. The layout overrides the single column
+  minimumWidth default value. Note that \l PageColumn::fillWidth must be also set.
+
+  \note When none of the conditions is met, a single column layout will be used.
+
+  \sa PageColumn
+  */
+QtObject {
+    id: layout
+
+    /*!
+      Condition activating the layout. Defaults to false.
+      */
+    property bool when: false
+
+    /*!
+      \qmlproperty list<PageColumn> data
+      \default
+      Default property holding the PageColumn elements configuring each column.
+      */
+    default property alias data: layout.__data
+    property list<PageColumn> __data
+}
 
=== modified file 'src/Ubuntu/Components/1.3/PageWrapper.qml'
--- src/Ubuntu/Components/1.3/PageWrapper.qml	2015-06-15 07:45:34 +0000
+++ src/Ubuntu/Components/1.3/PageWrapper.qml	2015-09-08 04:09:38 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.4
-import "../1.2/PageWrapperUtils.js" as Utils
+import "PageWrapperUtils.js" as Utils
 
 /*!
     \internal
@@ -66,6 +66,22 @@
     property Item pageHolder
 
     /*!
+      Instructs to load the page synchronously or not. Used by AdaptivePageLayout.
+      True by default to keep PageStack integrity.
+      */
+    property bool synchronous: true
+
+    /*!
+      Incubator for the asynchronous page creation
+      */
+    property var incubator: null
+
+    /*!
+      Signal emitted when incubator completes page loading.
+      */
+    signal pageLoaded()
+
+    /*!
       Returns true if the current PageWrapper is a child of the given page
       */
     function childOf(page) {
@@ -114,7 +130,14 @@
         if (pageWrapper.object) pageWrapper.object = null;
         Utils.initPage(pageWrapper);
         if (pageWrapper.active && reference) {
-            Utils.activate(pageWrapper);
+            if ((pageWrapper.incubator && pageWrapper.incubator.status == Component.Ready) || pageWrapper.object) {
+                Utils.activate(pageWrapper);
+            } else {
+                // asynchronous, connect page activation
+                pageLoaded.connect(function () {
+                    Utils.activate(pageWrapper);
+                });
+            }
         }
     }
 
 
=== added file 'src/Ubuntu/Components/1.3/PageWrapperUtils.js'
--- src/Ubuntu/Components/1.3/PageWrapperUtils.js	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/1.3/PageWrapperUtils.js	2015-09-08 04:09:38 +0000
@@ -0,0 +1,167 @@
+/*
+ * 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/>.
+ */
+
+//.pragma library // FIXME: cannot refer to Component.Error if I use this.
+// FIXME: ideally we would make this a stateless library, but that breaks applications
+//  that rely on accessing context variables in pages that were pushed on a PageStack
+//  by url (PageStack.push("FileName.qml")) because of a Qt bug:
+//  https://bugreports.qt-project.org/browse/QTBUG-31347
+
+/*!
+  \internal
+  Incubator wrapper object. Used when page is loaded asynchronously.
+  */
+
+function Incubator(pageWrapper, pageComponent) {
+    // private variable for QmlIncubatorObject
+    var incubator = null;
+
+    // public API
+    this.status = Component.Ready;
+    this.object = null;
+    this.onStatusChanged = null;
+    this.forceCompletion = function () {
+        if (incubator) {
+            incubator.forceCompletion();
+        }
+    }
+
+    // internal function to catch status changes
+    function incubatorStatusChanged(status) {
+        // update wrapper incubator fields
+        pageWrapper.incubator.status = status;
+        pageWrapper.incubator.object = pageWrapper.object = incubator.object;
+
+        // emit pageWrapper's pageLoaded signal to complete page activation and loading
+        if (status === Component.Ready) {
+            pageWrapper.pageLoaded();
+        }
+
+        // forward state change to the user
+        if (pageWrapper.incubator.onStatusChanged) {
+            // call onStatusChanged
+            pageWrapper.incubator.onStatusChanged(status);
+        }
+
+        // cleanup of ready or error
+        if (status !== Component.Loading) {
+            pageWrapper.incubator = null;
+            incubator = null;
+        }
+    }
+
+    if (pageWrapper.properties) {
+        incubator = pageComponent.incubateObject(pageWrapper, pageWrapper.properties);
+    } else {
+        incubator = pageComponent.incubateObject(pageWrapper);
+    }
+
+    this.status = incubator.status;
+    if (incubator.status != Component.Ready) {
+        incubator.onStatusChanged = incubatorStatusChanged;
+    } else {
+        incubatorStatusChanged(incubator.status);
+    }
+}
+
+/*******************************************************
+ *
+ */
+/*!
+  \internal
+  Initialize pageWrapper.object.
+ */
+function initPage(pageWrapper) {
+    var pageComponent;
+
+    if (pageWrapper.reference.createObject) {
+        // page reference is a component
+        pageComponent = pageWrapper.reference;
+    } else if (typeof pageWrapper.reference == "string") {
+        // page reference is a string (url)
+        pageComponent = Qt.createComponent(pageWrapper.reference);
+    }
+
+    // PageWrapper can override the synchronous loading
+    var synchronous = pageWrapper.hasOwnProperty("synchronous") ? pageWrapper.synchronous : true;
+
+    if (pageComponent) {
+        if (pageComponent.status === Component.Error) {
+            throw new Error("Error while loading page: " + pageComponent.errorString());
+        } else {
+            // create the object
+            pageWrapper.incubator = new Incubator(pageWrapper, pageComponent);
+            if (synchronous) {
+                pageWrapper.incubator.forceCompletion();
+            }
+            pageWrapper.canDestroy = true;
+        }
+    } else {
+        // page reference is an object
+        pageWrapper.object = pageWrapper.reference;
+        pageWrapper.object.parent = pageWrapper;
+        pageWrapper.canDestroy = false;
+
+        // copy the properties to the page object
+        for (var prop in pageWrapper.properties) {
+            if (pageWrapper.properties.hasOwnProperty(prop)) {
+                pageWrapper.object[prop] = pageWrapper.properties[prop];
+            }
+        }
+    }
+
+    return pageWrapper.object;
+}
+
+/*!
+  \internal
+  Create the page object if needed, and make the page object visible.
+ */
+function activate(pageWrapper) {
+    if (!pageWrapper.object) {
+        initPage(pageWrapper);
+    }
+
+    // Having the same page pushed multiple times on a stack changes
+    // the parent of the page object. Change it back here.
+    pageWrapper.object.parent = pageWrapper;
+
+    // Some page objects are invisible initially. Make visible.
+
+    pageWrapper.object.visible = true;
+    pageWrapper.active = true;
+}
+
+/*!
+  \internal
+  Hide page object.
+ */
+function deactivate(pageWrapper) {
+    pageWrapper.active = false;
+}
+
+/*!
+  \internal
+  Destroy the page object if pageWrapper.canDestroy is true.
+  Do nothing if pageWrapper.canDestroy is false.
+ */
+function destroyObject(pageWrapper) {
+    if (pageWrapper.canDestroy) {
+        pageWrapper.object.destroy();
+        pageWrapper.object = null;
+        pageWrapper.canDestroy = false;
+    }
+}
 
=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
--- src/Ubuntu/Components/1.3/TextField.qml	2015-08-11 17:15:59 +0000
+++ src/Ubuntu/Components/1.3/TextField.qml	2015-09-08 04:09:38 +0000
@@ -99,7 +99,7 @@
     \note During text selection all interactive parent Flickables are turned off.
 */
 
-ActionItem {
+Ubuntu.ActionItem {
     id: control
 
     implicitWidth: units.gu(25)
@@ -896,7 +896,7 @@
         }
     }
 
-    AbstractButton {
+    Ubuntu.AbstractButton {
         id: clearButton
         objectName: "clear_button"
         activeFocusOnPress: false
 
=== modified file 'src/Ubuntu/Components/ComponentModule.pro'
--- src/Ubuntu/Components/ComponentModule.pro	2015-07-29 10:12:07 +0000
+++ src/Ubuntu/Components/ComponentModule.pro	2015-09-08 04:09:38 +0000
@@ -25,7 +25,6 @@
 
 #1.2
 QML_FILES += 1.2/AbstractButton.qml \
-             1.2/ActionItem.qml \
              1.2/ActionList.qml \
              1.2/ActivityIndicator.qml \
              1.2/AnimatedItem.qml \
@@ -81,9 +80,7 @@
              1.2/UbuntuNumberAnimation.qml
 
 #1.3
-QML_FILES += 1.3/AbstractButton.qml \
-             1.3/ActionBar.qml \
-             1.3/ActionItem.qml \
+QML_FILES += 1.3/ActionBar.qml \
              1.3/ActionList.qml \
              1.3/ActivityIndicator.qml \
 	     1.3/AdaptivePageLayout.qml \
@@ -92,12 +89,10 @@
              1.3/Button.qml \
              1.3/Captions.qml \
              1.3/CheckBox.qml \
-	     1.3/ColumnMetrics.qml \
              1.3/ComboButton.qml \
              1.3/CrossFadeImage.qml \
              1.3/dateUtils.js \
              1.3/DraggingArea.qml \
-             1.3/Header.qml \
              1.3/InputHandler.qml \
              1.3/Label.qml \
              1.3/MainViewBase.qml \
@@ -114,6 +109,7 @@
              1.3/PageTreeNode.qml \
              1.3/pageUtils.js \
              1.3/PageWrapper.qml \
+             1.3/PageWrapperUtils.js \
              1.3/Panel.qml \
              1.3/ProgressBar.qml \
              1.3/PullToRefresh.qml \
@@ -137,9 +133,12 @@
              1.3/UbuntuListView.qml \
              1.3/UbuntuNumberAnimation.qml \
              1.3/ListItemPopover.qml \
-             1.3/BottomEdgeHint.qml
+             1.3/BottomEdgeHint.qml \
+             1.3/PageColumn.qml \
+             1.3/PageColumnsLayout.qml
 
-OTHER_FILES+= 1.3/CrossFadeImage.qdoc \
+OTHER_FILES+= qmldir \
+             1.3/CrossFadeImage.qdoc \
              1.3/UbuntuListView11.qdoc \
              1.3/Page.qdoc \
              1.3/PageHeadConfiguration.qdoc \
 
=== modified file 'src/Ubuntu/Components/ListItems/1.3/SingleControl.qml'
--- src/Ubuntu/Components/ListItems/1.3/SingleControl.qml	2015-04-29 07:21:29 +0000
+++ src/Ubuntu/Components/ListItems/1.3/SingleControl.qml	2015-09-08 04:09:38 +0000
@@ -54,7 +54,8 @@
 
     /*! \internal */
     onClicked: if (control && control.enabled && control.hasOwnProperty("clicked")) control.clicked()
-    pressed: __mouseArea.pressed || (control && control.hasOwnProperty("pressed") && control.pressed)
+    /*! \internal */
+    property bool pressed: __mouseArea.pressed || (control && control.hasOwnProperty("pressed") && control.pressed)
     /*! \internal */
     onPressedChanged: if (control && control.enabled && control.hasOwnProperty("pressed")) control.pressed = singleControlListItem.pressed
 
 
=== modified file 'src/Ubuntu/Components/Popups/1.3/Popover.qml'
--- src/Ubuntu/Components/Popups/1.3/Popover.qml	2015-07-19 17:54:49 +0000
+++ src/Ubuntu/Components/Popups/1.3/Popover.qml	2015-09-08 04:09:38 +0000
@@ -210,7 +210,7 @@
         objectName: "popover_foreground"
 
         //styling properties
-        property real minimumWidth: units.gu(25)
+        property real minimumWidth: units.gu(40)
 
         property real maxWidth: dismissArea ? (internal.portrait ? dismissArea.width : dismissArea.width * 3/4) : 0.0
         property real maxHeight: dismissArea ? (internal.portrait ? dismissArea.height * 3/4 : dismissArea.height) : 0.0
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.2/ListItemStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.2/ListItemStyle.qml	2015-07-22 18:57:58 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.2/ListItemStyle.qml	2015-09-08 04:09:38 +0000
@@ -25,7 +25,7 @@
      * Take over the ListItem's index context property as repeater used in panel
      * overrides the property.
      */
-    readonly property int listItemIndex: index
+    readonly property int listItemIndex: (typeof index !== "undefined") ? index : internals.childIndex()
 
     /*
      * Coloring properties
@@ -343,6 +343,19 @@
         readonly property real threshold: units.gu(1.5)
         property bool snapIn: false
 
+        // returns the child index of the ListItem when not used in model driven view
+        function childIndex() {
+            if (styledItem.parent) {
+                for (var i = 0; i < styledItem.parent.children.length; i++) {
+                    if (styledItem.parent.children[i] == styledItem) {
+                        return i;
+                    }
+                }
+            } else {
+                return -1;
+            }
+        }
+
         // update snap direction
         function updateSnapDirection() {
             if (prevX < listItemStyle.x && (snapChangerLimit <= listItemStyle.x)) {
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2015-05-22 10:48:49 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml	2015-09-08 04:09:38 +0000
@@ -87,8 +87,6 @@
                     id: actionsOverflowPopover
                     objectName: "actions_overflow_panel"
 
-                    backgroundColor: "white"
-
                     // Ensure the popover closes when actions change and
                     // the list item below may be destroyed before its
                     // onClicked is executed. See bug
 
=== removed file 'src/Ubuntu/Components/Themes/Ambiance/1.3/HeadDividerStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/HeadDividerStyle.qml	2015-04-24 14:07:02 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/HeadDividerStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright 2014 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import QtQuick 2.4
-
-/*!
-  This component is DEPRECATED and no longer used. The divider is now a simple line.
- */
-Item {
-    id: dividerStyle
-
-    property color color: styledItem.backgroundColor
-
-    // Do not make the following two colors part of the style API as they may be deprecated soon.
-    property color topColor: Qt.darker(color, 1.1)
-    property color bottomColor: Qt.lighter(color, 1.2)
-
-    Rectangle {
-        anchors.fill: parent
-        color: dividerStyle.color
-
-        gradient: Gradient {
-            // top shadow
-            GradientStop {
-                position: 0.02
-                color: dividerStyle.topColor
-            }
-            // middle (background)
-            GradientStop {
-                position: 0.05
-                color: dividerStyle.color
-            }
-            GradientStop {
-                position: 0.95
-                color: dividerStyle.color
-            }
-            // bottom highlight
-            GradientStop {
-                position: 0.98
-                color: dividerStyle.bottomColor
-            }
-        }
-    }
-}
 
=== removed file 'src/Ubuntu/Components/Themes/Ambiance/1.3/HeaderStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/HeaderStyle.qml	2015-04-24 14:07:02 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/HeaderStyle.qml	1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-/*
- * Copyright 2015 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-import QtQuick 2.4
-import Ubuntu.Components 1.3
-
-Item {
-    id: headerStyle
-    /*!
-      The height of the headercontents, which is the full height of
-      the header minus the separators shown at the bottom of it.
-     */
-    property real contentHeight: units.gu(7.5)
-
-    /*!
-      The source of the image that separates the header from the contents of a \l MainView.
-      The separator will be drawn over the contents.
-     */
-    property url separatorSource: Qt.resolvedUrl("../artwork/PageHeaderBaseDividerLight.sci")
-
-    /*!
-      The source of an additional image attached to the bottom of the separator. The contents
-      of the \l MainView will be drawn on top of the separator bottom image.
-     */
-    property url separatorBottomSource: Qt.resolvedUrl("../artwork/PageHeaderBaseDividerBottom.png")
-
-    property int fontWeight: Font.Light
-    property string fontSize: "x-large"
-    property color textColor: theme.palette.selected.backgroundText
-    property real textLeftMargin: units.gu(2)
-
-    implicitHeight: headerStyle.contentHeight + separator.height + separatorBottom.height
-
-    /*!
-      \internal
-      Tabs needs to call sync of the TabBar
-     */
-    property TabBar __tabBar: tabBarLoader.sourceComponent ? tabBarLoader.item : null
-
-    BorderImage {
-        id: separator
-        anchors {
-            bottom: parent.bottom
-            left: parent.left
-            right: parent.right
-        }
-        source: headerStyle.separatorSource
-    }
-    Image {
-        id: separatorBottom
-        anchors {
-            top: separator.bottom
-            left: parent.left
-            right: parent.right
-        }
-        source: headerStyle.separatorBottomSource
-    }
-
-    Item {
-        id: foreground
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: parent.top
-        }
-        height: headerStyle.contentHeight
-
-        Label {
-            LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
-
-            anchors {
-                left: parent.left
-                verticalCenter: parent.verticalCenter
-                leftMargin: headerStyle.textLeftMargin
-            }
-            text: styledItem.title
-            font.weight: headerStyle.fontWeight
-            visible: !styledItem.tabsModel && !styledItem.contents
-            fontSize: headerStyle.fontSize
-            color: headerStyle.textColor
-        }
-
-        Binding {
-            target: styledItem.contents
-            property: "anchors.fill"
-            value: foreground
-            when: styledItem.contents
-        }
-        Binding {
-            target: styledItem.contents
-            property: "parent"
-            value: foreground
-            when: styledItem.contents
-        }
-
-        Loader {
-            id: tabBarLoader
-            sourceComponent: styledItem.tabsModel && !styledItem.contents ? tabBarComponent : null
-            anchors.fill: parent
-        }
-
-        Component {
-            id: tabBarComponent
-            TabBar {
-                id: tabBar
-                anchors.fill: parent
-                model: styledItem.tabsModel
-                animate: styledItem.animate
-            }
-        }
-    }
-}
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml	2015-07-22 18:57:58 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml	2015-09-08 04:09:38 +0000
@@ -337,6 +337,7 @@
         property real snapChangerLimit: 0.0
         readonly property real threshold: units.gu(1.5)
         property bool snapIn: false
+        property bool completed: false
 
         // update snap direction
         function updateSnapDirection() {
@@ -419,4 +420,68 @@
     function rebound() {
         snapAnimation.snapTo(0);
     }
+
+    // expansion
+    Component.onCompleted: internals.completed = true
+    state: (internals.completed && styledItem.expansion.expanded) ? (listItemStyle.flickable ? "expandedWithFlickable" : "expandedNoFlickable") : ""
+    states: [
+        State {
+            name: "expandedNoFlickable"
+            PropertyChanges {
+                target: styledItem
+                height: styledItem.expansion.height
+            }
+        },
+        State {
+            name: "expandedWithFlickable"
+            PropertyChanges {
+                target: styledItem
+                height: styledItem.expansion.height
+            }
+            PropertyChanges {
+                target: listItemStyle.flickable
+                // we do not need to restore the original values
+                restoreEntryValues: false
+                // and we should not get any binding updates even
+                explicit: true
+                contentY: {
+                    var bottom = styledItem.y + styledItem.expansion.height - listItemStyle.flickable.contentY + listItemStyle.flickable.originY;
+                    var dy = bottom - listItemStyle.flickable.height;
+                    if (dy > 0) {
+                        return listItemStyle.flickable.contentY + dy - listItemStyle.flickable.originY;
+                    } else {
+                        return listItemStyle.flickable.contentY;
+                    }
+                }
+            }
+        }
+    ]
+    transitions: [
+        Transition {
+            from: ""
+            to: "expandedWithFlickable"
+            reversible: true
+            enabled: listItemStyle.animatePanels
+            ParallelAnimation {
+                UbuntuNumberAnimation {
+                    target: listItemStyle.flickable
+                    property: "contentY"
+                }
+                UbuntuNumberAnimation {
+                    target: styledItem
+                    property: "height"
+                }
+            }
+        },
+        Transition {
+            from: ""
+            to: "expandedNoFlickable"
+            reversible: true
+            enabled: listItemStyle.animatePanels
+            UbuntuNumberAnimation {
+                target: styledItem
+                property: "height"
+            }
+        }
+    ]
 }
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml	2015-04-29 08:55:31 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/OverflowPanel.qml	2015-09-08 04:09:38 +0000
@@ -32,7 +32,7 @@
     /*!
       The background color of the tabs panel and the actions overflow panel.
      */
-    property color backgroundColor: styledItem.panelColor
+    property color backgroundColor: theme.palette.normal.background
 
     /*!
       The background color of the tapped item in the panel.
 
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
--- src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-06-18 08:03:55 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2015-09-08 04:09:38 +0000
@@ -84,8 +84,6 @@
              1.3/DialerHandStyle.qml \
              1.3/DialerStyle.qml \
              1.3/DialogForegroundStyle.qml \
-             1.3/HeadDividerStyle.qml \
-             1.3/HeaderStyle.qml \
              1.3/HighlightMagnifier.qml \
              1.3/ListItemOptionSelectorStyle.qml \
              1.3/ListItemStyle.qml \
 
=== modified file 'src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp'
--- src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp	2014-09-01 06:56:39 +0000
+++ src/Ubuntu/Components/plugin/adapters/actionsproxy_p.cpp	2015-09-08 04:09:38 +0000
@@ -90,18 +90,18 @@
     }
     if (watch) {
         // connect to action proxy
-        QObject::connect(context, SIGNAL(activeChanged(bool)),
-                         this, SLOT(handleContextActivation(bool)),
+        QObject::connect(context, SIGNAL(activeChanged()),
+                         this, SLOT(handleContextActivation()),
                          Qt::DirectConnection);
     } else {
         // disconnect
-        QObject::disconnect(context, SIGNAL(activeChanged(bool)),
-                         this, SLOT(handleContextActivation(bool)));
+        QObject::disconnect(context, SIGNAL(activeChanged()),
+                         this, SLOT(handleContextActivation()));
     }
 }
 
 // handles the local context activation
-void ActionProxy::handleContextActivation(bool active)
+void ActionProxy::handleContextActivation()
 {
     // sender is the context changing activation
     UCActionContext *context = qobject_cast<UCActionContext*>(sender());
@@ -110,7 +110,7 @@
     }
     // deactivate the previous context if any
     if (!m_activeContext.isNull()) {
-        if (!active) {
+        if (!context->active()) {
             // the slot has been called due to the previous active deactivation,
             // so perform system cleanup
             clearContextActions(m_activeContext);
@@ -124,7 +124,7 @@
             m_activeContext->setActive(false);
         }
     }
-    if (active) {
+    if (context->active()) {
         // publish the context's actions to the system
         publishContextActions(context);
         context->markActionsPublished(true);
 
=== modified file 'src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h'
--- src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h	2014-09-01 06:56:39 +0000
+++ src/Ubuntu/Components/plugin/adapters/actionsproxy_p.h	2015-09-08 04:09:38 +0000
@@ -48,7 +48,7 @@
 
 protected Q_SLOTS:
     void watchContextActivation(UCActionContext *context, bool watch);
-    void handleContextActivation(bool active);
+    void handleContextActivation();
     virtual void clearContextActions(UCActionContext *context);
     virtual void publishContextActions(UCActionContext *context);
 
 
=== modified file 'src/Ubuntu/Components/plugin/i18n.cpp'
--- src/Ubuntu/Components/plugin/i18n.cpp	2015-03-03 13:47:48 +0000
+++ src/Ubuntu/Components/plugin/i18n.cpp	2015-09-08 04:09:38 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "i18n.h"
+#include "timeutils_p.h"
 #include <QtCore/QDir>
 
 namespace C {
@@ -252,3 +253,76 @@
     Q_UNUSED(context);
     return text;
 }
+/*!
+ * \qmlmethod string i18n::relativeDateTime(datetime dateTime)
+ * Translate a datetime based on proximity to current time.
+ */
+QString UbuntuI18n::relativeDateTime(const QDateTime& datetime)
+{
+    QDateTime relativeTo(QDateTime::currentDateTime());
+    const date_proximity_t prox = getDateProximity(relativeTo, datetime);
+
+    switch (prox)  {
+        case DATE_PROXIMITY_NOW:
+            /* TRANSLATORS: Time based "this is happening/happened now" */
+            return dtr("ubuntu-ui-toolkit", "Now");
+
+        case DATE_PROXIMITY_HOUR:
+        {
+            qint64 diff = datetime.toMSecsSinceEpoch() - relativeTo.toMSecsSinceEpoch();
+            qint64 minutes = qRound(float(diff) / 60000);
+            if (minutes < 0) {
+                return dtr("ubuntu-ui-toolkit", "%1 minute ago", "%1 minutes ago", qAbs(minutes)).arg(qAbs(minutes));
+            }
+            return dtr("ubuntu-ui-toolkit", "%1 minute", "%1 minutes", minutes).arg(minutes);
+        }
+
+        case DATE_PROXIMITY_TODAY:
+            /* en_US example: "1:00 PM" */
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h() ? dtr("ubuntu-ui-toolkit", "h:mm ap"):
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                                                     dtr("ubuntu-ui-toolkit", "HH:mm"));
+
+        case DATE_PROXIMITY_YESTERDAY:
+            /* en_US example: "Yesterday  13:00" */
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h() ? dtr("ubuntu-ui-toolkit", "'Yesterday\u2003'h:mm ap") :
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                                                     dtr("ubuntu-ui-toolkit", "'Yesterday\u2003'HH:mm"));
+
+        case DATE_PROXIMITY_TOMORROW:
+            /* en_US example: "Tomorrow  1:00 PM" */
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h() ? dtr("ubuntu-ui-toolkit", "'Tomorrow\u2003'h:mm ap") :
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                                                     dtr("ubuntu-ui-toolkit", "'Tomorrow\u2003'HH:mm"));
+
+        case DATE_PROXIMITY_LAST_WEEK:
+        case DATE_PROXIMITY_NEXT_WEEK:
+            /* en_US example: "Fri  1:00 PM" */
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h() ? dtr("ubuntu-ui-toolkit", "ddd'\u2003'h:mm ap") :
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                                                     dtr("ubuntu-ui-toolkit", "ddd'\u2003'HH:mm"));
+
+        case DATE_PROXIMITY_FAR_BACK:
+        case DATE_PROXIMITY_FAR_FORWARD:
+        default:
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+            return datetime.toString(isLocale12h() ? dtr("ubuntu-ui-toolkit", "ddd d MMM'\u2003'h:mm ap") :
+            /* TRANSLATORS: Please translated these to your locale datetime format using the format specified by
+               https://qt-project.org/doc/qt-5-snapshot/qdatetime.html#fromString-2 */
+                                                     dtr("ubuntu-ui-toolkit", "ddd d MMM'\u2003'HH:mm"));
+    }
+    return datetime.toString(Qt::DefaultLocaleShortDate);
+}
 
=== modified file 'src/Ubuntu/Components/plugin/i18n.h'
--- src/Ubuntu/Components/plugin/i18n.h	2015-02-03 18:11:32 +0000
+++ src/Ubuntu/Components/plugin/i18n.h	2015-09-08 04:09:38 +0000
@@ -50,6 +50,7 @@
     Q_INVOKABLE QString dctr(const QString& domain, const QString& context, const QString& text);
     Q_INVOKABLE QString tag(const QString& text);
     Q_INVOKABLE QString tag(const QString& context, const QString& text);
+    Q_INVOKABLE QString relativeDateTime(const QDateTime& datetime);
 
     // getter
     QString domain() const;
 
=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-08-12 09:54:40 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-09-08 04:09:38 +0000
@@ -62,6 +62,9 @@
 #include "uclistitemstyle.h"
 #include "ucserviceproperties.h"
 #include "ucnamespace.h"
+#include "ucactionitem.h"
+#include "uchaptics.h"
+#include "ucabstractbutton.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -116,6 +119,14 @@
     return new UCNamespaceV13();
 }
 
+static QObject *registerHaptics(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    return new UCHaptics();
+}
+
 void UbuntuComponentsPlugin::initializeBaseUrl()
 {
     if (!m_baseUrl.isValid()) {
@@ -174,6 +185,8 @@
     qmlRegisterSingletonType<UCUriHandler>(uri, major, minor, "UriHandler", registerUriHandler);
     qmlRegisterType<UCMouse>(uri, major, minor, "Mouse");
     qmlRegisterType<UCInverseMouse>(uri, major, minor, "InverseMouse");
+    qmlRegisterType<UCActionItem>(uri, major, minor, "ActionItem");
+    qmlRegisterSingletonType<UCHaptics>(uri, major, minor, "Haptics", registerHaptics);
 }
 
 void UbuntuComponentsPlugin::registerTypes(const char *uri)
@@ -211,6 +224,8 @@
 
     // register 1.3 API
     qmlRegisterType<UCListItem13>(uri, 1, 3, "ListItem");
+    qmlRegisterType<UCListItemExpansion>();
+    qmlRegisterUncreatableType<UCViewItemsAttached13>(uri, 1, 3, "ViewItems", "No create");
     qmlRegisterType<UCTheme>(uri, 1, 3, "ThemeSettings");
     qmlRegisterType<UCStyledItemBase, 2>(uri, 1, 3, "StyledItem");
     qmlRegisterSingletonType<UCNamespaceV13>(uri, 1, 3, "Ubuntu", registerUbuntuNamespace13);
@@ -220,6 +235,7 @@
     qmlRegisterType<UCUbuntuShape, 2>(uri, 1, 3, "UbuntuShape");
     qmlRegisterType<UCProportionalShape>(uri, 1, 3, "ProportionalShape");
     qmlRegisterType<LiveTimer>(uri, 1, 3, "LiveTimer");
+    qmlRegisterType<UCAbstractButton>(uri, 1, 3, "AbstractButton");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
@@ -244,6 +260,8 @@
 
     UCDeprecatedTheme::instance().registerToContext(context);
 
+    HapticsProxy::instance().setEngine(context->engine());
+
     context->setContextProperty("i18n", &UbuntuI18n::instance());
     ContextPropertyChangeListener *i18nChangeListener =
         new ContextPropertyChangeListener(context, "i18n");
 
=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-08-18 22:14:51 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-09-08 04:09:38 +0000
@@ -80,7 +80,10 @@
     $$PWD/ucstylehints.h \
     $$PWD/livetimer.h \
     $$PWD/livetimer_p.h \
-    $$PWD/timeutils_p.h
+    $$PWD/timeutils_p.h \
+    $$PWD/ucactionitem.h \
+    $$PWD/uchaptics.h \
+    $$PWD/ucabstractbutton.h
 
 SOURCES += $$PWD/plugin.cpp \
     $$PWD/uctheme.cpp \
@@ -127,12 +130,16 @@
     $$PWD/ucserviceproperties.cpp \
     $$PWD/privates/listitemdragarea.cpp \
     $$PWD/privates/listitemdraghandler.cpp \
+    $$PWD/privates/listitemexpansion.cpp \
     $$PWD/ucnamespace.cpp \
     $$PWD/ucdeprecatedtheme.cpp \
     $$PWD/ucdefaulttheme.cpp \
     $$PWD/ucstylehints.cpp \
     $$PWD/livetimer.cpp \
-    $$PWD/livetimer_p.cpp
+    $$PWD/livetimer_p.cpp \
+    $$PWD/ucactionitem.cpp \
+    $$PWD/uchaptics.cpp \
+    $$PWD/ucabstractbutton.cpp
 
 # adapters
 SOURCES += $$PWD/adapters/alarmsadapter_organizer.cpp
 
=== modified file 'src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp'
--- src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp	2015-04-13 11:11:59 +0000
+++ src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp	2015-09-08 04:09:38 +0000
@@ -47,13 +47,12 @@
     setObjectName("drag_area");
 }
 
-void ListItemDragArea::init()
+void ListItemDragArea::init(UCViewItemsAttached *viewItems)
 {
     setParentItem(static_cast<QQuickItem*>(parent()));
     QQuickAnchors *anchors = QQuickItemPrivate::get(this)->anchors();
     anchors->setFill(parentItem());
-    viewAttached = static_cast<UCViewItemsAttached*>(
-                qmlAttachedPropertiesObject<UCViewItemsAttached>(listView));
+    viewAttached = viewItems;
     reset();
 }
 
 
=== modified file 'src/Ubuntu/Components/plugin/privates/listitemdragarea.h'
--- src/Ubuntu/Components/plugin/privates/listitemdragarea.h	2015-02-24 15:57:53 +0000
+++ src/Ubuntu/Components/plugin/privates/listitemdragarea.h	2015-09-08 04:09:38 +0000
@@ -27,7 +27,7 @@
     Q_OBJECT
 public:
     explicit ListItemDragArea(QQuickItem *parent = 0);
-    void init();
+    void init(UCViewItemsAttached *viewItems);
     void reset();
 
 protected:
 
=== added file 'src/Ubuntu/Components/plugin/privates/listitemexpansion.cpp'
--- src/Ubuntu/Components/plugin/privates/listitemexpansion.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/privates/listitemexpansion.cpp	2015-09-08 04:09:38 +0000
@@ -0,0 +1,106 @@
+/*
+ * 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/>.
+ */
+
+#include "uclistitem.h"
+#include "uclistitem_p.h"
+
+UCListItemExpansion::UCListItemExpansion(QObject *parent)
+    : QObject(parent)
+    , m_listItem(static_cast<UCListItem13*>(parent))
+    , m_height(0.0)
+    , m_filtering(false)
+{
+}
+
+bool UCListItemExpansion::expandedLocked()
+{
+    UCListItemPrivate *listItem = UCListItemPrivate::get(m_listItem);
+    UCViewItemsAttachedPrivate *viewItems = UCViewItemsAttachedPrivate::get(listItem->parentAttached);
+    return expanded() && !((viewItems->expansionFlags & UCViewItemsAttached::UnlockExpanded) == UCViewItemsAttached::UnlockExpanded);
+}
+
+void UCListItemExpansion::enableClickFiltering(bool enable)
+{
+    if (m_filtering == enable) {
+        return;
+    }
+    m_filtering = enable;
+    if (m_filtering) {
+        m_listItem->window()->installEventFilter(this);
+    } else {
+        m_listItem->window()->removeEventFilter(this);
+    }
+}
+
+// event filter for external mouse presses to collapse when pressed outside
+bool UCListItemExpansion::eventFilter(QObject *target, QEvent *event)
+{
+    if (event->type() == QEvent::MouseButtonPress) {
+        QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
+        QQuickWindow *window = qobject_cast<QQuickWindow*>(target);
+        if (window) {
+            QPointF myPos(window->contentItem()->mapToItem(m_listItem, mouse->localPos()));
+            if (!m_listItem->contains(myPos)) {
+                UCListItemPrivate *listItem = UCListItemPrivate::get(m_listItem);
+                UCViewItemsAttachedPrivate *viewItems = UCViewItemsAttachedPrivate::get(listItem->parentAttached);
+                if (viewItems) {
+                    // collapse all as there can be only one expanded when the flag is set
+                    viewItems->collapseAll();
+                }
+            }
+        }
+    }
+    return false;
+}
+
+
+bool UCListItemExpansion::expanded()
+{
+    UCListItemPrivate *listItem = UCListItemPrivate::get(m_listItem);
+    UCViewItemsAttachedPrivate *viewItems = UCViewItemsAttachedPrivate::get(listItem->parentAttached);
+    return (viewItems && viewItems->expansionList.contains(listItem->index()));
+}
+
+void UCListItemExpansion::setExpanded(bool expanded)
+{
+    if (this->expanded() == expanded) {
+        return;
+    }
+    UCListItemPrivate *listItem = UCListItemPrivate::get(m_listItem);
+    UCViewItemsAttachedPrivate *viewItems = UCViewItemsAttachedPrivate::get(listItem->parentAttached);
+    if (viewItems) {
+        if (viewItems->expansionFlags & UCViewItemsAttached::Exclusive) {
+            // collapse all the expanded ones
+            viewItems->collapseAll();
+        }
+        if (expanded) {
+            viewItems->expand(listItem->index(), m_listItem);
+        } else {
+            viewItems->collapse(listItem->index());
+        }
+    }
+    UCListItemPrivate::get(m_listItem)->loadStyleItem();
+    // no need to emit changed signal, as ViewItems.expandedIndicesChanged is connected to the change signal
+}
+
+void UCListItemExpansion::setHeight(qreal height)
+{
+    if (m_height == height) {
+        return;
+    }
+    m_height = height;
+    Q_EMIT heightChanged();
+}
 
=== modified file 'src/Ubuntu/Components/plugin/sortfiltermodel.cpp'
--- src/Ubuntu/Components/plugin/sortfiltermodel.cpp	2015-03-03 13:47:48 +0000
+++ src/Ubuntu/Components/plugin/sortfiltermodel.cpp	2015-09-08 04:09:38 +0000
@@ -113,9 +113,12 @@
 QSortFilterProxyModelQML::roleByName(const QString& roleName) const
 {
     const QHash<int, QByteArray> roles = roleNames();
-    for(int role = 0; role < roles.count(); role++)
-        if (roles[role] == roleName)
-            return role;
+    QHashIterator<int, QByteArray> i(roles);
+    while (i.hasNext()) {
+        i.next();
+        if (i.value() == roleName)
+            return i.key();
+    }
     return 0;
 }
 
 
=== modified file 'src/Ubuntu/Components/plugin/timeutils_p.h'
--- src/Ubuntu/Components/plugin/timeutils_p.h	2015-07-20 15:34:32 +0000
+++ src/Ubuntu/Components/plugin/timeutils_p.h	2015-09-08 04:09:38 +0000
@@ -20,9 +20,33 @@
 #include "livetimer.h"
 
 #include <QDateTime>
+#include <QLocale>
 #include <QObject>
 #include <QTimer>
 
+/* Check the system locale setting to see if the format is 24-hour
+  time or 12-hour time */
+inline bool isLocale12h(void)
+{
+   QString strTimeFormat = QLocale::system().timeFormat();
+   QStringList includes; includes << "AP"; includes << "ap";
+   QStringList excludes; excludes << "H"; excludes << "HH";
+
+   Q_FOREACH(const QString& exclude, excludes) {
+       if (strTimeFormat.contains(exclude)) {
+           return false;
+       }
+   }
+
+   Q_FOREACH(const QString& include, includes) {
+       if (strTimeFormat.contains(include)) {
+           return true;
+       }
+   }
+
+   return false;
+}
+
 typedef enum
 {
    DATE_PROXIMITY_NOW,
 
=== added file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2015-09-08 04:09:38 +0000
@@ -0,0 +1,156 @@
+/*
+ * 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/>.
+ */
+
+#include "ucabstractbutton.h"
+#include "uchaptics.h"
+#include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquickmousearea_p.h>
+#include <QtQml/private/qqmlglobal_p.h>
+
+/*!
+    \qmltype AbstractButton
+    \instantiates UCAbstractButton
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief The AbstractButton class defines the behavior of the button.
+
+    This class defines the behavior of the button. All components deriving from
+    this class support haptic feedback out of the box.
+
+    If an action is specified, the button's clicked signal will trigger the action.
+    Subclasses of AbstractButton can use other properties of action (for example
+    the text and iconName).
+*/
+
+/*!
+ *
+ * \qmlsignal AbstractButton::clicked()
+ * This handler is called when there is a mouse click on the button and the button
+ * is not disabled. If \l {ActionItem::action}{action} is defined, the action will be triggered.
+ */
+
+/*!
+ *
+ * \qmlsignal AbstractButton::pressAndHold()
+ * This handler is called when there is a long press.
+ */
+
+UCAbstractButton::UCAbstractButton(QQuickItem *parent)
+    : UCActionItem(parent)
+    , m_mouseArea(new QQuickMouseArea)
+    , m_acceptEvents(true)
+{
+    setActiveFocusOnPress(true);
+}
+
+bool UCAbstractButton::isPressAndHoldConnected()
+{
+    static QMetaMethod method = QMetaMethod::fromSignal(&UCAbstractButton::pressAndHold);
+    static int signalIdx = QMetaObjectPrivate::signalIndex(method);
+    return QObjectPrivate::get(this)->isSignalConnected(signalIdx);
+}
+
+void UCAbstractButton::classBegin()
+{
+    UCActionItem::classBegin();
+
+    // make sure we have the haptics set up!
+    HapticsProxy::instance().initialize();
+
+    // set up mouse area
+    QQml_setParent_noEvent(m_mouseArea, this);
+    m_mouseArea->setParentItem(this);
+    QQuickAnchors *anchors = QQuickItemPrivate::get(m_mouseArea)->anchors();
+    anchors->setFill(this);
+    m_mouseArea->setHoverEnabled(true);
+}
+
+void UCAbstractButton::componentComplete()
+{
+    UCActionItem::componentComplete();
+    // connect to the right slot, using macros so we get the proper slot
+    connect(this, SIGNAL(clicked()), this, SLOT(trigger()));
+
+    // bind mouse area
+    connect(m_mouseArea, &QQuickMouseArea::pressedChanged, this, &UCAbstractButton::pressedChanged);
+    connect(m_mouseArea, &QQuickMouseArea::hoveredChanged, this, &UCAbstractButton::hoveredChanged);
+    connect(m_mouseArea, SIGNAL(clicked(QQuickMouseEvent*)), this, SLOT(_q_mouseAreaClicked()));
+    if (isPressAndHoldConnected()) {
+        connect(m_mouseArea, SIGNAL(pressAndHold(QQuickMouseEvent*)), this, SLOT(_q_mouseAreaPressAndHold()));
+    }
+}
+
+// handle mouseClicked with Haptics
+void UCAbstractButton::_q_mouseAreaClicked()
+{
+    // required by the deprecated ListItem module
+    if (!m_acceptEvents) {
+        return;
+    }
+    // play haptics
+    HapticsProxy::instance().play(QVariant());
+    Q_EMIT clicked();
+}
+
+// handle pressAndHold
+void UCAbstractButton::_q_mouseAreaPressAndHold()
+{
+    // required by the deprecated ListItem module
+    if (!m_acceptEvents) {
+        return;
+    }
+    Q_EMIT pressAndHold();
+}
+
+// emit clicked when Enter/Return is pressed
+void UCAbstractButton::keyPressEvent(QKeyEvent *event)
+{
+    UCActionItem::keyPressEvent(event);
+
+    switch (event->key()) {
+        case Qt::Key_Enter:
+        case Qt::Key_Return:
+        // FIXME: space may also come here, however that depends on the button type
+        // (i.e default Dialog btn) so we may need to add that to Button
+        {
+            Q_EMIT clicked();
+            break;
+        }
+    }
+}
+
+/*!
+ * \qmlproperty bool AbstractButton::pressed
+ * True if the user presses a mouse button in the button's mouse area.
+ */
+bool UCAbstractButton::pressed() const
+{
+    return m_mouseArea ? m_mouseArea->pressed() : false;
+}
+
+/*!
+ * \qmlproperty bool AbstractButton::hovered
+ * True if the mouse cursor hovers over the button's mouse area.
+ */
+bool UCAbstractButton::hovered() const
+{
+    return m_mouseArea ? m_mouseArea->hovered() : false;
+}
+
+QQuickMouseArea *UCAbstractButton::privateMouseArea() const
+{
+    return m_mouseArea;
+}
 
=== added file 'src/Ubuntu/Components/plugin/ucabstractbutton.h'
--- src/Ubuntu/Components/plugin/ucabstractbutton.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.h	2015-09-08 04:09:38 +0000
@@ -0,0 +1,64 @@
+/*
+ * 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/>.
+ */
+
+#ifndef UCABSTRACTBUTTON_H
+#define UCABSTRACTBUTTON_H
+
+#include "ucactionitem.h"
+
+class QQuickMouseArea;
+class UCAbstractButton : public UCActionItem
+{
+    Q_OBJECT
+    Q_PROPERTY(bool pressed READ pressed NOTIFY pressedChanged)
+    Q_PROPERTY(bool hovered READ hovered NOTIFY hoveredChanged)
+
+    // internal, declared to support the deprecated ListItem module
+    Q_PROPERTY(bool __acceptEvents MEMBER m_acceptEvents)
+    Q_PROPERTY(QQuickMouseArea *__mouseArea READ privateMouseArea CONSTANT)
+public:
+    explicit UCAbstractButton(QQuickItem *parent = 0);
+
+    bool pressed() const;
+    bool hovered() const;
+
+    bool privateAcceptEvents() const;
+    void setPrivateAcceptEvents(bool accept);
+    QQuickMouseArea *privateMouseArea() const;
+
+protected:
+    void classBegin();
+    void componentComplete();
+    void keyPressEvent(QKeyEvent *key);
+
+Q_SIGNALS:
+    void pressedChanged();
+    void hoveredChanged();
+    void clicked();
+    void pressAndHold();
+
+protected Q_SLOTS:
+    void _q_mouseAreaClicked();
+    void _q_mouseAreaPressAndHold();
+
+protected:
+    QQuickMouseArea *m_mouseArea;
+    bool m_acceptEvents:1;
+
+    bool isPressAndHoldConnected();
+};
+
+#endif // UCABSTRACTBUTTON_H
 
=== modified file 'src/Ubuntu/Components/plugin/ucaction.cpp'
--- src/Ubuntu/Components/plugin/ucaction.cpp	2015-07-03 19:16:56 +0000
+++ src/Ubuntu/Components/plugin/ucaction.cpp	2015-09-08 04:09:38 +0000
@@ -150,13 +150,12 @@
 
 UCAction::UCAction(QObject *parent)
     : QObject(parent)
+    , m_itemHint(Q_NULLPTR)
+    , m_parameterType(None)
     , m_factoryIconSource(true)
     , m_enabled(true)
     , m_visible(true)
     , m_published(false)
-    , m_itemHint(0)
-    , m_parameterType(None)
-    , m_shortcut(0)
 {
     generateName();
 }
@@ -288,7 +287,7 @@
         qmlInfo(this) << "Invalid shortcut: " << shortcut.toString();
 
     m_shortcut = shortcut;
-    Q_EMIT shortcutChanged(shortcut);
+    Q_EMIT shortcutChanged();
 }
 
 bool UCAction::event(QEvent *event)
@@ -302,7 +301,8 @@
         return false;
     }
 
-    trigger();
+    // do not call trigger() directly but invoke, as it may get overridden in QML
+    metaObject()->invokeMethod(this, "trigger");
     return true;
 }
 
 
=== modified file 'src/Ubuntu/Components/plugin/ucaction.h'
--- src/Ubuntu/Components/plugin/ucaction.h	2015-07-07 13:57:50 +0000
+++ src/Ubuntu/Components/plugin/ucaction.h	2015-09-08 04:09:38 +0000
@@ -70,28 +70,29 @@
     void parameterTypeChanged();
     void iconSourceChanged();
     void visibleChanged();
-    void shortcutChanged(const QVariant& shortcut);
+    void shortcutChanged();
     void triggered(const QVariant &value);
 
 public Q_SLOTS:
     void trigger(const QVariant &value = QVariant());
 
 private:
-    bool m_factoryIconSource:1;
-    bool m_enabled:1;
-    bool m_visible:1;
-    bool m_published:1;
-    QQmlComponent *m_itemHint;
     QString m_name;
     QString m_text;
     QString m_iconName;
     QUrl m_iconSource;
     QString m_description;
     QString m_keywords;
+    QVariant m_shortcut;
+    QQmlComponent *m_itemHint;
     Type m_parameterType;
-    QVariant m_shortcut;
+    bool m_factoryIconSource:1;
+    bool m_enabled:1;
+    bool m_visible:1;
+    bool m_published:1;
 
     friend class UCActionContext;
+    friend class UCActionItem;
     friend class UCListItemPrivate;
     friend class UCListItemAttached;
     friend class UCListItemActionsPrivate;
 
=== modified file 'src/Ubuntu/Components/plugin/ucactioncontext.cpp'
--- src/Ubuntu/Components/plugin/ucactioncontext.cpp	2015-07-09 17:55:03 +0000
+++ src/Ubuntu/Components/plugin/ucactioncontext.cpp	2015-09-08 04:09:38 +0000
@@ -104,6 +104,11 @@
  * sufficient to manage the active local context of the manager and no additional
  * calls are necessary to manually inactivate the other contexts.
  */
+bool UCActionContext::active()
+{
+    return m_active;
+}
+
 void UCActionContext::setActive(bool active)
 {
     if (m_active == active) {
@@ -114,7 +119,7 @@
         return;
     }
     m_active = active;
-    Q_EMIT activeChanged(active);
+    Q_EMIT activeChanged();
 }
 
 /*!
 
=== modified file 'src/Ubuntu/Components/plugin/ucactioncontext.h'
--- src/Ubuntu/Components/plugin/ucactioncontext.h	2015-07-09 17:55:03 +0000
+++ src/Ubuntu/Components/plugin/ucactioncontext.h	2015-09-08 04:09:38 +0000
@@ -29,7 +29,7 @@
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(QQmlListProperty<UCAction> actions READ actions)
-    Q_PROPERTY(bool active MEMBER m_active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
     Q_CLASSINFO("DefaultProperty", "actions")
 public:
     explicit UCActionContext(QObject *parent = 0);
@@ -41,10 +41,11 @@
 
     QQmlListProperty<UCAction> actions();
 
+    bool active();
     void setActive(bool active);
 
 Q_SIGNALS:
-    void activeChanged(bool);
+    void activeChanged();
 
 public Q_SLOTS:
     void addAction(UCAction *action);
 
=== added file 'src/Ubuntu/Components/plugin/ucactionitem.cpp'
--- src/Ubuntu/Components/plugin/ucactionitem.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.cpp	2015-09-08 04:09:38 +0000
@@ -0,0 +1,316 @@
+/*
+ * 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/>.
+ */
+
+#include "ucactionitem.h"
+#include "ucaction.h"
+
+/*!
+ * \qmltype ActionItem
+ * \instantiates UCActionItem
+ * \inqmlmodule Ubuntu.Components 1.1
+ * \ingroup ubuntu
+ * \brief A visual representation of an Action. The API of ActionItem is a
+ * copy of the API of \l Action, with additional properties to define
+ * visual aspects of the ActionItem.
+ *
+ * If \l action is set, the values of the other properties will by default
+ * be identical to the \l Action's property values. Setting the other properties
+ * will override the properties copied from the \l Action.
+ */
+
+/*!
+ * \qmlsignal ActionItem::triggered(var value)
+ * Called when the actionItem is triggered.
+ */
+UCActionItem::UCActionItem(QQuickItem *parent)
+    : UCStyledItemBase(parent)
+    , m_action(Q_NULLPTR)
+    , m_flags(0)
+{
+    connect(this, &UCActionItem::visibleChanged, this, &UCActionItem::_q_visibleChanged);
+    connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
+}
+
+void UCActionItem::componentComplete()
+{
+    UCStyledItemBase::componentComplete();
+    // make sure we connect to the right signals, so we detach and re-attach actions
+    // to make sure the SLOT macro picks up the custom trigger() slot
+    if (m_action) {
+        attachAction(false);
+        attachAction(true);
+    }
+}
+
+void UCActionItem::_q_visibleChanged()
+{
+    m_flags |= CustomVisible;
+    disconnect(this, &UCActionItem::visibleChanged, this, &UCActionItem::_q_visibleChanged);
+}
+
+void UCActionItem::_q_enabledChanged()
+{
+    m_flags |= CustomEnabled;
+    disconnect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
+}
+
+// update visible property
+void UCActionItem::_q_updateVisible()
+{
+    bool visible = m_action ? m_action->m_visible : true;
+    setVisible(visible);
+    // reset flag and reconnect signal handler disconnected by the
+    m_flags &= ~CustomVisible;
+    if (m_action) {
+        connect(this, &UCActionItem::visibleChanged, this, &UCActionItem::_q_visibleChanged);
+    }
+}
+
+// update enabled property
+void UCActionItem::_q_updateEnabled()
+{
+    bool enabled = m_action ? m_action->m_enabled : true;
+    setEnabled(enabled);
+    // reset flag and reconnect signal handler disconnected by the
+    m_flags &= ~CustomEnabled;
+    if (m_action) {
+        connect(this, &UCActionItem::enabledChanged, this, &UCActionItem::_q_enabledChanged);
+    }
+}
+
+void UCActionItem::updateProperties()
+{
+    if (!(m_flags & CustomText)) {
+        Q_EMIT textChanged();
+    }
+    if (!(m_flags & CustomIconSource)) {
+        Q_EMIT iconSourceChanged();
+    }
+    if (!(m_flags & CustomIconName)) {
+        Q_EMIT iconNameChanged();
+    }
+}
+
+void UCActionItem::attachAction(bool attach)
+{
+    if (attach) {
+        connect(this, SIGNAL(triggered(QVariant)),
+                m_action, SLOT(trigger(QVariant)), Qt::DirectConnection);
+        connect(m_action, &UCAction::visibleChanged,
+                this, &UCActionItem::_q_updateVisible, Qt::DirectConnection);
+        connect(m_action, &UCAction::enabledChanged,
+                this, &UCActionItem::_q_updateEnabled, Qt::DirectConnection);
+        if (!(m_flags & CustomText)) {
+            connect(m_action, &UCAction::textChanged,
+                    this, &UCActionItem::textChanged, Qt::DirectConnection);
+        }
+        if (!(m_flags & CustomIconSource)) {
+            connect(m_action, &UCAction::iconSourceChanged,
+                    this, &UCActionItem::iconSourceChanged, Qt::DirectConnection);
+        }
+        if (!(m_flags & CustomIconName)) {
+            connect(m_action, &UCAction::iconNameChanged,
+                    this, &UCActionItem::iconNameChanged, Qt::DirectConnection);
+        }
+    } else {
+        disconnect(this, SIGNAL(triggered(QVariant)),
+                   m_action, SLOT(trigger(QVariant)));
+        disconnect(m_action, &UCAction::visibleChanged,
+                   this, &UCActionItem::_q_updateVisible);
+        disconnect(m_action, &UCAction::enabledChanged,
+                   this, &UCActionItem::_q_updateEnabled);
+        if (!(m_flags & CustomText)) {
+            disconnect(m_action, &UCAction::textChanged,
+                       this, &UCActionItem::textChanged);
+        }
+        if (!(m_flags & CustomIconSource)) {
+            disconnect(m_action, &UCAction::iconSourceChanged,
+                       this, &UCActionItem::iconSourceChanged);
+        }
+        if (!(m_flags & CustomIconName)) {
+            disconnect(m_action, &UCAction::iconNameChanged,
+                       this, &UCActionItem::iconNameChanged);
+        }
+    }
+}
+
+/*!
+ * \qmlproperty Action ActionItem::action
+ * The \l Action associated with this ActionItem. If action is set, the values
+ * of the \l Action properties are copied to the values of the ActionItem
+ * properties, unless those were previously overridden.
+ */
+void UCActionItem::setAction(UCAction *action)
+{
+    if (m_action == action) {
+        return;
+    }
+    if (m_action) {
+        attachAction(false);
+    }
+    m_action = action;
+    Q_EMIT actionChanged();
+
+    if (m_action) {
+        attachAction(true);
+    }
+    _q_updateVisible();
+    _q_updateEnabled();
+    updateProperties();
+}
+
+/*!
+ * \qmlproperty string ActionItem::text
+ * The title of the actionItem. Defaults to the \c action.text.
+ */
+QString UCActionItem::text()
+{
+    if (m_flags & CustomText) {
+        return m_text;
+    }
+    return m_action ? m_action->m_text : QString();
+}
+void UCActionItem::setText(const QString &text)
+{
+    if (m_text == text) {
+        return;
+    }
+    m_text = text;
+    if (m_action && !(m_flags & CustomText)) {
+        // disconnect change signal from Action
+        disconnect(m_action, &UCAction::textChanged,
+                   this, &UCActionItem::textChanged);
+    }
+    m_flags |= CustomText;
+    Q_EMIT textChanged();
+}
+void UCActionItem::resetText()
+{
+    m_text.clear();
+    m_flags &= ~CustomText;
+    if (m_action) {
+        // re-connect change signal from Action
+        connect(m_action, &UCAction::textChanged,
+                this, &UCActionItem::textChanged, Qt::DirectConnection);
+    }
+    Q_EMIT textChanged();
+}
+
+/*!
+ * \qmlproperty url ActionItem::iconSource
+ * The image associated with the ActionItem. Defaults to \c action.iconSource.
+ *
+ * This is the URL of any image file. If both iconSource and \l iconName are defined,
+ * \l iconName will be ignored.
+ */
+QUrl UCActionItem::iconSource()
+{
+    if (m_flags & CustomIconSource) {
+        return m_iconSource;
+    }
+    if (m_action) {
+        return m_action->m_iconSource;
+    }
+    return !iconName().isEmpty() ? QUrl(QString("image://theme/%1").arg(iconName())) : QUrl();
+}
+void UCActionItem::setIconSource(const QUrl &iconSource)
+{
+    if (m_iconSource == iconSource) {
+        return;
+    }
+    m_iconSource = iconSource;
+    if (m_action && !(m_flags & CustomIconSource)) {
+        // disconnect change signal from Action
+        disconnect(m_action, &UCAction::iconSourceChanged,
+                   this, &UCActionItem::iconSourceChanged);
+    }
+    m_flags |= CustomIconSource;
+    Q_EMIT iconSourceChanged();
+}
+void UCActionItem::resetIconSource()
+{
+    m_iconSource.clear();
+    m_flags &= ~CustomIconSource;
+    if (m_action) {
+        // re-connect change signal from Action
+        connect(m_action, &UCAction::iconSourceChanged,
+                this, &UCActionItem::iconSourceChanged, Qt::DirectConnection);
+    }
+    Q_EMIT iconSourceChanged();
+}
+
+/*!
+ * \qmlproperty string ActionItem::iconName
+ * The icon associated with the actionItem in the suru icon theme. Defaults to
+ * \c action.iconName.
+ *
+ * \note The complete list of icons available in Ubuntu is not published yet.
+ * For now please refer to the folders where the icon themes are installed:
+ * \list
+ *  \li Ubuntu Touch: \l file:/usr/share/icons/suru
+ *  \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
+ * \endlist
+ * These 2 separate icon themes will be merged soon.
+ *
+ * If both \l iconSource and iconName are defined, iconName will be ignored.
+ */
+QString UCActionItem::iconName()
+{
+    if (m_flags & CustomIconName) {
+        return m_iconName;
+    }
+    return m_action ? m_action->m_iconName : QString();
+}
+void UCActionItem::setIconName(const QString &iconName)
+{
+    if (m_iconName == iconName) {
+        return;
+    }
+    m_iconName = iconName;
+    if (m_action && !(m_flags & CustomIconName)) {
+        // disconnect change signal from Action
+        disconnect(m_action, &UCAction::iconNameChanged,
+                   this, &UCActionItem::iconNameChanged);
+    }
+    m_flags |= CustomIconName;
+    Q_EMIT iconNameChanged();
+    // also sync iconSource if that is not a custom one or taken from action
+    if (!m_action || (m_flags & CustomIconSource)) {
+        Q_EMIT iconSourceChanged();
+    }
+}
+void UCActionItem::resetIconName()
+{
+    m_iconName.clear();
+    m_flags &= ~CustomIconName;
+    if (m_action) {
+        // re-connect change signal from Action
+        connect(m_action, &UCAction::iconNameChanged,
+                this, &UCActionItem::iconNameChanged, Qt::DirectConnection);
+    }
+    Q_EMIT iconNameChanged();
+}
+
+/*!
+ * \qmlmethod void ActionItem::trigger(var value)
+ * Trigger this action item if it is enabled.
+ */
+void UCActionItem::trigger(const QVariant &value)
+{
+    if (isEnabled()) {
+        Q_EMIT triggered(value);
+    }
+}
 
=== added file 'src/Ubuntu/Components/plugin/ucactionitem.h'
--- src/Ubuntu/Components/plugin/ucactionitem.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucactionitem.h	2015-09-08 04:09:38 +0000
@@ -0,0 +1,79 @@
+/*
+ * 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/>.
+ */
+#ifndef UCACTIONITEM_H
+#define UCACTIONITEM_H
+
+#include "ucstyleditembase.h"
+
+class UCAction;
+class UCActionItem : public UCStyledItemBase
+{
+    Q_OBJECT
+    Q_PROPERTY(UCAction *action MEMBER m_action WRITE setAction NOTIFY actionChanged FINAL)
+    Q_PROPERTY(QString text READ text WRITE setText RESET resetText NOTIFY textChanged)
+    Q_PROPERTY(QUrl iconSource READ iconSource WRITE setIconSource RESET resetIconSource NOTIFY iconSourceChanged)
+    Q_PROPERTY(QString iconName READ iconName WRITE setIconName RESET resetIconName NOTIFY iconNameChanged)
+public:
+    explicit UCActionItem(QQuickItem *parent = 0);
+
+    void setAction(UCAction *action);
+    QString text();
+    void setText(const QString &text);
+    void resetText();
+    QUrl iconSource();
+    void setIconSource(const QUrl &iconSource);
+    void resetIconSource();
+    QString iconName();
+    void setIconName(const QString &iconName);
+    void resetIconName();
+
+Q_SIGNALS:
+    void actionChanged();
+    void textChanged();
+    void iconSourceChanged();
+    void iconNameChanged();
+    void triggered(const QVariant &value);
+
+public Q_SLOTS:
+    void trigger(const QVariant &value = QVariant());
+
+protected Q_SLOTS:
+    void _q_visibleChanged();
+    void _q_enabledChanged();
+    void _q_updateVisible();
+    void _q_updateEnabled();
+
+protected:
+    enum {
+        CustomText = 0x01,
+        CustomIconSource = 0x02,
+        CustomIconName = 0x04,
+        CustomVisible = 0x40,
+        CustomEnabled = 0x80
+    };
+    QString m_text;
+    QString m_iconName;
+    QUrl m_iconSource;
+    UCAction *m_action;
+    quint8 m_flags;
+
+    void componentComplete();
+
+    void updateProperties();
+    void attachAction(bool attach);
+};
+
+#endif // UCACTIONITEM_H
 
=== added file 'src/Ubuntu/Components/plugin/uchaptics.cpp'
--- src/Ubuntu/Components/plugin/uchaptics.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/uchaptics.cpp	2015-09-08 04:09:38 +0000
@@ -0,0 +1,179 @@
+/*
+ * 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/>.
+ */
+
+#include "uchaptics.h"
+#include "plugin.h"
+#include <QtQml/QQmlComponent>
+#include <QtCore/QUrl>
+#include <QDebug>
+
+/*!
+  \qmltype Haptics
+  \instantiates UCHaptics
+  \inqmlmodule Ubuntu.Components 1.1
+  \ingroup ubuntu-services
+  \brief Singleton defining the haptics feedback used in components, where execution
+  of the feedback is controlled by the system settings.
+
+  Supports global feedback as well as custom feedback. Global feedback can be
+  configured through its properties, and \l play function will play the default
+  configuration, or a custom one if parameter is given.
+
+  Example of using Haptics:
+  \qml
+  import QtQuick 2.4
+  import Ubuntu.Components 1.3
+
+  Item {
+      implicitWidth: units.gu(20)
+      implicitHeight: units.gu(5)
+
+      Label {
+          text: "Press me"
+          anchors.fill: parent
+          horizontalAlignment: Text.AlignHCenter
+          verticalAlignment: Text.AlignVCenter
+      }
+      MouseArea {
+          anchors.fill: parent
+          onClicked: Haptics.play()
+      }
+  }
+  \endqml
+
+  Custom effects can be played as follows:
+  \qml
+  import QtQuick 2.4
+  import Ubuntu.Components 1.3
+
+  Item {
+      implicitWidth: units.gu(20)
+      implicitHeight: units.gu(5)
+
+      Label {
+          text: "Press me"
+          anchors.fill: parent
+          horizontalAlignment: Text.AlignHCenter
+          verticalAlignment: Text.AlignVCenter
+      }
+      MouseArea {
+          anchors.fill: parent
+          onClicked: Haptics.play({duration: 25, attackIntensity: 0.7})
+      }
+  }
+  \endqml
+
+  \note Though the \l effect property exposes \c start, \c stop and \c pause
+  functions, use those only if you want to have feedback independent from what the
+  system setting is.
+ */
+
+UCHaptics::UCHaptics(QObject *parent)
+    : QObject(parent)
+{
+    connect(&HapticsProxy::instance(), &HapticsProxy::enabledChanged,
+            this, &UCHaptics::enabledChanged);
+}
+
+/*!
+  \qmlproperty bool Haptics::enabled
+  \readonly
+  The property specifies whether the haptics feedback is enabled or not by the system.
+  */
+bool UCHaptics::enabled() const
+{
+    return HapticsProxy::instance().enabled();
+}
+
+/*!
+  \qmlproperty HapticsEffect Haptics::effect
+  \readonly
+  The property defines the settings of the haptics effect used by the component.
+  The default setting is a haptics effect with a duration of 10 milliseconds
+  with an intensity of 1.0, having fading time of 50 millisecods and fading
+  intensity 0.0, and attack time of 50 milliseconds and with an intensity of
+  0.0.
+  */
+QObject *UCHaptics::effect() const
+{
+    return HapticsProxy::instance().effect();
+}
+
+/*!
+  \qmlmethod void Haptics::play(var customEffect)
+  The function plays the feedback with the configuration specified in \l effect
+  if no parameter is given. Custom effect can be played by specifying the effect
+  properties in a JSON object in \c customEffect.
+
+  The function will exit unconditionaly if playing the effects is blocked by
+  system settings.
+
+  The function will not stop any ongoing haptics effect played, if that one
+  was a default haptics effect. In case of custom effects, the previous effect
+  will be stopped, and settings will be restored before the new haptics will
+  be played. The custom settings properties (the ones which are required to
+  be different from the ones defined in the \l effect) must be specified in
+  the parameter in a JSON object.
+  */
+void UCHaptics::play(const QVariant &customEffect)
+{
+    HapticsProxy::instance().play(customEffect);
+}
+
+/*********************************************************
+ * Proxy implementation
+ */
+bool HapticsProxy::enabled()
+{
+    initialize();
+    return (m_proxyObject) ? m_proxyObject->property("enabled").toBool() : false;
+}
+
+QObject *HapticsProxy::effect()
+{
+    initialize();
+    return (m_proxyObject) ? m_proxyObject->property("effect").value<QObject*>() : Q_NULLPTR;
+}
+
+void HapticsProxy::initialize()
+{
+    if (!m_engine || m_proxyObject) {
+        return;
+    }
+    // load haptics proxy from file system/qrc
+    QUrl path = UbuntuComponentsPlugin::pluginUrl().resolved(QUrl("1.1/Haptics.qml"));
+    QQmlComponent component(m_engine, path, QQmlComponent::PreferSynchronous);
+    if (!component.isError()) {
+        m_proxyObject = component.create();
+        if (m_proxyObject) {
+            connect(m_proxyObject, SIGNAL(enabledChanged()), this, SIGNAL(enabledChanged()));
+        }
+    } else {
+        qWarning() << qPrintable(component.errorString());
+    }
+}
+
+void HapticsProxy::play(const QVariant &customEffect)
+{
+    if (!m_engine) {
+        qWarning() << "Engine not specified, haptics won't play";
+    }
+    initialize();
+    if (m_proxyObject) {
+        // invoke play function
+        m_proxyObject->metaObject()->invokeMethod(m_proxyObject, "play", Q_ARG(QVariant, customEffect));
+    }
+}
 
=== added file 'src/Ubuntu/Components/plugin/uchaptics.h'
--- src/Ubuntu/Components/plugin/uchaptics.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/uchaptics.h	2015-09-08 04:09:38 +0000
@@ -0,0 +1,78 @@
+/*
+ * 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/>.
+ */
+
+#ifndef UCHAPTICS_H
+#define UCHAPTICS_H
+
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
+
+class UCHaptics : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool enabled READ enabled NOTIFY enabledChanged)
+    Q_PROPERTY(QObject *effect READ effect CONSTANT)
+public:
+    explicit UCHaptics(QObject *parent = 0);
+
+    bool enabled() const;
+    QObject *effect() const;
+
+Q_SIGNALS:
+    void enabledChanged();
+
+public Q_SLOTS:
+    void play(const QVariant &customEffect = QVariant());
+};
+
+class QQmlEngine;
+class HapticsProxy : public QObject
+{
+    Q_OBJECT
+public:
+    explicit HapticsProxy(QObject *parent = 0)
+        : QObject(parent)
+        , m_proxyObject(Q_NULLPTR)
+        , m_engine(Q_NULLPTR)
+    {
+    }
+
+    static HapticsProxy &instance()
+    {
+        static HapticsProxy instance;
+        return instance;
+    }
+
+    void setEngine(QQmlEngine *engine)
+    {
+        m_engine = engine;
+    }
+
+    void initialize();
+
+    bool enabled();
+    QObject *effect();
+    void play(const QVariant &customEffect);
+
+Q_SIGNALS:
+    void enabledChanged();
+
+private:
+    QObject *m_proxyObject;
+    QQmlEngine *m_engine;
+};
+
+#endif // UCHAPTICS_H
 
=== modified file 'src/Ubuntu/Components/plugin/uclistitem.cpp'
--- src/Ubuntu/Components/plugin/uclistitem.cpp	2015-07-30 13:27:32 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.cpp	2015-09-08 04:09:38 +0000
@@ -200,6 +200,7 @@
     , leadingActions(0)
     , trailingActions(0)
     , mainAction(0)
+    , expansion(Q_NULLPTR)
 {
 }
 UCListItemPrivate::~UCListItemPrivate()
@@ -325,7 +326,7 @@
 bool UCListItemPrivate::loadStyleItem(bool animated)
 {
     // the style should be loaded only if one of the condition is satisfied
-    if (!swiped && !selectMode() && !dragMode()) {
+    if (!swiped && !selectMode() && !dragMode() && !(expansion && expansion->expanded())) {
         return false;
     }
 
@@ -339,6 +340,7 @@
         preStyleChanged();
         return false;
     }
+    myStyle->updateFlickable(flickable);
     // bring the panels foreground
     styleItem->setZ(0);
     listItemStyle()->setAnimatePanels(true);
@@ -372,23 +374,13 @@
                 (parentItem ? QQuickItemPrivate::get(parentItem)->childItems.indexOf(q) : -1);
 }
 
-// returns true if the highlight is possible
-bool UCListItemPrivate::canHighlight(QMouseEvent *event)
+// returns true if the highlight is possible; the highlight is possible if the
+// list item has at least one action, leading/trailing actions set, onClicked
+// or onPressAndHold signal handlers set
+bool UCListItemPrivate::canHighlight()
 {
-    // if automatic, the highlight should not happen if we clicked on an active component;
-    // localPos is a position relative to ListItem which will give us a child from
-    // from the original coordinates; therefore we must map the position to the contentItem
    Q_Q(UCListItem);
-   QPointF myPos = q->mapToItem(contentItem, event->localPos());
-   QQuickItem *child = contentItem->childAt(myPos.x(), myPos.y());
-   bool activeComponent = child && (child->acceptedMouseButtons() & event->button()) &&
-           child->isEnabled() && !qobject_cast<QQuickText*>(child);
-   // do highlight if not pressed above the active component, and the component has either
-   // action, leading or trailing actions list or at least an active child component declared
-   QQuickMouseArea *ma = q->findChild<QQuickMouseArea*>();
-   bool activeMouseArea = ma && ma->isEnabled();
-   return !activeComponent && (isClickedConnected() || isPressAndHoldConnected() ||
-                               mainAction || leadingActions || trailingActions || activeMouseArea);
+   return (isClickedConnected() || isPressAndHoldConnected() || mainAction || leadingActions || trailingActions);
 }
 
 // set highlighted flag and update contentItem
@@ -876,8 +868,74 @@
  *
  * \sa ViewItems::dragMode, ViewItems::dragUpdated
  *
+ * \section2 Expansion
+ * Since Ubuntu.Components 1.3, ListItem supports expansion. ListItems declared
+ * in a view can expand exclusively, having leading and trailing panes locked
+ * when expanded and to be collapsed when tapping outside of the expanded area.
+ * The expansion is driven by the \l expansion group property, and the behavior
+ * by the \l ViewItems::expansionFlags and \l ViewItems::expandedIndices
+ * attached properties. Each ListItem which is required to expand should set a
+ * proper height in the \l expansion.height property, which should be bigger
+ * than the collapsed height of the ListItem is. The expansion itself is driven
+ * by the \l expansion.expanded property, which can be set freely depending on
+ * the use case, on click, on long press, etc.
+ *
+ * The default expansion behavior is set to be exclusive and locked, meaning
+ * there can be only one ListItem expanded within a view and neither leading
+ * nor trailing action panels cannot be swiped in. Expanding an other ListItem
+ * will collapse the previosuly expanded one. There can be cases when tapping
+ * outside of the expanded area of a ListItem we woudl need the expanded one
+ * to collapse automatically. This can be achieved by setting \c ViewItems.CollapseOnOutsidePress
+ * flag to \l ViewItems::expansionFlags. This flag will also turn on \c ViewItems.Exclusive
+ * flag, as tapping outside practicly forbids more than one item to be expanded
+ * at a time.
+ * \qml
+ * import QtQuick 2.4
+ * import Ubuntu.Components 1.3
+ *
+ * ListView {
+ *     width: units.gu(40)
+ *     height: units.gu(71)
+ *     model: ListModel {
+ *         Component.onCompleted: {
+ *             for (var i = 0; i < 50; i++) {
+ *                 append({data: i});
+ *             }
+ *         }
+ *     }
+ *     ViewItems.expansionFlags: ViewItems.CollapseOnOutsidePress
+ *     delegate: ListItem {
+ *         Label {
+ *             text: "Model item #" + modelData
+ *         }
+ *         trailingActions: ListItemActions {
+ *             actions: [
+ *                 Action {
+ *                     icon: "search"
+ *                 },
+ *                 Action {
+ *                     icon: "edit"
+ *                 },
+ *                 Action {
+ *                     icon: "copy"
+ *                 }
+ *             ]
+ *         }
+ *         expansion.height: units.gu(15)
+ *         onClicked: expansion.expanded = true
+ *     }
+ * }
+ * \endqml
+ * The example above collapses the expanded item whenever it is tapped or mouse
+ * pressed outside of the expanded list item.
+ * \note Set 0 to \l ViewItems::expansionFlags if no restrictions on expanded items
+ * is required (i.e multiple expanded items are allowed, swiping leading/trailing
+ * actions when expanded).
+ * \note Do not bind \l expansion.height to the ListItem's height as is will cause
+ * binding loops.
+ *
  * \section2 Note on styling
- * ListItem's styling differs from the other component sstyling, as ListItem loads
+ * ListItem's styling differs from the other components styling, as ListItem loads
  * the style only when either of the leadin/trailing panels are swiped, or when the
  * item enters in select- or drag mode. The component does not assume any visuals
  * to be present in the style.
@@ -914,6 +972,11 @@
 {
 }
 
+QObject *UCListItem::attachedViewItems(QObject *object, bool create)
+{
+    return qmlAttachedPropertiesObject<UCViewItemsAttached>(object, create);
+}
+
 void UCListItem::classBegin()
 {
     UCStyledItemBase::classBegin();
@@ -966,7 +1029,7 @@
                 this, SLOT(_q_syncDragMode()));
 
         // if selection or drag mode is on, initialize style, with animations turned off
-        if (d->parentAttached->selectMode() || d->parentAttached->dragMode()) {
+        if (d->parentAttached->selectMode() || d->parentAttached->dragMode() || (d->expansion && d->expansion->expanded())) {
             d->loadStyleItem(false);
         }
         // set the object name for testing purposes
@@ -996,10 +1059,10 @@
         QQuickItem *parentAttachee = data.item;
         if (d->flickable && d->flickable->inherits("QQuickListView")) {
             // attach to ListView
-            d->parentAttached = static_cast<UCViewItemsAttached*>(qmlAttachedPropertiesObject<UCViewItemsAttached>(d->flickable));
+            d->parentAttached = static_cast<UCViewItemsAttached*>(attachedViewItems(d->flickable, true));
             parentAttachee = d->flickable;
         } else if (data.item) {
-            d->parentAttached = static_cast<UCViewItemsAttached*>(qmlAttachedPropertiesObject<UCViewItemsAttached>(data.item));
+            d->parentAttached = static_cast<UCViewItemsAttached*>(attachedViewItems(data.item, true));
         } else {
             // mark as not ready, so no action should be performed which depends on readyness
             d->ready = false;
@@ -1007,6 +1070,11 @@
             d->parentAttached = 0;
         }
 
+        if (d->styleItem) {
+            UCListItemStyle * myStyle = static_cast<UCListItemStyle*>(d->styleItem);
+            myStyle->updateFlickable(d->flickable);
+        }
+
         if (parentAttachee) {
             QObject::connect(parentAttachee, SIGNAL(widthChanged()), this, SLOT(_q_updateSize()), Qt::DirectConnection);
             // update size
@@ -1081,7 +1149,7 @@
         // while moving, we cannot select any items
         return;
     }
-    if (d->canHighlight(event) && !d->highlighted && event->button() == Qt::LeftButton) {
+    if (d->canHighlight() && !d->highlighted && event->button() == Qt::LeftButton) {
         d->grabLeftButtonEvents(event);
     }
     // accept the event so we get the rest of the events as well
@@ -1194,7 +1262,7 @@
     Q_D(UCListItem);
     UCStyledItemBase::mouseMoveEvent(event);
 
-    if (d->selectMode() || d->dragMode()) {
+    if (d->selectMode() || d->dragMode() || (d->expansion && d->expansion->expandedLocked())) {
         // no move is allowed while selectable mode is on
         return;
     }
@@ -1672,4 +1740,48 @@
     d->defaultThemeVersion = BUILD_VERSION(1, 3);
 }
 
+QObject *UCListItem13::attachedViewItems(QObject *object, bool create)
+{
+    return qmlAttachedPropertiesObject<UCViewItemsAttached13>(object, create);
+}
+
+void UCListItem13::itemChange(ItemChange change, const ItemChangeData &data)
+{
+    UCListItem::itemChange(change, data);
+
+    Q_D(UCListItem);
+    // ViewItems drives expansion
+    if (d->parentAttached) {
+        connect(d->parentAttached.data(), SIGNAL(expandedIndicesChanged(QList<int>)),
+                this, SLOT(_q_updateExpansion(QList<int>)), Qt::UniqueConnection);
+    }
+}
+
+/*!
+ * \qmlpropertygroup ::ListItem::expansion
+ * \qmlproperty bool ListItem::expansion.expanded
+ * \qmlproperty real ListItem::expansion.height
+ * \since Ubuntu.Components 1.3
+ * The group drefines the expansion state of the ListItem.
+ */
+UCListItemExpansion *UCListItem13::expansion()
+{
+    Q_D(UCListItem);
+    if (!d->expansion) {
+        d->expansion = new UCListItemExpansion(this);
+    }
+    return d->expansion;
+}
+
+void UCListItem13::_q_updateExpansion(const QList<int> &indices)
+{
+    Q_UNUSED(indices);
+    Q_D(UCListItem);
+    Q_EMIT expansion()->expandedChanged();
+    // make sure the style is loaded
+    if (indices.contains(d->index())) {
+        d->loadStyleItem();
+    }
+}
+
 #include "moc_uclistitem.cpp"
 
=== modified file 'src/Ubuntu/Components/plugin/uclistitem.h'
--- src/Ubuntu/Components/plugin/uclistitem.h	2015-07-28 19:29:19 +0000
+++ src/Ubuntu/Components/plugin/uclistitem.h	2015-09-08 04:09:38 +0000
@@ -62,6 +62,7 @@
     void resetHighlightColor();
 
 protected:
+    virtual QObject *attachedViewItems(QObject *object, bool create);
     void classBegin();
     void componentComplete();
     QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *data);
@@ -109,17 +110,24 @@
     Q_PRIVATE_SLOT(d_func(), void _q_syncDragMode())
 };
 
+class UCListItemExpansion;
 class UCListItem13 : public UCListItem
 {
     Q_OBJECT
+    Q_PROPERTY(UCListItemExpansion* expansion READ expansion CONSTANT)
 protected:
+    virtual QObject *attachedViewItems(QObject *object, bool create);
+    void itemChange(ItemChange change, const ItemChangeData &data);
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
 private:
+    Q_SLOT void _q_updateExpansion(const QList<int> &indices);
     bool shouldShowContextMenu(QMouseEvent *event);
     void popoverClosed();
 public:
     explicit UCListItem13(QQuickItem *parent = 0);
+
+    UCListItemExpansion *expansion();
 };
 
 class UCListItemDividerPrivate;
@@ -158,8 +166,15 @@
     Q_PROPERTY(bool selectMode READ selectMode WRITE setSelectMode NOTIFY selectModeChanged)
     Q_PROPERTY(QList<int> selectedIndices READ selectedIndices WRITE setSelectedIndices NOTIFY selectedIndicesChanged)
     Q_PROPERTY(bool dragMode READ dragMode WRITE setDragMode NOTIFY dragModeChanged)
+    Q_ENUMS(ExpansionFlag)
 public:
-    explicit UCViewItemsAttached(QObject *owner);
+    enum ExpansionFlag {
+        Exclusive = 0x01,
+        UnlockExpanded = 0x02,
+        CollapseOnOutsidePress = Exclusive | 0x04
+    };
+    Q_DECLARE_FLAGS(ExpansionFlags, ExpansionFlag)
+    explicit UCViewItemsAttached(QObject *owner = 0);
     ~UCViewItemsAttached();
 
     static UCViewItemsAttached *qmlAttachedProperties(QObject *owner);
@@ -191,8 +206,68 @@
 private:
     Q_DECLARE_PRIVATE(UCViewItemsAttached)
 };
+Q_DECLARE_OPERATORS_FOR_FLAGS(UCViewItemsAttached::ExpansionFlags)
 QML_DECLARE_TYPEINFO(UCViewItemsAttached, QML_HAS_ATTACHED_PROPERTIES)
 
+// FIXME keep the 1.3 properties in a separate class, workaround for bug
+// https://bugs.launchpad.net/ubuntu/+source/qtdeclarative-opensource-src/+bug/1389721
+// enums and flag are added to UCViewItemsAttached like normal
+class UCViewItemsAttached13 : public UCViewItemsAttached
+{
+    Q_OBJECT
+    Q_PROPERTY(QList<int> expandedIndices READ expandedIndices WRITE setExpandedIndices NOTIFY expandedIndicesChanged)
+    Q_PROPERTY(int expansionFlags READ expansionFlags WRITE setExpansionFlags NOTIFY expansionFlagsChanged)
+public:
+    explicit UCViewItemsAttached13(QObject *owner = 0);
+    static UCViewItemsAttached13 *qmlAttachedProperties(QObject *owner);
+
+    QList<int> expandedIndices() const;
+    void setExpandedIndices(QList<int> indices);
+    int expansionFlags() const;
+    void setExpansionFlags(int flags);
+
+Q_SIGNALS:
+    void expandedIndicesChanged(const QList<int> &indices);
+    void expansionFlagsChanged();
+
+private:
+    UCViewItemsAttachedPrivate *d_ptr;
+    Q_DECLARE_PRIVATE_D(d_ptr, UCViewItemsAttached)
+};
+QML_DECLARE_TYPEINFO(UCViewItemsAttached13, QML_HAS_ATTACHED_PROPERTIES)
+
+class UCListItemExpansion : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool expanded READ expanded WRITE setExpanded NOTIFY expandedChanged)
+    Q_PROPERTY(qreal height MEMBER m_height WRITE setHeight NOTIFY heightChanged)
+public:
+    explicit UCListItemExpansion(QObject *parent = 0);
+
+    bool expandedLocked();
+    void enableClickFiltering(bool enable);
+
+    bool expanded();
+    void setExpanded(bool expanded);
+    void setHeight(qreal height);
+
+Q_SIGNALS:
+    void expandedChanged();
+    void heightChanged();
+
+protected:
+    bool eventFilter(QObject *, QEvent *);
+
+private:
+    UCListItem13 *m_listItem;
+    qreal m_height;
+    bool m_filtering:1;
+
+    friend class UCListItem;
+    friend class UCListItem13;
+    friend class UCListItemPrivate;
+};
+
 class UCDragEvent : public QObject
 {
     Q_OBJECT
 
=== modified file 'src/Ubuntu/Components/plugin/uclistitem_p.h'
--- src/Ubuntu/Components/plugin/uclistitem_p.h	2015-07-30 13:27:32 +0000
+++ src/Ubuntu/Components/plugin/uclistitem_p.h	2015-09-08 04:09:38 +0000
@@ -60,7 +60,7 @@
     void _q_syncSelectMode();
     void _q_syncDragMode();
     int index();
-    bool canHighlight(QMouseEvent *event);
+    bool canHighlight();
     void setHighlighted(bool pressed);
     void listenToRebind(bool listen);
     void lockContentItem(bool lock);
@@ -95,6 +95,7 @@
     UCListItemActions *leadingActions;
     UCListItemActions *trailingActions;
     UCAction *mainAction;
+    UCListItemExpansion *expansion;
 
     // getters/setters
     QQmlListProperty<QObject> data();
@@ -147,17 +148,25 @@
     bool isDragUpdatedConnected();
     void updateSelectedIndices(int fromIndex, int toIndex);
 
+    // expansion
+    void expand(int index, UCListItem13 *listItem, bool emitChangeSignal = true);
+    void collapse(int index, bool emitChangeSignal = true);
+    void collapseAll();
+    void toggleExpansionFlags(bool enable);
+
+    QSet<int> selectedList;
+    QMap<int, QPointer<UCListItem13> > expansionList;
+    QList< QPointer<QQuickFlickable> > flickables;
+    QList< PropertyChange* > changes;
+    QPointer<UCListItem> boundItem;
+    QPointer<UCListItem> disablerItem;
     QQuickFlickable *listView;
     ListItemDragArea *dragArea;
+    UCViewItemsAttached::ExpansionFlags expansionFlags;
     bool globalDisabled:1;
     bool selectable:1;
     bool draggable:1;
     bool ready:1;
-    QSet<int> selectedList;
-    QList< QPointer<QQuickFlickable> > flickables;
-    QList< PropertyChange* > changes;
-    QPointer<UCListItem> boundItem;
-    QPointer<UCListItem> disablerItem;
 };
 
 #endif // UCVIEWITEM_P_H
 
=== modified file 'src/Ubuntu/Components/plugin/uclistitemstyle.cpp'
--- src/Ubuntu/Components/plugin/uclistitemstyle.cpp	2015-04-13 13:42:03 +0000
+++ src/Ubuntu/Components/plugin/uclistitemstyle.cpp	2015-09-08 04:09:38 +0000
@@ -21,6 +21,7 @@
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlInfo>
 #include <QtQuick/private/qquickanimation_p.h>
+#include <QtQuick/private/qquickflickable_p.h>
 
 /*!
  * \qmltype ListItemStyle
@@ -41,6 +42,7 @@
     , m_snapAnimation(0)
     , m_dropAnimation(0)
     , m_dragPanel(0)
+    , m_flickable(Q_NULLPTR)
     , m_animatePanels(true)
 {
 }
@@ -54,21 +56,29 @@
         setAnimatePanels(context->contextProperty("animated").toBool());
     }
     m_listItem = qmlContext(this)->contextProperty("styledItem").value<UCListItem*>();
+    // get the flickable value
+    if (m_listItem) {
+        m_flickable = UCListItemPrivate::get(m_listItem)->flickable.data();
+    }
 }
 
 void UCListItemStyle::componentComplete()
 {
     QQuickItem::componentComplete();
 
-    // look for overridden slots
-    for (int i = metaObject()->methodOffset(); i < metaObject()->methodCount(); i++) {
-        const QMetaMethod method = metaObject()->method(i);
-        if (method.name() == QByteArrayLiteral("swipeEvent")) {
-            m_swipeEvent = method;
-        } else if (method.name() == QByteArrayLiteral("rebound")) {
-            m_rebound = method;
-        }
-    }
+    // look for overridden slots, indexOfMethod returns th elast index of the overridden method
+    m_rebound = metaObject()->method(metaObject()->indexOfMethod("rebound()"));
+    m_swipeEvent = metaObject()->method(metaObject()->indexOfMethod("swipeEvent(QVariant)"));
+//    qDebug() << m_rebound.isValid() << m_swipeEvent.isValid();
+//    for (int i = metaObject()->methodOffset(); i < metaObject()->methodCount(); i++) {
+//        const QMetaMethod method = metaObject()->method(i);
+//        if (method.name() == QByteArrayLiteral("swipeEvent")) {
+//            qDebug() << method.methodSignature();
+//            m_swipeEvent = method;
+//        } else if (method.name() == QByteArrayLiteral("rebound")) {
+//            m_rebound = method;
+//        }
+//    }
 
     // connect snapAnimation's stopped() and the owning ListItem's contentMovementeEnded() signals
     if (m_listItem && m_snapAnimation) {
@@ -92,6 +102,25 @@
 }
 
 /*!
+ * \qmlproperty Flickable ListItemStyle::flickable
+ * \readonly
+ * \since Ubuntu.Components.Styles 1.3
+ * The property holds the Flickable (or ListView) holding the ListItem styled.
+ */
+QQuickFlickable *UCListItemStyle::flickable()
+{
+    return m_flickable;
+}
+void UCListItemStyle::updateFlickable(QQuickFlickable *flickable)
+{
+    if (m_flickable == flickable) {
+        return;
+    }
+    m_flickable = flickable;
+    Q_EMIT flickableChanged();
+}
+
+/*!
  * \qmlmethod ListItemStyle::swipeEvent(SwipeEvent event)
  * The function is called by the ListItem when a swipe action is performed, i.e.
  * when the swipe is started, the position is updated or the swipe ends. The
 
=== modified file 'src/Ubuntu/Components/plugin/uclistitemstyle.h'
--- src/Ubuntu/Components/plugin/uclistitemstyle.h	2015-04-13 13:42:03 +0000
+++ src/Ubuntu/Components/plugin/uclistitemstyle.h	2015-09-08 04:09:38 +0000
@@ -62,6 +62,7 @@
 class QQuickPropertyAnimation;
 class QQuickBehavior;
 class UCListItem;
+class QQuickFlickable;
 class UCListItemStyle : public QQuickItem
 {
     Q_OBJECT
@@ -70,6 +71,7 @@
     Q_PROPERTY(bool animatePanels READ animatePanels NOTIFY animatePanelsChanged)
     Q_PROPERTY(QQuickItem *dragPanel MEMBER m_dragPanel NOTIFY dragPanelChanged)
     Q_PROPERTY(int listItemIndex READ index NOTIFY listItemIndexChanged FINAL REVISION 1)
+    Q_PROPERTY(QQuickFlickable *flickable READ flickable NOTIFY flickableChanged REVISION 1)
 public:
     explicit UCListItemStyle(QQuickItem *parent = 0);
 
@@ -78,6 +80,8 @@
     bool animatePanels() const;
     void setAnimatePanels(bool animate);
     int index();
+    QQuickFlickable *flickable();
+    void updateFlickable(QQuickFlickable *flickable);
 
 Q_SIGNALS:
     void snapAnimationChanged();
@@ -85,6 +89,7 @@
     void animatePanelsChanged();
     void dragPanelChanged();
     Q_REVISION(1) void listItemIndexChanged();
+    Q_REVISION(1) void flickableChanged();
 
 public Q_SLOTS:
     void swipeEvent(UCSwipeEvent *event);
@@ -102,6 +107,7 @@
     QQuickAbstractAnimation *m_snapAnimation;
     QQuickPropertyAnimation *m_dropAnimation;
     QQuickItem *m_dragPanel;
+    QQuickFlickable *m_flickable;
     bool m_animatePanels:1;
 
     friend class UCListItemPrivate;
 
=== modified file 'src/Ubuntu/Components/plugin/ucqquickimageextension.cpp'
--- src/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2014-11-24 13:14:35 +0000
+++ src/Ubuntu/Components/plugin/ucqquickimageextension.cpp	2015-09-08 04:09:38 +0000
@@ -19,6 +19,7 @@
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtCore/QDir>
+#include <QtGui/QGuiApplication>
 #include <QtQuick/private/qquickimagebase_p.h>
 
 #include "ucqquickimageextension.h"
@@ -78,8 +79,18 @@
     QString selectedFilePath = resolved.mid(separatorPosition+1);
 
     if (scaleFactor == "1") {
-        // No scaling. Just pass the file as is.
-        m_image->setSource(QUrl::fromLocalFile(selectedFilePath));
+        if (qFuzzyCompare(qGuiApp->devicePixelRatio(), (qreal)1.0)
+                || selectedFilePath.endsWith(".svg") || selectedFilePath.endsWith(".svgz")) {
+            // No scaling necessary. Just pass the file as is.
+            m_image->setSource(QUrl::fromLocalFile(selectedFilePath));
+        } else {
+            // Need to scale the pixel-based image to suit the devicePixelRatio setting ourselves.
+            // If we let Qt do it, Qt will not choose the UITK-supported "@gu" scaled images.
+            m_image->setSource(QUrl("image://scaling/1/" + selectedFilePath));
+            // explicitly set the source size in the QQuickImageBase, this persuades it that the
+            // supplied image is suitable for the current devicePixelRatio.
+            m_image->setSourceSize(m_image->sourceSize());
+        }
     } else {
         // Prepend "image://scaling" for the image to be loaded by UCScalingImageProvider.
         if (!m_source.path().endsWith(".sci")) {
@@ -100,7 +111,13 @@
                 rewrittenSciFile->setFileTemplate(QDir::tempPath() + QDir::separator() + "XXXXXX.sci");
                 rewrittenSciFile->open();
                 QTextStream output(rewrittenSciFile);
-                rewritten = rewriteSciFile(selectedFilePath, scaleFactor, output);
+
+                if (qFuzzyCompare(qGuiApp->devicePixelRatio(), (qreal)1.0)) {
+                    rewritten = rewriteSciFile(selectedFilePath, scaleFactor, output);
+                } else {
+                    QString scaleFactorInDevicePixels = QString::number(scaleFactor.toFloat() / qGuiApp->devicePixelRatio());
+                    rewritten = rewriteSciFile(selectedFilePath, scaleFactorInDevicePixels, output);
+                }
                 rewrittenSciFile->close();
 
                 s_rewrittenSciFiles.insert(m_source, QSharedPointer<QTemporaryFile>(rewrittenSciFile));
@@ -112,6 +129,9 @@
                 m_image->setSource(m_source);
             }
         }
+        // explicitly set the source size in the QQuickImageBase, this persuades it that the
+        // supplied image is suitable for the current devicePixelRatio.
+        m_image->setSourceSize(m_image->sourceSize());
     }
 }
 
 
=== modified file 'src/Ubuntu/Components/plugin/ucstatesaver.cpp'
--- src/Ubuntu/Components/plugin/ucstatesaver.cpp	2015-07-22 14:35:48 +0000
+++ src/Ubuntu/Components/plugin/ucstatesaver.cpp	2015-09-08 04:09:38 +0000
@@ -147,7 +147,7 @@
  * \instantiates UCStateSaverAttached
  * \inqmlmodule Ubuntu.Components 1.1
  * \ingroup ubuntu-services
- * \brief Attached propertyes to save component property states.
+ * \brief Attached properties to save component property states.
  *
  * StateSaver attached object provides the ability to save component property values
  * that can be restored after an inproper application close. The properties subject
@@ -297,7 +297,7 @@
  * List of properties to be serialized, separated with commas. Properties must be
  * writable and can only be \l{http://qt-project.org/doc/qt-5.0/qtqml/qtqml-typesystem-basictypes.html}{QML base types}.
  *
- * A custom singl eline input which saves the text, polaceholderText, font and color would look as follows:
+ * A custom single line input which saves the text, placeholderText, font and color would look as follows:
  * \qml
  * TextField {
  *     id: input
 
=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-08-24 20:49:41 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-09-08 04:09:38 +0000
@@ -318,10 +318,7 @@
     setFlag(ItemHasContents);
     QObject::connect(&UCUnits::instance(), SIGNAL(gridUnitChanged()), this,
                      SLOT(_q_gridUnitChanged()));
-    const float gridUnit = UCUnits::instance().gridUnit();
-    setImplicitWidth(implicitWidthGU * gridUnit);
-    setImplicitHeight(implicitHeightGU * gridUnit);
-    update();
+    _q_gridUnitChanged();
 }
 
 /*! \qmlproperty string UbuntuShape::radius
@@ -803,9 +800,11 @@
 */
 void UCUbuntuShape::setColor(const QColor& color)
 {
-    if (QuickUtils::showDeprecationWarnings()) {
-        qmlInfo(this) << "'color' is deprecated. Use 'backgroundColor', 'secondaryBackgroundColor' and "
-            "'backgroundMode' instead.";
+    static bool loggedOnce = false;
+    if (!loggedOnce) {
+        loggedOnce = true;
+        qmlInfo(this) << "'color' is deprecated. Use 'backgroundColor', 'secondaryBackgroundColor' "
+            "and 'backgroundMode' instead.";
     }
 
     if (!(m_flags & BackgroundApiSet)) {
@@ -834,7 +833,9 @@
 */
 void UCUbuntuShape::setGradientColor(const QColor& gradientColor)
 {
-    if (QuickUtils::showDeprecationWarnings()) {
+    static bool loggedOnce = false;
+    if (!loggedOnce) {
+        loggedOnce = true;
         qmlInfo(this) << "'gradientColor' is deprecated. Use 'backgroundColor', "
             "'secondaryBackgroundColor' and 'backgroundMode' instead.";
     }
@@ -863,7 +864,9 @@
 */
 void UCUbuntuShape::setImage(const QVariant& image)
 {
-    if (QuickUtils::showDeprecationWarnings()) {
+    static bool loggedOnce = false;
+    if (!loggedOnce) {
+        loggedOnce = true;
         qmlInfo(this) << "'image' is deprecated. Use 'source' instead.";
     }
 
@@ -894,7 +897,9 @@
 // maintain it for a while for compatibility reasons.
 void UCUbuntuShape::setStretched(bool stretched)
 {
-    if (QuickUtils::showDeprecationWarnings()) {
+    static bool loggedOnce = false;
+    if (!loggedOnce) {
+        loggedOnce = true;
         qmlInfo(this) << "'stretched' is deprecated. Use 'sourceFillMode' instead";
     }
 
@@ -915,8 +920,11 @@
 // Deprecation layer. Same comment as setStretched().
 void UCUbuntuShape::setHorizontalAlignment(HAlignment horizontalAlignment)
 {
-    if (QuickUtils::showDeprecationWarnings()) {
-        qmlInfo(this) << "'horizontalAlignment' is deprecated. Use 'sourceHorizontalAlignment' instead";
+    static bool loggedOnce = false;
+    if (!loggedOnce) {
+        loggedOnce = true;
+        qmlInfo(this) << "'horizontalAlignment' is deprecated. Use 'sourceHorizontalAlignment' "
+            "instead";
     }
 
     if (!(m_flags & SourceApiSet)) {
@@ -932,8 +940,11 @@
 // Deprecation layer. Same comment as setStretched().
 void UCUbuntuShape::setVerticalAlignment(VAlignment verticalAlignment)
 {
-    if (QuickUtils::showDeprecationWarnings()) {
-        qmlInfo(this) << "'horizontalAlignment' is deprecated. Use 'sourceVerticalAlignment' instead";
+    static bool loggedOnce = false;
+    if (!loggedOnce) {
+        loggedOnce = true;
+        qmlInfo(this) << "'horizontalAlignment' is deprecated. Use 'sourceVerticalAlignment' "
+            "instead";
     }
 
     if (!(m_flags & SourceApiSet)) {
@@ -1009,20 +1020,11 @@
     updateFromImageProperties(qobject_cast<QQuickItem*>(sender()));
 }
 
-void UCUbuntuShape::_q_openglContextDestroyed()
-{
-    // Delete the shape textures that are stored per context and shared by all the shape items.
-    const int index = getShapeTexturesIndex(qobject_cast<QOpenGLContext*>(sender()));
-    Q_ASSERT(index >= 0);
-    shapeTextures[index].openglContext = NULL;
-    glDeleteTextures(shapeTextureCount, shapeTextures[index].textureId);
-}
-
 void UCUbuntuShape::_q_gridUnitChanged()
 {
-    const float gridUnit = UCUnits::instance().gridUnit();
-    setImplicitWidth(implicitWidthGU * gridUnit);
-    setImplicitHeight(implicitHeightGU * gridUnit);
+    const float gridUnitInDevicePixels = UCUnits::instance().gridUnit() / qGuiApp->devicePixelRatio();
+    setImplicitWidth(implicitWidthGU * gridUnitInDevicePixels);
+    setImplicitHeight(implicitHeightGU * gridUnitInDevicePixels);
     update();
 }
 
@@ -1170,8 +1172,10 @@
             glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, shapeTextureSize, shapeTextureSize, 0, GL_RGBA,
                          GL_UNSIGNED_BYTE, shapeTextureData[i]);
         }
-        QObject::connect(openglContext, SIGNAL(aboutToBeDestroyed()), this,
-                         SLOT(_q_openglContextDestroyed()), Qt::DirectConnection);
+        connect(openglContext, &QOpenGLContext::aboutToBeDestroyed, [index] {
+            shapeTextures[index].openglContext = NULL;
+            glDeleteTextures(shapeTextureCount, shapeTextures[index].textureId);
+        } );
     }
     const quint32 shapeTextureId = shapeTextures[index].textureId[m_aspect != DropShadow ? 0 : 1];
 
@@ -1184,13 +1188,15 @@
             sourceTextureRect = sourceTexture->normalizedTextureSubRect();
         }
         if (m_flags & DirtySourceTransform) {
+            const float dpr = qGuiApp->devicePixelRatio();
+
             if (m_flags & SourceApiSet) {
-                updateSourceTransform(itemSize.width(), itemSize.height(), m_sourceFillMode,
+                updateSourceTransform(itemSize.width() * dpr, itemSize.height() * dpr, m_sourceFillMode,
                                       m_sourceHorizontalAlignment, m_sourceVerticalAlignment,
                                       sourceTexture->textureSize());
             } else {
                 FillMode imageFillMode = (m_flags & Stretched) ? Stretch : PreserveAspectCrop;
-                updateSourceTransform(itemSize.width(), itemSize.height(), imageFillMode,
+                updateSourceTransform(itemSize.width() * dpr, itemSize.height() * dpr, imageFillMode,
                                       m_imageHorizontalAlignment, m_imageVerticalAlignment,
                                       sourceTexture->textureSize());
             }
@@ -1220,13 +1226,15 @@
         // accordingly. The shape was using a fixed image for the corner before switching to a
         // distance field, since the corner wasn't taking the whole image (ending at ~80%) we need
         // to take that into account when the size is scaled down.
-        radius = UCUnits::instance().gridUnit() * radiusGuMap[m_radius];
+        radius = UCUnits::instance().gridUnit() * radiusGuMap[m_radius]
+                     / qGuiApp->devicePixelRatio();
         const float scaledDownRadius = qMin(itemSize.width(), itemSize.height()) * 0.5f * 0.8f;
         if (radius > scaledDownRadius) {
             radius = scaledDownRadius;
         }
     } else {
-        radius = qMin(itemSize.width(), itemSize.height()) * 0.5f * (m_relativeRadius * 0.01f);
+        radius = qMin(itemSize.width(), itemSize.height()) * 0.5f * (m_relativeRadius * 0.01f)
+                     / qGuiApp->devicePixelRatio();
     }
 
     updateMaterial(node, radius, shapeTextureId, sourceTexture && m_sourceOpacity);
@@ -1306,16 +1314,19 @@
         materialData->sourceOpacity = 0;
     }
 
+    const float physicalRadius = radius * qGuiApp->devicePixelRatio();
+
     // Mapping of radius size range from [0, 4] to [0, 1] with clamping, plus quantization.
     const float start = 0.0f + radiusSizeOffset;
     const float end = 4.0f + radiusSizeOffset;
+
     materialData->distanceAAFactor =
-        qMin((radius / (end - start)) - (start / (end - start)), 1.0f) * 255.0f;
+        qMin((physicalRadius / (end - start)) - (start / (end - start)), 1.0f) * 255.0f;
 
     // When the radius is equal to radiusSizeOffset (which means radius size is 0), no aspect is
     // flagged so that a dedicated (statically flow controlled) shaved off shader can be used for
     // optimal performance.
-    if (radius > radiusSizeOffset) {
+    if (physicalRadius > radiusSizeOffset) {
         const quint8 aspectFlags[] = {
             ShapeMaterial::Data::Flat, ShapeMaterial::Data::Inset, ShapeMaterial::Data::DropShadow,
             ShapeMaterial::Data::Inset | ShapeMaterial::Data::Pressed
 
=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.h'
--- src/Ubuntu/Components/plugin/ucubuntushape.h	2015-08-06 13:16:24 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.h	2015-09-08 04:09:38 +0000
@@ -296,7 +296,6 @@
 
 private Q_SLOTS:
     void _q_imagePropertiesChanged();
-    void _q_openglContextDestroyed();
     void _q_gridUnitChanged();
     void _q_providerDestroyed(QObject* object=0);
     void _q_textureChanged();
 
=== modified file 'src/Ubuntu/Components/plugin/ucunits.cpp'
--- src/Ubuntu/Components/plugin/ucunits.cpp	2015-03-03 13:47:48 +0000
+++ src/Ubuntu/Components/plugin/ucunits.cpp	2015-09-08 04:09:38 +0000
@@ -24,6 +24,8 @@
 #include <QtCore/QDir>
 #include <QtCore/QRegularExpression>
 #include <QtCore/qmath.h>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QScreen>
 
 #define ENV_GRID_UNIT_PX "GRID_UNIT_PX"
 #define DEFAULT_GRID_UNIT_PX 8
@@ -62,10 +64,46 @@
 
     \sa {Resolution Independence}
 */
+
+/*
+ * Note on the interaction between GRID_UNIT_PX and QT_DEVICE_PIXEL_RATIO
+ *
+ * In Qt5.4 there is a single means to scale the UI: the QT_DEVICE_PIXEL_RATIO environment
+ * variable. This accepts only integer values, thus allowing a x2 or x3 scaling of any
+ * Qt-based UI, that includes QWidget as well as any QML UI.
+ *
+ * Setting QT_DEVICE_PIXEL_RATIO=2 implies one density-independent pixel corresponds to 2
+ * physical pixels. Developers describe their UI in terms of density-independent pixels.
+ * Qt scales accordingly.
+ *
+ * The Ubuntu UI Toolkit has solved the scaling problem with the GRID_UNIT_PX variable.
+ * It offers more flexibility, but only scales QML applications written to use the UITK
+ * (since it uses this Units class) as it is built on top of QML.
+ *
+ * There are additional areas in Qt where QT_DEVICE_PIXEL_RATIO causes correct scaling which
+ * GRID_UNIT_PX cannot, for example:
+ *   1. cacheBuffer for ListView/GridViews - specified in density-independent pixels
+ *   2. gesture recognition  matches what is on screen better, as it is density-independent
+ *      pixel aware
+ *
+ * In order to get the best of both worlds, Ubuntu will set both GRID_UNIT_PX and
+ * QT_DEVICE_PIXEL_RATIO. Thus all Qt apps will scale reasonably well, with UITK-based apps
+ * scaling perfectly for any desired scale (i.e. non-integer scales).
+ *
+ * However UITK developers can just use this Units class as usual, and will be almost totally
+ * isolated from Qt's own scaling concept.
+ */
+
 UCUnits::UCUnits(QObject *parent) :
-    QObject(parent)
+    QObject(parent),
+    m_devicePixelRatio(qGuiApp->devicePixelRatio())
 {
-    m_gridUnit = getenvFloat(ENV_GRID_UNIT_PX, DEFAULT_GRID_UNIT_PX);
+    // If GRID_UNIT_PX set, always use it. If not, 1GU := DEFAULT_GRID_UNIT_PX * m_devicePixelRatio
+    if (qEnvironmentVariableIsSet(ENV_GRID_UNIT_PX)) {
+        m_gridUnit = getenvFloat(ENV_GRID_UNIT_PX, DEFAULT_GRID_UNIT_PX);
+    } else {
+        m_gridUnit = DEFAULT_GRID_UNIT_PX * m_devicePixelRatio;
+    }
 }
 
 /*!
@@ -89,14 +127,15 @@
 
     Returns the number of pixels \a value density independent pixels correspond to.
 */
+// Density-independent pixels (and not physical pixels) because Qt sizes in terms of density-independent pixels.
 float UCUnits::dp(float value)
 {
     const float ratio = m_gridUnit / DEFAULT_GRID_UNIT_PX;
     if (value <= 2.0) {
         // for values under 2dp, return only multiples of the value
-        return qRound(value * qFloor(ratio));
+        return qRound(value * qFloor(ratio)) / m_devicePixelRatio;
     } else {
-        return qRound(value * ratio);
+        return qRound(value * ratio) / m_devicePixelRatio;
     }
 }
 
@@ -105,9 +144,11 @@
 
     Returns the number of pixels \a value grid units correspond to.
 */
+// Density-independent pixels (and not physical pixels) because Qt sizes in terms of density-independent pixels.
+
 float UCUnits::gu(float value)
 {
-    return qRound(value * m_gridUnit);
+    return qRound(value * m_gridUnit) / m_devicePixelRatio;
 }
 
 QString UCUnits::resolveResource(const QUrl& url)
 
=== modified file 'src/Ubuntu/Components/plugin/ucunits.h'
--- src/Ubuntu/Components/plugin/ucunits.h	2013-10-18 08:56:39 +0000
+++ src/Ubuntu/Components/plugin/ucunits.h	2015-09-08 04:09:38 +0000
@@ -53,6 +53,7 @@
     float gridUnitSuffixFromFileName(const QString &fileName);
 
 private:
+    float m_devicePixelRatio;
     float m_gridUnit;
 };
 
 
=== modified file 'src/Ubuntu/Components/plugin/ucviewitemsattached.cpp'
--- src/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-03-17 16:48:59 +0000
+++ src/Ubuntu/Components/plugin/ucviewitemsattached.cpp	2015-09-08 04:09:38 +0000
@@ -104,6 +104,7 @@
     : QObjectPrivate()
     , listView(0)
     , dragArea(0)
+    , expansionFlags(UCViewItemsAttached::Exclusive)
     , globalDisabled(false)
     , selectable(false)
     , draggable(false)
@@ -556,7 +557,7 @@
         return;
     }
     dragArea = new ListItemDragArea(listView);
-    dragArea->init();
+    dragArea->init(q_func());
 }
 
 void UCViewItemsAttachedPrivate::leaveDragMode()
@@ -611,3 +612,142 @@
         Q_EMIT q->selectedIndicesChanged();
     }
 }
+
+
+UCViewItemsAttached13::UCViewItemsAttached13(QObject *owner)
+    : UCViewItemsAttached(owner)
+{
+    d_ptr = UCViewItemsAttachedPrivate::get(this);
+}
+
+UCViewItemsAttached13 *UCViewItemsAttached13::qmlAttachedProperties(QObject *owner)
+{
+    return new UCViewItemsAttached13(owner);
+}
+
+/*!
+ * \qmlattachedproperty list<int> ViewItems::expandedIndices
+ * \since Ubuntu.Components 1.3
+ * The property contains the indexes of the ListItems marked as expanded. The
+ * indexes are model indexes when used in ListView, and child indexes in other
+ * components. The property being writable, initial expansion configuration
+ * can be provided for a view, and provides ability to save the expansion state.
+ * \note If the \l ViewItems::expansionFlags is having \c ViewItems.Exclusive
+ * flags set, only the last item from the list will be considered and set as
+ * expanded.
+ */
+QList<int> UCViewItemsAttached13::expandedIndices() const
+{
+    Q_D(const UCViewItemsAttached);
+    return d->expansionList.keys();
+}
+void UCViewItemsAttached13::setExpandedIndices(QList<int> indices)
+{
+    Q_UNUSED(indices);
+    Q_D(UCViewItemsAttached);
+    d->collapseAll();
+    if (indices.size() > 0) {
+        if (d->expansionFlags & UCViewItemsAttached::Exclusive) {
+            // take only the last one from the list
+            d->expand(indices.last(), QPointer<UCListItem13>(), false);
+        } else {
+            for (int i = 0; i < indices.size(); i++) {
+                d->expand(indices[i], QPointer<UCListItem13>(), false);
+            }
+        }
+    }
+    Q_EMIT expandedIndicesChanged(d->expansionList.keys());
+}
+
+// insert listItem into the expanded indices map
+void UCViewItemsAttachedPrivate::expand(int index, UCListItem13 *listItem, bool emitChangeSignal)
+{