* MimeIcon.cs: If a gnome icon doesn't exist add a default icon.

2006-10-28  Alexander Olk  <alex.olk@googlemail.com>

svn path=/trunk/mcs/; revision=67068

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 5f6867fd344ce8c57e61ee02c80d3bedc0665b91..a4f3d52225d3143279589774dde22141c5464c93 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-28  Alexander Olk  <alex.olk@googlemail.com>
+
+       * MimeIcon.cs: If a gnome icon doesn't exist add a default icon.
+
 2006-10-28  Alexander Olk  <alex.olk@googlemail.com>
 
        * ThemeClearlooks.cs: A little speedup.

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs
index ec07ec4c9c71ad23158311c75185803372bc0002..201cb2d4b8887fbf1d35aa9f2e450aea96977583 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/MimeIcon.cs
@@ -33,7 +33,6 @@ using System;
 using System.Reflection;
 using System.Drawing;
 using System.Collections;
-//using System.Collections.Specialized;
 using System.IO;
 using System.Text;
 using System.Runtime.InteropServices;
@@ -281,10 +280,9 @@ namespace System.Windows.Forms
                        MimeIconEngine.AddIconByImage ("desktop/desktop",  ResourceImageLoader.Get ("user-desktop.png"));
                        MimeIconEngine.AddIconByImage ("directory/home",  ResourceImageLoader.Get ("user-home.png"));
                        
-                       // fix
-                       MimeIconEngine.AddIconByImage ("network/network",  ResourceImageLoader.Get ("document-open.png"));
+                       MimeIconEngine.AddIconByImage ("network/network",  ResourceImageLoader.Get ("folder-remote.png"));
                        MimeIconEngine.AddIconByImage ("recently/recently",  ResourceImageLoader.Get ("document-open.png"));
-                       MimeIconEngine.AddIconByImage ("workplace/workplace",  ResourceImageLoader.Get ("document-open.png"));
+                       MimeIconEngine.AddIconByImage ("workplace/workplace",  ResourceImageLoader.Get ("computer.png"));
                        
                        return MimeExtensionHandlerStatus.OK; // return always ok
                }
@@ -327,6 +325,32 @@ namespace System.Windows.Forms
                        
                        Image image = GnomeUtil.GetIcon (name, 48);
                        
+                       if (image == null) {
+                               if (internal_mime_type == "unknown/unknown")
+                                       image = ResourceImageLoader.Get ("text-x-generic.png");
+                               else
+                               if (internal_mime_type == "inode/directory")
+                                       image = ResourceImageLoader.Get ("folder.png");
+                               else
+                               if (internal_mime_type == "directory/home")
+                                       image = ResourceImageLoader.Get ("user-home.png");
+                               else
+                               if (internal_mime_type == "desktop/desktop")
+                                       image = ResourceImageLoader.Get ("user-desktop.png");
+                               else
+                               if (internal_mime_type == "recently/recently")
+                                       image = ResourceImageLoader.Get ("document-open.png");
+                               else
+                               if (internal_mime_type == "workplace/workplace")
+                                       image = ResourceImageLoader.Get ("computer.png");
+                               else
+                               if (internal_mime_type == "network/network" || internal_mime_type == "nfs/nfs" || internal_mime_type == "smb/smb")
+                                       image = ResourceImageLoader.Get ("folder-remote.png");
+                               else
+                               if (internal_mime_type == "harddisk/harddisk" || internal_mime_type == "cdrom/cdrom" || internal_mime_type == "removable/removable")
+                                       image = ResourceImageLoader.Get ("text-x-generic.png");
+                       }
+                       
                        index = MimeIconEngine.SmallIcons.Images.Add (image, Color.Transparent);
                        MimeIconEngine.LargeIcons.Images.Add (image, Color.Transparent);