Merge lp:~zsombi/ubuntu-ui-toolkit/inverseMouseArea-update into lp:ubuntu-ui-toolkit

[Zsombor Egri]

Reverting InverseMouseAreaType updateArea() method to update(). Call super class update() method shadowed by the override.

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-04 07:26:07 +0000
+++ debian/changelog	2014-06-18 15:28:52 +0000
@@ -1,3 +1,48 @@
+ubuntu-ui-toolkit (0.1.46+14.10.20140602-0ubuntu2) UNRELEASED; urgency=medium
+
+  [Leo Arias ]
+  * On the autopilot helper for the header, fix the swipe to show 
+    when hidden.
+  * Added a fixture for autopilot tests to use a fake home directory.
+    Fixes: https://bugs.launchpad.net/bugs/1317639
+  * Cleaned the containers in unity test using the alternate 
+    launcher.
+  * Fixed the creation of the fake Xauthority file on mako for the 
+    fixture tests. Fixes: https://bugs.launchpad.net/bugs/1326072
+  * Fixed the swipe to delete on the list item autopilot helper.
+    Fixes: https://bugs.launchpad.net/bugs/1311392.
+  * clean ups to the autopilot tests for the widget gallery.
+
+  [ Christian Dywan ]   
+  * Add a launcher with a switch for the QQMLEngine.
+  * The presence of a mouse enables the interactive thumb. 
+    Fixes: https://bugs.launchpad.net/bugs/1165173
+  * Initialize sort.order explicitly. 
+    Fixes: https://bugs.launchpad.net/bugs/1324087
+  * Swiping from Left to Right to Delete only.
+  * Show explicit failure when test wasn't built yet.
+  * Add push_to_phone script to push QML/ Python/ artwork.
+
+
+  [ Tim Peeters ]
+  * Anchor the internal PageTreeNode of PageStack to fill its parent. 
+    Fixes: https://bugs.launchpad.net/bugs/1322527
+  * Deprecate sheets. Fixes: https://bugs.launchpad.net/bugs/1304541
+  * Fix bug where header overflow action popover does not close when 
+    the associated action pushes a new page on the pagestack. 
+    Fixes: https://bugs.launchpad.net/bugs/1326963.
+
+  [ Zsombor Egri]
+  * Adding touch functions to UbuntuTestCase.
+  * Qt5.3 related fixes. Fixes: 
+    https://bugs.launchpad.net/bugs/1324070, 
+    https://bugs.launchpad.net/bugs/1324088, 
+    https://bugs.launchpad.net/bugs/1324089.
+
+
+
+ -- Zoltán Balogh <[e-mail]>  Wed, 04 Jun 2014 09:40:11 +0200
+
 ubuntu-ui-toolkit (0.1.46+14.10.20140602-0ubuntu1) utopic; urgency=low
 
   [ Christian Dywan ]   

=== modified file 'debian/ubuntu-ui-toolkit-autopilot.install'
--- debian/ubuntu-ui-toolkit-autopilot.install	2014-02-21 23:39:43 +0000
+++ debian/ubuntu-ui-toolkit-autopilot.install	2014-06-18 15:28:52 +0000
@@ -1,2 +1,3 @@
 usr/lib/python3
+usr/lib/ubuntu-ui-toolkit/launcher
 usr/lib/python2.7

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Template.qml'
--- examples/ubuntu-ui-toolkit-gallery/Template.qml	2014-04-23 09:39:11 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Template.qml	2014-06-18 15:28:52 +0000
@@ -30,6 +30,7 @@
 
     Flickable {
         id: flickable
+        objectName: "TemplateFlickable"
         anchors.fill: parent
         anchors.topMargin: units.gu(2)
         anchors.bottomMargin: units.gu(2)
@@ -46,6 +47,9 @@
     }
 
     Scrollbar {
+        id: sb
+        objectName: "TemplateScrollbar"
         flickableItem: flickable
+        property alias interactive: sb.__interactive
     }
 }

=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2014-05-12 16:40:44 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2014-06-18 15:28:52 +0000
@@ -105,7 +105,7 @@
     /*!
       \preliminary
       \qmlproperty string swipingState
-      The current swiping state ("SwipingLeft", "SwipingRight", "")
+      The current swiping state ("SwipingRight" or "")
      */
     readonly property alias swipingState: backgroundIndicator.state
 
@@ -228,7 +228,7 @@
             __mouseArea.drag.target = body
             held = true
             __mouseArea.drag.maximumX = parent.width
-            __mouseArea.drag.minimumX = (parent.width * -1)
+            __mouseArea.drag.minimumX = 0
             backgroundIndicator.visible = true
         }
 
@@ -334,10 +334,8 @@
             onXChanged: {
                 if (x > 0) {
                     backgroundIndicator.state = "SwipingRight"
-                } else if (x === 0) {
+                } else {
                     backgroundIndicator.state = ""
-                } else {
-                    backgroundIndicator.state = "SwipingLeft"
                 }
             }
         }
@@ -427,24 +425,6 @@
                         target: confirmRemovalDialog
                         x: body.x - confirmRemovalDialog.width - units.gu(2)
                     }
-                },
-                State {
-                    name: "SwipingLeft"
-                    AnchorChanges {
-                        target: backgroundIndicator
-                        anchors.left: body.right
-                        anchors.right: parent.right
-                    }
-
-                    PropertyChanges {
-                        target: backgroundIndicator
-                        opacity: 1.0
-                    }
-
-                    PropertyChanges {
-                        target: confirmRemovalDialog
-                        x: units.gu(2)
-                    }
                 }
             ]
         }

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2014-04-23 09:39:11 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2014-06-18 15:28:52 +0000
@@ -121,7 +121,7 @@
           http://qt-project.org/doc/qt-5.0/qtgui/qwindow.html#contentOrientation-prop
          */
         function applyOrientation() {
-            if (windowActive)
+            if (windowActive && window)
                 window.contentOrientation = Screen.orientation
         }
 

=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-06-18 15:28:52 +0000
@@ -20,6 +20,7 @@
     \qmltype ComposerSheet
     \inherits SheetBase
     \inqmlmodule Ubuntu.Components.Popups 1.0
+    \deprecated
     \ingroup ubuntu-popups
     \brief Much like the \l DefaultSheet the Composer Sheet allows an application to insert a content
         view over the focused view without disrupting the navigation pattern. However the Composer Sheet
@@ -56,6 +57,8 @@
             }
         }
     \endqml
+
+    \b{Sheets are deprecated. Consider using \l Dialog, \l Popover or \l PageStack instead.}
 */
 
 SheetBase {

=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-06-18 15:28:52 +0000
@@ -19,6 +19,7 @@
 
 /*!
     \qmltype DefaultSheet
+    \deprecated
     \inherits SheetBase
     \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
@@ -58,6 +59,9 @@
             }
         }
     \endqml
+
+    \b{Sheets are deprecated. Consider using \l Dialog, \l Popover or \l PageStack instead.}
+
 */
 SheetBase {
     id: sheet

=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
--- modules/Ubuntu/Components/Popups/SheetBase.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Popups/SheetBase.qml	2014-06-18 15:28:52 +0000
@@ -19,16 +19,22 @@
 
 /*!
     \qmltype SheetBase
+    \deprecated
     \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief Parent class of different types of sheets. Not to be used directly.
 
     Examples: See subclasses.
-    \b{This component is under heavy development.}
+    \b{Sheets are deprecated. Consider using \l Dialog, \l Popover or \l PageStack instead.}
 */
 PopupBase {
     id: sheet
 
+    Component.onCompleted: {
+        print("WARNING: Sheets are deprecated. " +
+              "Consider using Dialog, Popover or PageStack instead.")
+    }
+
     /*!
       \preliminary
       \qmlproperty list<Object> container

=== modified file 'modules/Ubuntu/Components/Scrollbar.qml'
--- modules/Ubuntu/Components/Scrollbar.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Scrollbar.qml	2014-06-18 15:28:52 +0000
@@ -87,7 +87,7 @@
       This property holds whether the scrollbar is active or passive. It is present
       for testing purposes.
     */
-    property bool __interactive: false
+    property bool __interactive: __styleInstance !== null && __styleInstance.interactive
 
     implicitWidth: internals.vertical ? units.gu(4) : flickableItem.width
     implicitHeight: !internals.vertical ? units.gu(4) : flickableItem.height

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml	2014-05-14 13:21:10 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml	2014-06-18 15:28:52 +0000
@@ -259,9 +259,21 @@
 
             Popover {
                 id: actionsOverflowPopover
-                objectName: "actionsOverflowPopover"
+                objectName: "actions_overflow_popover"
                 parent: QuickUtils.rootItem(actionsOverflowPopover)
                 caller: actionsOverflowButton
+
+                Connections {
+                    target: styledItem
+                    onActionsChanged: {
+                        // Ensure the popover closes when actions change and
+                        // the list item below may be destroyed before its
+                        // onClicked is executed. See bug
+                        // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1326963
+                        actionsOverflowPopover.hide();
+                    }
+                }
+
                 Column {
                     anchors {
                         left: parent.left

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2014-06-18 15:28:52 +0000
@@ -59,7 +59,7 @@
     property bool interactive: false
     property real minimumSliderSize: units.gu(2)
 
-    property bool overlay: true
+    property bool overlay: !interactive
     property real overlayOpacityWhenShown: 0.6
     property real overlayOpacityWhenHidden: 0.0
 
@@ -222,6 +222,9 @@
         onReleased: mouse.accepted = false
     }
 
+    // The presence of a mouse enables the interactive thumb
+    // FIXME: Should use form factor hints
+    InverseMouse.onEntered: interactive = true
 
     // The slider's position represents which part of the flickable is visible.
     // The slider's size represents the size the visible part relative to the
@@ -401,6 +404,7 @@
 
     Item {
         id: thumb
+        objectName: "interactiveScrollbarThumb"
 
         enabled: interactive
 

=== modified file 'modules/Ubuntu/Components/plugin/filterbehavior.cpp'
--- modules/Ubuntu/Components/plugin/filterbehavior.cpp	2014-05-15 09:35:22 +0000
+++ modules/Ubuntu/Components/plugin/filterbehavior.cpp	2014-06-18 15:28:52 +0000
@@ -19,6 +19,14 @@
 
 #include "filterbehavior.h"
 
+FilterBehavior::FilterBehavior(QObject *parent)
+    : QObject(parent)
+    , m_property(QString())
+    , m_pattern(QRegExp())
+{
+
+}
+
 QString
 FilterBehavior::property() const
 {

=== modified file 'modules/Ubuntu/Components/plugin/filterbehavior.h'
--- modules/Ubuntu/Components/plugin/filterbehavior.h	2014-05-15 09:35:22 +0000
+++ modules/Ubuntu/Components/plugin/filterbehavior.h	2014-06-18 15:28:52 +0000
@@ -29,6 +29,8 @@
     Q_PROPERTY(QRegExp pattern READ pattern WRITE setPattern NOTIFY patternChanged)
 
 public:
+    explicit FilterBehavior(QObject *parent = 0);
+
     QString property() const;
     void setProperty(const QString& property);
     QRegExp pattern() const;

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.cpp'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-04-25 12:53:58 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.cpp	2014-06-18 15:28:52 +0000
@@ -244,11 +244,6 @@
      */
     QObject::connect(this, &QQuickMouseArea::windowChanged,
                      this, &InverseMouseAreaType::resetFilterOnWindowUpdate);
-
-    if (!m_sensingArea) {
-        // get sensing area upon parent change
-        QObject::connect(this, SIGNAL(parentChanged(QQuickItem*)), this, SLOT(update()));
-    }
 }
 
 InverseMouseAreaType::~InverseMouseAreaType()
@@ -291,6 +286,7 @@
         m_sensingArea = QuickUtils::instance().rootItem(this);
     }
     updateEventFilter(isEnabled() && isVisible() && m_topmostItem);
+    QQuickMouseArea::update();
 }
 /*!
   \internal
@@ -302,6 +298,14 @@
     updateEventFilter(m_topmostItem);
 }
 
+void InverseMouseAreaType::itemChange(ItemChange change, const ItemChangeData &data)
+{
+    if (change == ItemParentHasChanged && data.item) {
+        update();
+    }
+    QQuickMouseArea::itemChange(change, data);
+}
+
 void InverseMouseAreaType::componentComplete()
 {
     QQuickMouseArea::componentComplete();

=== modified file 'modules/Ubuntu/Components/plugin/inversemouseareatype.h'
--- modules/Ubuntu/Components/plugin/inversemouseareatype.h	2014-03-20 10:01:21 +0000
+++ modules/Ubuntu/Components/plugin/inversemouseareatype.h	2014-06-18 15:28:52 +0000
@@ -32,6 +32,7 @@
     Q_INVOKABLE virtual bool contains(const QPointF &point) const;
 
 protected:
+    void itemChange(ItemChange, const ItemChangeData &);
     void componentComplete();
     bool eventFilter(QObject *, QEvent *);
 

=== modified file 'modules/Ubuntu/Components/plugin/sortbehavior.cpp'
--- modules/Ubuntu/Components/plugin/sortbehavior.cpp	2014-05-15 09:35:22 +0000
+++ modules/Ubuntu/Components/plugin/sortbehavior.cpp	2014-06-18 15:28:52 +0000
@@ -19,6 +19,14 @@
 
 #include "sortbehavior.h"
 
+SortBehavior::SortBehavior(QObject *parent)
+    : QObject(parent)
+    , m_property(QString())
+    , m_order(Qt::AscendingOrder)
+{
+
+}
+
 QString
 SortBehavior::property() const
 {

=== modified file 'modules/Ubuntu/Components/plugin/sortbehavior.h'
--- modules/Ubuntu/Components/plugin/sortbehavior.h	2014-05-15 09:35:22 +0000
+++ modules/Ubuntu/Components/plugin/sortbehavior.h	2014-06-18 15:28:52 +0000
@@ -29,6 +29,8 @@
     Q_PROPERTY(Qt::SortOrder order READ order WRITE setOrder NOTIFY orderChanged)
 
 public:
+    explicit SortBehavior(QObject *parent = 0);
+
     QString property() const;
     void setProperty(const QString& property);
     Qt::SortOrder order() const;

=== modified file 'modules/Ubuntu/Components/plugin/uctheme.cpp'
--- modules/Ubuntu/Components/plugin/uctheme.cpp	2014-04-23 08:50:20 +0000
+++ modules/Ubuntu/Components/plugin/uctheme.cpp	2014-06-18 15:28:52 +0000
@@ -81,7 +81,12 @@
     QStringList pathList = envPath.split(':', QString::SkipEmptyParts);
     if (pathList.isEmpty()) {
         // get the default path list from generic data location, which contains
-        // ~/.local/share and XDG_DATA_DIRS
+        // XDG_DATA_DIRS
+        QString xdgDirs = QLatin1String(getenv("XDG_DATA_DIRS"));
+        if (!xdgDirs.isEmpty()) {
+            pathList << xdgDirs.split(':', QString::SkipEmptyParts);
+        }
+        // ~/.local/share
         pathList << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
     }
     // fix folders

=== modified file 'modules/Ubuntu/Test/plugin/plugin.pro'
--- modules/Ubuntu/Test/plugin/plugin.pro	2013-12-16 17:37:48 +0000
+++ modules/Ubuntu/Test/plugin/plugin.pro	2014-06-18 15:28:52 +0000
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = ../UbuntuTest
-QT += core-private qml qml-private quick quick-private
+QT += core-private qml qml-private quick quick-private gui-private
 
 equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
     QT += v8-private

=== modified file 'modules/Ubuntu/Test/plugin/uctestcase.cpp'
--- modules/Ubuntu/Test/plugin/uctestcase.cpp	2014-03-28 17:02:52 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.cpp	2014-06-18 15:28:52 +0000
@@ -26,8 +26,11 @@
 #include <QtTest/QtTest>
 #include <QtQuick/QQuickItem>
 
+#include <qpa/qwindowsysteminterface.h>
+
 Q_DECLARE_METATYPE(QList<QQmlError>)
 
+QTouchDevice *UbuntuTestCase::m_touchDevice = 0;
 /*!
  * \ingroup ubuntu
  * \brief UbuntuTestCase is the C++ pendant to the QML UbuntuTestCase.
@@ -60,3 +63,26 @@
 	return m_spy->count();
 }
 
+/*!
+ * Registers a touch device if there's none registered.
+ */
+void UbuntuTestCase::registerTouchDevice()
+{
+    // check if there is any touch device registered in the system
+    if (!m_touchDevice) {
+        QList<const QTouchDevice*> touchDevices = QTouchDevice::devices();
+        Q_FOREACH(const QTouchDevice *device, touchDevices) {
+            if (device->type() == QTouchDevice::TouchScreen) {
+                m_touchDevice = const_cast<QTouchDevice*>(device);
+                break;
+            }
+        }
+    }
+    // if none, register one
+    if (!m_touchDevice) {
+        m_touchDevice = new QTouchDevice;
+        m_touchDevice->setType(QTouchDevice::TouchScreen);
+        QWindowSystemInterface::registerTouchDevice(m_touchDevice);
+    }
+}
+

=== modified file 'modules/Ubuntu/Test/plugin/uctestcase.h'
--- modules/Ubuntu/Test/plugin/uctestcase.h	2014-03-28 17:02:52 +0000
+++ modules/Ubuntu/Test/plugin/uctestcase.h	2014-06-18 15:28:52 +0000
@@ -19,10 +19,13 @@
 #ifndef UBUNTU_TEST_UBUNTUTESTCASE_H
 #define UBUNTU_TEST_UBUNTUTESTCASE_H
 
+#include <QtTest/QtTest>
 #include <QtQuick/QQuickItem>
 #include <QtQuick/QQuickView>
 #include <QtTest/QSignalSpy>
 
+#define CHECK_TOUCH_DEVICE()    if (!checkTouchDevice(__FUNCTION__)) return
+
 class UbuntuTestCase : public QQuickView
 {
     Q_OBJECT
@@ -40,8 +43,74 @@
             qFatal("Item '%s' found with unexpected type", qPrintable(objectName));
         qFatal("No item '%s' found", qPrintable(objectName));
     }
+
+    static void registerTouchDevice();
+
+    inline static void touchPress(int touchId, QWindow *window, const QPoint &point)
+    {
+        CHECK_TOUCH_DEVICE();
+        QTest::touchEvent(window, m_touchDevice).press(touchId, point, window);
+    }
+    inline static void touchRelease(int touchId, QWindow *window, const QPoint &point)
+    {
+        CHECK_TOUCH_DEVICE();
+        QTest::touchEvent(window, m_touchDevice).release(touchId, point, window);
+    }
+    inline static void touchClick(int touchId, QWindow *window, const QPoint &point)
+    {
+        CHECK_TOUCH_DEVICE();
+        touchPress(touchId, window, point);
+        QTest::qWait(10);
+        touchRelease(touchId, window, point);
+    }
+    inline static void touchLongPress(int touchId, QWindow *window, const QPoint &point)
+    {
+        CHECK_TOUCH_DEVICE();
+        touchPress(touchId, window, point);
+        QTest::qWait(800);
+    }
+    inline static void touchDoubleClick(int touchId, QWindow *window, const QPoint &point)
+    {
+        CHECK_TOUCH_DEVICE();
+        touchClick(touchId, window, point);
+        QTest::qWait(10);
+        touchClick(touchId, window, point);
+    }
+    inline static void touchMove(int touchId, QWindow *window, const QPoint &point)
+    {
+        CHECK_TOUCH_DEVICE();
+        QTest::touchEvent(window, m_touchDevice).move(touchId, point, window);
+    }
+    inline static void touchDrag(int touchId, QWindow *window, const QPoint &from, const QPoint &delta, int steps = 5)
+    {
+        touchPress(touchId, window, from);
+        QTest::qWait(10);
+        QTest::touchEvent(window, m_touchDevice).move(touchId, from, window);
+        qreal stepDx = delta.x() / steps;
+        qreal stepDy = delta.y() / steps;
+        if (!delta.isNull()) {
+            for (int i = 0; i < steps; i++) {
+                QTest::qWait(10);
+                QTest::touchEvent(window, m_touchDevice).move(touchId, from + QPoint(i * stepDx, i * stepDy), window);
+            }
+        }
+        QTest::qWait(10);
+        touchRelease(touchId, window, from + QPoint(stepDx, stepDy));
+    }
+
+
 private:
     QSignalSpy* m_spy;
+    static QTouchDevice *m_touchDevice;
+
+    static inline bool checkTouchDevice(const char *func)
+    {
+        if (!m_touchDevice) {
+            qWarning() << QString("No touch device registered. Register one using registerTouchDevice() before using %1").arg(func);
+            return false;
+        }
+        return true;
+    }
 };
 
 #endif // UBUNTU_TEST_UBUNTUTESTCASE_H

=== added file 'push_to_phone.sh'
--- push_to_phone.sh	1970-01-01 00:00:00 +0000
+++ push_to_phone.sh	2014-06-18 15:28:52 +0000
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# 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/>.
+#
+# Author: Christian Dywan <[e-mail]>
+
+ARCH=arm-linux-gnueabihf
+
+# Make the image writable
+phablet-config writable-image || exit 1
+# Copy selectively to avoid pushing binaries (arch conflict) and sources (unneeded)
+cd modules || exit 1
+for i in $(ls Ubuntu/Components/*.qml 2>/dev/null); do
+    echo modules/$i '->' /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
+    adb push $i /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
+done
+for i in $(ls Ubuntu/Components/*.js 2>/dev/null); do
+    echo modules/$i '->' /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
+    adb push $i /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/
+done
+cd ..
+for i in ListItems Pickers Popups Colors Styles Themes artwork; do
+    adb push modules/Ubuntu/Components/$i/ /usr/lib/$ARCH/qt5/qml/Ubuntu/Components/$i || exit 1
+done
+# Autopilot tests should always match the Toolkit
+adb push tests/autopilot/ubuntuuitoolkit/ /usr/lib/python2.7/dist-packages/ubuntuuitoolkit || exit 1
+adb push examples/ubuntu-ui-toolkit-gallery/ /usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery || exit 1
+# For launching the gallery easily
+adb push examples/ubuntu-ui-toolkit-gallery/*.desktop /usr/share/applications/ || exit 1

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-05-29 16:14:55 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_flickable.py	2014-06-18 15:28:52 +0000
@@ -40,6 +40,16 @@
 
 class Scrollable(_common.UbuntuUIToolkitCustomProxyObjectBase):
 
+    @autopilot_logging.log_action(logger.info)
+    def is_child_visible(self, child):
+        """Determine if the child is visible.
+
+        A child is visible if no scrolling is needed to reveal it.
+
+        """
+        containers = self._get_containers()
+        return self._is_child_visible(child, containers)
+
     def _get_containers(self):
         """Return a list with the containers to take into account when swiping.
 

=== modified file 'tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py'
--- tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py	2014-04-25 18:39:51 +0000
+++ tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/listitems.py	2014-06-18 15:28:52 +0000
@@ -42,6 +42,9 @@
     def swipe_to_delete(self, direction='right'):
         """Swipe the item in a specific direction."""
         if self.removable:
+            # Swipe to delete is always right to left
+            if direction == 'left':
+                direction = 'right'
             self._drag_pointing_device_to_delete(direction)
             if self.confirmRemoval:
                 self.waitingConfirmationForRemoval.wait_for(True)
@@ -52,14 +55,19 @@
                 'The item "{0}" is not removable'.format(self.objectName))
 
     def _drag_pointing_device_to_delete(self, direction):
-        x, y, w, h = self.globalRect
-        tx = x + (w // 8)
-        ty = y + (h // 2)
+        x, y, width, height = self.globalRect
+        left_x = x + (width * 0.2)
+        right_x = x + (width * 0.8)
+        start_y = stop_y = y + (height // 2)
 
         if direction == 'right':
-            self.pointing_device.drag(tx, ty, w, ty)
+            start_x = left_x
+            stop_x = right_x
+            self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
         elif direction == 'left':
-            self.pointing_device.drag(w - (w*0.1), ty, x, ty)
+            start_x = right_x
+            stop_x = left_x
+            self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
         else:
             raise _common.ToolkitException(
                 'Invalid direction "{0}" used on swipe to delete function'

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-05-29 16:17:56 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/__init__.py	2014-06-18 15:28:52 +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
@@ -142,91 +142,6 @@
     def main_view(self):
         return self.app.select_single(emulators.MainView)
 
-    def checkListItem(self, itemText):
-        item = self.getListItem(itemText)
-        self.assertThat(item, Not(Is(None)))
-
-    def getListItem(self, itemText):
-        # XXX We shouldn't access the elements by text, because that's likely
-        # to change often and might be translated. We should always use the
-        # objectName instead. --elopio - 2013-06-26216
-        return self.main_view.select_single("Standard", text=itemText)
-
-    def getWidgetLoaderAndListView(self):
-        contentLoader = self.main_view.select_single(
-            "QQuickLoader", objectName="contentLoader")
-        listView = self.main_view.select_single(
-            "QQuickListView", objectName="widgetList")
-        self.assertThat(listView, Not(Is(None)))
-        self.assertThat(listView.visible, Eventually(Equals(True)))
-        return (contentLoader, listView)
-
-    def loadItem(self, item):
-        self.selectItem(item)
-        contentLoader = self.main_view.select_single(
-            "QQuickLoader", objectName="contentLoader")
-        self.assertThat(contentLoader.progress, Eventually(Equals(1.0)))
-        loadedPage = self.getListItem(item)
-        self.assertThat(loadedPage, Not(Is(None)))
-        #loadedPage is not a page, it is the list item which goes in
-        #background when the item is selected, which changes the visible
-        #property of item in list itself to False. So followin check
-        #fails on Nexus 4. Commenting it for now.
-        #self.assertThat(loadedPage.visible, Eventually(Equals(True)))
-
-    def drag(self, itemText, itemTextTo):
-        item = self.getListItem(itemText)
-        itemTo = self.getListItem(itemTextTo)
-
-        self.pointing_device.move_to_object(item)
-        self.pointing_device.press()
-        self.pointing_device.move_to_object(itemTo)
-        self.pointing_device.release()
-
-    def reveal_item_by_flick(self, item, flickable, direction):
-        x1, y1, w1, h1 = item.globalRect
-        x2, y2, w2, h2 = flickable.globalRect
-        if direction is FlickDirection.UP:
-            while y1 + h1 > y2 + h2:
-                self.flick(flickable, direction)
-                x1, y1, w1, h1 = item.globalRect
-        elif direction is FlickDirection.DOWN:
-            while y1 < y2:
-                self.flick(flickable, direction)
-                x1, y1, w1, h1 = item.globalRect
-
-    def flick(self, flickable, direction, delta=40):
-        """This funcito flicks the page from middle to the given direction."""
-        x, y, w, h = flickable.globalRect
-        if direction == FlickDirection.UP:
-            self.pointing_device.drag(x + w / 2, y + h / 2, x + w / 2,
-                                      y + h / 2 - delta)
-            flickable.flicking.wait_for(False)
-        elif direction == FlickDirection.DOWN:
-            self.pointing_device.drag(x + w / 2, y + h / 2, x + w / 2,
-                                      y + h / 2 + delta)
-            flickable.flicking.wait_for(False)
-        else:
-            raise ValueError("Invalid direction or not implementd yet")
-
-    def selectItem(self, itemText):
-        item = self.getListItem(itemText)
-        x1, y1, w1, h1 = item.globalRect
-        x2, y2, w2, h2 = self.main_view.globalRect
-
-        orientationHelper = self.getOrientationHelper()
-        rot = orientationHelper.rotation
-        scrollTo = h2 / 2 - (y1 - h2 - h1)
-        if rot == 0.0 and y1 > h2:
-            self.pointing_device.drag(w2 / 2, h2 / 2, w2 / 2, scrollTo)
-
-        self.assertThat(item.selected, Eventually(Equals(False)))
-
-        self.pointing_device.move_to_object(item)
-        self.pointing_device.click()
-
-        self.assertThat(item.selected, Eventually(Equals(True)))
-
     def getOrientationHelper(self):
         orientationHelper = self.main_view.select_many(
             "OrientationHelper")[0]
@@ -249,29 +164,3 @@
         obj = self.getObject(objectName)
         self.pointing_device.move_to_object(obj)
         self.pointing_device.click()
-
-    def mousePress(self, objectName):
-        obj = self.getObject(objectName)
-        self.pointing_device.move_to_object(obj)
-        self.pointing_device.press()
-
-    def mouseRelease(self):
-        self.pointing_device.release()
-
-    def type_string(self, string):
-        self.keyboard.type(string)
-
-    def type_key(self, key):
-        self.keyboard.key(key)
-
-    def tap_clearButton(self, objectName):
-        textField = self.getObject(objectName)
-        self.assertIsNotNone(textField)
-        self.pointing_device.click_object(textField)
-        self.assertThat(textField.focus, Eventually(Equals(True)))
-        self.assertThat(textField.hasClearButton, Eventually(Equals(True)))
-        btn = textField.select_single("AbstractButton")
-        self.assertIsNotNone(btn)
-        self.assertThat(btn.visible, Eventually(Equals(True)))
-        self.pointing_device.click_object(btn)
-        self.assertThat(btn.pressed, Eventually(Equals(False)))

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2014-05-19 09:46:05 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py	2014-06-18 15:28:52 +0000
@@ -14,53 +14,16 @@
 # 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 os
 
 import testtools
-
 import ubuntuuitoolkit
-from ubuntuuitoolkit import tests
+from ubuntuuitoolkit import fixture_setup, 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)
@@ -68,6 +31,7 @@
         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())
 
@@ -77,6 +41,7 @@
         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())
 
@@ -199,3 +164,61 @@
 
         self.pointing_device.click_object(topButton)
         self.assertEqual(self.label.text, 'topButton')
+
+
+class UnityFlickableTestCase(tests.QMLStringAppTestCase):
+
+    test_qml = ("""
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+
+    Flickable {
+        objectName: 'testFlickable'
+        width: 200; height: 200
+        contentWidth: image.width; contentHeight: image.height
+    }
+}
+""")
+
+    def launch_application(self):
+        fake_application = fixture_setup.FakeApplication(
+            qml_file_contents=self.test_qml)
+        self.useFixture(fake_application)
+
+        self.app = self.launch_test_application(
+            self.get_alternate_launch_command(),
+            '-engine',
+            '-I', tests._get_module_include_path(),
+            fake_application.qml_file_path,
+            '--desktop_file_hint={0}'.format(
+                fake_application.desktop_file_path),
+            emulator_base=ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase,
+            app_type='qt')
+
+    def get_alternate_launch_command(self):
+        root = tests.get_path_to_source_root()
+        path_to_local_launcher = os.path.join(
+            root, 'tests', 'launcher', 'launcher')
+        if os.path.exists(path_to_local_launcher):
+            return path_to_local_launcher
+        else:
+            path_to_installed_launcher = os.path.join(
+                '/', 'usr', 'lib', 'ubuntu-ui-toolkit', 'launcher')
+        return path_to_installed_launcher
+
+    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.
+        test_flickable = self.app.select_single(
+            ubuntuuitoolkit.QQuickFlickable, objectName='testFlickable')
+        top_container = test_flickable._get_top_container()
+        self.assertIsInstance(top_container, ubuntuuitoolkit.MainView)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-05-29 18:18:43 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py	2014-06-18 15:28:52 +0000
@@ -18,6 +18,8 @@
 
 import ubuntuuitoolkit
 from ubuntuuitoolkit import tests
+from testtools.matchers import Equals
+from autopilot.matchers import Eventually
 
 
 class HeaderTestCase(tests.QMLStringAppTestCase):
@@ -32,73 +34,93 @@
 
     useDeprecatedToolbar: false
 
-    Page {
-        title: "Test title"
-
-        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 {
-            back: ToolbarButton {
-                action: Action {
-                    id: cancelAction
-                    iconName: "cancel"
-                    text: "cancel"
-                    onTriggered: label.text = "Cancel button clicked."
-                }
-            }
-            Repeater {
-                id: buttonRepeater
-                model: 5
+    PageStack {
+        id: stack
+        Component.onCompleted: stack.push(page)
+
+        Page {
+            title: "Test title"
+            id: page
+
+            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 {
+                back: ToolbarButton {
+                    action: Action {
+                        id: cancelAction
+                        iconName: "cancel"
+                        text: "cancel"
+                        onTriggered: label.text = "Cancel button clicked."
+                    }
+                }
+                Repeater {
+                    id: buttonRepeater
+                    model: 5
+                    ToolbarButton {
+                        action: Action {
+                            objectName: "action" + index
+                            text: "text " + index
+                            iconName: "add"
+                            onTriggered: {
+                                label.text = "Button "+index+" clicked.";
+                            }
+                        }
+                    }
+                }
                 ToolbarButton {
                     action: Action {
-                        objectName: "action" + index
-                        text: "text " + index
+                        objectName: "pushStackAction"
+                        text: "Push page"
                         iconName: "add"
-                        onTriggered: label.text = "Button "+index+" clicked."
+                        onTriggered: stack.push(pushMe)
                     }
                 }
             }
         }
+        Page {
+            title: "Pushed page"
+            id: pushMe
+        }
     }
 }
 """)
@@ -125,6 +147,13 @@
         self.header.click_action_button('action3')
         self.assertEqual(self.label.text, 'Button 3 clicked.')
 
+    def test_click_header_overflow_action_closes_popover_bug1326963(self):
+        overflow_popover = self.main_view.select_single(
+            'Popover',
+            objectName='actions_overflow_popover')
+        self.header.click_action_button('pushStackAction')
+        self.assertThat(overflow_popover.visible, Eventually(Equals(False)))
+
     def test_click_unexisting_header_action_button(self):
         error = self.assertRaises(
             ubuntuuitoolkit.ToolkitException, self.header.click_action_button,

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py'
--- tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2014-04-25 18:39:51 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py	2014-06-18 15:28:52 +0000
@@ -120,6 +120,7 @@
         self.assertTrue(self._item.waitingConfirmationForRemoval)
 
     def test_swipe_item_to_left(self):
+        # This will do a right to left swipe behind the scenes
         self._item.swipe_to_delete('left')
         self.assertTrue(self._item.waitingConfirmationForRemoval)
 
@@ -134,6 +135,7 @@
         self.assertFalse(self._item.exists())
 
     def test_delete_item_moving_left(self):
+        # This will do a right to left swipe behind the scenes
         self._item.swipe_to_delete('left')
         self._item.confirm_removal()
         self.assertFalse(self._item.exists())

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2013-10-24 11:01:03 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py	2014-06-18 15:28:52 +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
@@ -19,10 +19,10 @@
 import os
 import shutil
 
-from ubuntuuitoolkit import tests
-
-
-class GalleryTestCase(tests.QMLFileAppTestCase):
+import ubuntuuitoolkit
+
+
+class GalleryTestCase(ubuntuuitoolkit.tests.QMLFileAppTestCase):
     """Base class for gallery test cases."""
 
     local_desktop_file_path = None
@@ -39,7 +39,7 @@
 
     def _get_path_to_gallery_source(self):
         return os.path.join(
-            tests.get_path_to_source_root(), 'examples',
+            ubuntuuitoolkit.tests.get_path_to_source_root(), 'examples',
             'ubuntu-ui-toolkit-gallery')
 
     def _application_source_exists(self):
@@ -58,7 +58,8 @@
             self.test_source_path,
             'ubuntu-ui-toolkit-gallery.desktop')
         if self._application_source_exists():
-            local_desktop_file_dir = tests.get_local_desktop_file_directory()
+            local_desktop_file_dir = (
+                ubuntuuitoolkit.tests.get_local_desktop_file_directory())
             if not os.path.exists(local_desktop_file_dir):
                 os.makedirs(local_desktop_file_dir)
             local_desktop_file_path = os.path.join(
@@ -71,6 +72,19 @@
         else:
             return desktop_file_path
 
+    def open_page(self, page):
+        """Open a page of the widget gallery.
+
+        :param page: The objectName of the element in the index list that opens
+            the page.
+
+        """
+        list_view = self.main_view.select_single(
+            ubuntuuitoolkit.QQuickListView, objectName="widgetList")
+        list_view.click_element(page)
+        element = self.main_view.select_single('Standard', objectName=page)
+        element.selected.wait_for(True)
+
     def tearDown(self):
         super(GalleryTestCase, self).tearDown()
         # We can't delete the desktop file before we close the application,

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py	2014-02-11 01:55:49 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py	2014-06-18 15:28:52 +0000
@@ -45,9 +45,7 @@
     ]
 
     def test_buttons(self):
-        item = "Buttons"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('buttonsElement')
 
         button = self.app.select_single(objectName=self.button_name)
         self.assertIsNot(button, None)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-05-26 12:37:32 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py	2014-06-18 15:28:52 +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
@@ -16,32 +16,19 @@
 
 """Tests for the Ubuntu UI Toolkit Gallery"""
 
-from autopilot.matchers import Eventually
-from testtools.matchers import Is, Not, Equals
-
-from ubuntuuitoolkit import emulators
+import ubuntuuitoolkit
 from ubuntuuitoolkit.tests import gallery
 
 
-class GenericTests(gallery.GalleryTestCase):
+class GalleryAppTestCase(gallery.GalleryTestCase):
     """Generic tests for the Gallery"""
 
-    def test_0_can_select_mainwindow(self):
-        """Must be able to select the main window."""
-
-        rootItem = self.main_view
-        self.assertThat(rootItem, Not(Is(None)))
-        self.assertThat(rootItem.visible, Eventually(Equals(True)))
-
-    def test_navigation(self):
-        item = "Navigation"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+    def test_select_main_view_must_return_main_window_emulator(self):
+        main_view = self.main_view
+        self.assertIsInstance(main_view, ubuntuuitoolkit.MainView)
 
     def test_slider(self):
-        item = "Slider"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('slidersElement')
 
         item_data = [
             ["slider_standard"],
@@ -57,9 +44,7 @@
             # TODO: move slider value
 
     def test_progress_and_activity(self):
-        item = "Progress and activity"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('progressBarsElement')
 
         item_data = [
             ["progressbar_standard"],
@@ -79,9 +64,7 @@
         # FIXME: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1308979
         return
 
-        item = "Ubuntu Shape"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('ubuntuShapesElement')
 
         item_data = [
             ["ubuntushape_color_hex"],
@@ -115,12 +98,9 @@
     ]
 
     def test_open_page(self):
-        list_view = self.main_view.select_single(
-            emulators.QQuickListView, objectName="widgetList")
-        list_view.click_element(self.element_name)
+        self.open_page(self.element_name)
         element = self.main_view.select_single(
             'Standard', objectName=self.element_name)
-        element.selected.wait_for(True)
         self.checkPageHeader(element.text)
         if self.template_name == 'textinputsTemplate':
             page_type = 'TextInputs'

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-05-23 09:50:42 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py	2014-06-18 15:28:52 +0000
@@ -24,9 +24,7 @@
 
     def setUp(self):
         super(OptionSelectorTestCase, self).setUp()
-        item = "Option Selector"
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('optionSelectorsElement')
 
     def test_select_option_from_collapsed_optionselector(self):
         collapsed_option_selector = self.main_view.select_single(

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py	2014-06-18 15:28:52 +0000
@@ -0,0 +1,63 @@
+# -*- 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/>.
+
+from autopilot import platform
+
+from ubuntuuitoolkit.tests import gallery
+
+
+class ScrollBarTestCase(gallery.GalleryTestCase):
+
+    def setUp(self):
+        super(ScrollBarTestCase, self).setUp()
+        self.open_page('navigationElement')
+        self.scrollbar = self.main_view.wait_select_single(
+            'Scrollbar', objectName="TemplateScrollbar")
+
+    def move_mouse_to_thumb(self):
+        # TODO we need a helper to move the interactive thumb.
+        # --elopio 2014-05-06
+        thumb = self.scrollbar.select_single(
+            objectName='interactiveScrollbarThumb')
+        self.pointing_device.move_to_object(thumb)
+
+    def test_scrollbar_must_start_without_interactive_thumb(self):
+        self.assertEqual(self.scrollbar.interactive, False)
+
+    def test_move_mouse_to_thumb_must_make_scrollbar_interactive(self):
+        if platform.model() != 'Desktop':
+            self.skipTest(
+                'The interactive thumb is activated by the move of a mouse')
+
+        self.move_mouse_to_thumb()
+
+        self.assertEqual(self.scrollbar.interactive, True)
+
+    def test_drag_thumb_down_must_make_bottom_visible(self):
+        if platform.model() != 'Desktop':
+            self.skipTest(
+                'The interactive thumb is activated by the move of a mouse')
+
+        bottom_section = self.main_view.select_single(className='PageStack')
+        flickable = self.main_view.select_single(
+            'QQuickFlickable', objectName='TemplateFlickable')
+        self.assertEqual(flickable.is_child_visible(bottom_section), False)
+
+        self.move_mouse_to_thumb()
+        x, y = self.pointing_device.position()
+        self.pointing_device.drag(x, y, x, self.main_view.height)
+
+        self.assertEqual(flickable.is_child_visible(bottom_section), True)

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2014-04-30 09:40:17 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py	2014-06-18 15:28:52 +0000
@@ -54,9 +54,7 @@
         # Apply the user locale from the environment
         # The UITK does the same, so the test must be localized
         locale.setlocale(locale.LC_ALL, "")
-        item = 'Text Field'
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('textinputsElement')
 
     def test_write_on_textfield_must_update_text(self):
         textfield = self.main_view.select_single(
@@ -78,9 +76,7 @@
 
     def setUp(self):
         super(DisabledTextInputTestCase, self).setUp()
-        item = 'Text Field'
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('textinputsElement')
 
     def test_textfield_disabled(self):
         textfield_disabled = self.main_view.select_single(

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py'
--- tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py	2013-11-01 15:15:30 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py	2014-06-18 15:28:52 +0000
@@ -35,10 +35,7 @@
 
     def setUp(self):
         super(EnabledTogglesTestCase, self).setUp()
-        item = "Toggles"
-        self.checkListItem(item)
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('togglesElement')
 
     def test_change_toggles_state(self):
         toggle = self.main_view.select_single(
@@ -65,10 +62,7 @@
 
     def setUp(self):
         super(DisabledTogglesTestCase, self).setUp()
-        item = "Toggles"
-        self.checkListItem(item)
-        self.loadItem(item)
-        self.checkPageHeader(item)
+        self.open_page('togglesElement')
 
     def test_change_toggles_state(self):
         toggle = self.main_view.select_single(

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py'
--- tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-05-28 09:42:30 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py	2014-06-18 15:28:52 +0000
@@ -298,7 +298,7 @@
         # home.
         self.useFixture(fixture_setup.FakeHome())
 
-        open(os.path.join(os.environ.get('HOME'), '.Xauthority')).close()
+        open(os.path.join(os.environ.get('HOME'), '.Xauthority'), 'w').close()
 
         self.useFixture(fixture_setup.FakeHome())
         self.assertTrue(

=== added directory 'tests/launcher'
=== added file 'tests/launcher/launcher.cpp'
--- tests/launcher/launcher.cpp	1970-01-01 00:00:00 +0000
+++ tests/launcher/launcher.cpp	2014-06-18 15:28:52 +0000
@@ -0,0 +1,146 @@
+/*
+ * 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/>.
+ *
+ * QML launcher with the ability to setup the QQuickView/ QQmlEngine differently
+ *
+ * Rationale: Different variants of qmlscene exist as well as C++ and Go apps
+ * This is to write Autopilot test cases that exhibit specific behavior
+ */
+
+#include <iostream>
+#include <QtCore/qdebug.h>
+#include <QtQuick/QQuickView>
+#include <QtGui/QGuiApplication>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlContext>
+#include <QtCore/QFileInfo>
+#include <QLibrary>
+#include <QOpenGLContext>
+#include <QtGui/private/qopenglcontext_p.h>
+#include <QtQuick/private/qsgcontext_p.h>
+
+int usage()
+{
+    QString self(QGuiApplication::instance()->arguments().at(0));
+    std::cout << "Usage\n  "
+        << qPrintable(self)
+        << " -testability -frameless -engine"
+        << " --desktop_file_path=DESKTOP_FILE"
+        << " -I MODULE_PATH FILENAME\n";
+    return 1;
+}
+
+int main(int argc, const char *argv[])
+{
+    // QPlatformIntegration::ThreadedOpenGL
+    setenv("QML_FORCE_THREADED_RENDERER", "1", 1);
+    // QPlatformIntegration::BufferQueueingOpenGL
+    setenv("QML_FIXED_ANIMATION_STEP", "1", 1);
+    // Oxide and QWebEngine need a shared context
+    QScopedPointer<QOpenGLContext> shareContext;
+    shareContext.reset(new QOpenGLContext);
+#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
+    QSGContext::setSharedOpenGLContext(shareContext.data());
+#else
+    QOpenGLContextPrivate::setGlobalShareContext(shareContext.data());
+#endif
+    QGuiApplication::setApplicationName("UITK Launcher");
+    QGuiApplication application(argc, (char**)argv);
+    QStringList args (application.arguments());
+
+    int _testability(args.indexOf("-testability"));
+    args.removeAt(_testability);
+    int _frameless(args.indexOf("-frameless"));
+    args.removeAt(_frameless);
+    int _engine(args.indexOf("-engine"));
+    args.removeAt(_engine);
+
+    Q_FOREACH(QString arg, args) {
+        if (arg.startsWith("--desktop_file_hint")) {
+            // This will not be used - it only needs to be ignored
+            int _desktop_file_hint(args.indexOf(arg));
+            args.removeAt(_desktop_file_hint);
+        }
+    }
+
+    // Testability is only supported out of the box by QApplication not QGuiApplication
+    if (_testability > -1 || getenv("QT_LOAD_TESTABILITY")) {
+        QLibrary testLib(QLatin1String("qttestability"));
+        if (testLib.load()) {
+            typedef void (*TasInitialize)(void);
+            TasInitialize initFunction = (TasInitialize)testLib.resolve("qt_testability_init");
+            if (initFunction) {
+                initFunction();
+            } else {
+                qCritical("Library qttestability resolve failed!");
+                return 1;
+            }
+        } else {
+            qCritical("Library qttestability load failed!");
+            return 1;
+        }
+    }
+
+    QQmlEngine* engine;
+    // The default constructor affects the components tree (autopilot vis)
+    QQuickView* view;
+    if (_engine > -1) {
+        view = new QQuickView();
+        engine = view->engine();
+    } else {
+        engine = new QQmlEngine();
+        view = new QQuickView(engine, NULL);
+    }
+
+    int _import(args.indexOf("-I"));
+    args.removeAt(_import);
+    if (_import > -1) {
+        if (args.count() > _import) {
+            QString importPath(args.at(_import));
+            args.removeAt(_import);
+            engine->addImportPath(importPath);
+        }
+    }
+
+    view->setResizeMode(QQuickView::SizeRootObjectToView);
+    view->setTitle("UI Toolkit QQuickView");
+    if (_frameless > -1) {
+        view->setFlags(Qt::FramelessWindowHint);
+    }
+
+    // The remaining unnamed argument must be a filename
+    if (args.count() == 1) {
+        qCritical() << "Missing filename";
+        return usage();
+    }
+    QString filename(args.at(1));
+    // The first argument is the launcher itself
+    args.removeAt(0);
+
+    QUrl source(QUrl::fromLocalFile(filename));
+    view->setSource(source);
+    if (view->errors().count() > 0) {
+        return usage();
+    }
+    view->show();
+
+    if (args.count() > 1) {
+        qCritical() << "Invalid arguments passed" << args;
+        return usage();
+    }
+
+    return application.exec();
+}
+

=== added file 'tests/launcher/launcher.pro'
--- tests/launcher/launcher.pro	1970-01-01 00:00:00 +0000
+++ tests/launcher/launcher.pro	2014-06-18 15:28:52 +0000
@@ -0,0 +1,11 @@
+TEMPLATE = app
+QT += qml quick
+# For setSharedOpenGLContext
+QT += core-private gui-private quick-private
+CONFIG += no_keywords
+SOURCES += \
+    launcher.cpp
+launcher.path = /usr/lib/ubuntu-ui-toolkit
+launcher.files = launcher
+INSTALLS += launcher
+

=== modified file 'tests/tests.pro'
--- tests/tests.pro	2014-02-21 23:39:43 +0000
+++ tests/tests.pro	2014-06-18 15:28:52 +0000
@@ -7,4 +7,6 @@
 autopilot2_module.path = /usr/lib/python2.7/dist-packages/ubuntuuitoolkit
 autopilot2_module.files = autopilot/ubuntuuitoolkit/*
 
+SUBDIRS += launcher
+
 INSTALLS += autopilot_module autopilot2_module

=== modified file 'tests/unit/runtest.sh'
--- tests/unit/runtest.sh	2014-04-15 14:26:35 +0000
+++ tests/unit/runtest.sh	2014-06-18 15:28:52 +0000
@@ -38,7 +38,10 @@
 
 function execute_test_cmd {
   echo "Executing $_CMD $_ARGS"
-  if [ $DISPLAY ]; then
+  if [ ! -x $_TARGET ]; then
+    echo "Error: $_TARGET wasn't built!"
+    RESULT=2
+  elif [ $DISPLAY ]; then
     # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
     # https://bugreports.qt-project.org/browse/QTBUG-36243
     QML2_IMPORT_PATH=../../../modules:$QML2_IMPORT_PATH UBUNTU_UI_TOOLKIT_THEMES_PATH=../../../modules \

=== modified file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	2013-12-03 10:36:54 +0000
+++ tests/unit/unit.pro	2014-06-18 15:28:52 +0000
@@ -18,9 +18,7 @@
     tst_scaling_image_provider \
     tst_qquick_image_extension \
     tst_performance \
-    tst_ubuntu_shape \
     tst_mainview \
-    tst_page \
     tst_i18n \
     tst_arguments \
     tst_argument \

=== modified file 'tests/unit_x11/tst_components/tst_hide_chrome.qml'
--- tests/unit_x11/tst_components/tst_hide_chrome.qml	2014-04-25 05:28:37 +0000
+++ tests/unit_x11/tst_components/tst_hide_chrome.qml	2014-06-18 15:28:52 +0000
@@ -61,6 +61,11 @@
         when: windowShown
         id: testCase
 
+        function cleanup() {
+            // clean buffers
+            waitForRendering(mainView, 500);
+        }
+
         function openToolbar() {
             var toolbar = mainView.__propagated.toolbar;
             toolbar.open();

=== renamed file 'tests/unit/tst_components/tst_page.qml' => 'tests/unit_x11/tst_components/tst_page.qml'
=== modified file 'tests/unit_x11/tst_components/tst_popover.qml'
--- tests/unit_x11/tst_components/tst_popover.qml	2014-04-17 14:14:43 +0000
+++ tests/unit_x11/tst_components/tst_popover.qml	2014-06-18 15:28:52 +0000
@@ -61,6 +61,7 @@
         function cleanup() {
             popoverSpy.target = null;
             popoverSpy.clear();
+            waitForRendering(main, 500);
         }
 
         function test_dismiss_on_click_data() {

=== renamed file 'tests/unit/tst_components/tst_quickutils.qml' => 'tests/unit_x11/tst_components/tst_quickutils.qml'
=== modified file 'tests/unit_x11/tst_components/tst_textarea.qml'
--- tests/unit_x11/tst_components/tst_textarea.qml	2014-04-30 07:10:06 +0000
+++ tests/unit_x11/tst_components/tst_textarea.qml	2014-06-18 15:28:52 +0000
@@ -555,6 +555,7 @@
         }
 
         function test_scroll_with_selected_text() {
+            skip("Flaky test, feature needs rewrite");
             longText.focus = true;
             var handler = findChild(longText, "input_handler");
             verify(handler);
@@ -629,6 +630,7 @@
         }
 
         function test_press_and_hold_over_selected_text() {
+            skip("Flaky test, feature will be rewritten");
             longText.focus = true;
             var handler = findChild(longText, "input_handler");
             var y = longText.height / 2;

=== renamed file 'tests/unit/tst_components/tst_toolbaritems.qml' => 'tests/unit_x11/tst_components/tst_toolbaritems.qml'
=== modified file 'tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml'
--- tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml	2014-04-23 08:50:20 +0000
+++ tests/unit_x11/tst_inversemousearea/InverseMouseAreaInWindow.qml	2014-06-18 15:28:52 +0000
@@ -21,6 +21,7 @@
 Item{
     id: root
     property string log: ""
+//    onLogChanged: print("LOG", log)
     width: units.gu(100)
     height: units.gu(100)
 
@@ -28,9 +29,11 @@
         objectName: "isawindow"
         width: units.gu(50)
         height: units.gu(50)
+        visible: true
 
         Item {
             id: clickArea
+            objectName: "clickArea"
             anchors {
                 left: parent.left
                 right: parent.right

=== modified file 'tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp'
--- tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp	2014-04-15 21:37:57 +0000
+++ tests/unit_x11/tst_inversemousearea/tst_inversemouseareatest.cpp	2014-06-18 15:28:52 +0000
@@ -22,10 +22,10 @@
 #include <QtQuick/QQuickItem>
 #include <QtCore/QEvent>
 
+#include "uctestcase.h"
 #include "inversemouseareatype.h"
 #include "ucunits.h"
 #include <private/qquickevents_p_p.h>
-#include <qpa/qwindowsysteminterface.h>
 
 #define DOUBLECLICK_TIMEOUT 400
 
@@ -78,13 +78,6 @@
         return QPointF(UCUnits::instance().gu(guX), UCUnits::instance().gu(guY)).toPoint();
     }
 
-    void touchClick(QWindow *window, const QPoint &point)
-    {
-        QTest::touchEvent(window, device).press(0, point, window);
-        QTest::qWait(10);
-        QTest::touchEvent(window, device).release(0, point, window);
-    }
-
 protected Q_SLOTS:
     void capturePressed(QQuickMouseEvent *event)
     {
@@ -95,16 +88,14 @@
 
     void initTestCase()
     {
+        // make sure we have a touch device installed
+        UbuntuTestCase::registerTouchDevice();
         QString modules("../../../modules");
         QVERIFY(QDir(modules).exists());
 
         quickView = new QQuickView(0);
         quickEngine = quickView->engine();
 
-        device = new QTouchDevice;
-        device->setType(QTouchDevice::TouchScreen);
-        QWindowSystemInterface::registerTouchDevice(device);
-
         quickView->setGeometry(0,0, 240, 320);
         //add modules folder so we have access to the plugin from QML
         QStringList imports = quickEngine->importPathList();
@@ -139,7 +130,6 @@
         QVERIFY(eventCleanup.isEmpty());
     }
 
-
     void testCase_PropagateEvents()
     {
         eventCleanup.clear();
@@ -167,10 +157,14 @@
         InverseMouseAreaType *area = testArea("InverseMouseAreaInWindow.qml");
         QVERIFY(area);
         quickView->show();
+        QTest::qWaitForWindowExposed(quickView);
 
         QList<QQuickWindow *> l = quickView->rootObject()->findChildren<QQuickWindow*>("isawindow");
         QVERIFY(l.count());
 
+        QQuickItem *clickArea = quickView->rootObject()->findChild<QQuickItem*>("clickArea");
+        QVERIFY(clickArea);
+
         QTest::mouseClick(l[0], Qt::LeftButton, 0, QPoint(20, 10));
         QTest::waitForEvents();
         QCOMPARE(quickView->rootObject()->property("log").toString(), QString("IMA"));
@@ -519,7 +513,7 @@
         QCOMPARE(imaSpy.count(), 1);
 
         imaSpy.clear();
-        touchClick(quickView, guPoint(20, 5));
+        UbuntuTestCase::touchClick(0, quickView, guPoint(20, 5));
         QCOMPARE(imaSpy.count(), 1);
     }
 

=== renamed directory 'tests/unit/tst_page' => 'tests/unit_x11/tst_page'
=== renamed directory 'tests/unit/tst_ubuntu_shape' => 'tests/unit_x11/tst_ubuntu_shape'
=== modified file 'tests/unit_x11/unit_x11.pro'
--- tests/unit_x11/unit_x11.pro	2013-12-29 19:15:15 +0000
+++ tests/unit_x11/unit_x11.pro	2014-06-18 15:28:52 +0000
@@ -1,4 +1,12 @@
 TEMPLATE = subdirs
 
-SUBDIRS += tst_components tst_test tst_inversemousearea tst_recreateview tst_statesaver tst_theme_engine tst_orientation tst_layouts \
+SUBDIRS += tst_components \
+    tst_ubuntu_shape \
+    tst_page \
+    tst_test \
+    tst_inversemousearea \
+    tst_recreateview \
+    tst_statesaver \
+    tst_theme_engine \
+    tst_orientation tst_layouts \
     tst_mousefilters