Merge lp:~nick-dedekind/ubuntu-settings-components/transfer-menu into lp:~registry/ubuntu-settings-components/trunk

[Nick Dedekind]

Added TransferMenu

* Are there any related MPs required for this MP to build/function as expected? Please list.
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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/52/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/52/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/54/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/56/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

I've asked Cimi to review this as he's a member of ubuntu-settings-components and I'm not; however, FWIW:

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

Yes.

Manual test conducted in conjunction with
https://code.launchpad.net/~nick-dedekind/ubuntu-settings-components/transfer-menu/+merge/224672 and https://code.launchpad.net/~charlesk/indicator-transfer/per-transfer-actions/+merge/224537. The manual tests in the indicator-transfer MP put these new transfer menu components on display.

> * Did CI run pass? If not, please explain why.

Yes.

[Andrea Cimitan (cimi)]

I'd test what should change with active: true or false (visibility).

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

> I'd test what should change with active: true or false (visibility).

Done. & added stateText test

[Michał Sawicz (saviq)]

Bump changelog so we can depend on it?

More inline.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/62/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/62/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Oh and one more thing... Do (should) the enum values come from somewhere?

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/63/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/63/rebuild

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Fixed review comments

[Nick Dedekind (nick-dedekind)]

> Oh and one more thing... Do (should) the enum values come from somewhere?

They come from indicator-transfer
http://bazaar.launchpad.net/~charlesk/indicator-transfer/per-transfer-actions/view/head:/include/transfer/transfer.h

would need to do some shizzle in there if we wanted to export to includes.

[Michał Sawicz (saviq)]

> > Oh and one more thing... Do (should) the enum values come from somewhere?
>
> They come from indicator-transfer
> http://bazaar.launchpad.net/~charlesk/indicator-transfer/per-transfer-
> actions/view/head:/include/transfer/transfer.h
>
> would need to do some shizzle in there if we wanted to export to includes.

I'd just be worried that this get out of sync... There's probably no lib from the indicator that we could link to?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:73
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/64/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/64/rebuild

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

> > > Oh and one more thing... Do (should) the enum values come from somewhere?
> >
> > They come from indicator-transfer
> > http://bazaar.launchpad.net/~charlesk/indicator-transfer/per-transfer-
> > actions/view/head:/include/transfer/transfer.h
> >
> > would need to do some shizzle in there if we wanted to export to includes.
>
> I'd just be worried that this get out of sync... There's probably no lib from
> the indicator that we could link to?

Not for the transfer indicator specifically. There's libindicator, but I don't think it's used for the indicators we use.

[Michał Sawicz (saviq)]

Yup.

review: Approve

[lp:~nick-dedekind/ubuntu-settings-components/transfer-menu]

75. By Nick Dedekind on 2014-07-07

updated debian packaging

=== modified file 'SettingsComponents.qml'
--- SettingsComponents.qml	2014-07-01 12:51:28 +0000
+++ SettingsComponents.qml	2014-07-07 15:54:19 +0000
@@ -159,6 +159,25 @@
                     onPlay: { mediaPlayer.running = !mediaPlayer.running; }
                 }
 
+                TransferMenu {
+                    text: "Video Downloading"
+                    stateText: "3 minutes remaning"
+                    iconSource: "tests/artwork/speak-now.jpg"
+                    progress: 0.6
+                    active: true
+                    removable: true
+                    confirmRemoval: true
+                }
+
+                TransferMenu {
+                    text: "Video Downloading"
+                    iconSource: "tests/artwork/speak-now.jpg"
+                    progress: 0.6
+                    active: false
+                    removable: true
+                    confirmRemoval: true
+                }
+
                 AccessPointMenu {
                     checked: true
                     secure: true

=== modified file 'Ubuntu/Settings/Menus/CMakeLists.txt'
--- Ubuntu/Settings/Menus/CMakeLists.txt	2014-07-07 15:54:19 +0000
+++ Ubuntu/Settings/Menus/CMakeLists.txt	2014-07-07 15:54:19 +0000
@@ -11,6 +11,7 @@
 
 set(UbuntuSettingsMenusQml_SOURCES
     plugin.cpp
+    types.h
 )
 add_definitions(-DUBUNTUSETTINGSCOMPONENTS_LIBRARY)
 

=== added file 'Ubuntu/Settings/Menus/TransferMenu.qml'
--- Ubuntu/Settings/Menus/TransferMenu.qml	1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/Menus/TransferMenu.qml	2014-07-07 15:54:19 +0000
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import QtQuick.Layouts 1.1
+
+ListItem.Empty {
+    id: menu
+
+    property alias iconSource: icon.source
+    property alias text: label.text
+    property alias stateText: stateLabel.text
+    property alias progress: progressBar.value
+    property bool active: false
+
+    property alias maximum: progressBar.maximumValue
+
+    implicitHeight: row.height + units.gu(2)
+
+    RowLayout {
+        id: row
+        anchors {
+            left: parent.left
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+            leftMargin: menu.__contentsMargins
+            rightMargin: menu.__contentsMargins
+        }
+
+        UbuntuShape {
+            id: imageShape
+            Layout.preferredWidth: units.gu(5)
+            Layout.preferredHeight: units.gu(5)
+
+            Layout.alignment: Qt.AlignTop
+
+            image: Image {
+                objectName: "icon"
+                id: icon
+
+                sourceSize {
+                    width: units.gu(5)
+                    height: units.gu(5)
+                }
+            }
+        }
+
+        ColumnLayout {
+            spacing: units.gu(0.5)
+
+            Label {
+                id: label
+                objectName: "text"
+                Layout.fillWidth: true
+
+                elide: Text.ElideRight
+                maximumLineCount: 1
+            }
+
+            ProgressBar {
+                id: progressBar
+                objectName: "progress"
+                visible: menu.active
+                value: 0.0
+
+                Layout.preferredHeight: units.gu(2)
+                Layout.fillWidth: true
+            }
+
+            Label {
+                id: stateLabel
+                objectName: "stateText"
+                Layout.fillWidth: true
+                visible: menu.active
+
+                elide: Text.ElideRight
+                maximumLineCount: 1
+            }
+        }
+    }
+}

=== modified file 'Ubuntu/Settings/Menus/plugin.cpp'
--- Ubuntu/Settings/Menus/plugin.cpp	2014-07-07 15:54:19 +0000
+++ Ubuntu/Settings/Menus/plugin.cpp	2014-07-07 15:54:19 +0000
@@ -14,8 +14,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+// local
 #include "plugin.h"
+#include "types.h"
+
+// Qt
+#include <QtQml/qqml.h>
 
 void UbuntuSettingsComponentsPlugin::registerTypes(const char *uri)
 {
+    qmlRegisterUncreatableType<TransferState>(uri, 0, 1, "TransferState", "Can't create TransferState class");
 }

=== added file 'Ubuntu/Settings/Menus/types.h'
--- Ubuntu/Settings/Menus/types.h	1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/Menus/types.h	2014-07-07 15:54:19 +0000
@@ -0,0 +1,43 @@
+/*
+ * 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/>.
+ */
+
+#ifndef UBUNTUSETTINGSMENUSTYPES_H
+#define UBUNTUSETTINGSMENUSTYPES_H
+
+#include "pluginglobal.h"
+
+#include <QObject>
+
+class UBUNTUSETTINGSCOMPONENTS_EXPORT TransferState : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(TransferStates)
+public:
+    enum TransferStates {
+        Queued,
+        Running,
+        Paused,
+        Canceled,
+        Hashing,
+        Processing,
+        Finished,
+        Error
+    };
+
+    TransferState(QObject* parent = 0): QObject(parent) {}
+};
+
+#endif // UBUNTUSETTINGSMENUSTYPES_H

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-07 15:54:19 +0000
+++ debian/changelog	2014-07-07 15:54:19 +0000
@@ -2,8 +2,9 @@
 
   [ Nick Dedekind ]
   * Added plugin module for Ubuntu.Settings.Menus
+  * Added TransferMenu
 
- -- Nicholas Dedekind <[e-mail]>  Mon, 07 Jul 2014 16:43:16 +0100
+ -- Nicholas Dedekind <[e-mail]>  Mon, 07 Jul 2014 12:28:37 +0100
 
 ubuntu-settings-components (0.2+14.10.20140701.2-0ubuntu2) utopic; urgency=medium
 

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-07-07 15:54:19 +0000
+++ tests/qmltests/CMakeLists.txt	2014-07-07 15:54:19 +0000
@@ -31,3 +31,4 @@
 add_qml_test(Menus UserSessionMenu)
 add_qml_test(Menus TextMessageMenu)
 add_qml_test(Menus TimeZoneMenu)
+add_qml_test(Menus TransferMenu)

=== added file 'tests/qmltests/Menus/tst_TransferMenu.qml'
--- tests/qmltests/Menus/tst_TransferMenu.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Menus/tst_TransferMenu.qml	2014-07-07 15:54:19 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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 Ubuntu.Settings.Menus 0.1
+import "../utils.js" as UtilsJS
+
+Item {
+    width: units.gu(42)
+    height: units.gu(75)
+
+    Flickable {
+        id: flickable
+
+        anchors.fill: parent
+        contentWidth: column.width
+        contentHeight: column.height
+
+        Item {
+            id: column
+
+            width: flickable.width
+            height: childrenRect.height
+
+            TransferMenu {
+                id: transferMenu
+
+                text: "Downloading Movie"
+                progress: 0
+                active: false
+                iconSource: Qt.resolvedUrl("../../artwork/avatar.png")
+            }
+            TransferMenu {
+                id: transferMenu2
+                anchors.top: transferMenu.bottom
+
+                text: "Syncing Data"
+                progress: 0.6
+                active: true
+                iconSource: Qt.resolvedUrl("../../artwork/rhythmbox.png")
+            }
+        }
+    }
+
+    TestCase {
+        name: "TransferMenu"
+        when: windowShown
+
+        function init() {
+            transferMenu.text = "";
+            transferMenu.iconSource = "";
+            transferMenu.progress = 0;
+            transferMenu.active = false;
+        }
+
+        function test_iconSource_data() {
+            return [ { icon: Qt.resolvedUrl("../../artwork/avatar.png") },
+                     { icon: Qt.resolvedUrl("../../artwork/rhythmbox.png") }
+            ];
+        }
+
+        function test_iconSource(data) {
+            transferMenu.iconSource = data.icon;
+
+            var icon = UtilsJS.findChild(transferMenu, "icon");
+            compare(icon.source, data.icon, "Icon does not match data");
+        }
+
+        function test_text_data() {
+            return [ { text: "Text 1" },
+                     { text: "Text 2" }
+            ];
+        }
+
+        function test_text(data) {
+            transferMenu.text = data.text;
+
+            var text = UtilsJS.findChild(transferMenu, "text");
+            compare(text.text, data.text, "Text does not match data");
+        }
+
+        function test_stateText_data() {
+            return [ { stateText: "State 1" },
+                     { stateText: "State 2" }
+            ];
+        }
+
+        function test_stateText(data) {
+            transferMenu.stateText = data.stateText;
+
+            var stateText = UtilsJS.findChild(transferMenu, "stateText");
+            compare(stateText.text, data.stateText, "State text does not match data");
+        }
+
+        function test_progress_data() {
+            return [ { progress: 0.5 },
+                     { progress: 1.0 }
+            ];
+        }
+
+        function test_progress(data) {
+            transferMenu.progress = data.progress;
+
+            var progress = UtilsJS.findChild(transferMenu, "progress");
+            compare(progress.value, data.progress, "Progress does not match expected value");
+        }
+
+        function test_active() {
+            var progress = UtilsJS.findChild(transferMenu, "progress");
+            var stateText = UtilsJS.findChild(transferMenu, "stateText");
+
+            transferMenu.active = true;
+            compare(progress.visible, true, "Progress should be visible when active");
+            compare(stateText.visible, true, "State should be visible when active");
+
+            transferMenu.active = false;
+            compare(progress.visible, false, "Progress should not be visible when inactive");
+            compare(stateText.visible, false, "State should not be visible when inactive");
+        }
+    }
+}