* MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs:

* MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs:
* MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs:
* MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:
* MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs:
* MonoDevelop.Ide.Gui.Dialogs/IncludeNewFilesDialog.cs:
* MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs:
* MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs:
* MonoDevelop.Ide.Gui.Dialogs/OverridesImplementsDialog.cs:
* MonoDevelop.Ide.Gui.Dialogs/ConfirmProjectDeleteDialog.cs:
* MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs:
  Track API changes for lazy loading images.

svn path=/trunk/monodevelop/; revision=151097

12 files changed, 30 insertions, 15 deletions

diff --git a/main/src/core/MonoDevelop.Ide/ChangeLog b/main/src/core/MonoDevelop.Ide/ChangeLog
index 362c02e5a5..8130b4d31b 100644
--- a/main/src/core/MonoDevelop.Ide/ChangeLog
+++ b/main/src/core/MonoDevelop.Ide/ChangeLog
@@ -1,3 +1,18 @@
+2010-02-09  Mike Krüger  <mkrueger@novell.com>
+
+	* MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs:
+	* MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs:
+	* MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs:
+	* MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:
+	* MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs:
+	* MonoDevelop.Ide.Gui.Dialogs/IncludeNewFilesDialog.cs:
+	* MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs:
+	* MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs:
+	* MonoDevelop.Ide.Gui.Dialogs/OverridesImplementsDialog.cs:
+	* MonoDevelop.Ide.Gui.Dialogs/ConfirmProjectDeleteDialog.cs:
+	* MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs:
+	  Track API changes for lazy loading images.
+
 2010-02-08  Michael Hutchinson  <mhutchinson@novell.com>
 
 	* MonoDevelop.Ide.Gui/Ide.cs: Add startup trace calls.
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs
index 1589622a8a..af050812d5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs
@@ -48,7 +48,7 @@ namespace MonoDevelop.Ide.CodeFormatting
 		TreeIter iter;
 		CodeFormatOption option;
 		
-		CellRendererPixbuf pixbufCellRenderer;
+		MonoDevelop.Core.Gui.CellRendererPixbuf pixbufCellRenderer;
 		
 		public TypedCodeFormattingPolicyPanelWidget ()
 		{
@@ -57,7 +57,7 @@ namespace MonoDevelop.Ide.CodeFormatting
 			TreeViewColumn column = new TreeViewColumn ();
 			
 			// pixbuf column
-			pixbufCellRenderer = new CellRendererPixbuf ();
+			pixbufCellRenderer = new MonoDevelop.Core.Gui.CellRendererPixbuf ();
 			column.PackStart (pixbufCellRenderer, false);
 			column.SetCellDataFunc (pixbufCellRenderer, new Gtk.TreeCellDataFunc (RenderIcon));
 			
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
index 550613dc00..4c3ab5f521 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs
@@ -41,7 +41,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 		List<CodeTemplate> templates;
 		Gtk.TreeStore templateStore;
 		CellRendererText   templateCellRenderer;
-		CellRendererPixbuf pixbufCellRenderer;
+		MonoDevelop.Core.Gui.CellRendererPixbuf pixbufCellRenderer;
 		Mono.TextEditor.TextEditor textEditor = new Mono.TextEditor.TextEditor ();
 		Mono.TextEditor.TextEditorOptions options;
 		
@@ -58,7 +58,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 			TreeViewColumn column = new TreeViewColumn ();
 			column.Title = GettextCatalog.GetString ("Key");
 			
-			pixbufCellRenderer = new CellRendererPixbuf ();
+			pixbufCellRenderer = new MonoDevelop.Core.Gui.CellRendererPixbuf ();
 			column.PackStart (pixbufCellRenderer, false);
 			column.SetCellDataFunc (pixbufCellRenderer, new Gtk.TreeCellDataFunc (RenderIcon));
 			
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
index d873d761d2..cf87a59746 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs
@@ -87,7 +87,7 @@ namespace MonoDevelop.Ide.FindInFiles
 			fileNameColumn.Resizable = true;
 			fileNameColumn.SortColumnId  = 0;
 			fileNameColumn.Title = GettextCatalog.GetString ("File");
-			CellRendererPixbuf fileNamePixbufRenderer = new CellRendererPixbuf ();
+			var fileNamePixbufRenderer = new MonoDevelop.Core.Gui.CellRendererPixbuf ();
 			fileNameColumn.PackStart (fileNamePixbufRenderer, false);
 			fileNameColumn.SetCellDataFunc (fileNamePixbufRenderer, new Gtk.TreeCellDataFunc (FileIconDataFunc));
 			
@@ -295,7 +295,7 @@ namespace MonoDevelop.Ide.FindInFiles
 		
 		void FileIconDataFunc (Gtk.TreeViewColumn column, Gtk.CellRenderer cell, Gtk.TreeModel model, Gtk.TreeIter iter)
 		{
-			CellRendererPixbuf fileNamePixbufRenderer = (CellRendererPixbuf)cell;
+			MonoDevelop.Core.Gui.CellRendererPixbuf fileNamePixbufRenderer = (MonoDevelop.Core.Gui.CellRendererPixbuf)cell;
 			SearchResult searchResult = (SearchResult)store.GetValue (iter, SearchResultColumn);
 			fileNamePixbufRenderer.Pixbuf = DesktopService.GetPixbufForFile (searchResult.FileName, Gtk.IconSize.Menu);
 		}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
index 6efc757995..1b57364cc5 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/ExtensibleTreeView.cs
@@ -1849,7 +1849,7 @@ namespace MonoDevelop.Ide.Gui.Components
 			{
 				Gdk.Pixbuf icon = icons [id] as Gdk.Pixbuf;
 				if (icon == null) {
-					icon = pad.tree.RenderIcon (id, Gtk.IconSize.Menu, "");
+					icon = ImageService.GetPixbuf (id, Gtk.IconSize.Menu);
 					icons [id] = icon;
 				}
 				return icon;
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ConfirmProjectDeleteDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ConfirmProjectDeleteDialog.cs
index e2f7adf14c..20c87ab9f9 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ConfirmProjectDeleteDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ConfirmProjectDeleteDialog.cs
@@ -70,7 +70,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 			col.PackStart (crt, false);
 			col.AddAttribute (crt, "active", 0);
 			
-			CellRendererPixbuf crp = new CellRendererPixbuf ();
+			MonoDevelop.Core.Gui.CellRendererPixbuf crp = new MonoDevelop.Core.Gui.CellRendererPixbuf ();
 			col.PackStart (crp, false);
 			col.AddAttribute (crp, "pixbuf", 1);
 			
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/IncludeNewFilesDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/IncludeNewFilesDialog.cs
index 9e7e546604..a8f56f5f6b 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/IncludeNewFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/IncludeNewFilesDialog.cs
@@ -70,7 +70,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs
 			textColumn.AddAttribute (toggleRender, "active", Columns.IsToggled);
 			
 			textColumn.Title = "Name";
-			CellRendererPixbuf pixbufRenderer = new CellRendererPixbuf ();
+			var pixbufRenderer = new MonoDevelop.Core.Gui.CellRendererPixbuf ();
 			textColumn.PackStart (pixbufRenderer, false);
 			textColumn.AddAttribute (pixbufRenderer, "pixbuf", Columns.IconOpened);
 			textColumn.AddAttribute (pixbufRenderer, "pixbuf-expander-open", Columns.IconOpened);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
index 9d95c2eed7..ffc912897c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs
@@ -732,7 +732,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs {
 				Model = templateStore;
 				
 				TreeViewColumn col = new TreeViewColumn ();
-				CellRendererPixbuf crp = new CellRendererPixbuf ();
+				MonoDevelop.Core.Gui.CellRendererPixbuf crp = new MonoDevelop.Core.Gui.CellRendererPixbuf ();
 				crp.StockSize = (uint) Gtk.IconSize.Dnd;
 				crp.Ypad = 2;
 				col.PackStart (crp, false);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OverridesImplementsDialog.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OverridesImplementsDialog.cs
index 9df731f4f8..da9d5a6d60 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OverridesImplementsDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OverridesImplementsDialog.cs
@@ -91,7 +91,7 @@ namespace MonoDevelop.Ide
 			nameCol.PackStart (cbRenderer, false);
 			nameCol.AddAttribute (cbRenderer, "active", colCheckedIndex);
 
-			CellRendererPixbuf iconRenderer = new CellRendererPixbuf ();
+			MonoDevelop.Core.Gui.CellRendererPixbuf iconRenderer = new MonoDevelop.Core.Gui.CellRendererPixbuf ();
 			nameCol.PackStart (iconRenderer, false);
 			nameCol.AddAttribute (iconRenderer, "pixbuf", colIconIndex);
 
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs
index 53529a7693..24e4cf35a7 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/SplashScreen.cs
@@ -33,7 +33,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs {
 			this.WindowPosition = WindowPosition.Center;
 			this.TypeHint = Gdk.WindowTypeHint.Splashscreen;
 			try {
-				bitmap = new Gdk.Pixbuf(Assembly.GetCallingAssembly(), "SplashScreen.png");
+				bitmap = new Gdk.Pixbuf (Assembly.GetCallingAssembly(), "SplashScreen.png");
 			} catch (Exception e) {
 				LoggingService.LogError ("Can't load splash screen pixbuf 'SplashScreen.png'.", e);
 			}
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
index 60c0fba611..c152245bab 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs
@@ -75,7 +75,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels
 			TreeViewColumn col = new TreeViewColumn ();
 			col.Title = GettextCatalog.GetString ("Command");
 			col.Spacing = 4;
-			CellRendererPixbuf crp = new CellRendererPixbuf ();
+			MonoDevelop.Core.Gui.CellRendererPixbuf crp = new MonoDevelop.Core.Gui.CellRendererPixbuf ();
 			col.PackStart (crp, false);
 			col.AddAttribute (crp, "stock-id", iconCol);
 			col.AddAttribute (crp, "visible", iconVisibleCol);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
index 2be1a85fcf..48c56c950c 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs
@@ -485,7 +485,7 @@ namespace MonoDevelop.Ide.Gui
 			string windowTitle = GettextCatalog.GetString (padCodon.Label);
 			DockItem item = dock.AddItem (padCodon.PadId);
 			item.Label = windowTitle;
-			item.Icon = window.Icon;
+			item.Icon = ImageService.GetPixbuf (window.Icon, IconSize.Menu);
 			item.DefaultLocation = location;
 			item.DefaultVisible = false;
 			
@@ -527,7 +527,7 @@ namespace MonoDevelop.Ide.Gui
 				if (String.IsNullOrEmpty (windowTitle)) 
 					windowTitle = GettextCatalog.GetString (codon.Label);
 				item.Label = windowTitle;
-				item.Icon  = window.Icon;
+				item.Icon  = ImageService.GetPixbuf (window.Icon, IconSize.Menu);
 			}
 		}