Merge lp:~unity-team/ubuntu-settings-components/status-icon into lp:~registry/ubuntu-settings-components/trunk

[Michał Sawicz]

Add new StatusIcon component.

New run-time dependency: suru-icon-theme.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:78
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/51/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/10
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/13

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/53/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/12
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/15

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/19

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/58/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/20/console
    None: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/20/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:83
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/59/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/21

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

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

A couple of comments added

review: Needs Fixing

[Michał Sawicz (saviq)]

Fixed.

[Nick Dedekind (nick-dedekind)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:84
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/60/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/18/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/22

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

review: Needs Fixing (continuous-integration)

=== modified file 'SettingsComponents.qml'
--- SettingsComponents.qml	2014-07-01 12:51:37 +0000
+++ SettingsComponents.qml	2014-07-01 12:51:37 +0000
@@ -18,6 +18,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Ubuntu.Settings.Components 0.1
 import Ubuntu.Settings.Menus 0.1
 
 MainView {
@@ -236,6 +237,35 @@
                         }
                     }
                 }
+
+                Row {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                    }
+
+                    spacing: units.gu(1)
+
+                    Label {
+                        text: "StatusIcon"
+                        anchors.verticalCenter: parent.verticalCenter
+                    }
+
+                    StatusIcon {
+                        height: units.gu(5)
+                        source: "image://theme/gps"
+                    }
+
+                    StatusIcon {
+                        height: units.gu(5)
+                        source: "image://theme/battery-caution"
+                    }
+
+                    StatusIcon {
+                        height: units.gu(5)
+                        source: "image://theme/missing,gpm-battery-000-charging"
+                    }
+                }
             }
         }
     }

=== added file 'Ubuntu/Settings/Components/StatusIcon.qml'
--- Ubuntu/Settings/Components/StatusIcon.qml	1970-01-01 00:00:00 +0000
+++ Ubuntu/Settings/Components/StatusIcon.qml	2014-07-01 12:51:37 +0000
@@ -0,0 +1,129 @@
+/*
+ * 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
+
+Item {
+    id: root
+
+    /*!
+       The source of the icon to display.
+       \qmlproperty url source
+    */
+    property url source
+
+    /*!
+       The color that all pixels that originally are of color \l keyColor should take.
+       \qmlproperty color color
+    */
+    property alias color: colorizedImage.keyColorOut
+
+    /*!
+       The color of the pixels that should be colorized.
+       By default it is set to #808080.
+       \qmlproperty color keyColor
+    */
+    property alias keyColor: colorizedImage.keyColorIn
+
+    // FIXME: should only be "status", but overriding in settings app doesn't work.
+    property var sets: ["status","apps"]
+
+    implicitWidth: image.width
+
+    Image {
+        id: image
+        objectName: "image"
+        anchors { top: parent.top; bottom: parent.bottom }
+        sourceSize.height: height
+
+        visible: !colorizedImage.active
+
+        property string iconPath: "/usr/share/icons/suru/%1/scalable/%2.svg"
+        property var icons: {
+            if (String(root.source).match(/^image:\/\/theme/)) {
+                return String(root.source).replace("image://theme/", "").split(",");
+            } else return null;
+        }
+        property int fallback: 0
+        property int setFallback: 0
+
+        Component.onCompleted: updateSource()
+        onStatusChanged: if (status == Image.Error) bump();
+        onIconsChanged: reset()
+
+        Connections {
+            target: root
+            onSetsChanged: image.reset()
+        }
+
+        function reset() {
+            fallback = 0;
+            setFallback = 0;
+
+            updateSource();
+        }
+
+        function bump() {
+            if (icons === null) return;
+            if (fallback < icons.length - 1) fallback += 1;
+            else if (setFallback < root.sets.length - 1) {
+                setFallback += 1;
+                fallback = 0;
+            } else {
+                console.warn("Could not load StatusIcon with source \"%1\" and sets %2.".arg(root.source).arg(root.sets));
+                return;
+            }
+
+            updateSource();
+        }
+
+        function updateSource() {
+            if (icons === null) {
+                source = root.source;
+            } else {
+                source = (root.sets && root.sets.length > setFallback) && (icons && icons.length > fallback) ?
+                            iconPath.arg(root.sets[setFallback]).arg(icons[fallback]) : "";
+            }
+        }
+    }
+
+    ShaderEffect {
+        id: colorizedImage
+
+        anchors.fill: parent
+        visible: active && image.status == Image.Ready
+
+        // Whether or not a color has been set.
+        property bool active: keyColorOut != Qt.rgba(0.0, 0.0, 0.0, 0.0)
+
+        property Image source: visible ? image : null
+        property color keyColorOut: Qt.rgba(0.0, 0.0, 0.0, 0.0)
+        property color keyColorIn: "#808080"
+        property real threshold: 0.1
+
+        fragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            uniform sampler2D source;
+            uniform highp vec4 keyColorOut;
+            uniform highp vec4 keyColorIn;
+            uniform lowp float threshold;
+            uniform lowp float qt_Opacity;
+            void main() {
+                lowp vec4 sourceColor = texture2D(source, qt_TexCoord0);
+                gl_FragColor = mix(vec4(keyColorOut.rgb, 1.0) * sourceColor.a, sourceColor, step(threshold, distance(sourceColor.rgb / sourceColor.a, keyColorIn.rgb))) * qt_Opacity;
+            }"
+    }
+}

=== modified file 'Ubuntu/Settings/Components/qmldir'
--- Ubuntu/Settings/Components/qmldir	2013-10-29 17:40:23 +0000
+++ Ubuntu/Settings/Components/qmldir	2014-07-01 12:51:37 +0000
@@ -5,3 +5,4 @@
 HeroMessageHeader 0.1 HeroMessageHeader.qml
 IconVisual 0.1 IconVisual.qml
 QuickReply 0.1 QuickReply.qml
+StatusIcon 0.1 StatusIcon.qml

=== modified file 'debian/control'
--- debian/control	2014-07-01 12:51:37 +0000
+++ debian/control	2014-07-01 12:51:37 +0000
@@ -13,6 +13,7 @@
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
                qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),
+               suru-icon-theme,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/ubuntu-settings-components
 # If you don't have have commit access to this branch but would like to upload
@@ -27,6 +28,7 @@
 Depends: qml-module-qtquick-layouts,
          qtdeclarative5-ubuntu-settings-components-assets (= ${source:Version}),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),
+         suru-icon-theme,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Ubuntu Settings Components

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2013-10-04 10:10:47 +0000
+++ tests/qmltests/CMakeLists.txt	2014-07-01 12:51:37 +0000
@@ -11,6 +11,7 @@
 )
 
 add_qml_test(Components Calendar)
+add_qml_test(Components StatusIcon)
 
 add_qml_test(Menus AccessPointMenu)
 add_qml_test(Menus ButtonMenu)

=== added file 'tests/qmltests/Components/tst_StatusIcon.qml'
--- tests/qmltests/Components/tst_StatusIcon.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/Components/tst_StatusIcon.qml	2014-07-01 12:51:37 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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 Ubuntu.Settings.Components 0.1
+import "../utils.js" as UtilsJS
+
+Item {
+    width: units.gu(40)
+    height: units.gu(70)
+
+    StatusIcon {
+        id: icon
+
+        height: units.gu(3)
+    }
+
+    TestCase {
+        name: "StatusIcon"
+        when: windowShown
+
+        function init() {
+            icon.source = "";
+            icon.sets = [ "status" ]
+            waitForRendering(icon)
+        }
+
+        function test_icon() {
+            icon.source = "image://theme/bar,gps,baz";
+
+            var image = UtilsJS.findChild(icon, "image");
+            tryCompare(image, "source", "file://" + image.iconPath.arg("status").arg("gps"));
+        }
+
+        function test_iconFallback() {
+            icon.source = "image://theme/foo,bar,baz";
+
+            var image = UtilsJS.findChild(icon, "image");
+            tryCompare(image, "source", "file://" + image.iconPath.arg("status").arg("baz"));
+        }
+
+        function test_iconSets() {
+            icon.source = "image://theme/bar,add,baz";
+            icon.sets = [ "foo", "actions", "bar" ]
+
+            var image = UtilsJS.findChild(icon, "image");
+            tryCompare(image, "source", "file://" + image.iconPath.arg("actions").arg("add"));
+        }
+
+        function test_iconSetsFallback() {
+            icon.source = "image://theme/add,bar,baz";
+            icon.sets = [ "foo", "bar", "baz" ]
+
+            var image = UtilsJS.findChild(icon, "image");
+            tryCompare(image, "source", "file://" + image.iconPath.arg("baz").arg("baz"));
+        }
+
+        function test_iconSource() {
+            var image = UtilsJS.findChild(icon, "image");
+            icon.source = image.iconPath.arg("status").arg("gps");
+
+            tryCompare(image, "source", "file://" + image.iconPath.arg("status").arg("gps"));
+        }
+    }
+}