[Monodevelop-patches-list] r660 - in trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor: Commands Gui/Dialogs

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-01-26 01:33:55 -0500 (Mon, 26 Jan 2004)
New Revision: 660

Modified:
   trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/SearchCommands.cs
   trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/Dialogs/ReplaceDialog.cs
Log:
bug fixery


Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/SearchCommands.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/SearchCommands.cs	2004-01-26 06:27:24 UTC (rev 659)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Commands/SearchCommands.cs	2004-01-26 06:33:55 UTC (rev 660)
@@ -49,8 +49,14 @@
 		{
 			SetSearchPattern();
 			if (SearchReplaceManager.ReplaceDialog != null) {
-				SearchReplaceManager.ReplaceDialog.SetSearchPattern(SearchReplaceManager.SearchOptions.SearchPattern);
-				SearchReplaceManager.ReplaceDialog.Present ();
+				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();
@@ -73,8 +79,14 @@
 			Find.SetSearchPattern();
 			
 			if (SearchReplaceManager.ReplaceDialog != null) {
-				SearchReplaceManager.ReplaceDialog.SetSearchPattern(SearchReplaceManager.SearchOptions.SearchPattern);
-				SearchReplaceManager.ReplaceDialog.Present ();
+				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();

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/Dialogs/ReplaceDialog.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/Dialogs/ReplaceDialog.cs	2004-01-26 06:27:24 UTC (rev 659)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Gui/Dialogs/ReplaceDialog.cs	2004-01-26 06:33:55 UTC (rev 660)
@@ -25,7 +25,7 @@
 {
 	public class ReplaceDialog : Gtk.Window
 	{
-		bool replaceMode;
+		public bool replaceMode;
 		ResourceService resourceService = (ResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
 		static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
 		static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.Services.GetService(typeof(FileUtilityService));