Merge lp:~aacid/unity-2d/loadhttpicon into lp:unity-2d

[Albert Astals Cid]

[Dash] Load http:// iconHints directly instead of prepending the image:// part

[Dash] Load http:// iconHints directly instead of prepending the image:// part

[Paweł Stołowski (stolowski)]

Great stuff!

review: Approve

=== modified file 'shell/dash/TileVertical.qml'
--- shell/dash/TileVertical.qml	2011-12-01 01:41:13 +0000
+++ shell/dash/TileVertical.qml	2012-04-04 09:11:24 +0000
@@ -78,7 +78,8 @@
             Image {
                 id: icon
 
-                source: iconHint != "" ? "image://icons/"+iconHint : "image://icons/unknown"
+                source: iconHint.indexOf("http://") == 0 ? iconHint
+                                                         : "image://icons/" + (iconHint != "" ? iconHint : "unknown")
                 onStatusChanged: if (status == Image.Error) source = "image://icons/unknown"
                 width: 64
                 height: 64

=== modified file 'tests/manual-tests/dash.txt'
--- tests/manual-tests/dash.txt	2012-04-02 11:38:16 +0000
+++ tests/manual-tests/dash.txt	2012-04-04 09:11:24 +0000
@@ -113,3 +113,15 @@
   #   * Open dash and verify that all results are displayed in 'Home' lens, and no search query is applied.
 
 -----
+
+  # Test case objectives:
+  #   * Check that remote icons show in the dash
+  # Pre-conditions
+  #   * None
+  # Test steps
+  #   * Open dash
+  #   * Go to the music lens
+  #   * Type some song you don't have on the local computer and that is on the music store
+  #   * Verify the results have the cover of the song/album and not the ? icon
+
+-----