Merge lp:~fboucault/unity-2d/icon_fallback into lp:unity-2d

[Florian Boucault]

[dash][launcher] When an application has no icon or the icon fails to load, display a placeholder icon.

[Alberto Mardegan (mardy)]

Tested both in places and the launcher, using the "search for file" application (which has no icon).
Works perfectly!

review: Approve

=== modified file 'launcher/LauncherItem.qml'
--- launcher/LauncherItem.qml	2011-07-14 16:00:02 +0000
+++ launcher/LauncherItem.qml	2011-08-30 20:59:42 +0000
@@ -245,6 +245,7 @@
                 onWidthChanged: updateColors()
                 onHeightChanged: updateColors()
                 onSourceChanged: updateColors()
+                onStatusChanged: if (status == Image.Error) source = "image://icons/unknown"
 
                 function updateColors() {
                     if (!item.backgroundFromIcon) return;

=== modified file 'launcher/LauncherList.qml'
--- launcher/LauncherList.qml	2011-08-10 16:57:30 +0000
+++ launcher/LauncherList.qml	2011-08-30 20:59:42 +0000
@@ -93,7 +93,7 @@
         padding: list.itemPadding
 
         desktopFile: item.desktop_file ? item.desktop_file : ""
-        icon: "image://icons/" + item.icon
+        icon: item.icon != "" ? "image://icons/" + item.icon : "image://icons/unknown"
         running: item.running
         active: item.active
         urgent: item.urgent

=== modified file 'places/TileVertical.qml'
--- places/TileVertical.qml	2011-08-25 13:08:52 +0000
+++ places/TileVertical.qml	2011-08-30 20:59:42 +0000
@@ -79,7 +79,8 @@
             Image {
                 id: icon
 
-                source: iconHint != "" ? "image://icons/"+iconHint : ""
+                source: iconHint != "" ? "image://icons/"+iconHint : "image://icons/unknown"
+                onStatusChanged: if (status == Image.Error) source = "image://icons/unknown"
                 width: 64
                 height: 64
                 anchors.horizontalCenter: parent.horizontalCenter