[Monodevelop-patches-list] r2680 - in trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor: . Gui

[Lluis Sanchez <lluis@ximian.com>]

Author: lluis
Date: 2005-07-20 12:54:25 -0400 (Wed, 20 Jul 2005)
New Revision: 2680

Modified:
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
Log:
2005-07-20  Lluis Sanchez Gual  <lluis at novell.com> 

	* Gui/SourceEditorWidget.cs: Factorized some code into
	SearchReplaceManager.



Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-07-20 16:53:11 UTC (rev 2679)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-07-20 16:54:25 UTC (rev 2680)
@@ -1,3 +1,8 @@
+2005-07-20  Lluis Sanchez Gual  <lluis at novell.com> 
+
+	* Gui/SourceEditorWidget.cs: Factorized some code into
+	SearchReplaceManager.
+
 2005-07-20  Peter Johanson  <latexer at gentoo.org>
 
 	* CodeCompletion/*: Migrated to MonoDevelop.Base assembly.

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2005-07-20 16:53:11 UTC (rev 2679)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2005-07-20 16:54:25 UTC (rev 2680)
@@ -96,19 +96,7 @@
 		public void Find()
 		{
 			SetSearchPattern();
-			if (SearchReplaceManager.ReplaceDialog != null) {
-				if (SearchReplaceManager.ReplaceDialog.replaceMode == false) {
-					SearchReplaceManager.ReplaceDialog.SetSearchPattern(SearchReplaceManager.SearchOptions.SearchPattern);
-					SearchReplaceManager.ReplaceDialog.Present ();
-				} else {
-					SearchReplaceManager.ReplaceDialog.Destroy ();
-					ReplaceDialog rd = new ReplaceDialog (false);
-					rd.ShowAll ();
-				}
-			} else {
-				ReplaceDialog rd = new ReplaceDialog (false);
-				rd.ShowAll();
-			}
+			SearchReplaceManager.ShowFindWindow ();
 		}
 		
 		[CommandHandler (SearchCommands.FindNext)]
@@ -141,23 +129,10 @@
 		public void Replace ()
 		{ 
 			SetSearchPattern ();
+			SearchReplaceManager.ShowFindReplaceWindow ();
 			
-			if (SearchReplaceManager.ReplaceDialog != null) {
-				if (SearchReplaceManager.ReplaceDialog.replaceMode == true) {
-					SearchReplaceManager.ReplaceDialog.SetSearchPattern(SearchReplaceManager.SearchOptions.SearchPattern);
-					SearchReplaceManager.ReplaceDialog.Present ();
-				} else {
-					SearchReplaceManager.ReplaceDialog.Destroy ();
-					ReplaceDialog rd = new ReplaceDialog (true);
-					rd.ShowAll ();
-				}
-			} else {
-				ReplaceDialog rd = new ReplaceDialog(true);
-				rd.ShowAll();
-			}
 		}
 		
-		
 		[CommandHandler (EditorCommands.GotoLineNumber)]
 		public void GotoLineNumber ()
 		{