[Monodevelop-patches-list] r1119 - in trunk/MonoDevelop: . data/resources/glade src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs

commit-watcher at mono-cvs.ximian.com commit-watcher at mono-cvs.ximian.com
Fri Mar 5 21:53:40 EST 2004


Author: jba
Date: 2004-03-05 21:53:40 -0500 (Fri, 05 Mar 2004)
New Revision: 1119

Modified:
   trunk/MonoDevelop/ChangeLog
   trunk/MonoDevelop/data/resources/glade/texteditoraddin.glade
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
Log:
changed Gtk.Combo's to Gnome.Entry's to work around a focus bug that locked MD on find

Modified: trunk/MonoDevelop/ChangeLog
===================================================================
--- trunk/MonoDevelop/ChangeLog	2004-03-05 19:39:28 UTC (rev 1118)
+++ trunk/MonoDevelop/ChangeLog	2004-03-06 02:53:40 UTC (rev 1119)
@@ -1,3 +1,12 @@
+2004-03-05  John BouAntoun  <jba-mono at optusnet.com.au>
+	
+	* src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs : 
+	changed Gtk.Combo's to Gnome.Entry's to fix bug where MD would lock up with 
+	hidden "Not Found" Dialog popping up under the find dialog
+	* src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs: 
+	as above
+	* data/resources/glade/texteditoraddin.glade : as above
+
 2004-03-05  John Luke  <jluke at cfl.rr.com>
 	
 	* src/Main/Base/Gui/Dialogs/ReferenceDialog/AssemblyReferencePanel.cs:
@@ -11,8 +20,10 @@
 
 2004-03-05  John BouAntoun  <jba-mono at optusnet.com.au>
 
-	* src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs : added configuration renaming
-	* src/Main/Base/Gui/Dialogs/TreeViewOptions.cs : made InitializeComponent virtual so ProjectOptionDialog could override (see above)
+	* src/Main/Base/Gui/Dialogs/ProjectOptionsDialog.cs : added configuration 
+	renaming
+	* src/Main/Base/Gui/Dialogs/TreeViewOptions.cs : made InitializeComponent 
+	virtual so ProjectOptionDialog could override (see above)
 
 2004-03-04  Mike Kestner  <mkestner at ximian.com>
 

Modified: trunk/MonoDevelop/data/resources/glade/texteditoraddin.glade
===================================================================
--- trunk/MonoDevelop/data/resources/glade/texteditoraddin.glade	2004-03-05 19:39:28 UTC (rev 1118)
+++ trunk/MonoDevelop/data/resources/glade/texteditoraddin.glade	2004-03-06 02:53:40 UTC (rev 1119)
@@ -2,6 +2,7 @@
 <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 
 <glade-interface>
+<requires lib="gnome"/>
 
 <widget class="GtkDialog" id="GotoLineDialog">
   <property name="visible">True</property>
@@ -392,18 +393,15 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkCombo" id="searchPatternComboBox">
+		<widget class="GnomeEntry" id="searchPatternEntry">
 		  <property name="visible">True</property>
-		  <property name="value_in_list">False</property>
-		  <property name="allow_empty">True</property>
-		  <property name="case_sensitive">False</property>
-		  <property name="enable_arrow_keys">True</property>
-		  <property name="enable_arrows_always">False</property>
+		  <property name="max_saved">20</property>
 
 		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="combo_entry1">
+		    <widget class="GtkEntry" id="entry7">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
+		      <property name="has_focus">True</property>
 		      <property name="editable">True</property>
 		      <property name="visibility">True</property>
 		      <property name="max_length">0</property>
@@ -413,13 +411,6 @@
 		      <property name="activates_default">True</property>
 		    </widget>
 		  </child>
-
-		  <child internal-child="list">
-		    <widget class="GtkList" id="combo-list1">
-		      <property name="visible">True</property>
-		      <property name="selection_mode">GTK_SELECTION_SINGLE</property>
-		    </widget>
-		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -478,16 +469,12 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkCombo" id="replacePatternComboBox">
+		<widget class="GnomeEntry" id="replacePatternEntry">
 		  <property name="visible">True</property>
-		  <property name="value_in_list">False</property>
-		  <property name="allow_empty">True</property>
-		  <property name="case_sensitive">False</property>
-		  <property name="enable_arrow_keys">True</property>
-		  <property name="enable_arrows_always">False</property>
+		  <property name="max_saved">20</property>
 
 		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="combo-entry2">
+		    <widget class="GtkEntry" id="entry9">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
 		      <property name="editable">True</property>
@@ -496,16 +483,9 @@
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
 		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">True</property>
+		      <property name="activates_default">False</property>
 		    </widget>
 		  </child>
-
-		  <child internal-child="list">
-		    <widget class="GtkList" id="combo-list2">
-		      <property name="visible">True</property>
-		      <property name="selection_mode">GTK_SELECTION_SINGLE</property>
-		    </widget>
-		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -762,18 +742,15 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkCombo" id="searchPatternComboBox">
+		<widget class="GnomeEntry" id="searchPatternEntry">
 		  <property name="visible">True</property>
-		  <property name="value_in_list">False</property>
-		  <property name="allow_empty">True</property>
-		  <property name="case_sensitive">False</property>
-		  <property name="enable_arrow_keys">True</property>
-		  <property name="enable_arrows_always">False</property>
+		  <property name="max_saved">20</property>
 
 		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="combo-entry1">
+		    <widget class="GtkEntry" id="entry11">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
+		      <property name="has_focus">True</property>
 		      <property name="editable">True</property>
 		      <property name="visibility">True</property>
 		      <property name="max_length">0</property>
@@ -783,13 +760,6 @@
 		      <property name="activates_default">True</property>
 		    </widget>
 		  </child>
-
-		  <child internal-child="list">
-		    <widget class="GtkList" id="combo-list1">
-		      <property name="visible">True</property>
-		      <property name="selection_mode">GTK_SELECTION_SINGLE</property>
-		    </widget>
-		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -835,7 +805,7 @@
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
+		  <property name="xalign">0</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
@@ -888,7 +858,7 @@
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
+		  <property name="xalign">0</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
@@ -1251,18 +1221,15 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkCombo" id="searchPatternComboBox">
+		<widget class="GnomeEntry" id="searchPatternEntry">
 		  <property name="visible">True</property>
-		  <property name="value_in_list">False</property>
-		  <property name="allow_empty">True</property>
-		  <property name="case_sensitive">False</property>
-		  <property name="enable_arrow_keys">True</property>
-		  <property name="enable_arrows_always">False</property>
+		  <property name="max_saved">20</property>
 
 		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="combo-entry1">
+		    <widget class="GtkEntry" id="entry3">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
+		      <property name="has_focus">True</property>
 		      <property name="editable">True</property>
 		      <property name="visibility">True</property>
 		      <property name="max_length">0</property>
@@ -1272,13 +1239,6 @@
 		      <property name="activates_default">True</property>
 		    </widget>
 		  </child>
-
-		  <child internal-child="list">
-		    <widget class="GtkList" id="combo-list1">
-		      <property name="visible">True</property>
-		      <property name="selection_mode">GTK_SELECTION_SINGLE</property>
-		    </widget>
-		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -1337,16 +1297,12 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkCombo" id="replacePatternComboBox">
+		<widget class="GnomeEntry" id="replacePatternEntry">
 		  <property name="visible">True</property>
-		  <property name="value_in_list">False</property>
-		  <property name="allow_empty">True</property>
-		  <property name="case_sensitive">False</property>
-		  <property name="enable_arrow_keys">True</property>
-		  <property name="enable_arrows_always">False</property>
+		  <property name="max_saved">20</property>
 
 		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="combo-entry2">
+		    <widget class="GtkEntry" id="entry5">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
 		      <property name="editable">True</property>
@@ -1355,16 +1311,9 @@
 		      <property name="text" translatable="yes"></property>
 		      <property name="has_frame">True</property>
 		      <property name="invisible_char" translatable="yes">*</property>
-		      <property name="activates_default">True</property>
+		      <property name="activates_default">False</property>
 		    </widget>
 		  </child>
-
-		  <child internal-child="list">
-		    <widget class="GtkList" id="combo-list2">
-		      <property name="visible">True</property>
-		      <property name="selection_mode">GTK_SELECTION_SINGLE</property>
-		    </widget>
-		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
@@ -1410,7 +1359,7 @@
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
+		  <property name="xalign">0</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
@@ -1463,7 +1412,7 @@
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
+		  <property name="xalign">0</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
@@ -1838,18 +1787,18 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkCombo" id="searchPatternComboBox">
+		<widget class="GnomeEntry" id="searchPatternEntry">
 		  <property name="visible">True</property>
-		  <property name="value_in_list">False</property>
-		  <property name="allow_empty">True</property>
-		  <property name="case_sensitive">False</property>
-		  <property name="enable_arrow_keys">True</property>
-		  <property name="enable_arrows_always">False</property>
+		  <property name="max_saved">20</property>
+		  <accessibility>
+		    <atkproperty name="AtkObject::accessible_name" translatable="yes">searchPatternEntry</atkproperty>
+		  </accessibility>
 
 		  <child internal-child="entry">
-		    <widget class="GtkEntry" id="combo_entry1">
+		    <widget class="GtkEntry" id="combo-entry3">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
+		      <property name="has_focus">True</property>
 		      <property name="editable">True</property>
 		      <property name="visibility">True</property>
 		      <property name="max_length">0</property>
@@ -1859,13 +1808,6 @@
 		      <property name="activates_default">True</property>
 		    </widget>
 		  </child>
-
-		  <child internal-child="list">
-		    <widget class="GtkList" id="combo-list1">
-		      <property name="visible">True</property>
-		      <property name="selection_mode">GTK_SELECTION_SINGLE</property>
-		    </widget>
-		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs	2004-03-05 19:39:28 UTC (rev 1118)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs	2004-03-06 02:53:40 UTC (rev 1119)
@@ -41,8 +41,8 @@
 		StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService (typeof (StringParserService));
 		
 		// gtk widgets
-		[Glade.Widget] Gtk.Combo searchPatternComboBox;
-		[Glade.Widget] Gtk.Combo replacePatternComboBox;
+		[Glade.Widget] Gnome.Entry searchPatternEntry;
+		[Glade.Widget] Gnome.Entry replacePatternEntry;
 		[Glade.Widget] Gtk.Button findHelpButton;
 		[Glade.Widget] Gtk.Button findButton;
 		[Glade.Widget] Gtk.Button markAllButton;
@@ -56,8 +56,7 @@
 		[Glade.Widget] Gtk.OptionMenu specialSearchStrategyComboBox;
 		[Glade.Widget] Gtk.OptionMenu searchLocationComboBox;
 		[Glade.Widget] Gtk.Label label1;
-		[Glade.Widget] Gtk.Label label2;
-		[Glade.Widget] Gtk.Entry combo_entry1;
+		[Glade.Widget] Gtk.Label label2;		
 		[Glade.Widget] Gtk.Label searchLocationLabel;
 		[Glade.Widget] Gtk.Dialog FindDialogWidget;
 		[Glade.Widget] Gtk.Dialog ReplaceDialogWidget;
@@ -83,7 +82,7 @@
 			SizeGroup helpButtons = new SizeGroup(SizeGroupMode.Horizontal);
 			SizeGroup checkButtons = new SizeGroup(SizeGroupMode.Horizontal);
 			labels.AddWidget(label1);			
-			combos.AddWidget(searchPatternComboBox);
+			combos.AddWidget(searchPatternEntry);
 			helpButtons.AddWidget(findHelpButton);
 			checkButtons.AddWidget(ignoreCaseCheckBox);
 			checkButtons.AddWidget(searchWholeWordOnlyCheckBox);
@@ -108,7 +107,7 @@
 				
 				// set te size groups to include the replace dialog
 				labels.AddWidget(label2);
-				combos.AddWidget(replacePatternComboBox);
+				combos.AddWidget(replacePatternEntry);
 				helpButtons.AddWidget(replaceHelpButton);
 				
 				replaceHelpButton.Sensitive = false;
@@ -191,7 +190,7 @@
 			}
 			searchLocationComboBox.SetHistory (index);
 			
-			searchPatternComboBox.Entry.Text  = SearchReplaceManager.SearchOptions.SearchPattern;
+			searchPatternEntry.GtkEntry.Text  = SearchReplaceManager.SearchOptions.SearchPattern;
 			
 			// insert event handlers
 			findButton.Clicked  += new EventHandler(FindNextEvent);
@@ -203,14 +202,14 @@
 				ReplaceDialogPointer.Title = resourceService.GetString("Dialog.NewProject.SearchReplace.ReplaceDialogName");
 				replaceButton.Clicked    += new EventHandler(ReplaceEvent);
 				replaceAllButton.Clicked += new EventHandler(ReplaceAllEvent);
-				replacePatternComboBox.Entry.Text = SearchReplaceManager.SearchOptions.ReplacePattern;
+				replacePatternEntry.GtkEntry.Text = SearchReplaceManager.SearchOptions.ReplacePattern;
 			} else {
 				ReplaceDialogPointer.Title = resourceService.GetString("Dialog.NewProject.SearchReplace.FindDialogName");
 				markAllButton.Clicked    += new EventHandler(MarkAllEvent);
 			}
-			combo_entry1.SelectRegion(0, 999);
+			searchPatternEntry.GtkEntry.SelectRegion(0, searchPatternEntry.GtkEntry.Text.Length);
 			
-				//ControlDictionary["replacePatternComboBox"].Visible = false;
+				//ControlDictionary["replacePatternEntry"].Visible = false;
 				//ControlDictionary["replaceAllButton"].Visible       = false;
 				//ControlDictionary["replacePatternLabel"].Visible    = false;
 				//ControlDictionary["replacePatternButton"].Visible   = false;
@@ -236,14 +235,14 @@
 
 		public void SetSearchPattern(string pattern)
 		{
-			searchPatternComboBox.Entry.Text  = pattern;
+			searchPatternEntry.GtkEntry.Text  = pattern;
 		}
 		
 		void SetupSearchReplaceManager()
 		{
-			SearchReplaceManager.SearchOptions.SearchPattern  = searchPatternComboBox.Entry.Text;
+			SearchReplaceManager.SearchOptions.SearchPattern  = searchPatternEntry.GtkEntry.Text;
 			if (replaceMode) {
-				SearchReplaceManager.SearchOptions.ReplacePattern = replacePatternComboBox.Entry.Text;
+				SearchReplaceManager.SearchOptions.ReplacePattern = replacePatternEntry.GtkEntry.Text;
 			}
 			
 			SearchReplaceManager.SearchOptions.IgnoreCase          = !ignoreCaseCheckBox.Active;
@@ -277,7 +276,7 @@
 		
 		void FindNextEvent(object sender, EventArgs e)
 		{
-			if (searchPatternComboBox.Entry.Text.Length == 0) {
+			if (searchPatternEntry.GtkEntry.Text.Length == 0) {
 				return;
 			}
 			
@@ -291,12 +290,12 @@
 				//Cursor = Cursors.Default;
 			}
 			
-			AddSearchHistoryItem(findHistory, searchPatternComboBox.Entry.Text);
+			AddSearchHistoryItem(findHistory, searchPatternEntry.GtkEntry.Text);
 		}
 		
 		void ReplaceEvent(object sender, EventArgs e)
 		{
-			if (searchPatternComboBox.Entry.Text.Length == 0) {
+			if (searchPatternEntry.GtkEntry.Text.Length == 0) {
 				return;
 			}
 			
@@ -310,12 +309,12 @@
 				//Cursor = Cursors.Default;
 			}
 			
-			AddSearchHistoryItem(replaceHistory, replacePatternComboBox.Entry.Text);
+			AddSearchHistoryItem(replaceHistory, replacePatternEntry.GtkEntry.Text);
 		}
 		
 		void ReplaceAllEvent(object sender, EventArgs e)
 		{
-			if (searchPatternComboBox.Entry.Text.Length == 0) {
+			if (searchPatternEntry.GtkEntry.Text.Length == 0) {
 				return;
 			}
 			
@@ -328,12 +327,12 @@
 				//Cursor = Cursors.Default;
 			}
 			
-			AddSearchHistoryItem(replaceHistory, replacePatternComboBox.Entry.Text);
+			AddSearchHistoryItem(replaceHistory, replacePatternEntry.GtkEntry.Text);
 		}
 		
 		void MarkAllEvent(object sender, EventArgs e)
 		{
-			if (searchPatternComboBox.Entry.Text.Length == 0) {
+			if (searchPatternEntry.GtkEntry.Text.Length == 0) {
 				return;
 			}
 			
@@ -346,7 +345,7 @@
 				//Cursor = Cursors.Default;
 			}
 			
-			AddSearchHistoryItem(findHistory, searchPatternComboBox.Entry.Text);
+			AddSearchHistoryItem(findHistory, searchPatternEntry.GtkEntry.Text);
 		}
 		
 		void CloseDialogEvent(object sender, EventArgs e)
@@ -380,9 +379,9 @@
 			string[] stringArray = new string[history.Count];
 			history.CopyTo(stringArray, 0);
 			if (history == findHistory) {
-				searchPatternComboBox.PopdownStrings = stringArray;
+				searchPatternEntry.PopdownStrings = stringArray;
 			} else if( history == replaceHistory) {
-				replacePatternComboBox.PopdownStrings = stringArray;
+				replacePatternEntry.PopdownStrings = stringArray;
 			}
 		}
 		
@@ -396,7 +395,7 @@
 		
 			if(stringArray != null) {
 				findHistory.AddRange(stringArray.ToString().Split(HISTORY_SEPARATOR_CHAR));
-				searchPatternComboBox.PopdownStrings = stringArray.ToString().Split(HISTORY_SEPARATOR_CHAR);
+				searchPatternEntry.PopdownStrings = stringArray.ToString().Split(HISTORY_SEPARATOR_CHAR);
 			}
 			
 			// now do the replace history
@@ -404,7 +403,7 @@
 				stringArray = propertyService.GetProperty("MonoDevelop.FindReplaceDialogs.ReplaceHistory");
 				if(stringArray != null) {
 					replaceHistory.AddRange(stringArray.ToString().Split(HISTORY_SEPARATOR_CHAR));
-					replacePatternComboBox.PopdownStrings = stringArray.ToString().Split(HISTORY_SEPARATOR_CHAR);
+					replacePatternEntry.PopdownStrings = stringArray.ToString().Split(HISTORY_SEPARATOR_CHAR);
 				}
 			}
 		}
@@ -443,7 +442,7 @@
 		public void ShowAll()
 		{
 			ReplaceDialogPointer.ShowAll();
-			searchPatternComboBox.Entry.SelectRegion (0, searchPatternComboBox.Entry.Text.Length);
+			searchPatternEntry.GtkEntry.SelectRegion (0, searchPatternEntry.GtkEntry.Text.Length);
 		}
 		#endregion
 	}

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs	2004-03-05 19:39:28 UTC (rev 1118)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs	2004-03-06 02:53:40 UTC (rev 1119)
@@ -1,7 +1,7 @@
 // <file>
 //     <copyright see="prj:///doc/copyright.txt"/>
 //     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
+//     <owner name="Mike Kr�ger" email="mike at icsharpcode.net"/>
 //     <version value="$version"/>
 // </file>
 
@@ -33,8 +33,8 @@
 		static PropertyService propertyService = (PropertyService)ServiceManager.Services.GetService(typeof(PropertyService));
 		public bool replaceMode;
 
-		[Glade.Widget] Gtk.Combo searchPatternComboBox;
-		[Glade.Widget] Gtk.Combo replacePatternComboBox;
+		[Glade.Widget] Gnome.Entry searchPatternEntry;
+		[Glade.Widget] Gnome.Entry replacePatternEntry;
 		[Glade.Widget] Gtk.Button findHelpButton;
 		[Glade.Widget] Gtk.Button findButton;
 		[Glade.Widget] Gtk.Button markAllButton;
@@ -87,7 +87,7 @@
 			labels.AddWidget(label1);
 			labels.AddWidget(label6);
 			labels.AddWidget(label7);
-			combos.AddWidget(searchPatternComboBox);
+			combos.AddWidget(searchPatternEntry);
 			combos.AddWidget(directoryTextBox);
 			combos.AddWidget(fileMaskTextBox);
 			helpButtons.AddWidget(findHelpButton);
@@ -114,7 +114,7 @@
 				
 				// set te size groups to include the replace dialog
 				labels.AddWidget(label2);
-				combos.AddWidget(replacePatternComboBox);
+				combos.AddWidget(replacePatternEntry);
 				helpButtons.AddWidget(replaceHelpButton);
 				
 				replaceHelpButton.Sensitive = false;
@@ -158,7 +158,7 @@
 		{
 			ReplaceDialogPointer.ShowAll ();
 			SearchReplaceInFilesManager.ReplaceDialog = this;
-			searchPatternComboBox.Entry.SelectRegion (0, searchPatternComboBox.Entry.Text.Length);
+			searchPatternEntry.GtkEntry.SelectRegion (0, searchPatternEntry.GtkEntry.Text.Length);
 		}
 
 		public ReplaceInFilesDialog(bool replaceMode)
@@ -172,14 +172,14 @@
 			/*
 			if (replaceMode) {
 				this.SetupFromXml(propertyService.DataDirectory + @"\resources\dialogs\ReplaceInFilesDialog.xfrm");
-				ControlDictionary["replacePatternComboBox"].Text = SearchReplaceInFilesManager.SearchOptions.ReplacePattern;
+				ControlDictionary["replacePatternEntry"].Text = SearchReplaceInFilesManager.SearchOptions.ReplacePattern;
 				ControlDictionary["replaceHelpButton"].Enabled = false;
 			} else {
 				this.SetupFromXml(propertyService.DataDirectory + @"\resources\dialogs\FindInFilesDialog.xfrm");
 			}*/
 			
 			//ControlDictionary["findHelpButton"].Enabled = false;
-			//ControlDictionary["searchPatternComboBox"].Text = SearchReplaceInFilesManager.SearchOptions.SearchPattern;
+			//ControlDictionary["searchPatternEntry"].Text = SearchReplaceInFilesManager.SearchOptions.SearchPattern;
 			
 			//AcceptButton = (Button)ControlDictionary["findButton"];
 			//CancelButton = (Button)ControlDictionary["closeButton"];
@@ -234,11 +234,11 @@
 			browseButton.Clicked += new EventHandler(BrowseDirectoryEvent);
 			findButton.Clicked += new EventHandler(FindEvent);
 			
-			searchPatternComboBox.Entry.Text = SearchReplaceInFilesManager.SearchOptions.SearchPattern;
+			searchPatternEntry.GtkEntry.Text = SearchReplaceInFilesManager.SearchOptions.SearchPattern;
 			
 			if (replaceMode) {
 				replaceAllButton.Clicked += new EventHandler(ReplaceEvent);
-				replacePatternComboBox.Entry.Text = SearchReplaceInFilesManager.SearchOptions.ReplacePattern;
+				replacePatternEntry.GtkEntry.Text = SearchReplaceInFilesManager.SearchOptions.ReplacePattern;
 			}
 			
 			ReplaceDialogPointer.Close += new EventHandler (CloseDialogEvent);
@@ -325,9 +325,9 @@
 			SearchReplaceInFilesManager.SearchOptions.SearchDirectory = directoryName;
 			SearchReplaceInFilesManager.SearchOptions.SearchSubdirectories = includeSubdirectoriesCheckBox.Active;
 			
-			SearchReplaceInFilesManager.SearchOptions.SearchPattern  = searchPatternComboBox.Entry.Text;
+			SearchReplaceInFilesManager.SearchOptions.SearchPattern  = searchPatternEntry.GtkEntry.Text;
 			if (replaceMode) {
-				SearchReplaceInFilesManager.SearchOptions.ReplacePattern = replacePatternComboBox.Entry.Text;
+				SearchReplaceInFilesManager.SearchOptions.ReplacePattern = replacePatternEntry.GtkEntry.Text;
 			}
 			
 			SearchReplaceInFilesManager.SearchOptions.IgnoreCase          = !ignoreCaseCheckBox.Active;




More information about the Monodevelop-patches-list mailing list