* src/addins/NUnit/Gui/TestPad.cs:

* src/addins/NUnit/Gui/TestResultsPad.cs:
* src/addins/CBinding/Gui/DataProvider.cs:
* src/addins/ChangeLogAddIn/AddLogEntryDialog.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Workbench.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/ProgressMonitors.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DocumentSwitcher.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/DefaultWorkbench.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs:
* src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ThreadsPad.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewFileDialog.cs:
* src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPad.cs:
* src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/StackTracePad.cs:
* src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.Html/PathCompletion.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/NewProjectDialog.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/BackgroundProgressMonitor.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/SearchResultWidget.cs:
* src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValueTreeView.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplatePanel.cs:
* src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.Editor/POEditorWidget.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/IncludeNewFilesDialog.cs:
* src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.Html/DocTypeCompletionData.cs:
* src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/OverridesImplementsDialog.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/ConfirmProjectDeleteDialog.cs:
* src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/GenerateCodeWindow.cs:
* src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Completion/XmlCompletionData.cs:
* src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.Dialogs/SelectRenamedClassDialog.cs:
* src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringPreviewDialog.cs:
* src/addins/MonoDevelop.Refactoring/MonoDevelop.CodeGeneration/AbstractGenerateAction.cs:
* src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Completion/XmlTagCompletionData.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeFormatting/CodeFormattingPolicyPanelWidget.cs:
* src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs/ProjectFileSelectorDialog.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogView.cs:
* src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Parser/SuggestedHandlerCompletionData.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/StatusView.cs:
* src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.Toolbox/ComponentSelectorDialog.cs:
* src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ClassOutlineTextEditorExtension.cs:
* src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Dialogs/CommitDialog.cs:
* src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.Completion/XmlMultipleClosingTagCompletionData.cs:
* src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Dialogs.OptionPanels/NamespaceSynchronisationPanel.cs:
  Track api changes.

* src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/ImageService.cs:
* src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Codons/MimeTypeNode.cs:
* src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/Command.cs:
* src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Dialogs/OptionsDialog.cs:
* src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/CommandInfo.cs:
* src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/ActionCommand.cs:
* src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui.Codons/OptionsDialogSection.cs:
* src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/CommandEntrySet.cs:
* src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/CommandMenuItem.cs:
* src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/CommandArrayInfo.cs:
* src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/LinkCommandEntry.cs:
* src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/CommandToolButton.cs:
* src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/LocalCommandEntry.cs:
* src/core/MonoDevelop.Components/MonoDevelop.Components.Commands/CommandToggleToolButton.cs:
  Use the new IconId type to represent icon names.

* src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/CellRendererPixbuf.cs:
  Renamed to CellRendererIcon to avoid conflicts with the Gtk class.
  Added support for rendering icons specified with IconId objects.

* src/core/MonoDevelop.Core.Gui/MonoDevelop.Core.Gui/StockIcons.cs:
  Use new IconId type.

* src/core/MonoDevelop.Core/Makefile.am:
* src/core/MonoDevelop.Core/MonoDevelop.Core.csproj:
* src/core/MonoDevelop.Core/MonoDevelop.Core/IconId.cs: Implemented
  new IconId class which can be used to represent icon names and
  supports lazy loading of pixbufs.

* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Pad.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Codons/PadCodon.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/IPadContainer.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomType.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/FileTemplate.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomEvent.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceWindow.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/AbstractPadContent.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomField.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/SdiWorkspaceLayout.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/Namespace.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomMethod.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/IBaseMember.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomProperty.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/ProjectTemplate.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomParameter.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs:
* src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Components/TreeViewItem.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/LocalVariable.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/AbstractMember.cs:
* src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/DomMemberDecorator.cs:
* src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/CompletionData.cs:
* src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/ICompletionData.cs:
* src/core/MonoDevelop.Projects.Gui/MonoDevelop.Projects.Gui.Completion/CompletionDataList.cs:
  Use the new IconId type.

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

2 files changed, 3 insertions, 3 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs
index 718c63e80f..9796191624 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.CodeTemplates/CodeTemplate.cs
@@ -99,7 +99,7 @@ namespace MonoDevelop.Ide.CodeTemplates
 			set;
 		}
 		
-		public string Icon {
+		public IconId Icon {
 			get {
 				return Code.Contains ("$selected$") ? "md-template-surroundwith" : "md-template";
 			}
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 4c3ab5f521..550613dc00 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;
-		MonoDevelop.Core.Gui.CellRendererPixbuf pixbufCellRenderer;
+		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 MonoDevelop.Core.Gui.CellRendererPixbuf ();
+			pixbufCellRenderer = new CellRendererPixbuf ();
 			column.PackStart (pixbufCellRenderer, false);
 			column.SetCellDataFunc (pixbufCellRenderer, new Gtk.TreeCellDataFunc (RenderIcon));