Unity 8

Merge lp:~aacid/unity8/preview_progress into lp:unity8

preview_progress
Merge into trunk

Proposed by Albert Astals Cid on 2014-02-12

Status:	Merged
Approved by:	Andrea Cimitan on 2014-02-12
Approved revision:	718
Merged at revision:	720
Proposed branch:	lp:~aacid/unity8/preview_progress
Merge into:	lp:unity8
Prerequisite:	lp:~unity-team/unity8/unity8.preview_video
Diff against target:	202 lines (+160/-0) 5 files modified qml/Dash/Previews/PreviewProgress.qml (+70/-0) qml/Dash/Previews/PreviewWidgetFactory.qml (+1/-0) tests/qmltests/CMakeLists.txt (+1/-0) tests/qmltests/Dash/Previews/tst_PreviewProgress.qml (+87/-0) tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml (+1/-0)
To merge this branch:	bzr merge lp:~aacid/unity8/preview_progress
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-02-13
Andrea Cimitan (community)		2014-02-12	Approve on 2014-02-12
Review via email: mp+205939@code.launchpad.net

Commit message

Progress Preview Widget

Description of the change

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

* Did you perform an exploratory manual test run of your code change and any related functionality?
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?
N/A

lp:~aacid/unity8/preview_progress updated on 2014-02-12

713. By Albert Astals Cid on 2014-02-12: Actually commit the test file ^_^
714. By Albert Astals Cid on 2014-02-12: Some explanation of what are we doing in the test
715. By Albert Astals Cid on 2014-02-12: whitespacing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-12:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-02-12:

The autopilot error gets fixed by https://code.launchpad.net/~elopio/unity8/fix1277591-open_scope_scrolling_waiting_for_wrong_property/+merge/205423

Revision history for this message

Andrea Cimitan (cimi) wrote on 2014-02-12:

I think the documentation needs a \brief headline (then a new line with the rest of the description, to be consistent)

Question, is total of Ubuntu.DownloadDaemonListener 0.1 always > 0?

163 + spy.target = previewProgress
semicolon

Also, considering all the issues we had with signalSpy, I'd rather clear it after
compare(args[2], progressjsonFinish);, and compare with 1 then.

review: Needs Fixing

lp:~aacid/unity8/preview_progress updated on 2014-02-12

716. By Albert Astals Cid on 2014-02-12: fixlets
717. By Albert Astals Cid on 2014-02-12: Cimi is scared total may be <= 0
718. By Albert Astals Cid on 2014-02-12: fix test name

Revision history for this message

Andrea Cimitan (cimi) on 2014-02-12:

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-12:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-13:

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

review: Approve (continuous-integration)

Revision history for this message

Andrea Cimitan (cimi) wrote on 2014-02-18:

* 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.
Yes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Albert Astals Cid

Mohammad Rakibul Hasan

Unity Team

 === added file 'qml/Dash/Previews/PreviewProgress.qml'
 --- qml/Dash/Previews/PreviewProgress.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/Previews/PreviewProgress.qml	2014-02-12 16:28:25 +0000
@@ -0,0 +1,70 @@
++/*
++ * 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
++import Ubuntu.Components 0.1
++import Ubuntu.DownloadDaemonListener 0.1
++
++/*! \brief Preview widget for a progress bar.
++ *
++ *  It feeds itself from the source determined in widgetData["source"]
++ *  At the moment we only support the dbus source defined
++ *  by source["dbus-name"] and source["dbus-object"]
++ */
++
++PreviewWidget {
++    id: root
++
++    implicitHeight: progressBar.implicitHeight
++    implicitWidth: progressBar.implicitWidth
++
++    ProgressBar {
++        id: progressBar
++        objectName: "progressBar"
++        value: 0
++        maximumValue: 100
++        implicitHeight: units.gu(5)
++        height: parent.height
++        width: parent.width
++
++        property var source: widgetData["source"]
++        // TODO Eventually we will need to support more sources other
++        // than DownloadTracker via dbus so we'll need a Loader based on source contents
++
++        DownloadTracker {
++            service: progressBar.source["dbus-name"] || ""
++            dbusPath: progressBar.source["dbus-object"] || ""
++
++            onProgress: {
++                if (total <= 0) {
++                    progressBar.indeterminate = true;
++                } else {
++                    progressBar.indeterminate = false;
++                    var percentage = parseInt(received * 100 / total);
++                    progressBar.value = percentage;
++                }
++            }
++
++            onFinished: {
++                root.triggered(widgetId, "finished", widgetData)
++            }
++
++            onError: {
++                root.triggered(widgetId, "failed", widgetData)
++            }
++        }
++    }
++}
 === modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
 --- qml/Dash/Previews/PreviewWidgetFactory.qml	2014-02-12 16:28:25 +0000
 +++ qml/Dash/Previews/PreviewWidgetFactory.qml	2014-02-12 16:28:25 +0000
@@ -47,6 +47,7 @@
              case "gallery": return "PreviewImageGallery.qml";
              case "header": return "PreviewHeader.qml";
              case "image": return "PreviewZoomableImage.qml"
++            case "progress": return "PreviewProgress.qml";
              case "text": return "PreviewTextSummary.qml";
              case "video": return "PreviewVideoPlayback.qml";
              default: return "";
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2014-02-12 16:28:25 +0000
 +++ tests/qmltests/CMakeLists.txt	2014-02-12 16:28:25 +0000
@@ -61,6 +61,7 @@
  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 PreviewHeader IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
++add_qml_test(Dash/Previews PreviewProgress 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)
  add_qml_test(Dash/Previews PreviewVideoPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
  add_qml_test(Dash/Previews PreviewZoomableImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
 === added file 'tests/qmltests/Dash/Previews/tst_PreviewProgress.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewProgress.qml	2014-02-12 16:28:25 +0000
@@ -0,0 +1,87 @@
++/*
++ * 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 progressjson: {
++        "type": "progress",
++        "source": { "dbus-name" : "somename", "dbus-object": "somestring" }
++    }
++
++    property var progressjsonFinish: {
++        "type": "progress",
++        "source": { "dbus-name" : "somename", "dbus-object": "finish" }
++    }
++
++    property var progressjsonError: {
++        "type": "progress",
++        "source": { "dbus-name" : "somename", "dbus-object": "error" }
++    }
++
++    SignalSpy {
++        id: spy
++        signalName: "triggered"
++    }
++
++    PreviewProgress {
++        id: previewProgress
++        widgetId: "previewProgress"
++        widgetData: progressjson
++        width: units.gu(30)
++
++        Rectangle {
++            anchors.fill: parent
++            color: "red"
++            opacity: 0.1
++        }
++    }
++
++    UT.UnityTestCase {
++        name: "PreviewProgressTest"
++        when: windowShown
++
++        function test_json() {
++            spy.target = previewProgress;
++
++            // The mock DownloadTracker triggers its signals when you pass
++            // finish/error as dbus-object to it. Exercise it here
++            previewProgress.widgetData = progressjsonFinish;
++            compare(spy.count, 1);
++            var args = spy.signalArguments[0];
++            compare(args[0], "previewProgress");
++            compare(args[1], "finished");
++            compare(args[2], progressjsonFinish);
++
++            spy.clear();
++
++            previewProgress.widgetData = progressjsonError;
++            compare(spy.count, 1);
++            var args = spy.signalArguments[0];
++            compare(args[0], "previewProgress");
++            compare(args[1], "failed");
++            compare(args[2], progressjsonError);
++        }
++    }
++}
 === modified file 'tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2014-02-12 16:28:25 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml	2014-02-12 16:28:25 +0000
@@ -80,6 +80,7 @@
                  { tag: "Gallery", type: "gallery", source: "PreviewImageGallery.qml" },
                  { tag: "Header", type: "header", source: "PreviewHeader.qml" },
                  { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },
++                { tag: "Progress", type: "progress", source: "PreviewProgress.qml" },
                  { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },
                  { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },
              ];