[Monodevelop-patches-list] r1064 - branches/MonoDevelop-playground/src/Plugins/FileBrowser

[commit-watcher at mono-cvs.ximian.com]

Author: jzwart
Date: 2004-02-29 10:48:01 -0500 (Sun, 29 Feb 2004)
New Revision: 1064

Modified:
   branches/MonoDevelop-playground/src/Plugins/FileBrowser/FileBrowserWidgetFactory.cs
   branches/MonoDevelop-playground/src/Plugins/FileBrowser/FileIconLoader.cs
Log:
FileBrowser fixes.


Modified: branches/MonoDevelop-playground/src/Plugins/FileBrowser/FileBrowserWidgetFactory.cs
===================================================================
--- branches/MonoDevelop-playground/src/Plugins/FileBrowser/FileBrowserWidgetFactory.cs	2004-02-29 13:22:01 UTC (rev 1063)
+++ branches/MonoDevelop-playground/src/Plugins/FileBrowser/FileBrowserWidgetFactory.cs	2004-02-29 15:48:01 UTC (rev 1064)
@@ -42,7 +42,7 @@
 
 	public Widget CreateWidget (Workbench workbench)
 	{
-		return new FileBrowser ();
+		return new FileScout ();
 	}
 }
 }

Modified: branches/MonoDevelop-playground/src/Plugins/FileBrowser/FileIconLoader.cs
===================================================================
--- branches/MonoDevelop-playground/src/Plugins/FileBrowser/FileIconLoader.cs	2004-02-29 13:22:01 UTC (rev 1063)
+++ branches/MonoDevelop-playground/src/Plugins/FileBrowser/FileIconLoader.cs	2004-02-29 15:48:01 UTC (rev 1064)
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Configuration;
 
 using Gtk;
 using Gnome;
@@ -11,12 +12,17 @@
 		static IconTheme iconTheme;
 		static ThumbnailFactory thumbnailFactory;
 		static Hashtable iconHash;
+		static private Gdk.Pixbuf regularIcon;
 
 		static FileIconLoader ()
 		{
 			iconTheme = new IconTheme ();
 			thumbnailFactory = new ThumbnailFactory (ThumbnailSize.Normal);
 			iconHash = new Hashtable ();
+
+			string imagedir = ConfigurationSettings.AppSettings["imagesPath"];
+			string filename = imagedir + System.IO.Path.DirectorySeparatorChar + "gnome-fs-regular.png";
+			regularIcon = new Gdk.Pixbuf (filename);
 		}
 
 		private FileIconLoader ()
@@ -45,9 +51,9 @@
 				try {
 					info = iconTheme.LookupIcon (type, 24, 0);
 				} catch {
-					return new Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
+					return regularIcon;//Gdk.Pixbuf ("../data/resources/icons/gnome-fs-regular.png");
 				}
-				bf = new Gdk.Pixbuf (info == null ? p_filename : info.Filename);
+				bf = info == null ? regularIcon : new Gdk.Pixbuf (info.Filename);
 				iconHash [type] = bf;
 			}
 			return bf;