Merge lp:~unity-team/unity8/unity8.previews_textSummary into lp:unity8

[Andrea Cimitan]

Adding textSummary previews component

It's a label basically with some style

[lp:~unity-team/unity8/unity8.previews_textSummary]

661. By Andrea Cimitan on 2014-01-31

Merged preview widget branch

662. By Andrea Cimitan on 2014-01-31

Merged

663. By Andrea Cimitan on 2014-02-03

continue work

664. By Andrea Cimitan on 2014-02-03

More work

665. By Andrea Cimitan on 2014-02-03

Merged audioplayer

666. By Andrea Cimitan on 2014-02-03

Added tests

667. By Andrea Cimitan on 2014-02-03

More robust test

668. By Andrea Cimitan on 2014-02-03

moved code

669. By Andrea Cimitan on 2014-02-04

Added another test and comments

670. By Andrea Cimitan on 2014-02-04

Added dot at end of comment

671. By Andrea Cimitan on 2014-02-04

Moved end of comment to new line

672. By Andrea Cimitan on 2014-02-04

Renamings

673. By Andrea Cimitan on 2014-02-04

Merged audioplayer branch

674. By Andrea Cimitan on 2014-02-04

More renamings

675. By Andrea Cimitan on 2014-02-04

Removed unused dep

676. By Andrea Cimitan on 2014-02-04

Modified unity8 pot file

677. By Andrea Cimitan on 2014-02-04

Added comments to seemore and moved variable

678. By Andrea Cimitan on 2014-02-04

Changes according to review

679. By Andrea Cimitan on 2014-02-05

Moar fixes

680. By Andrea Cimitan on 2014-02-06

review stuff

Unmerged revisions

=== added file 'qml/Dash/Previews/AudioPlayer.qml'
--- qml/Dash/Previews/AudioPlayer.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/AudioPlayer.qml	2014-01-31 09:36:27 +0000
@@ -0,0 +1,200 @@
+/*
+ * 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 QtMultimedia 5.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1
+
+Item {
+    id: root
+
+    property alias model: trackRepeater.model
+
+    implicitHeight: childrenRect.height
+
+    function stop() {
+        audio.stop()
+    }
+
+    Audio {
+        id: audio
+        objectName: "audio"
+
+        property real progress: audio.position / audio.duration
+        property Item playingItem
+
+        Component.onDestruction: {
+            audio.stop();
+        }
+
+        onErrorStringChanged: console.warn("Audio player error:", errorString)
+    }
+
+    Column {
+        anchors { left: parent.left; right: parent.right }
+        visible: trackRepeater.count > 0
+
+        Repeater {
+            id: trackRepeater
+            objectName: "trackRepeater"
+
+            delegate: Item {
+                id: trackItem
+                objectName: "trackItem" + index
+
+                property bool isPlayingItem: audio.playingItem == trackItem
+
+                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
+
+                    property int column1Width: units.gu(3)
+                    property int column2Width: width - (2 * spacing) - column1Width - column3Width
+                    property int column3Width: units.gu(4)
+
+                    anchors.verticalCenter: parent.verticalCenter
+                    width: parent.width
+                    spacing: units.gu(1)
+
+                    Button {
+                        objectName: "playButton"
+                        width: trackRow.column1Width
+                        height: width
+                        iconSource: audio.playbackState == Audio.PlayingState && trackItem.isPlayingItem ? "image://theme/media-playback-pause" : "image://theme/media-playback-start"
+
+                        // Can't be "transparent" or "#00xxxxxx" as the button optimizes away the surrounding shape
+                        // FIXME when this is resolved: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1251685
+                        color: "#01000000"
+
+                        onClicked: {
+                            if (trackItem.isPlayingItem) {
+                                if (audio.playbackState == Audio.PlayingState) {
+                                    audio.pause();
+                                } else if (audio.playbackState == Audio.PausedState){
+                                    audio.play();
+                                }
+                            } else {
+                                trackItem.play();
+                            }
+                        }
+                    }
+
+                    Item {
+                        anchors.verticalCenter: parent.verticalCenter
+                        width: parent.column2Width
+                        height: trackSubtitleLabel.visible ? trackTitleLabel.height + trackSubtitleLabel.height : trackTitleLabel.height
+
+                        Label {
+                            id: trackTitleLabel
+                            objectName: "trackTitleLabel"
+                            anchors { top: parent.top; left: parent.left; right: parent.right }
+                            opacity: 0.9
+                            color: "white"
+                            fontSize: "small"
+                            horizontalAlignment: Text.AlignLeft
+                            text: modelData["title"]
+                            style: Text.Raised
+                            styleColor: "black"
+                            elide: Text.ElideRight
+                        }
+
+                        Label {
+                            id: trackSubtitleLabel
+                            objectName: "trackSubtitleLabel"
+                            anchors { top: trackTitleLabel.bottom; left: parent.left; right: parent.right }
+                            visible: text != ""
+                            opacity: 0.9
+                            color: "white"
+                            fontSize: "small"
+                            horizontalAlignment: Text.AlignLeft
+                            text: modelData["subtitle"] !== undefined ? modelData["subtitle"] : ""
+                            style: Text.Raised
+                            styleColor: "black"
+                            elide: Text.ElideRight
+                        }
+
+                        UbuntuShape {
+                            id: progressBarFill
+                            objectName: "progressBarFill"
+
+                            property int maxWidth: progressBarImage.width - units.dp(4)
+
+                            anchors {
+                                left: progressBarImage.left
+                                right: progressBarImage.right
+                                verticalCenter: progressBarImage.verticalCenter
+                                margins: units.dp(2)
+                                rightMargin: maxWidth - (maxWidth * audio.progress) + units.dp(2)
+                            }
+                            height: units.dp(2)
+                            visible: progressBarImage.visible
+                            color: UbuntuColors.orange
+                        }
+
+                        Image {
+                            id: progressBarImage
+                            anchors { left: parent.left; top: parent.bottom; right: parent.right }
+                            height: units.dp(6)
+                            visible: audio.playbackState != Audio.StoppedState && trackItem.isPlayingItem && modelData["length"] > 0
+                            source: "graphics/music_progress_bg.png"
+                        }
+                    }
+
+                    Label {
+                        id: timeLabel
+                        objectName: "timeLabel"
+                        anchors.verticalCenter: parent.verticalCenter
+                        width: parent.column3Width
+                        opacity: 0.9
+                        color: "white"
+                        fontSize: "small"
+                        horizontalAlignment: Text.AlignRight
+                        text: lengthToString(modelData["length"])
+                        style: Text.Raised
+                        styleColor: "black"
+
+                        function lengthToString(s) {
+                            if (s <= 0 || s === undefined) return ""
+
+                            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
+                            } else {
+                                var min = "" + Math.floor(s / 60) % 60
+                                if (min.length == 1) min = "0" + min
+                                return hour + ":" + min + ":" + sec
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'qml/Dash/Previews/TextSummary.qml'
--- qml/Dash/Previews/TextSummary.qml	1970-01-01 00:00:00 +0000
+++ qml/Dash/Previews/TextSummary.qml	2014-01-31 09:36:27 +0000
@@ -0,0 +1,27 @@
+/*
+ * 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
+
+Label {
+    fontSize: "medium"
+    color: Theme.palette.selected.backgroundText
+    opacity: .6
+    wrapMode: Text.WordWrap
+    style: Text.Raised
+    styleColor: "black"
+}

=== renamed directory 'qml/Dash/Music/graphics' => 'qml/Dash/Previews/graphics'
=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-01-13 14:15:17 +0000
+++ tests/qmltests/CMakeLists.txt	2014-01-31 09:36:27 +0000
@@ -53,6 +53,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 AudioPlayer IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
 add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
                              PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
 add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}

=== added directory 'tests/qmltests/Dash/Previews'
=== added file 'tests/qmltests/Dash/Previews/tst_AudioPlayer.qml'
--- tests/qmltests/Dash/Previews/tst_AudioPlayer.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Dash/Previews/tst_AudioPlayer.qml	2014-01-31 09:36:27 +0000
@@ -0,0 +1,162 @@
+/*
+ * 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 Ubuntu.Components 0.1
+import "../../../../qml/Dash/Previews"
+import Unity.Test 0.1 as UT
+import QtMultimedia 5.0
+
+Rectangle {
+    id: root
+    width: units.gu(60)
+    height: units.gu(80)
+    color: "grey"
+
+    property var tracksModel0: [
+    ]
+
+    property var tracksModel1: [
+        { title: "Some track name", length: "30", source: "../../tests/qmltests/Dash/Music/data/testsound1.ogg" }
+    ]
+
+    property var tracksModel2: [
+        { title: "Some track name", length: "30", source: "../../tests/qmltests/Dash/Music/data/testsound1.ogg" },
+        { title: "Some other track name", subtitle: "Subtitle", length: "83", source: "../../tests/qmltests/Dash/Music/data/testsound2.ogg" },
+        { title: "And another one", length: "7425", source: "../../tests/qmltests/Dash/Music/data/testsound3.ogg" }
+    ]
+
+    AudioPlayer {
+        id: audioPlayer
+        anchors.fill: parent
+        model: tracksModel2
+    }
+
+    UT.UnityTestCase {
+        name: "AudioPlayerTest"
+        when: windowShown
+
+        function init() {
+            waitForRendering(audioPlayer);
+        }
+
+        function test_tracks_data() {
+            return [
+                    {tag: "0 tracks", tracksModel: tracksModel0},
+                    {tag: "1 track", tracksModel: tracksModel1},
+                    {tag: "3 tracks", tracksModel: tracksModel2}
+            ];
+        }
+
+        function test_tracks(data) {
+            audioPlayer.model = data.tracksModel;
+            waitForRendering(audioPlayer);
+
+            var trackRepeater = findChild(audioPlayer, "trackRepeater");
+            compare(trackRepeater.count, data.tracksModel.length)
+
+            for (var i = 0; i < data.tracksModel.length; ++i) {
+                var trackItem = findChild(audioPlayer, "trackItem" + i);
+                var titleLabel = findChild(trackItem, "trackTitleLabel");
+                compare(titleLabel.text, data.tracksModel[i]["title"])
+                var subtitleLabel = findChild(trackItem, "trackSubtitleLabel");
+                if (data.tracksModel[i]["subtitle"] !== undefined) {
+                    compare(subtitleLabel.text, data.tracksModel[i]["subtitle"])
+                } else {
+                    compare(subtitleLabel.visible, false)
+                }
+                // not checking time label because it's formatted, the model only contains seconds
+            }
+        }
+
+        function checkPlayerSource(index) {
+            var modelFilename = audioPlayer.model[index]["source"].replace(/^.*[\\\/]/, '');
+            var playerFilename = findInvisibleChild(audioPlayer, "audio").source.toString().replace(/^.*[\\\/]/, '');
+
+            compare(modelFilename, playerFilename, "Player source is not set correctly.");
+        }
+
+        function test_playback() {
+            audioPlayer.model = tracksModel2;
+            waitForRendering(audioPlayer);
+
+            var track0Item = findChild(audioPlayer, "trackItem0");
+            var track1Item = findChild(audioPlayer, "trackItem1");
+            var track2Item = findChild(audioPlayer, "trackItem2");
+
+            var track0ProgressBar = findChild(track0Item, "progressBarFill");
+            var track1ProgressBar = findChild(track1Item, "progressBarFill");
+            var track2ProgressBar = findChild(track2Item, "progressBarFill");
+
+            var track0PlayButton = findChild(track0Item, "playButton");
+            var track1PlayButton = findChild(track1Item, "playButton");
+            var track2PlayButton = findChild(track2Item, "playButton");
+
+            var audio = findInvisibleChild(audioPlayer, "audio");
+
+            // All progress bars must be hidden in the beginning
+            compare(track0ProgressBar.visible, false);
+            compare(track1ProgressBar.visible, false);
+            compare(track2ProgressBar.visible, false);
+
+            // Playing track 0 should make progress bar 0 visible
+            mouseClick(track0PlayButton, track0PlayButton.width / 2, track0PlayButton.height / 2);
+
+            tryCompare(audio, "playbackState", Audio.PlayingState);
+            checkPlayerSource(0);
+
+            tryCompare(track0ProgressBar, "visible", true);
+            tryCompare(track1ProgressBar, "visible", false);
+            tryCompare(track2ProgressBar, "visible", false);
+
+            // Clicking the button again should pause it. The progress bar should stay visible
+            mouseClick(track0PlayButton, track0PlayButton.width / 2, track0PlayButton.height / 2);
+            tryCompare(audio, "playbackState", Audio.PausedState);
+            checkPlayerSource(0);
+            tryCompare(track0ProgressBar, "visible", true);
+
+            // Continue playback
+            mouseClick(track0PlayButton, track0PlayButton.width / 2, track0PlayButton.height / 2);
+            tryCompare(audio, "playbackState", Audio.PlayingState);
+            checkPlayerSource(0);
+
+            // Playing track 1 should make progress bar 1 visible and hide progress bar 0 again
+            mouseClick(track1PlayButton, track1PlayButton.width / 2, track1PlayButton.height / 2);
+
+            tryCompare(audio, "playbackState", Audio.PlayingState);
+            checkPlayerSource(1);
+
+            tryCompare(track0ProgressBar, "visible", false);
+            tryCompare(track1ProgressBar, "visible", true);
+            tryCompare(track2ProgressBar, "visible", false);
+
+            // Playing track 2 should make progress bar 1 visible and hide progress bar 0 again
+            mouseClick(track2PlayButton, track2PlayButton.width / 2, track2PlayButton.height / 2);
+
+            tryCompare(audio, "playbackState", Audio.PlayingState);
+            checkPlayerSource(2);
+
+            tryCompare(track0ProgressBar, "visible", false);
+            tryCompare(track1ProgressBar, "visible", false);
+            tryCompare(track2ProgressBar, "visible", true);
+
+            // Calling stop() should make all players shut up!
+            audioPlayer.stop()
+            tryCompare(audio, "playbackState", Audio.StoppedState);
+        }
+    }
+}