Merge into trunk : optIn-newHeader : Code : Ubuntu UI Toolkit

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2014-03-26
Zsombor Egri		2014-02-27	Approve on 2014-03-10
Review via email: mp+208662@code.launchpad.net

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-02-27:

#

Check out https://code.launchpad.net/~tpeeters/+junk/vscale to see an example of how the Panel can be used.

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-02-27

924. By Tim Peeters on 2014-02-27: update components.api

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

#

FAILED: Continuous integration, rev:923
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1803/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3566/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3177/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/751/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/751/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3570/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3179/console

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-02-27

925. By Tim Peeters on 2014-02-27: rename useOldToolbar to useDeprecatedToolbar
926. By Tim Peeters on 2014-02-27: only load toolbar when it is used
927. By Tim Peeters on 2014-02-27: update components.api
928. By Tim Peeters on 2014-02-27: toolbar always visible when loaded

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-27:

#

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-02-28

929. By Tim Peeters on 2014-02-28: remove initialization test that was only correct by luck/good timing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-28:

#

FAILED: Continuous integration, rev:929
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1808/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3586
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3199/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/756
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/756
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/756/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3590
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3590/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3201
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3201/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5583/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4380

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-02-28

930. By Tim Peeters on 2014-02-28: empty

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-28:

#

FAILED: Continuous integration, rev:930
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1813/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3606
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3217/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/761
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/761
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/761/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3610
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3610/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3219
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3219/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5598/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4402

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-04

931. By Tim Peeters on 2014-03-04: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-04:

#

FAILED: Continuous integration, rev:931
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1825/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3643
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3248/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/773
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/773/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3647
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3647/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3250
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3250/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5626/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4444

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-04

932. By Tim Peeters on 2014-03-04: huh? Why did jenkisn fail?

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-04:

#

FAILED: Continuous integration, rev:932
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1828/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3653
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3258/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/776
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/776
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/776/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3657
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3657/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3260
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3260/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5634/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4454

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-04

933. By Tim Peeters on 2014-03-04: stop Loader from eating events

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-04:

#

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-06

934. By Tim Peeters on 2014-03-06: fix typo in Toolbar.qml comment
935. By Tim Peeters on 2014-03-06: fix parentage of toolbar
936. By Tim Peeters on 2014-03-06: merge trunk
937. By Tim Peeters on 2014-03-06: fix typo properly

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

#

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

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-06:

#

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

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-06:

#

Some failures in CI@home for unity8 and system settings: http://paste.ubuntu.com/7044989/
There is a bug in unity8 with qt5 that can cause these. Should be fixed with qt5.2.

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-09

938. By Tim Peeters on 2014-03-09: link bug
939. By Tim Peeters on 2014-03-09: merge trunk (translations only)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-09:

#

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

review: Approve (continuous-integration)

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-03-10:

#

Things look good.

review: Approve

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-14

940. By Tim Peeters on 2014-03-14: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-14:

#

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-17

941. By Tim Peeters on 2014-03-17: merge trunk

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-17

942. By Tim Peeters on 2014-03-17: merge trunk
943. By Tim Peeters on 2014-03-17: merge ima-bug1288876. See if jenkins CI passes now.

Revision history for this message

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

#

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

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-17:

#

CI@home results:
- Several failures in music-app
- Several failures in ubuntu-clock-app
- Several failures in dialer-app: StateNotFoundError: Object not found with name '*' and properties {'objectName': 'historyList'}. (phone didn't have sim-card while testing)
- One error in unity8: unity8.indicators.tests.test_indicators.IndicatorTestCase.test_indicator_exists(Bluetooth) (phone has bluetooth disabled)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-17:

#

CI@home full results: http://paste.ubuntu.com/7111217/

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-18

944. By Tim Peeters on 2014-03-18: revert ima-bug1288876 merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

#

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-18

945. By Tim Peeters on 2014-03-18: retry

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-18:

#

previous CI failed because device screen unlock failed because the device was not 'clean' (left-over installed packages from another MR were there).

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

#

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

review: Needs Fixing (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-18

946. By Tim Peeters on 2014-03-18: CI jobs fixed. retry

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-18:

#

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

review: Approve (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-24

947. By Tim Peeters on 2014-03-24: merge trunk
948. By Tim Peeters on 2014-03-24: re-adding InverseMouseAreaInListView.qml which got lost in the previous trunk merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-24:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-24:

#

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

review: Approve (continuous-integration)

lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader updated on 2014-03-26

949. By Tim Peeters on 2014-03-26: merge translations from trunk

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-26:

#

I don't know why the diff lists
237 === removed file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml'
238 --- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 2014-03-20 15:30:06 +0000
239 +++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 1970-01-01 00:00:00 +0000

and

168 === added file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml'
169 --- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 1970-01-01 00:00:00 +0000
170 +++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml 2014-03-26 17:43:24 +0000

The supposedly removed and added files are identical. There was a conflict with that file when merging trunk but it seemed resolved.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-26:

#

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

review: Approve (continuous-integration)

Revision history for this message

Tim Peeters (tpeeters) wrote on 2014-03-31:

#

ran clock-app tests 3 time without failures: http://paste.ubuntu.com/7184819/

Ubuntu UI Toolkit

Merge lp:~tpeeters/ubuntu-ui-toolkit/optIn-newHeader into lp:ubuntu-ui-toolkit

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'components.api'
 --- components.api	2014-03-06 10:48:23 +0000
 +++ components.api	2014-03-26 17:43:24 +0000
@@ -191,6 +191,7 @@
      property color backgroundColor
      property color footerColor
      property bool automaticOrientation
++    property bool useDeprecatedToolbar
      default property internal contentsItem
      property list<Action> actions
      property UnityActions.ActionManager actionManager
 === modified file 'modules/Ubuntu/Components/MainView.qml'
 --- modules/Ubuntu/Components/MainView.qml	2014-02-12 17:38:57 +0000
 +++ modules/Ubuntu/Components/MainView.qml	2014-03-26 17:43:24 +0000
@@ -221,6 +221,16 @@
      property alias automaticOrientation: canvas.automaticOrientation
      /*!
++      Setting this option will enable the old toolbar, and disable the new features
++      that are being added to the new header. Unsetting it removes the toolbar and
++      enables developers to have a sneak peek at the new features that are coming to
++      the header, even before all the required functionality is implemented.
++      This property will be deprecated after the new header implementation is done and
++      all apps transitioned to using it. Default value: true.
++     */
++    property bool useDeprecatedToolbar: true
++
++    /*!
        \internal
        Use default property to ensure children added do not draw over the toolbar.
       */
@@ -266,7 +276,9 @@
                      fill: parent
                      // move the whole contents up if the toolbar is locked and opened otherwise the toolbar will obscure part of the contents
--                    bottomMargin: toolbarItem.locked && toolbarItem.opened ? toolbarItem.height + toolbarItem.triggerSize : 0
++                    bottomMargin: mainView.useDeprecatedToolbar &&
++                                  toolbarLoader.item.locked && toolbarLoader.item.opened ?
++                                      toolbarLoader.item.height + toolbarLoader.item.triggerSize : 0
                      // compensate so that the actual y is always 0
                      topMargin: -parent.y
+                 }
@@ -282,9 +294,11 @@
                  onPressed: {
                      mouse.accepted = false;
--                    if (!toolbarItem.locked) {
--                        toolbarItem.close();
++                    if (mainView.useDeprecatedToolbar) {
++                        if (!toolbarLoader.item.locked) {
++                            toolbarLoader.item.close();
+                         }
++                    }
                      if (headerItem.tabBar && !headerItem.tabBar.alwaysSelectionMode) {
                          headerItem.tabBar.selectionMode = false;
+                     }
@@ -298,15 +312,23 @@
           */
          property bool animate: true
--        Toolbar {
--            id: toolbarItem
--            onPressedChanged: {
--                if (!pressed) return;
--                if (headerItem.tabBar !== null) {
--                    headerItem.tabBar.selectionMode = false;
++        Component {
++            id: toolbarComponent
++            Toolbar {
++                parent: canvas
++                onPressedChanged: {
++                    if (!pressed) return;
++                    if (headerItem.tabBar !== null) {
++                        headerItem.tabBar.selectionMode = false;
++                    }
+                 }
++                animate: canvas.animate
+             }
--            animate: canvas.animate
++        }
++
++        Loader {
++            id: toolbarLoader
++            sourceComponent: mainView.useDeprecatedToolbar ? toolbarComponent : null
+         }
          /*!
@@ -338,8 +360,10 @@
                  // no connections are made when target is null
                  target: headerItem.tabBar
                  onPressedChanged: {
--                    if (headerItem.tabBar.pressed) {
--                        if (!toolbarItem.locked) toolbarItem.close();
++                    if (mainView.useDeprecatedToolbar) {
++                        if (headerItem.tabBar.pressed) {
++                            if (!toolbarLoader.item.locked) toolbarLoader.item.close();
++                        }
+                     }
+                 }
+             }
@@ -354,7 +378,9 @@
                      if (headerItem.tabBar) {
                          headerItem.tabBar.selectionMode = true;
+                     }
--                    if (!toolbarItem.locked) toolbarItem.open();
++                    if (mainView.useDeprecatedToolbar) {
++                        if (!toolbarLoader.item.locked) toolbarLoader.item.open();
++                    }
                      canvas.animate = true;
+                 }
+             }
@@ -386,8 +412,8 @@
          UnityActions.ActionManager {
              id: unityActionManager
              onQuit: {
--               // FIXME Wire this up to the application lifecycle management API instead of quit().
--               Qt.quit()
++                // FIXME Wire this up to the application lifecycle management API instead of quit().
++                Qt.quit()
+             }
+         }
+     }
@@ -405,7 +431,7 @@
            The toolbar that will be propagated to the children in the page tree node.
            It will be used by the active \l Page to set the toolbar actions.
           */
--        property Toolbar toolbar: toolbarItem
++        property Toolbar toolbar: toolbarLoader.item
          /*!
            \internal
 === modified file 'modules/Ubuntu/Components/Toolbar.qml'
 --- modules/Ubuntu/Components/Toolbar.qml	2014-01-08 16:32:38 +0000
 +++ modules/Ubuntu/Components/Toolbar.qml	2014-03-26 17:43:24 +0000
@@ -36,7 +36,7 @@
      LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
      LayoutMirroring.childrenInherit: true
--    // Closing of the toolbar on app contents ineraction is handled by the Page.
++    // Closing of the toolbar on app contents interaction is handled by the Page.
      __closeOnContentsClicks: false
      /*!
 === modified file 'tests/unit/tst_components/tst_toolbaritems.qml'
 --- tests/unit/tst_components/tst_toolbaritems.qml	2013-09-09 20:34:51 +0000
 +++ tests/unit/tst_components/tst_toolbaritems.qml	2014-03-26 17:43:24 +0000
@@ -52,7 +52,6 @@
          function initTestCase() {
              compare(toolbarItems.pageStack, null, "pageStack initially null");
--            compare(toolbarItems.opened, false, "toolbar items closed by default");
              compare(toolbarItems.locked, false, "toolbar items unlocked with children");
              compare(emptyToolbarItems.locked, true, "toolbar items unlocked without visible children");
              compare(toolbarItems.back === undefined, false, "back item set by default");
@@ -61,7 +60,7 @@
+         }
          function test_opened() {
--            compare(toolbarItems.opened, true, "Toolbar items initially opened");
++            compare(toolbarItems.opened, true, "Toolbar items opened when page is first loaded");
              toolbarItems.opened = false;
              compare(toolbarItems.opened, false, "Toolbar items can be closed");
              toolbarItems.opened = true;
 === added file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml'
 --- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml	2014-03-26 17:43:24 +0000
@@ -0,0 +1,64 @@
++/*
++ * 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 0.1
++import Ubuntu.Components.ListItems 0.1
++
++MainView {
++    id: root
++    width: units.gu(40)
++    height: units.gu(71)
++
++    property InverseMouseArea ima: null
++
++    Component {
++        id: editor
++        TextArea {
++        }
++    }
++
++    Page {
++        title: "Test"
++
++        ListView {
++            id: list
++            objectName: "ListView"
++            anchors.fill: parent
++            model: 1
++
++            delegate: Empty {
++                objectName: "Card"
++                width: parent.width - units.gu(5)
++                anchors.horizontalCenter: parent.horizontalCenter
++                height: units.gu(50)
++
++                Loader {
++                    anchors.fill: parent
++                    sourceComponent: editor
++                }
++
++                InverseMouseArea {
++                    id: imaItem
++                    objectName: "Test_IMA"
++                    anchors.fill: parent
++                    topmostItem: true
++                    Component.onCompleted: root.ima = imaItem
++                }
++            }
++        }
++    }
++}
 === removed file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml'
 --- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml	2014-03-20 15:30:06 +0000
 +++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
--/*
-- * Copyright 2014 Canonical Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import Ubuntu.Components.ListItems 0.1
--
--MainView {
--    id: root
--    width: units.gu(40)
--    height: units.gu(71)
--
--    property InverseMouseArea ima: null
--
--    Component {
--        id: editor
--        TextArea {
--        }
--    }
--
--    Page {
--        title: "Test"
--
--        ListView {
--            id: list
--            objectName: "ListView"
--            anchors.fill: parent
--            model: 1
--
--            delegate: Empty {
--                objectName: "Card"
--                width: parent.width - units.gu(5)
--                anchors.horizontalCenter: parent.horizontalCenter
--                height: units.gu(50)
--
--                Loader {
--                    anchors.fill: parent
--                    sourceComponent: editor
--                }
--
--                InverseMouseArea {
--                    id: imaItem
--                    objectName: "Test_IMA"
--                    anchors.fill: parent
--                    topmostItem: true
--                    Component.onCompleted: root.ima = imaItem
--                }
--            }
--        }
--    }
--}