Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntu-shape-icon into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

[UbuntuShape] Added an ShellIcon item.

[UbuntuShape] Added an ShellIcon item.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1581
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2047/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/775/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/777/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/774/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2047/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1583
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2052/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/782
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/782/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/779

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2052/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1584
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2056/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/784
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/786
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/786/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/783

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2056/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1586
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2057/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/785
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/787
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/787/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/784

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2057/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1587
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2060/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/788
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/790
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/790/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/787

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2060/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

Are the changes to ucubuntushape.{cpp,h} intentionally in this MR, or does the branch need to sync with another branch/staging?

[Tim Peeters (tpeeters)]

142 + radius, a drop shadow aspect and a PereserveAspectCrop source fill mode. Changing the width

*PreserveAspectCrop

[Tim Peeters (tpeeters)]

The implementation itself looks fine, but I don't think we should add this new component without an API discussion. Can you create one here? https://drive.google.com/drive/folders/0B2qCWpKr2DsHNFhNQkYzc1Z1Tm8

If I ignore the implementation+performance and just think of the API, then perhaps we should extend the Icon component with a bool property to enable the shape around it? Alternatively, would it be possible to have the defaults of the UbuntuShapeIcon applied to UbuntuShape instead (using implicitWidth/Height and a default radius) when an icon is set inside the shape? (maybe we have to extend it with an iconName property, like the Icon.name).

review: Needs Information

[Loïc Molinari (loic.molinari)]

> Are the changes to ucubuntushape.{cpp,h} intentionally in this MR, or does the
> branch need to sync with another branch/staging?

The relative radius needed by UbuntuShapeIcon requires a higher bound whic hexplains the changes there.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1588
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2083/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/811
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/813
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/813/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/810

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2083/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

what about naming it StandardFrame?

[Tim Peeters (tpeeters)]

should we have this component in the UITK component gallery?

[Loïc Molinari (loic.molinari)]

So let's call it ShellIcon and put it in the gallery.

[Loïc Molinari (loic.molinari)]

Resubmitted removing the now useless prerequisite and changing the naming.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1591
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2095/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/823/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/825/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/822/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2095/rebuild

review: Needs Fixing (continuous-integration)

[lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-ubuntu-shape-icon]

1592. By Loïc Molinari on 2015-08-06

Fixed components.api.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1592
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2096/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/824
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/826
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/826/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/823

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2096/rebuild

review: Approve (continuous-integration)

[Tim Peeters (tpeeters)]

okay, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-08-04 20:07:41 +0000
+++ components.api	2015-08-06 14:21:03 +0000
@@ -826,6 +826,7 @@
     property double contentsWidth
     property bool modal
     property string title
+Ubuntu.Components.ShellIcon 1.3: UbuntuShape
 Ubuntu.Components.ListItems.SingleControl 1.0 0.1: Empty
     property Item control
 Ubuntu.Components.ListItems.SingleControl 1.3: Empty

=== added file 'examples/ubuntu-ui-toolkit-gallery/ShellIcon.qml'
--- examples/ubuntu-ui-toolkit-gallery/ShellIcon.qml	1970-01-01 00:00:00 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ShellIcon.qml	2015-08-06 14:21:03 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2015 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 Ubuntu.Components 1.3
+
+Template {
+    objectName: "shellIconsTemplate"
+
+    TemplateSection {
+        title: "Shell Icon"
+        className: "ShellIcon"
+
+        TemplateRow {
+            title: i18n.tr("Sizes")
+            titleWidth: units.gu(8)
+            height: units.gu(14)
+
+            ShellIcon {
+                objectName: "shellicon_size1"
+                source: Image { source: "map_icon.png" }
+                width: units.gu(6)
+            }
+            ShellIcon {
+                objectName: "shellicon_size2"
+                source: Image { source: "map_icon.png" }
+                width: units.gu(10)
+            }
+            ShellIcon {
+                objectName: "shellicon_size3"
+                source: Image { source: "map_icon.png" }
+                width: units.gu(14)
+            }
+        }
+    }
+}

=== modified file 'examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml'
--- examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-08-03 14:20:21 +0000
+++ examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml	2015-08-06 14:21:03 +0000
@@ -87,6 +87,11 @@
         source: "Icons.qml"
     }
     ListElement {
+        objectName: "shellIconsElement"
+        label: "Shell Icons"
+        source: "ShellIcon.qml"
+    }
+    ListElement {
         objectName: "labelsElement"
         label: "Label"
         source: "Label.qml"

=== modified file 'src/Ubuntu/Components/plugin/plugin.cpp'
--- src/Ubuntu/Components/plugin/plugin.cpp	2015-07-23 11:49:38 +0000
+++ src/Ubuntu/Components/plugin/plugin.cpp	2015-08-06 14:21:03 +0000
@@ -33,6 +33,7 @@
 #include "quickutils.h"
 #include "ucubuntushape.h"
 #include "ucubuntushapeoverlay.h"
+#include "ucshellicon.h"
 #include "inversemouseareatype.h"
 #include "qquickclipboard.h"
 #include "qquickmimedata.h"
@@ -216,6 +217,7 @@
     qmlRegisterCustomType<UCStyleHints>(uri, 1, 3, "StyleHints", new UCStyleHintsParser);
     qmlRegisterType<UCAction, 1>(uri, 1, 3, "Action");
     qmlRegisterType<UCUbuntuShape, 2>(uri, 1, 3, "UbuntuShape");
+    qmlRegisterType<UCShellIcon>(uri, 1, 3, "ShellIcon");
 }
 
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
--- src/Ubuntu/Components/plugin/plugin.pri	2015-07-30 09:57:45 +0000
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-08-06 14:21:03 +0000
@@ -30,6 +30,7 @@
     $$PWD/ucubuntushapetexture.h \
     $$PWD/ucubuntushape.h \
     $$PWD/ucubuntushapeoverlay.h \
+    $$PWD/ucshellicon.h \
     $$PWD/inversemouseareatype.h \
     $$PWD/qquickclipboard.h \
     $$PWD/qquickmimedata.h \
@@ -88,6 +89,7 @@
     $$PWD/quickutils.cpp \
     $$PWD/ucubuntushape.cpp \
     $$PWD/ucubuntushapeoverlay.cpp \
+    $$PWD/ucshellicon.cpp \
     $$PWD/inversemouseareatype.cpp \
     $$PWD/qquickclipboard.cpp \
     $$PWD/qquickmimedata.cpp \

=== added file 'src/Ubuntu/Components/plugin/ucshellicon.cpp'
--- src/Ubuntu/Components/plugin/ucshellicon.cpp	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucshellicon.cpp	2015-08-06 14:21:03 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2015 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/>.
+ *
+ * Author: Loïc Molinari <[e-mail]>
+ */
+
+#include "ucshellicon.h"
+
+const qreal aspectRatio = 16.0 / 15.0;
+const qreal invAspectRatio = 1.0 / aspectRatio;
+
+/*! \qmltype ShellIcon
+    \instantiates UCShellIcon
+    \inqmlmodule Ubuntu.Components 1.3
+    \ingroup ubuntu
+    \brief Extended UbuntuShape mostly used for icons and vignettes.
+
+    The ShellIcon is an extended \l UbuntuShape with a fixed aspect ratio (16:15), a relative
+    radius, a drop shadow aspect and a PreserveAspectCrop source fill mode. Changing the width
+    implies an update of height and radius, and changing the height implies an update of width and
+    radius. The goal being to keep the same proportion between width, height and radius whatever the
+    size.
+*/
+UCShellIcon::UCShellIcon(QQuickItem* parent)
+    : UCUbuntuShape(parent)
+{
+    setAspect(UCUbuntuShape::DropShadow);
+    setRelativeRadius(0.67);
+    setSourceFillMode(UCUbuntuShape::PreserveAspectCrop);
+    connect(this, SIGNAL(widthChanged()), this, SLOT(_q_updateHeight()));
+    connect(this, SIGNAL(heightChanged()), this, SLOT(_q_updateWidth()));
+}
+
+void UCShellIcon::_q_updateWidth()
+{
+    const qreal newWidth = height() * aspectRatio;
+    if (qAbs(newWidth - width()) > 0.5) {
+        setWidth(newWidth);
+    }
+}
+
+void UCShellIcon::_q_updateHeight()
+{
+    const qreal newHeight = width() * invAspectRatio;
+    if (qAbs(newHeight - height()) > 0.5) {
+        setHeight(newHeight);
+    }
+}

=== added file 'src/Ubuntu/Components/plugin/ucshellicon.h'
--- src/Ubuntu/Components/plugin/ucshellicon.h	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/plugin/ucshellicon.h	2015-08-06 14:21:03 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2015 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/>.
+ *
+ * Author: Loïc Molinari <[e-mail]>
+ */
+
+#ifndef UCSHELLICON_H
+#define UCSHELLICON_H
+
+#include "ucubuntushape.h"
+
+class UCShellIcon : public UCUbuntuShape
+{
+    Q_OBJECT
+
+public:
+    UCShellIcon(QQuickItem* parent=0);
+
+private Q_SLOTS:
+    void _q_updateWidth();
+    void _q_updateHeight();
+
+private:
+    Q_DISABLE_COPY(UCShellIcon)
+};
+
+QML_DECLARE_TYPE(UCShellIcon)
+
+#endif  // UCSHELLICON_H

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-07-31 09:40:26 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-08-06 14:21:03 +0000
@@ -291,8 +291,8 @@
     , m_sourceScale(1.0f, 1.0f)
     , m_sourceTranslation(0.0f, 0.0f)
     , m_sourceTransform(1.0f, 1.0f, 0.0f, 0.0f)
+    , m_relativeRadius(0)
     , m_radius(Small)
-    , m_relativeRadius(0)
     , m_aspect(Inset)
     , m_imageHorizontalAlignment(AlignHCenter)
     , m_imageVerticalAlignment(AlignVCenter)
@@ -366,15 +366,14 @@
     \since Ubuntu.Components 1.3
 
     This property defines a radius relative to the size of the UbuntuShape. It is specified as a
-    number between 0.0 (0%) and 0.5 (50%) corresponding to the proportion of the radius with regards
-    to the smallest side (divided by 2 since a side has 2 angles). The default value is 0.0.
+    number between 0.0 (0%) and 0.75 (75%) corresponding to the proportion of the radius with
+    regards to the smallest side (divided by 2 since a side has 2 angles). The default value is 0.0.
 
     \note Setting a non-zero value takes over the \l radius property.
 */
 void UCUbuntuShape::setRelativeRadius(qreal relativeRadius)
 {
-    // m_relativeRadius is on 6 bits, increasing the higher bound might require higher precision.
-    const quint8 relativeRadiusPacked = qRound(qBound(0.0, relativeRadius, 0.5) * 100.0);
+    const quint8 relativeRadiusPacked = qRound(qBound(0.0, relativeRadius, 0.75) * 100.0);
     if (m_relativeRadius != relativeRadiusPacked) {
         m_relativeRadius = relativeRadiusPacked;
         update();

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.h'
--- src/Ubuntu/Components/plugin/ucubuntushape.h	2015-07-31 09:40:26 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.h	2015-08-06 14:21:03 +0000
@@ -330,8 +330,8 @@
     QVector2D m_sourceScale;
     QVector2D m_sourceTranslation;
     QVector4D m_sourceTransform;
+    quint8 m_relativeRadius;
     Radius m_radius : 2;
-    quint8 m_relativeRadius : 6;
     quint8 m_aspect : 3;
     HAlignment m_imageHorizontalAlignment : 2;
     VAlignment m_imageVerticalAlignment : 2;
@@ -341,6 +341,7 @@
     FillMode m_sourceFillMode : 2;
     WrapMode m_sourceHorizontalWrapMode : 1;
     WrapMode m_sourceVerticalWrapMode : 1;
+    quint8 __explicit_padding : 6;
     quint8 m_sourceOpacity;
     quint8 m_flags;
 

=== added file 'tests/resources/ubuntushape/ShellIconTest.qml'
--- tests/resources/ubuntushape/ShellIconTest.qml	1970-01-01 00:00:00 +0000
+++ tests/resources/ubuntushape/ShellIconTest.qml	2015-08-06 14:21:03 +0000
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2015 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 1.3
+
+Item {
+    id: root
+    width: 500
+    height: width * (15.0 / 16.0)
+    focus: true
+
+    // Zoom properties.
+    property variant translation: Qt.point(0.0, 0.0)
+    property real scaleBase: 1.1
+    property real scaleExponent: 0.0
+    property real minScaleExponent: 0.0
+    property real maxScaleExponent:  48.317715856  // Logarithm of 100 to base 1.1 (scaleBase).
+    property real scaleFactor: 1.0
+    property real scale: 1.0
+
+    // Overlay text properties.
+    property string textOverlayString:
+        "Zoom  (scroll):   x " + root.scaleFactor.toFixed(1) + "\n" +
+        "Width      (a):   " + shape.width.toFixed(2) + "\n" +
+        "Height     (z):   " + shape.height.toFixed(2)
+
+    // Main scene.
+    Item {
+        id: scene
+        anchors.fill: parent
+
+        Rectangle {
+            id: background
+            anchors.fill: parent
+            color: "white"
+        }
+
+        ShellIcon {
+            id: shape
+            anchors.centerIn: parent
+            width: 300
+            source: Image { source: "music-app.png" }
+        }
+    }
+
+    // Zoom support.
+    ShaderEffectSource {
+        id: shaderEffectSource
+        anchors.fill: scene
+        sourceItem: scene
+        hideSource: true
+        visible: false
+        smooth: false
+    }
+    ShaderEffect {
+        anchors.fill: scene
+        property variant tex: shaderEffectSource
+        property variant translation: root.translation
+        property real scaleFactor: root.scale
+        vertexShader: "
+            uniform mat4 qt_Matrix;
+            uniform float scaleFactor;
+            uniform vec2 translation;
+            attribute vec4 qt_Vertex;
+            attribute vec2 qt_MultiTexCoord0;
+            varying vec2 texCoord;
+            void main() {
+                texCoord = vec2(scaleFactor) * qt_MultiTexCoord0 + translation;
+                gl_Position = qt_Matrix * qt_Vertex;
+            }"
+        fragmentShader: "
+            uniform sampler2D tex;
+            uniform float qt_Opacity;
+            varying vec2 texCoord;
+            void main() {
+                gl_FragColor = texture2D(tex, texCoord) * qt_Opacity;
+            }"
+    }
+
+    // Text overlay.
+    Text {
+        id: textOverlay
+        width:200
+        anchors.top: parent.top
+        anchors.topMargin: 10
+        anchors.left: parent.left
+        anchors.leftMargin: 10
+        font.family: "Ubuntu Mono"
+        font.pixelSize: 14
+        font.weight: Font.Bold
+        color: "black"
+        text: textOverlayString
+    }
+
+    // Mouse handling.
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        acceptedButtons: Qt.LeftButton
+        hoverEnabled: true
+
+        property real lastX: 0.0
+        property real lastY: 0.0
+
+        onPressed: {
+            if (pressedButtons & Qt.LeftButton) {
+                lastX = mouseX;
+                lastY = mouseY;
+            }
+        }
+        onPositionChanged: {
+            if (pressedButtons & Qt.LeftButton) {
+                var tx = root.translation.x;
+                var ty = root.translation.y;
+                var sx = root.scale / root.width;
+                var sy = root.scale / root.height;
+                var x = mouseX - lastX;
+                var y = mouseY - lastY;
+                root.translation = Qt.point(Math.max(0.0, Math.min(1.0 - root.scale, tx - sx * x)),
+                                            Math.max(0.0, Math.min(1.0 - root.scale, ty - sy * y)));
+                lastX = mouseX;
+                lastY = mouseY;
+            }
+        }
+        onWheel: {
+            root.scaleExponent = Math.max(minScaleExponent, Math.min(maxScaleExponent,
+                root.scaleExponent + (wheel.angleDelta.y < 0.0 ? -1.0 : 1.0)));
+            root.scaleFactor = Math.pow(root.scaleBase, root.scaleExponent);
+            var oldScale = root.scale;
+            root.scale = 1.0 / root.scaleFactor;
+            var s = oldScale - root.scale;
+            var tx = root.translation.x;
+            var ty = root.translation.y;
+            var x = mouseX / root.width;
+            var y = mouseY / root.height;
+            root.translation = Qt.point(Math.max(0.0, Math.min(1.0 - root.scale, tx + s * x)),
+                                        Math.max(0.0, Math.min(1.0 - root.scale, ty + s * y)));
+        }
+    }
+
+    // Keyboard handling.
+    Keys.onPressed: {
+        var shift = Qt.ShiftModifier;
+
+        if (event.key == Qt.Key_A) {
+            shape.width = Math.max(0.0, shape.width + ((event.modifiers & shift) ? 2.0 : -2.0));
+        } else if (event.key == Qt.Key_Z) {
+            shape.height = Math.max(0.0, shape.height + ((event.modifiers & shift) ? 2.0 : -2.0));
+        }
+    }
+}

=== added file 'tests/resources/ubuntushape/music-app.png'
Binary files tests/resources/ubuntushape/music-app.png	1970-01-01 00:00:00 +0000 and tests/resources/ubuntushape/music-app.png	2015-08-06 14:21:03 +0000 differ