[banshee] [U1MS] Fix display of the source icon



commit 0df6b19afbeab2b913bf0918204ad30c98163e36
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sat Dec 11 16:55:16 2010 +0100

    [U1MS] Fix display of the source icon
    
    Handle the source icon in a private icon theme, like we do usually,
    instead of embedding it as a resource in the assembly.
    
    Also provide a 16x16 icon, which comes from the ubuntuone-client package
    and is available under a Creative Commons license.

 .../Banshee.UbuntuOneMusicStore.csproj             |    3 ---
 .../UbuntuOneMusicStoreSource.cs                   |    4 +---
 .../Banshee.UbuntuOneMusicStore/Makefile.am        |    4 +---
 .../ThemeIcons/16x16/categories/ubuntuone.png      |  Bin 0 -> 1037 bytes
 .../22x22/categories}/ubuntuone.png                |  Bin 1131 -> 1131 bytes
 5 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.csproj b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.csproj
index 420e027..f6d92b9 100644
--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.csproj
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.csproj
@@ -50,9 +50,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources\ubuntuone.png">
-      <LogicalName>ubuntuone.png</LogicalName>
-    </EmbeddedResource>
     <EmbeddedResource Include="Banshee.UbuntuOneMusicStore.addin.xml">
       <LogicalName>Banshee.UbuntuOneMusicStore.addin.xml</LogicalName>
     </EmbeddedResource>
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
index f975e70..260c384 100644
--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
@@ -50,9 +50,7 @@ namespace Banshee.UbuntuOneMusicStore
             Catalog.GetString ("Ubuntu One Music Store"),
             sort_order, "ubuntu-one-music-store")
         {
-            Pixbuf icon = new Pixbuf (System.Reflection.Assembly.GetExecutingAssembly ()
-                                      .GetManifestResourceStream ("ubuntuone.png"));
-            Properties.Set<Pixbuf> ("Icon.Pixbuf_22", icon.ScaleSimple (22, 22, InterpType.Bilinear));
+            Properties.SetString ("Icon.Name", "ubuntuone");
         }
 
         // A count of 0 will be hidden in the source TreeView
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am b/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am
index a00b36a..ebc1fb4 100644
--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Makefile.am
@@ -5,9 +5,7 @@ INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
 
 SOURCES = Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs
 
-RESOURCES =  \
-	Banshee.UbuntuOneMusicStore.addin.xml \
-	Resources/ubuntuone.png
+RESOURCES = Banshee.UbuntuOneMusicStore.addin.xml
 
 if ENABLE_UBUNTUONE
 include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/ThemeIcons/16x16/categories/ubuntuone.png b/src/Extensions/Banshee.UbuntuOneMusicStore/ThemeIcons/16x16/categories/ubuntuone.png
new file mode 100644
index 0000000..ce8c088
Binary files /dev/null and b/src/Extensions/Banshee.UbuntuOneMusicStore/ThemeIcons/16x16/categories/ubuntuone.png differ
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Resources/ubuntuone.png b/src/Extensions/Banshee.UbuntuOneMusicStore/ThemeIcons/22x22/categories/ubuntuone.png
similarity index 100%
rename from src/Extensions/Banshee.UbuntuOneMusicStore/Resources/ubuntuone.png
rename to src/Extensions/Banshee.UbuntuOneMusicStore/ThemeIcons/22x22/categories/ubuntuone.png



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]