Merge lp:~larsu/ubuntu-settings-components/remove-icon-lookup-hack into lp:~registry/ubuntu-settings-components/trunk

[Lars Karlitski]

StatusIcon: remove icon loading hack

StatusIcon loads icons itself to make sure rectangular icons preserve their aspect ratio. It doesn't follow the fdo spec for this, but hard-codes some of the suru icon theme subdirectories. This breaks when someone requests an icon from a different subdirectory or doesn't have suru installed in /usr/share.

UnityThemeIconProvider supports rectangular icons now, making this workaround unnecessary.

StatusIcon: remove icon loading hack

This depends on lp:~larsu/ubuntu-ui-toolkit/custom-icon-lookup.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

This component should just go away completely, as well as its uses in unity8 and ubuntu-settings-components, once the UITK fix is in.

review: Needs Resubmitting

[lp:~larsu/ubuntu-settings-components/remove-icon-lookup-hack]

77. By Lars Karlitski on 2014-08-26

Remove StatusIcon

It worked around the fact that rectangular icons didn't work. The image
provider in ubuntu-ui-toolkit supports those now and people can just use its
Icon component instead.

[Lars Karlitski (larsu)]

Ok, removed it. I'm in the process of removing StatusIcon in Unity8 and System Settings as well.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/79/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/41

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

review: Approve (continuous-integration)

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

FAILED: Continuous integration, rev:77
https://unity8-jenkins.ubuntu.com/job/lp-ubuntu-settings-components-ci/23/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1136/console

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Text conflict in examples/SettingsComponents.qml
Contents conflict in plugins/Ubuntu/Settings/Components/StatusIcon.qml
Text conflict in plugins/Ubuntu/Settings/Components/qmldir
Text conflict in tests/qmltests/CMakeLists.txt
Contents conflict in tests/qmltests/Components/tst_StatusIcon.qml
5 conflicts encountered.

Unmerged revisions

77. By Lars Karlitski on 2014-08-26

Remove StatusIcon

It worked around the fact that rectangular icons didn't work. The image
provider in ubuntu-ui-toolkit supports those now and people can just use its
Icon component instead.

76. By Lars Karlitski on 2014-08-25

StatusIcon: remove icon loading hack

StatusIcon loads icons itself to make sure rectangular icons preserve their
aspect ratio. It doesn't follow the fdo spec for this, but hard-codes some of
the suru icon theme subdirectories. This breaks when someone requests an icon
from a different subdirectory or doesn't have suru installed in /usr/share.

UnityThemeIconProvider supports rectangular icons now, making this workaround
unnecessary.

=== modified file 'SettingsComponents.qml'
--- SettingsComponents.qml	2014-07-04 14:07:50 +0000
+++ SettingsComponents.qml	2014-08-26 15:38:35 +0000
@@ -256,35 +256,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 'Ubuntu/Settings/Components/StatusIcon.qml'
--- Ubuntu/Settings/Components/StatusIcon.qml	2014-07-01 12:10:32 +0000
+++ 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.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	2014-06-30 15:36:05 +0000
+++ Ubuntu/Settings/Components/qmldir	2014-08-26 15:38:35 +0000
@@ -5,4 +5,3 @@
 HeroMessageHeader 0.1 HeroMessageHeader.qml
 IconVisual 0.1 IconVisual.qml
 QuickReply 0.1 QuickReply.qml
-StatusIcon 0.1 StatusIcon.qml

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-07-04 14:07:50 +0000
+++ tests/qmltests/CMakeLists.txt	2014-08-26 15:38:35 +0000
@@ -11,7 +11,6 @@
 )
 
 add_qml_test(Components Calendar)
-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	2014-07-01 10:41:39 +0000
+++ tests/qmltests/Components/tst_StatusIcon.qml	1970-01-01 00:00:00 +0000
@@ -1,80 +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.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"));
-        }
-    }
-}