Merge lp:~zsombi/ubuntu-ui-toolkit/78-action-property into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Introducing action property in ListItem.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1379
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1372/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/853
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/99
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/99
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/745
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/851
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/851/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17187

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1372/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1383
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1381/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/934
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/111
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/111/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/108
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/825
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/932
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/932/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17353

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1381/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

128 + * import QtQiock 2.3

review: Needs Fixing

[Tim Peeters (tpeeters)]

128 + * import QtQiock 2.3
129 + * import Ubuntu.Components 1.2
130 + *
131 + * ListItem {
132 + * Label {
133 + * text: "This is a label"
134 + * }
135 + * Switch {
136 + * id: toggle
137 + * anchors.right: parent.right
138 + * }
139 + * Component.onCompleted: clicked.connect(toggle.clicked)
140 + * }

please update the example so that it is an actual qml program that can be run (this one doesn't have width and height set, so it won't show anything)

[Tim Peeters (tpeeters)]

139 + * Component.onCompleted: clicked.connect(toggle.clicked)

The way you set this up seems more complicated than needed. Why not use this:

    onClicked: toggle.checked = !toggle.checked

[Tim Peeters (tpeeters)]

160 + * The property holds the default action attached to the list item which will be
161 + * triggered when the ListItem is clicked. ListItem will not visualize the action,

why *default* action? You could say "The action that will be triggered when the ListItem is clicked"

[Tim Peeters (tpeeters)]

please make this also a working example that I can simply copy&paste and then run

175 + * ListItem {
176 + * property bool emitActionTriggered: false
177 + * action: Action {
178 + * onTriggered: console.log("action triggered", value)
179 + * }
180 + * onPresseAndHold: {
181 + * console.log("suppresses clicked() signal, also action triggered");
182 + * emitActionTriggered = true;
183 + * }
184 + * onHighlightedChanged: {
185 + * if (!highlighted && emitActionTriggered) {
186 + * emitActionTriggered = false;
187 + * action.trigger(index);
188 + * }
189 + * }
190 + * }
191 + * \endqml

[Tim Peeters (tpeeters)]

169 + * \note Handling pressAndHold will suppress the action triggering as the clicked
170 + * signal is also suppressed. If the action triggering is still needed, it must be
171 + * triggered manually on \l highlighted changed.

this is odd. We had something similar in a previous MR.

But it is possible to support both clicked and longpress. From the text it appears as if defining onPressAndHold:..., action handling will be disabled. But I think what it means is that if pressAndHold happens, no clicked event will follow. I think it is already clear that there will be no clicked() event after pressAndHold.

[Tim Peeters (tpeeters)]

180 + * onPresseAndHold: {

can you run the examples that you add to the documentation to make sure they work and there are no errors in it?

[Tim Peeters (tpeeters)]

175 + * ListItem {
176 + * property bool emitActionTriggered: false
177 + * action: Action {
178 + * onTriggered: console.log("action triggered", value)
179 + * }
180 + * onPresseAndHold: {
181 + * console.log("suppresses clicked() signal, also action triggered");
182 + * emitActionTriggered = true;
183 + * }
184 + * onHighlightedChanged: {
185 + * if (!highlighted && emitActionTriggered) {
186 + * emitActionTriggered = false;
187 + * action.trigger(index);
188 + * }
189 + * }
190 + * }

This example is I think a bit of a corner case and will only confuse the developers. Normally after a longpress you don't need to handle clicked when you release again. I think we can remove this example.

[Tim Peeters (tpeeters)]

255 + UCAction *defaultAction;

why call this defaultAction and not action?

[Tim Peeters (tpeeters)]

298 + ListItem {
299 + Label {
300 + text: "Switch makes this item to highlight"
301 + }
302 + Switch {
303 + id: toggle
304 + anchors.right: parent.right
305 + }
306 + Component.onCompleted: clicked.connect(toggle.clicked)

same comment as for the example above, why not say onClicked: toggle.checked = !toggle.checked?

307 + }
308 + ListItem {
309 + Label {
310 + text: "No action, no trailing/leading actions, no active component"
311 + }
312 + onClicked: print("clicked")
313 + onPressAndHold: print("longPressed")
314 + }

this is fine, but for this MR, maybe you should add a ListItem with an action?

[Tim Peeters (tpeeters)]

95 + function test_action_triggered_on_clicked() {
396 + testItem.action = stockAction;
397 + actionSpy.target = stockAction;
398 + clickSpy.target = testItem;
399 + mouseClick(testItem, centerOf(testItem).x, centerOf(testItem).y);
400 + clickSpy.wait();
401 + actionSpy.wait();
402 + }

no need to have an actionSpy.count check here?

[Zsombor Egri (zsombi)]

> 128 + * import QtQiock 2.3
Removed

[Zsombor Egri (zsombi)]

> 128 + * import QtQiock 2.3
> 129 + * import Ubuntu.Components 1.2
> 130 + *
> 131 + * ListItem {
> 132 + * Label {
> 133 + * text: "This is a label"
> 134 + * }
> 135 + * Switch {
> 136 + * id: toggle
> 137 + * anchors.right: parent.right
> 138 + * }
> 139 + * Component.onCompleted: clicked.connect(toggle.clicked)
> 140 + * }
>
> please update the example so that it is an actual qml program that can be run
> (this one doesn't have width and height set, so it won't show anything)

As said on IRC, this is a snippet, so one can take it and put it in an app. Width is taken from the parent, or if no parent is given, it'll default to 40GU; and height defaults to 7GU, as documented.

[Zsombor Egri (zsombi)]

> 139 + * Component.onCompleted: clicked.connect(toggle.clicked)
>
> The way you set this up seems more complicated than needed. Why not use this:
>
> onClicked: toggle.checked = !toggle.checked

Either ways is good, but this one destroys the binding you may have on the checked property, right? So connecting the signals makes sure the property binding stays.

[Zsombor Egri (zsombi)]

> 160 + * The property holds the default action attached to the list item
> which will be
> 161 + * triggered when the ListItem is clicked. ListItem will not
> visualize the action,
>
> why *default* action? You could say "The action that will be triggered when
> the ListItem is clicked"

The reason for naming like that is to differentiate it from leading/trailing ones.

[Zsombor Egri (zsombi)]

> please make this also a working example that I can simply copy&paste and then
> run
>
> 175 + * ListItem {
> 176 + * property bool emitActionTriggered: false
> 177 + * action: Action {
> 178 + * onTriggered: console.log("action triggered", value)
> 179 + * }
> 180 + * onPresseAndHold: {
> 181 + * console.log("suppresses clicked() signal, also action
> triggered");
> 182 + * emitActionTriggered = true;
> 183 + * }
> 184 + * onHighlightedChanged: {
> 185 + * if (!highlighted && emitActionTriggered) {
> 186 + * emitActionTriggered = false;
> 187 + * action.trigger(index);
> 188 + * }
> 189 + * }
> 190 + * }
> 191 + * \endqml

Being a code snippet, you can copy/paste in your app any time.

[Zsombor Egri (zsombi)]

> 169 + * \note Handling pressAndHold will suppress the action triggering as
> the clicked
> 170 + * signal is also suppressed. If the action triggering is still
> needed, it must be
> 171 + * triggered manually on \l highlighted changed.
>
> this is odd. We had something similar in a previous MR.
>
> But it is possible to support both clicked and longpress. From the text it
> appears as if defining onPressAndHold:..., action handling will be disabled.
> But I think what it means is that if pressAndHold happens, no clicked event
> will follow. I think it is already clear that there will be no clicked() event
> after pressAndHold.

I think what we did we simply removed from the #77 MR, as this cannot really be formulated to be understandable enough. Let's do the same here.

[Zsombor Egri (zsombi)]

> 175 + * ListItem {
> 176 + * property bool emitActionTriggered: false
> 177 + * action: Action {
> 178 + * onTriggered: console.log("action triggered", value)
> 179 + * }
> 180 + * onPresseAndHold: {
> 181 + * console.log("suppresses clicked() signal, also action
> triggered");
> 182 + * emitActionTriggered = true;
> 183 + * }
> 184 + * onHighlightedChanged: {
> 185 + * if (!highlighted && emitActionTriggered) {
> 186 + * emitActionTriggered = false;
> 187 + * action.trigger(index);
> 188 + * }
> 189 + * }
> 190 + * }
>
> This example is I think a bit of a corner case and will only confuse the
> developers. Normally after a longpress you don't need to handle clicked when
> you release again. I think we can remove this example.

Indeed...

[Zsombor Egri (zsombi)]

> 255 + UCAction *defaultAction;
>
> why call this defaultAction and not action?

Let's call it mainAction then, action would collide with action() getter.

[Zsombor Egri (zsombi)]

> 298 + ListItem {
> 299 + Label {
> 300 + text: "Switch makes this item to highlight"
> 301 + }
> 302 + Switch {
> 303 + id: toggle
> 304 + anchors.right: parent.right
> 305 + }
> 306 + Component.onCompleted: clicked.connect(toggle.clicked)
>
> same comment as for the example above, why not say onClicked: toggle.checked =
> !toggle.checked?

As said before, that destroys any binding to it. This doesn't.

>
>
> 307 + }
> 308 + ListItem {
> 309 + Label {
> 310 + text: "No action, no trailing/leading actions, no
> active component"
> 311 + }
> 312 + onClicked: print("clicked")
> 313 + onPressAndHold: print("longPressed")
> 314 + }
>
>
> this is fine, but for this MR, maybe you should add a ListItem with an action?

ok, done.

[Zsombor Egri (zsombi)]

> 95 + function test_action_triggered_on_clicked() {
> 396 + testItem.action = stockAction;
> 397 + actionSpy.target = stockAction;
> 398 + clickSpy.target = testItem;
> 399 + mouseClick(testItem, centerOf(testItem).x,
> centerOf(testItem).y);
> 400 + clickSpy.wait();
> 401 + actionSpy.wait();
> 402 + }
>
> no need to have an actionSpy.count check here?

Why would you need that? Actually the clickSpy is the unnecessary thing here. Or would you want to see that the action i triggered once only?

[lp:~zsombi/ubuntu-ui-toolkit/78-action-property]

1384. By Zsombor Egri on 2015-02-05

review comments applied

[Tim Peeters (tpeeters)]

great, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-02-03 18:11:32 +0000
+++ components.api	2015-02-05 14:40:22 +0000
@@ -869,6 +869,7 @@
     Property { name: "contentMoving"; type: "bool"; isReadonly: true }
     Property { name: "color"; type: "QColor" }
     Property { name: "highlightColor"; type: "QColor" }
+    Property { name: "action"; type: "UCAction"; isPointer: true }
     Property { name: "listItemData"; type: "QObject"; isList: true; isReadonly: true }
     Property { name: "listItemChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
     Property { name: "style"; type: "QQmlComponent"; isPointer: true }

=== modified file 'modules/Ubuntu/Components/plugin/ucaction.h'
--- modules/Ubuntu/Components/plugin/ucaction.h	2015-01-06 07:40:49 +0000
+++ modules/Ubuntu/Components/plugin/ucaction.h	2015-02-05 14:40:22 +0000
@@ -87,6 +87,7 @@
     Type m_parameterType;
 
     friend class UCActionContext;
+    friend class UCListItemPrivate;
     friend class UCListItemAttached;
     friend class UCListItemActionsPrivate;
 

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-01-22 11:34:18 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2015-02-05 14:40:22 +0000
@@ -24,6 +24,7 @@
 #include "propertychange_p.h"
 #include "i18n.h"
 #include "quickutils.h"
+#include "ucaction.h"
 #include <QtQml/QQmlInfo>
 #include <QtQuick/private/qquickitem_p.h>
 #include <QtQuick/private/qquickflickable_p.h>
@@ -354,6 +355,7 @@
     , leadingPanel(0)
     , trailingPanel(0)
     , animator(0)
+    , mainAction(0)
     , styleComponent(0)
     , implicitStyleComponent(0)
     , styleItem(0)
@@ -593,6 +595,7 @@
 // returns true if the highlight is possible
 bool UCListItemPrivate::canHighlight(QMouseEvent *event)
 {
+    // if automatic, the highlight should not happen if we clicked on an active component;
     // localPos is a position relative to ListItem which will give us a child from
     // from the original coordinates; therefore we must map the position to the contentItem
    Q_Q(UCListItem);
@@ -604,7 +607,7 @@
    QQuickMouseArea *ma = q->findChild<QQuickMouseArea*>();
    bool activeMouseArea = ma && ma->isEnabled();
    return !activeComponent && (isClickedConnected() || isPressAndHoldConnected() ||
-                               leadingActions || trailingActions || activeMouseArea);
+                               mainAction || leadingActions || trailingActions || activeMouseArea);
 }
 
 // set highlighted flag and update contentItem
@@ -929,7 +932,7 @@
     UCStyledItemBase::itemChange(change, data);
     if (change == ItemParentHasChanged) {
         Q_D(UCListItem);
-        // make sure we are not connected to the previous Flickable
+        // make sure we are not connected to any previous Flickable
         d->listenToRebind(false);
         // check if we are in a positioner, and if that positioner is in a Flickable
         QQuickBasePositioner *positioner = qobject_cast<QQuickBasePositioner*>(data.item);
@@ -1024,7 +1027,8 @@
         // while moving, we cannot select any items
         return;
     }
-    if (event->button() == Qt::LeftButton && d->canHighlight(event)) {
+    if (d->canHighlight(event) && !d->suppressClick
+            && !d->highlighted && event->button() == Qt::LeftButton) {
         // stop any ongoing animation!
         if (d->animator) {
             d->animator->stop();
@@ -1059,7 +1063,12 @@
 
         if (!d->suppressClick) {
             Q_EMIT clicked();
+            if (d->mainAction) {
+                Q_EMIT d->mainAction->trigger(d->index());
+            }
             d->_q_rebound();
+        } else {
+            d->suppressClick = false;
         }
     }
     d->setHighlighted(false);
@@ -1145,6 +1154,7 @@
         QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
         if (child->isEnabled() && (child->acceptedMouseButtons() & mouse->button()) && !qobject_cast<QQuickText*>(child)) {
             Q_D(UCListItem);
+            // suppress click
             d->suppressClick = true;
             // listen for flickable to be able to rebind if movement started there!
             d->listenToRebind(true);
@@ -1299,6 +1309,42 @@
  * is moved horizontally. When in Flickable (or ListView), the item gets un-highlighted
  * (false) when the mouse or touch is moved towards the vertical direction causing
  * the flickable to move.
+ *
+ * Configures the color when highlighted. Defaults to the theme palette's background
+ * color.
+ *
+ * An item is highlighted, thus highlight state toggled, when pressed and it has
+ * one of the following conditions fulfilled:
+ * \list
+ *  \li * \l leadingActions or \l trailingActions set,
+ *  \li * it has an \l action attached
+ *  \li * if the ListItem has an active child component, such as a \l Button, a
+ *      \l Switch, etc.
+ *  \li * in general, if an active (enabled and visible) \c MouseArea is added
+ *      as a child component
+ *  \li * \l clicked signal handler is implemented or there is a slot or function
+ *      connected to it
+ *  \li * \l pressAndHold signal handler is implemented or there is a slot or
+ *      function connected to it.
+ * \endlist
+ *
+ * \note Adding an active component does not mean the component will be activated
+ * when the ListItem will be tapped/clicked outside of the component area. If
+ * such a behavior is needed, that must be done explicitly.
+ * \qml
+ * ListItem {
+ *     Label {
+ *         text: "This is a label"
+ *     }
+ *     Switch {
+ *         id: toggle
+ *         anchors.right: parent.right
+ *     }
+ *     Component.onCompleted: clicked.connect(toggle.clicked)
+ * }
+ * \endqml
+ *
+ * \sa action, leadingActions, trailingActions
  */
 bool UCListItem::highlighted() const
 {
@@ -1340,7 +1386,6 @@
         Q_EMIT q->contentMovementEnded();
     }
     Q_EMIT q->contentMovingChanged();
-
 }
 
 /*!
@@ -1395,6 +1440,37 @@
 }
 
 /*!
+ * \qmlproperty Action ListItem::action
+ * The property holds the action which will be triggered when the ListItem is
+ * clicked. ListItem will not visualize the action, that is the responsibility
+ * of the components placed inside the list item. However, when set, the ListItem
+ * will be highlighted on press.
+ *
+ * If the action set has no value type set, ListItem will set its type to \c
+ * Action.Integer and the \l {Action::triggered}{triggered} signal will be getting
+ * the ListItem index as \e value parameter.
+ *
+ * Defaults no null.
+ */
+UCAction *UCListItemPrivate::action() const
+{
+    return mainAction;
+}
+void UCListItemPrivate::setAction(UCAction *action)
+{
+    Q_Q(UCListItem);
+    if (mainAction == action) {
+        return;
+    }
+    mainAction = action;
+    if (mainAction && (mainAction->m_parameterType == UCAction::None)) {
+        // call setProperty to invoke notify signal
+        mainAction->setProperty("parameterType", UCAction::Integer);
+    }
+    Q_EMIT q->actionChanged();
+}
+
+/*!
  * \qmlproperty real ListItem::swipeOvershoot
  * The property configures the overshoot value on swiping. Its default value is
  * configured by the \l {ListItemStyle}{style}. Any positive value overrides the

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.h'
--- modules/Ubuntu/Components/plugin/uclistitem.h	2015-01-15 10:37:24 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.h	2015-02-05 14:40:22 +0000
@@ -23,8 +23,8 @@
 class UCListItemContent;
 class UCListItemDivider;
 class UCListItemActions;
+class UCAction;
 class UCListItemAttached;
-class QQuickPropertyAnimation;
 class UCListItemPrivate;
 class UCListItem : public UCStyledItemBase
 {
@@ -38,6 +38,7 @@
     Q_PRIVATE_PROPERTY(UCListItem::d_func(), bool contentMoving READ contentMoving NOTIFY contentMovingChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
     Q_PROPERTY(QColor highlightColor READ highlightColor WRITE setHighlightColor RESET resetHighlightColor NOTIFY highlightColorChanged)
+    Q_PRIVATE_PROPERTY(UCListItem::d_func(), UCAction *action READ action WRITE setAction NOTIFY actionChanged DESIGNABLE false)
     Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlListProperty<QObject> listItemData READ data DESIGNABLE false)
     Q_PRIVATE_PROPERTY(UCListItem::d_func(), QQmlListProperty<QQuickItem> listItemChildren READ children NOTIFY listItemChildrenChanged DESIGNABLE false)
     // FIXME move these to StyledItemBase with subtheming
@@ -88,6 +89,7 @@
     void contentMovingChanged();
     void colorChanged();
     void highlightColorChanged();
+    void actionChanged();
     void listItemChildrenChanged();
 
     void clicked();

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-01-15 10:37:24 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2015-02-05 14:40:22 +0000
@@ -96,6 +96,7 @@
     UCActionPanel *leadingPanel;
     UCActionPanel *trailingPanel;
     UCListItemSnapAnimator *animator;
+    UCAction *mainAction;
 
     // FIXME move these to StyledItemBase togehther with subtheming.
     QQmlComponent *styleComponent;
@@ -115,6 +116,8 @@
     void resetStyle();
     void initStyleItem();
     QQuickItem *styleInstance() const;
+    UCAction *action() const;
+    void setAction(UCAction *action);
 };
 
 class UCListItemAttachedPrivate : public QObjectPrivate

=== modified file 'modules/Ubuntu/Components/plugin/ucstyleditembase.cpp'
--- modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2014-11-25 07:30:40 +0000
+++ modules/Ubuntu/Components/plugin/ucstyleditembase.cpp	2015-02-05 14:40:22 +0000
@@ -181,6 +181,7 @@
 {
     // only filter pressed events
     if (event->type() == QEvent::MouseButtonPress) {
+        // send mouse event
         QMouseEvent *mouse = static_cast<QMouseEvent*>(event);
         // the event may occur outside of the parent's boundaries if not clipped
         // therefore must check containment

=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2015-01-15 10:44:36 +0000
+++ tests/resources/listitems/ListItemTest.qml	2015-02-05 14:40:22 +0000
@@ -21,7 +21,8 @@
 MainView {
     id: main
     width: units.gu(50)
-    height: units.gu(100)
+    height: units.gu(105)
+    useDeprecatedToolbar: false
 
     property bool override: false
 
@@ -217,5 +218,23 @@
                 }
             }
         }
+        ListItem {
+            Label {
+                text: "Switch makes this item to highlight"
+            }
+            Switch {
+                id: toggle
+                anchors.right: parent.right
+            }
+            Component.onCompleted: clicked.connect(toggle.clicked)
+        }
+        ListItem {
+            Label {
+                text: "With action assigned"
+            }
+            onClicked: print("clicked")
+            onPressAndHold: print("longPressed")
+            action: stock
+        }
     }
 }

=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	2015-01-19 18:21:40 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2015-02-05 14:40:22 +0000
@@ -114,6 +114,22 @@
                 trailingActions: trailing
             }
         }
+        Flickable {
+            id: testFlickable
+            width: parent.width
+            height: units.gu(28)
+            ListView {
+                id: nestedListView
+                width: parent.width
+                height: units.gu(28)
+                clip: true
+                model: 10
+                delegate: ListItem {
+                    objectName: "listItem" + index
+                    leadingActions: leading
+                }
+            }
+        }
     }
 
     UbuntuTestCase {
@@ -171,6 +187,7 @@
         }
 
         function cleanup() {
+            testItem.action = null;
             movingSpy.clear();
             highlightedSpy.clear();
             clickSpy.clear();
@@ -203,6 +220,7 @@
             compare(defaults.divider.colorTo, "#ffffff", "colorTo differs.");
             fuzzyCompare(defaults.divider.colorTo.a, 0.07, 0.01, "colorTo alpha differs");
             compare(defaults.contentMoving, false, "default is not moving");
+            compare(defaults.action, null, "No action by default.");
             compare(defaults.style, null, "Style is loaded upon first use.");
             compare(defaults.__styleInstance, null, "__styleInstance must be null.");
 
@@ -357,6 +375,7 @@
         }
         function test_listview_not_interactive_while_tugged(data) {
             listView.positionViewAtBeginning();
+            interactiveSpy.target = listView;
             compare(listView.interactive, true, "ListView is not interactive");
             movingSpy.target = data.item;
             interactiveSpy.target = listView;
@@ -672,5 +691,46 @@
             highlightedSpy.wait();
             mouseRelease(clickedConnected, centerOf(clickedConnected).x, centerOf(clickedConnected).y);
         }
+
+        function test_listitem_blocks_ascendant_flickables() {
+            var listItem = findChild(nestedListView, "listItem0");
+            verify(listItem, "Cannot find test item");
+            interactiveSpy.target = testFlickable;
+            movingSpy.target = listItem;
+            // tug leading
+            flick(listItem, centerOf(listItem).x, centerOf(listItem).y, listItem.width / 2, 0);
+            movingSpy.wait();
+            // check if interactive got changed
+            interactiveSpy.wait();
+
+            // cleanup!!!
+            rebound(listItem);
+        }
+
+        function test_action_type_set() {
+            stockAction.parameterType = Action.None;
+            compare(stockAction.parameterType, Action.None, "No parameter type for stockAction!");
+            testItem.action = stockAction;
+            compare(stockAction.parameterType, Action.Integer, "No parameter type for stockAction!");
+        }
+
+        function test_action_triggered_on_clicked() {
+            testItem.action = stockAction;
+            actionSpy.target = stockAction;
+            mouseClick(testItem, centerOf(testItem).x, centerOf(testItem).y);
+            actionSpy.wait();
+        }
+
+        function test_action_suppressed_on_longpress() {
+            testItem.action = stockAction;
+            actionSpy.target = stockAction;
+            clickSpy.target = testItem;
+            pressAndHoldSpy.target = testItem;
+            mouseLongPress(testItem, centerOf(testItem).x, centerOf(testItem).y);
+            mouseRelease(testItem, centerOf(testItem).x, centerOf(testItem).y);
+            pressAndHoldSpy.wait();
+            compare(clickSpy.count, 0, "Click must be suppressed.");
+            compare(actionSpy.count, 0, "Action triggered must be suppressed");
+        }
     }
 }