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

Lluis Sanchez <lluis@ximian.com> lluis at mono-cvs.ximian.com
Mon Jun 27 17:13:19 EDT 2005


Author: lluis
Date: 2005-06-27 17:13:18 -0400 (Mon, 27 Jun 2005)
New Revision: 2606

Removed:
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/BookmarkCommands.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/
Modified:
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelopEditor.addin.xml
   trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/texteditoraddin.glade
Log:
2005-06-27  Lluis Sanchez Gual  <lluis at novell.com> 

	* Gui/SourceEditorWidget.cs: Added some imports.
	
	* Search/*.cs:
	* Commands/SearchCommands.cs:
	* Gui/Dialogs/ReplaceInFilesDialog.cs:
	* Gui/Dialogs/ReplaceDialog.cs: Moved to MonoDevelop.Base.
	
	* Gui/SourceEditorDisplayBinding.cs: Implement some new interfaces.
	* Commands/BookmarkCommands.cs: Those are implemented with inline
	command handlers.
	
	* texteditoraddin.glade: Moved search/replace dialogs to MonoDevelop.Base.
	* Makefile.am: Removed moved files.
	* MonoDevelopEditor.addin.xml: Search/replace commands are now defined in
	MonoDevelop.Base.



Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-06-24 08:05:02 UTC (rev 2605)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog	2005-06-27 21:13:18 UTC (rev 2606)
@@ -1,3 +1,21 @@
+2005-06-27  Lluis Sanchez Gual  <lluis at novell.com> 
+
+	* Gui/SourceEditorWidget.cs: Added some imports.
+	
+	* Search/*.cs:
+	* Commands/SearchCommands.cs:
+	* Gui/Dialogs/ReplaceInFilesDialog.cs:
+	* Gui/Dialogs/ReplaceDialog.cs: Moved to MonoDevelop.Base.
+	
+	* Gui/SourceEditorDisplayBinding.cs: Implement some new interfaces.
+	* Commands/BookmarkCommands.cs: Those are implemented with inline
+	command handlers.
+	
+	* texteditoraddin.glade: Moved search/replace dialogs to MonoDevelop.Base.
+	* Makefile.am: Removed moved files.
+	* MonoDevelopEditor.addin.xml: Search/replace commands are now defined in
+	MonoDevelop.Base.
+
 2005-06-09  Lluis Sanchez Gual  <lluis at novell.com> 
 
 	* Services/SourceViewService.cs: Added null check.

Deleted: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/BookmarkCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/BookmarkCommands.cs	2005-06-24 08:05:02 UTC (rev 2605)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/BookmarkCommands.cs	2005-06-27 21:13:18 UTC (rev 2606)
@@ -1,74 +0,0 @@
-using System;
-
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.Services;
-using MonoDevelop.Gui.Dialogs;
-using MonoDevelop.Gui;
-using MonoDevelop.Core.AddIns.Codons;
-
-namespace MonoDevelop.EditorBindings.Commands
-{
-	public class ToggleBookmark : AbstractMenuCommand
-	{
-		public override void Run ()
-		{
-			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
-			if (window == null)
-				return;
-			
-			IBookmarkOperations o = window.ViewContent as IBookmarkOperations;
-			if (o == null)
-				return;
-			
-			o.ToggleBookmark ();
-		}
-	}
-	
-	public class PrevBookmark : AbstractMenuCommand
-	{
-		public override void Run ()
-		{
-			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
-			if (window == null)
-				return;
-			
-			IBookmarkOperations o = window.ViewContent as IBookmarkOperations;
-			if (o == null)
-				return;
-			
-			o.PrevBookmark ();
-		}
-	}
-		
-	public class NextBookmark : AbstractMenuCommand
-	{
-		public override void Run ()
-		{
-			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
-			if (window == null)
-				return;
-			
-			IBookmarkOperations o = window.ViewContent as IBookmarkOperations;
-			if (o == null)
-				return;
-			
-			o.NextBookmark ();
-		}
-	}
-		
-	public class ClearBookmarks : AbstractMenuCommand
-	{
-		public override void Run ()
-		{
-			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
-			if (window == null)
-				return;
-			
-			IBookmarkOperations o = window.ViewContent as IBookmarkOperations;
-			if (o == null)
-				return;
-			
-			o.ClearBookmarks ();
-		}
-	}
-}
\ No newline at end of file

Deleted: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs	2005-06-24 08:05:02 UTC (rev 2605)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs	2005-06-27 21:13:18 UTC (rev 2606)
@@ -1,98 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-//     <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Threading;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Text;
-
-using MonoDevelop.Core.AddIns;
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.AddIns.Codons;
-using MonoDevelop.TextEditor;
-using MonoDevelop.TextEditor.Actions;
-using MonoDevelop.TextEditor.Document;
-using MonoDevelop.Gui.Dialogs;
-using MonoDevelop.Gui;
-using MonoDevelop.SourceEditor.Gui;
-using SourceEditor_ = MonoDevelop.SourceEditor.Gui.SourceEditor;
-using MonoDevelop.Commands;
-
-namespace MonoDevelop.Commands
-{
-	public enum SearchCommands
-	{
-		Find,
-		FindNext,
-		FindPrevious,
-		Replace,
-		FindInFiles,
-		FindSelection,
-		FindBox,
-		ReplaceInFiles
-	}
-
-	public class FindInFilesHandler : CommandHandler
-	{
-		public static void SetSearchPattern ()
-		{
-			IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
-			if (window != null && window.ViewContent is SourceEditorDisplayBindingWrapper)
-			{
-				SourceEditor_ editor = ((SourceEditorDisplayBindingWrapper)window.ViewContent).Editor;
-				string selectedText = editor.Buffer.GetSelectedText ();
-				if (selectedText != null && selectedText.Length > 0)
-					SearchReplaceInFilesManager.SearchOptions.SearchPattern = selectedText.Split ('\n')[0];
-			}
-		}
-
-		protected override void Run ()
-		{
-			SetSearchPattern ();
-			if (SearchReplaceInFilesManager.ReplaceDialog != null) {
-				if (SearchReplaceInFilesManager.ReplaceDialog.replaceMode == false) {
-					SearchReplaceInFilesManager.ReplaceDialog.SetSearchPattern(SearchReplaceInFilesManager.SearchOptions.SearchPattern);
-					SearchReplaceInFilesManager.ReplaceDialog.Present ();
-				} else {
-					SearchReplaceInFilesManager.ReplaceDialog.Destroy ();
-					ReplaceInFilesDialog rd = new ReplaceInFilesDialog (false);
-					rd.ShowAll ();
-				}
-			} else {
-				ReplaceInFilesDialog rd = new ReplaceInFilesDialog(false);
-				rd.ShowAll();
-			}
-		}
-	}
-	
-	public class ReplaceInFilesHandler : CommandHandler
-	{
-		protected override void Run()
-		{
-			FindInFilesHandler.SetSearchPattern ();
-			
-			if (SearchReplaceInFilesManager.ReplaceDialog != null) {
-				if (SearchReplaceInFilesManager.ReplaceDialog.replaceMode == true) {
-					SearchReplaceInFilesManager.ReplaceDialog.SetSearchPattern(SearchReplaceInFilesManager.SearchOptions.SearchPattern);
-					SearchReplaceInFilesManager.ReplaceDialog.Present ();
-				} else {
-					SearchReplaceInFilesManager.ReplaceDialog.Destroy ();
-					ReplaceInFilesDialog rd = new ReplaceInFilesDialog (true);
-					rd.ShowAll ();
-				}
-			} else {
-				ReplaceInFilesDialog rd = new ReplaceInFilesDialog (true);
-				rd.ShowAll ();
-			}
-		}
-	}
-	
-}

Deleted: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs	2005-06-24 08:05:02 UTC (rev 2605)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceDialog.cs	2005-06-27 21:13:18 UTC (rev 2606)
@@ -1,441 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-//     <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Drawing;
-using System.ComponentModel;
-using System.Collections.Specialized;
-
-using MonoDevelop.Gui;
-using MonoDevelop.TextEditor.Document;
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.Services;
-using MonoDevelop.Services;
-using MonoDevelop.TextEditor;
-
-using Gtk;
-using Glade;
-
-namespace MonoDevelop.Gui.Dialogs
-{
-	public class ReplaceDialog
-	{
-		private const int historyLimit = 20;
-		private const char historySeparator = (char) 10;
-		// regular members
-		public bool replaceMode;
-		StringCollection findHistory = new StringCollection();
-		StringCollection replaceHistory = new StringCollection();
-		
-		// services
-		static PropertyService propertyService = (PropertyService)ServiceManager.GetService(typeof(PropertyService));
-		static FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-		StringParserService stringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
-		
-		// gtk widgets
-		[Glade.Widget] Gtk.Entry searchPatternEntry;
-		[Glade.Widget] Gtk.Entry replacePatternEntry;
-		[Glade.Widget] Gtk.Button findHelpButton;
-		[Glade.Widget] Gtk.Button findButton;
-		[Glade.Widget] Gtk.Button markAllButton;
-		[Glade.Widget] Gtk.Button closeButton;
-		[Glade.Widget] Gtk.Button replaceButton;
-		[Glade.Widget] Gtk.Button replaceAllButton;
-		[Glade.Widget] Gtk.Button replaceHelpButton;
-		[Glade.Widget] Gtk.CheckButton ignoreCaseCheckBox;
-		[Glade.Widget] Gtk.CheckButton searchWholeWordOnlyCheckBox;
-		[Glade.Widget] Gtk.CheckButton useSpecialSearchStrategyCheckBox;
-		[Glade.Widget] Gtk.ComboBox specialSearchStrategyComboBox;
-		[Glade.Widget] Gtk.ComboBox searchLocationComboBox;
-		[Glade.Widget] Gtk.Label label1;
-		[Glade.Widget] Gtk.Label label2;		
-		[Glade.Widget] Gtk.Label searchLocationLabel;
-		[Glade.Widget] Gtk.Dialog FindDialogWidget;
-		[Glade.Widget] Gtk.Dialog ReplaceDialogWidget;
-		Gtk.Dialog ReplaceDialogPointer;
-		
-		void InitDialog ()
-		{
-			findButton.UseUnderline = true;			
-			closeButton.UseUnderline = true;			
-			
-			//set up the size groups
-			SizeGroup labels = new SizeGroup(SizeGroupMode.Horizontal);
-			SizeGroup combos = new SizeGroup(SizeGroupMode.Horizontal);
-			SizeGroup options = new SizeGroup(SizeGroupMode.Horizontal);
-			SizeGroup helpButtons = new SizeGroup(SizeGroupMode.Horizontal);
-			SizeGroup checkButtons = new SizeGroup(SizeGroupMode.Horizontal);
-			labels.AddWidget(label1);			
-			combos.AddWidget(searchPatternEntry);
-			helpButtons.AddWidget(findHelpButton);
-			checkButtons.AddWidget(ignoreCaseCheckBox);
-			checkButtons.AddWidget(searchWholeWordOnlyCheckBox);
-			checkButtons.AddWidget(useSpecialSearchStrategyCheckBox);
-			checkButtons.AddWidget(searchLocationLabel);
-			options.AddWidget(specialSearchStrategyComboBox);
-			options.AddWidget(searchLocationComboBox);
-
-			searchPatternEntry.Completion = new EntryCompletion ();
-			searchPatternEntry.Completion.Model = new ListStore (typeof (string));
-			searchPatternEntry.Completion.TextColumn = 0;
-			
-			// set button sensitivity
-			findHelpButton.Sensitive = false;
-			
-			// set replace dialog properties 
-			if (replaceMode)
-			{
-				replacePatternEntry.Completion = new EntryCompletion ();
-				replacePatternEntry.Completion.Model = new ListStore (typeof (string));
-				replacePatternEntry.Completion.TextColumn = 0;
-
-				ReplaceDialogPointer = this.ReplaceDialogWidget;
-				// set the label properties
-				replaceButton.UseUnderline = true;
-				replaceAllButton.UseUnderline = true;
-				
-				// set te size groups to include the replace dialog
-				labels.AddWidget(label2);
-				combos.AddWidget(replacePatternEntry);
-				helpButtons.AddWidget(replaceHelpButton);
-				
-				replaceHelpButton.Sensitive = false;
-			}
-			else
-			{
-				ReplaceDialogPointer = this.FindDialogWidget;
-				markAllButton.UseUnderline = true;
-			}
-			ReplaceDialogPointer.TransientFor = (Gtk.Window)WorkbenchSingleton.Workbench;
-		}
-		
-		public ReplaceDialog(bool replaceMode)
-		{
-			// some members needed to initialise this dialog based on replace mode
-			this.replaceMode = replaceMode;
-			string dialogName = (replaceMode) ? "ReplaceDialogWidget" : "FindDialogWidget";
-			
-			// we must do it from *here* otherwise, we get this assembly, not the caller
-			Glade.XML glade = new XML (null, "texteditoraddin.glade", dialogName, null);
-			glade.Autoconnect (this);
-			InitDialog ();
-			
-			LoadHistoryValues();
-			
-			ignoreCaseCheckBox.Active = !SearchReplaceManager.SearchOptions.IgnoreCase;
-			searchWholeWordOnlyCheckBox.Active = SearchReplaceManager.SearchOptions.SearchWholeWordOnly;
-			
-			useSpecialSearchStrategyCheckBox.Active  = SearchReplaceManager.SearchOptions.SearchStrategyType != SearchStrategyType.Normal;
-			useSpecialSearchStrategyCheckBox.Toggled += new EventHandler(SpecialSearchStrategyCheckBoxChangedEvent);
-			
-			ListStore store = new ListStore (typeof (string));
-			store.AppendValues (GettextCatalog.GetString ("Wildcards"));
-			store.AppendValues (GettextCatalog.GetString ("Regular Expressions"));
-			specialSearchStrategyComboBox.Model = store;
-
-			CellRendererText cr = new CellRendererText ();
-			specialSearchStrategyComboBox.PackStart (cr, true);
-			specialSearchStrategyComboBox.AddAttribute (cr, "text", 0);
-		
-			int index = 0;
-			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"));
-			store.AppendValues (GettextCatalog.GetString ("All Open Files"));
-			store.AppendValues (GettextCatalog.GetString ("Entire Project"));
-			
-			searchLocationComboBox.Model = store;
-			searchLocationComboBox.PackStart (cr, true);
-			searchLocationComboBox.AddAttribute (cr, "text", 0);
-			
-			index = 0;
-			switch (SearchReplaceManager.SearchOptions.DocumentIteratorType) {
-				case DocumentIteratorType.AllOpenFiles:
-					index = 1;
-					break;
-				case DocumentIteratorType.WholeCombine:
-					SearchReplaceManager.SearchOptions.DocumentIteratorType = DocumentIteratorType.CurrentDocument;
-					break;
-			}
-			searchLocationComboBox.Active = index;
-			
-			searchPatternEntry.Text = SearchReplaceManager.SearchOptions.SearchPattern;
-			
-			// insert event handlers
-			findButton.Clicked  += new EventHandler(FindNextEvent);
-			closeButton.Clicked += new EventHandler(CloseDialogEvent);
-			ReplaceDialogPointer.Close += new EventHandler(CloseDialogEvent);
-			ReplaceDialogPointer.DeleteEvent += new DeleteEventHandler (OnDeleted);
-			
-			if (replaceMode) {
-				ReplaceDialogPointer.Title = GettextCatalog.GetString ("Replace");
-				replaceButton.Clicked    += new EventHandler(ReplaceEvent);
-				replaceAllButton.Clicked += new EventHandler(ReplaceAllEvent);
-				replacePatternEntry.Text = SearchReplaceManager.SearchOptions.ReplacePattern;
-			} else {
-				ReplaceDialogPointer.Title = GettextCatalog.GetString ("Find");
-				markAllButton.Clicked    += new EventHandler(MarkAllEvent);
-			}
-			searchPatternEntry.SelectRegion(0, searchPatternEntry.Text.Length);
-			
-			SpecialSearchStrategyCheckBoxChangedEvent(null, null);
-			SearchReplaceManager.ReplaceDialog     = this;
-		}
-		
-		protected void OnClosed()
-		{
-			SaveHistoryValues();
-			SearchReplaceManager.ReplaceDialog = null;
-		}
-		
-		void OnDeleted (object o, DeleteEventArgs args)
-		{
-			// perform the standard closing windows event
-			OnClosed();
-			SearchReplaceManager.ReplaceDialog = null;
-		}
-
-		public void SetSearchPattern(string pattern)
-		{
-			searchPatternEntry.Text  = pattern;
-		}
-
-		void OnSpecialSearchStrategyChanged (object o, EventArgs e)
-		{
-			if (specialSearchStrategyComboBox.Active != 1) {
-				searchWholeWordOnlyCheckBox.Sensitive = true;
-			} else {
-				searchWholeWordOnlyCheckBox.Sensitive = false;
-			}
-		}
-		
-		void SetupSearchReplaceManager()
-		{
-			SearchReplaceManager.SearchOptions.SearchPattern  = searchPatternEntry.Text;
-			if (replaceMode) {
-				SearchReplaceManager.SearchOptions.ReplacePattern = replacePatternEntry.Text;
-			}
-			
-			SearchReplaceManager.SearchOptions.IgnoreCase          = !ignoreCaseCheckBox.Active;
-			SearchReplaceManager.SearchOptions.SearchWholeWordOnly = searchWholeWordOnlyCheckBox.Active;
-			
-			if (useSpecialSearchStrategyCheckBox.Active) {
-				switch (specialSearchStrategyComboBox.Active) {
-					case 0:
-						SearchReplaceManager.SearchOptions.SearchStrategyType = SearchStrategyType.Wildcard;
-						break;
-					case 1:
-						SearchReplaceManager.SearchOptions.SearchStrategyType = SearchStrategyType.RegEx;
-						break;
-				}
-			} else {
-				SearchReplaceManager.SearchOptions.SearchStrategyType = SearchStrategyType.Normal;
-			}
-			
-			switch (searchLocationComboBox.Active) {
-				case 0:
-					SearchReplaceManager.SearchOptions.DocumentIteratorType = DocumentIteratorType.CurrentDocument;
-					break;
-				case 1:
-					SearchReplaceManager.SearchOptions.DocumentIteratorType = DocumentIteratorType.AllOpenFiles;
-					break;
-				case 2:
-					SearchReplaceManager.SearchOptions.DocumentIteratorType = DocumentIteratorType.WholeCombine;
-					break;
-			}
-		}
-		
-		void FindNextEvent(object sender, EventArgs e)
-		{
-			if (searchPatternEntry.Text.Length == 0)
-				return;
-			
-			SetupSearchReplaceManager();
-			SearchReplaceManager.FindNext();
-			
-			AddSearchHistoryItem(findHistory, searchPatternEntry.Text);
-		}
-		
-		void ReplaceEvent(object sender, EventArgs e)
-		{
-			if (searchPatternEntry.Text.Length == 0)
-				return;
-			
-			SetupSearchReplaceManager();
-			SearchReplaceManager.Replace();
-			
-			AddSearchHistoryItem(replaceHistory, replacePatternEntry.Text);
-		}
-		
-		void ReplaceAllEvent(object sender, EventArgs e)
-		{
-			if (searchPatternEntry.Text.Length == 0)
-				return;
-			
-			SetupSearchReplaceManager();
-			SearchReplaceManager.ReplaceAll();
-			
-			AddSearchHistoryItem(replaceHistory, replacePatternEntry.Text);
-		}
-		
-		void MarkAllEvent(object sender, EventArgs e)
-		{
-			if (searchPatternEntry.Text.Length == 0)
-				return;
-			
-			SetupSearchReplaceManager();
-			SearchReplaceManager.MarkAll();			
-			
-			AddSearchHistoryItem(findHistory, searchPatternEntry.Text);
-		}
-		
-		void CloseDialogEvent(object sender, EventArgs e)
-		{
-			ReplaceDialogPointer.Hide();
-			OnClosed ();
-		}
-		
-		void SpecialSearchStrategyCheckBoxChangedEvent(object sender, EventArgs e)
-		{
-			if (useSpecialSearchStrategyCheckBox != null) {
-				specialSearchStrategyComboBox.Sensitive = useSpecialSearchStrategyCheckBox.Active;
-				if (useSpecialSearchStrategyCheckBox.Active) {
-					if (specialSearchStrategyComboBox.Active == 1) {
-						searchWholeWordOnlyCheckBox.Sensitive = false;
-					}
-				} else {
-					searchWholeWordOnlyCheckBox.Sensitive = true;
-				}
-			}
-		}
-		
-		// generic method to add a string to a history item
-		private void AddSearchHistoryItem (StringCollection history, string toAdd)
-		{
-			// add the item to the find history
-			if (history.Contains(toAdd)) {
-				// remove it so it gets added at the top
-				history.Remove(toAdd);
-			}
-			// make sure there is only 20
-			if (history.Count == historyLimit) {
-				history.RemoveAt(historyLimit - 1);
-			}
-			history.Insert(0, toAdd);
-			
-			// update the drop down for the combobox
-			ListStore store = new ListStore (typeof (string));
-			for (int i = 0; i < history.Count; i ++)
-				store.AppendValues (history[i]);
-
-			if (history == findHistory)
-				searchPatternEntry.Completion.Model = store;
-			else if( history == replaceHistory)
-				replacePatternEntry.Completion.Model = store;
-		}
-		
-		// loads the history arrays from the property service
-		// NOTE: a newline character separates the search history strings
-		private void LoadHistoryValues()
-		{
-			object stringArray;
-			// set the history in properties
-			stringArray = propertyService.GetProperty("MonoDevelop.FindReplaceDialogs.FindHistory");
-		
-			if (stringArray != null) {
-				string[] items = stringArray.ToString ().Split (historySeparator);
-				ListStore store = new ListStore (typeof (string));
-
-				if(items != null) {
-					findHistory.AddRange (items);
-					foreach (string i in items) {
-						store.AppendValues (i);
-					}
-				}
-
-				searchPatternEntry.Completion.Model = store;
-			}
-			
-			// now do the replace history
-			stringArray = propertyService.GetProperty ("MonoDevelop.FindReplaceDialogs.ReplaceHistory");
-			
-			if (replaceMode) {
-				if (stringArray != null) {
-					string[] items = stringArray.ToString ().Split (historySeparator);
-					ListStore store = new ListStore (typeof (string));
-					
-					if(items != null) {
-						replaceHistory.AddRange (items);
-						foreach (string i in items) {
-							store.AppendValues (i);
-						}
-					}
-					
-					replacePatternEntry.Completion.Model = store;
-				}
-			}
-		}
-		
-		// saves the history arrays to the property service
-		// NOTE: a newline character separates the search history strings
-		private void SaveHistoryValues()
-		{
-			string[] stringArray;
-			// set the history in properties
-			stringArray = new string[findHistory.Count];
-			findHistory.CopyTo (stringArray, 0);			
-			propertyService.SetProperty ("MonoDevelop.FindReplaceDialogs.FindHistory", string.Join(historySeparator.ToString(), stringArray));
-			
-			// now do the replace history
-			if (replaceMode)	{
-				stringArray = new string[replaceHistory.Count];
-				replaceHistory.CopyTo (stringArray, 0);				
-				propertyService.SetProperty ("MonoDevelop.FindReplaceDialogs.ReplaceHistory", string.Join(historySeparator.ToString(), stringArray));
-			}
-		}
-		
-		#region code to pretend to be a dialog (cause we cant inherit Dialog and use glade)
-		public void Present()
-		{
-			ReplaceDialogPointer.Present();
-		}
-		
-		public void Destroy()
-		{
-			// save the search and replace history to properties
-			OnClosed ();
-			ReplaceDialogPointer.Destroy();
-		}
-		
-		public void ShowAll()
-		{
-			ReplaceDialogPointer.ShowAll();
-			searchPatternEntry.SelectRegion (0, searchPatternEntry.Text.Length);
-		}
-		#endregion
-		
-		public Gtk.Dialog DialogPointer
-		{
-			get {
-				return ReplaceDialogPointer;
-			}
-		}
-	}
-}

Deleted: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs	2005-06-24 08:05:02 UTC (rev 2605)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ReplaceInFilesDialog.cs	2005-06-27 21:13:18 UTC (rev 2606)
@@ -1,382 +0,0 @@
-// <file>
-//     <copyright see="prj:///doc/copyright.txt"/>
-//     <license see="prj:///doc/license.txt"/>
-//     <owner name="Mike Kr�ger" email="mike at icsharpcode.net"/>
-//     <version value="$version"/>
-// </file>
-
-using System;
-using System.IO;
-using System.Drawing;
-using System.ComponentModel;
-
-using MonoDevelop.Gui;
-using MonoDevelop.TextEditor.Document;
-using MonoDevelop.Core.Properties;
-using MonoDevelop.Core.Services;
-using MonoDevelop.Services;
-using MonoDevelop.TextEditor;
-using MonoDevelop.Gui.Widgets;
-
-using Glade;
-using Gtk;
-
-namespace MonoDevelop.Gui.Dialogs
-{
-	public class ReplaceInFilesDialog
-	{
-		IMessageService messageService  = (IMessageService)ServiceManager.GetService(typeof(IMessageService));
-		public bool replaceMode;
-
-		[Glade.Widget] Gtk.Entry searchPatternEntry;
-		[Glade.Widget] Gtk.Entry replacePatternEntry;
-		[Glade.Widget] Gtk.Button findHelpButton;
-		[Glade.Widget] Gtk.Button findButton;
-		[Glade.Widget] Gtk.Button markAllButton;
-		[Glade.Widget] Gtk.Button closeButton;
-		[Glade.Widget] Gtk.Button replaceButton;
-		[Glade.Widget] Gtk.Button replaceAllButton;
-		[Glade.Widget] Gtk.Button replaceHelpButton;
-		[Glade.Widget] Gtk.CheckButton ignoreCaseCheckBox;
-		[Glade.Widget] Gtk.CheckButton searchWholeWordOnlyCheckBox;
-		[Glade.Widget] Gtk.CheckButton useSpecialSearchStrategyCheckBox;
-		[Glade.Widget] Gtk.ComboBox specialSearchStrategyComboBox;
-		[Glade.Widget] Gtk.ComboBox searchLocationComboBox;
-		[Glade.Widget] Gtk.Label label1;
-		[Glade.Widget] Gtk.Label label2;
-		[Glade.Widget] Gtk.Label searchLocationLabel;
-		[Glade.Widget] Gtk.Dialog FindInFilesDialogWidget;
-		[Glade.Widget] Gtk.Dialog ReplaceInFilesDialogWidget;
-
-		[Glade.Widget] Gtk.CheckButton includeSubdirectoriesCheckBox;
-		[Glade.Widget] Gtk.Entry fileMaskTextBox;
-		[Glade.Widget] Gtk.Entry directoryTextBox;
-		[Glade.Widget] Gtk.Button browseButton;
-		[Glade.Widget] Gtk.Label label6;
-		[Glade.Widget] Gtk.Label label7;
-		[Glade.Widget] Gtk.Button stopButton;
-
-		
-		Gtk.Dialog ReplaceDialogPointer;
-		
-		void InitDialog ()
-		{
-			findButton.UseUnderline = true;			
-			closeButton.UseUnderline = true;
-			
-			//set up the size groups
-			SizeGroup labels = new SizeGroup(SizeGroupMode.Horizontal);
-			SizeGroup combos = new SizeGroup(SizeGroupMode.Horizontal);
-			SizeGroup options = new SizeGroup(SizeGroupMode.Horizontal);
-			SizeGroup helpButtons = new SizeGroup(SizeGroupMode.Horizontal);
-			SizeGroup checkButtons = new SizeGroup(SizeGroupMode.Horizontal);
-			labels.AddWidget(label1);
-			labels.AddWidget(label6);
-			labels.AddWidget(label7);
-			combos.AddWidget(searchPatternEntry);
-			combos.AddWidget(directoryTextBox);
-			combos.AddWidget(fileMaskTextBox);
-			helpButtons.AddWidget(findHelpButton);
-			helpButtons.AddWidget(browseButton);
-			checkButtons.AddWidget (includeSubdirectoriesCheckBox);
-			checkButtons.AddWidget(ignoreCaseCheckBox);
-			checkButtons.AddWidget(searchWholeWordOnlyCheckBox);
-			checkButtons.AddWidget(useSpecialSearchStrategyCheckBox);
-			checkButtons.AddWidget(searchLocationLabel);
-			options.AddWidget(specialSearchStrategyComboBox);
-			options.AddWidget(searchLocationComboBox);
-
-			searchPatternEntry.Completion = new EntryCompletion ();
-			searchPatternEntry.Completion.Model = new ListStore (typeof (string));
-			searchPatternEntry.Completion.TextColumn = 0;
-			
-			// set button sensitivity
-			findHelpButton.Sensitive = false;
-			
-			// set replace dialog properties 
-			if (replaceMode)
-			{
-				replacePatternEntry.Completion = new EntryCompletion ();
-				replacePatternEntry.Completion.Model = new ListStore (typeof (string));
-				replacePatternEntry.Completion.TextColumn = 0;
-
-				label2.Text = GettextCatalog.GetString ("Replace in Files");
-				
-				// set the size groups to include the replace dialog
-				labels.AddWidget(label2);
-				combos.AddWidget(replacePatternEntry);
-				helpButtons.AddWidget(replaceHelpButton);
-				
-				replaceHelpButton.Sensitive = false;
-				ReplaceDialogPointer = this.ReplaceInFilesDialogWidget;
-			}
-			else
-			{
-				ReplaceDialogPointer = this.FindInFilesDialogWidget;
-			}
-			ReplaceDialogPointer.TransientFor = (Gtk.Window)WorkbenchSingleton.Workbench;
-		}
-
-		protected void OnClosed()
-		{
-			//SaveHistoryValues();
-		}
-		
-		void OnDeleted (object o, DeleteEventArgs args)
-		{
-			// perform the standard closing windows event
-			OnClosed();
-			SearchReplaceInFilesManager.ReplaceDialog = null;
-		}
-
-		public void Present ()
-		{
-			ReplaceDialogPointer.Present ();
-		}
-
-		public void Destroy ()
-		{
-			ReplaceDialogPointer.Destroy ();
-		}
-
-		void CloseDialogEvent(object sender, EventArgs e)
-		{
-			ReplaceDialogPointer.Hide();
-			OnClosed ();
-		}
-
-		public void ShowAll ()
-		{
-			ReplaceDialogPointer.ShowAll ();
-			SearchReplaceInFilesManager.ReplaceDialog = this;
-			searchPatternEntry.SelectRegion (0, searchPatternEntry.Text.Length);
-		}
-
-		public ReplaceInFilesDialog (bool replaceMode)
-		{
-			this.replaceMode = replaceMode;
-			string dialogName = (replaceMode) ? "ReplaceInFilesDialogWidget" : "FindInFilesDialogWidget";
-			Glade.XML glade = new XML (null, "texteditoraddin.glade", dialogName, null);
-			glade.Autoconnect (this);
-			InitDialog ();
-
-			CellRendererText cr = new CellRendererText ();
-			Gtk.ListStore store = new ListStore (typeof (string));
-			store.AppendValues (GettextCatalog.GetString ("Wildcards"));
-			store.AppendValues (GettextCatalog.GetString ("Regular Expressions"));
-			specialSearchStrategyComboBox.Model = store;
-			specialSearchStrategyComboBox.PackStart (cr, true);
-			specialSearchStrategyComboBox.AddAttribute (cr, "text", 0);
-			
-			int index = 0;
-			switch (SearchReplaceManager.SearchOptions.SearchStrategyType) {
-				case SearchStrategyType.Normal:
-				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"));
-			store.AppendValues (GettextCatalog.GetString ("All open files"));
-			store.AppendValues (GettextCatalog.GetString ("Whole project"));
-			searchLocationComboBox.Model = store;
-			searchLocationComboBox.PackStart (cr, true);
-			searchLocationComboBox.AddAttribute (cr, "text", 0);
-						
-			index = 0;
-			switch (SearchReplaceInFilesManager.SearchOptions.DocumentIteratorType) {
-				case DocumentIteratorType.AllOpenFiles:
-					index = 1;
-					break;
-				case DocumentIteratorType.WholeCombine:
-					index = 2;
-					break;
-			}
-			
-			searchLocationComboBox.Active = index;
-			searchLocationComboBox.Changed += new EventHandler(SearchLocationCheckBoxChangedEvent);
-			useSpecialSearchStrategyCheckBox.Toggled += new EventHandler(SpecialSearchStrategyCheckBoxChangedEvent);
-			
-			directoryTextBox.Text = SearchReplaceInFilesManager.SearchOptions.SearchDirectory;
-			fileMaskTextBox.Text = SearchReplaceInFilesManager.SearchOptions.FileMask;
-			includeSubdirectoriesCheckBox.Active = SearchReplaceInFilesManager.SearchOptions.SearchSubdirectories;
-			
-			browseButton.Clicked += new EventHandler(BrowseDirectoryEvent);
-			findButton.Clicked += new EventHandler(FindEvent);
-
-			stopButton.Clicked += new EventHandler(StopEvent);
-			
-			searchPatternEntry.Text = SearchReplaceInFilesManager.SearchOptions.SearchPattern;
-			
-			if (replaceMode) {
-				replaceAllButton.Clicked += new EventHandler(ReplaceEvent);
-				replacePatternEntry.Text = SearchReplaceInFilesManager.SearchOptions.ReplacePattern;
-			}
-			
-			ReplaceDialogPointer.Close += new EventHandler (CloseDialogEvent);
-			closeButton.Clicked += new EventHandler (CloseDialogEvent);
-			ReplaceDialogPointer.DeleteEvent += new DeleteEventHandler (OnDeleted);
-			
-			SearchLocationCheckBoxChangedEvent (null, null);
-			SpecialSearchStrategyCheckBoxChangedEvent (null, null);
-		}
-		
-		void FindEvent (object sender, EventArgs e)
-		{
-			if (SetupSearchReplaceInFilesManager ())
-				SearchReplaceInFilesManager.FindAll ();
-		}
-
-		void StopEvent (object sender, EventArgs e)
-		{
-			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)
-		{
-			if (SetupSearchReplaceInFilesManager ())
-				SearchReplaceInFilesManager.ReplaceAll ();
-		}
-		
-		void BrowseDirectoryEvent (object sender, EventArgs e)
-		{
-			PropertyService PropertyService = (PropertyService)ServiceManager.GetService (typeof (PropertyService));			
-			FolderDialog fd = new FolderDialog (GettextCatalog.GetString ("Select directory"));
-
-			// set up the dialog to point to currently selected folder, or the default projects folder
-			string defaultFolder = this.directoryTextBox.Text;	
-			if (defaultFolder == string.Empty || defaultFolder == null) {
-				// only use the bew project default path if there is no path set
-				defaultFolder =	PropertyService.GetProperty (
-						"MonoDevelop.Gui.Dialogs.NewProjectDialog.DefaultPath", 
-						System.IO.Path.Combine (
-							System.Environment.GetEnvironmentVariable ("HOME"),
-							"Projects")).ToString ();
-			}
-			fd.SetFilename( defaultFolder );
-			if (fd.Run() == (int)Gtk.ResponseType.Ok)
-			{
-				directoryTextBox.Text = fd.Filename;
-			}
-			fd.Hide ();
-		}
-		
-		void SearchLocationCheckBoxChangedEvent(object sender, EventArgs e)
-		{
-			bool enableDirectorySearch = searchLocationComboBox.Active == 0;
-			fileMaskTextBox.Sensitive = enableDirectorySearch;
-			directoryTextBox.Sensitive = enableDirectorySearch;
-			browseButton.Sensitive = enableDirectorySearch;
-			includeSubdirectoriesCheckBox.Sensitive = enableDirectorySearch;
-		}
-		
-		void SpecialSearchStrategyCheckBoxChangedEvent (object sender, EventArgs e)
-		{
-			specialSearchStrategyComboBox.Sensitive = useSpecialSearchStrategyCheckBox.Active;
-			if (useSpecialSearchStrategyCheckBox.Active) {
-				if (specialSearchStrategyComboBox.Active == 1) {
-					searchWholeWordOnlyCheckBox.Sensitive = false;
-				}
-			} else {
-				searchWholeWordOnlyCheckBox.Sensitive = true;
-			}
-		}
-		
-		public void SetSearchPattern(string pattern)
-		{
-			searchPatternEntry.Text  = pattern;
-		}
-
-		bool SetupSearchReplaceInFilesManager()
-		{
-			FileUtilityService fileUtilityService = (FileUtilityService)ServiceManager.GetService(typeof(FileUtilityService));
-			
-			string directoryName = directoryTextBox.Text;
-			string fileMask      = fileMaskTextBox.Text;
-			if (fileMask == null || fileMask.Length == 0) {
-				fileMask = "*";
-			}
-			
-			if (SearchReplaceInFilesManager.SearchOptions.DocumentIteratorType == DocumentIteratorType.Directory) {
-				
-				if (!fileUtilityService.IsValidFileName(directoryName)) {
-					messageService.ShowErrorFormatted(GettextCatalog.GetString ("Invalid directory name: {0}"), directoryName);
-					return false;
-				}
-				
-				if (!Directory.Exists(directoryName)) {
-					messageService.ShowErrorFormatted (GettextCatalog.GetString ("Invalid directory name: {0}"), directoryName);
-					return false;
-				}
-				
-				if (!fileUtilityService.IsValidFileName(fileMask) || fileMask.IndexOf('\\') >= 0) {
-					messageService.ShowErrorFormatted(GettextCatalog.GetString ("Invalid file mask: {0}"), fileMask);
-					return false;
-				}
-			}
-			if (fileMask == null || fileMask.Length == 0) {
-				SearchReplaceInFilesManager.SearchOptions.FileMask = "*";
-			} else {
-				SearchReplaceInFilesManager.SearchOptions.FileMask        = fileMask;
-			}
-			SearchReplaceInFilesManager.SearchOptions.SearchDirectory = directoryName;
-			SearchReplaceInFilesManager.SearchOptions.SearchSubdirectories = includeSubdirectoriesCheckBox.Active;
-			
-			SearchReplaceInFilesManager.SearchOptions.SearchPattern  = searchPatternEntry.Text;
-			if (replaceMode)
-				SearchReplaceInFilesManager.SearchOptions.ReplacePattern = replacePatternEntry.Text;
-			
-			SearchReplaceInFilesManager.SearchOptions.IgnoreCase          = !ignoreCaseCheckBox.Active;
-			SearchReplaceInFilesManager.SearchOptions.SearchWholeWordOnly = searchWholeWordOnlyCheckBox.Active;
-			
-			if (useSpecialSearchStrategyCheckBox.Active) {
-				switch (specialSearchStrategyComboBox.Active) {
-					case 0:
-						SearchReplaceInFilesManager.SearchOptions.SearchStrategyType = SearchStrategyType.Wildcard;
-						break;
-					case 1:
-						SearchReplaceInFilesManager.SearchOptions.SearchStrategyType = SearchStrategyType.RegEx;
-						break;
-				}
-			} else {
-				SearchReplaceInFilesManager.SearchOptions.SearchStrategyType = SearchStrategyType.Normal;
-			}
-			
-			switch (searchLocationComboBox.Active) {
-				case 0:
-					SearchReplaceInFilesManager.SearchOptions.DocumentIteratorType = DocumentIteratorType.Directory;
-					break;
-				case 1:
-					SearchReplaceInFilesManager.SearchOptions.DocumentIteratorType = DocumentIteratorType.AllOpenFiles;
-					break;
-				case 2:
-					SearchReplaceInFilesManager.SearchOptions.DocumentIteratorType = DocumentIteratorType.WholeCombine;
-					break;
-			}
-			return true;
-		}
-		
-		public Gtk.Dialog DialogPointer {
-			get {
-				return ReplaceDialogPointer;
-			}
-		}
-	}
-}

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2005-06-24 08:05:02 UTC (rev 2605)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2005-06-27 21:13:18 UTC (rev 2606)
@@ -12,7 +12,10 @@
 using MonoDevelop.EditorBindings.Properties;
 using MonoDevelop.EditorBindings.FormattingStrategy;
 using MonoDevelop.Services;
+using MonoDevelop.Gui.Search;
 
+using MonoDevelop.TextEditor.Document;
+
 using Gtk;
 using GtkSourceView;
 
@@ -93,7 +96,8 @@
 	}
 	
 	public class SourceEditorDisplayBindingWrapper : AbstractViewContent,
-		IEditable, IPositionable, IBookmarkOperations, IDebuggableEditor, ICodeStyleOperations
+		IEditable, IPositionable, IBookmarkBuffer, IDebuggableEditor, ICodeStyleOperations,
+		IDocumentInformation
 	{
 		VBox mainBox;
 		HBox editorBar;
@@ -416,6 +420,8 @@
 					bouncingDelegate = new GLib.IdleHandler (BounceAndGrab);
 				if (needsUpdate) {
 					GLib.Idle.Add (bouncingDelegate);
+					if (cachedText == null)
+						return se.Buffer.Text;
 				}
 				return cachedText;
 			}
@@ -441,6 +447,19 @@
 		{
 			se.Buffer.Redo ();
 		}
+		
+		public string SelectedText {
+			get {
+				return se.Buffer.GetSelectedText ();
+			}
+			set {
+				int offset = se.Buffer.GetLowerSelectionBounds ();
+				((IClipboardHandler)se.Buffer).Delete (null, null);
+				se.Buffer.Insert (offset, value);
+				se.Buffer.PlaceCursor (se.Buffer.GetIterAtOffset (offset + value.Length));
+				se.View.ScrollMarkOnscreen (se.Buffer.InsertMark);
+			}
+		}
 #endregion
 
 #region Status Bar Handling
@@ -524,28 +543,84 @@
 			se.View.UnIndentSelection ();
 		}
 #endregion 
-#region IBookmarkOperations
-		void IBookmarkOperations.ToggleBookmark ()
+
+		public object CursorPosition {
+			get { return se.Buffer.GetIterAtMark (se.Buffer.InsertMark); }
+			set { se.Buffer.MoveMark (se.Buffer.InsertMark, (TextIter) value); }
+		}
+
+		public object GetPositionFromOffset (int offset)
 		{
-			se.ToggleBookmark ();
+			return se.Buffer.GetIterAtOffset (offset);
 		}
 		
-		void IBookmarkOperations.PrevBookmark ()
+		public int GetOffsetFromPosition (object position)
 		{
+			return ((TextIter)position).Offset;
+		}
+		
+		public void Select (object startPosition, object endPosition)
+		{
+			se.Buffer.MoveMark (se.Buffer.InsertMark, (TextIter) startPosition);
+			se.Buffer.MoveMark (se.Buffer.SelectionBound, (TextIter) endPosition);
+		}
+		
+		public void ShowPosition (object position)
+		{
+			se.View.ScrollToIter ((TextIter)position, 0.3, false, 0, 0);
+		}
+
+		public void SetBookmarked (object position, bool mark)
+		{
+			int line = ((TextIter)position).Line;
+			if (se.Buffer.IsBookmarked (line) != mark)
+				se.Buffer.ToggleBookmark (line);
+		}
+		
+		public bool IsBookmarked (object position)
+		{
+			int line = ((TextIter)position).Line;
+			return se.Buffer.IsBookmarked (line);
+		}
+		
+		public void PrevBookmark ()
+		{
 			se.PrevBookmark ();
 		}
 		
-		void IBookmarkOperations.NextBookmark ()
+		public void NextBookmark ()
 		{
 			se.NextBookmark ();
 		}
 		
-		void IBookmarkOperations.ClearBookmarks ()
+		public void ClearBookmarks ()
 		{
 			se.ClearBookmarks ();
 		}
+
+#region IDocumentInformation
+		string IDocumentInformation.FileName {
+			get { return ContentName; }
+		}
+		
+		public ITextIterator GetTextIterator ()
+		{
+			int startOffset = Editor.Buffer.GetIterAtMark (Editor.Buffer.InsertMark).Offset;
+			return new ForwardTextIterator (this, se.View, startOffset);
+		}
+		
+		public string GetLineTextAtOffset (int offset)
+		{
+			TextIter resultIter = se.Buffer.GetIterAtOffset (offset);
+			TextIter start_line = resultIter, end_line = resultIter;
+			start_line.LineOffset = 0;
+			end_line.ForwardToLineEnd ();
+			return se.Buffer.GetText (start_line.Offset, end_line.Offset - start_line.Offset);
+		}
+		
 #endregion
 
+
 		void SetInitialValues ()
 		{
 			se.View.ModifyFont (TextEditorProperties.Font);

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2005-06-24 08:05:02 UTC (rev 2605)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorWidget.cs	2005-06-27 21:13:18 UTC (rev 2606)
@@ -5,10 +5,12 @@
 
 using MonoDevelop.TextEditor.Document;
 using MonoDevelop.Commands;
+using MonoDevelop.Gui;
 using MonoDevelop.Gui.Dialogs;
 using GtkSourceView;
 using MonoDevelop.DefaultEditor;
 using MonoDevelop.Services;
+using MonoDevelop.Gui.Search;
 
 namespace MonoDevelop.SourceEditor.Gui
 {

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2005-06-24 08:05:02 UTC (rev 2605)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Makefile.am	2005-06-27 21:13:18 UTC (rev 2606)
@@ -26,14 +26,11 @@
 Gui/OptionPanels/SyntaxHighlightingPanel.cs \
 Gui/Dialogs/EditTemplateGroupDialog.cs \
 Gui/Dialogs/GotoLineNumberDialog.cs \
-Gui/Dialogs/ReplaceDialog.cs \
-Gui/Dialogs/ReplaceInFilesDialog.cs \
 InsightWindow/IndexerInsightDataProvider.cs \
 InsightWindow/MethodInsightDataProvider.cs \
 InsightWindow/InsightWindow.cs \
 InsightWindow/IInsightDataProvider.cs \
 Commands/EditorCommands.cs \
-Commands/SearchCommands.cs \
 Commands/IEditAction.cs \
 Properties/TextEditorProperties.cs \
 FormattingStrategy/DefaultFormattingStrategy.cs \
@@ -41,33 +38,6 @@
 FormattingStrategy/IFormattingStrategy.cs \
 FormattingStrategy/IFormattableDocument.cs \
 Codons/EditActionCodon.cs \
-Search/DocumentIterator/IDocumentInformation.cs \
-Search/DocumentIterator/EditorDocumentInformation.cs \
-Search/DocumentIterator/FileDocumentInformation.cs \
-Search/DocumentIterator/DirectoryDocumentIterator.cs \
-Search/DocumentIterator/AllOpenDocumentIterator.cs \
-Search/DocumentIterator/IDocumentIterator.cs \
-Search/DocumentIterator/ReverseDocumentIterator.cs \
-Search/DocumentIterator/WholeProjectDocumentIterator.cs \
-Search/DocumentIterator/CurrentDocumentIterator.cs \
-Search/SearchStrategy/KMPSearchStrategy.cs \
-Search/SearchStrategy/ISearchStrategy.cs \
-Search/SearchStrategy/BruteForceSearchStrategy.cs \
-Search/SearchStrategy/RegExSearchStrategy.cs \
-Search/SearchStrategy/WildcardSearchStrategy.cs \
-Search/SearchReplaceManager.cs \
-Search/DefaultFind.cs \
-Search/SearchResult/DefaultSearchResult.cs \
-Search/SearchResult/ISearchResult.cs \
-Search/SearchOptions.cs \
-Search/SearchReplaceInFilesManager.cs \
-Search/SearchReplaceUtilities.cs \
-Search/IFind.cs \
-Search/TextIterator/ITextIterator.cs \
-Search/TextIterator/ForwardTextFileIterator.cs \
-Search/TextIterator/ForwardTextIterator.cs \
-Search/TextIterator/ExtendedStreamReader.cs \
-Search/ITextBufferStrategy.cs \
 Services/SourceViewService.cs
 
 REFS = /r:System.Drawing.dll \

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelopEditor.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelopEditor.addin.xml	2005-06-24 08:05:02 UTC (rev 2605)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/MonoDevelopEditor.addin.xml	2005-06-27 21:13:18 UTC (rev 2606)
@@ -87,43 +87,6 @@
 				_label = "Goto Matching _Brace" 
 				description = "Goto Matching Brace" 
 				shortcut = "Control|B" />
-
-		<!-- SearchCommands -->
-		
-		<Command id = "MonoDevelop.Commands.SearchCommands.Find"
-				_label = "_Find..." 
-				icon = "Icons.16x16.FindIcon" 
-				description = "Find" 
-				shortcut = "Control|F" />
-		<Command id = "MonoDevelop.Commands.SearchCommands.FindNext"
-				_label = "Find _Next" 
-				icon = "Icons.16x16.FindNextIcon" 
-				description = "Find next" 
-				shortcut = "F3" />
-		<Command id = "MonoDevelop.Commands.SearchCommands.FindSelection"
-				_label = "Find Selection" 
-				description = "Find selection" 
-				shortcut = "Control|F3" />
-		<Command id = "MonoDevelop.Commands.SearchCommands.FindPrevious"
-				_label = "Find _Previous" 
-				icon = "Icons.16x16.FindPrevIcon" 
-				description = "Find previous" 
-				shortcut = "Shift|F3" />
-		<Command id = "MonoDevelop.Commands.SearchCommands.Replace"
-				_label = "_Replace..." 
-				icon = "Icons.16x16.ReplaceIcon" 
-				description = "Replace" 
-				shortcut = "Control|H" />
-		<Command id = "MonoDevelop.Commands.SearchCommands.FindInFiles"
-				defaultHandler = "MonoDevelop.Commands.FindInFilesHandler"
-				_label = "F_ind In Files..." 
-				icon = "Icons.16x16.FindInFiles" 
-				description = "Find in files" />
-		<Command id = "MonoDevelop.Commands.SearchCommands.ReplaceInFiles"
-				defaultHandler = "MonoDevelop.Commands.ReplaceInFilesHandler"
-				_label = "R_eplace In Files..." 
-				icon = "Icons.16x16.ReplaceInFiles" 
-				description = "Replace in files" />
 	</Extension>
 
 	<Extension path = "/SharpDevelop/ViewContent/DefaultTextEditor/ContextMenu">

Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/texteditoraddin.glade
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/texteditoraddin.glade	2005-06-24 08:05:02 UTC (rev 2605)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/texteditoraddin.glade	2005-06-27 21:13:18 UTC (rev 2606)
@@ -192,1918 +192,4 @@
   </child>
 </widget>
 
-<widget class="GtkDialog" id="ReplaceDialogWidget">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Replace Dialog</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">True</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area2">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="closeButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="replaceAllButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment4">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox12">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image4">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-find-and-replace</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label5">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">R_eplace All</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <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="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="replaceButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment3">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox11">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image3">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-find-and-replace</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label4">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Replace</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <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="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="findButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-find</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox15">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox13">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label1">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Find:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="searchPatternEntry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="findHelpButton">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">&gt;</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox14">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label2">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Replace:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="replacePatternEntry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="replaceHelpButton">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">&gt;</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="ignoreCaseCheckBox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Case sensitive</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="searchWholeWordOnlyCheckBox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Whole words only</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox16">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkCheckButton" id="useSpecialSearchStrategyCheckBox">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Use special search strategy:</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkComboBox" id="specialSearchStrategyComboBox">
-		  <property name="visible">True</property>
-		  <property name="add_tearoffs">False</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox17">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="searchLocationLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Search in:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkComboBox" id="searchLocationComboBox">
-		  <property name="visible">True</property>
-		  <property name="add_tearoffs">False</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="FindInFilesDialogWidget">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Find Dialog</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">True</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area2">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="stopButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-stop</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="closeButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="findButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-find</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox15">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox13">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label1">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Find:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="searchPatternEntry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="findHelpButton">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">&gt;</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox18">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label6">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Filemask:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="fileMaskTextBox">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox19">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label7">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Directory:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="directoryTextBox">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="browseButton">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">...</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="includeSubdirectoriesCheckBox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Recurse subdirectories</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="ignoreCaseCheckBox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Case sensitive</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="searchWholeWordOnlyCheckBox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Whole word only</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox16">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkCheckButton" id="useSpecialSearchStrategyCheckBox">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Use special search strategy:</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkComboBox" id="specialSearchStrategyComboBox">
-		  <property name="visible">True</property>
-		  <property name="add_tearoffs">False</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox17">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="searchLocationLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Search in:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkComboBox" id="searchLocationComboBox">
-		  <property name="visible">True</property>
-		  <property name="add_tearoffs">False</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="ReplaceInFilesDialogWidget">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Replace Dialog</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">True</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area2">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="stopButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-stop</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="closeButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="replaceAllButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment4">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox12">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image4">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-find-and-replace</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label5">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">R_eplace All</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <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="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="findButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-find</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox15">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox13">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label1">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Find:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="searchPatternEntry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="findHelpButton">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">&gt;</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox14">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label2">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Replace:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="replacePatternEntry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="replaceHelpButton">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">&gt;</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox18">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label6">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Filemask:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="fileMaskTextBox">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox19">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label7">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Directory:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="directoryTextBox">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="browseButton">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">...</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="includeSubdirectoriesCheckBox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Recurse subdirectories</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="ignoreCaseCheckBox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Case sensitive</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="searchWholeWordOnlyCheckBox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Whole word only</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox16">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkCheckButton" id="useSpecialSearchStrategyCheckBox">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Use special search strategy:</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkComboBox" id="specialSearchStrategyComboBox">
-		  <property name="visible">True</property>
-		  <property name="add_tearoffs">False</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox17">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="searchLocationLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Search in:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkComboBox" id="searchLocationComboBox">
-		  <property name="visible">True</property>
-		  <property name="add_tearoffs">False</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="FindDialogWidget">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Find Dialog</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">True</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area2">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="closeButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="markAllButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-
-	      <child>
-		<widget class="GtkAlignment" id="alignment2">
-		  <property name="visible">True</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xscale">0</property>
-		  <property name="yscale">0</property>
-		  <property name="top_padding">0</property>
-		  <property name="bottom_padding">0</property>
-		  <property name="left_padding">0</property>
-		  <property name="right_padding">0</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox10">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">2</property>
-
-		      <child>
-			<widget class="GtkImage" id="image2">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-find</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label3">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Mark All</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <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="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="findButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="has_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-find</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">0</property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="vbox15">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">6</property>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox13">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label1">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Find:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="searchPatternEntry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">*</property>
-		  <property name="activates_default">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="findHelpButton">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">&gt;</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="ignoreCaseCheckBox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Case sensitive</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkCheckButton" id="searchWholeWordOnlyCheckBox">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Whole word only</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">False</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox16">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkCheckButton" id="useSpecialSearchStrategyCheckBox">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Use special search strategy:</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkComboBox" id="specialSearchStrategyComboBox">
-		  <property name="visible">True</property>
-		  <property name="add_tearoffs">False</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkHBox" id="hbox17">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">6</property>
-
-	      <child>
-		<widget class="GtkLabel" id="searchLocationLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Search in:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkComboBox" id="searchLocationComboBox">
-		  <property name="visible">True</property>
-		  <property name="add_tearoffs">False</property>
-		  <property name="focus_on_click">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
 </glade-interface>




More information about the Monodevelop-patches-list mailing list