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

[Todd Berman <tberman@sevenl.net>]

Author: tberman
Date: 2005-05-21 15:52:15 -0400 (Sat, 21 May 2005)
New Revision: 2553

Modified:
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
Log:
	* Gui/Dialogs/ReplaceDialog.cs:
	* Gui/Dialogs/ReplaceInFilesDialog.cs:
	Fix #74965.

2005-05-21  Todd Berman  <tberman at off.net>



Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-05-21 19:42:14 UTC (rev 2552)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-05-21 19:52:15 UTC (rev 2553)
@@ -1,5 +1,11 @@
 2005-05-21  Todd Berman  <tberman at off.net>
 
+	* Gui/Dialogs/ReplaceDialog.cs:
+	* Gui/Dialogs/ReplaceInFilesDialog.cs:
+	Fix #74965.
+
+2005-05-21  Todd Berman  <tberman at off.net>
+
 	* Search/SearchReplaceManager.cs:
 	* Search/SearchStrategy/RegExSearchStrategy.cs:
 	* Search/SearchReplaceInFilesManager.cs:

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs	2005-05-21 19:42:14 UTC (rev 2552)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs	2005-05-21 19:52:15 UTC (rev 2553)
@@ -146,12 +146,15 @@
 			switch (SearchReplaceManager.SearchOptions.SearchStrategyType) {
 				case SearchStrategyType.Normal:
 				case SearchStrategyType.Wildcard:
+					searchWholeWordOnlyCheckBox.Sensitive = true;
 					break;
 				case SearchStrategyType.RegEx:
+					searchWholeWordOnlyCheckBox.Sensitive = false;
 					index = 1;
 					break;
 			}
 			specialSearchStrategyComboBox.Active = index;
+			specialSearchStrategyComboBox.Changed += new EventHandler (OnSpecialSearchStrategyChanged);
 			
 			store = new ListStore (typeof (string));
 			store.AppendValues (GettextCatalog.GetString ("Current File"));
@@ -213,6 +216,15 @@
 		{
 			searchPatternEntry.Text  = pattern;
 		}
+
+		void OnSpecialSearchStrategyChanged (object o, EventArgs e)
+		{
+			if (specialSearchStrategyComboBox.Active != 1) {
+				searchWholeWordOnlyCheckBox.Sensitive = true;
+			} else {
+				searchWholeWordOnlyCheckBox.Sensitive = false;
+			}
+		}
 		
 		void SetupSearchReplaceManager()
 		{

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs	2005-05-21 19:42:14 UTC (rev 2552)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs	2005-05-21 19:52:15 UTC (rev 2553)
@@ -174,10 +174,12 @@
 				case SearchStrategyType.Wildcard:
 					break;
 				case SearchStrategyType.RegEx:
+					searchWholeWordOnlyCheckBox.Sensitive = false;
 					index = 1;
 					break;
 			}
 	 		specialSearchStrategyComboBox.Active = index;
+			specialSearchStrategyComboBox.Changed += new EventHandler (OnSpecialSearchStrategyChanged);
 			
 			store = new ListStore (typeof (string));
 			store.AppendValues (GettextCatalog.GetString ("Directories"));
@@ -236,6 +238,15 @@
 			if (SetupSearchReplaceInFilesManager ())
 				SearchReplaceInFilesManager.CancelSearch();
 		}
+
+		void OnSpecialSearchStrategyChanged (object o, EventArgs e)
+		{
+			if (specialSearchStrategyComboBox.Active != 1) {
+				searchWholeWordOnlyCheckBox.Sensitive = true;
+			} else {
+				searchWholeWordOnlyCheckBox.Sensitive = false;
+			}
+		}
 		
 						
 		void ReplaceEvent(object sender, EventArgs e)