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

@@ -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"

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);

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);