From eb46887d5f6e8bb9c12d91a7c42fe63b6bd5f1f8 Mon Sep 17 00:00:00 2001
From: Christian Hornung <chhornung@googlemail.com>
Date: Mon, 29 Sep 2008 09:06:44 +0000
Subject: [PATCH] Prevent project resource image editor from resetting the
 custom tool to ResXFileCodeGenerator when PublicResXFileCodeGenerator is
 selected. Set AcceptButton and CancelButton on SetReflectorPathDialog. Add
 icon to "Close" entry in text editor context menu.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3563 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 AddIns/ICSharpCode.SharpDevelop.addin                         | 1 +
 .../FormsDesigner/Project/Src/Services/ImageResourceEditor.cs | 4 +++-
 .../Project/Src/SetReflectorPathDialog.Designer.cs            | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin
index 7d42727046..c39edbafdb 100644
--- a/AddIns/ICSharpCode.SharpDevelop.addin
+++ b/AddIns/ICSharpCode.SharpDevelop.addin
@@ -1731,6 +1731,7 @@
 		          class = "ICSharpCode.SharpDevelop.Commands.SaveFileAs"/>
 		<MenuItem id = "File"
 		          label = "${res:XML.MainMenu.FileMenu.Close}"
+		          icon  = "Icons.16x16.CloseFileIcon"
 		          class ="ICSharpCode.SharpDevelop.Commands.CloseFile"/>
 		<MenuItem id = "Separator2" type = "Separator" />
 		<MenuItem id = "Comment"
diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ImageResourceEditor.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ImageResourceEditor.cs
index fc1f3d1986..91f1131e81 100644
--- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ImageResourceEditor.cs
+++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Services/ImageResourceEditor.cs
@@ -110,7 +110,9 @@ namespace ICSharpCode.FormsDesigner.Services
 								throw new InvalidOperationException("The selected resource file '" + projectResource.ResourceFile + "' was not found in the project.");
 							}
 							const string resourceGeneratorToolName = "ResXFileCodeGenerator";
-							if (!String.Equals(resourceGeneratorToolName, fpi.CustomTool, StringComparison.Ordinal)) {
+							const string publicResourceGeneratorToolName = "PublicResXFileCodeGenerator";
+							if (!String.Equals(resourceGeneratorToolName, fpi.CustomTool, StringComparison.Ordinal) &&
+							    !String.Equals(publicResourceGeneratorToolName, fpi.CustomTool, StringComparison.Ordinal)) {
 								fpi.CustomTool = resourceGeneratorToolName;
 							}
 							CustomToolsService.RunCustomTool(fpi, true);
diff --git a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/SetReflectorPathDialog.Designer.cs b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/SetReflectorPathDialog.Designer.cs
index 90a7106386..35ff81a52b 100644
--- a/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/SetReflectorPathDialog.Designer.cs
+++ b/src/AddIns/Misc/ReflectorAddIn/ReflectorAddIn/Project/Src/SetReflectorPathDialog.Designer.cs
@@ -139,8 +139,10 @@ namespace ReflectorAddIn
 			// 
 			// SetReflectorPathDialog
 			// 
+			this.AcceptButton = pshOK;
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.CancelButton = pshCancel;
 			this.ClientSize = new System.Drawing.Size(440, 222);
 			this.Controls.Add(grpPath);
 			this.Controls.Add(linkReflector);