Merge lp:~aacid/ubuntu-settings-components/remove_StatusIcon into lp:ubuntu-settings-components

[Albert Astals Cid]

Remove StatusIcon, we've moved to SDK Icon

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

 * 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

 * If you changed localized strings, has the POT file been updated?
N/A

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
also checked no other StatusIcon strings present in the code
 * Did CI run pass? If not, please explain why.
waiting

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:156
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/43/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2197
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2225
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2131
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2131
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2131
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2122
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2122/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2122
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2122/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2122
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2122/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2122
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2122/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2122
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2122/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2122
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2122/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2122
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2122/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2122
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2122/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2122
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2122/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/43/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/OtherComponents.qml'
--- examples/OtherComponents.qml	2016-02-11 11:23:02 +0000
+++ examples/OtherComponents.qml	2016-06-30 15:45:36 +0000
@@ -225,35 +225,6 @@
                     }
                 }
             }
-
-            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"
-                }
-            }
         }
     }
 }

=== removed file 'plugins/Ubuntu/Settings/Components/StatusIcon.qml'
--- plugins/Ubuntu/Settings/Components/StatusIcon.qml	2016-02-11 11:23:02 +0000
+++ plugins/Ubuntu/Settings/Components/StatusIcon.qml	1970-01-01 00:00:00 +0000
@@ -1,129 +0,0 @@
-/*
- * 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.4
-
-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 'plugins/Ubuntu/Settings/Components/qmldir'
--- plugins/Ubuntu/Settings/Components/qmldir	2015-04-07 09:42:19 +0000
+++ plugins/Ubuntu/Settings/Components/qmldir	2016-06-30 15:45:36 +0000
@@ -6,5 +6,4 @@
 Calendar 0.1 Calendar.qml
 MessageHeader 0.1 MessageHeader.qml
 QuickReply 0.1 QuickReply.qml
-StatusIcon 0.1 StatusIcon.qml
 UbuntuShapeForItem 0.1 UbuntuShapeForItem.qml

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2016-06-15 10:45:27 +0000
+++ tests/qmltests/CMakeLists.txt	2016-06-30 15:45:36 +0000
@@ -14,7 +14,6 @@
 
 add_qml_test(Components Calendar)
 add_qml_test(Components ServerPropertySynchroniser)
-add_qml_test(Components StatusIcon)
 
 add_qml_test(Menus AccessPointMenu)
 add_qml_test(Menus ButtonMenu)

=== removed file 'tests/qmltests/Components/tst_StatusIcon.qml'
--- tests/qmltests/Components/tst_StatusIcon.qml	2016-02-11 11:23:02 +0000
+++ tests/qmltests/Components/tst_StatusIcon.qml	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * 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.4
-import QtTest 1.0
-import Ubuntu.Test 0.1
-import Ubuntu.Settings.Components 0.1
-
-Item {
-    width: units.gu(40)
-    height: units.gu(70)
-
-    StatusIcon {
-        id: icon
-
-        height: units.gu(3)
-    }
-
-    UbuntuTestCase {
-        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 = 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 = 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 = 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 = findChild(icon, "image");
-            tryCompare(image, "source", "file://" + image.iconPath.arg("baz").arg("baz"));
-        }
-
-        function test_iconSource() {
-            var image = findChild(icon, "image");
-            icon.source = image.iconPath.arg("status").arg("gps");
-
-            tryCompare(image, "source", "file://" + image.iconPath.arg("status").arg("gps"));
-        }
-    }
-}