Merge lp:~unity-2d-team/unity-2d/launcher-layout into lp:unity-2d/3.0

[Ugo Riboni]

[launcher] Implement various look and feel changes in the launcher to match the launcher design on Natty.
The only functional change is the "pips" on the right side of the window to indicate the number of open windows.
There are also changes to the icon and blended image providers, to correctly handle scaling if requested in the former and to use the right compositing mode for the latter. Both also have more warnings and safer code.
Everything else is visual changes and code cleaning.

[Florian Boucault (fboucault)]

The launcher width is only 65 pixels in the mockups, not 66.

review: Needs Fixing

[Florian Boucault (fboucault)]

launcher/UnityApplications/iconimageprovider.cpp:

QDebug include is in the middle of the file.

review: Needs Fixing

[Ugo Riboni (uriboni)]

Fixed the QDebug. Regarding the 66 vs. 65 pixels: it's 66 in the current natty implementation, 65 in the mockup. I didn't fix it for now, and you will figure it out with Otto later as agreed.

[lp:~unity-2d-team/unity-2d/launcher-layout]

387. By Ugo Riboni on 2011-02-11

Move QDebug include to the top of the file

[Florian Boucault (fboucault)]

=== modified file 'launcher/Launcher.qml'

@@ -44,11 +53,7 @@
                     list.visibleMenu.hide()
                 }
                 list.visibleMenu = item.menu
-
- /* The menu needs to never overlap with the MouseArea of
- item otherwise flickering happens when the mouse is on
- an overlapping pixel (hence the -4). */
- item.menu.show(width-4, y+height/2-list.contentY+panel.y)
+ item.menu.show(width, y + height / 2 - list.contentY + panel.y)

The contextual menu's vertical position is slightly off, it should be around 3 pixels below. The point of the arrow of the contextual menu should be at the same height as the point of the arrow showing that the application is focused.

review: Needs Fixing

[Florian Boucault (fboucault)]

Can you add an unexpected change to that merge request? The width of the ubuntu circle of friends button in the panel has to coincide with the width of the launcher so that the line of the button and the border line of the launcher match perfectly and form only one continuous vertical line.

Thanks.

[Florian Boucault (fboucault)]

=== modified file 'launcher/LauncherItem.qml'

+ It is tile composed by a colored background layer, an icon (with 'icon' as source),
+ and a shine layer on top.

does not make sense.

review: Needs Fixing

[Florian Boucault (fboucault)]

=== modified file 'launcher/UnityApplications/launcherapplication.cpp'

@@ -394,6 +404,8 @@
     }
     if (m_has_visible_window != prev)
         emit hasVisibleWindowChanged(m_has_visible_window);
+
+ Q_EMIT windowCountChanged(windowCount());
 }

This is a hack taking advantage of the fact that LauncherApplication::updateHasVisibleWindow is called at the right time.

Instead you need to define a slot that will do Q_EMIT windowCountChanged(windowCount()); and connect it to BamfApplication::WindowAdded and BamfApplication::WindowRemoved signals.

review: Needs Fixing (code)

[Florian Boucault (fboucault)]

> === modified file 'launcher/UnityApplications/launcherapplication.cpp'
>
> @@ -394,6 +404,8 @@
> }
> if (m_has_visible_window != prev)
> emit hasVisibleWindowChanged(m_has_visible_window);
> +
> + Q_EMIT windowCountChanged(windowCount());
> }
>
>
> This is a hack taking advantage of the fact that
> LauncherApplication::updateHasVisibleWindow is called at the right time.
>
> Instead you need to define a slot that will do Q_EMIT
> windowCountChanged(windowCount()); and connect it to
> BamfApplication::WindowAdded and BamfApplication::WindowRemoved signals.

I suggest calling the slot 'updateWindowCount'.

[Florian Boucault (fboucault)]

=== modified file 'launcher/app/launcherview.cpp'

@@ -32,6 +32,9 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>

+#define MAX(a,b) ((a >= b) ? a : b)
+#define MIN(a,b) ((a <= b) ? a : b)
+

Remove and replace with Qt's qMax and qMin.

(http://doc.qt.nokia.com/latest/qtglobal.html#qMax)

review: Needs Fixing

[Florian Boucault (fboucault)]

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp 2011-02-08 10:41:55 +0000
+++ launcher/app/launcher.cpp 2011-02-11 11:57:46 +0000
@@ -76,12 +76,15 @@
     launcherView->setFocus();

     launcherView->engine()->addImportPath(unity2dImportPath());
+ launcherView->engine()->addImportPath(unity2dDirectory() + "/libunity-2d-private/");

This should _only_ be done when running un-installed. Please take example from places/app/places.cpp:

    if (!isRunningInstalled()) {
        [...]
        /* Place.qml imports Unity2d */
        view.engine()->addImportPath(unity2dDirectory() + "/libunity-2d-private/");
    }

review: Needs Fixing

[Florian Boucault (fboucault)]

=== modified file 'launcher/app/launcher.cpp'

     launcherView->rootContext()->setContextProperty("launcherView", launcherView);
     launcherView->rootContext()->setContextProperty("panel", &panel);
+ launcherView->rootContext()->setContextProperty("engineBaseUrl",
+ launcherView->engine()->baseUrl().toLocalFile());

This looks like a workaround for the lack of support of images in path relative to the launcher binary in BlendedImageProvider. Let's document it quickly for now.

[Florian Boucault (fboucault)]

=== added file 'launcher/artwork/launcher_arrow_ltr.png'
=== added file 'launcher/artwork/launcher_arrow_rtl.png'
=== added file 'launcher/artwork/launcher_pip_ltr.png'

No abbreviations. Replace 'ltr' with 'left' and 'rtl' with 'right'.

review: Needs Fixing

[Florian Boucault (fboucault)]

I sometimes get a WARNING (hopefully not important):

LauncherItem.qml:89 Unable to assign undefined value

[Florian Boucault (fboucault)]

=== modified file 'libunity-2d-private/Unity2d/blendedimageprovider.cpp'

        qWarning() << "BlendedImageProvider: faile to match id:" << id;
should read
        qWarning() << "BlendedImageProvider: failed to match id:" << id;

"[...] when a sting isn't an SVG color name"
should read
"[...] when a string is not a SVG color name (eg. "red", "yellow", etc.)

review: Needs Fixing

[Florian Boucault (fboucault)]

Only 'launcher/LauncherItem.qml' left to do and the review should be complete.

[lp:~unity-2d-team/unity-2d/launcher-layout]

388. By Ugo Riboni on 2011-02-15

Make sure the panel home button is aligned with the new launcher size

389. By Ugo Riboni on 2011-02-15

Make sure the menu is aligned with the center of tha active app arrow

390. By Ugo Riboni on 2011-02-15

Fix typos in comment

391. By Ugo Riboni on 2011-02-15

Fix to prevent some harmless warnings

392. By Ugo Riboni on 2011-02-15

Separate the code path for updating windowCount from that of hasVisibleWindow

393. By Ugo Riboni on 2011-02-15

Use qMin and qMax instead of local defines

394. By Ugo Riboni on 2011-02-15

Make sure to correctly add import paths based on installed/uninstalled status. Document a workaround.

395. By Ugo Riboni on 2011-02-15

Fix typos and docs

[Ugo Riboni (uriboni)]

Fixed pretty much everything, except the renaming of the icons which stay as they are since they were copied from Unity.

Also please check my fix in commit 391 for the following warning:
"LauncherItem.qml:89 Unable to assign undefined value"
and let me know if you have a better workaround.

[Florian Boucault (fboucault)]

Sounds good to me, ship that good job!

review: Approve

=== modified file 'launcher/Launcher.qml'
--- launcher/Launcher.qml	2011-02-10 08:24:27 +0000
+++ launcher/Launcher.qml	2011-02-15 13:21:38 +0000
@@ -2,39 +2,48 @@
 import UnityApplications 1.0
 
 Item {
-    width: 58
-    height: 1024
+    id: launcher
 
     Image {
         id: background
 
         anchors.fill: parent
         fillMode: Image.TileVertically
-        source: "/usr/share/unity/themes/launcher_background_middle.png"
+        source: "artwork/background.png"
     }
 
     ListView {
         id: list
+        spacing: 5
+        anchors.topMargin: 5
+        anchors.fill: parent
+        focus: true
 
         /* Keep a reference to the currently visible contextual menu */
         property variant visibleMenu
 
-        anchors.fill: parent
-        focus: true
-
         model: ListAggregatorModel {
             id: items
         }
 
         delegate: LauncherItem {
-            id: wrapper
-
-            width: 58; height: 54
-            icon: "image://icons/"+item.icon
+            id: launcherItem
+
+            width: launcher.width
+            height: tileSize
+
+            icon: "image://icons/" + item.icon
             running: item.running
             active: item.active
             urgent: item.urgent
             launching: item.launching
+            pips: Math.min(item.windowCount, 3)
+            tileSize: 54
+
+            /* Best way I could find to check if the item is an application or the
+               workspaces switcher. There may be something cleaner and better. */
+            backgroundFromIcon: item.toString().indexOf("LauncherApplication") == 0 ||
+                                item.toString().indexOf("Workspaces") == 0
 
             Binding { target: item.menu; property: "title"; value: item.name }
 
@@ -44,11 +53,9 @@
                     list.visibleMenu.hide()
                 }
                 list.visibleMenu = item.menu
-
-                /* The menu needs to never overlap with the MouseArea of
-                   item otherwise flickering happens when the mouse is on
-                   an overlapping pixel (hence the -4). */
-                item.menu.show(width-4, y+height/2-list.contentY+panel.y)
+                // The extra 4 pixels are needed to center exactly with the arrow
+                // that indicated the active tile.
+                item.menu.show(width, y + height / 2 - list.contentY + panel.y + 4)
             }
 
             onClicked: {
@@ -75,6 +82,7 @@
                 else
                     item.menu.hide()
             }
+
             Connections {
                 target: list
                 onMovementStarted: item.menu.hide()
@@ -87,16 +95,17 @@
             }
 
             ListView.onAdd: SequentialAnimation {
-                PropertyAction { target: wrapper; property: "scale"; value: 0 }
-                NumberAnimation { target: wrapper; property: "height"; from: 0; to: 54; duration: 250; easing.type: Easing.InOutQuad }
-                NumberAnimation { target: wrapper; property: "scale"; to: 1; duration: 250; easing.type: Easing.InOutQuad }
+                PropertyAction { target: launcherItem; property: "scale"; value: 0 }
+                NumberAnimation { target: launcherItem; property: "height";
+                                  from: 0; to: launcherItem.tileSize; duration: 250; easing.type: Easing.InOutQuad }
+                NumberAnimation { target: launcherItem; property: "scale"; to: 1; duration: 250; easing.type: Easing.InOutQuad }
             }
 
             ListView.onRemove: SequentialAnimation {
-                PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
-                NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
-                NumberAnimation { target: wrapper; property: "height"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
-                PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: false }
+                PropertyAction { target: launcherItem; property: "ListView.delayRemove"; value: true }
+                NumberAnimation { target: launcherItem; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
+                NumberAnimation { target: launcherItem; property: "height"; to: 0; duration: 250; easing.type: Easing.InOutQuad }
+                PropertyAction { target: launcherItem; property: "ListView.delayRemove"; value: false }
             }
 
             onRunningChanged: setIconGeometry()

=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-01-17 19:17:00 +0000
+++ launcher/LauncherItem.qml	2011-02-15 13:21:38 +0000
@@ -1,201 +1,214 @@
 import Qt 4.7
-
-/* Item displaying a launcher item.
-
-   It contains:
-    - a generic bordered background image
-    - an icon representing the item
-    - a text describing the item
-
-   When an application is launched, the border changes appearance.
-   It supports mouse hover by changing the appearance of the background image.
-
-   The 'icon' property holds the source of the image to load as an icon.
-   The 'label' property holds the text to display.
-   The 'running' property is a boolean indicating whether or not the
-   application is launched.
-
-   The 'clicked' signal is emitted upon clicking on the item.
+import Unity2d 1.0
+
+/* This component represents a single "tile" in the launcher and the surrounding
+   indicator icons.
+
+   The tile is square in size, with a side determined by the 'tileSize' property,
+   and rounded borders.
+   It is composed by a colored background layer, an icon (with 'icon' as source),
+   and a layer on top that provides a "shine" effect.
+   The main color of the background layer may be calculated based on the icon color
+   or may be fixed (depending on the 'backgroundFromIcon' property).
+
+   There's also an additional layer which contains only the outline of the tile
+   that is only appearing during the launching animation (when the 'launching' property is
+   true). During this animation the background fades out and the outline fades in,
+   giving a "pulsing" appearance to the tile.
+
+   Around the tile we may have on the left a number of "pips" between zero and three.
+   Pips are small icons used to indicate how many windows we have open for the current tile
+   (based on the 'windowCount' property).
+   The rule is: if there's only one window, we just display an arrow. If there are
+   two we display 2 pips, if there are 3 or more display 3 pips.
+
+   On the right of the tile there's an arrow that appears if the tile is currently 'active'.
+
+   Additionally, when the tile is marked as 'urgent' it will start an animation where the
+   rotation is changed so that it appears to be "shaking".
 */
 Item {
-    id: launcherItem
+    id: item
+    anchors.horizontalCenter: parent.horizontalCenter
 
+    property int tileSize
     property alias icon: icon.source
-    property alias label: label.text
     property bool running: false
     property bool active: false
     property bool urgent: false
     property bool launching: false
+    property bool backgroundFromIcon
+    property color defaultBackgroundColor: "#333333"
+
+    property int pips: 0
+    property string pipSource: engineBaseUrl + "artwork/launcher_" +
+                               ((pips <= 1) ? "arrow" : "pip") + "_ltr.png"
+    function getPipOffset(index) {
+        /* Pips need to always be centered, regardless if they are an even or odd
+           number. The following simple conditional code works and is less
+           convoluted than a generic formula. It's ok since we always work with at
+           most three pips anyway. */
+        if (pips == 1) return 0;
+        if (pips == 2) return (index == 0) ? -2 : +2
+        else return (index == 0) ? 0 : (index == 1) ? -4 : +4
+    }
 
     signal clicked(variant mouse)
     signal entered
     signal exited
 
-    Keys.onPressed: {
-        if (event.key == Qt.Key_Return) {
-            clicked()
-            event.accepted = true;
-        }
-    }
-
-    Image {
-        id: shadow
-
-        source: "artwork/shadow.png"
-        asynchronous: true
-    }
-
-    Image {
-        id: glow
-
-        anchors.horizontalCenter: parent.horizontalCenter
+    /* This is the arrow shown at the right of the tile when the application is
+       the active one */
+    Image {
+        anchors.right: parent.right
         anchors.verticalCenter: parent.verticalCenter
-
-        source: "artwork/glow.png"
-        asynchronous: true
-        opacity: 0.0
-
-        SequentialAnimation on opacity {
-            loops: Animation.Infinite
-            alwaysRunToEnd: true
-            running: launching
-            NumberAnimation { to: 1.0; duration: 1000; easing.type: Easing.InOutQuad }
-            NumberAnimation { to: 0.0; duration: 1000; easing.type: Easing.InOutQuad }
+        source: "image://blended/%1color=%2alpha=%3"
+              .arg(engineBaseUrl + "artwork/launcher_arrow_rtl.png")
+              .arg("lightgrey")
+              .arg(1.0)
+
+        /* This extra shift is necessary (as is for the pips below)
+           since we are vertically centering in a parent with even height, so
+           there's one pixel offset that need to be assigned arbitrarily.
+           Unity chose to add it, QML to subtract it. So we adjust for that. */
+        transform: Translate { y: 1 }
+
+        visible: active
+    }
+
+    /* This is the area on the left of the tile where the pips/arrow end up.
+
+       I'd rather use a Column here, but the pip images have an halo
+       around them, so they are pretty tall and would mess up the column.
+       As a workaround I center all of them, then shift up or down
+       depending on the index. */
+    Repeater {
+        model: item.pips
+        delegate: Image {
+            /* FIXME: It seems that when the image is created (or re-used) by the Repeater
+               for a moment it doesn't have any parent, and therefore warnings are
+               printed for the following two anchor assignements. This fixes the
+               problem, but I'm not sure if it should happen in the first place. */
+            anchors.left: (parent) ? parent.left : undefined
+            anchors.verticalCenter: (parent) ? parent.verticalCenter : undefined
+
+            source: "image://blended/%1color=%2alpha=%3"
+                    .arg(pipSource).arg("lightgrey").arg(1.0)
+
+            transform: Translate { y: getPipOffset(index) + 1 }
         }
     }
 
+    /* This is the for centering the actual tile in the launcher */
     Item {
-        id: container
-
-        width: 50
-        height: 50
-        anchors.horizontalCenter: parent.horizontalCenter
-        anchors.verticalCenter: parent.verticalCenter
-
-        MouseArea {
-            id: mouse
-
-            acceptedButtons: Qt.LeftButton | Qt.RightButton
-            hoverEnabled: true
-            anchors.fill: parent
-            onClicked: launcherItem.clicked(mouse)
-            onEntered: launcherItem.entered()
-            onExited: launcherItem.exited()
-        }
-
-        Rectangle {
-            id: background
-
-            opacity: mouse.containsMouse ? 1.0 : 0.9
-            anchors.fill: parent
-            anchors.margins: 1
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            smooth: true
-            color: if(icon.source != "")
-                       return launcherView.iconAverageColor(icon.source,
-                                                            Qt.size(icon.width, icon.height))
-            radius: 5
-        }
-
+        id: tile
+        anchors.centerIn: parent
+        width: item.tileSize
+        height: parent.height
+
+        /* This is the image providing the background image. The
+           color blended with this image is obtained from the color of the icon when it's
+           loaded.
+           While the application is launching, this will fade out and in. */
+        Image {
+            id: tileBackground
+            property color color: defaultBackgroundColor
+            anchors.fill: parent
+
+            SequentialAnimation on opacity {
+                NumberAnimation { to: 0.0; duration: 1000; easing.type: Easing.InOutQuad }
+                NumberAnimation { to: 1.0; duration: 1000; easing.type: Easing.InOutQuad }
+
+                loops: Animation.Infinite
+                alwaysRunToEnd: true
+                running: launching
+            }
+
+            sourceSize.width: item.tileSize
+            sourceSize.height: item.tileSize
+            source: "image://blended/%1color=%2alpha=%3"
+                    .arg(engineBaseUrl + "artwork/round_corner_54x54.png")
+                    .arg(color.toString().replace("#", ""))
+                    .arg(1.0)
+        }
+
+        /* This image appears only while launching, and pulses in and out in counterpoint
+           to the background, so that the outline of the tile is always visible. */
+        Image {
+            id: tileOutline
+            anchors.fill: parent
+
+            sourceSize.width: item.tileSize
+            sourceSize.height: item.tileSize
+            source: "artwork/round_outline_54x54.png"
+
+            opacity: 0
+
+            SequentialAnimation on opacity {
+                NumberAnimation { to: 1.0; duration: 1000; easing.type: Easing.InOutQuad }
+                NumberAnimation { to: 0.0; duration: 1000; easing.type: Easing.InOutQuad }
+
+                loops: Animation.Infinite
+                alwaysRunToEnd: true
+                running: launching
+            }
+        }
+
+        /* This is just the main icon of the tile */
         Image {
             id: icon
-
-            width: 32
-            height: 32
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            fillMode: Image.PreserveAspectFit
-            sourceSize.width: width
-            sourceSize.height: height
-            smooth: true
-
-            asynchronous: true
-            opacity: status == Image.Ready ? 1 : 0
-            Behavior on opacity {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
+            anchors.centerIn: parent
+
+            sourceSize.width: 48
+            sourceSize.height: 48
+
+            /* Whenever one of the parameters used in calculating the background color of
+               the icon changes, recalculate its value */
+            onWidthChanged: updateColors()
+            onHeightChanged: updateColors()
+            onSourceChanged: updateColors()
+
+            function updateColors() {
+                if (!item.backgroundFromIcon) return;
+
+                var colors = launcherView.getColorsFromIcon(icon.source, icon.sourceSize)
+                if (colors && colors.length > 0) tileBackground.color = colors[0]
+            }
         }
 
+        /* This just adds some shiny effect to the tile */
         Image {
-            id: foreground
-
+            id: tileShine
             anchors.fill: parent
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenter: parent.verticalCenter
-            fillMode: Image.PreserveAspectFit
-            sourceSize.width: width
-            sourceSize.height: height
-            smooth: true
-
-            source: "/usr/share/unity/themes/prism_icon_foreground.png"
-
-            asynchronous: true
-            opacity: status == Image.Ready ? 1 : 0
-            Behavior on opacity {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
+
+            source: "artwork/round_shine_54x54.png"
+            sourceSize.width: item.tileSize
+            sourceSize.height: item.tileSize
         }
 
+        /* The entire tile will "shake" when the window is marked as "urgent", to attract
+           the user's attention */
         SequentialAnimation {
-            id: nudging
             running: urgent
+            alwaysRunToEnd: true
+
             SequentialAnimation {
                 loops: 30
-                NumberAnimation { target: container; property: "rotation"; to: 15; duration: 150 }
-                NumberAnimation { target: container; property: "rotation"; to: -15; duration: 150 }
+                NumberAnimation { target: tile; property: "rotation"; to: 15; duration: 150 }
+                NumberAnimation { target: tile; property: "rotation"; to: -15; duration: 150 }
             }
-            NumberAnimation { target: container; property: "rotation"; to: 0; duration: 75 }
-        }
-
-        NumberAnimation {
-            id: end_nudging
-            running: !urgent
-            target: container
-            property: "rotation"
-            to: 0
-            duration: 75
-        }
-
-    }
-
-    Image {
-        id: running_arrow
-
-        z: -1
-        width: sourceSize.width
-        height: sourceSize.height
-        anchors.rightMargin: -2
-        anchors.right: container.left
-        anchors.verticalCenter: container.verticalCenter
-        opacity: running ? 1.0 : 0.0
-        source: urgent ? "/usr/share/unity/themes/application-running-notify.png" : "/usr/share/unity/themes/application-running.png"
-
-        Behavior on opacity {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
-    }
-
-    Image {
-        id: active_arrow
-
-        z: -1
-        width: sourceSize.width
-        height: sourceSize.height
-        anchors.leftMargin: -2
-        anchors.left: container.right
-        anchors.verticalCenter: container.verticalCenter
-        opacity: active ? 1.0 : 0.0
-        source: "/usr/share/unity/themes/application-selected.png"
-
-        Behavior on opacity {NumberAnimation {duration: 200; easing.type: Easing.InOutQuad}}
-    }
-
-    Text {
-        id: label
-
-        font.pointSize: 10
-        wrapMode: Text.WordWrap
-        horizontalAlignment: Text.AlignHCenter
-        anchors.top: parent.bottom
-        anchors.topMargin: 7
-        anchors.right: parent.right
-        anchors.bottom: parent.bottom
-        anchors.left: parent.left
-        font.underline: parent.focus
+            NumberAnimation { target: tile; property: "rotation"; to: 0; duration: 75 }
+        }
+    }
+
+    MouseArea {
+        id: mouse
+        anchors.fill: parent
+
+        hoverEnabled: true
+        acceptedButtons: Qt.LeftButton | Qt.RightButton
+        onClicked: item.clicked(mouse)
+        onEntered: item.entered()
+        onExited: item.exited()
     }
 }

=== modified file 'launcher/UnityApplications/iconimageprovider.cpp'
--- launcher/UnityApplications/iconimageprovider.cpp	2011-01-15 01:41:03 +0000
+++ launcher/UnityApplications/iconimageprovider.cpp	2011-02-15 13:21:38 +0000
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include <QFile>
+#include <QDebug>
 
 
 static const char* UNITY_RES_PATH = "/usr/share/unity/";
@@ -46,25 +47,34 @@
        to do so was a failure due to the fragility of the code path. For example
        it is very easy to break the entire mechanism by adding or forgetting a
        slash in any of the paths. */
-    if (id.startsWith(UNITY_RES_PATH))
-    {
-        if (QFile::exists(id))
-        {
-            return QImage(id);
-        }
-        else
-        {
-            QString rid(id);
-            rid.replace(UNITY_RES_PATH, INSTALL_PREFIX "/share/unity-2d/");
-            /* No need to check whether the file exists, we don’t have a
-               fallback anyway. */
-            return QImage(rid);
-        }
-    }
-
-    /* Dealing with case where id is an absolute path to the icon file */
-    if(id.startsWith("/"))
-        return QImage(id);
+    QString iconFilePath;
+    if (id.startsWith(UNITY_RES_PATH)) {
+        iconFilePath = id;
+        if (!QFile::exists(iconFilePath)) {
+            iconFilePath.replace(UNITY_RES_PATH, INSTALL_PREFIX "/share/unity-2d/");
+        }
+    } else if (id.startsWith("/")) {
+        iconFilePath = id;
+    }
+
+    /* We have a direct path to the icon file. Let's load it, scale it if required and
+       we are done */
+    if (!iconFilePath.isEmpty()) {
+        QImage icon(iconFilePath);
+        if (icon.isNull()) {
+            qWarning() << "Failed to directly load icon at path:" << iconFilePath;
+            return QImage();
+        }
+
+        if (requestedSize.isValid()) {
+            icon = icon.scaled(requestedSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+        }
+
+        if (size) {
+            *size = icon.size();
+        }
+        return icon;
+    }
 
     /* if id is of the form theme_name/icon_name then lookup the icon in the
        specified theme otherwise in the default theme */

=== modified file 'launcher/UnityApplications/launcherapplication.cpp'
--- launcher/UnityApplications/launcherapplication.cpp	2011-02-10 08:24:27 +0000
+++ launcher/UnityApplications/launcherapplication.cpp	2011-02-15 13:21:38 +0000
@@ -109,6 +109,16 @@
     return false;
 }
 
+int
+LauncherApplication::windowCount() const
+{
+    if (m_application == NULL) {
+        return 0;
+    }
+
+    return m_application->windows()->size();
+}
+
 bool
 LauncherApplication::urgent() const
 {
@@ -297,6 +307,8 @@
     QObject::connect(application, SIGNAL(UrgentChanged(bool)), this, SIGNAL(urgentChanged(bool)));
     QObject::connect(application, SIGNAL(WindowAdded(BamfWindow*)), this, SLOT(updateHasVisibleWindow()));
     QObject::connect(application, SIGNAL(WindowRemoved(BamfWindow*)), this, SLOT(updateHasVisibleWindow()));
+    QObject::connect(application, SIGNAL(WindowAdded(BamfWindow*)), this, SLOT(updateWindowCount()));
+    QObject::connect(application, SIGNAL(WindowRemoved(BamfWindow*)), this, SLOT(updateWindowCount()));
     connect(application, SIGNAL(ChildAdded(BamfView*)), SLOT(slotChildAdded(BamfView*)));
     connect(application, SIGNAL(ChildRemoved(BamfView*)), SLOT(slotChildRemoved(BamfView*)));
 
@@ -318,6 +330,7 @@
     m_launching_timer.stop();
     emit launchingChanged(launching());
     updateHasVisibleWindow();
+    updateWindowCount();
     fetchIndicatorMenus();
 }
 
@@ -396,6 +409,12 @@
         emit hasVisibleWindowChanged(m_has_visible_window);
 }
 
+void
+LauncherApplication::updateWindowCount()
+{
+    Q_EMIT windowCountChanged(windowCount());
+}
+
 bool
 LauncherApplication::has_visible_window() const
 {

=== modified file 'launcher/UnityApplications/launcherapplication.h'
--- launcher/UnityApplications/launcherapplication.h	2011-02-10 08:24:27 +0000
+++ launcher/UnityApplications/launcherapplication.h	2011-02-15 13:21:38 +0000
@@ -52,6 +52,7 @@
     /* getters */
     virtual bool active() const;
     virtual bool running() const;
+    virtual int windowCount() const;
     virtual bool urgent() const;
     bool sticky() const;
     virtual QString name() const;
@@ -93,6 +94,7 @@
     void onBamfApplicationClosed(bool running);
     void onLaunchingTimeouted();
     void updateHasVisibleWindow();
+    void updateWindowCount();
 
     bool launch();
     void show();

=== modified file 'launcher/UnityApplications/launcherdevice.cpp'
--- launcher/UnityApplications/launcherdevice.cpp	2011-01-14 20:41:34 +0000
+++ launcher/UnityApplications/launcherdevice.cpp	2011-02-15 13:21:38 +0000
@@ -54,6 +54,12 @@
     return false;
 }
 
+int
+LauncherDevice::windowCount() const
+{
+    return 0;
+}
+
 bool
 LauncherDevice::urgent() const
 {

=== modified file 'launcher/UnityApplications/launcherdevice.h'
--- launcher/UnityApplications/launcherdevice.h	2010-11-04 19:50:22 +0000
+++ launcher/UnityApplications/launcherdevice.h	2011-02-15 13:21:38 +0000
@@ -40,6 +40,7 @@
     /* getters */
     virtual bool active() const;
     virtual bool running() const;
+    virtual int windowCount() const;
     virtual bool urgent() const;
     virtual QString name() const;
     virtual QString icon() const;

=== modified file 'launcher/UnityApplications/launcheritem.h'
--- launcher/UnityApplications/launcheritem.h	2010-12-16 11:07:52 +0000
+++ launcher/UnityApplications/launcheritem.h	2011-02-15 13:21:38 +0000
@@ -31,6 +31,7 @@
 
     Q_PROPERTY(bool active READ active NOTIFY activeChanged)
     Q_PROPERTY(bool running READ running NOTIFY runningChanged)
+    Q_PROPERTY(int windowCount READ windowCount NOTIFY windowCountChanged)
     Q_PROPERTY(bool urgent READ urgent NOTIFY urgentChanged)
     Q_PROPERTY(QString name READ name NOTIFY nameChanged)
     Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)
@@ -45,6 +46,7 @@
     /* getters */
     virtual bool active() const = 0;
     virtual bool running() const = 0;
+    virtual int windowCount() const = 0;
     virtual bool urgent() const = 0;
     virtual QString name() const = 0;
     virtual QString icon() const = 0;
@@ -61,6 +63,7 @@
 signals:
     void activeChanged(bool);
     void runningChanged(bool);
+    void windowCountChanged(int);
     void urgentChanged(bool);
     void nameChanged(QString);
     void iconChanged(QString);

=== modified file 'launcher/UnityApplications/placeentry.cpp'
--- launcher/UnityApplications/placeentry.cpp	2011-02-07 15:41:35 +0000
+++ launcher/UnityApplications/placeentry.cpp	2011-02-15 13:21:38 +0000
@@ -234,6 +234,12 @@
     return false;
 }
 
+int
+PlaceEntry::windowCount() const
+{
+    return 0;
+}
+
 bool
 PlaceEntry::urgent() const
 {

=== modified file 'launcher/UnityApplications/placeentry.h'
--- launcher/UnityApplications/placeentry.h	2011-02-01 18:03:11 +0000
+++ launcher/UnityApplications/placeentry.h	2011-02-15 13:21:38 +0000
@@ -109,6 +109,7 @@
     /* getters */
     virtual bool active() const;
     virtual bool running() const;
+    virtual int windowCount() const;
     virtual bool urgent() const;
     virtual QString name() const;
     virtual QString icon() const;

=== modified file 'launcher/UnityApplications/trash.cpp'
--- launcher/UnityApplications/trash.cpp	2011-01-14 20:41:34 +0000
+++ launcher/UnityApplications/trash.cpp	2011-02-15 13:21:38 +0000
@@ -53,6 +53,12 @@
     return false;
 }
 
+int
+Trash::windowCount() const
+{
+    return 0;
+}
+
 bool
 Trash::urgent() const
 {
@@ -68,7 +74,7 @@
 QString
 Trash::icon() const
 {
-    return QString(unity2dDirectory() + "/launcher/artwork/trash.png");
+    return "user-trash";
 }
 
 bool

=== modified file 'launcher/UnityApplications/trash.h'
--- launcher/UnityApplications/trash.h	2010-11-09 10:52:04 +0000
+++ launcher/UnityApplications/trash.h	2011-02-15 13:21:38 +0000
@@ -39,6 +39,7 @@
     /* getters */
     virtual bool active() const;
     virtual bool running() const;
+    virtual int windowCount() const;
     virtual bool urgent() const;
     virtual QString name() const;
     virtual QString icon() const;

=== modified file 'launcher/UnityApplications/workspaces.cpp'
--- launcher/UnityApplications/workspaces.cpp	2011-02-03 20:31:40 +0000
+++ launcher/UnityApplications/workspaces.cpp	2011-02-15 13:21:38 +0000
@@ -48,6 +48,12 @@
     return false;
 }
 
+int
+Workspaces::windowCount() const
+{
+    return 0;
+}
+
 bool
 Workspaces::urgent() const
 {

=== modified file 'launcher/UnityApplications/workspaces.h'
--- launcher/UnityApplications/workspaces.h	2011-02-02 22:45:59 +0000
+++ launcher/UnityApplications/workspaces.h	2011-02-15 13:21:38 +0000
@@ -39,6 +39,7 @@
     /* getters */
     virtual bool active() const;
     virtual bool running() const;
+    virtual int windowCount() const;
     virtual bool urgent() const;
     virtual QString name() const;
     virtual QString icon() const;

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-02-08 10:41:55 +0000
+++ launcher/app/launcher.cpp	2011-02-15 13:21:38 +0000
@@ -64,7 +64,7 @@
     /* Panel containing the QML declarative view */
     Unity2dPanel panel;
     panel.setEdge(Unity2dPanel::LeftEdge);
-    panel.setFixedWidth(58);
+    panel.setFixedWidth(66);
 
     /* QML declarative view */
     LauncherView *launcherView = new LauncherView;
@@ -79,10 +79,17 @@
     /* Note: baseUrl seems to be picky: if it does not end with a slash,
        setSource() will fail */
     launcherView->engine()->setBaseUrl(QUrl::fromLocalFile(unity2dDirectory() + "/launcher/"));
+    if (!isRunningInstalled()) {
+        launcherView->engine()->addImportPath(unity2dDirectory() + "/libunity-2d-private/");
+    }
 
     launcherView->rootContext()->setContextProperty("launcherView", launcherView);
     launcherView->rootContext()->setContextProperty("panel", &panel);
 
+    /* FIXME: this is needed since the blended image provider doesn't support relative paths yet */
+    launcherView->rootContext()->setContextProperty("engineBaseUrl",
+                                                    launcherView->engine()->baseUrl().toLocalFile());
+
     LauncherControl control;
     launcherView->rootContext()->setContextProperty("launcherControl", &control);
     control.connectToBus();

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-02-07 17:21:35 +0000
+++ launcher/app/launcherview.cpp	2011-02-15 13:21:38 +0000
@@ -110,65 +110,53 @@
     if (accepted) event->accept();
 }
 
-QColor
-LauncherView::iconAverageColor(QUrl source, QSize size)
+/* Calculates both the background color and the glow color of a launcher tile
+   based on the colors in the specified icon (using the same algorithm as Unity).
+   The values are returned as list where the first item is the background color
+   and the second one is the glow color.
+*/
+QList<QVariant>
+LauncherView::getColorsFromIcon(QUrl source, QSize size) const
 {
-    /* FIXME: we are loading again an icon that was already loaded */
+    QList<QVariant> colors;
+
+    // FIXME: we should find a way to avoid reloading the icon
     QImage icon = engine()->imageProvider("icons")->requestImage(source.path().mid(1), &size, size);
-
-    if (icon.width() == 0 || icon.height() == 0)
-    {
-        qWarning() << "Unable to load icon at" << source;
-        return QColor();
+    if (icon.width() == 0 || icon.height() == 0) {
+        qWarning() << "Unable to load icon in getColorsFromIcon from" << source;
+        return colors;
     }
 
-    int total_r = 0, total_g = 0, total_b = 0;
-    int select_r = 0, select_g = 0, select_b = 0;
-    int selected_pixels = 0;
+    long int rtotal = 0, gtotal = 0, btotal = 0;
+    float total = 0.0f;
 
-    for (int y=0; y<icon.height(); ++y)
-    {
-        for (int x=0; x<icon.width(); ++x)
-        {
+    for (int y = 0; y < icon.height(); ++y) {
+        for (int x = 0; x < icon.width(); ++x) {
             QColor color = QColor::fromRgba(icon.pixel(x, y));
 
-            if (color.alphaF() < 0.5)
-                continue;
-
-            total_r += color.red();
-            total_g += color.green();
-            total_b += color.blue();
-
-            if (color.saturationF() <= 0.33)
-                continue;
-
-            select_r += color.red();
-            select_g += color.green();
-            select_b += color.blue();
-
-            selected_pixels++;
+            float saturation = (qMax (color.red(), qMax (color.green(), color.blue())) -
+                                qMin (color.red(), qMin (color.green(), color.blue()))) / 255.0f;
+            float relevance = .1 + .9 * (color.alpha() / 255.0f) * saturation;
+
+            rtotal += (unsigned char) (color.red() * relevance);
+            gtotal += (unsigned char) (color.green() * relevance);
+            btotal += (unsigned char) (color.blue() * relevance);
+
+            total += relevance * 255;
         }
     }
 
-    QColor color;
-
-    if (selected_pixels <= 20)
-    {
-        int total_pixels = icon.width()*icon.height();
-        color = QColor::fromRgb(total_r/total_pixels,
-                                total_g/total_pixels,
-                                total_b/total_pixels);
-        color.setHsv(color.hue(), 0, color.value());
-    }
-    else
-    {
-        color = QColor::fromRgb(select_r/selected_pixels,
-                                select_g/selected_pixels,
-                                select_b/selected_pixels);
-        float saturation = qMin(color.saturationF()*0.7, 1.0);
-        float value = qMin(color.valueF()*1.4, 1.0);
-        color.setHsvF(color.hueF(), saturation, value);
-    }
-
-    return color;
+    QColor hsv = QColor::fromRgbF(rtotal / total, gtotal / total, btotal / total).toHsv();
+
+    /* Background color is the base color with 0.90f HSV value */
+    hsv.setHsvF(hsv.hueF(),
+                (hsv.saturationF() > .15f) ? 0.65f : hsv.saturationF(),
+                0.90f);
+    colors.append(QVariant::fromValue(hsv.toRgb()));
+
+    /* Glow color is the base color with 1.0f HSV value */
+    hsv.setHsvF(hsv.hueF(), hsv.saturationF(), 1.0f);
+    colors.append(QVariant::fromValue(hsv.toRgb()));
+
+    return colors;
 }

=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-02-07 17:21:35 +0000
+++ launcher/app/launcherview.h	2011-02-15 13:21:38 +0000
@@ -23,6 +23,7 @@
 #include <QDeclarativeView>
 #include <QUrl>
 #include <QDragEnterEvent>
+#include <QList>
 
 class LauncherView : public QDeclarativeView
 {
@@ -30,7 +31,7 @@
 
 public:
     explicit LauncherView();
-    Q_INVOKABLE QColor iconAverageColor(QUrl source, QSize size);
+    Q_INVOKABLE QList<QVariant> getColorsFromIcon(QUrl source, QSize size) const;
 
 signals:
     void desktopFileDropped(QString path);

=== added file 'launcher/artwork/background.png'
Binary files launcher/artwork/background.png	1970-01-01 00:00:00 +0000 and launcher/artwork/background.png	2011-02-15 13:21:38 +0000 differ
=== removed file 'launcher/artwork/glow.png'
Binary files launcher/artwork/glow.png	2011-01-28 14:43:29 +0000 and launcher/artwork/glow.png	1970-01-01 00:00:00 +0000 differ
=== added file 'launcher/artwork/launcher_arrow_ltr.png'
Binary files launcher/artwork/launcher_arrow_ltr.png	1970-01-01 00:00:00 +0000 and launcher/artwork/launcher_arrow_ltr.png	2011-02-15 13:21:38 +0000 differ
=== added file 'launcher/artwork/launcher_arrow_rtl.png'
Binary files launcher/artwork/launcher_arrow_rtl.png	1970-01-01 00:00:00 +0000 and launcher/artwork/launcher_arrow_rtl.png	2011-02-15 13:21:38 +0000 differ
=== added file 'launcher/artwork/launcher_pip_ltr.png'
Binary files launcher/artwork/launcher_pip_ltr.png	1970-01-01 00:00:00 +0000 and launcher/artwork/launcher_pip_ltr.png	2011-02-15 13:21:38 +0000 differ
=== added file 'launcher/artwork/round_corner_54x54.png'
Binary files launcher/artwork/round_corner_54x54.png	1970-01-01 00:00:00 +0000 and launcher/artwork/round_corner_54x54.png	2011-02-15 13:21:38 +0000 differ
=== added file 'launcher/artwork/round_outline_54x54.png'
Binary files launcher/artwork/round_outline_54x54.png	1970-01-01 00:00:00 +0000 and launcher/artwork/round_outline_54x54.png	2011-02-15 13:21:38 +0000 differ
=== added file 'launcher/artwork/round_shine_54x54.png'
Binary files launcher/artwork/round_shine_54x54.png	1970-01-01 00:00:00 +0000 and launcher/artwork/round_shine_54x54.png	2011-02-15 13:21:38 +0000 differ
=== removed file 'launcher/artwork/shadow.png'
Binary files launcher/artwork/shadow.png	2010-09-13 15:52:34 +0000 and launcher/artwork/shadow.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'launcher/artwork/trash.png'
Binary files launcher/artwork/trash.png	2010-11-09 10:52:04 +0000 and launcher/artwork/trash.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'libunity-2d-private/Unity2d/blendedimageprovider.cpp'
--- libunity-2d-private/Unity2d/blendedimageprovider.cpp	2011-02-07 15:32:51 +0000
+++ libunity-2d-private/Unity2d/blendedimageprovider.cpp	2011-02-15 13:21:38 +0000
@@ -16,6 +16,7 @@
 
 #include "blendedimageprovider.h"
 #include <QPainter>
+#include <QDebug>
 
 BlendedImageProvider::BlendedImageProvider() : QDeclarativeImageProvider(QDeclarativeImageProvider::Image)
 {
@@ -28,31 +29,66 @@
 QImage BlendedImageProvider::requestImage(const QString &id, QSize *size, const QSize &requestedSize)
 {
     /* id is of the form [FILENAME]color=[COLORNAME]alpha=[FLOAT] */
-    QRegExp rx("(.+)color=(.+)alpha=(\\d+(?:\.\\d+)?)");
-    rx.indexIn(id);
+    QRegExp rx("^(.+)color=(.+)alpha=(\\d+(?:\\.\\d+)?)$");
+    if (rx.indexIn(id)) {
+        qWarning() << "BlendedImageProvider: failed to match id:" << id;
+        return QImage();
+    }
     QStringList list = rx.capturedTexts();
-    if(list.size() != 4)
-        return QImage();
-
-    QString filename = list[1];
-    QColor color;
-    color.setNamedColor(list[2]);
-    float alpha = list[3].toFloat();
+
+    QString fileName = list[1];
+    if (fileName.isEmpty()) {
+        qWarning() << "BlendedImageProvider: filename can't be empty.";
+        return QImage();
+    }
+
+    QString colorName = list[2];
+    if (!QColor::isValidColor(colorName)) {
+        /* Passing a named color of the form #RRGGBB is impossible
+           due to the fact that QML Image considers the source an URL and strips any anchor
+           from the string it passes to this method (i.e. everything after the #).
+           As a workaround we allow passing the color as RRGGBB and when a sting is not an
+           SVG color name (e.g. "blue", "yellow" etc.) we try interpreting it as an RRGGBB
+           color by adding back the #.
+        */
+        colorName.prepend("#");
+        if (!QColor::isValidColor(colorName)) {
+            qWarning() << "BlendedImageProvider: invalid color name:" << list[2];
+            return QImage();
+        }
+    }
+    QColor color(colorName);
+
+    bool valid = false;
+    float alpha = list[3].toFloat(&valid);
+    if (!valid) {
+        qWarning() << "BlendedImageProvider: can't convert alpha to floating point:" << list[3];
+        return QImage();
+    }
     color.setAlphaF(alpha);
 
-    QImage image(filename);
-    if(requestedSize.width() == 0 && requestedSize.height() != 0)
+    QImage image(fileName);
+    if (image.isNull()) {
+        qWarning() << "BlendedImageProvider: failed to load image from file:" << fileName;
+        return QImage();
+    }
+
+    if (requestedSize.width() == 0 && requestedSize.height() != 0) {
         image = image.scaledToHeight(requestedSize.height(), Qt::SmoothTransformation);
-    else if(requestedSize.width() != 0 && requestedSize.height() == 0)
+    } else if (requestedSize.width() != 0 && requestedSize.height() == 0) {
         image = image.scaledToWidth(requestedSize.width(), Qt::SmoothTransformation);
-    else if(requestedSize.isValid())
+    } else if (requestedSize.isValid()) {
         image = image.scaled(requestedSize, Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+    }
 
-    if(size)
+    if (size) {
         *size = image.size();
+    }
 
+    /* We use SourceAtop as the composition mode since we want any area that is fully transparent
+       in the source image to be fully transparent also in the result. */
     QPainter painter(&image);
-    painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+    painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
     painter.fillRect(image.rect(), color);
     painter.end();
 

=== modified file 'panel/applets/homebutton/homebuttonapplet.cpp'
--- panel/applets/homebutton/homebuttonapplet.cpp	2011-01-22 03:52:17 +0000
+++ panel/applets/homebutton/homebuttonapplet.cpp	2011-02-15 13:21:38 +0000
@@ -49,7 +49,7 @@
     connect(m_button, SIGNAL(clicked()), SLOT(toggleDash()));
 
     m_button->setStyleSheet(
-            "QToolButton { border: none; margin: 0; padding: 0; width: 54 }"
+            "QToolButton { border: none; margin: 0; padding: 0; width: 61 }"
             "QToolButton:checked, QToolButton:pressed {"
             // Use border-image here, not background-image, because bfb_bg_active.png is 56px wide
             "     border-image: url(theme:/bfb_bg_active.png);"