Merge lp:~zsombi/ubuntu-ui-toolkit/45-selected-option-rebinds into lp:~zsombi/ubuntu-ui-toolkit/listitem-master

[Zsombor Egri]

Selected leading/trailing action rebinds contentItem.

[lp:~zsombi/ubuntu-ui-toolkit/45-selected-option-rebinds]

1252. By Zsombor Egri on 2014-09-19

prereq sync

1253. By Zsombor Egri on 2014-09-24

prereq sync

1254. By Zsombor Egri on 2014-09-25

prereq sync

1255. By Zsombor Egri on 2014-09-25

fixing test cases

1256. By Zsombor Egri on 2014-09-25

tests fixed

1257. By Zsombor Egri on 2014-09-25

naming fix

1258. By Zsombor Egri on 2014-09-29

prereq sync

1259. By Zsombor Egri on 2014-10-02

prereq sync

1260. By Zsombor Egri on 2014-10-13

prereq sync

1261. By Zsombor Egri on 2014-10-20

prereq sync

1262. By Zsombor Egri on 2014-10-22

prereq sync

1263. By Zsombor Egri on 2014-10-22

prereq sync

1264. By Zsombor Egri on 2014-10-23

prereq sync

1265. By Zsombor Egri on 2014-10-23

prereq sync

1266. By Zsombor Egri on 2014-10-24

prereq sync

1267. By Zsombor Egri on 2014-10-30

prereq sync

1268. By Zsombor Egri on 2014-10-30

test fixed

1269. By Zsombor Egri on 2014-10-30

prereq sync

1270. By Zsombor Egri on 2014-11-04

prereq sync

1271. By Zsombor Egri on 2014-11-07

prereq sync

1272. By Zsombor Egri on 2014-11-07

prereq sync

1273. By Zsombor Egri on 2014-11-07

test fix ongoing

1274. By Zsombor Egri on 2014-11-07

based on Flickable's thinking, rename data and children properties to listItemData/listItemChildren to not to interfere with the original properties. This affects testing as well, as by using the original property names the QML children or data lookup cannot find the panelItem anymore.

1275. By Zsombor Egri on 2014-11-07

API updated

1276. By Zsombor Egri on 2014-11-10

prereq sync

1277. By Zsombor Egri on 2014-11-12

prereq sync

1278. By Zsombor Egri on 2014-11-12

prereq sync

1279. By Zsombor Egri on 2014-11-17

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-24

prereq sync

1286. By Zsombor Egri on 2014-11-24

prereq sync

1287. By Zsombor Egri on 2014-11-25

prereq sync

1288. By Zsombor Egri on 2014-11-25

options renamed to actions

[Tim Peeters (tpeeters)]

for lp:~tpeeters/+junk/lists I am trying to print the index of the list item for which an action was triggered, by adding
onTriggered: print("Action "+value)
value returns undefined if I don't set the parameterType of the Action to be Integer.

Can/Should we set the parameterType automatically? Or at least document that we should set it here? We can at least check that the parameterType is Integer, but I'm not sure what to do if it is not.

[Tim Peeters (tpeeters)]

^comes in 60-

review: Approve

=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml	2014-11-25 10:59:26 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml	2014-11-25 10:59:28 +0000
@@ -18,7 +18,7 @@
 import Ubuntu.Components 1.2
 
 /*
-  This component is the holder of the ListItem options.
+  This component is the holder of the ListItem actions.
   */
 Item {
 
@@ -43,8 +43,8 @@
     // panel implementation
     id: panel
     width: Math.max(
-               optionsRow.childrenRect.width,
-               ListItemActions.visibleActions.length * MathUtils.clamp(visualizedActionWidth, height, optionsRow.maxItemWidth))
+               actionsRow.childrenRect.width,
+               ListItemActions.visibleActions.length * MathUtils.clamp(visualizedActionWidth, height, actionsRow.maxItemWidth))
 
     // used for module/autopilot testing
     objectName: "ListItemPanel" + (leading ? "Leading" : "Trailing")
@@ -54,7 +54,7 @@
       */
     readonly property Item contentItem: parent ? parent.contentItem : null
     /*
-      Specifies whether the panel is used to visualize leading or trailing options.
+      Specifies whether the panel is used to visualize leading or trailing actions.
       */
     readonly property bool leading: panel.ListItemActions.status == panel.ListItemActions.Leading
 
@@ -76,8 +76,16 @@
         color: panel.backgroundColor
     }
 
+    // handle action triggering
+    ListItemActions.onStatusChanged: {
+        if (ListItemActions.status === ListItemActions.Disconnected && actionsRow.selectedAction) {
+            actionsRow.selectedAction.trigger(actionsRow.listItemIndex >= 0 ? actionsRow.listItemIndex : null);
+            actionsRow.selectedAction = null;
+        }
+    }
+
     Row {
-        id: optionsRow
+        id: actionsRow
         anchors {
             left: parent.left
             top: parent.top
@@ -87,17 +95,25 @@
 
         property real maxItemWidth: panel.parent ? (panel.parent.width / panel.ListItemActions.visibleActions.length) : 0
 
+        property Action selectedAction
+        property int listItemIndex
+
         Repeater {
             model: panel.ListItemActions.visibleActions
             AbstractButton {
                 action: modelData
                 enabled: action.enabled
                 opacity: action.enabled ? 1.0 : 0.5
-                width: MathUtils.clamp(delegateLoader.item ? delegateLoader.item.width : 0, height, optionsRow.maxItemWidth)
+                width: MathUtils.clamp(delegateLoader.item ? delegateLoader.item.width : 0, height, actionsRow.maxItemWidth)
                 anchors {
                     top: parent.top
                     bottom: parent.bottom
                 }
+                function trigger() {
+                    actionsRow.selectedAction = modelData;
+                    actionsRow.listItemIndex = panel.ListItemActions.listItemIndex;
+                    panel.ListItemActions.snapToPosition(0.0);
+                }
 
                 Rectangle {
                     anchors.fill: parent

=== modified file 'modules/Ubuntu/Components/plugin/uclistitem_p.h'
--- modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-11-25 10:59:26 +0000
+++ modules/Ubuntu/Components/plugin/uclistitem_p.h	2014-11-25 10:59:28 +0000
@@ -83,13 +83,11 @@
     QQmlComponent *styleComponent;
     UCListItemStyle *styleItem;
 
-    // getter/setters
+    // getters/setters
     QQmlListProperty<QObject> data();
     QQmlListProperty<QQuickItem> children();
     bool contentMoving() const;
     void setContentMoving(bool moved);
-    QQuickPropertyAnimation *snapAnimation() const;
-    void setSnapAnimation(QQuickPropertyAnimation *animation);
     QQmlComponent *style() const;
     void setStyle(QQmlComponent *delegate);
     bool loadStyle();

=== modified file 'tests/unit_x11/tst_components/tst_listitem.qml'
--- tests/unit_x11/tst_components/tst_listitem.qml	2014-11-25 10:59:26 +0000
+++ tests/unit_x11/tst_components/tst_listitem.qml	2014-11-25 10:59:28 +0000
@@ -50,7 +50,6 @@
         id: trailing
         actions: [
             stockAction,
-            stockAction,
         ]
     }
     ListItemActions {
@@ -170,7 +169,7 @@
             compare(defaults.__styleInstance, null, "__styleInstance must be null.");
 
             compare(actionsDefault.delegate, null, "ListItemActions has no delegate set by default.");
-            compare(actionsDefault.actions.length, 0, "ListItemActions has no options set.");
+            compare(actionsDefault.actions.length, 0, "ListItemActions has no actions set.");
         }
 
         function test_children_in_content_item() {
@@ -244,7 +243,7 @@
             testItem.divider.visible = true;
         }
 
-        function test_touch_tug_options_data() {
+        function test_tug_actions_data() {
             var item = findChild(listView, "listItem0");
             return [
                 {tag: "Trailing, mouse", item: item, pos: centerOf(item), dx: -units.gu(20), positiveDirection: false, mouse: true},
@@ -253,7 +252,7 @@
                 {tag: "Leading, touch", item: item, pos: centerOf(item), dx: units.gu(20), positiveDirection: true, mouse: false},
             ];
         }
-        function test_touch_tug_options(data) {
+        function test_tug_actions(data) {
             listView.positionViewAtBeginning();
             movingSpy.target = data.item;
             if (data.mouse) {
@@ -263,9 +262,9 @@
             }
             movingSpy.wait();
             if (data.positiveDirection) {
-                verify(data.item.contentItem.x > 0, data.tag + " options did not show up");
+                verify(data.item.contentItem.x > 0, data.tag + " actions did not show up");
             } else {
-                verify(data.item.contentItem.x < 0, data.tag + " options did not show up");
+                verify(data.item.contentItem.x < 0, data.tag + " actions did not show up");
             }
 
             // dismiss
@@ -277,9 +276,9 @@
             var item1 = findChild(listView, "listItem1");
             return [
                 {tag: "Click on an other Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item1, mouse: true},
-                {tag: "Click on the same Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item0.contentItem, mouse: true},
+                {tag: "Click on the same Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item0, mouse: true},
                 {tag: "Tap on an other Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item1, mouse: false},
-                {tag: "Tap on the same Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item0.contentItem, mouse: false},
+                {tag: "Tap on the same Item", item: item0, pos: centerOf(item0), dx: -units.gu(20), clickOn: item0, mouse: false},
             ];
         }
         function test_rebound_when_pressed_outside_or_clicked(data) {
@@ -352,5 +351,38 @@
             // dismiss
             rebound(data.item);
         }
+
+        function test_selecting_action_rebounds_data() {
+            var item0 = findChild(listView, "listItem0");
+            return [
+                {tag: "With mouse", item: item0, pos: centerOf(item0), dx: units.gu(20), leading: true, select: "leading_1", mouse: true},
+                {tag: "With touch", item: item0, pos: centerOf(item0), dx: units.gu(20), leading: true, select: "leading_1", mouse: false},
+            ]
+        }
+        function test_selecting_action_rebounds(data) {
+            listView.positionViewAtBeginning();
+            movingSpy.target = data.item;
+            if (data.mouse) {
+                flick(data.item, data.pos.x, data.pos.y, data.dx, 0);
+            } else {
+                TestExtras.touchDrag(0, data.item, data.pos, Qt.point(data.dx, 0));
+            }
+            movingSpy.wait();
+            verify(data.item.contentItem.x > 0, "Not snapped in!");
+            var panel = panelItem(data.item, data.leading);
+            verify(panel, "panelItem not found");
+            var selectedAction = findChild(panel, data.select);
+            verify(selectedAction, "Cannot select action " + data.select);
+
+            // dismiss
+            movingSpy.clear();
+            if (data.mouse) {
+                mouseClick(selectedAction, centerOf(selectedAction).x, centerOf(selectedAction).y);
+            } else {
+                TestExtras.touchClick(0, selectedAction, centerOf(selectedAction));
+            }
+            movingSpy.wait();
+            fuzzyCompare(data.item.contentItem.x, 0.0, 0.1, "Content not snapped out");
+        }
     }
 }