Merge lp:~unity-team/unity8/action_preview_widget into lp:unity8

[Michał Sawicz]

Actions Preview Widget

 * Are there any related MPs required for this MP to build/function as expected?
It's listed in the prerequisite field

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes, the tests work, it's not hooked into the rest of the app yet

 * 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?
No, it's not hooked into the rest of the app yet, will get a whole review when we do that.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:680
http://jenkins.qa.ubuntu.com/job/unity8-ci/2245/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2950
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2686
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1116
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/767
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/769
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/769/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/767
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2589
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2952
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2952/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2687
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2687/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5111
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3682

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

27 + property var data: null

33 + onClicked: triggeredAction(data)

164 + root.triggered(root.widgetId, data.id, data);

306 + compare(spy.signalArguments[0][2], target.widgetData["actions"][buttonNumber]);

Those actions should not submit any data. Only actions triggered by data-generating widgets (rating-input, progress) will actually send any data.

Can we override the clicked() signal to send just the action id?

=====

62 + width: childrenRect.width
63 + height: childrenRect.height

I've a feeling this should be implicitWidth, but the buttons should be divided in two if the widget is wider.

Remember a single button should be right-aligned, too.

=====

81 + id: c

More name, please.

=====

92 + delegate: Button {

Why not PreviewActionButton?

=====

77 + width: c.maxWidth

82 + property real maxWidth: -1

98 + width: implicitWidth < parent.width ? parent.width : implicitWidth

100 + Component.onCompleted: {
101 + c.maxWidth = Math.max(c.maxWidth, implicitWidth);
102 + }

I don't think that's necessary, see above about widths.

=====

83 + anchors.top: moreButton.bottom
84 + anchors.topMargin: spacing

Compress into { } please.

=====

84 + anchors.topMargin: spacing

86 + spacing: height > 0 ? units.gu(1) : 0

Shouldn't the topMargin have that condition instead?

=====

97 + height: moreButton.expanded ? implicitHeight : 0

99 + visible: height > 0

Shouldn't that be on the Column instead?

=====

Animate the Column height please.

=====

142 + width: childrenRect.width

Should be parent-driven.

=====

144 + readonly property var actions: root.widgetData ? root.widgetData["actions"] : null

Move lower in the hierarchy, please, so it's not exposed.

=====

158 + item.model = actions.slice(1)

Smart! ++; please.

=====

174 +

--\n, please.

=====

185 + //! The id of the widget

ETOOMANYTHES, "The widget identifier"?

=====

301 + spy.clear();

→ cleanup()?

=====

303 + compare(spy.count, 1);

spy.wait();

review: Needs Fixing

[Albert Astals Cid (aacid)]

> 27 + property var data: null
>
> 33 + onClicked: triggeredAction(data)
>
> 164 + root.triggered(root.widgetId, data.id, data);
>
> 306 + compare(spy.signalArguments[0][2],
> target.widgetData["actions"][buttonNumber]);
>
> Those actions should not submit any data. Only actions triggered by data-
> generating widgets (rating-input, progress) will actually send any data.

Done

> Can we override the clicked() signal to send just the action id?

No, it complains about duplicate signals

[Albert Astals Cid (aacid)]

> =====
>
> 81 + id: c
>
> More name, please.

done

[Albert Astals Cid (aacid)]

> 92 + delegate: Button {
>
> Why not PreviewActionButton?

Done.

[Albert Astals Cid (aacid)]

> 158 + item.model = actions.slice(1)
>
> Smart! ++; please.

Done

[Albert Astals Cid (aacid)]

>
>
> 174 +
>
> --\n, please.

Really? Done

[Albert Astals Cid (aacid)]

> =====
>
> 185 + //! The id of the widget
>
> ETOOMANYTHES, "The widget identifier"?

Done.

[Albert Astals Cid (aacid)]

> 301 + spy.clear();
>
> → cleanup()?

Object SignalSpy_QMLTYPE_3(0x15abe60) has no method 'cleanup'

So no :D

[Albert Astals Cid (aacid)]

> 303 + compare(spy.count, 1);
>
> spy.wait();

Why? It should trigger immediately and only once, spy.wait() seems a worse check than spy.count == 1

[Albert Astals Cid (aacid)]

> 144 + readonly property var actions: root.widgetData ?
> root.widgetData["actions"] : null
>
> Move lower in the hierarchy, please, so it's not exposed.

Done

[Albert Astals Cid (aacid)]

> 62 + width: childrenRect.width
> 63 + height: childrenRect.height
>
> I've a feeling this should be implicitWidth, but the buttons should be divided
> in two if the widget is wider.
>
> Remember a single button should be right-aligned, too.

I made it implicitWidth and right-aligned the buttons.

I did not understand the "buttons should be divided in two if the widget is wider" part.

[Albert Astals Cid (aacid)]

> 77 + width: c.maxWidth
>
> 82 + property real maxWidth: -1
>
> 98 + width: implicitWidth < parent.width ? parent.width : implicitWidth
>
> 100 + Component.onCompleted: {
> 101 + c.maxWidth = Math.max(c.maxWidth, implicitWidth);
> 102 + }
>
> I don't think that's necessary, see above about widths.

Well, this makes sure all the buttons in the "combo button column" have the same width, otherwise the thing looked ultra ugly to me. Why do you think it's not necessary?

[Albert Astals Cid (aacid)]

>
> 84 + anchors.topMargin: spacing
>
> 86 + spacing: height > 0 ? units.gu(1) : 0
>
> Shouldn't the topMargin have that condition instead?

Makes sense, done.

[Albert Astals Cid (aacid)]

> 83 + anchors.top: moreButton.bottom
> 84 + anchors.topMargin: spacing
>
> Compress into { } please.

Done

[Albert Astals Cid (aacid)]

> =====
>
> 97 + height: moreButton.expanded ? implicitHeight : 0
>
> 99 + visible: height > 0
>
> Shouldn't that be on the Column instead?
>
> =====
>
> Animate the Column height please.
>

Done both, it was part of a failed animation experiment from yesterday after another one failed and another one failed (yeah it was late on the day :D)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:686
http://jenkins.qa.ubuntu.com/job/unity8-ci/2249/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/771
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/773
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/773/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/771
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2598
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2961
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2961/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2694
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2694/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5118
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3692

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

74 + gradient: UbuntuColors.orangeGradient

No gradient, please - use color: Theme.palette.selected.foreground

=====

76 + width: parent.width

86 + width: parent.width

I'd use anchors, but your call.

=====

129 +/*! This preview widget shows a either one button, two buttons or one button

"shows either"

=====

137 + implicitHeight: row.height
138 + implicitWidth: row.width

Please make it height:, and drop the implicitWidth I think?

=====

158 + item.width = Qt.binding(function() { return (root.width - units.gu(1)) / 2; });

Just make Loader.width ↑, the loaded item will be sized to that.

review: Needs Fixing

[Albert Astals Cid (aacid)]

Done everything expect the "width: parent.width" -> anchors thing. If you want that it'll have to wait until tomorrow, i have to run now :D

[Michał Sawicz (saviq)]

Only a merge on top of the superseded proposal.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:693
http://jenkins.qa.ubuntu.com/job/unity8-ci/2251/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2966
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2700
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/775
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/775/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/773
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2968
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2968/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2701
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2701/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5124
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3700

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

review: Approve (continuous-integration)

=== added file 'qml/Dash/Previews/PreviewActionButton.qml'
--- qml/Dash/Previews/PreviewActionButton.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/PreviewActionButton.qml	2014-02-06 18:10:34 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2014 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 Ubuntu.Components 0.1
+
+Button {
+    signal triggeredAction(string id)
+
+    property var data: null
+    objectName: "button" + (data && data.id || "")
+    color: Theme.palette.selected.foreground
+    text: data && data.label || ""
+    iconSource: data && data.icon || ""
+    iconPosition: "left"
+    onClicked: triggeredAction(data.id)
+}

=== added file 'qml/Dash/Previews/PreviewActionCombo.qml'
--- qml/Dash/Previews/PreviewActionCombo.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/PreviewActionCombo.qml	2014-02-06 18:10:34 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2014 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 Ubuntu.Components 0.1
+
+Item {
+    id: root
+
+    implicitHeight: childrenRect.height
+
+    signal triggeredAction(string id)
+
+    property alias model: actionRepeater.model
+
+    Button {
+        id: moreButton
+        property bool expanded: false
+
+        objectName: "moreLessButton"
+        text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")
+        color: Theme.palette.selected.foreground
+        onClicked: expanded = !expanded
+        width: parent.width
+    }
+
+    Column {
+        anchors {
+            top: moreButton.bottom
+            topMargin: height > 0 ? spacing : 0
+        }
+        objectName: "buttonColumn"
+        spacing: units.gu(1)
+        width: parent.width
+        height: moreButton.expanded ? implicitHeight : 0
+        clip: true
+        Behavior on height {
+            UbuntuNumberAnimation {
+                duration: UbuntuAnimation.SnapDuration
+            }
+        }
+
+        Repeater {
+            id: actionRepeater
+
+            delegate: PreviewActionButton {
+                data: modelData
+                width: implicitWidth < parent.width ? parent.width : implicitWidth
+                onClicked: root.triggeredAction(modelData.id)
+            }
+        }
+    }
+}

=== added file 'qml/Dash/Previews/PreviewActions.qml'
--- qml/Dash/Previews/PreviewActions.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/PreviewActions.qml	2014-02-06 18:10:34 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2014 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
+
+/*! This preview widget shows either one button, two buttons or one button
+ *  and a combo button depending on the number of items in widgetData["actions"].
+ *  For each of the items we recognize the fields "label", "icon" and "id".
+ */
+
+PreviewWidget {
+    id: root
+
+    height: row.height
+
+    Row {
+        id: row
+        readonly property var actions: root.widgetData ? root.widgetData["actions"] : null
+        anchors.right: parent.right
+
+        spacing: units.gu(1)
+
+        Loader {
+            id: loader
+            readonly property bool button: row.actions && row.actions.length == 2
+            readonly property bool combo: row.actions && row.actions.length > 2
+            source: button ? "PreviewActionButton.qml" : (combo ? "PreviewActionCombo.qml" : "")
+            width: (root.width - units.gu(1)) / 2
+            onLoaded: {
+                if (button) {
+                    item.data = row.actions[1];
+                } else if (combo) {
+                    item.model = row.actions.slice(1);
+                }
+            }
+            Connections {
+                target: loader.item
+                onTriggeredAction: {
+                    root.triggered(root.widgetId, id, null);
+                }
+            }
+        }
+
+        PreviewActionButton {
+            data: visible ? row.actions[0] : null
+            visible: row.actions && row.actions.length > 0
+            onTriggeredAction: root.triggered(root.widgetId, id, null)
+            width: (root.width - units.gu(1)) / 2
+        }
+    }
+}

=== modified file 'qml/Dash/Previews/PreviewAudioPlayback.qml'
--- qml/Dash/Previews/PreviewAudioPlayback.qml	2014-02-06 18:10:33 +0000
+++ qml/Dash/Previews/PreviewAudioPlayback.qml	2014-02-06 18:10:34 +0000
@@ -17,7 +17,6 @@
 import QtQuick 2.0
 import QtMultimedia 5.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
 
 /*! \brief Preview widget for audio tracks.
 
@@ -35,7 +34,7 @@
 
 PreviewWidget {
     id: root
-    implicitHeight: childrenRect.height
+    height: childrenRect.height
 
     onIsCurrentPreviewChanged: if (!isCurrentPreview) audio.stop()
 
@@ -47,24 +46,24 @@
         property Item playingItem
 
         Component.onDestruction: {
-            // destructing the component doesn't automatically send stop to the media service, probably a bug in QtMultimedia
+            // destroying the component doesn't automatically send stop to the media service, probably a bug in QtMultimedia
             audio.stop();
         }
 
         onErrorStringChanged: console.warn("Audio player error:", errorString)
 
         function lengthToString(s) {
-            if (s <= 0 || s === undefined) return ""
+            if (typeof(s) !== "number" || s <= 0) return "";
 
-            var sec = "" + s % 60
-            if (sec.length == 1) sec = "0" + sec
-            var hour = Math.floor(s / 3600)
+            var sec = "" + s % 60;
+            if (sec.length == 1) sec = "0" + sec;
+            var hour = Math.floor(s / 3600);
             if (hour < 1) {
-                return Math.floor(s / 60) + ":" + sec
+                return Math.floor(s / 60) + ":" + sec;
             } else {
-                var min = "" + Math.floor(s / 60) % 60
-                if (min.length == 1) min = "0" + min
-                return hour + ":" + min + ":" + sec
+                var min = "" + Math.floor(s / 60) % 60;
+                if (min.length == 1) min = "0" + min;
+                return hour + ":" + min + ":" + sec;
             }
         }
     }
@@ -78,6 +77,15 @@
             objectName: "trackRepeater"
             model: root.widgetData["tracks"]
 
+            function play(item, source) {
+                audio.stop();
+                // Make sure we change the source, even if two items point to the same uri location
+                audio.source = "";
+                audio.source = source;
+                audio.playingItem = item;
+                audio.play();
+            }
+
             delegate: Item {
                 id: trackItem
                 objectName: "trackItem" + index
@@ -87,15 +95,6 @@
                 anchors { left: parent.left; right: parent.right }
                 height: units.gu(5)
 
-                function play() {
-                    audio.stop();
-                    // Make sure we change the source, even if two items point to the same uri location
-                    audio.source = "";
-                    audio.source = modelData["source"];
-                    audio.playingItem = trackItem;
-                    audio.play();
-                }
-
                 Row {
                     id: trackRow
 
@@ -121,11 +120,11 @@
                             if (trackItem.isPlayingItem) {
                                 if (audio.playbackState == Audio.PlayingState) {
                                     audio.pause();
-                                } else if (audio.playbackState == Audio.PausedState){
+                                } else if (audio.playbackState == Audio.PausedState) {
                                     audio.play();
                                 }
                             } else {
-                                trackItem.play();
+                                trackRepeater.play(trackItem, modelData["source"]);
                             }
                         }
                     }
@@ -156,7 +155,7 @@
                             color: Theme.palette.selected.backgroundText
                             fontSize: "small"
                             horizontalAlignment: Text.AlignLeft
-                            text: modelData["subtitle"] !== undefined ? modelData["subtitle"] : ""
+                            text: modelData["subtitle"] || ""
                             elide: Text.ElideRight
                         }
 

=== modified file 'qml/Dash/Previews/PreviewWidget.qml'
--- qml/Dash/Previews/PreviewWidget.qml	2014-02-06 18:10:33 +0000
+++ qml/Dash/Previews/PreviewWidget.qml	2014-02-06 18:10:34 +0000
@@ -19,9 +19,19 @@
 /*! Interface for preview widgets. */
 
 Item {
-    /// type:bool Specifies the preview widget being currently used or not
+    //! Specifies the preview widget being currently used or not
     property bool isCurrentPreview: true
 
-    /// Variable used to contain widget's data
+    //! The widget identifier
+    property string widgetId
+
+    //! Variable used to contain widget's data
     property var widgetData
+
+    /*! \brief This signal should be emitted when a preview action was triggered.
+     *
+     *  \param widgetId,actionId Respective identifiers from widgetData.
+     *  \param data Optional widget-specific data sent to the scope.
+     */
+    signal triggered(string widgetId, string actionId, var data)
 }

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-02-06 18:10:33 +0000
+++ tests/qmltests/CMakeLists.txt	2014-02-06 18:10:34 +0000
@@ -55,6 +55,7 @@
 add_qml_test(Dash/Apps AppPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/Music MusicPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
+add_qml_test(Dash/Previews PreviewActions IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)

=== added file 'tests/qmltests/Dash/Previews/tst_PreviewActions.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewActions.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewActions.qml	2014-02-06 18:10:34 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2014 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 actionDataOneAction: {
+        "actions": [{"label": "Some Label", "icon": "../graphics/play_button.png", "id": "someid"}]
+    }
+
+    property var actionDataTwoActions: {
+        "actions": [{"label": "Some Label A", "icon": "../graphics/icon_clear.png", "id": "someid1"},
+                    {"label": "Some Label B", "icon": "../graphics/play_button.png", "id": "someid2"}
+        ]
+    }
+
+    property var actionDataFiveActions: {
+        "actions": [{"label": "Some Label C", "icon": "../graphics/play_button.png", "id": "someid3"},
+                    {"label": "Some Label D", "icon": "../graphics/icon_clear.png", "id": "someid4"},
+                    {"label": "Some Label E", "icon": "../graphics/play_button.png", "id": "someid5"},
+                    {"label": "Some Label F", "icon": "../graphics/icon_clear.png", "id": "someid6"},
+                    {"label": "Some Label G", "icon": "../graphics/play_button.png", "id": "someid7"}
+        ]
+    }
+
+    SignalSpy {
+        id: spy
+        signalName: "triggered"
+    }
+
+    Column {
+        spacing: units.gu(1)
+
+        PreviewActions {
+            id: oneAction
+            widgetId: "button"
+            widgetData: actionDataOneAction
+            onTriggered: console.log("triggered", widgetId, actionId);
+            width: units.gu(50)
+
+            Rectangle {
+                anchors.fill: parent
+                color: "red"
+                opacity: 0.1
+            }
+        }
+
+        PreviewActions {
+            id: buttonAndCombo
+            widgetId: "buttonAndCombo"
+            widgetData: actionDataFiveActions
+            onTriggered: console.log("triggered", widgetId, actionId);
+            width: units.gu(40)
+
+            Rectangle {
+                anchors.fill: parent
+                color: "red"
+                opacity: 0.1
+            }
+        }
+
+        PreviewActions {
+            id: twoActions
+            widgetId: "2buttons"
+            widgetData: actionDataTwoActions
+            onTriggered: console.log("triggered", widgetId, actionId);
+            width: units.gu(60)
+        }
+    }
+
+    UT.UnityTestCase {
+        name: "PreviewActionTest"
+        when: windowShown
+
+        function cleanup()
+        {
+            spy.clear();
+        }
+
+        function checkButtonPressSignal(target, id)
+        {
+            var button = findChild(root, "button" + id);
+            verify(button != null);
+            spy.target = target;
+            mouseClick(button, button.width / 2, button.height / 2);
+            compare(spy.count, 1);
+            compare(spy.signalArguments[0][0], target.widgetId);
+            compare(spy.signalArguments[0][1], id);
+        }
+
+        function test_checkButtons_data() {
+            return [
+                {tag: "oneActionButton", target: oneAction, id: "someid" },
+                {tag: "twobuttonsButton0", target: twoActions, id: "someid1" },
+                {tag: "twobuttonsButton1", target: twoActions, id: "someid2" },
+                {tag: "buttonAndComboButton0", target: buttonAndCombo, id: "someid3" }
+            ]
+        }
+
+        function test_checkButtons(data) {
+            checkButtonPressSignal(data.target, data.id, data.buttonNumber)
+        }
+
+        function test_comboButton_data() {
+            return [
+                {tag: "button1", id: "someid4" },
+                {tag: "button2", id: "someid5" },
+                {tag: "button3", id: "someid6" },
+                {tag: "button4", id: "someid7" }
+            ]
+        }
+
+        function test_comboButton(data) {
+            var button = findChild(root, "moreLessButton");
+            var buttonColumn = findChild(root, "buttonColumn");
+            verify(button != null);
+            var twoActionsY = twoActions.y
+            mouseClick(button, button.width / 2, button.height / 2);
+            tryCompareFunction(function () { return twoActions.y <= twoActionsY; }, false);
+            tryCompare(buttonColumn, "height", buttonColumn.implicitHeight);
+            checkButtonPressSignal(buttonAndCombo, data.id, data.buttonNumber);
+            mouseClick(button, button.width / 2, button.height / 2);
+            tryCompare(twoActions, "y", twoActionsY);
+        }
+    }
+}

=== modified file 'tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml'
--- tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml	2014-02-06 18:10:33 +0000
+++ tests/qmltests/Dash/Previews/tst_PreviewAudioPlayback.qml	2014-02-06 18:10:34 +0000
@@ -57,6 +57,7 @@
 
         function test_time_formatter_data() {
             return [
+                    { tag: "NaN", value: "not a number", result: "" },
                     { tag: "0", value: 0, result: "" },
                     { tag: "-1", value: -1, result: "" },
                     { tag: "30", value: 30, result: "0:30" },