banshee r4830 - in trunk/banshee: . src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage src/Dap/Banshee.Dap.MassStorage/ThemeIcons/128x128 src/Dap/Banshee.Dap.MassStorage/ThemeIcons/128x128/devices src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16 src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/devices src/Dap/Banshee.Dap.MassStorage/ThemeIcons/22x22/devices src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32 src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/devices src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48 src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/devices src/Dap/Banshee.Dap/Banshee.Dap

[abock svn gnome org]

Author: abock
Date: Mon Nov 10 22:23:17 2008
New Revision: 4830
URL: http://svn.gnome.org/viewvc/banshee?rev=4830&view=rev

Log:
* banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/devices/phone-htc-g1-white.png:
* banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/devices/phone-htc-g1-white.png:
* banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/22x22/devices/phone-htc-g1-white.png:
* banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/devices/phone-htc-g1-white.png:
* banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/128x128/devices/phone-htc-g1-white.png:
  Awesome G1 icons from jimmac

* banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs: Make
  FallbackIcon public and static so other DapSources can use it

* banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs:
  Use jimmac's awesome G1 icons

* banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs:
* banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs:
  Allow devices to override the source icon; set the G1 source 

Added:
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/128x128/
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/128x128/devices/
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/128x128/devices/phone-htc-g1-white.png   (contents, props changed)
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/devices/
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/devices/phone-htc-g1-white.png   (contents, props changed)
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/22x22/devices/
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/22x22/devices/phone-htc-g1-white.png   (contents, props changed)
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/devices/
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/devices/phone-htc-g1-white.png   (contents, props changed)
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/devices/
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/devices/phone-htc-g1-white.png   (contents, props changed)
Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
   trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
   trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs

Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/AndroidDevice.cs	Mon Nov 10 22:23:17 2008
@@ -56,6 +56,10 @@
             "amazonmp3/"
         };
         
+        private static string [] icon_names = new string [] {
+            "phone-htc-g1-white", DapSource.FallbackIcon
+        };
+        
         private AmazonMp3GroupSource amazon_source;
         private string amazon_base_dir;
         
@@ -114,6 +118,11 @@
             get { return 320; }
         }
         
+        public override string [] GetIconNames () 
+        {
+            return icon_names;
+        }
+        
         public override bool GetTrackPath (TrackInfo track, out string path)
         {
             path = FileNamePattern.CreateFromTrackInfo (

Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageDevice.cs	Mon Nov 10 22:23:17 2008
@@ -176,6 +176,11 @@
             get { return "mass-storage"; }
         }
         
+        public virtual string [] GetIconNames ()
+        {
+            return null;
+        }
+        
         public bool IsType (string type)
         {
             return type == DeviceType;

Modified: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage/MassStorageSource.cs	Mon Nov 10 22:23:17 2008
@@ -323,6 +323,12 @@
 
 #endregion
 
+        protected override string [] GetIconNames ()
+        {
+            string [] names = ms_device != null ? ms_device.GetIconNames () : null;
+            return names == null ? base.GetIconNames () : names;
+        }
+        
         public override long BytesUsed {
             get { return BytesCapacity - volume.Available; }
         }

Added: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/128x128/devices/phone-htc-g1-white.png
==============================================================================
Binary file. No diff available.

Added: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/16x16/devices/phone-htc-g1-white.png
==============================================================================
Binary file. No diff available.

Added: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/22x22/devices/phone-htc-g1-white.png
==============================================================================
Binary file. No diff available.

Added: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/32x32/devices/phone-htc-g1-white.png
==============================================================================
Binary file. No diff available.

Added: trunk/banshee/src/Dap/Banshee.Dap.MassStorage/ThemeIcons/48x48/devices/phone-htc-g1-white.png
==============================================================================
Binary file. No diff available.

Modified: trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs
==============================================================================
--- trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	(original)
+++ trunk/banshee/src/Dap/Banshee.Dap/Banshee.Dap/DapSource.cs	Mon Nov 10 22:23:17 2008
@@ -433,7 +433,7 @@
             }
         }
         
-        private string FallbackIcon {
+        public static string FallbackIcon {
             get { return "multimedia-player"; }
         }