Merge lp:~zsombi/ubuntu-ui-toolkit/60-action-value-type into lp:~bzoltan/ubuntu-ui-toolkit/new_list_item

[Zsombor Egri]

Use the index of the ListItem if the item has been used in a component which declares the "index" context property within the ListItem's context. Usually comes from ListView or Repeater usage.

Use the index of the ListItem if the item has been used in a component which declares the "index" context property within the ListItem's context. Usually comes from ListView or Repeater usage.

[lp:~zsombi/ubuntu-ui-toolkit/60-action-value-type]

1240. By Zsombor Egri on 2014-09-15

prereq

1241. By Zsombor Egri on 2014-09-15

prereq merge

1242. By Zsombor Egri on 2014-09-15

prereq

1243. By Zsombor Egri on 2014-09-15

test adjusted to be able to swipe teh 4th list item as well

1244. By Zsombor Egri on 2014-09-16

prereq

1245. By Zsombor Egri on 2014-09-17

prereq

1246. By Zsombor Egri on 2014-09-17

prereq

1247. By Zsombor Egri on 2014-09-17

prereq

1248. By Zsombor Egri on 2014-09-17

prereq

1249. By Zsombor Egri on 2014-09-17

prereq

1250. By Zsombor Egri on 2014-09-17

prereq

1251. By Zsombor Egri on 2014-09-17

fixes

1252. By Zsombor Egri on 2014-09-18

prereq sync

1253. By Zsombor Egri on 2014-09-19

prereq sync

1254. By Zsombor Egri on 2014-09-24

prereq sync

1255. By Zsombor Egri on 2014-09-25

prereq sync

1256. By Zsombor Egri on 2014-09-25

prereq sync

1257. By Zsombor Egri on 2014-09-25

prereq sync

1258. By Zsombor Egri on 2014-09-28

prereq sync

1259. By Zsombor Egri on 2014-09-29

prereq sync

1260. By Zsombor Egri on 2014-10-02

prereq sync

1261. By Zsombor Egri on 2014-10-13

prereq sync

1262. By Zsombor Egri on 2014-10-20

prereq sync

1263. By Zsombor Egri on 2014-10-22

prereq sync

1264. By Zsombor Egri on 2014-10-22

prereq sync

1265. By Zsombor Egri on 2014-10-24

prereq sync

1266. By Zsombor Egri on 2014-10-29

prereq sync

1267. By Zsombor Egri on 2014-10-29

fixing action triggering due to snap policy changes

1268. By Zsombor Egri on 2014-10-30

prereq sync

1269. By Zsombor Egri on 2014-10-30

test case adjusted

1270. By Zsombor Egri on 2014-10-31

index fetched every time is required to make sure we always use teh proper index

1271. By Zsombor Egri on 2014-10-31

prereq sync

1272. By Zsombor Egri on 2014-11-03

index fix

1273. By Zsombor Egri on 2014-11-04

prereq sync

1274. By Zsombor Egri on 2014-11-10

prereq sync

1275. By Zsombor Egri on 2014-11-11

panel width fixes

1276. By Zsombor Egri on 2014-11-12

prereq sync

1277. By Zsombor Egri on 2014-11-12

build fix

1278. By Zsombor Egri on 2014-11-12

tests adjustments

1279. By Zsombor Egri on 2014-11-12

prereq sync

1280. By Zsombor Egri on 2014-11-17

prereq sync

1281. By Zsombor Egri on 2014-11-18

prereq sync

1282. By Zsombor Egri on 2014-11-19

prereq sync

1283. By Zsombor Egri on 2014-11-20

prereq sync

1284. By Zsombor Egri on 2014-11-24

prereq sync

1285. By Zsombor Egri on 2014-11-25

prereq sync

1286. By Zsombor Egri on 2014-11-25

prereq sync

1287. By Zsombor Egri on 2014-11-25

prereq sync

1288. By Zsombor Egri on 2014-11-25

prereq sync

1289. By Zsombor Egri on 2014-11-25

semicolon removal rolled back

1290. By Zsombor Egri on 2014-11-28

prereq sync

1291. By Zsombor Egri on 2014-12-01

prereq sync

1292. By Zsombor Egri on 2014-12-01

prereq sync

1293. By Zsombor Egri on 2014-12-01

move action parameterType checking to C++ at the action's addition time

1294. By Zsombor Egri on 2014-12-01

prere sync

1295. By Zsombor Egri on 2014-12-01

action parameter type restrictions documentation reformulated

1296. By Zsombor Egri on 2014-12-01

prereq sync

1297. By Zsombor Egri on 2014-12-01

prereq sync

Unmerged revisions

1297. By Zsombor Egri on 2014-12-01

prereq sync

1296. By Zsombor Egri on 2014-12-01

prereq sync

1295. By Zsombor Egri on 2014-12-01

action parameter type restrictions documentation reformulated

1294. By Zsombor Egri on 2014-12-01

prere sync

1293. By Zsombor Egri on 2014-12-01

move action parameterType checking to C++ at the action's addition time

1292. By Zsombor Egri on 2014-12-01

prereq sync

1291. By Zsombor Egri on 2014-12-01

prereq sync

1290. By Zsombor Egri on 2014-11-28

prereq sync

1289. By Zsombor Egri on 2014-11-25

semicolon removal rolled back

1288. By Zsombor Egri on 2014-11-25

prereq sync

=== modified file 'modules/Ubuntu/Components/ListItemPanel.qml'
--- modules/Ubuntu/Components/ListItemPanel.qml	2014-09-15 08:45:40 +0000
+++ modules/Ubuntu/Components/ListItemPanel.qml	2014-09-15 08:45:41 +0000
@@ -25,6 +25,13 @@
     width: optionsRow.childrenRect.width
 
     readonly property Item contentItem: parent ? parent.contentItem : null
+
+    /*
+      Index of the ListItem, if the ListItem is inside a ListView or has been
+      created using a Repeater.
+      */
+    property int listItemIndex: -1
+
     /*
       Specifies whether the panel is used to visualize leading or trailing options.
       */
@@ -44,6 +51,15 @@
       */
     signal selected()
 
+    // fire selected action when parent is removed
+    onParentChanged: {
+        if (!parent && selectedAction) {
+            selectedAction.triggered(listItemIndex >= 0 ? listItemIndex : null);
+            selectedAction = null;
+        }
+    }
+    property Action selectedAction: null
+
     anchors {
         left: contentItem ? (leadingPanel ? undefined : contentItem.right) : undefined
         right: contentItem ? (leadingPanel ? contentItem.left : undefined) : undefined
@@ -78,7 +94,13 @@
                     top: parent.top
                     bottom: parent.bottom
                 }
-                onTriggered: panel.selected()
+
+                function trigger() {
+                    // save the action as we trigger when the rebound animation is over
+                    // to make sure we properly clean up the blockade of teh Flickables
+                    panel.selectedAction = action;
+                    panel.selected();
+                }
 
                 Loader {
                     id: delegateLoader

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem.cpp'
--- modules/Ubuntu/Components/plugin/uclistitem.cpp	2014-09-15 08:45:40 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem.cpp	2014-09-15 08:45:41 +0000
@@ -279,6 +279,7 @@
     , pressed(false)
     , moved(false)
     , ready(false)
+    , index(-1)
     , xAxisMoveThresholdGU(1.5)
     , reboundAnimation(0)
     , flickableInteractive(0)
@@ -372,6 +373,7 @@
     reboundAnimation->restart();
 }
 
+// set pressed flag and update background
 // called when units size changes
 void UCListItemPrivate::_q_updateSize()
 {
@@ -570,7 +572,14 @@
 void UCListItem::componentComplete()
 {
     UCStyledItemBase::componentComplete();
-    d_func()->ready = true;
+    Q_D(UCListItem);
+    d->ready = true;
+    // is there an index context property?
+    QQmlContext *context = qmlContext(this);
+    QVariant index = context->contextProperty("index");
+    if (index.isValid()) {
+        d->index = index.toInt();
+    }
 }
 
 void UCListItem::itemChange(ItemChange change, const ItemChangeData &data)

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-09-15 08:45:40 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-09-15 08:45:41 +0000
@@ -62,6 +62,7 @@
     bool moved:1;
     bool suppressClick:1;
     bool ready:1;
+    int index;
     qreal xAxisMoveThresholdGU;
     QPointF lastPos;
     QPointF pressedPos;

=== modified file 'modules/Ubuntu/Components/plugin/uclistitemoptions.cpp'
--- modules/Ubuntu/Components/plugin/uclistitemoptions.cpp	2014-09-15 08:45:40 +0000
+++ modules/Ubuntu/Components/plugin/uclistitemoptions.cpp	2014-09-15 08:45:41 +0000
@@ -111,6 +111,7 @@
         return false;
     }
     _this->leading = leading;
+    _this->panelItem->setProperty("listItemIndex", UCListItemPrivate::get(listItem)->index);
     _this->panelItem->setProperty("leadingPanel", leading);
     _this->panelItem->setParentItem(listItem);
     _this->offsetDragged = 0.0;
@@ -127,9 +128,9 @@
     }
 
     QObject::disconnect(_this->panelItem, SIGNAL(selected()), _this->panelItem->parentItem(), SLOT(_q_rebound()));
-    _this->panelItem->setParentItem(0);
     _this->connected = false;
     _this->leading = false;
+    _this->panelItem->setParentItem(0);
     // if there was a queuedItem, make it grab the options list
     if (_this->queuedItem) {
         UCListItemPrivate::get(_this->queuedItem.data())->grabPanel(options, true);

=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2014-09-15 08:45:40 +0000
+++ tests/resources/listitems/ListItemTest.qml	2014-09-15 08:45:41 +0000
@@ -29,7 +29,7 @@
         id: stock
         iconName: "starred"
         text: "Staaaar"
-        onTriggered: print(iconName, "triggered")
+        onTriggered: print(iconName, "triggered", value)
     }
 
     ListItemOptions {
@@ -37,7 +37,7 @@
         objectName: "StockLeading"
         Action {
             iconName: "delete"
-            onTriggered: print(iconName, "triggered")
+            onTriggered: print(iconName, "triggered", value)
         }
         Action {
             iconName: "alarm-clock"
@@ -46,11 +46,11 @@
         }
         Action {
             iconName: "camcorder"
-            onTriggered: print(iconName, "triggered")
+            onTriggered: print(iconName, "triggered", value)
         }
         Action {
             iconName: "stock_website"
-            onTriggered: print(iconName, "triggered")
+            onTriggered: print(iconName, "triggered", value)
         }
     }
 
@@ -63,7 +63,6 @@
         ListItem {
             id: testItem
             objectName: "single"
-            contentItem.color: "lime"
             onClicked: {
                 print("click")
                 main.override = !main.override
@@ -135,11 +134,11 @@
                         leadingOptions: ListItemOptions {
                             Action {
                                 iconName: "edit"
-                                onTriggered: print(iconName, "clicked")
+                                onTriggered: print(iconName, "triggered", value)
                             }
                             Action {
                                 iconName: "delete"
-                                onTriggered: print(iconName, "clicked")
+                                onTriggered: print(iconName, "triggered", value)
                             }
                         }
                         trailingOptions: ListItemOptions {

=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	2014-09-15 08:45:40 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2014-09-15 08:45:41 +0000
@@ -27,17 +27,25 @@
     Action {
         id: stockAction
         iconName: "starred"
+        property var param
+        onTriggered: param = value
     }
     ListItemOptions {
         id: leading
         Action {
-            iconName: "starred"
-        }
-        Action {
-            iconName: "starred"
-        }
-        Action {
-            iconName: "starred"
+            iconName: "delete"
+            property var param
+            onTriggered: param = value
+        }
+        Action {
+            iconName: "edit"
+            property var param
+            onTriggered: param = value
+        }
+        Action {
+            iconName: "camcorder"
+            property var param
+            onTriggered: param = value
         }
     }
     ListItemOptions {
@@ -118,6 +126,11 @@
             target: testItem;
         }
 
+        SignalSpy {
+            id: actionSpy
+            signalName: "triggered"
+        }
+
         function centerOf(item) {
             return Qt.point(item.width / 2, item.height / 2);
         }
@@ -130,6 +143,7 @@
         function cleanup() {
             pressedSpy.clear();
             clickSpy.clear();
+            actionSpy.clear();
             listView.interactive = true;
             // tap on the first item to make sure we are rebounding all
             mouseClick(defaults, 0, 0);
@@ -406,5 +420,35 @@
             }
             waitForRendering(data.item, 800);
         }
+
+        function test_verify_action_value_data() {
+            return [
+                {tag: "Undefined", item: testItem, result: undefined},
+                {tag: "Index 0", item: findChild(listView, "listItem0"), result: 0},
+                {tag: "Index 1", item: findChild(listView, "listItem1"), result: 1},
+                {tag: "Index 2", item: findChild(listView, "listItem2"), result: 2},
+                {tag: "Index 3", item: findChild(listView, "listItem3"), result: 3},
+            ];
+        }
+        function test_verify_action_value(data) {
+            var option = findChild(data.item.leadingOptions.panelItem, "list_option_0");
+            verify(option, "Options panel cannot be reached");
+            // we test the last action, as we tug the first action on leading, which means teh alst will be accessible
+            var len = data.item.leadingOptions.options.length;
+            var action = data.item.leadingOptions.options[len - 1];
+            actionSpy.target = action;
+            actionSpy.clear();
+            // tug options in
+            flick(data.item.contentItem, centerOf(data.item.contentItem).x, centerOf(data.item.contentItem).y, option.width, 0);
+            waitForRendering(data.item.contentItem, 800);
+
+            // select the option
+            mouseClick(data.item, centerOf(option).x, centerOf(option).y);
+            waitForRendering(data.item.contentItem, 800);
+
+            // check the action param
+            actionSpy.wait();
+            compare(action.param, data.result, "Action parameter differs");
+        }
     }
 }