Merge lp:~zsombi/ubuntu-ui-toolkit/icon_async into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Expose Icon.asynchronous property to drive image loading of the icon.

Expose Icon.asynchronous property to drive image loading of the icon.

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1828
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/205/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/490/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64/205/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1828
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/214/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/491/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-singlenode/214/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

proeprty -> property

Defaults to true. -> Defaults to false.

review: Needs Fixing

[lp:~zsombi/ubuntu-ui-toolkit/icon_async]

1829. By Zsombor Egri on 2016-02-11

typo and default value mistake fixed

1830. By Zsombor Egri on 2016-02-11

staging sync

[Albert Astals Cid (aacid)]

Looks good to me

review: Approve

[Cris Dywan (kalikiana)]

This obviously make sense... it's unfortunate however very sensible to keep it off by default... maybe we can re-consider that for 1.4 at least.

I notice test_keyColor no longer has the work-around for qtbug 49713 where log is '' and the value is Error, I can't imagine how that bug would no longer apply here.

review: Needs Information

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1830
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/290/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/774/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/290/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1830
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/65/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/775/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/65/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1830
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/294/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/776/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/294/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/icon_async]

1831. By Zsombor Egri on 2016-02-11

moving shader result test from previous version

[Cris Dywan (kalikiana)]

Thanks! Let's see the test passing now.

review: Approve

[lp:~zsombi/ubuntu-ui-toolkit/icon_async]

1832. By Zsombor Egri on 2016-02-11

API updated

1833. By Zsombor Egri on 2016-02-11

fixing API changes

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1830
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/42/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/784/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/42/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

FAILED: Continuous integration, rev:1830
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/14/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/290/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/294/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/65/console
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/42/console
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/785/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/774
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/776
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/775
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/784

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1833
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/68/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/789/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/68/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1833
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/293/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/790/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/293/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1833
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/297/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/792/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/297/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1833
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/45/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/793/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/45/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1833
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/17/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/293
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/297
        deb: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/297/artifact/debs/artifacts/*zip*/artifacts.zip
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/68
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/45
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/794/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/790
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/792
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/789
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/793

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/17/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1833
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/297/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/805/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/297/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1833
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/72/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/808/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/72/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1833
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/301/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/809/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/301/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:1833
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/49/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/810/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/49/rebuild

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2016-02-08 12:03:42 +0000
+++ components.api	2016-02-11 09:50:36 +0000
@@ -500,6 +500,7 @@
 Ubuntu.Components.Icon 1.1: Icon
     property url source
 Ubuntu.Components.Icon 1.3: Item
+    property bool asynchronous
     property color color
     property color keyColor
     property string name
@@ -1006,6 +1007,7 @@
     property bool showProgressPercentage
     property double value
 Ubuntu.Components.ProgressionSlot 1.3: Item
+    property bool asynchronous
     property color color
     property color keyColor
     property string name

=== modified file 'src/Ubuntu/Components/1.3/Icon.qml'
--- src/Ubuntu/Components/1.3/Icon.qml	2015-12-14 08:55:29 +0000
+++ src/Ubuntu/Components/1.3/Icon.qml	2016-02-11 09:50:36 +0000
@@ -101,6 +101,12 @@
 
     property alias source: image.source
 
+    /*!
+      \qmlproperty bool Icon::asynchronous
+      The property drives the image loading of the icon. Defaults to false.
+    */
+    property alias asynchronous: image.asynchronous
+
     implicitWidth: image.implicitWidth
     implicitHeight: image.implicitHeight
 
@@ -119,6 +125,7 @@
 
         cache: true
         visible: !colorizedImage.visible
+        asynchronous: false
     }
 
     ShaderEffect {

=== added file 'tests/unit_x11/tst_components/tst_icon13.qml'
--- tests/unit_x11/tst_components/tst_icon13.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_icon13.qml	2016-02-11 09:50:36 +0000
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2016 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.4
+import QtTest 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Test 1.0
+
+Item {
+    width: units.gu(50)
+    height: units.gu(50)
+
+    Row {
+        anchors.centerIn: parent
+        height: units.gu(10)
+        width: childrenRect.width
+
+        Icon {
+            // Fails to load the icon when suru-icon-theme or libqt5svg5 are
+            // not installed. This causes a warning and rejection
+            // by jenkins continuous integration.
+            name: "add"
+            height: parent.height
+            width: height
+        }
+        Icon {
+            // Fails when the icon is becoming invisible when non-atomic updates
+            // cause sourceSize.width or sourceSize.height to be 0 before other
+            // properties are updated.
+            id: icon
+            width: visible ? units.gu(10) : 0
+            height: width
+            name: "search"
+        }
+        Icon {
+            id: icon2
+            width: units.gu(10)
+            height: width
+        }
+        Icon {
+            // Regression test for bug #1371509
+            // Will print "QML QQuickImage: Failed to get image from provider" when broken.
+            id: icon3
+            width: units.gu(10)
+            height: width
+            source: Qt.resolvedUrl("tst_icon-select.png")
+        }
+    }
+
+    UbuntuTestCase {
+        name: "Icon"
+        when: windowShown
+
+        SignalSpy {
+            id: shaderSpy
+            signalName: 'onStatusChanged'
+        }
+
+        function cleanup() {
+            icon2.name = "";
+        }
+
+        function initTestCase() {
+            compare(icon.asynchronous, false, "asynchronous default value differs");
+        }
+
+        function test_updateIconSize_bug1349769() {
+            icon.visible = false;
+            // causes "QML Image: Failed to get image from provider: image://theme/search"
+            // warning when sourceSize.width or sourceSize.height becomes 0 while
+            // while still trying to render the icon. Tests will pass with the warning, but
+            // the MR is rejected by jenkins continuous integration.
+        }
+
+        function test_name() {
+            icon2.name = "search";
+
+            var image = findChild(icon2, "image");
+            compare(image.source, "image://theme/search",
+                    "Source of the image should be image://theme/{name}.");
+        }
+
+        function test_source() {
+            icon2.name = "search";
+            icon2.source = "/usr/share/icons/suru/actions/scalable/edit-find.svg";
+
+            var image = findChild(icon2, "image");
+            compare(image.source,
+                    "file:///usr/share/icons/suru/actions/scalable/edit-find.svg",
+                    "Source of the image should equal icon2.source.");
+        }
+
+        function test_keyColor() {
+            icon.visible = true;
+            var image = findChild(icon, "image");
+            var shader = findChild(icon, "shader");
+            shaderSpy.target = shader;
+
+            compare(icon.name, 'search');
+            compare(shader.visible, false);
+            compare(shader.status, ShaderEffect.Uncompiled)
+            icon.color = UbuntuColors.orange;
+            shaderSpy.wait();
+            compare(shader.log, '')
+            // https://bugreports.qt.io/browse/QTBUG-49713
+            // status may be Error with no log even if successful
+            verify(shader.status !== ShaderEffect.Uncompiled)
+            compare(shader.keyColorOut, icon.color);
+            compare(shader.visible, true);
+            compare(shader.source, image);
+            icon.keyColor = UbuntuColors.purple;
+            compare(shader.keyColorIn, icon.keyColor);
+            // Unsetting the icon name should disable the shader
+            icon.name = '';
+            compare(icon.source, '');
+            compare(shader.visible, false);
+            // Let's get back to a valid source
+            icon.name = 'search';
+            compare(shader.visible, true);
+            compare(shader.source, image);
+            // Unsetting the keyColor should also disable the shader
+            icon.color = Qt.rgba(0.0, 0.0, 0.0, 0.0);
+            compare(shader.visible, false);
+        }
+    }
+}