Merge lp:~aacid/unity8/icon-actions into lp:unity8

[Albert Astals Cid]

icon-actions preview widget

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
sizes and behaviour are agreed by design

[lp:~aacid/unity8/icon-actions]

1847. By Albert Astals Cid on 2015-07-06

Don't live in the past yo!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1847
http://jenkins.qa.ubuntu.com/job/unity8-ci/5947/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/273
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/227
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/228
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/273
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/273/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21676

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5947/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

review: Needs Fixing

[lp:~aacid/unity8/icon-actions]

1848. By Albert Astals Cid on 2015-07-08

use row.actoins

1849. By Albert Astals Cid on 2015-07-08

sourcesize the icon

[Albert Astals Cid (aacid)]

> I'm missing where this is needed... maybe you wanted to add this check for the model of the repeater?
Yes, done

> sourceSize?
Added

> do we want those two logs?
Yeah, helps with manual testing (i.e. "make tryPreviewIconActions")

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1849
http://jenkins.qa.ubuntu.com/job/unity8-ci/5995/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/283/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/234
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/195/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/283
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/283/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21717

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5995/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/icon-actions]

1850. By Albert Astals Cid on 2015-07-08

implicitHeight is better, thanks Cimi!

1851. By Albert Astals Cid on 2015-07-08

Make Cimi happy

1852. By Albert Astals Cid on 2015-07-08

Cimi wants more if

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1850
http://jenkins.qa.ubuntu.com/job/unity8-ci/6001/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/239
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/240
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/289
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/289/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21724

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6001/rebuild

review: Needs Fixing (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
 * Did CI run pass? If not, please explain why.
ap
 * Did you make sure that the branch does not contain spurious tags?
yeah

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1852
http://jenkins.qa.ubuntu.com/job/unity8-ci/6004/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/292
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/243
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/292
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/292/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21729

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6004/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1852
http://jenkins.qa.ubuntu.com/job/unity8-ci/6044/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/346/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-wily/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-amd64-ci/282
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-wily-i386-ci/283
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/253/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/346
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/346/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21866

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6044/rebuild

review: Needs Fixing (continuous-integration)

=== added file 'qml/Dash/Previews/PreviewIconActions.qml'
--- qml/Dash/Previews/PreviewIconActions.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/PreviewIconActions.qml	2015-07-08 12:53:05 +0000
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.1
+import Ubuntu.Components 1.1
+
+/*! This preview widget icons+label for number of items in widgetData["actions"].
+ *  For each of the items we recognize the fields "label", "icon", "temporaryIcon" and "id".
+ *  temporaryIcon is the icon that will be shown just after the user presses icon until the
+ *  scope refreshes the preview
+ */
+
+PreviewWidget {
+    id: root
+
+    implicitHeight: row.height
+
+    Row {
+        id: row
+        readonly property var actions: root.widgetData ? root.widgetData["actions"] : null
+        width: parent.width
+
+        spacing: units.gu(2)
+
+        Repeater {
+            model: row.actions
+
+            AbstractButton {
+                objectName: "button" + modelData.id
+                height: label.height
+                width: childrenRect.width
+
+                Image {
+                    id: icon
+                    height: parent.height
+                    width: height
+                    source: modelData.icon
+                    sourceSize { width: icon.width; height: icon.height }
+                }
+
+                Label {
+                    id: label
+                    anchors.left: icon.right
+                    anchors.leftMargin: visible ? units.gu(0.5) : 0
+                    text: modelData.label
+                    visible: text !== ""
+                }
+
+                onClicked: {
+                    if (modelData.temporaryIcon) {
+                        icon.source = modelData.temporaryIcon;
+                    }
+                    root.triggered(root.widgetId, modelData.id, modelData);
+                }
+            }
+        }
+    }
+
+}

=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2015-05-08 13:12:02 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2015-07-08 12:53:05 +0000
@@ -53,6 +53,7 @@
             case "expandable": return "PreviewExpandable.qml";
             case "gallery": return "PreviewImageGallery.qml";
             case "header": return "PreviewHeader.qml";
+            case "icon-actions": return "PreviewIconActions.qml";
             case "image": return "PreviewZoomableImage.qml";
             case "progress": return "PreviewProgress.qml";
             case "payments": return "PreviewPayments.qml";

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2015-06-18 19:23:08 +0000
+++ tests/qmltests/CMakeLists.txt	2015-07-08 12:53:05 +0000
@@ -29,6 +29,7 @@
 add_unity8_qmltest(Dash/Previews PreviewAudioPlayback)
 add_unity8_qmltest(Dash/Previews PreviewExpandable)
 add_unity8_qmltest(Dash/Previews PreviewHeader)
+add_unity8_qmltest(Dash/Previews PreviewIconActions)
 add_unity8_qmltest(Dash/Previews PreviewImageGallery)
 add_unity8_qmltest(Dash/Previews PreviewPayments)
 add_unity8_qmltest(Dash/Previews PreviewProgress)

=== added file 'tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml	2015-07-08 12:53:05 +0000
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import QtTest 1.0
+import "../../../../qml/Dash/Previews"
+import Unity.Test 0.1 as UT
+import Ubuntu.Components 0.1
+
+
+Rectangle {
+    id: root
+    width: units.gu(60)
+    height: units.gu(80)
+
+    property var actionDataActions: {
+        "actions": [{"label": "10", "id": "someid", "icon": Qt.resolvedUrl("../artwork/[e-mail]"), "temporaryIcon": Qt.resolvedUrl("../artwork/emblem.png")},
+                    {"label": "12", "id": "someid2", "icon": Qt.resolvedUrl("../artwork/checkers.png"), "temporaryIcon": Qt.resolvedUrl("../artwork/background.png")},
+                    {"label": "", "id": "someid3", "icon": Qt.resolvedUrl("../artwork/music-player-design.png")},
+        ]
+    }
+
+    SignalSpy {
+        id: spy
+        signalName: "triggered"
+    }
+
+    PreviewIconActions {
+        id: preview
+        widgetId: "iconActions"
+        widgetData: actionDataActions
+        onTriggered: {
+            if (timer.index !== -1) {
+                if (!testcase.running) {
+                    console.log("Processing other click, ignoring");
+                }
+                return;
+            }
+
+            for (var i in actionDataActions.actions) {
+                if (actionId == actionDataActions.actions[i].id) {
+                    timer.index = i;
+                    break;
+                }
+            }
+
+            timer.start();
+            if (!testcase.running) {
+                console.log("triggered", widgetId, actionId);
+            }
+        }
+        width: parent.width
+        clip: true
+    }
+
+    Timer {
+        id: timer
+        property int index: -1
+        interval: 500
+        onTriggered: {
+            actionDataActions.actions[index].icon = Qt.resolvedUrl("../../UnityLogo.png");
+            preview.widgetDataChanged();
+            index = -1;
+        }
+    }
+
+    UT.UnityTestCase {
+        id: testcase
+        name: "PreviewIconActionTest"
+        when: windowShown
+
+        function cleanup()
+        {
+            spy.clear();
+        }
+
+        function test_checkButtonWithTemporary_data() {
+            return [
+                {tag: "with temporary", temporaryIcon: "emblem", index: 0},
+                {tag: "without temporary", temporaryIcon: undefined, index: 2},
+            ];
+        }
+
+        function test_checkButtonWithTemporary(data) {
+            spy.target = preview;
+
+            var buttonId = actionDataActions.actions[data.index].id;
+            var buttonIcon = actionDataActions.actions[data.index].icon;
+            var buttonTemporaryIcon = actionDataActions.actions[data.index]["temporaryIcon"];
+            var buttonLabel = actionDataActions.actions[data.index].label;
+
+            var button = findChild(root, "button" + buttonId);
+            var image = findChildsByType(button, "QQuickImage")[0];
+            var label = findChildsByType(button, "Label")[0];
+
+            compare(image.source, buttonIcon);
+            compare(label.text, buttonLabel);
+            mouseClick(button);
+            compare(spy.count, 1);
+            compare(spy.signalArguments[0][1], buttonId);
+
+            if (buttonTemporaryIcon) {
+                compare(image.source, buttonTemporaryIcon);
+            }
+
+            tryCompareFunction(function() {
+                var button = findChild(root, "button" + buttonId);
+                var image = findChildsByType(button, "QQuickImage")[0];
+                return image.source && image.source.toString().indexOf("UnityLogo") > -1;
+            }, true);
+        }
+    }
+}