Merge lp:~tpeeters/ubuntu-ui-toolkit/noPrivateHeader into lp:~bzoltan/ubuntu-ui-toolkit/landing_140514

[Tim Peeters]

Undo changes of r1082 that cause a regression in messaging-app (and contenthub).

Undo changes of r1082 that cause a regression in messaging-app (and contenthub).

Unmerged revisions

1088. By Tim Peeters on 2014-05-28

revert r1082 because it breaks contenthub (and thus messaging-app)

1087. By Zoltan Balogh on 2014-05-28

Landing 28/05

1086. By Cris Dywan on 2014-05-28

Tweak API parsing to include the Button.font property. Fixes: https://bugs.launchpad.net/bugs/1322169.

Approved by PS Jenkins bot.

1085. By Zsombor Egri on 2014-05-28

Missing "default" keyword added to children property of Base, causing rendering and test case failures on Qt 5.3. Fixes: https://bugs.launchpad.net/bugs/1317881.

Approved by PS Jenkins bot, Tim Peeters.

1084. By Ugo Riboni on 2014-05-27

Allow requesting extra large thumbnails.

Approved by PS Jenkins bot, Zsombor Egri.

1083. By Florian Boucault on 2014-05-27

AnimatedItem: deprecated as it was not used and still costly.

Approved by PS Jenkins bot, Zsombor Egri.

1082. By Tim Peeters on 2014-05-27

Make Header component internal as it was always documented.

Approved by Zsombor Egri, PS Jenkins bot.

1081. By Cris Dywan on 2014-05-27

Call bindtextdomain on /usr if APP_DIR is not defined. Fixes: https://bugs.launchpad.net/bugs/1322630.

Approved by PS Jenkins bot, Tim Peeters, David Planella.

1080. By Zoltan Balogh on 2014-05-27

Replace split with match to work around failing split() function usage.

Approved by Zsombor Egri, PS Jenkins bot.

1079. By Cris Dywan on 2014-05-26

More unit tests and property corrections for SortFilterModel.

Approved by Tim Peeters, PS Jenkins bot.

=== modified file 'CHANGES'
--- CHANGES	2014-04-24 20:35:41 +0000
+++ CHANGES	2014-05-28 18:09:57 +0000
@@ -19,6 +19,7 @@
 
 API Changes
 ***********
+* CHANGED IN: ThinDivider: base class Image TO Rectangle
 * ADDED IN: all modules exported as 0.1 as well as 1.0 version
 * ADDED IN: PickerDelegate: readonly property Picker picker
 * CHANGED IN: OptionSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
 
=== modified file 'components.api'
--- components.api	2014-05-13 09:13:32 +0000
+++ components.api	2014-05-28 18:09:57 +0000
@@ -31,6 +31,7 @@
 AbstractButton
     property color color
     property Gradient gradient
+    property font font
     property string iconPosition
 CheckBox 0.1 1.0
 AbstractButton
@@ -94,7 +95,7 @@
     property real __leftIconMargin
     property real __rightIconMargin
     property bool __iconIsItem
-    property internal children
+    default property internal children
 Caption 0.1 1.0
 Item
     property string text
@@ -140,6 +141,7 @@
     property bool expanded
     property bool multiSelection
     property bool colourImage
+    property Component delegate
     property real containerHeight
     property int selectedIndex
     property bool currentlyExpanded
@@ -175,7 +177,7 @@
 Base
     property string subText
 ThinDivider 0.1 1.0
-Image
+Rectangle
 ValueSelector 0.1 1.0
 Empty
     property variant icon
@@ -204,12 +206,14 @@
 Object 0.1 1.0
 QtObject
     default property internal children
+    property list<QtObject> __defaultPropertyFix
 OptionSelector 0.1 1.0
 ListItem.Empty
     property var model
     property bool expanded
     property bool multiSelection
     property bool colourImage
+    property Component delegate
     property real containerHeight
     property int selectedIndex
     property bool currentlyExpanded
@@ -235,6 +239,7 @@
 Page 0.1 1.0
 PageTreeNode
     property string title
+    property Item tools
     property Item __customHeaderContents
     property Flickable flickable
     property list<Action> actions
@@ -355,6 +360,7 @@
 OrientationHelper
     property Item dismissArea
     property bool grabDismissAreaEvents
+    property PropertyAnimation fadingAnimation
     function show()
     function hide()
     function __closeIfHidden()
@@ -613,6 +619,11 @@
     function mouseLongPress(item, x, y, button, modifiers, delay)
     function tryCompareFunction(func, expectedResult, timeout)
 plugins.qmltypes
+    name: "FilterBehavior"
+    prototype: "QObject"
+    exports: ["FilterBehavior 1.1"]
+    Property { name: "property"; type: "string" }
+    Property { name: "pattern"; type: "QRegExp" }
     name: "InverseMouseAreaType"
     prototype: "QQuickMouseArea"
     exports: ["InverseMouseArea 0.1", "InverseMouseArea 1.0"]
@@ -621,6 +632,41 @@
     Method {
     name: "contains"
     Parameter { name: "point"; type: "QPointF" }
+    name: "QAbstractProxyModel"
+    prototype: "QAbstractItemModel"
+    Property { name: "sourceModel"; type: "QAbstractItemModel"; isPointer: true }
+    name: "QSortFilterProxyModel"
+    prototype: "QAbstractProxyModel"
+    Property { name: "filterRegExp"; type: "QRegExp" }
+    Property { name: "filterKeyColumn"; type: "int" }
+    Property { name: "dynamicSortFilter"; type: "bool" }
+    Property { name: "filterCaseSensitivity"; type: "Qt::CaseSensitivity" }
+    Property { name: "sortCaseSensitivity"; type: "Qt::CaseSensitivity" }
+    Property { name: "isSortLocaleAware"; type: "bool" }
+    Property { name: "sortRole"; type: "int" }
+    Property { name: "filterRole"; type: "int" }
+    Method {
+    name: "setFilterRegExp"
+    Parameter { name: "pattern"; type: "string" }
+    Method {
+    name: "setFilterWildcard"
+    Parameter { name: "pattern"; type: "string" }
+    Method {
+    name: "setFilterFixedString"
+    Parameter { name: "pattern"; type: "string" }
+    Method { name: "clear" }
+    Method { name: "invalidate" }
+    name: "QSortFilterProxyModelQML"
+    prototype: "QSortFilterProxyModel"
+    exports: ["SortFilterModel 1.1"]
+    Property { name: "model"; type: "QAbstractItemModel"; isPointer: true }
+    Property { name: "count"; type: "int"; isReadonly: true }
+    Property { name: "sort"; type: "SortBehavior"; isReadonly: true; isPointer: true }
+    Property { name: "filter"; type: "FilterBehavior"; isReadonly: true; isPointer: true }
+    Method {
+    name: "get"
+    Parameter { name: "row"; type: "int" }
+    Method { name: "count"; type: "int" }
     name: "ShapeItem"
     prototype: "QQuickItem"
     exports: ["Shape 0.1", "Shape 1.0"]
@@ -636,6 +682,11 @@
     Property { name: "borderSource"; type: "string" }
     Signal { name: "borderChanged" }
     Method { name: "gridUnitChanged" }
+    name: "SortBehavior"
+    prototype: "QObject"
+    exports: ["SortBehavior 1.1"]
+    Property { name: "property"; type: "string" }
+    Property { name: "order"; type: "Qt::SortOrder" }
     name: "UCAlarm"
     prototype: "QObject"
     exports: ["Alarm 0.1", "Alarm 1.0"]
@@ -819,6 +870,8 @@
     exports: ["Layouts 0.1", "Layouts 1.0"]
     Property { name: "currentLayout"; type: "string"; isReadonly: true }
     Property { name: "layouts"; type: "ULConditionalLayout"; isList: true; isReadonly: true }
+    Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+    Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
     name: "ULLayoutsAttached"
     prototype: "QObject"
     Property { name: "item"; type: "string" }
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-05-16 11:56:17 +0000
+++ debian/changelog	2014-05-28 18:09:57 +0000
@@ -1,4 +1,115 @@
-ubuntu-ui-toolkit (0.1.46+14.10.20140512-0ubuntu2) UNRELEASED; urgency=medium
+ubuntu-ui-toolkit (0.1.46+14.10.20140527-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Christian Dywan ]
+  * Tweak API parsing to include the Button.font property. 
+    Fixes: https://bugs.launchpad.net/bugs/1322169
+  * Call bindtextdomain on /usr if APP_DIR is not defined. 
+    Fixes: https://bugs.launchpad.net/bugs/1322630
+  * More unit tests and property corrections for SortFilterModel.
+  * Read ubuntu-ui-toolkit.ini from $XDG_CONFIG_HOME.
+  * Skip test_ubuntushape which is flakey and add a FIXME.
+
+  [ Zsombor Egri ]
+  * Missing "default" keyword added to children property of Base, 
+    causing rendering and test case failures on Qt 5.3. 
+    Fixes: https://bugs.launchpad.net/bugs/1317881
+
+  [ Ugo Riboni ]
+  * Allow requesting extra large thumbnails.
+
+  [ Florian Boucault ]
+  * AnimatedItem: deprecated as it was not used and still costly.
+  * Label: default font weight is now light.
+
+  [ Tim Peeters ]
+  * Make Header component internal as it was always documented.
+
+
+  [ Zoltán Balogh ]
+  * Replace split with match to work around failing split() 
+    function usage.
+ 
+ -- Zoltán Balogh <[e-mail]>  Wed, 28 May 2014 11:54:22 +0200
+
+ubuntu-ui-toolkit (0.1.46+14.10.20140527-0ubuntu1) utopic; urgency=medium
+
+  [ Timo Jyrinki ]
+  * Allow using the renamed QML packages. Allow also old names 
+    for eg. trusty backporting. For additional cross-building 
+    friendliness, add :any to python build dependencies.
+
+  [ Leo Arias ]
+  * Rewrite OptionSelector tests using new helpers.
+  * Added autopilot helpers to pick a time from a date picker.
+  * In autopilot select all text only if not already selected.
+    Fixes: https://bugs.launchpad.net/bugs/1321222.
+
+  [ Christian Dywan ]
+  * Skip flaky test_updateAlarm_Repeating.
+  * Skip test_ubuntushape which is flakey and add a FIXME.
+  * Read ubuntu-ui-toolkit.ini from $XDG_CONFIG_HOME.
+  * More unit tests and property corrections for SortFilterModel.
+
+  [ Tim Peeters ]
+  * Fix bug where header actions are painted in the middle 
+    of the page. Fixes: https://bugs.launchpad.net/bugs/1319861
+  * Add header demo program to the resources.
+  * Show header if it was not visible before clicking header 
+    button in autopilot test. 
+
+  [ Florian Boucault ]
+  * ActivityIndicator: do not rely on the main thread to animate
+    by using an Animator.
+  * ThinDivider: use a Rectangle instead of an Image. 
+    5x faster creation.
+  * Label: default font weight is now light.
+
+  [ Zsombor Egri ]
+  * Ubuntu Layouts reparents those default layout components which
+    are not subject of layout instead of altering their visible and
+    enabled properties. 
+    Fixes: https://bugs.launchpad.net/bugs/1204834
+    https://bugs.launchpad.net/bugs/1298886
+    https://bugs.launchpad.net/bugs/1300668.
+
+  [ Alberto Mardegan ]
+  * Keep a map of windows and associated textures. 
+    Fixes: https://bugs.launchpad.net/bugs/1296728.
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 27 May 2014 07:51:29 +0000
+
+ubuntu-ui-toolkit (0.1.46+14.10.20140520-0ubuntu1) utopic; urgency=medium
+
+  [ Leo Arias ]
+  * Added the swipe_into_view method to autopilot helpers.
+    Fixed the name of the QQuickFlickable autopilot helper. 
+    Fixes: https://bugs.launchpad.net/bugs/1286479 
+    https://bugs.launchpad.net/bugs/1314433.
+  * On the autopilot helpers, find the top container starting from
+    the flickable. Fixes: https://bugs.launchpad.net/bugs/1314390.
+
+  [ Christian Dywan ] 
+  * Use i18n.dtr for toolkit-owned translations. 
+    Fixes: https://bugs.launchpad.net/bugs/1317539
+  * Introduce QML bindings for SortFilterModel. 
+    Fixes: https://bugs.launchpad.net/bugs/1266529
+  * Pick data path if .click is present. 
+    Fixes: https://bugs.launchpad.net/bugs/1317772
+
+  [ Tim Peeters ]
+  * Quick fix for TabBarStyle.qml:119: TypeError: Cannot 
+    read property of null.
+
+  [ Zsombor Egri ]
+  * One time alarms omit dayOfWeek value changes. 
+    Fixes: https://bugs.launchpad.net/bugs/1319401
+
+  [ CI bot ]
+  * Resync trunk
+
+ -- Ubuntu daily release <[e-mail]>  Tue, 20 May 2014 08:35:48 +0000
+
+ubuntu-ui-toolkit (0.1.46+14.10.20140516-0ubuntu1) utopic; urgency=medium
 
   [ Tim Peeters ]
   * Take visibility of actions into account when determining whether 
@@ -31,7 +142,7 @@
     on mobile architectures (less rattling, more realistic).
     Fixes: https://bugs.launchpad.net/bugs/1290201.
 
- -- Zoltán Balogh <[e-mail]>  Wed, 14 May 2014 15:46:58 +0300
+ -- Ubuntu daily release <[e-mail]>  Fri, 16 May 2014 11:58:25 +0000
 
 ubuntu-ui-toolkit (0.1.46+14.10.20140512-0ubuntu1) utopic; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2014-05-12 09:33:55 +0000
+++ debian/control	2014-05-28 18:09:57 +0000
@@ -6,9 +6,9 @@
                devscripts,
                libgles2-mesa-dev,
                libglib2.0-dev,
-               python3,
-               python,
-               libqt5qml-graphicaleffects | libqt5graphicaleffects5,
+               python3:any,
+               python:any,
+               qml-module-qtgraphicaleffects | libqt5qml-graphicaleffects,
                qt5-default,
                qtbase5-dev,
                qtbase5-private-dev,
@@ -17,12 +17,12 @@
                libqt5sql5-sqlite,
                qtdeclarative5-dev-tools,
                qtdeclarative5-private-dev,
-               qtdeclarative5-qtquick2-plugin,
-               qtdeclarative5-test-plugin,
-               qtdeclarative5-window-plugin,
+               qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
+               qml-module-qttest | qtdeclarative5-test-plugin,
+               qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
                qtdeclarative5-qtfeedback-plugin,
                qtdeclarative5-unity-action-plugin (>= 1.1.0),
-               qtdeclarative5-localstorage-plugin,
+               qml-module-qtquick-localstorage | qtdeclarative5-localstorage-plugin,
                qtdeclarative5-doc-html,
                qtwebkit5-doc-html,
                qtsvg5-doc-html,
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/ListItems.qml'
--- examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2014-04-28 10:30:06 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ListItems.qml	2014-05-28 18:09:57 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Toolkit
+import Ubuntu.Components 1.1 as Toolkit
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 Template {
@@ -259,11 +259,20 @@
             ListElement { name: "Potato"; details: "Vegetable" }
         }
 
+        Toolkit.SortFilterModel {
+            id: processedFruits
+            model: fruitModel
+            sort.property: "title"
+            sort.order: Qt.DescendingOrder
+            filter.property: "details"
+            filter.pattern: /Vegetable/
+        }
+
         Toolkit.UbuntuListView {
             id: ubuntuListView
             anchors { left: parent.left; right: parent.right }
             height: units.gu(24)
-            model: fruitModel
+            model: processedFruits
             clip: true
 
             delegate: ListItem.Expandable {
 
=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
--- modules/Ubuntu/Components/AnimatedItem.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/AnimatedItem.qml	2014-05-28 18:09:57 +0000
@@ -30,45 +30,8 @@
     id: root
     /*!
       \preliminary
+      \deprecated
       Specifies whether the component is on the visible area of the Flickable or not.
     */
     property bool onScreen: true
-
-    QtObject {
-        id: internal
-        property Flickable flickable
-
-        // returns whether the component is in the visible area of the flickable
-        function checkOnScreen()
-        {
-            var pos = root.mapToItem(flickable, 0, 0)
-            root.onScreen = (pos.y + root.height >= 0) && (pos.y <= internal.flickable.height) &&
-                            (pos.x + root.width >= 0) && (pos.x <= internal.flickable.width)
-        }
-        // lookup for a flickable parent
-        function updateFlickableParent()
-        {
-            var flickable = root.parent
-            while (flickable) {
-                if (flickable.hasOwnProperty("flicking") && flickable.hasOwnProperty("flickableDirection")) {
-                    // non-interactive flickables must be skipped as those do not provide
-                    // on-screen detection support
-                    if (flickable.interactive)
-                        break
-                }
-                flickable = flickable.parent
-            }
-            internal.flickable = flickable
-        }
-    }
-
-    Connections {
-        target: internal.flickable
-
-        onContentXChanged: internal.checkOnScreen()
-        onContentYChanged: internal.checkOnScreen()
-    }
-
-    Component.onCompleted: internal.updateFlickableParent()
-    onParentChanged: internal.updateFlickableParent()
 }
 
=== modified file 'modules/Ubuntu/Components/Label.qml'
--- modules/Ubuntu/Components/Label.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Label.qml	2014-05-28 18:09:57 +0000
@@ -56,6 +56,7 @@
 
     font.pixelSize: FontUtils.sizeToPixels(fontSize)
     font.family: "Ubuntu"
+    font.weight: Font.Light
     color: Theme.palette.selected.backgroundText
 
     /* FIXME: workaround for QTBUG 35095 where Text's alignment is incorrect
 
=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
--- modules/Ubuntu/Components/ListItems/Base.qml	2014-04-28 19:24:56 +0000
+++ modules/Ubuntu/Components/ListItems/Base.qml	2014-05-28 18:09:57 +0000
@@ -159,7 +159,7 @@
     /*!
       \internal
      */
-    property alias children: middle.data
+    default property alias children: middle.data
     Item {
         id: middle
         property bool anchorToIconHelper: !__iconIsItem && iconHelper.source != ""
 
=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2014-04-30 11:04:41 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2014-05-28 18:09:57 +0000
@@ -390,7 +390,7 @@
                         width: units.gu(5)
                     }
                     Label {
-                        text: i18n.tr("Delete")
+                        text: i18n.dtr('ubuntu-ui-toolkit', 'Delete')
                         verticalAlignment: Text.AlignVCenter
                         anchors {
                             verticalCenter: parent.verticalCenter
 
=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
--- modules/Ubuntu/Components/ListItems/ThinDivider.qml	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml	2014-05-28 18:09:57 +0000
@@ -44,11 +44,14 @@
         }
     \endqml
 */
-Image {
+Rectangle {
     anchors {
         left: (parent) ? parent.left : null
         right: (parent) ? parent.right : null
     }
     height: (visible) ? units.dp(2) : 0
-    source: "artwork/ListItemDividerHorizontal.png"
+    gradient: Gradient {
+        GradientStop { position: 0.0; color: "#26000000" }
+        GradientStop { position: 1.0; color: "#14F3F3E7" }
+    }
 }
 
=== removed file 'modules/Ubuntu/Components/ListItems/artwork/[e-mail]'
 Binary files modules/Ubuntu/Components/ListItems/artwork/[e-mail]	2013-02-06 11:48:20 +0000 and modules/Ubuntu/Components/ListItems/artwork/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== modified file 'modules/Ubuntu/Components/Page.qml'
--- modules/Ubuntu/Components/Page.qml	2014-05-16 11:33:37 +0000
+++ modules/Ubuntu/Components/Page.qml	2014-05-28 18:09:57 +0000
@@ -185,6 +185,13 @@
             value: page.pageStack
             when: tools && tools.hasOwnProperty("pageStack")
         }
+        Binding {
+            target: tools
+            property: "visible"
+            value: false
+            when: header && !header.useDeprecatedToolbar &&
+                  page.tools !== null
+        }
 
         function isVerticalFlickable(object) {
             if (object && object.hasOwnProperty("flickableDirection") && object.hasOwnProperty("contentHeight")) {
 
=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-05-28 18:09:57 +0000
@@ -42,7 +42,7 @@
     Column {
         Label {
             text: "Selected date: W" + datePicker.week + " - " +
-                    Qt.formatDate(datePicker.date, "dddd, dd-mmmm-yyyy")
+                    Qt.formatDate(datePicker.date, "dddd, dd-MMMM-yyyy")
         }
         DatePicker {
             id: datePicker
@@ -61,7 +61,7 @@
 
     Column {
         Label {
-            text: "Selected month: " + Qt.formatDate(datePicker.date, "mmmm-yyyy")
+            text: "Selected month: " + Qt.formatDate(datePicker.date, "MMMM-yyyy")
         }
         DatePicker {
             id: datePicker
@@ -117,7 +117,7 @@
 
     Column {
         Label {
-            text: "Selected date: " + Qt.formatDate(datePicker.date, "dddd, dd-mmmm-yyyy")
+            text: "Selected date: " + Qt.formatDate(datePicker.date, "dddd, dd-MMMM-yyyy")
         }
         DatePicker {
             id: datePicker
@@ -523,7 +523,8 @@
         function updatePickers() {
             if (completed) {
                 // check mode flags first
-                var modes = datePicker.mode.split(/\W/g);
+                // FIXME: The js split(/\W/g) terminates the process on armhf with Qt 5.3 (v4 js) (https://bugreports.qt-project.org/browse/QTBUG-39255)
+                var modes = datePicker.mode.match(/\w+/g);
 
                 showYearPicker = showMonthPicker = showDayPicker =
                 showHoursPicker = showMinutesPicker = showSecondsPicker = false;
@@ -607,7 +608,8 @@
             completed = false;
 
             // use short format to exclude any extra characters
-            var format = datePicker.locale.dateFormat(Locale.ShortFormat).split(/\W/g);
+            // FIXME: The js split(/\W/g) terminates the process on armhf with Qt 5.3 (v4 js) (https://bugreports.qt-project.org/browse/QTBUG-39255)
+            var format = datePicker.locale.dateFormat(Locale.ShortFormat).match(/\w+/g);
             // loop through the format to decide the position of the tumbler
             var formatIndex = 0;
             for (var i in format) {
@@ -667,5 +669,3 @@
         }
     }
 }
-
-
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml'
--- modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-05-28 18:09:57 +0000
@@ -96,7 +96,7 @@
             }
             delegate: PickerDelegate {
                 Label {
-                    objectName: "PickerRow_PickerLabel"
+                    objectName: "PickerRow_PickerLabel" + (pickerModel ? modelData : "")
                     text: pickerModel ? pickerModel.text(modelData) : ""
                     anchors.fill: parent
                     verticalAlignment: Text.AlignVCenter
 
=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2014-04-28 06:48:28 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2014-05-28 18:09:57 +0000
@@ -22,39 +22,39 @@
     objectName: "text_input_popover"
     actions: ActionList {
         Action {
-            text: i18n.tr("Select All")
+            text: i18n.dtr('ubuntu-ui-toolkit', "Select All")
             enabled: target && target.text !== "" && target.text !== target.selectedText
             onTriggered: target.selectAll()
         }
         Action {
-            text: i18n.tr("Select Word")
+            text: i18n.dtr('ubuntu-ui-toolkit', "Select Word")
             enabled: target && target.text !== "" && target.selectedText === ""
             onTriggered: target.selectWord()
         }
         Action {
-            text: i18n.tr("Cut")
+            text: i18n.dtr('ubuntu-ui-toolkit', "Cut")
             // If paste/editing is not possible, then disable also "Cut" operation
             // It is applicable for ReadOnly's TextFields and TextAreas
             enabled: target && target.selectedText !== "" && target.canPaste
             onTriggered: target.cut()
         }
         Action {
-            text: i18n.tr("Copy")
+            text: i18n.dtr('ubuntu-ui-toolkit', "Copy")
             enabled: target && target.selectedText !== ""
             onTriggered: target.copy()
         }
         Action {
-            text: i18n.tr("Paste")
+            text: i18n.dtr('ubuntu-ui-toolkit', "Paste")
             enabled: target && target.canPaste
             onTriggered: target.paste()
         }
         Action {
-            text: i18n.tr("Undo")
+            text: i18n.dtr('ubuntu-ui-toolkit', "Undo")
             enabled: target && target.canUndo
             onTriggered: target.undo()
         }
         Action {
-            text: i18n.tr("Redo")
+            text: i18n.dtr('ubuntu-ui-toolkit', "Redo")
             enabled: target && target.canRedo
             onTriggered: target.redo()
         }
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-05-28 18:09:57 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.2
 import Ubuntu.Components 1.1
 
 Image {
@@ -28,7 +28,7 @@
     verticalAlignment: Image.AlignVCenter
     source: "artwork/spinner.png"
 
-    NumberAnimation on rotation {
+    RotationAnimator on rotation {
         running: styledItem.running
         from: 0
         to: 360
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-05-09 11:21:23 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml	2014-05-28 18:09:57 +0000
@@ -116,8 +116,8 @@
                 AbstractButton {
                     id: button
                     anchors {
-                        top: parent.top
-                        bottom: parent.bottom
+                        top: parent ? parent.top : undefined
+                        bottom: parent ? parent.bottom : undefined
                     }
                     width: text.paintedWidth + text.anchors.leftMargin + text.anchors.rightMargin
 
 
=== modified file 'modules/Ubuntu/Components/Toolbar.qml'
--- modules/Ubuntu/Components/Toolbar.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Toolbar.qml	2014-05-28 18:09:57 +0000
@@ -27,9 +27,9 @@
 Panel {
     id: toolbar
     anchors {
-        left: parent.left
-        right: parent.right
-        bottom: parent.bottom
+        left: parent ? parent.left : undefined
+        right: parent ? parent.right : undefined
+        bottom: parent ? parent.bottom : undefined
     }
     height: background.height
 
 
=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
--- modules/Ubuntu/Components/ToolbarItems.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/ToolbarItems.qml	2014-05-28 18:09:57 +0000
@@ -139,7 +139,7 @@
     property Item back: ToolbarButton {
         objectName: "back_toolbar_button"
         iconSource: Qt.resolvedUrl("artwork/back.png")
-        text: i18n.tr("Back")
+        text: i18n.dtr('ubuntu-ui-toolkit', 'Back')
         visible: toolbarItems.pageStack && toolbarItems.pageStack.depth > 1
         /*!
           If there is a \l PageStack of sufficient depth, triggering the back button
 
=== added file 'modules/Ubuntu/Components/plugin/filterbehavior.cpp'
--- modules/Ubuntu/Components/plugin/filterbehavior.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/filterbehavior.cpp	2014-05-28 18:09:57 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *   Christian Dywan <[e-mail]>
+ *
+ * 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 "filterbehavior.h"
+
+QString
+FilterBehavior::property() const
+{
+    return m_property;
+}
+
+void
+FilterBehavior::setProperty(const QString& property)
+{
+    m_property = property;
+    Q_EMIT propertyChanged();
+}
+
+QRegExp
+FilterBehavior::pattern() const
+{
+    return m_pattern;
+}
+
+void
+FilterBehavior::setPattern(QRegExp pattern)
+{
+    m_pattern = pattern;
+    Q_EMIT patternChanged();
+}
+
 
=== added file 'modules/Ubuntu/Components/plugin/filterbehavior.h'
--- modules/Ubuntu/Components/plugin/filterbehavior.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/filterbehavior.h	2014-05-28 18:09:57 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *   Christian Dywan <[e-mail]>
+ *
+ * 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 FILTERBEHAVIOR_H
+#define FILTERBEHAVIOR_H
+
+#include <QSortFilterProxyModel>
+
+class FilterBehavior : public QObject {
+    Q_OBJECT
+
+    Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged)
+    Q_PROPERTY(QRegExp pattern READ pattern WRITE setPattern NOTIFY patternChanged)
+
+public:
+    QString property() const;
+    void setProperty(const QString& property);
+    QRegExp pattern() const;
+    void setPattern(QRegExp pattern);
+
+Q_SIGNALS:
+    void propertyChanged();
+    void patternChanged();
+
+private:
+    QString m_property;
+    QRegExp m_pattern;
+};
+
+#endif // FILTERBEHAVIOR_H
 
=== modified file 'modules/Ubuntu/Components/plugin/i18n.cpp'
--- modules/Ubuntu/Components/plugin/i18n.cpp	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/plugin/i18n.cpp	2014-05-28 18:09:57 +0000
@@ -17,7 +17,6 @@
  */
 
 #include "i18n.h"
-#include <QtCore/QStandardPaths>
 #include <QtCore/QDir>
 
 namespace C {
@@ -102,19 +101,16 @@
     m_domain = domain;
     C::textdomain(domain.toUtf8());
     /*
-     Look for locale folder as per XDG basedir spec
      The default is /usr/share/locale if we don't set a folder
-     We look for share/domain to pick correctly among multiple prefixes
+     For click we use APP_DIR/share/locale
+     e.g. /usr/share/click/preinstalled/com.example.foo/current/share/locale
      */
-    QString dataPath(QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-        domain, QStandardPaths::LocateDirectory));
-    if (!dataPath.isEmpty()) {
-        QDir dataDir(dataPath);
-        if (dataDir.cdUp() && dataDir.cd("locale")) {
-            QString localePath(dataDir.path());
-            C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
-        }
+    QString appDir(getenv("APP_DIR"));
+    if (!QDir::isAbsolutePath (appDir)) {
+        appDir = "/usr";
     }
+    QString localePath(QDir(appDir).filePath("share/locale"));
+    C::bindtextdomain(domain.toUtf8(), localePath.toUtf8());
     Q_EMIT domainChanged();
 }
 
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2014-05-28 18:09:57 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2012-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
@@ -48,6 +48,7 @@
 #include "ucurihandler.h"
 #include "ucmouse.h"
 #include "ucinversemouse.h"
+#include "sortfiltermodel.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -186,6 +187,14 @@
 
     // register custom event
     ForwardedEvent::registerForwardedEvent();
+
+    // register parent type so that properties can get/ set it
+    qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 1, "QAbstractItemModel", "Not instantiable");
+
+    // register 1.1 only API
+    qmlRegisterType<QSortFilterProxyModelQML>(uri, 1, 1, "SortFilterModel");
+    qmlRegisterUncreatableType<FilterBehavior>(uri, 1, 1, "FilterBehavior", "Not instantiable");
+    qmlRegisterUncreatableType<SortBehavior>(uri, 1, 1, "SortBehavior", "Not instantiable");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 
=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2014-03-25 06:46:36 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2014-05-28 18:09:57 +0000
@@ -55,6 +55,9 @@
     alarmrequest_p_p.h \
     adapters/alarmsadapter_p.h \
     ucstatesaver.h \
+    sortbehavior.h \
+    filterbehavior.h \
+    sortfiltermodel.h \
     statesaverbackend_p.h \
     ucstatesaver_p.h \
     ucurihandler.h \
@@ -87,6 +90,9 @@
     thumbnailgenerator.cpp \
     alarmrequest_p.cpp \
     ucstatesaver.cpp \
+    sortbehavior.cpp \
+    filterbehavior.cpp \
+    sortfiltermodel.cpp \
     statesaverbackend_p.cpp \
     ucurihandler.cpp \
     ucmousefilters.cpp \
 
=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp'
--- modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-04-08 18:41:31 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.cpp	2014-05-28 18:09:57 +0000
@@ -32,6 +32,9 @@
 // Threshold in grid unit defining the texture quality to be used.
 const float lowHighTextureThreshold = 11.0f;
 
+// Map of windows and associated textures.
+QHash<QOpenGLContext*, ShapeItem::TextureHandles> ShapeItem::textures_;
+
 static const char* const shapeVertexShader =
     "uniform lowp mat4 matrix;                  \n"
     "attribute lowp vec4 positionAttrib;        \n"
@@ -338,6 +341,21 @@
     update();
 }
 
+void ShapeItem::onOpenglContextDestroyed()
+{
+    QOpenGLContext* context = qobject_cast<QOpenGLContext*>(sender());
+    if (Q_UNLIKELY(!context)) return;
+
+    QHash<QOpenGLContext*, TextureHandles>::iterator it =
+        textures_.find(context);
+    if (it != textures_.end()) {
+        TextureHandles &textureHandles = it.value();
+        delete textureHandles.high;
+        delete textureHandles.low;
+        textures_.erase(it);
+    }
+}
+
 QSGNode* ShapeItem::updatePaintNode(QSGNode* old_node, UpdatePaintNodeData* data)
 {
     Q_UNUSED(data);
@@ -345,19 +363,28 @@
     // FIXME(loicm) Shape textures are stored in the read-only data section of the plugin as it
     //     avoids having to deal with paths for now. It should preferably be loaded from a file.
 
-    /* Textures created with QWindow::createTextureFromImage() become invalid
-     * when the window is destroyed; therefore, we must keep track of which
-     * window was used to create them and be ready to re-create them if that
-     * window goes away. */
-    static QPointer<QWindow> textureOwner = 0;
-    if (!textureOwner) {
-        shapeTextureHigh.texture = window()->createTextureFromImage(
+    // OpenGL allocates textures per context, so we store textures reused by
+    // all shape instances per context as well
+    QOpenGLContext* openglContext = window() ? window()->openglContext() : NULL;
+    if (Q_UNLIKELY(!openglContext)) {
+        qCritical() << "Window has no GL context!";
+        delete old_node;
+        return NULL;
+    }
+
+    TextureHandles &textureHandles = textures_[openglContext];
+    // If the hash table didn't contain an entry for the current context, the
+    // line above has just caused the creation of a default-constructed value.
+    if (!textureHandles.high) {
+        textureHandles.high = window()->createTextureFromImage(
             QImage(shapeTextureHigh.data, shapeTextureHigh.width, shapeTextureHigh.height,
                    QImage::Format_ARGB32_Premultiplied));
-        shapeTextureLow.texture = window()->createTextureFromImage(
+        textureHandles.low = window()->createTextureFromImage(
             QImage(shapeTextureLow.data, shapeTextureLow.width, shapeTextureLow.height,
                    QImage::Format_ARGB32_Premultiplied));
-        textureOwner = window();
+        QObject::connect(openglContext, SIGNAL(aboutToBeDestroyed()),
+                         this, SLOT(onOpenglContextDestroyed()),
+                         Qt::DirectConnection);
     }
 
     // The image item sets its texture in its updatePaintNode() method when QtQuick iterates through
@@ -387,8 +414,15 @@
 
     ShapeTexturedMaterial* texturedMaterial = node->texturedMaterial();
     ShapeColoredMaterial* coloredMaterial = node->coloredMaterial();
-    TextureData* textureData = (gridUnit_ > lowHighTextureThreshold) ?
-        &shapeTextureHigh : &shapeTextureLow;
+    TextureData* textureData;
+    QSGTexture* textureHandle;
+    if (gridUnit_ > lowHighTextureThreshold) {
+        textureData = &shapeTextureHigh;
+        textureHandle = textureHandles.high;
+    } else {
+        textureData = &shapeTextureLow;
+        textureHandle = textureHandles.low;
+    }
 
     // Set the shape texture to be used by the materials depending on current grid unit. The radius
     // is set considering the current grid unit and the texture raster grid unit. When the item size
@@ -406,8 +440,8 @@
         radius = halfMinWidthHeight;
         scaledDown |= 1;
     }
-    coloredMaterial->setShapeTexture(textureData->texture, !!scaledDown);
-    texturedMaterial->setShapeTexture(textureData->texture, !!scaledDown);
+    coloredMaterial->setShapeTexture(textureHandle, !!scaledDown);
+    texturedMaterial->setShapeTexture(textureHandle, !!scaledDown);
 
     // Update the other material properties.
     coloredMaterial->setColor(color_);
 
=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.h'
--- modules/Ubuntu/Components/plugin/shapeitem.h	2013-10-18 08:56:39 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.h	2014-05-28 18:09:57 +0000
@@ -91,6 +91,7 @@
 
 private Q_SLOTS:
     void onImagePropertiesChanged();
+    void onOpenglContextDestroyed();
 
 private:
     enum DirtyFlags {
@@ -110,6 +111,12 @@
                               | DirtyGridUnit | DirtyGeometry)
     };
 
+    struct TextureHandles {
+        TextureHandles(): high(0), low(0) {}
+        QSGTexture* high;
+        QSGTexture* low;
+    };
+
     QColor color_;
     QColor gradientColor_;
     bool gradientColorSet_;
@@ -124,6 +131,7 @@
     float gridUnit_;
     QRectF geometry_;
     QFlags<DirtyFlags> dirtyFlags_;
+    static QHash<QOpenGLContext*, TextureHandles> textures_;
 
     Q_DISABLE_COPY(ShapeItem)
 };
 
=== modified file 'modules/Ubuntu/Components/plugin/shapeitemtexture.h'
--- modules/Ubuntu/Components/plugin/shapeitemtexture.h	2013-01-07 07:59:56 +0000
+++ modules/Ubuntu/Components/plugin/shapeitemtexture.h	2014-05-28 18:09:57 +0000
@@ -20,7 +20,6 @@
 
 struct TextureData {
     const unsigned char* const data;
-    QSGTexture* texture;
     int width;
     int height;
     int bytesPerPixel;
@@ -5160,7 +5159,7 @@
 
 // High resolution shape texture.
 TextureData shapeTextureHigh __attribute__((aligned(16))) = {
-    shapeTextureHighData, NULL, 256, 128, 4, 32.0f, 64.0f, 18.0f,
+    shapeTextureHighData, 256, 128, 4, 32.0f, 64.0f, 18.0f,
     {
         {  // Medium raw coords.
             { hh, 0.0f }, { 0.25f-hh, 0.0f }, { 0.25f-hh, 0.0f }, { hh, 0.0f },
@@ -6484,7 +6483,7 @@
 
 // Low resolution shape texture.
 TextureData shapeTextureLow __attribute__((aligned(16))) = {
-    shapeTextureLowData, NULL, 128, 64, 4, 16.0f, 32.0f, 9.0f,
+    shapeTextureLowData, 128, 64, 4, 16.0f, 32.0f, 9.0f,
     {
         {  // Medium raw coords.
             { hl, 0.0f }, { 0.25f-hl, 0.0f }, { 0.25f-hl, 0.0f }, { hl, 0.0f },
 
=== added file 'modules/Ubuntu/Components/plugin/sortbehavior.cpp'
--- modules/Ubuntu/Components/plugin/sortbehavior.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/sortbehavior.cpp	2014-05-28 18:09:57 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *   Christian Dywan <[e-mail]>
+ *
+ * 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 "sortbehavior.h"
+
+QString
+SortBehavior::property() const
+{
+    return m_property;
+}
+
+Qt::SortOrder
+SortBehavior::order() const
+{
+    return m_order;
+}
+
+void
+SortBehavior::setProperty(const QString& property)
+{
+    m_property = property;
+    Q_EMIT propertyChanged();
+}
+
+void
+SortBehavior::setOrder(Qt::SortOrder order)
+{
+    m_order = order;
+    Q_EMIT orderChanged();
+}
+
 
=== added file 'modules/Ubuntu/Components/plugin/sortbehavior.h'
--- modules/Ubuntu/Components/plugin/sortbehavior.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/sortbehavior.h	2014-05-28 18:09:57 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * Authors:
+ *   Christian Dywan <[e-mail]>
+ *
+ * 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 SORTBEHAVIOR_H
+#define SORTBEHAVIOR_H
+
+#include <QSortFilterProxyModel>
+
+class SortBehavior : public QObject {
+    Q_OBJECT
+
+    Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged)
+    Q_PROPERTY(Qt::SortOrder order READ order WRITE setOrder NOTIFY orderChanged)
+
+public:
+    QString property() const;
+    void setProperty(const QString& property);
+    Qt::SortOrder order() const;
+    void setOrder(Qt::SortOrder order);
+
+Q_SIGNALS:
+    void propertyChanged();
+    void orderChanged();
+
+private:
+    QString m_property;
+    Qt::SortOrder m_order;
+};
+
+#endif // SORTBEHAVIOR_H
 
=== added file 'modules/Ubuntu/Components/plugin/sortfiltermodel.cpp'
--- modules/Ubuntu/Components/plugin/sortfiltermodel.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/sortfiltermodel.cpp	2014-05-28 18:09:57 +0000
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * Authors:
+ *   Michal Hruby <[e-mail]>
+ *   Christian Dywan <[e-mail]>
+ *
+ * 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 "sortfiltermodel.h"
+
+/*!
+ * \qmltype SortFilterModel
+ * \instantiates QSortFilterProxyModelQML
+ * \inqmlmodule Ubuntu.Components 0.1
+ * \ingroup ubuntu
+ * \brief SortFilterModel sorts and filters rows from an existing model.
+ *
+ * The SortFilterModel takes an existing model such as a ListModel or
+ * any QAbstractItemModel implementation. The original rows and role names
+ * show up in the SortFilterModel with two basic differences. For one if
+ * \l sort.property is set all rows will be sorted. Further more if
+ * \l filter.property is set only rows matching the filter will be in the model.
+ *
+ * Example usage:
+ * \qml
+ * import QtQuick 2.0
+ * import Ubuntu.Components 1.1
+ * import Ubuntu.Components.ListItems 1.1
+ *
+ * MainView {
+ *     width: units.gu(80)
+ *     height: units.gu(40)
+ *
+ *     ListModel {
+ *         id: movies
+ *         ListElement {
+ *             title: "Esign"
+ *             producer: "Chris Larkee"
+ *         }
+ *         ListElement {
+ *             title: "Elephants Dream"
+ *             producer: "Blender"
+ *         }
+ *         ListElement {
+ *             title: "Big Buck Bunny"
+ *             producer: "Blender"
+ *         }
+ *     }
+ *
+ *     SortFilterModel {
+ *         id: sortedMovies
+ *         model: movies
+ *         sort.property: "title"
+ *         sort.order: Qt.DescendingOrder
+ *
+ *         filter.property: "producer"
+ *         filter.pattern: /blender/
+ *     }
+ *
+ *     ListView {
+ *         model: sortedMovies
+ *         anchors.fill: parent
+ *
+ *         delegate: Subtitled {
+ *             text: title
+ *             subText: producer
+ *         }
+ *
+ *         section.delegate: ListItem.Header { text: i18n.tr(section) }
+ *         section.property: "title"
+ *         section.criteria: ViewSection.FirstCharacter
+ *     }
+ * }
+ * \endqml
+ *
+ * Pay attention to the differences between the original model and the result:
+ * \list
+ *     \li Big Buck Bunny will be the first row, because it's sorted by title
+ *     \li Esign won't be visible, because it's from the wrong producer
+ * \endlist
+ */
+
+
+QSortFilterProxyModelQML::QSortFilterProxyModelQML(QObject *parent)
+    : QSortFilterProxyModel(parent)
+{
+    // This is virtually always what you want in QML
+    setDynamicSortFilter(true);
+    connect(this, SIGNAL(modelReset()), SIGNAL(countChanged()));
+    connect(this, SIGNAL(rowsInserted(QModelIndex,int,int)), SIGNAL(countChanged()));
+    connect(this, SIGNAL(rowsRemoved(QModelIndex,int,int)), SIGNAL(countChanged()));
+    connect(&m_sortBehavior, &SortBehavior::propertyChanged, this, &QSortFilterProxyModelQML::sortChangedInternal);
+    connect(&m_sortBehavior, &SortBehavior::orderChanged, this, &QSortFilterProxyModelQML::sortChangedInternal);
+    connect(&m_filterBehavior, &FilterBehavior::propertyChanged, this, &QSortFilterProxyModelQML::filterChangedInternal);
+    connect(&m_filterBehavior, &FilterBehavior::patternChanged, this, &QSortFilterProxyModelQML::filterChangedInternal);
+}
+
+int
+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;
+    return 0;
+}
+
+/*!
+ * \qmlproperty string SortFilterModel::sort.property
+ *
+ * If set to a valid role name, all rows will be sorted according to \l sort.order.
+ */
+
+/*!
+ * \qmlproperty string SortFilterModel::sort.order
+ *
+ * The order, if \l sort.property is set.
+ * Qt::AscendingOrder sorts results from A to Z or 0 to 9.
+ * Qt::DescendingOrder sorts results from Z to A or 9 to 0.
+ */
+
+SortBehavior*
+QSortFilterProxyModelQML::sortBehavior()
+{
+    return &m_sortBehavior;
+}
+
+/*!
+ * \qmlproperty string SortFilterModel::filter.pattern
+ *
+ * The pattern all rows must match, if \l filter.property is set.
+ *
+ * Some examples:
+ * \list
+ *     \li /possible/ matches anywhere in a word, so both "impossible" and "possible".
+ *     \li /^sign/ matches "sign". But not "assignment" because ^ means start.
+ *     \li /vest$/ matches "safety vest" and "vest" but not "vested".
+ * \endlist
+ *
+ * For more advanced uses it's recommended to read up on Javascript regular expressions.
+ */
+
+/*!
+ * \qmlproperty string SortFilterModel::filter.property
+ *
+ * If set to a valid role name, only rows matching \l filter.pattern will be in the model.
+ */
+
+FilterBehavior*
+QSortFilterProxyModelQML::filterBehavior()
+{
+    return &m_filterBehavior;
+}
+
+void
+QSortFilterProxyModelQML::sortChangedInternal()
+{
+    setSortRole(roleByName(m_sortBehavior.property()));
+    sort(sortColumn() != -1 ? sortColumn() : 0, m_sortBehavior.order());
+    Q_EMIT sortChanged();
+}
+
+void
+QSortFilterProxyModelQML::filterChangedInternal()
+{
+    setFilterRole(roleByName(m_filterBehavior.property()));
+    setFilterRegExp(m_filterBehavior.pattern());
+    Q_EMIT filterChanged();
+}
+
+QHash<int, QByteArray> QSortFilterProxyModelQML::roleNames() const
+{
+    return sourceModel() ? sourceModel()->roleNames() : QHash<int, QByteArray>();
+}
+
+/*!
+ * \qmlproperty QAbstractItemModel SortFilterModel::model
+ *
+ * The source model to sort and/ or filter.
+ */
+void
+QSortFilterProxyModelQML::setModel(QAbstractItemModel *itemModel)
+{
+    if (itemModel == NULL) {
+        return;
+    }
+
+    if (itemModel != sourceModel()) {
+        if (sourceModel() != NULL) {
+            sourceModel()->disconnect(this);
+        }
+
+        setSourceModel(itemModel);
+        // Roles mapping to role names may change
+        setSortRole(roleByName(m_sortBehavior.property()));
+        setFilterRole(roleByName(m_filterBehavior.property()));
+        Q_EMIT modelChanged();
+    }
+}
+
+QVariantMap
+QSortFilterProxyModelQML::get(int row)
+{
+    QVariantMap res;
+    const QHash<int, QByteArray> roles = roleNames();
+    for(int role = 0; role < roles.count(); role++)
+        res.insert (roles[role], data(row, role));
+    return res;
+}
+
+QVariant
+QSortFilterProxyModelQML::data(int row, int role)
+{
+    if (sourceModel() == NULL) {
+        return QVariant();
+    }
+
+    return index(row, 0).data(role);
+}
+
+int
+QSortFilterProxyModelQML::count()
+{
+    return rowCount();
+}
+
+bool
+QSortFilterProxyModelQML::filterAcceptsRow(int sourceRow,
+                                           const QModelIndex &sourceParent) const
+{
+    if (filterRegExp().isEmpty()) {
+        return true;
+    }
+
+    bool result = QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
+    return result;
+}
+
+#include "moc_sortfiltermodel.cpp"
+
 
=== added file 'modules/Ubuntu/Components/plugin/sortfiltermodel.h'
--- modules/Ubuntu/Components/plugin/sortfiltermodel.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/sortfiltermodel.h	2014-05-28 18:09:57 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * Authors:
+ *   Michal Hruby <[e-mail]>
+ *   Christian Dywan <[e-mail]>
+ *
+ * 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 QSORTFILTERPROXYMODELQML_H
+#define QSORTFILTERPROXYMODELQML_H
+
+#include <QSortFilterProxyModel>
+#include "sortbehavior.h"
+#include "filterbehavior.h"
+
+class Q_DECL_EXPORT QSortFilterProxyModelQML : public QSortFilterProxyModel
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QAbstractItemModel* model READ sourceModel WRITE setModel NOTIFY modelChanged)
+    Q_PROPERTY(int count READ count NOTIFY countChanged)
+    Q_PROPERTY(SortBehavior* sort READ sortBehavior NOTIFY sortChanged)
+    Q_PROPERTY(FilterBehavior* filter READ filterBehavior NOTIFY filterChanged)
+
+public:
+    explicit QSortFilterProxyModelQML(QObject *parent = 0);
+
+    Q_INVOKABLE QVariantMap get(int row);
+    QVariant data(int row, int role);
+    Q_INVOKABLE int count();
+    virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
+
+    /* getters */
+    QHash<int, QByteArray> roleNames() const;
+
+    /* setters */
+    void setFilterProperty(const QString& property);
+    void setModel(QAbstractItemModel *model);
+
+Q_SIGNALS:
+    void countChanged();
+    void modelChanged();
+    void sortChanged();
+    void filterChanged();
+
+private:
+    SortBehavior m_sortBehavior;
+    SortBehavior* sortBehavior();
+    void sortChangedInternal();
+    FilterBehavior m_filterBehavior;
+    FilterBehavior* filterBehavior();
+    void filterChangedInternal();
+    int roleByName(const QString& roleName) const;
+};
+
+#endif // QSORTFILTERPROXYMODELQML_H
 
=== modified file 'modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp'
--- modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp	2014-02-25 09:14:23 +0000
+++ modules/Ubuntu/Components/plugin/thumbnailgenerator.cpp	2014-05-28 18:09:57 +0000
@@ -43,12 +43,15 @@
      * is the only way around the issue for now. */
     std::string src_path(QUrl(id).path().toUtf8().data());
     std::string tgt_path;
+    const int xlarge_cutoff = 512;
+    const int large_cutoff = 256;
+    const int small_cutoff = 128;
     try {
         ThumbnailSize desiredSize;
-        const int large_cutoff = 256;
-        const int small_cutoff = 128;
-        if(requestedSize.width() > large_cutoff || requestedSize.height() > large_cutoff) {
+        if(requestedSize.width() > xlarge_cutoff || requestedSize.height() > xlarge_cutoff) {
             desiredSize = TN_SIZE_ORIGINAL;
+        } else if(requestedSize.width() > large_cutoff || requestedSize.height() > large_cutoff) {
+            desiredSize = TN_SIZE_XLARGE;
         } else if(requestedSize.width() > small_cutoff || requestedSize.height() > small_cutoff) {
             desiredSize = TN_SIZE_LARGE;
         } else {
 
=== modified file 'modules/Ubuntu/Components/plugin/ucalarm.cpp'
--- modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/plugin/ucalarm.cpp	2014-05-28 18:09:57 +0000
@@ -177,6 +177,21 @@
         return result;
     }
 
+    // fix lp:1319401 - dayOfWeek omitted if set to other than AutoDetect
+    int dayOfWeek = rawData.date.date().dayOfWeek();
+    if (!isDaySet(dayOfWeek, rawData.days)) {
+        // dayOfWeek has been set by the user, adjust the date to it
+        int nextOccurrence = nextDayOfWeek(rawData.days, dayOfWeek);
+        if (nextOccurrence < dayOfWeek) {
+             // the starting date should be moved to the next week's occurrence
+            rawData.date = rawData.date.addDays(7 - dayOfWeek + nextOccurrence);
+        } else {
+            // the starting date is still this week
+            rawData.date = rawData.date.addDays(nextOccurrence - dayOfWeek);
+        }
+        rawData.changes |= AlarmData::Date;
+    }
+
     // start date should be later then the current date/time
     if (rawData.date <= AlarmData::normalizeDate(QDateTime::currentDateTime())) {
         return UCAlarm::EarlyDate;
@@ -370,10 +385,6 @@
     d->rawData.date = AlarmData::normalizeDate(date);
     d->rawData.changes |= AlarmData::Date;
     Q_EMIT dateChanged();
-    if (d->rawData.type == UCAlarm::OneTime) {
-        // adjust dayOfWeek as well
-        setDaysOfWeek(UCAlarm::AutoDetect);
-    }
 }
 
 /*!
 
=== modified file 'modules/Ubuntu/Components/plugin/ucthemesettings.cpp'
--- modules/Ubuntu/Components/plugin/ucthemesettings.cpp	2013-10-18 08:56:39 +0000
+++ modules/Ubuntu/Components/plugin/ucthemesettings.cpp	2014-05-28 18:09:57 +0000
@@ -21,19 +21,20 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QFile>
+#include <QtCore/QStandardPaths>
 
 /*
-  User theme settings are stored in $HOME/.config/ubuntu-ui-toolkit/theme.ini file, which contains
+  User theme settings are stored in $XDG_CONFIG_HOME/ubuntu-ui-toolkit/theme.ini file, which contains
   the current global theme name.
 */
 
-const QString SETTINGS_FILE_FORMAT("%1/.config/ubuntu-ui-toolkit/theme.ini");
+const QString SETTINGS_FILE_FORMAT("%1/ubuntu-ui-toolkit/theme.ini");
 const QString THEME_KEY("theme");
 const QString DEFAULT_THEME("Ubuntu.Components.Themes.Ambiance");
 
 UCThemeSettings::UCThemeSettings(QObject *parent) :
     QObject(parent),
-    m_settings(SETTINGS_FILE_FORMAT.arg(QDir::homePath()), QSettings::IniFormat)
+    m_settings(SETTINGS_FILE_FORMAT.arg(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation)), QSettings::IniFormat)
 {
     // check if there is a theme settings file, if not, create one
     if (!QFile::exists(m_settings.fileName())) {
 
=== modified file 'modules/Ubuntu/Layouts/plugin/plugin.pro'
--- modules/Ubuntu/Layouts/plugin/plugin.pro	2013-11-22 11:15:48 +0000
+++ modules/Ubuntu/Layouts/plugin/plugin.pro	2014-05-28 18:09:57 +0000
@@ -5,7 +5,7 @@
 
 QMAKE_CXXFLAGS += -Werror
 
-QT += quick-private
+QT += quick-private gui-private
 QT += qml-private core-private
 
 equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
 
=== modified file 'modules/Ubuntu/Layouts/plugin/propertychanges.cpp'
--- modules/Ubuntu/Layouts/plugin/propertychanges.cpp	2013-06-26 09:58:41 +0000
+++ modules/Ubuntu/Layouts/plugin/propertychanges.cpp	2014-05-28 18:09:57 +0000
@@ -145,7 +145,7 @@
     }
     if (fromBinding) {
         QQmlAbstractBinding *revertedBinding = QQmlPropertyPrivate::setBinding(property, fromBinding);
-        if (revertedBinding && ((revertedBinding != toBinding.data()) || (revertedBinding == toBinding.data() && deleteToBinding))) {
+        if (revertedBinding && (revertedBinding != fromBinding) && ((revertedBinding != toBinding.data()) || (revertedBinding == toBinding.data() && deleteToBinding))) {
             revertedBinding->destroy();
         }
     } else if (!toBinding.isNull() && QQmlPropertyPrivate::binding(property) == toBinding.data()) {
@@ -222,24 +222,6 @@
 {
 }
 
-/******************************************************************************
- * ReparentChange
- */
-ReparentChange::ReparentChange(QQuickItem *target, const QString &property, QQuickItem *source)
-    : PropertyChange(target, property, QVariant(), Normal)
-    , sourceProperty(source, property, qmlContext(source))
-{
-    action.type = PropertyAction::Binding;
-}
-
-void ReparentChange::saveState()
-{
-    action.toValue = sourceProperty.read();
-    PropertyChange::saveState();
-    if (sourceProperty.isValid()) {
-        action.setTargetBinding(QQmlPropertyPrivate::binding(sourceProperty), false);
-    }
-}
 
 /******************************************************************************
  * ParentChange
@@ -304,35 +286,31 @@
  * ItemStackBackup
  * High priority change backing up the item's stack position.
  */
-ItemStackBackup::ItemStackBackup(QQuickItem *item, QQuickItem *currentLayoutItem, QQuickItem *previousLayoutItem)
+ItemStackBackup::ItemStackBackup(QQuickItem *item)
     : PropertyChange(High)
     , target(item)
-    , currentLayout(currentLayoutItem)
-    , previousLayout(previousLayoutItem)
-    , originalStackBefore(0)
+    , prevItem(0)
 {
 }
 
 void ItemStackBackup::saveState()
 {
     QQuickItem *rewindParent = target->parentItem();
+    if (!rewindParent) {
+        return;
+    }
     // save original stack position, but detect layout objects!
     QList<QQuickItem*> children = rewindParent->childItems();
-    for (int ii = 0; ii < children.count() - 1; ++ii) {
-        if (children.at(ii) == target) {
-            originalStackBefore = children.at(ii + 1);
-            if (originalStackBefore == currentLayout || originalStackBefore == previousLayout) {
-                originalStackBefore = 0;
-            }
-            break;
-        }
+    int index = children.indexOf(target);
+    if (index > 0) {
+        prevItem = children.at(index - 1);
     }
 }
 
 void ItemStackBackup::revert()
 {
-    if (originalStackBefore) {
-        target->stackBefore(originalStackBefore);
+    if (prevItem) {
+        target->stackAfter(prevItem);
     }
 }
 
@@ -459,6 +437,13 @@
     return *this;
 }
 
+// creates two changes, one for reparenting and one for itemstack backup
+ChangeList &ChangeList::addParentChange(QQuickItem *item, QQuickItem *newParent, bool topmostItem)
+{
+    return addChange(new ParentChange(item, newParent, topmostItem))
+            .addChange(new ItemStackBackup(item));
+}
+
 QList<PropertyChange*> ChangeList::unifiedChanges()
 {
     QList<PropertyChange*> list;
 
=== modified file 'modules/Ubuntu/Layouts/plugin/propertychanges_p.h'
--- modules/Ubuntu/Layouts/plugin/propertychanges_p.h	2013-06-26 09:58:41 +0000
+++ modules/Ubuntu/Layouts/plugin/propertychanges_p.h	2014-05-28 18:09:57 +0000
@@ -104,18 +104,6 @@
 };
 
 
-class ReparentChange : public PropertyChange
-{
-public:
-    ReparentChange(QQuickItem *item, const QString &property, QQuickItem *source);
-
-protected:
-    virtual void saveState();
-
-    QQmlProperty sourceProperty;
-};
-
-
 class ParentChange : public PropertyChange
 {
 public:
@@ -143,16 +131,14 @@
 class ItemStackBackup : public PropertyChange
 {
 public:
-    ItemStackBackup(QQuickItem *item, QQuickItem *currentLayoutItem, QQuickItem *previousLayoutItem);
+    ItemStackBackup(QQuickItem *item);
     void apply() {}
     void revert();
 
 protected:
     virtual void saveState();
     QQuickItem *target;
-    QQuickItem *currentLayout;
-    QQuickItem *previousLayout;
-    QQuickItem *originalStackBefore;
+    QQuickItem *prevItem;
 private:
     friend class ULLayouts;
 };
@@ -214,6 +200,7 @@
     void clear();
 
     ChangeList &addChange(PropertyChange *change);
+    ChangeList &addParentChange(QQuickItem *item, QQuickItem *newParent, bool topmostItem);
 
 private:
     QList<PropertyChange*> changes[PropertyChange::MaxPriority];
 
=== modified file 'modules/Ubuntu/Layouts/plugin/ulitemlayout.h'
--- modules/Ubuntu/Layouts/plugin/ulitemlayout.h	2013-06-06 16:00:10 +0000
+++ modules/Ubuntu/Layouts/plugin/ulitemlayout.h	2014-05-28 18:09:57 +0000
@@ -26,7 +26,7 @@
     Q_OBJECT
     Q_DISABLE_COPY(ULItemLayout)
 
-    Q_PROPERTY(QString item READ item WRITE setItem)
+    Q_PROPERTY(QString item READ item WRITE setItem NOTIFY itemChanged)
 
 public:
     explicit ULItemLayout(QQuickItem *parent = 0);
@@ -35,6 +35,9 @@
     QString item() const;
     void setItem(const QString &value);
 
+Q_SIGNALS:
+    void itemChanged();
+
 private:
     QString m_itemName;
 };
 
=== modified file 'modules/Ubuntu/Layouts/plugin/ullayouts.cpp'
--- modules/Ubuntu/Layouts/plugin/ullayouts.cpp	2014-04-20 19:25:12 +0000
+++ modules/Ubuntu/Layouts/plugin/ullayouts.cpp	2014-05-28 18:09:57 +0000
@@ -22,15 +22,21 @@
 #include "ulconditionallayout.h"
 #include "propertychanges_p.h"
 #include <QtQml/QQmlInfo>
+#include <QtQuick/private/qquickitem_p.h>
 
 ULLayoutsPrivate::ULLayoutsPrivate(ULLayouts *qq)
     : QQmlIncubator(Asynchronous)
     , q_ptr(qq)
     , currentLayoutItem(0)
     , previousLayoutItem(0)
+    , contentItem(new QQuickItem)
     , currentLayoutIndex(-1)
     , ready(false)
 {
+    // hidden container for the components that are not laid out
+    // any component not subject of layout is reparented into this component
+    contentItem->setParent(qq);
+    contentItem->setParentItem(qq);
 }
 
 
@@ -80,7 +86,6 @@
     QQuickItem *item = static_cast<QQuickItem*>(object);
     // set disabled and invisible, and set its parent as last action
     item->setVisible(false);
-    item->setEnabled(false);
 }
 
 /*
@@ -98,14 +103,16 @@
         currentLayoutItem = qobject_cast<QQuickItem*>(object());
         Q_ASSERT(currentLayoutItem);
 
-        // hide all non-laid out items first
-        hideExcludedItems();
-
         //reparent components to be laid out
         reparentItems();
         // set parent item, then enable and show layout
         changes.addChange(new ParentChange(currentLayoutItem, q, false));
-        itemActivate(currentLayoutItem, true);
+
+        // hide default layout, then show the new one
+        // there's no need to queue these property changes as we do not need
+        // to back up their previosus states
+        contentItem->setVisible(false);
+        currentLayoutItem->setVisible(true);
         // apply changes
         changes.apply();
         // clear previous layout
@@ -114,18 +121,10 @@
 
         Q_EMIT q->currentLayoutChanged();
     } else if (status == Error) {
-        Q_Q(ULLayouts);
         error(q, errors());
     }
 }
 
-void ULLayoutsPrivate::hideExcludedItems()
-{
-    for (int i = 0; i < excludedFromLayout.count(); i++) {
-        itemActivate(excludedFromLayout[i], false);
-    }
-}
-
 /*
  * Re-parent items to the new layout.
  */
@@ -134,26 +133,32 @@
     // create copy of items list, to keep track of which ones we change
     LaidOutItemsMap unusedItems = itemsToLayout;
 
-    // iterate through the Layout definition to find containers - those Items with
-    // ConditionalLayout.items set
-    QList<QQuickItem*> items = currentLayoutItem->findChildren<QQuickItem*>();
-    // add the root item as that also can be the container
-    items.prepend(currentLayoutItem);
-
-    Q_FOREACH(QQuickItem *container, items) {
-        // check whether we have ItemLayout declared
-        ULItemLayout *itemLayout = qobject_cast<ULItemLayout*>(container);
-        if (itemLayout) {
-            reparentToItemLayout(unusedItems, itemLayout);
+    // iterate through the Layout definition to find containers - ItemLayout items
+    QList<ULItemLayout*> containers = collectContainers(currentLayoutItem);
+
+    Q_FOREACH(ULItemLayout *container, containers) {
+        reparentToItemLayout(unusedItems, container);
+    }
+}
+
+QList<ULItemLayout*> ULLayoutsPrivate::collectContainers(QQuickItem *fromItem)
+{
+    QList<ULItemLayout*> result;
+    // check first if the fromItem is also a container
+    ULItemLayout *container = qobject_cast<ULItemLayout*>(fromItem);
+    if (container) {
+        result.append(container);
+    }
+
+    // loop through children but exclude nested Layouts
+    QList<QQuickItem*> children = fromItem->childItems();
+    Q_FOREACH(QQuickItem *child, children) {
+        if (qobject_cast<ULLayouts*>(child)) {
+            continue;
         }
-    }
-
-    // hide the rest of the unused ones
-    LaidOutItemsMapIterator i(unusedItems);
-    while (i.hasNext()) {
-        i.next();
-        itemActivate(i.value(), false);
-    }
+        result.append(collectContainers(child));
+    }
+    return result;
 }
 
 /*
@@ -176,8 +181,7 @@
     }
 
     // the component fills the parent
-    changes.addChange(new ParentChange(item, fragment, true));
-    changes.addChange(new ItemStackBackup(item, currentLayoutItem, previousLayoutItem));
+    changes.addParentChange(item, fragment, true);
     changes.addChange(new AnchorChange(item, "fill", fragment));
     changes.addChange(new PropertyChange(item, "anchors.margins", 0));
     changes.addChange(new PropertyChange(item, "anchors.leftMargin", 0));
@@ -194,18 +198,6 @@
     map.remove(itemName);
 }
 
-void ULLayoutsPrivate::itemActivate(QQuickItem *item, bool activate)
-{
-    changes.addChange(new PropertyChange(item, "visible", activate))
-           .addChange(new PropertyChange(item, "enabled", activate));
-}
-
-// remove the deleted item from the excluded ones
-void ULLayoutsPrivate::_q_removeExcludedItem(QObject *excludedItem)
-{
-    excludedFromLayout.removeAll(static_cast<QQuickItem*>(excludedItem));
-}
-
 /*
  * Validates the declared conditional layouts by checking whether they have name
  * property set and whether the value set is unique, and whether the conditional
@@ -244,44 +236,20 @@
 /*
  * Collect items to be laid out.
  */
-void ULLayoutsPrivate::getLaidOutItems()
+void ULLayoutsPrivate::getLaidOutItems(QQuickItem *container)
 {
-    Q_Q(ULLayouts);
-
-    QList<QQuickItem*> items = q->findChildren<QQuickItem*>();
-    for (int i = 0; i < items.count(); i++) {
-        QQuickItem *item = items[i];
+    Q_FOREACH(QQuickItem *child, container->childItems()) {
+        // skip nested layouts
+        if (qobject_cast<ULLayouts*>(child)) {
+            continue;
+        }
         ULLayoutsAttached *marker = qobject_cast<ULLayoutsAttached*>(
-                    qmlAttachedPropertiesObject<ULLayouts>(item, false));
+                    qmlAttachedPropertiesObject<ULLayouts>(child, false));
         if (marker && !marker->item().isEmpty()) {
-            itemsToLayout.insert(marker->item(), item);
+            itemsToLayout.insert(marker->item(), child);
         } else {
-            // the item is not marked to be laid out but one of its parents
-            // can be, therefore check
-            // check if the item's  parent is included in the layout
-            QQuickItem *pl = item->parentItem();
-            marker = 0;
-            if (!pl && item->parent()) {
-                // this may be an item instance assigned to a property
-                // like "property var anItem: Item {}"
-                // in which case we must get the parent object of it, not the parent item
-                pl = qobject_cast<QQuickItem*>(item->parent());
-            }
-            while (pl) {
-                marker = qobject_cast<ULLayoutsAttached*>(
-                            qmlAttachedPropertiesObject<ULLayouts>(pl, false));
-                if (marker && !marker->item().isEmpty()) {
-                    break;
-                }
-                pl = pl->parentItem();
-            }
-            if (!marker || (marker && marker->item().isEmpty())) {
-                // remember theese so we hide them once we switch away from default layout
-                excludedFromLayout << item;
-                // and make sure we remove the item from excluded ones in case the item is destroyed
-                QObject::connect(item, SIGNAL(destroyed(QObject*)),
-                                 q, SLOT(_q_removeExcludedItem(QObject*)));
-            }
+            // continue to search in between the child's children
+            getLaidOutItems(child);
         }
     }
 }
@@ -344,6 +312,9 @@
         // revert and clear changes
         changes.revert();
         changes.clear();
+        // make contentItem visible
+
+        contentItem->setVisible(true);
         delete currentLayoutItem;
         currentLayoutItem = 0;
         currentLayoutIndex = -1;
@@ -606,10 +577,18 @@
     Q_D(ULLayouts);
     d->ready = true;
     d->validateConditionalLayouts();
-    d->getLaidOutItems();
+    d->getLaidOutItems(d->contentItem);
     d->updateLayout();
 }
 
+void ULLayouts::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+{
+    Q_D(ULLayouts);
+    QQuickItem::geometryChanged(newGeometry, oldGeometry);
+    // simply update the container's width/height to the new width/height
+    d->contentItem->setSize(newGeometry.size());
+}
+
 /*!
  * \qmlproperty string Layouts::currentLayout
  * The property holds the active layout name. The default layout is identified
@@ -634,6 +613,17 @@
 }
 
 /*!
+ * \internal
+ * Returns the contentItem for internal use.
+ */
+QQuickItem *ULLayouts::contentItem() const
+{
+    Q_D(const ULLayouts);
+    return d->contentItem;
+}
+
+
+/*!
  * \qmlproperty list<ConditionalLayout> Layouts::layouts
  * The property holds the list of different ConditionalLayout elements.
  */
@@ -647,4 +637,25 @@
                                                  &ULLayoutsPrivate::clear_layouts);
 }
 
+/*!
+ * \internal
+ * Overrides the default data property.
+ */
+QQmlListProperty<QObject> ULLayouts::data()
+{
+    Q_D(ULLayouts);
+    return QQuickItemPrivate::get(d->contentItem)->data();
+}
+
+/*!
+ * \internal
+ * Overrides the default children property.
+ */
+QQmlListProperty<QQuickItem> ULLayouts::children()
+{
+    Q_D(ULLayouts);
+    return QQuickItemPrivate::get(d->contentItem)->children();
+}
+
+
 #include "moc_ullayouts.cpp"
 
=== modified file 'modules/Ubuntu/Layouts/plugin/ullayouts.h'
--- modules/Ubuntu/Layouts/plugin/ullayouts.h	2014-02-18 13:27:23 +0000
+++ modules/Ubuntu/Layouts/plugin/ullayouts.h	2014-05-28 18:09:57 +0000
@@ -55,7 +55,10 @@
 
     Q_PROPERTY(QString currentLayout READ currentLayout NOTIFY currentLayoutChanged DESIGNABLE false)
     Q_PROPERTY(QQmlListProperty<ULConditionalLayout> layouts READ layouts DESIGNABLE false)
-    
+
+    Q_PROPERTY(QQmlListProperty<QObject> data READ data DESIGNABLE false)
+    Q_PROPERTY(QQmlListProperty<QQuickItem> children READ children DESIGNABLE false)
+    Q_CLASSINFO("DefaultProperty", "data")
 public:
     explicit ULLayouts(QQuickItem *parent = 0);
     ~ULLayouts();
@@ -64,21 +67,23 @@
 
     QString currentLayout() const;
     QList<ULConditionalLayout*> layoutList();
+    QQuickItem *contentItem() const;
 
 Q_SIGNALS:
     void currentLayoutChanged();
 
 protected:
     void componentComplete();
+    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
 
 private:
     QQmlListProperty<ULConditionalLayout> layouts();
+    QQmlListProperty<QObject> data();
+    QQmlListProperty<QQuickItem> children();
 
     friend class ULConditionalLayout;
     Q_DECLARE_PRIVATE(ULLayouts)
     QScopedPointer<ULLayoutsPrivate> d_ptr;
-
-    Q_PRIVATE_SLOT(d_func(), void _q_removeExcludedItem(QObject*))
 };
 
 QML_DECLARE_TYPE(ULLayouts)
 
=== modified file 'modules/Ubuntu/Layouts/plugin/ullayouts_p.h'
--- modules/Ubuntu/Layouts/plugin/ullayouts_p.h	2014-02-18 13:27:23 +0000
+++ modules/Ubuntu/Layouts/plugin/ullayouts_p.h	2014-05-28 18:09:57 +0000
@@ -33,9 +33,8 @@
 
     ULLayoutsPrivate(ULLayouts *qq);
 
-    void _q_removeExcludedItem(QObject *excludedItem);
     void validateConditionalLayouts();
-    void getLaidOutItems();
+    void getLaidOutItems(QQuickItem *item);
     void updateLayout();
 
     static void error(QObject *item, const QString &message);
@@ -51,9 +50,9 @@
     QList<ULConditionalLayout*> layouts;
     ChangeList changes;
     LaidOutItemsMap itemsToLayout;
-    QList<QQuickItem*> excludedFromLayout;
     QQuickItem* currentLayoutItem;
     QQuickItem* previousLayoutItem;
+    QQuickItem* contentItem;
     int currentLayoutIndex;
     bool ready:1;
 
@@ -64,10 +63,9 @@
     static void clear_layouts(QQmlListProperty<ULConditionalLayout>*);
 
     void reLayout();
-    void hideExcludedItems();
     void reparentItems();
+    QList<ULItemLayout*> collectContainers(QQuickItem *fromItem);
     void reparentToItemLayout(LaidOutItemsMap &map, ULItemLayout *fragment);
-    void itemActivate(QQuickItem *item, bool activate);
 };
 
 #endif // ULLAYOUTS_P_H
 
=== modified file 'po/ca.po'
--- po/ca.po	2014-05-10 07:55:56 +0000
+++ po/ca.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/de.po'
--- po/de.po	2014-05-10 07:55:56 +0000
+++ po/de.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/es.po'
--- po/es.po	2014-05-10 07:55:56 +0000
+++ po/es.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/fi.po'
--- po/fi.po	2014-05-10 07:55:56 +0000
+++ po/fi.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/fr.po'
--- po/fr.po	2014-05-10 07:55:56 +0000
+++ po/fr.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/gl.po'
--- po/gl.po	2014-05-10 07:55:56 +0000
+++ po/gl.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/he.po'
--- po/he.po	2014-05-10 07:55:56 +0000
+++ po/he.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/hu.po'
--- po/hu.po	2014-05-10 07:55:56 +0000
+++ po/hu.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/ko.po'
--- po/ko.po	2014-05-10 07:55:56 +0000
+++ po/ko.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/my.po'
--- po/my.po	2014-05-10 07:55:56 +0000
+++ po/my.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/nl.po'
--- po/nl.po	2014-05-10 07:55:56 +0000
+++ po/nl.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/oc.po'
--- po/oc.po	2014-05-10 07:55:56 +0000
+++ po/oc.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2014-05-10 07:55:56 +0000
+++ po/pt_BR.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/sv.po'
--- po/sv.po	2014-05-10 07:55:56 +0000
+++ po/sv.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'po/uk.po'
--- po/uk.po	2014-05-10 07:55:56 +0000
+++ po/uk.po	2014-05-28 18:09:57 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
-"X-Generator: Launchpad (build 16996)\n"
+"X-Launchpad-Export-Date: 2014-05-22 06:44+0000\n"
+"X-Generator: Launchpad (build 17017)\n"
 
 #: examples/ubuntu-ui-toolkit-gallery/Animations.qml:22
 msgid "NumberAnimation"
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/__init__.py	2014-04-25 18:39:51 +0000
+++ tests/autopilot/ubuntuuitoolkit/__init__.py	2014-05-28 18:09:57 +0000
@@ -24,14 +24,15 @@
     'environment',
     'emulators',
     'fixture_setup',
-    'Flickable',
     'get_keyboard',
     'get_pointing_device',
     'Header',
     'listitems',
     'MainView',
     'OptionSelector',
+    'pickers',
     'popups',
+    'QQuickFlickable',
     'QQuickListView',
     'TabBar',
     'Tabs',
@@ -53,14 +54,15 @@
 from ubuntuuitoolkit._custom_proxy_objects import (
     check_autopilot_version,
     CheckBox,
-    Flickable,
     get_keyboard,
     get_pointing_device,
     Header,
     listitems,
     MainView,
     OptionSelector,
+    pickers,
     popups,
+    QQuickFlickable,
     QQuickListView,
     TabBar,
     Tabs,
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2014-04-28 15:39:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py	2014-05-28 18:09:57 +0000
@@ -20,14 +20,15 @@
 __all__ = [
     'check_autopilot_version',
     'CheckBox',
-    'Flickable',
     'get_keyboard',
     'get_pointing_device',
     'Header',
     'listitems',
     'MainView',
     'OptionSelector',
+    'pickers',
     'popups',
+    'QQuickFlickable',
     'QQuickListView',
     'TabBar',
     'Tabs',
@@ -45,13 +46,14 @@
     ToolkitException,
     UbuntuUIToolkitCustomProxyObjectBase,
 )
-from ubuntuuitoolkit._custom_proxy_objects._flickable import Flickable
+from ubuntuuitoolkit._custom_proxy_objects._flickable import QQuickFlickable
 from ubuntuuitoolkit._custom_proxy_objects._header import Header
 from ubuntuuitoolkit._custom_proxy_objects import listitems
 from ubuntuuitoolkit._custom_proxy_objects._mainview import MainView
 from ubuntuuitoolkit._custom_proxy_objects._optionselector import (
     OptionSelector
 )
+from ubuntuuitoolkit._custom_proxy_objects import pickers
 from ubuntuuitoolkit._custom_proxy_objects import popups
 from ubuntuuitoolkit._custom_proxy_objects._qquicklistview import (
     QQuickListView
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2014-04-16 21:13:39 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py	2014-05-28 18:09:57 +0000
@@ -16,13 +16,21 @@
 
 """Common helpers for Ubuntu UI Toolkit Autopilot custom proxy objects."""
 
+import logging
 from distutils import version
 
 import autopilot
-from autopilot import platform, input
+from autopilot import (
+    input,
+    logging as autopilot_logging,
+    platform
+)
 from autopilot.introspection import dbus
 
 
+logger = logging.getLogger(__name__)
+
+
 class ToolkitException(Exception):
     """Exception raised when there is an error with the emulator."""
 
@@ -67,3 +75,39 @@
         check_autopilot_version()
         super(UbuntuUIToolkitCustomProxyObjectBase, self).__init__(*args)
         self.pointing_device = get_pointing_device()
+
+    def is_flickable(self):
+        """Check if the object is flickable.
+
+        If the object has a flicking attribute, we consider it as a flickable.
+
+        :return: True if the object is flickable. False otherwise.
+
+        """
+        try:
+            self.flicking
+            return True
+        except AttributeError:
+            return False
+
+    @autopilot_logging.log_action(logger.info)
+    def swipe_into_view(self):
+        """Make the object visible.
+
+        Currently it works only when the object needs to be swiped vertically.
+        TODO implement horizontal swiping. --elopio - 2014-03-21
+
+        """
+        flickable_parent = self._get_flickable_parent()
+        flickable_parent.swipe_child_into_view(self)
+
+    def _get_flickable_parent(self):
+        parent = self.get_parent()
+        root = self.get_root_instance()
+        while parent.id != root.id:
+            if parent.is_flickable():
+                return parent
+            parent = parent.get_parent()
+        raise ToolkitException(
+            "The element is not contained in a Flickable so it can't be "
+            "swiped into view.")
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-04-16 21:13:39 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-05-28 18:09:57 +0000
@@ -38,21 +38,7 @@
     return min(containers_bottom)
 
 
-class Flickable(_common.UbuntuUIToolkitCustomProxyObjectBase):
-
-    @autopilot_logging.log_action(logger.info)
-    def swipe_child_into_view(self, child):
-        """Make the child visible.
-
-        Currently it works only when the object needs to be swiped vertically.
-        TODO implement horizontal swiping. --elopio - 2014-03-21
-
-        """
-        containers = self._get_containers()
-        if not self._is_child_visible(child, containers):
-            self._swipe_non_visible_child_into_view(child, containers)
-        else:
-            logger.debug('The element is already visible.')
+class Scrollable(_common.UbuntuUIToolkitCustomProxyObjectBase):
 
     def _get_containers(self):
         """Return a list with the containers to take into account when swiping.
@@ -68,15 +54,19 @@
     def _get_top_container(self):
         """Return the top-most container with a globalRect."""
         root = self.get_root_instance()
-        containers = [root]
-        while len(containers) == 1:
-            try:
-                containers[0].globalRect
-                return containers[0]
-            except AttributeError:
-                containers = containers[0].get_children()
-
-        raise _common.ToolkitException("Couldn't find the top-most container.")
+        parent = self.get_parent()
+        top_container = None
+        while parent.id != root.id:
+            if hasattr(parent, 'globalRect'):
+                top_container = parent
+
+            parent = parent.get_parent()
+
+        if top_container is None:
+            raise _common.ToolkitException(
+                "Couldn't find the top-most container.")
+        else:
+            return top_container
 
     def _is_child_visible(self, child, containers):
         """Check if the center of the child is visible.
@@ -90,8 +80,38 @@
         return (object_center >= visible_top and
                 object_center <= visible_bottom)
 
+    def _slow_drag(self, start_x, stop_x, start_y, stop_y):
+        # If we drag too fast, we end up scrolling more than what we
+        # should, sometimes missing the  element we are looking for.
+        # I found that when the flickDeceleration is 1500, the rate should be
+        # 5 and that when it's 100, the rate should be 1. With those two points
+        # we can get that the following equation.
+        # XXX The deceleration might not be linear with respect to the rate,
+        # but this works for the two types of scrollables we have for now.
+        # --elopio - 2014-05-08
+        rate = (self.flickDeceleration + 250) / 350
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate=rate)
+
+
+class QQuickFlickable(Scrollable):
+
+    @autopilot_logging.log_action(logger.info)
+    def swipe_child_into_view(self, child):
+        """Make the child visible.
+
+        Currently it works only when the object needs to be swiped vertically.
+        TODO implement horizontal swiping. --elopio - 2014-03-21
+
+        """
+        containers = self._get_containers()
+        if not self._is_child_visible(child, containers):
+            self._swipe_non_visible_child_into_view(child, containers)
+        else:
+            logger.debug('The element is already visible.')
+
     @autopilot_logging.log_action(logger.info)
     def _swipe_non_visible_child_into_view(self, child, containers):
+        original_content_y = self.contentY
         while not self._is_child_visible(child, containers):
             # Check the direction of the swipe based on the position of the
             # child relative to the immediate flickable container.
@@ -100,6 +120,10 @@
             else:
                 self._swipe_to_show_more_below(containers)
 
+            if self.contentY == original_content_y:
+                raise _common.ToolkitException(
+                    "Couldn't swipe in the flickable.")
+
     @autopilot_logging.log_action(logger.info)
     def _swipe_to_show_more_above(self, containers):
         if self.atYBeginning:
@@ -124,8 +148,12 @@
         # bottom.
         top = _get_visible_container_top(containers) + 5
         bottom = _get_visible_container_bottom(containers) - 5
+
         if direction == 'below':
-            start_y = bottom
+            # Take into account that swiping from below can open the toolbar or
+            # trigger the bottom edge gesture.
+            # XXX Do this only if we are close to the bottom edge.
+            start_y = bottom - 20
             stop_y = top
         elif direction == 'above':
             start_y = top
@@ -137,11 +165,6 @@
         self.dragging.wait_for(False)
         self.moving.wait_for(False)
 
-    def _slow_drag(self, start_x, stop_x, start_y, stop_y):
-        # If we drag too fast, we end up scrolling more than what we
-        # should, sometimes missing the  element we are looking for.
-        self.pointing_device.drag(start_x, start_y, stop_x, stop_y, rate=5)
-
     @autopilot_logging.log_action(logger.info)
     def _scroll_to_top(self):
         if not self.atYBeginning:
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-05-02 18:55:43 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py	2014-05-28 18:09:57 +0000
@@ -21,6 +21,7 @@
 
 from ubuntuuitoolkit._custom_proxy_objects import (
     _common,
+    _mainview,
     _tabbar
 )
 
@@ -36,9 +37,31 @@
 
     def __init__(self, *args):
         super(Header, self).__init__(*args)
-        self.pointing_device = _common.get_pointing_device()
+        # XXX we need a better way to keep reference to the main view.
+        # --elopio - 2014-02-26
+        self.main_view = self.get_root_instance().select_single(
+            _mainview.MainView)
+
+    def _show_if_not_visible(self):
+        if not self._is_visible():
+            self._show()
+
+    def _is_visible(self):
+        return self.y == 0
+
+    def _show(self):
+        # FIXME This will fail if the header is not linked to a flickable that
+        # fills the main view. The header has a flickable property but it
+        # can't be read by autopilot. See bug http://pad.lv/1318829
+        start_x = stop_x = (self.globalRect.x + self.globalRect.width) // 2
+        start_y = self.main_view.globalRect.y + 5
+        stop_y = start_y + self.globalRect.height
+        self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
+        self.y.wait_for(0)
 
     def click_back_button(self):
+        self._show_if_not_visible()
+
         if self.useDeprecatedToolbar:
             raise _common.ToolkitException('Old header has no back button')
         try:
@@ -51,6 +74,8 @@
         self.pointing_device.click_object(back_button)
 
     def click_custom_back_button(self):
+        self._show_if_not_visible()
+
         if self.useDeprecatedToolbar:
             raise _common.ToolkitException(
                 'Old header has no custom back button')
@@ -79,6 +104,8 @@
         :raise ToolkitEmulatorException: If the main view has no tabs.
 
         """
+        self._show_if_not_visible()
+
         if self.useDeprecatedToolbar:
             self._switch_to_next_tab_in_deprecated_tabbar()
         else:
@@ -108,6 +135,8 @@
                 useDeprecatedToolbar is set.
 
         """
+        self._show_if_not_visible()
+
         if self.useDeprecatedToolbar:
             raise _common.ToolkitException(
                 "Header.swtich_to_tab_by_index only works with new header")
@@ -145,6 +174,8 @@
             name.
 
         """
+        self._show_if_not_visible()
+
         button = self._get_action_button(action_object_name)
         self.pointing_device.click_object(button)
 
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2014-04-30 18:17:32 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py	2014-05-28 18:09:57 +0000
@@ -169,7 +169,7 @@
         :parameter object_name: The QML objectName property of the popover.
 
         """
-        return self.select_single(
+        return self.wait_select_single(
             popups.ActionSelectionPopover, objectName=object_name)
 
     @autopilot_logging.log_action(logger.info)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py	2014-04-16 21:13:39 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_qquicklistview.py	2014-05-28 18:09:57 +0000
@@ -19,22 +19,24 @@
 from autopilot import logging as autopilot_logging
 from autopilot.introspection import dbus
 
-from ubuntuuitoolkit._custom_proxy_objects import _flickable
-from ubuntuuitoolkit._custom_proxy_objects import _common
-
+from ubuntuuitoolkit._custom_proxy_objects import _common, _flickable
 
 logger = logging.getLogger(__name__)
 
 
-class QQuickListView(_flickable.Flickable):
+class QQuickListView(_flickable.QQuickFlickable):
 
     @autopilot_logging.log_action(logger.info)
-    def click_element(self, object_name):
+    def click_element(self, object_name, direction=None):
         """Click an element from the list.
 
         It swipes the element into view if it's center is not visible.
 
         :parameter objectName: The objectName property of the element to click.
+        :parameter direction: The direction where the element is, it can be
+            either 'above' or 'below'. Default value is None, which means we
+            don't know where the object is and we will need to search the full
+            list.
 
         """
         try:
@@ -42,16 +44,31 @@
         except dbus.StateNotFoundError:
             # The element might be on a part of the list that hasn't been
             # created yet. We have to search for it scrolling the entire list.
-            element = self._find_element(object_name)
+            element = self._find_element(object_name, direction)
         self.swipe_child_into_view(element)
         self.pointing_device.click_object(element)
 
     @autopilot_logging.log_action(logger.info)
-    def _find_element(self, object_name):
-        self._scroll_to_top()
-        while not self.atYEnd:
-            containers = self._get_containers()
-            self._swipe_to_show_more_below(containers)
+    def _find_element(self, object_name, direction=None):
+        if direction is None:
+            # We don't know where the object is so we start looking for it from
+            # the top.
+            self._scroll_to_top()
+            direction = 'below'
+
+        if direction == 'below':
+            fail_condition = lambda: self.atYEnd
+            swipe_method = self._swipe_to_show_more_below
+        elif direction == 'above':
+            fail_condition = lambda: self.atYBeginning
+            swipe_method = self._swipe_to_show_more_above
+        else:
+            raise _common.ToolkitException(
+                'Invalid direction: {}'.format(direction))
+
+        containers = self._get_containers()
+        while not fail_condition():
+            swipe_method(containers)
             try:
                 return self.select_single(objectName=object_name)
             except dbus.StateNotFoundError:
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2014-04-16 21:13:39 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py	2014-05-28 18:09:57 +0000
@@ -81,8 +81,13 @@
             self.keyboard.press_and_release('BackSpace')
 
     def _select_all(self):
-        self.pointing_device.click_object(self, press_duration=1)
-        root = self.get_root_instance()
-        main_view = root.select_single(_mainview.MainView)
-        popover = main_view.get_action_selection_popover('text_input_popover')
-        popover.click_button_by_text('Select All')
+        if not self._is_all_text_selected():
+            self.pointing_device.click_object(self, press_duration=1)
+            root = self.get_root_instance()
+            main_view = root.select_single(_mainview.MainView)
+            popover = main_view.get_action_selection_popover(
+                'text_input_popover')
+            popover.click_button_by_text('Select All')
+
+    def _is_all_text_selected(self):
+        return self.text == self.selectedText
 
=== added file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/pickers.py	2014-05-28 18:09:57 +0000
@@ -0,0 +1,255 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import datetime
+import logging
+
+from autopilot import logging as autopilot_logging
+from autopilot.introspection import dbus
+
+from ubuntuuitoolkit._custom_proxy_objects import (
+    _common,
+    _flickable,
+    _qquicklistview
+)
+
+
+logger = logging.getLogger(__name__)
+
+
+class DatePicker(_common.UbuntuUIToolkitCustomProxyObjectBase):
+    """Autopilot helper for the DatePicker component."""
+
+    @autopilot_logging.log_action(logger.info)
+    def pick_date(self, date):
+        """Pick a date from the date picker.
+
+        :parameter date: The date to pick.
+        :type date: An object with year, month and day attributes, like
+            python's datetime.date.
+        :raises ubuntuuitoolkit.ToolkitException if the mode of the picker
+            doesn't let select a date.
+
+        """
+        if not self._is_date_picker():
+            raise _common.ToolkitException(
+                "Can't pick date. The picker mode is: {!r}.".format(self.mode))
+        if 'Years' in self.mode:
+            self._pick_year(date.year)
+            self.year.wait_for(date.year)
+        if 'Month' in self.mode:
+            # Python's date object starts at one. The model in the date picker
+            # at 0.
+            self._pick_month(date.month - 1)
+            self.month.wait_for(date.month - 1)
+        if 'Day' in self.mode:
+            self._pick_day(date.day)
+            self.day.wait_for(date.day)
+
+    def _is_date_picker(self):
+        mode = self.mode
+        if 'Years' in mode or 'Months' in mode or 'Days' in mode:
+            return True
+        else:
+            return False
+
+    @autopilot_logging.log_action(logger.info)
+    def _pick_year(self, year):
+        picker = self.select_single(
+            'Picker', objectName='PickerRow_YearPicker')
+        list_view = picker.select_single(
+            _qquicklistview.QQuickListView, objectName='Picker_Linear')
+        self._pick_value(self.year, year, list_view)
+
+    @autopilot_logging.log_action(logger.info)
+    def _pick_month(self, month):
+        self._pick_value_from_path_view('Month', self.month, month)
+
+    @autopilot_logging.log_action(logger.info)
+    def _pick_day(self, day):
+        # Python's date object starts at one. The model in the date picker
+        # at 0.
+        self._pick_value_from_path_view('Day', self.day - 1, day - 1)
+
+    def _pick_value_from_path_view(self, type_, current_value, new_value):
+        picker = self.select_single(
+            'Picker', objectName='PickerRow_{}Picker'.format(type_))
+        path_view = picker.select_single(
+            QQuickPathView, objectName='Picker_WrapAround')
+        self._pick_value(current_value, new_value, path_view)
+
+    def _pick_value(self, current_value, new_value, scrollable):
+        if new_value > current_value:
+            direction = 'below'
+        elif new_value < current_value:
+            direction = 'above'
+        else:
+            logger.debug('The value is already selected.')
+            return
+        scrollable.click_element(
+            object_name='PickerRow_PickerLabel{}'.format(new_value),
+            direction=direction)
+
+    def get_date(self):
+        """Return the currently selected date.
+
+        :return: a python datetime.date object with the selected date.
+
+        """
+        # Python's date object starts at one. The model in the date picker
+        # at 0.
+        return datetime.date(self.year, self.month + 1, self.day)
+
+    @autopilot_logging.log_action(logger.info)
+    def pick_time(self, time):
+        """Pick a time from the date picker.
+
+        :parameter time: The time to pick.
+        :type time: An object with hour, minute and second attributes, like
+            python's datetime.time.
+        :raises ubuntuuitoolkit.ToolkitException if the mode of the picker
+            doesn't let select a time.
+
+        """
+        if not self._is_time_picker():
+            raise _common.ToolkitException(
+                "Can't pick time. The picker mode is: {!r}.".format(self.mode))
+        if 'Hours' in self.mode:
+            self._pick_hour(time.hour)
+            self.hours.wait_for(time.hour)
+        if 'Minutes' in self.mode:
+            self._pick_minute(time.minute)
+            self.minutes.wait_for(time.minute)
+        if 'Seconds' in self.mode:
+            self._pick_second(time.second)
+            self.seconds.wait_for(time.second)
+
+    def _is_time_picker(self):
+        mode = self.mode
+        if 'Hours' in mode or 'Minutes' in mode or 'Seconds' in mode:
+            return True
+        else:
+            return False
+
+    @autopilot_logging.log_action(logger.info)
+    def _pick_hour(self, hour):
+        self._pick_value_from_path_view('Hours', self.hours, hour)
+
+    @autopilot_logging.log_action(logger.info)
+    def _pick_minute(self, minute):
+        self._pick_value_from_path_view('Minutes', self.minutes, minute)
+
+    @autopilot_logging.log_action(logger.info)
+    def _pick_second(self, second):
+        self._pick_value_from_path_view('Seconds', self.seconds, second)
+
+    def get_time(self):
+        """Return the currently selected time.
+
+        :return: a python datetime.time object with the selected time.
+
+        """
+        return datetime.time(self.hours, self.minutes, self.seconds)
+
+
+class QQuickPathView(_flickable.Scrollable):
+
+    # TODO make it more general and move it to its own module.
+    # --elopio - 2014-05-06
+
+    @autopilot_logging.log_action(logger.info)
+    def click_element(self, object_name, direction='below'):
+        try:
+            element = self.select_single(objectName=object_name)
+        except dbus.StateNotFoundError:
+            # The element might be on a part of the list that hasn't been
+            # created yet. We have to search for it scrolling.
+            element = self._find_element(object_name, direction)
+        self.swipe_child_into_view(element)
+        self.pointing_device.click_object(element)
+
+    @autopilot_logging.log_action(logger.info)
+    def _find_element(self, object_name, direction):
+        containers = self._get_containers()
+        for index in range(self.count):
+            if direction == 'below':
+                swipe_method = self._swipe_to_show_one_more_below
+            elif direction == 'above':
+                swipe_method = self._swipe_to_show_one_more_above
+            else:
+                raise _common.ToolkitException(
+                    'Invalid direction: {}'.format(direction))
+
+            swipe_method(containers)
+
+            try:
+                return self.select_single(objectName=object_name)
+            except dbus.StateNotFoundError:
+                pass
+        raise _common.ToolkitException(
+            'List element with objectName "{}" not found.'.format(object_name))
+
+    @autopilot_logging.log_action(logger.info)
+    def _swipe_to_show_one_more_above(self, containers):
+        self._swipe_to_show_one_more('above', containers)
+
+    @autopilot_logging.log_action(logger.info)
+    def _swipe_to_show_one_more_below(self, containers):
+        self._swipe_to_show_one_more('below', containers)
+
+    def _swipe_to_show_one_more(self, direction, containers):
+        start_x = stop_x = self.globalRect.x + (self.globalRect.width // 2)
+        center_y = self.globalRect.y + (self.globalRect.height // 2)
+        # XXX This assumes all the children are of the same height
+        child = self.get_children_by_type('PickerDelegate')[0]
+        top = center_y - (child.globalRect.height // 2)
+        bottom = center_y + (child.globalRect.height // 2)
+        if direction == 'below':
+            start_y = bottom
+            stop_y = top
+        elif direction == 'above':
+            start_y = top
+            stop_y = bottom
+        else:
+            raise _common.ToolkitException(
+                'Invalid direction {}.'.format(direction))
+        self._slow_drag(start_x, stop_x, start_y, stop_y)
+        self.dragging.wait_for(False)
+        self.moving.wait_for(False)
+
+    @autopilot_logging.log_action(logger.info)
+    def swipe_child_into_view(self, child):
+        """Make the child visible.
+
+        Currently it works only when the object needs to be swiped vertically.
+        TODO implement horizontal swiping. --elopio - 2014-03-21
+
+        """
+        containers = self._get_containers()
+        if not self._is_child_visible(child, containers):
+            self._swipe_non_visible_child_into_view(child, containers)
+        else:
+            logger.debug('The element is already visible.')
+
+    @autopilot_logging.log_action(logger.info)
+    def _swipe_non_visible_child_into_view(self, child, containers):
+        while not self._is_child_visible(child, containers):
+            # Check the direction of the swipe based on the position of the
+            # child relative to the immediate flickable container.
+            if child.globalRect.y < self.globalRect.y:
+                self._swipe_to_show_one_more_above(containers)
+            else:
+                self._swipe_to_show_one_more_below(containers)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/emulators.py'
--- tests/autopilot/ubuntuuitoolkit/emulators.py	2014-04-25 18:39:51 +0000
+++ tests/autopilot/ubuntuuitoolkit/emulators.py	2014-05-28 18:09:57 +0000
@@ -36,12 +36,12 @@
     'CheckBox',
     'ComposerSheet',
     'Empty',
-    'Flickable',
     'Header',
     'ItemSelector',
     'MainView',
     'MultiValue',
     'OptionSelector',
+    'QQuickFlickable',
     'QQuickListView',
     'SingleControl',
     'SingleValue',
@@ -61,10 +61,10 @@
     get_keyboard,
     get_pointing_device,
     CheckBox,
-    Flickable,
     Header,
     MainView,
     OptionSelector,
+    QQuickFlickable,
     QQuickListView,
     TabBar,
     Tabs,
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py	2014-05-28 18:09:57 +0000
@@ -0,0 +1,203 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import datetime
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import pickers, tests
+
+
+class DatePickerBaseTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Pickers 1.0
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Column {
+        DatePicker {
+            id: datePicker
+            objectName: 'datePicker'
+            mode: 'Years|Months|Days'
+            date: {
+                var d = new Date()
+                // Make sure that the picker will have higher and lower values
+                // to select.
+                d.setFullYear(d.getFullYear() + 25)
+                d.setMonth('5')
+                d.setDate('15')
+                return d
+            }
+        }
+        DatePicker {
+            id: timePicker
+            objectName: 'timePicker'
+            mode: 'Hours|Minutes|Seconds'
+            date: {
+                var d = new Date()
+                // Make sure that the picker will have higher and lower values
+                // to select.
+                d.setHours(12)
+                d.setMinutes('30')
+                d.setSeconds('30')
+                return d
+            }
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(DatePickerBaseTestCase, self).setUp()
+        self.date_picker = self.main_view.select_single(
+            pickers.DatePicker, objectName='datePicker')
+        self.time_picker = self.main_view.select_single(
+            pickers.DatePicker, objectName='timePicker')
+
+
+class DatePickerTestCase(DatePickerBaseTestCase):
+
+    def test_select_date_picker_must_return_custom_proxy_object(self):
+        self.assertIsInstance(
+            self.date_picker, pickers.DatePicker)
+
+    def test_pick_date_on_time_picker_must_raise_exception(self):
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException, self.time_picker.pick_date,
+            'dummy')
+        self.assertEqual(
+            str(error),
+            "Can't pick date. The picker mode is: {!r}.".format(
+                self.time_picker.mode))
+
+    def test_pick_time_on_date_picker_must_raise_exception(self):
+        error = self.assertRaises(
+            ubuntuuitoolkit.ToolkitException, self.date_picker.pick_time,
+            'dummy')
+        self.assertEqual(
+            str(error),
+            "Can't pick time. The picker mode is: {!r}.".format(
+                self.date_picker.mode))
+
+    def test_swipe_to_show_one_more_below_must_select_next_index(self):
+        """Test that we don't end up swiping more than needed.
+
+        This would cause us to miss the element we are looking for, and to have
+        to swipe many times in order to finally click it.
+
+        """
+        picker = self.main_view.select_single(
+            'Picker', objectName='PickerRow_DayPicker')
+        path_view = picker.select_single(
+            pickers.QQuickPathView, objectName='Picker_WrapAround')
+        current_index = path_view.currentIndex
+
+        path_view._swipe_to_show_one_more_below(path_view._get_containers())
+
+        self.assertEqual(path_view.currentIndex, current_index + 1)
+
+    def test_swipe_to_show_one_more_above_must_select_previous_index(self):
+        """Test that we don't end up swiping more than needed.
+
+        This would cause us to miss the element we are looking for, and to have
+        to swipe many times in order to finally click it.
+
+        """
+        picker = self.main_view.select_single(
+            'Picker', objectName='PickerRow_DayPicker')
+        path_view = picker.select_single(
+            pickers.QQuickPathView, objectName='Picker_WrapAround')
+        current_index = path_view.currentIndex
+
+        path_view._swipe_to_show_one_more_above(path_view._get_containers())
+
+        self.assertEqual(path_view.currentIndex, current_index - 1)
+
+
+class PickDateFromDatePickerTestCase(DatePickerBaseTestCase):
+
+    SELECTED_YEAR = datetime.date.today().year + 25
+    SELECTED_MONTH = 6  # June
+    SELECTED_DAY = 15
+
+    scenarios = [
+        ('higher year', {
+            'date_to_pick': datetime.date(
+                SELECTED_YEAR + 10, SELECTED_MONTH, SELECTED_DAY)}),
+        ('lower year', {
+            'date_to_pick': datetime.date(
+                SELECTED_YEAR - 10, SELECTED_MONTH, SELECTED_DAY)}),
+        ('higher month', {
+            'date_to_pick': datetime.date(
+                SELECTED_YEAR, SELECTED_MONTH + 4, SELECTED_DAY)}),
+        ('lower month', {
+            'date_to_pick': datetime.date(
+                SELECTED_YEAR, SELECTED_MONTH - 4, SELECTED_DAY)}),
+        ('higher day', {
+            'date_to_pick': datetime.date(
+                SELECTED_YEAR, SELECTED_MONTH, SELECTED_DAY + 10)}),
+        ('lower day', {
+            'date_to_pick': datetime.date(
+                SELECTED_YEAR, SELECTED_MONTH, SELECTED_DAY - 10)}),
+        ('change all values', {
+            'date_to_pick': datetime.date(
+                SELECTED_YEAR - 10, SELECTED_MONTH + 4, SELECTED_DAY - 10)}),
+    ]
+
+    def test_pick_date(self):
+        """Test that picking a date updates the picker."""
+        self.date_picker.pick_date(self.date_to_pick)
+        self.assertEqual(self.date_picker.get_date(), self.date_to_pick)
+
+
+class PickTimeFromDatePickerTestCase(DatePickerBaseTestCase):
+
+    SELECTED_HOUR = 12
+    SELECTED_MINUTE = 30
+    SELECTED_SECOND = 30
+
+    scenarios = [
+        ('higher hour', {
+            'time_to_pick': datetime.time(
+                SELECTED_HOUR + 6, SELECTED_MINUTE, SELECTED_SECOND)}),
+        ('lower hour', {
+            'time_to_pick': datetime.time(
+                SELECTED_HOUR - 6, SELECTED_MINUTE, SELECTED_SECOND)}),
+        ('higher minute', {
+            'time_to_pick': datetime.time(
+                SELECTED_HOUR, SELECTED_MINUTE + 10, SELECTED_SECOND)}),
+        ('lower minute', {
+            'time_to_pick': datetime.time(
+                SELECTED_HOUR, SELECTED_MINUTE - 10, SELECTED_SECOND)}),
+        ('higher second', {
+            'time_to_pick': datetime.time(
+                SELECTED_HOUR, SELECTED_MINUTE, SELECTED_SECOND + 10)}),
+        ('lower second', {
+            'time_to_pick': datetime.time(
+                SELECTED_HOUR, SELECTED_MINUTE, SELECTED_SECOND - 10)}),
+        ('change all values', {
+            'time_to_pick': datetime.time(
+                SELECTED_HOUR + 6, SELECTED_MINUTE - 10,
+                SELECTED_SECOND + 10)}),
+    ]
+
+    def test_pick_time(self):
+        self.time_picker.pick_time(self.time_to_pick)
+        self.assertEqual(self.time_picker.get_time(), self.time_to_pick)
 
=== added file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2014-05-28 18:09:57 +0000
@@ -0,0 +1,201 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+
+import testtools
+
+import ubuntuuitoolkit
+from ubuntuuitoolkit import tests
+from ubuntuuitoolkit._custom_proxy_objects import _common
+
+
+class FlickableTestCase(testtools.TestCase):
+
+    def test_get_unity_top_container(self):
+        """Test that we can get the top cointainer in Unity."""
+        # This tests bug http://pad.lv/1314390
+        # On Unity, the top container is not the first child as it is in all
+        # the apps that have a MainView. This makes the first implementation of
+        # _get_top_container fail. Instead of going from the top looking for
+        # a container, we should start from the flickable until we find the
+        # top-most container.
+        # FIXME we are faking the QML tree because we have no way to launch
+        # the app with a tree like the one in Unity8. kalikiana has a branch
+        # with an alternate launcher that will let us clean this test.
+        # --elopio - 2014-05-15.
+        RootClass = type('obj', (object,), {'id': 'root'})
+        mock_root_instance = RootClass()
+        # We consider a container is an object with a globalRect.
+        MockNonContainerClass = type('obj', (object,), {})
+        mock_non_container = MockNonContainerClass()
+        MockContainerClass = type(
+            'obj', (object,), {'id': 'container', 'globalRect': 'dummy'})
+        mock_container = MockContainerClass()
+        mock_container.get_parent = lambda: mock_root_instance
+
+        # The root instance has two children. This exposes the bug.
+        mock_root_instance.get_children = lambda: [
+            mock_non_container, mock_container]
+
+        dummy_state = {'id': '10'}
+        flickable = ubuntuuitoolkit.QQuickFlickable(
+            dummy_state, '/dummy'.encode(), 'dummy')
+
+        flickable.get_root_instance = lambda: mock_root_instance
+        # The top container of the flickable is its immediate parent.
+        flickable.get_parent = lambda: mock_container
+
+        top_container = flickable._get_top_container()
+        self.assertEqual(top_container, mock_container)
+
+    def test_is_flickable_with_flicking_property_must_return_true(self):
+        """is_flickable returns True if flickable property exists."""
+        dummy_id = (0, 0)
+        dummy_flicking = (0, 'dummy')
+        state_with_flicking = {'id': dummy_id, 'flicking': dummy_flicking}
+        element = _common.UbuntuUIToolkitCustomProxyObjectBase(
+            state_with_flicking, '/dummy'.encode(), 'dummy')
+        with element.no_automatic_refreshing():
+            self.assertTrue(element.is_flickable())
+
+    def test_is_flickable_without_flicking_property_must_return_false(self):
+        """is_flickable returns False if flickable property doesn't exist."""
+        dummy_id = (0, 0)
+        state_without_flicking = {'id': dummy_id}
+        element = _common.UbuntuUIToolkitCustomProxyObjectBase(
+            state_without_flicking, '/dummy'.encode(), 'dummy')
+        with element.no_automatic_refreshing():
+            self.assertFalse(element.is_flickable())
+
+
+class IsFlickableTestCase(tests.QMLStringAppTestCase):
+    """Functional test to check that is_flickable returns the right value.
+
+    We already have tests for is_flickable with mocks, so here we just check
+    with some real elements.
+
+    """
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+MainView {
+    objectName: 'mainView'
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Flickable {
+        objectName: 'flickable'
+    }
+    ListView {
+        objectName: 'listView'
+    }
+    Label {
+        objectName: 'label'
+    }
+}
+""")
+
+    scenarios = [
+        ('main view', dict(object_name='mainView', is_flickable=False)),
+        ('flickable', dict(object_name='flickable', is_flickable=True)),
+        ('list view', dict(object_name='listView', is_flickable=True)),
+        ('label', dict(object_name='label', is_flickable=False))
+    ]
+
+    def test_is_flickable(self):
+        """Test that is_flickable identifies the elements correctly."""
+        element = self.app.select_single(objectName=self.object_name)
+        self.assertEqual(element.is_flickable(), self.is_flickable)
+
+
+class SwipeIntoViewTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Label {
+        id: clickedLabel
+        objectName: "clickedLabel"
+        text: "No element clicked."
+    }
+
+    Flickable {
+        anchors {
+            fill: parent
+            topMargin: clickedLabel.height
+            // It can't be at the bottom, or the toolbar will be opened
+            // when we try to click it.
+            bottomMargin: units.gu(10)
+        }
+        objectName: 'flickable'
+        height: units.gu(60)
+        contentHeight: bottomButton.y + bottomButton.height
+
+        Button {
+            id: topButton
+            objectName: 'topButton'
+            text: 'Top button'
+            onClicked: clickedLabel.text = objectName
+        }
+        Rectangle {
+            id: emptyRectangle
+            height: units.gu(80)
+            anchors.top: topButton.bottom
+        }
+        Button {
+            id: bottomButton
+            objectName: 'bottomButton'
+            text: 'Bottom button'
+            onClicked: clickedLabel.text = objectName
+            anchors.top: emptyRectangle.bottom
+        }
+    }
+}
+""")
+
+    def setUp(self):
+        super(SwipeIntoViewTestCase, self).setUp()
+        self.label = self.main_view.select_single(
+            'Label', objectName='clickedLabel')
+        self.assertEqual(self.label.text, 'No element clicked.')
+
+    def test_swipe_to_bottom(self):
+        self.main_view.close_toolbar()
+
+        button = self.main_view.select_single(objectName='bottomButton')
+        button.swipe_into_view()
+
+        self.pointing_device.click_object(button)
+        self.assertEqual(self.label.text, 'bottomButton')
+
+    def test_swipe_to_top(self):
+        self.main_view.close_toolbar()
+        bottomButton = self.main_view.select_single(objectName='bottomButton')
+        bottomButton.swipe_into_view()
+
+        topButton = self.main_view.select_single(objectName='topButton')
+        topButton.swipe_into_view()
+
+        self.pointing_device.click_object(topButton)
+        self.assertEqual(self.label.text, 'topButton')
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-05-10 21:52:19 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-05-28 18:09:57 +0000
@@ -22,7 +22,7 @@
 
     test_qml = ("""
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 MainView {
     width: units.gu(48)
@@ -33,11 +33,46 @@
     Page {
         title: "Test title"
 
-        Label {
-            id: label
-            objectName: "clicked_label"
-            anchors.centerIn: parent
-            text: "No button clicked."
+        Flickable {
+            anchors.fill: parent
+            contentHeight: units.gu(120)
+            objectName: "header_test_flickable"
+
+            Label {
+                id: label
+                objectName: "clicked_label"
+                anchors {
+                    top: parent.top
+                    horizontalCenter: parent.horizontalCenter
+                }
+                text: "No button clicked."
+            }
+
+            Button {
+                objectName: "hide_actions_button"
+                anchors {
+                    top: label.bottom
+                    topMargin: units.gu(5)
+                    horizontalCenter: parent.horizontalCenter
+                }
+                text: "Hide some actions"
+                onClicked: {
+                    cancelAction.visible = false;
+                    for (var i=0; i < 3; i++) {
+                        buttonRepeater.itemAt(i).action.visible = false;
+                    }
+                    // only three of five visible actions left
+                }
+            }
+            Label {
+                id: endLabel
+                objectName: "end_label"
+                anchors {
+                    bottom: parent.bottom
+                    horizontalCenter: parent.horizontalCenter
+                }
+                text: "The end."
+            }
         }
 
         tools: ToolbarItems {
@@ -62,22 +97,6 @@
                 }
             }
         }
-
-        Button {
-            objectName: "hide_actions_button"
-            anchors {
-                bottom: parent.bottom
-                horizontalCenter: parent.horizontalCenter
-            }
-            text: "Hide some actions"
-            onClicked: {
-                cancelAction.visible = false;
-                for (var i=0; i < 3; i++) {
-                    buttonRepeater.itemAt(i).action.visible = false;
-                }
-                // only three of five visible actions left
-            }
-        }
     }
 }
 """)
@@ -95,8 +114,8 @@
         self.assertEqual(self.header.title, "Test title")
 
     def test_click_header_action_button(self):
-        self.header.click_action_button('action1')
-        self.assertEqual(self.label.text, 'Button 1 clicked.')
+        self.header.click_action_button('action0')
+        self.assertEqual(self.label.text, 'Button 0 clicked.')
 
     def test_click_header_overflow_action_button(self):
         # custom back button and first action button go in the header
@@ -117,6 +136,13 @@
         self.header.click_custom_back_button()
         self.assertEqual(self.label.text, 'Cancel button clicked.')
 
+    def test_click_header_action_button_with_hidden_header(self):
+        bottom_label = self.main_view.select_single(objectName='end_label')
+        bottom_label.swipe_into_view()
+        self.assertFalse(self.header._is_visible())
+        self.header.click_action_button('action0')
+        self.assertEqual(self.label.text, 'Button 0 clicked.')
+
     def test_overflow_button(self):
         # there are 5 actions plus a custom back action
         overflow_button = self.header.select_single(
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py	2014-04-17 01:06:31 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py	2014-05-28 18:09:57 +0000
@@ -14,6 +14,13 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+try:
+    from unittest import mock
+except ImportError:
+    import mock
+
+from autopilot import platform
+
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
 
@@ -91,3 +98,23 @@
         self.assertTrue(self.simple_text_field.is_empty())
         self.simple_text_field.write('test')
         self.assertFalse(self.simple_text_field.is_empty())
+
+    def test_select_all_selects_all_text(self):
+        if platform.model() != 'Desktop':
+            self.skipTest('Select all is not yet implemented on the phone.')
+        self.simple_text_field.write('Text to select.')
+        self.simple_text_field._select_all()
+
+        self.assertTrue(self.simple_text_field._is_all_text_selected())
+
+    def test_select_all_when_already_selected_must_do_nothing(self):
+        """Test for select all the text when it's already selected."""
+        if platform.model() != 'Desktop':
+            self.skipTest('Select all is not yet implemented on the phone.')
+        self.simple_text_field.write('Text to select.')
+        self.simple_text_field._select_all()
+        with mock.patch.object(
+                self.simple_text_field, 'pointing_device') as mock_device:
+            self.simple_text_field._select_all()
+
+        self.assertFalse(mock_device.called)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-01-13 15:31:14 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-05-28 18:09:57 +0000
@@ -75,6 +75,10 @@
             # TODO: check for properties
 
     def test_ubuntushape(self):
+        # Flaky test case
+        # FIXME: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1308979
+        return
+
         item = "Ubuntu Shape"
         self.loadItem(item)
         self.checkPageHeader(item)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2013-11-08 09:19:02 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-05-28 18:09:57 +0000
@@ -1,6 +1,6 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
-# Copyright (C) 2012, 2013 Canonical Ltd.
+# Copyright (C) 2012, 2013, 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
@@ -14,85 +14,52 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-"""Tests for the Ubuntu UI Toolkit Gallery - OptionSelector component"""
-import time
-from autopilot.matchers import Eventually
-from testtools.matchers import Equals
-from ubuntuuitoolkit.tests import FlickDirection
+"""Tests for the Ubuntu UI Toolkit Gallery - OptionSelector component."""
+
+import ubuntuuitoolkit
 from ubuntuuitoolkit.tests.gallery import GalleryTestCase
 
 
-class OptionSelectorTests(GalleryTestCase):
-    """Generic tests for the Gallery"""
-
-    def test_optionselector_collapsed(self):
-        item = "Option Selector"
-        self.loadItem(item)
-        self.checkPageHeader(item)
-        collapsed = self.getObject("optionselector_collapsed")
-        styleditem = collapsed.select_single('StyledItem',
-                                             objectName='listContainer')
-
-        self.assertThat(collapsed.selectedIndex, Equals(0))
-        self.pointing_device.click_object(collapsed)
-        self.assertThat(styleditem.currentlyExpanded, Eventually(Equals(True)))
-        #try to search the following list entry few times
-        #as it may not be available immediately.
-        for t in range(0, 9):
-            try:
-                selectedValue = collapsed.select_single('Label',
-                                                        text='Value 4')
-                self.assertIsNotNone(selectedValue)
-            except:
-                time.sleep(1)
-
-        self.pointing_device.click_object(selectedValue)
-        self.assertThat(collapsed.selectedIndex, Eventually(Equals(3)))
-        self.assertThat(styleditem.currentlyExpanded,
-                        Eventually(Equals(False)))
-
-    def test_optionselector_expanded(self):
-        item = "Option Selector"
-        self.loadItem(item)
-        self.checkPageHeader(item)
-        expanded = self.getObject("optionselector_expanded")
-
-        self.assertThat(expanded.selectedIndex, Equals(0))
-        selectedValue = expanded.select_single('Label', text='Value 4')
-        self.assertIsNotNone(selectedValue)
-        self.pointing_device.click_object(selectedValue)
-        self.assertThat(expanded.selectedIndex, Eventually(Equals(3)))
-
-        selectedValue = expanded.select_single('Label', text='Value 1')
-        self.assertIsNotNone(selectedValue)
-        self.pointing_device.click_object(selectedValue)
-        self.assertThat(expanded.selectedIndex, Eventually(Equals(0)))
-
-    def test_optionselector_custommodel(self):
-        item = "Option Selector"
-        self.loadItem(item)
-        self.checkPageHeader(item)
-
-        custommodel = self.getObject("optionselector_custommodel")
-        flickable = self.main_view.select_single('QQuickFlickable')
-        self.assertIsNotNone(flickable)
-
-        #Flick upward to reveal the hidden ui element.
-        self.reveal_item_by_flick(custommodel, flickable, FlickDirection.UP)
-        self.assertThat(flickable.flicking, Eventually(Equals(False)))
-
-        self.assertThat(custommodel.selectedIndex, Equals(0))
-        selectedValue = custommodel.select_single('Label', text='Name 4')
-        self.assertIsNotNone(selectedValue)
-        self.pointing_device.click_object(selectedValue)
-        self.assertThat(custommodel.selectedIndex, Eventually(Equals(3)))
-
-        selectedValue = custommodel.select_single('Label', text='Name 1')
-        self.assertIsNotNone(selectedValue)
-        self.pointing_device.click_object(selectedValue)
-        self.assertThat(custommodel.selectedIndex, Eventually(Equals(0)))
-
-        #scroll the page downward now.
-        collapsed = self.getObject("optionselector_collapsed")
-        self.reveal_item_by_flick(collapsed, flickable, FlickDirection.DOWN)
-        self.assertThat(flickable.flicking, Eventually(Equals(False)))
+class OptionSelectorTestCase(GalleryTestCase):
+
+    def setUp(self):
+        super(OptionSelectorTestCase, self).setUp()
+        item = "Option Selector"
+        self.loadItem(item)
+        self.checkPageHeader(item)
+
+    def test_select_option_from_collapsed_optionselector(self):
+        collapsed_option_selector = self.main_view.select_single(
+            ubuntuuitoolkit.OptionSelector,
+            objectName='optionselector_collapsed')
+
+        self.assertEqual(
+            collapsed_option_selector.get_selected_text(), 'Value 1')
+
+        collapsed_option_selector.select_option('Label', text='Value 4')
+        self.assertEqual(collapsed_option_selector.get_selected_index(), 3)
+
+    def test_select_option_from_expanded_optionselector(self):
+        expanded_option_selector = self.main_view.select_single(
+            ubuntuuitoolkit.OptionSelector,
+            objectName='optionselector_expanded')
+
+        self.assertEqual(
+            expanded_option_selector.get_selected_text(), 'Value 1')
+
+        expanded_option_selector.select_option('Label', text='Value 4')
+        self.assertEqual(expanded_option_selector.get_selected_index(), 3)
+
+    def test_select_option_from_optionselector_with_custom_model(self):
+        option_selector_with_custom_model = self.main_view.select_single(
+            ubuntuuitoolkit.OptionSelector,
+            objectName='optionselector_custommodel')
+        option_selector_with_custom_model.swipe_into_view()
+
+        self.assertEqual(
+            option_selector_with_custom_model.get_selected_index(), 0)
+
+        option_selector_with_custom_model.select_option(
+            'Label', text='Name 4')
+        self.assertEqual(
+            option_selector_with_custom_model.get_selected_index(), 3)
 
=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-04-28 15:39:24 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_emulators.py	2014-05-28 18:09:57 +0000
@@ -32,7 +32,7 @@
 
     symbols_retaining_name = [
         'check_autopilot_version', 'get_keyboard', 'get_pointing_device',
-        'CheckBox', 'Flickable', 'Header', 'MainView', 'OptionSelector',
+        'CheckBox', 'Header', 'MainView', 'OptionSelector', 'QQuickFlickable',
         'QQuickListView', 'TabBar', 'Tabs', 'TextField', 'Toolbar',
     ]
 
 
=== modified file 'tests/qmlapicheck.py'
--- tests/qmlapicheck.py	2014-04-24 09:18:38 +0000
+++ tests/qmlapicheck.py	2014-05-28 18:09:57 +0000
@@ -130,10 +130,10 @@
     if '{' in line and '}' in line:
         if filetype == 'qmltypes' and not in_builtin_type:
             print('    ' + line.strip())
-        continue
+            continue
 
     # End of function/ signal/ Item block
-    if '}' in line:
+    if '}' in line and not '{' in line:
         in_block -= 1
         block_meta = {}
         if in_block == 1 and in_builtin_type:
@@ -143,7 +143,7 @@
     # Only root "Item {" is inspected for QML, otherwise all children
     if in_block == 1 or filetype == 'qmltypes':
         # Left hand side specifies a keyword, a type and a variable name
-        declaration = line.split(':')[0]
+        declaration = line.split(':', 1)[0]
         words = declaration.strip().split(' ')
         # Skip types with prefixes considered builtin
         if filetype == 'qmltypes' and words[0] == 'name':
@@ -175,7 +175,8 @@
         for word in words:
             if word in keywords:
                 if filetype == 'qml':
-                    signature = declaration.split('{')[0].strip()
+                    separator = '{' if 'function' in declaration else ':'
+                    signature = declaration.split(separator, 1)[0].strip()
                     if 'alias' in line:
                         no_mods = signature
                         for mod in ['readonly', 'default']:
@@ -198,7 +199,7 @@
                 break
 
     # Start of function/ signal/ Item block
-    if '{' in line:
+    if '{' in line and not '}' in line:
         in_block += 1
         block_meta = {}
         # The parent type can affect API
 
=== modified file 'tests/resources/alarm/Alarms.qml'
--- tests/resources/alarm/Alarms.qml	2014-04-23 08:50:20 +0000
+++ tests/resources/alarm/Alarms.qml	2014-05-28 18:09:57 +0000
@@ -113,7 +113,7 @@
             id: days
             text: "Occurence"
             values: getValues()
-            visible: recurence.selectedIndex == 2
+            visible: recurence.selectedIndex !== 1
             onClicked: {
                 PopupUtils.open(Qt.resolvedUrl("AlarmDays.qml"), days, {"alarm": alarm});
             }
 
=== added file 'tests/resources/toolbar/header.qml'
--- tests/resources/toolbar/header.qml	1970-01-01 00:00:00 +0000
+++ tests/resources/toolbar/header.qml	2014-05-28 18:09:57 +0000
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2013-2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+MainView {
+    id: mainView
+    width: units.gu(40)
+    height: units.gu(50)
+
+    PageStack {
+        id: stack
+
+        Component.onCompleted: stack.push(tabs)
+        Tabs {
+            id: tabs
+            Tab {
+                title: "Tab 1"
+                page: Page {
+                    Button {
+                        anchors.centerIn: parent
+                        text: "Click me"
+                        onTriggered: stack.push(pageOnStack)
+                    }
+                    tools: ToolbarItems {
+                        ToolbarButton {
+                            action: Action {
+                                iconName: "settings"
+                                text: "Settings"
+                            }
+                        }
+                    }
+                }
+            }
+            Tab {
+                title: "Tab 2"
+                page: Page {
+                    Label {
+                        anchors.centerIn: parent
+                        text: "Second tab"
+                    }
+
+                    tools: ToolbarItems {
+                        ToolbarButton {
+                            action: Action {
+                                iconName: "search"
+                                text: "Search"
+                            }
+                        }
+                        ToolbarButton {
+                            action: Action {
+                                iconName: "contact"
+                                text: "Contacts"
+                            }
+                        }
+                        ToolbarButton {
+                            action: Action {
+                                iconName: "share"
+                                text: "Share"
+                            }
+                        }
+                        ToolbarButton {
+                            action: Action {
+                                iconName: "select"
+                                text: "Select"
+                            }
+                        }
+                    }
+                }
+            }
+            Tab {
+                title: "Tab 3"
+                page: Page {
+                    Switch {
+                        id: newHeaderSwitch
+                        anchors.centerIn: parent
+                        checked: !mainView.useDeprecatedToolbar
+                        onTriggered: {
+                            mainView.useDeprecatedToolbar = !checked;
+                        }
+                    }
+                    Label {
+                        anchors {
+                            horizontalCenter: parent.horizontalCenter
+                            bottom: newHeaderSwitch.top
+                            bottomMargin: units.gu(1)
+                        }
+                        text: "Use new header"
+                    }
+                    tools: ToolbarItems {
+                        ToolbarButton {
+                            action: Action {
+                                iconName: "camera-flip"
+                                text: "hello"
+                            }
+                        }
+                    }
+
+                }
+            }
+            Tab {
+                title: "Tab 4"
+                page: Page { }
+            }
+            Tab {
+                title: "Tab 5"
+                page: Page { }
+            }
+        }
+    }
+
+    Page {
+        id: pageOnStack
+        visible: false
+        title: "Stacked page"
+        Label {
+            anchors.centerIn: parent
+            text: "Use back button to return"
+        }
+        tools: ToolbarItems {
+            ToolbarButton {
+                action: Action {
+                    iconName: "search"
+                    text: "Search"
+                }
+            }
+        }
+    }
+}
 
=== modified file 'tests/unit/tst_alarms/tst_alarms.cpp'
--- tests/unit/tst_alarms/tst_alarms.cpp	2014-04-10 09:53:26 +0000
+++ tests/unit/tst_alarms/tst_alarms.cpp	2014-05-28 18:09:57 +0000
@@ -354,6 +354,7 @@
         waitForRequest(&alarm);
         QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
         QVERIFY(containsAlarm(&alarm));
+        QSKIP("https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1322558");
 
         alarm.setDate(alarm.date().addDays(1));
         alarm.save();
@@ -456,6 +457,51 @@
         QVERIFY(srcDate.timeZone() != dstDate.timeZone());
     }
 
+    void test_oneTime_dow_data() {
+        QTest::addColumn<QString>("message");
+        QTest::addColumn<int>("dow");
+
+        QTest::newRow("Monday") << "Monday" << (int)UCAlarm::Monday;
+        QTest::newRow("Tuesday") << "Tuesday" << (int)UCAlarm::Tuesday;
+        QTest::newRow("Wednesday") << "Wednesday" << (int)UCAlarm::Wednesday;
+        QTest::newRow("Thursday") << "Thursday" << (int)UCAlarm::Thursday;
+        QTest::newRow("Friday") << "Friday" << (int)UCAlarm::Friday;
+        QTest::newRow("Saturday") << "Saturday" << (int)UCAlarm::Saturday;
+        QTest::newRow("Sunday") << "Sunday" << (int)UCAlarm::Sunday;
+    }
+    void test_oneTime_dow() {
+        QFETCH(QString, message);
+        QFETCH(int, dow);
+
+        UCAlarm alarm(QDateTime::currentDateTime().addSecs(3600), "test_oneTime_dow_" + message);
+        alarm.setDaysOfWeek((UCAlarm::DaysOfWeek)dow);
+        alarm.save();
+        waitForRequest(&alarm);
+        QCOMPARE(alarm.error(), (int)UCAlarm::NoError);
+        QVERIFY(containsAlarm(&alarm));
+    }
+
+    void test_oneTime_setDate_does_not_change_dow_data() {
+        QTest::addColumn<QString>("message");
+        QTest::addColumn<int>("dow");
+
+        QTest::newRow("Monday") << "Monday" << (int)UCAlarm::Monday;
+        QTest::newRow("Tuesday") << "Tuesday" << (int)UCAlarm::Tuesday;
+        QTest::newRow("Wednesday") << "Wednesday" << (int)UCAlarm::Wednesday;
+        QTest::newRow("Thursday") << "Thursday" << (int)UCAlarm::Thursday;
+        QTest::newRow("Friday") << "Friday" << (int)UCAlarm::Friday;
+        QTest::newRow("Saturday") << "Saturday" << (int)UCAlarm::Saturday;
+        QTest::newRow("Sunday") << "Sunday" << (int)UCAlarm::Sunday;
+    }
+    void test_oneTime_setDate_does_not_change_dow() {
+        QFETCH(QString, message);
+        QFETCH(int, dow);
+
+        UCAlarm alarm(QDateTime::currentDateTime(), "test_oneTime_setDate_does_not_change_dow_" + message);
+        alarm.setDaysOfWeek((UCAlarm::DaysOfWeek)dow);
+        alarm.setDate(QDateTime::currentDateTime().addSecs(3600));
+        QCOMPARE((int)alarm.daysOfWeek(), dow);
+    }
 };
 
 QTEST_MAIN(tst_UCAlarms)
 
=== modified file 'tests/unit/tst_components/tst_label.qml'
--- tests/unit/tst_components/tst_label.qml	2014-04-23 08:50:20 +0000
+++ tests/unit/tst_components/tst_label.qml	2014-05-28 18:09:57 +0000
@@ -44,7 +44,7 @@
     }
 
     function test_fontWeight() {
-        compare(textCustom.font.weight, Font.Normal, "font.weight is 'normal' by default")
+        compare(textCustom.font.weight, Font.Light, "font.weight is 'light' by default")
 
         var fontWeights = [ Font.Light, Font.Normal, Font.DemiBold, Font.Bold, Font.Black ]
 
 
=== added file 'tests/unit/tst_components/tst_sortfiltermodel.qml'
--- tests/unit/tst_components/tst_sortfiltermodel.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_components/tst_sortfiltermodel.qml	2014-05-28 18:09:57 +0000
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import Ubuntu.Components 1.1
+
+TestCase {
+     name: "SortFilterModel"
+
+    ListModel {
+        id: things
+        ListElement { foo: "pub"; alpha: "bee"; num: 200 }
+        ListElement { foo: "den"; alpha: "cow"; num: 300 }
+        ListElement { foo: "bar"; alpha: "ant"; num: 100 }
+    }
+
+    SortFilterModel {
+        id: unmodified
+        model: things
+    }
+
+    SortFilterModel {
+        id: alphabetic
+        model: things
+        sort.property: "alpha"
+    }
+
+    SortFilterModel {
+        id: alphaSecond
+        model: things
+        sort.property: "foo"
+    }
+
+    SortFilterModel {
+        id: alphabeticRe
+        model: things
+        sort.property: "alpha"
+        sort.order: Qt.DescendingOrder
+    }
+
+    SortFilterModel {
+        id: numeric
+        model: things
+        sort.property: "num"
+    }
+
+    SortFilterModel {
+        id: numericRe
+        model: things
+        sort.property: "num"
+        sort.order: Qt.DescendingOrder
+    }
+
+    SortFilterModel {
+        id: bee
+        model: things
+        filter.property: "alpha"
+        filter.pattern: /e/
+    }
+
+    function test_passthrough() {
+        compare(unmodified.count, things.count)
+    }
+
+    function test_sort() {
+        // Default is Ascending
+        compare(alphabetic.sort.order, Qt.AscendingOrder)
+        compare(alphabetic.get(0).alpha, "ant")
+        compare(alphabetic.get(1).alpha, "bee")
+        compare(alphabetic.get(2).alpha, "cow")
+
+        // Ensure different columns work also
+        compare(alphaSecond.get(0).foo, "bar")
+
+        // Descending
+        compare(alphabeticRe.sort.order, Qt.DescendingOrder)
+        compare(alphabeticRe.get(0).alpha, "cow")
+        compare(alphabeticRe.get(1).alpha, "bee")
+        compare(alphabeticRe.get(2).alpha, "ant")
+
+        // Numbers
+        compare(numeric.get(0).num, 100)
+        compare(numericRe.get(0).num, 300)
+
+        // Changing roles
+        alphabetic.sort.property = "foo"
+        compare(alphabetic.get(0).foo, "bar")
+        compare(alphabetic.get(1).foo, "den")
+        compare(alphabetic.get(2).foo, "pub")
+        // Sanity check
+        compare(alphabetic.get(1).alpha, "cow")
+        // change again
+        alphabetic.sort.property = "num"
+        compare(alphabetic.get(0).num, 100)
+        compare(alphabetic.get(1).num, 200)
+        compare(alphabetic.get(2).num, 300)
+        // Sanity check
+        compare(alphabetic.get(2).alpha, "cow")
+    }
+
+    function test_filter() {
+        // Default is an empty pattern
+        compare(unmodified.filter.pattern, RegExp())
+
+        // Filter
+        compare(bee.count, 1)
+        compare(bee.get(0).alpha, "bee")
+    }
+}
 
=== modified file 'tests/unit/tst_components/tst_toolbaritems.qml'
--- tests/unit/tst_components/tst_toolbaritems.qml	2014-04-23 08:50:20 +0000
+++ tests/unit/tst_components/tst_toolbaritems.qml	2014-05-28 18:09:57 +0000
@@ -23,6 +23,7 @@
     height: 200
 
     MainView {
+        id: mainView
         anchors.fill: parent
         PageStack {
             id: pageStack0
@@ -37,7 +38,8 @@
 
         Page {
             id: page1
-            tools: ToolbarItems {
+            tools: toolbarItems
+            ToolbarItems {
                 id: toolbarItems
                 ToolbarButton {
                     id: button
@@ -94,5 +96,12 @@
             pageStack0.pop();
             compare(pageStack0.depth, 0, "pageStack is empty after popping both pages");
         }
+
+        function test_visible() {
+            compare(toolbarItems.visible, true, "Toolbar items are visible when in toolbar");
+            mainView.useDeprecatedToolbar = false;
+            compare(toolbarItems.visible, false, "Toolbar items are invisible when not using deprecated toolbar");
+            mainView.useDeprecatedToolbar = true;
+        }
     }
 }
 
=== removed directory 'tests/unit/tst_i18n/appropriate/localizedApp'
=== renamed directory 'tests/unit/tst_i18n/appropriate' => 'tests/unit/tst_i18n/localizedApp'
=== added directory 'tests/unit/tst_i18n/localizedApp/.click'
=== added file 'tests/unit/tst_i18n/localizedApp/.click/status'
--- tests/unit/tst_i18n/localizedApp/.click/status	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_i18n/localizedApp/.click/status	2014-05-28 18:09:57 +0000
@@ -0,0 +1,1 @@
+Package: localizedApp
 
=== added directory 'tests/unit/tst_i18n/localizedApp/share'
=== renamed directory 'tests/unit/tst_i18n/appropriate/locale' => 'tests/unit/tst_i18n/localizedApp/share/locale'
=== modified file 'tests/unit/tst_i18n/src/tst_i18n.cpp'
--- tests/unit/tst_i18n/src/tst_i18n.cpp	2013-12-13 15:37:31 +0000
+++ tests/unit/tst_i18n/src/tst_i18n.cpp	2014-05-28 18:09:57 +0000
@@ -76,19 +76,11 @@
     {
         // Set test locale folder in the environment
         // Using setenv because QProcessEnvironment ignores changes
-        QString wrongDataFolder(QCoreApplication::applicationDirPath() + "/diversion");
-        QString testDataFolder(QCoreApplication::applicationDirPath() + "/appropriate");
-        setenv("XDG_DATA_DIRS", (wrongDataFolder + ":" + testDataFolder).toUtf8(), 1);
+        QString testAppDir(QCoreApplication::applicationDirPath() + "/localizedApp");
+        setenv("APP_DIR", testAppDir.toUtf8(), 1);
 
         // Verify that we set it correctly
-        QString dataPath(QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-            "localizedApp", QStandardPaths::LocateDirectory));
-        QDir dataDir(dataPath);
-        QVERIFY(dataDir.cdUp());
-        QVERIFY(dataDir.cd("locale"));
-        QString doubleCheckLocalePath(dataDir.path());
-        QCOMPARE(doubleCheckLocalePath, testDataFolder + "/locale");
-        QVERIFY(QFileInfo(testDataFolder + "/locale/en/LC_MESSAGES/localizedApp.mo").exists());
+        QVERIFY(QFileInfo(testAppDir + "/share/locale/en/LC_MESSAGES/localizedApp.mo").exists());
 
         QString modules("../../../modules");
         QVERIFY(QDir(modules).exists());
@@ -128,12 +120,8 @@
 
         // Was the locale folder detected and set?
         QString boundDomain(C::bindtextdomain(i18n->domain().toUtf8(), ((const char*)0)));
-        QString dataPath(QStandardPaths::locate(QStandardPaths::GenericDataLocation,
-            i18n->domain(), QStandardPaths::LocateDirectory));
-        QDir dataDir(dataPath);
-        QVERIFY(dataDir.cdUp());
-        QVERIFY(dataDir.cd("locale"));
-        QString expectedLocalePath(dataDir.path());
+        QString testAppDir(QCoreApplication::applicationDirPath() + "/localizedApp");
+        QString expectedLocalePath(QDir(testAppDir).filePath("share/locale"));
         QCOMPARE(boundDomain, expectedLocalePath);
         // Is the domain gettext uses correct?
         QString gettextDomain(C::textdomain(((const char*)0)));
 
=== modified file 'tests/unit/tst_i18n/tst_i18n.pro'
--- tests/unit/tst_i18n/tst_i18n.pro	2013-12-13 15:37:31 +0000
+++ tests/unit/tst_i18n/tst_i18n.pro	2014-05-28 18:09:57 +0000
@@ -2,7 +2,7 @@
 QT += gui
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
 
-system(msgfmt po/en_US.po -o appropriate/locale/en/LC_MESSAGES/localizedApp.mo)
+system(msgfmt po/en_US.po -o localizedApp/share/locale/en/LC_MESSAGES/localizedApp.mo)
 
 SOURCES += \
     src\/tst_i18n.cpp
 
=== modified file 'tests/unit_x11/tst_components/tst_datepicker.qml'
--- tests/unit_x11/tst_components/tst_datepicker.qml	2014-05-05 17:45:45 +0000
+++ tests/unit_x11/tst_components/tst_datepicker.qml	2014-05-28 18:09:57 +0000
@@ -59,7 +59,7 @@
         function getPickerLabel(picker, name) {
             var pickerItem = findChild(picker, name);
             var pickerCurrent = findChild(pickerItem, "Picker_ViewLoader");
-            return findChild(pickerCurrent.item.currentItem, "PickerRow_PickerLabel");
+            return pickerCurrent.item.currentItem.children[2];
         }
         function getPickerModel(picker, name) {
             var pickerItem = findInvisibleChild(picker, name);
 
=== added file 'tests/unit_x11/tst_layouts/NestedVisibility.qml'
--- tests/unit_x11/tst_layouts/NestedVisibility.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_layouts/NestedVisibility.qml	2014-05-28 18:09:57 +0000
@@ -0,0 +1,163 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
+
+MainView {
+    id: main
+    objectName: "mainView"
+    applicationName: "test-app"
+
+    /*
+     This property enables the application to change orientation
+     when the device is rotated. The default is false.
+    */
+    automaticOrientation: true // TODO: support wide aspect ratios, esp. on prepareGamePage
+
+    width: units.gu(40)
+    height: units.gu(75)
+
+    function phoneLayout() {
+        width = units.gu(50);
+    }
+    function tabletPortraitLayout() {
+        width = units.gu(70);
+    }
+    function tabletLandscapeLayout() {
+        width = units.gu(100);
+    }
+
+    PageStack {
+        Component.onCompleted: push(testPage)
+
+        Page {
+            title: i18n.tr("Conditional Layouts with PageStack")
+            id: testPage
+            visible: false
+
+            Layouts {
+                id: layouts
+                objectName: "mainLayout"
+                width: parent.width
+                height: parent.height
+                layouts: [
+                    ConditionalLayout {
+                        name: "tabletPortrait"
+                        when: main.width > units.gu(50)
+                        Layouts {
+                            anchors.fill: parent
+                            objectName: "nestedLayout"
+                            layouts: [
+                                ConditionalLayout {
+                                    name: "tabletLandscape"
+                                    when: main.width > units.gu(70)
+                                    Row {
+                                        objectName: "tabletLandscape"
+                                        anchors.fill: parent
+                                        Rectangle {
+                                            height: parent.height
+                                            color: "white"
+                                            width: parent.width / 5
+                                        }
+                                        Flow {
+                                            spacing: units.gu(2)
+                                            ItemLayout {
+                                                objectName: "nestedMagentaContainer"
+                                                item: "mainMagenta"
+                                                width: units.gu(20)
+                                                height: width
+                                            }
+                                            ItemLayout {
+                                                objectName: "nestedGreenContainer"
+                                                item: "mainGreen"
+                                                width: units.gu(60)
+                                                height: width
+                                            }
+                                        }
+                                    }
+                                }
+                            ]
+                            // Default layout, but can have ItemLayouts
+                            // as those will belong to the previous Layouts
+                            // and attaching Layouts.item we can layout it further
+                            Flow {
+                                objectName: "tabletPortrait"
+                                anchors.fill: parent
+                                ItemLayout {
+                                    objectName: "greenContainer"
+                                    item: "mainGreen"
+                                    width: units.gu(40)
+                                    height: width
+                                    Layouts.item: item
+                                }
+                                ItemLayout {
+                                    objectName: "magentaContainer"
+                                    item: "mainMagenta"
+                                    width: units.gu(60)
+                                    height: width
+                                    Layouts.item: item
+                                }
+                            }
+                        }
+                    }
+                ]
+
+                // default layout for mainLayout
+                Flow {
+                    objectName: "mainDefaultLayout"
+                    anchors.fill: parent
+                    Rectangle {
+                        objectName: "mainRed"
+                        width: units.gu(15)
+                        height: width
+                        color: "red"
+                        Layouts.item: "mainRed"
+                    }
+                    Rectangle {
+                        objectName: "mainGreen"
+                        width: units.gu(15)
+                        height: width
+                        color: "green"
+                        Layouts.item: "mainGreen"
+                    }
+                    Rectangle {
+                        objectName: "mainBlue"
+                        width: units.gu(15)
+                        height: width
+                        color: "blue"
+                        Layouts.item: "mainBlue"
+                    }
+                    Rectangle {
+                        objectName: "mainMagenta"
+                        width: units.gu(15)
+                        height: width
+                        color: "magenta"
+                        Layouts.item: "mainMagenta"
+                    }
+                    Rectangle {
+                        objectName: "mainHidden"
+                        width: units.gu(15)
+                        height: width
+                        color: "yellow"
+                        visible: false
+                    }
+                }
+            }
+        }
+    }
+}
 
=== added file 'tests/unit_x11/tst_layouts/Visibility.qml'
--- tests/unit_x11/tst_layouts/Visibility.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_layouts/Visibility.qml	2014-05-28 18:09:57 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
+
+MainView {
+    id: main
+    objectName: "mainView"
+    applicationName: "test-app"
+
+    /*
+     This property enables the application to change orientation
+     when the device is rotated. The default is false.
+    */
+    automaticOrientation: true // TODO: support wide aspect ratios, esp. on prepareGamePage
+
+    property bool boundValue: true
+
+    width: units.gu(100)
+    height: units.gu(75)
+
+    function portraitLayout() {
+        width = units.gu(50);
+    }
+    function landscapeLayout() {
+        width = units.gu(100);
+    }
+
+    PageStack {
+        Component.onCompleted: push(testPage)
+
+        Page {
+            title: i18n.tr("Conditional Layouts with PageStack")
+            id: testPage
+            visible: false
+
+            Layouts {
+                id: layouts
+                objectName: "layoutManager"
+                width: parent.width
+                height: parent.height
+                layouts: [
+                    ConditionalLayout {
+                        name: "wide"
+                        when: layouts.width < units.gu(60)
+                        UbuntuShape {
+                            width: units.gu(20)
+                            height: units.gu(20)
+                            color: "red"
+                            Label { text: "wide" }
+                        }
+                    }
+                ]
+
+                // This is a default layout.
+                // When using a PageStack and layouts is not empty, it won't display or switch to the default layout.
+                // However it only works when putting it into the layouts list with an inversed condition.
+                UbuntuShape {
+                    objectName: "DefaultLayout"
+                    width: units.gu(20)
+                    height: units.gu(20)
+                    color: "green"
+                    visible: main.boundValue
+                    Label { text: "default" }
+                }
+            }
+        }
+    }
+}
 
=== modified file 'tests/unit_x11/tst_layouts/tst_layouts.cpp'
--- tests/unit_x11/tst_layouts/tst_layouts.cpp	2014-03-19 12:48:33 +0000
+++ tests/unit_x11/tst_layouts/tst_layouts.cpp	2014-05-28 18:09:57 +0000
@@ -72,6 +72,25 @@
         return (children.count() > 0) ? children[0] : 0;
     }
 
+    bool hasChildItem(QQuickItem *child, QQuickItem *parent)
+    {
+        QQuickItem *pl = child->parentItem();
+        while (pl) {
+            if (pl == parent) {
+                return true;
+            }
+            pl = pl->parentItem();
+        }
+        return false;
+    }
+
+    QQuickItem *prevSibling(QQuickItem *item)
+    {
+        QList<QQuickItem*> children = item->parentItem()->childItems();
+        int index = children.indexOf(item);
+        return (index > 0) ? children.at(index - 1) : 0;
+    }
+
 
 private Q_SLOTS:
     void initTestCase()
@@ -419,16 +438,16 @@
 
     void testCase_AnchorFilledReparenting()
     {
-        QScopedPointer<QQuickView> view(loadTest("AnchorFilledReparenting.qml"));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorFilledReparenting.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();
         QVERIFY(root);
 
-        QQuickItem *layout = testItem(root, "layoutManager");
+        ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager");
         QVERIFY(layout);
         QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged()));
 
-        QQuickItem *item = testItem(root, "testItem");
+        QQuickItem *item = view->findItem<QQuickItem*>("testItem");
         QVERIFY(item);
 
         QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>();
@@ -436,27 +455,27 @@
 
         root->setWidth(root->width() + 100);
         layoutChangeSpy.wait(100);
-        QQuickItem *testLayout = testItem(root, "testLayout");
+        QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout");
         QVERIFY(testLayout);
         QCOMPARE(anchors->fill(), testLayout);
 
         root->setWidth(root->width() - 100);
         layoutChangeSpy.wait(100);
-        QCOMPARE(anchors->fill(), layout);
+        QCOMPARE(anchors->fill(), layout->contentItem());
     }
 
     void testCase_AnchorFilledMargins()
     {
-        QScopedPointer<QQuickView> view(loadTest("AnchorFilledMargins.qml"));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorFilledMargins.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();
         QVERIFY(root);
 
-        QQuickItem *layout = testItem(root, "layoutManager");
+        ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager");
         QVERIFY(layout);
         QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged()));
 
-        QQuickItem *item = testItem(root, "testItem");
+        QQuickItem *item = view->findItem<QQuickItem*>("testItem");
         QVERIFY(item);
 
         QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>();
@@ -465,29 +484,29 @@
         root->setWidth(root->width() + 100);
         layoutChangeSpy.wait(100);
 
-        QQuickItem *testLayout = testItem(root, "testLayout");
+        QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout");
         QVERIFY(testLayout);
         QCOMPARE(anchors->fill(), testLayout);
         QCOMPARE(anchors->margins(), 0.0);
 
         root->setWidth(root->width() - 100);
         layoutChangeSpy.wait(100);
-        QCOMPARE(anchors->fill(), layout);
+        QCOMPARE(anchors->fill(), layout->contentItem());
         QCOMPARE(anchors->margins(), 10.0);
     }
 
     void testCase_AnchorFilledSeparateMargins()
     {
-        QScopedPointer<QQuickView> view(loadTest("AnchorFilledSeparateMargins.qml"));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorFilledSeparateMargins.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();
         QVERIFY(root);
 
-        QQuickItem *layout = testItem(root, "layoutManager");
+        ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager");
         QVERIFY(layout);
         QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged()));
 
-        QQuickItem *item = testItem(root, "testItem");
+        QQuickItem *item = view->findItem<QQuickItem*>("testItem");
         QVERIFY(item);
 
         QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>();
@@ -496,7 +515,7 @@
         root->setWidth(root->width() + 100);
         layoutChangeSpy.wait(100);
 
-        QQuickItem *testLayout = testItem(root, "testLayout");
+        QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout");
         QVERIFY(testLayout);
         QCOMPARE(anchors->fill(), testLayout);
         QCOMPARE(anchors->margins(), 0.0);
@@ -507,7 +526,7 @@
 
         root->setWidth(root->width() - 100);
         layoutChangeSpy.wait(100);
-        QCOMPARE(anchors->fill(), layout);
+        QCOMPARE(anchors->fill(), layout->contentItem());
         QCOMPARE(anchors->leftMargin(), 10.0);
         QCOMPARE(anchors->topMargin(), 20.0);
         QCOMPARE(anchors->rightMargin(), 30.0);
@@ -516,16 +535,16 @@
 
     void testCase_AnchorCenteredInDefault()
     {
-        QScopedPointer<QQuickView> view(loadTest("AnchorCenteredInDefault.qml"));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorCenteredInDefault.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();
         QVERIFY(root);
 
-        QQuickItem *layout = testItem(root, "layoutManager");
+        ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager");
         QVERIFY(layout);
         QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged()));
 
-        QQuickItem *item = testItem(root, "testItem");
+        QQuickItem *item = view->findItem<QQuickItem*>("testItem");
         QVERIFY(item);
 
         QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>();
@@ -533,335 +552,335 @@
 
         root->setWidth(root->width() + 100);
         layoutChangeSpy.wait(100);
-        QQuickItem *testLayout = testItem(root, "testLayout");
+        QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout");
         QVERIFY(testLayout);
         QCOMPARE(anchors->fill(), testLayout);
 
         root->setWidth(root->width() - 100);
         layoutChangeSpy.wait(100);
-        QCOMPARE(anchors->centerIn(), layout);
+        QCOMPARE(anchors->centerIn(), layout->contentItem());
     }
 
     void testCase_AnchorVerticalCenter()
     {
-        QScopedPointer<QQuickView> view(loadTest("AnchorVerticalCenter.qml"));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorVerticalCenter.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();
         QVERIFY(root);
 
-        QQuickItem *layout = testItem(root, "layoutManager");
+        ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager");
         QVERIFY(layout);
         QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged()));
 
-        QQuickItem *item = testItem(root, "testItem");
+        QQuickItem *item = view->findItem<QQuickItem*>("testItem");
         QVERIFY(item);
 
         QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>();
         QVERIFY(anchors);
 
-        QCOMPARE(anchors->verticalCenter().item, layout);
+        QCOMPARE(anchors->verticalCenter().item, layout->contentItem());
 
         root->setWidth(root->width() + 100);
         layoutChangeSpy.wait(100);
-        QQuickItem *testLayout = testItem(root, "testLayout");
+        QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout");
         QVERIFY(testLayout);
         QCOMPARE(anchors->fill(), testLayout);
 
         root->setWidth(root->width() - 100);
         layoutChangeSpy.wait(100);
-        QCOMPARE(anchors->verticalCenter().item, layout);
+        QCOMPARE(anchors->verticalCenter().item, layout->contentItem());
     }
 
     void testCase_AnchorVerticalCenterOffset()
     {
-        QScopedPointer<QQuickView> view(loadTest("AnchorVerticalCenterOffset.qml"));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorVerticalCenterOffset.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();
         QVERIFY(root);
 
-        QQuickItem *layout = testItem(root, "layoutManager");
+        ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager");
         QVERIFY(layout);
         QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged()));
 
-        QQuickItem *item = testItem(root, "testItem");
+        QQuickItem *item = view->findItem<QQuickItem*>("testItem");
         QVERIFY(item);
 
         QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>();
         QVERIFY(anchors);
 
-        QCOMPARE(anchors->verticalCenter().item, layout);
+        QCOMPARE(anchors->verticalCenter().item, layout->contentItem());
         QCOMPARE(anchors->verticalCenterOffset(), 50.0);
 
         root->setWidth(root->width() + 100);
         layoutChangeSpy.wait(100);
-        QQuickItem *testLayout = qobject_cast<QQuickItem*>(testItem(root, "testLayout"));
+        QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout");
         QVERIFY(testLayout);
         QCOMPARE(anchors->fill(), testLayout);
         // no need to check offset as it does not affect the fill
 
         root->setWidth(root->width() - 100);
         layoutChangeSpy.wait(100);
-        QCOMPARE(anchors->verticalCenter().item, layout);
+        QCOMPARE(anchors->verticalCenter().item, layout->contentItem());
         QCOMPARE(anchors->verticalCenterOffset(), 50.0);
     }
 
     void testCase_AnchorHorizontalCenter()
     {
-        QScopedPointer<QQuickView> view(loadTest("AnchorHorizontalCenter.qml"));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorHorizontalCenter.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();
         QVERIFY(root);
 
-        QQuickItem *layout = testItem(root, "layoutManager");
+        ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager");
         QVERIFY(layout);
         QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged()));
 
-        QQuickItem *item = testItem(root, "testItem");
+        QQuickItem *item = view->findItem<QQuickItem*>("testItem");
         QVERIFY(item);
 
         QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>();
         QVERIFY(anchors);
 
-        QCOMPARE(anchors->horizontalCenter().item, layout);
+        QCOMPARE(anchors->horizontalCenter().item, layout->contentItem());
 
         root->setWidth(root->width() + 100);
         layoutChangeSpy.wait(100);
-        QQuickItem *testLayout = testItem(root, "testLayout");
+        QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout");
         QVERIFY(testLayout);
         QCOMPARE(anchors->fill(), testLayout);
 
         root->setWidth(root->width() - 100);
         layoutChangeSpy.wait(100);
-        QCOMPARE(anchors->horizontalCenter().item, layout);
+        QCOMPARE(anchors->horizontalCenter().item, layout->contentItem());
     }
 
     void testCase_AnchorHorizontalCenterOffset()
     {
-        QScopedPointer<QQuickView> view(loadTest("AnchorHorizontalCenterOffset.qml"));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorHorizontalCenterOffset.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();
         QVERIFY(root);
 
-        QQuickItem *layout = testItem(root, "layoutManager");
+        ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager");
         QVERIFY(layout);
         QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged()));
 
-        QQuickItem *item = testItem(root, "testItem");
+        QQuickItem *item = view->findItem<QQuickItem*>("testItem");
         QVERIFY(item);
 
         QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>();
         QVERIFY(anchors);
 
-        QCOMPARE(anchors->horizontalCenter().item, layout);
+        QCOMPARE(anchors->horizontalCenter().item, layout->contentItem());
         QCOMPARE(anchors->horizontalCenterOffset(), 50.0);
 
         root->setWidth(root->width() + 100);
         layoutChangeSpy.wait(100);
-        QQuickItem *testLayout = testItem(root, "testLayout");
+        QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout");
         QVERIFY(testLayout);
         QCOMPARE(anchors->fill(), testLayout);
         // no need to check offset as it does not affect the fill
 
         root->setWidth(root->width() - 100);
         layoutChangeSpy.wait(100);
-        QCOMPARE(anchors->horizontalCenter().item, layout);
+        QCOMPARE(anchors->horizontalCenter().item, layout->contentItem());
         QCOMPARE(anchors->horizontalCenterOffset(), 50.0);
     }
 
     void testCase_AnchorCenterWithOffset()
     {
-        QScopedPointer<QQuickView> view(loadTest("AnchorCenterWithOffset.qml"));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorCenterWithOffset.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();
         QVERIFY(root);
 
-        QQuickItem *layout = testItem(root, "layoutManager");
+        ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager");
         QVERIFY(layout);
         QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged()));
 
-        QQuickItem *item = testItem(root, "testItem");
+        QQuickItem *item = view->findItem<QQuickItem*>("testItem");
         QVERIFY(item);
 
         QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>();
         QVERIFY(anchors);
 
-        QCOMPARE(anchors->centerIn(), layout);
+        QCOMPARE(anchors->centerIn(), layout->contentItem());
         QCOMPARE(anchors->verticalCenterOffset(), 50.0);
         QCOMPARE(anchors->horizontalCenterOffset(), 40.0);
 
         root->setWidth(root->width() + 100);
         layoutChangeSpy.wait(100);
-        QQuickItem *testLayout = testItem(root, "testLayout");
+        QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout");
         QVERIFY(testLayout);
         QCOMPARE(anchors->fill(), testLayout);
         // no need to check offsets as it does not affect the fill
 
         root->setWidth(root->width() - 100);
         layoutChangeSpy.wait(100);
-        QCOMPARE(anchors->centerIn(), layout);
+        QCOMPARE(anchors->centerIn(), layout->contentItem());
         QCOMPARE(anchors->verticalCenterOffset(), 50.0);
         QCOMPARE(anchors->horizontalCenterOffset(), 40.0);
     }
 
     void testCase_AnchorLeft()
     {
-        QScopedPointer<QQuickView> view(loadTest("AnchorLeft.qml"));
+        QScopedPointer<UbuntuTestCase> view(new UbuntuTestCase("AnchorLeft.qml"));
         QVERIFY(view);
         QQuickItem *root = view->rootObject();
         QVERIFY(root);
 
-        QQuickItem *layout = testItem(root, "layoutManager");
+        ULLayouts *layout = view->findItem<ULLayouts*>("layoutManager");
         QVERIFY(layout);
         QSignalSpy layoutChangeSpy(layout, SIGNAL(currentLayoutChanged()));
 
-        QQuickItem *item = testItem(root, "testItem");
+        QQuickItem *item = view->findItem<QQuickItem*>("testItem");
         QVERIFY(item);
 
         QQuickAnchors *anchors = item->property("anchors").value<QQuickAnchors*>();
         QVERIFY(anchors);
 
-        QCOMPARE(anchors->left().item, layout);
+        QCOMPARE(anchors->left().item, layout->contentItem());
         QCOMPARE(anchors->leftMargin(), 10.0);
 
         root->setWidth(root->width() + 100);
         layoutChangeSpy.wait(100);
-        QQuickItem *testLayout = testItem(root, "testLayout");
+        QQuickItem *testLayout = view->findItem<QQuickItem*>("testLayout");
         QVERIFY(testLayout);
         QCOMPARE(anchors->fill(), testLayout);