From c8ad6e1ecaa23c29482d91043976728e53ee20ea Mon Sep 17 00:00:00 2001
From: Siegfried Pammer <siegfriedpammer@gmail.com>
Date: Tue, 4 Oct 2011 21:39:04 +0200
Subject: [PATCH] Remove incremental search from AvalonEdit.AddIn

---
 .../AvalonEdit.AddIn/AvalonEdit.AddIn.addin   | 14 -------
 .../AvalonEdit.AddIn/AvalonEdit.AddIn.csproj  |  1 -
 .../Src/Commands/RunIncrementalSearch.cs      | 40 -------------------
 .../Project/ICSharpCode.SharpDevelop.addin    |  1 -
 4 files changed, 56 deletions(-)
 delete mode 100644 src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Commands/RunIncrementalSearch.cs

diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
index f6f6d194f3..be73ce6c71 100755
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.addin
@@ -133,20 +133,6 @@
 		</MenuItem>
 	</Path>
 	
-	<Path name = "/SharpDevelop/Workbench/MainMenu/Search">
-		<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
-			<MenuItem id = "SearchIncremental"
-			          label = "${res:XML.MainMenu.SearchMenu.IncrementalSearch}"
-			          shortcut = "Control|E"
-			          class = "ICSharpCode.AvalonEdit.AddIn.Commands.RunIncrementalSearch"/>
-			<MenuItem id = "SearchReverseIncremental"
-			          label = "${res:XML.MainMenu.SearchMenu.ReverseIncrementalSearch}"
-			          shortcut = "Control|Shift|E"
-			          class = "ICSharpCode.AvalonEdit.AddIn.Commands.RunReverseIncrementalSearch"
-			          insertbefore = "SearchInFilesSeparator"/>
-		</Condition>
-	</Path>
-	
 	<Path name = "/SharpDevelop/Dialogs/OptionsDialog/CodingOptions">
 		<OptionPanel id = "CodeTemplates"
 		             label = "${res:Dialog.Options.CodeTemplatesText}"
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj
index 3ed5a3ef9e..cbd74f85ea 100644
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj
+++ b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/AvalonEdit.AddIn.csproj
@@ -118,7 +118,6 @@
     <Compile Include="Src\NewLineConsistencyCheck.cs" />
     <Compile Include="Src\SharpDevelopTextEditor.cs" />
     <Compile Include="Src\Commands\FoldingCommands.cs" />
-    <Compile Include="Src\Commands\RunIncrementalSearch.cs" />
     <Compile Include="Src\Commands\SaveFileWithEncoding.cs" />
     <Compile Include="Src\Commands\SortOptionsDialog.xaml.cs">
       <DependentUpon>SortOptionsDialog.xaml</DependentUpon>
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Commands/RunIncrementalSearch.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Commands/RunIncrementalSearch.cs
deleted file mode 100644
index 837d24b0f4..0000000000
--- a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Commands/RunIncrementalSearch.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
-// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
-
-using System;
-using System.Windows.Documents;
-using ICSharpCode.AvalonEdit.Editing;
-using ICSharpCode.Core;
-using ICSharpCode.SharpDevelop.Editor;
-using ICSharpCode.SharpDevelop.Gui;
-
-namespace ICSharpCode.AvalonEdit.AddIn.Commands
-{
-	public class RunIncrementalSearch : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent as ITextEditorProvider;
-			if (provider != null) {
-				TextArea textArea = provider.TextEditor.GetService(typeof(TextArea)) as TextArea;
-				if (textArea != null) {
-					textArea.ActiveInputHandler = new IncrementalSearch(textArea, LogicalDirection.Forward);
-				}
-			}
-		}
-	}
-	
-	public class RunReverseIncrementalSearch : AbstractMenuCommand
-	{
-		public override void Run()
-		{
-			ITextEditorProvider provider = WorkbenchSingleton.Workbench.ActiveViewContent as ITextEditorProvider;
-			if (provider != null) {
-				TextArea textArea = provider.TextEditor.GetService(typeof(TextArea)) as TextArea;
-				if (textArea != null) {
-					textArea.ActiveInputHandler = new IncrementalSearch(textArea, LogicalDirection.Backward);
-				}
-			}
-		}
-	}
-}
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
index 102252206b..1a72b0cd2e 100755
--- a/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
+++ b/src/Main/Base/Project/ICSharpCode.SharpDevelop.addin
@@ -1624,7 +1624,6 @@
 		</MenuItem> <!-- end DEBUG menu -->
 		
 		<MenuItem id = "Search" label = "${res:XML.MainMenu.SearchMenu}" type="Menu">
-			<MenuItem id = "SearchInFilesSeparator" type = "Separator" />
 			<Condition name = "WindowActive" activewindow="ICSharpCode.SharpDevelop.Editor.ITextEditorProvider" action="Disable">
 				<MenuItem id = "ToggleBookmark"
 				          label = "${res:XML.MainMenu.SearchMenu.ToggleBookmark}"