Fixed several minor bugs; put some strings into the translation database.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1444 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

AddIns/ICSharpCode.SharpDevelop.addin

@@ -155,7 +155,7 @@
 	<Path name = "/SharpDevelop/Pads/ProjectBrowser/ToolBar/File">
 		<ToolbarItem id      = "OpenFile"
 		             icon    = "Icons.16x16.OpenFileIcon"
-		             tooltip = "Open"
+		             tooltip = "${res:Gui.ProjectBrowser.Open}"
 		             class   = "ICSharpCode.SharpDevelop.Project.Commands.OpenFileEvent"/>
 	</Path>
 	
@@ -670,10 +670,12 @@
 		<ToolbarItem id      = "Back"
 		             icon    = "Icons.16x16.BrowserBefore"
 		             tooltip = "${res:MainWindow.Windows.ClassBrowser.BackButton.ToolTip}"
+		             loadclasslazy = "false"
 		             class   = "ICSharpCode.SharpDevelop.Gui.ClassBrowserNavigateBackward"/>
 		<ToolbarItem id      = "Forward"
 		             icon    = "Icons.16x16.BrowserAfter"
 		             tooltip = "${res:MainWindow.Windows.ClassBrowser.ForwardButton.ToolTip}"
+		             loadclasslazy = "false"
 		             class   = "ICSharpCode.SharpDevelop.Gui.ClassBrowserNavigateForward"/>
 		
 		<ToolbarItem id = "NavigationSeparator" type  = "Separator"/>
@@ -741,7 +743,7 @@
 		             class   = "ICSharpCode.SharpDevelop.Commands.OpenFile"/>
 		
 		<ToolbarItem id      = "OpenProject"
-		             tooltip = "${res:XML.MainMenu.FileMenu.Open.Project}"
+		             tooltip = "${res:XML.MainMenu.FileMenu.Open.Project.Description}"
 		             icon    = "Icons.16x16.OpenProjectIcon"
 		             class   = "ICSharpCode.SharpDevelop.Project.Commands.LoadSolution"
 		/>
@@ -1669,34 +1671,34 @@
 	
 	<Path name = "/SharpDevelop/Workbench/ToolBar/Standard">
 		<ToolbarItem id = "SearchSeparator" type = "Separator"/>
-		<!--			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable"> -->
+		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.ITextEditorControlProvider" action="Disable">
-		<ToolbarItem id = "Comment"
+			<ToolbarItem id = "Comment"
-		             icon = "Icons.16x16.CommentRegion"
+			             icon = "Icons.16x16.CommentRegion"
-		             tooltip = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
+			             tooltip = "${res:XML.TextAreaContextMenu.CommentUncommentSelection}"
-		             class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.CommentRegion"/>
+			             class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.CommentRegion"/>
-		<!--				<ToolbarItem id = "Uncomment"
+			<!--				<ToolbarItem id = "Uncomment"
 				             icon = "Icons.16x16.UnCommentRegion"
 				             tooltip = "${res:XML.TextAreaContextMenu.UncommentSelection}"
 				             class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.UncommentRegion"/> -->
-		
+			
-		<ToolbarItem id = "SearchSeparator2" type = "Separator"/>
+			<ToolbarItem id = "SearchSeparator2" type = "Separator"/>
-		<ToolbarItem id = "ToggleBookmark"
+			<ToolbarItem id = "ToggleBookmark"
-		             icon = "Bookmarks.ToggleMark"
+			             icon = "Bookmarks.ToggleMark"
-		             tooltip = "${res:XML.MainMenu.SearchMenu.ToggleBookmark.Description}"
+			             tooltip = "${res:XML.MainMenu.SearchMenu.ToggleBookmark.Description}"
-		             class = "ICSharpCode.SharpDevelop.Bookmarks.ToggleBookmark"/>
+			             class = "ICSharpCode.SharpDevelop.Bookmarks.ToggleBookmark"/>
-		<ToolbarItem id = "PrevBookmark"
+			<ToolbarItem id = "PrevBookmark"
-		             icon = "Bookmarks.GotoPrevInFile"
+			             icon = "Bookmarks.GotoPrevInFile"
-		             tooltip = "${res:XML.MainMenu.SearchMenu.PrevBookmark.Description}"
+			             tooltip = "${res:XML.MainMenu.SearchMenu.PrevBookmark.Description}"
-		             class = "ICSharpCode.SharpDevelop.Bookmarks.PrevBookmark"/>
+			             class = "ICSharpCode.SharpDevelop.Bookmarks.PrevBookmark"/>
-		<ToolbarItem id = "NextBookmark"
+			<ToolbarItem id = "NextBookmark"
-		             icon = "Bookmarks.GotoNextInFile"
+			             icon = "Bookmarks.GotoNextInFile"
-		             tooltip = "${res:XML.MainMenu.SearchMenu.NextBookmark.Description}"
+			             tooltip = "${res:XML.MainMenu.SearchMenu.NextBookmark.Description}"
-		             class = "ICSharpCode.SharpDevelop.Bookmarks.NextBookmark"/>
+			             class = "ICSharpCode.SharpDevelop.Bookmarks.NextBookmark"/>
-		<ToolbarItem id = "ClearBookmarks"
+			<ToolbarItem id = "ClearBookmarks"
-		             icon = "Bookmarks.ClearAll"
+			             icon = "Bookmarks.ClearAll"
-		             tooltip = "${res:XML.MainMenu.SearchMenu.ClrBookmark.Description}"
+			             tooltip = "${res:XML.MainMenu.SearchMenu.ClrBookmark.Description}"
-		             class = "ICSharpCode.SharpDevelop.Bookmarks.ClearBookmarks"/>
+			             class = "ICSharpCode.SharpDevelop.Bookmarks.ClearBookmarks"/>
-		<!--			</Condition> -->
+		</Condition>
 	</Path>
 	
 	

src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/BinaryView.cs

@@ -50,7 +50,7 @@ namespace ResourceEditor
 			
 			viewHexDumpCheckBox.Location = new Point(8, 4);
 			viewHexDumpCheckBox.Size = new Size(Width - 16, 16);
-			viewHexDumpCheckBox.Text = "Show as Hex Dump";
+			viewHexDumpCheckBox.Text = StringParser.Parse("${res:ResourceEditor.ResourceEdit.ShowAsHexDump}");
 			viewHexDumpCheckBox.CheckedChanged += new EventHandler(CheckEvt);
 			
 			Controls.Add(byteDataTextBox);

src/AddIns/DisplayBindings/XmlEditor/Project/Src/AssignStylesheetCommand.cs

@@ -43,7 +43,7 @@ namespace ICSharpCode.XmlEditor
 				dialog.AddExtension = true;
 				dialog.Multiselect = false;
 				dialog.CheckFileExists = true;
-				dialog.Title = "Assign XSLT Stylesheet";
+				dialog.Title = ResourceService.GetString("ICSharpCode.XmlEditor.AssignXSLT.Title");
 				
 				AddInTreeNode node = AddInTree.GetTreeNode("/SharpDevelop/Workbench/FileFilter");
 				if (node != null) {

src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.addin

@@ -65,7 +65,7 @@
 						<Condition name = "WindowActive" activewindow = "ICSharpCode.XmlEditor.XslOutputView"/>
 					</Not>
 					<MenuItem id="AssignStylesheet"
-					          label="&amp;Assign XSLT..."
+					          label="${res:ICSharpCode.XmlEditor.AssignXSLT}"
 					          class="ICSharpCode.XmlEditor.AssignStylesheetCommand"/>
 					<ComplexCondition action="Disable">
 						<!-- evaluate StylesheetAssigned only when XmlView is active - important for lazy loading! -->
@@ -74,11 +74,11 @@
 							<Condition name = "StylesheetAssigned" action="Disable"/>
 						</And>
 						<MenuItem id="OpenStylesheet"
-						          label="&amp;Open XSLT"
+						          label="${res:ICSharpCode.XmlEditor.OpenXSLT}"
 						          class="ICSharpCode.XmlEditor.OpenStylesheetCommand"/>
 					</ComplexCondition>
 					<MenuItem id="RunTransform"
-					          label="Run XSL&amp;T"
+					          label="${res:ICSharpCode.XmlEditor.RunXSLT}"
 					          class="ICSharpCode.XmlEditor.RunXslTransformCommand"
 					          shortcut="Control|Shift|T"/>
 				</ComplexCondition>

src/AddIns/Misc/AddInManager/Project/Src/InstallableAddIn.cs

@@ -40,7 +40,7 @@ namespace ICSharpCode.AddInManager
 				addIn = AddIn.Load(fileName);
 			}
 			if (addIn.Manifest.PrimaryIdentity == null)
-				throw new AddInLoadException("The AddIn must have an <Identity> for use with the AddIn-Manager.");
+				throw new AddInLoadException(ResourceService.GetString("AddInManager.AddInMustHaveIdentity"));
 		}
 		
 		void LoadAddInFromZip(ZipFile file)

src/AddIns/Misc/AddInManager/Project/Src/ManagerForm.cs

@@ -446,8 +446,7 @@ namespace ICSharpCode.AddInManager
 					switch (Path.GetExtension(file).ToLowerInvariant()) {
 						case ".addin":
 							if (FileUtility.IsBaseDirectory(FileUtility.ApplicationRootPath, file)) {
-								MessageService.ShowMessage("You cannot install AddIns inside the ${ProductName} directory, " +
+								MessageService.ShowMessage("${res:AddInManager.CannotInstallIntoApplicationDirectory}");
-								                           "they will be picked up as pre-installed AddIns automatically.");
 								return false;
 							}
 							list.Add(new InstallableAddIn(file, false));
@@ -457,7 +456,7 @@ namespace ICSharpCode.AddInManager
 							list.Add(new InstallableAddIn(file, true));
 							break;
 						default:
-							MessageService.ShowMessage("Unknown file format: " + Path.GetExtension(file));
+							MessageService.ShowMessage("${res:AddInManager.UnknownFileFormat} " + Path.GetExtension(file));
 							return false;
 					}
 				} catch (AddInLoadException ex) {
@@ -644,7 +643,7 @@ namespace ICSharpCode.AddInManager
 				case AddInAction.Disable:
 					for (int i = 0; i < selected.Count; i++) {
 						if (selected[i].Manifest.PrimaryIdentity == "ICSharpCode.AddInManager") {
-							MessageService.ShowMessage("You cannot disable the AddInManager because you need it to re-enable AddIns!");
+							MessageService.ShowMessage("${res:AddInManager.CannotDisableAddInManager}");
 							selected.RemoveAt(i--);
 						}
 					}

src/AddIns/Misc/SharpReport/SharpReport/Designer/SideTab/BuildSideTab.cs

@@ -72,7 +72,7 @@ namespace SharpReport
 			                                                               bitmap);
 			tab.Items.Add (t);
 			
-			t = sideTab.SideTabItemFactory.CreateSideTabItem( "DataRow",
+			t = sideTab.SideTabItemFactory.CreateSideTabItem( ResourceService.GetString("SharpReport.Toolbar.DataRow"),
 			                                                 GlobalEnums.ReportItemType.ReportRowItem.ToString(),
 			                                                 ResourceService.GetBitmap("Icons.16x16.SharpQuery.Table"));
 			tab.Items.Add (t);
@@ -84,7 +84,7 @@ namespace SharpReport
 			
 			bitmap = ResourceService.GetIcon("Icons.16x16.ResourceEditor.bmp").ToBitmap();
 			
-			t = sideTab.SideTabItemFactory.CreateSideTabItem( "Image",
+			t = sideTab.SideTabItemFactory.CreateSideTabItem( ResourceService.GetString("SharpReport.Toolbar.Image"),
 			                                                 GlobalEnums.ReportItemType.ReportImageItem.ToString(),
 			                                                 bitmap);
 			tab.Items.Add (t);

src/Main/Base/Project/Src/TextEditor/Commands/ClassBookmarkMenuBuilder.cs

@@ -72,16 +72,19 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Commands
 		void AddImplementInterfaceCommandItems(List<ToolStripItem> subItems, IClass c, bool explicitImpl, ModifierEnum modifier)
 		{
 			CodeGenerator codeGen = c.ProjectContent.Language.CodeGenerator;
+			IAmbience ambience = AmbienceService.CurrentAmbience;
+			ambience.ConversionFlags = ConversionFlags.None;
 			foreach (IReturnType rt in c.BaseTypes) {
 				IClass interf = rt.GetUnderlyingClass();
 				if (interf != null && interf.ClassType == ClassType.Interface) {
+					IReturnType rtCopy = rt; // copy for access by anonymous method
 					EventHandler eh = delegate {
 						IDocument d = GetDocument(c);
 						if (d != null)
-							codeGen.ImplementInterface(rt, d, explicitImpl, modifier, c);
+							codeGen.ImplementInterface(rtCopy, d, explicitImpl, modifier, c);
 						ParserService.ParseCurrentViewContent();
 					};
-					subItems.Add(new MenuCommand(interf.Name, eh));
+					subItems.Add(new MenuCommand(ambience.Convert(interf), eh));
 				}
 			}
 		}

src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs

@@ -238,22 +238,25 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
 		
 		InsightWindow insightWindow = null;
 		CodeCompletionWindow codeCompletionWindow = null;
+		bool inHandleKeyPress;
 		
 		bool HandleKeyPress(char ch)
 		{
-			string fileName = FileName;
+			if (inHandleKeyPress)
-			if (codeCompletionWindow != null && !codeCompletionWindow.IsDisposed) {
+				return false;
-				if (codeCompletionWindow.ProcessKeyEvent(ch)) {
+			inHandleKeyPress = true;
-					return true;
+			try {
-				}
 				if (codeCompletionWindow != null && !codeCompletionWindow.IsDisposed) {
-					// code-completion window is still opened but did not want to handle
+					if (codeCompletionWindow.ProcessKeyEvent(ch)) {
-					// the keypress -> don't try to restart code-completion
+						return true;
-					return false;
+					}
+					if (codeCompletionWindow != null && !codeCompletionWindow.IsDisposed) {
+						// code-completion window is still opened but did not want to handle
+						// the keypress -> don't try to restart code-completion
+						return false;
+					}
 				}
-			}
+				
-			
-			try {
 				if (ICSharpCode.SharpDevelop.Dom.CodeCompletionOptions.EnableCodeCompletion) {
 					foreach (ICodeCompletionBinding ccBinding in CodeCompletionBindings) {
 						if (ccBinding.HandleKeyPress(this, ch))
@@ -282,6 +285,8 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
 				}
 			} catch (Exception ex) {
 				LogException(ex);
+			} finally {
+				inHandleKeyPress = false;
 			}
 			return false;
 		}