* gtk-gui/gui.stetic:

* gtk-gui/generated.cs:
* MonoDevelop.Ide.FindInFiles/Scope.cs:
* MonoDevelop.Ide.FindInFiles/FindInFilesDialog.cs:
* gtk-gui/MonoDevelop.Ide.FindInFiles.FindInFilesDialog.cs:
* gtk-gui/MonoDevelop.Ide.FindInFiles.SearchResultWidget.cs:
  Implemented 'Bug 552017 - Saner and new default options for Find in
  Files -> Directories dialog'.

svn path=/trunk/monodevelop/; revision=149815

4 files changed, 532 insertions, 545 deletions

diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.FindInFiles.FindInFilesDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.FindInFiles.FindInFilesDialog.cs
index a50ea4edbc..869eea6eb2 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.FindInFiles.FindInFilesDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.FindInFiles.FindInFilesDialog.cs
@@ -1,291 +1,286 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
 
-namespace MonoDevelop.Ide.FindInFiles {
-    
-    
-    public partial class FindInFilesDialog {
-        
-        private Gtk.VBox vbox2;
-        
-        private Gtk.HBox hbox1;
-        
-        private Gtk.Table tableFindAndReplace;
-        
-        private Gtk.ComboBoxEntry comboboxentryFileMask;
-        
-        private Gtk.ComboBoxEntry comboboxentryFind;
-        
-        private Gtk.HBox hbox2;
-        
-        private Gtk.ComboBox comboboxScope;
-        
-        private Gtk.Label labelFileMask;
-        
-        private Gtk.Label labelFind;
-        
-        private Gtk.Label labelScope;
-        
-        private Gtk.Table table1;
-        
-        private Gtk.CheckButton checkbuttonCaseSensitive;
-        
-        private Gtk.CheckButton checkbuttonRegexSearch;
-        
-        private Gtk.CheckButton checkbuttonWholeWordsOnly;
-        
-        private Gtk.Button buttonStop;
-        
-        private Gtk.Button buttonClose;
-        
-        private Gtk.Button buttonReplace;
-        
-        private Gtk.Button buttonSearch;
-        
-        protected virtual void Build() {
-            Stetic.Gui.Initialize(this);
-            // Widget MonoDevelop.Ide.FindInFiles.FindInFilesDialog
-            this.Name = "MonoDevelop.Ide.FindInFiles.FindInFilesDialog";
-            this.TypeHint = ((Gdk.WindowTypeHint)(1));
-            this.WindowPosition = ((Gtk.WindowPosition)(4));
-            this.BorderWidth = ((uint)(6));
-            this.DestroyWithParent = true;
-            this.SkipPagerHint = true;
-            this.SkipTaskbarHint = true;
-            // Internal child MonoDevelop.Ide.FindInFiles.FindInFilesDialog.VBox
-            Gtk.VBox w1 = this.VBox;
-            w1.Name = "dialog1_VBox";
-            w1.Spacing = 6;
-            w1.BorderWidth = ((uint)(2));
-            // Container child dialog1_VBox.Gtk.Box+BoxChild
-            this.vbox2 = new Gtk.VBox();
-            this.vbox2.Name = "vbox2";
-            this.vbox2.Spacing = 6;
-            this.vbox2.BorderWidth = ((uint)(6));
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.hbox1 = new Gtk.HBox();
-            this.hbox1.Name = "hbox1";
-            this.hbox1.Spacing = 6;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.tableFindAndReplace = new Gtk.Table(((uint)(3)), ((uint)(2)), false);
-            this.tableFindAndReplace.Name = "tableFindAndReplace";
-            this.tableFindAndReplace.RowSpacing = ((uint)(6));
-            this.tableFindAndReplace.ColumnSpacing = ((uint)(6));
-            // Container child tableFindAndReplace.Gtk.Table+TableChild
-            this.comboboxentryFileMask = Gtk.ComboBoxEntry.NewText();
-            this.comboboxentryFileMask.Name = "comboboxentryFileMask";
-            this.tableFindAndReplace.Add(this.comboboxentryFileMask);
-            Gtk.Table.TableChild w2 = ((Gtk.Table.TableChild)(this.tableFindAndReplace[this.comboboxentryFileMask]));
-            w2.TopAttach = ((uint)(2));
-            w2.BottomAttach = ((uint)(3));
-            w2.LeftAttach = ((uint)(1));
-            w2.RightAttach = ((uint)(2));
-            w2.XOptions = ((Gtk.AttachOptions)(4));
-            w2.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child tableFindAndReplace.Gtk.Table+TableChild
-            this.comboboxentryFind = Gtk.ComboBoxEntry.NewText();
-            this.comboboxentryFind.Name = "comboboxentryFind";
-            this.tableFindAndReplace.Add(this.comboboxentryFind);
-            Gtk.Table.TableChild w3 = ((Gtk.Table.TableChild)(this.tableFindAndReplace[this.comboboxentryFind]));
-            w3.LeftAttach = ((uint)(1));
-            w3.RightAttach = ((uint)(2));
-            w3.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child tableFindAndReplace.Gtk.Table+TableChild
-            this.hbox2 = new Gtk.HBox();
-            this.hbox2.Name = "hbox2";
-            this.hbox2.Spacing = 6;
-            // Container child hbox2.Gtk.Box+BoxChild
-            this.comboboxScope = Gtk.ComboBox.NewText();
-            this.comboboxScope.Name = "comboboxScope";
-            this.hbox2.Add(this.comboboxScope);
-            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.hbox2[this.comboboxScope]));
-            w4.Position = 0;
-            w4.Expand = false;
-            w4.Fill = false;
-            this.tableFindAndReplace.Add(this.hbox2);
-            Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.tableFindAndReplace[this.hbox2]));
-            w5.TopAttach = ((uint)(1));
-            w5.BottomAttach = ((uint)(2));
-            w5.LeftAttach = ((uint)(1));
-            w5.RightAttach = ((uint)(2));
-            w5.XOptions = ((Gtk.AttachOptions)(4));
-            w5.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child tableFindAndReplace.Gtk.Table+TableChild
-            this.labelFileMask = new Gtk.Label();
-            this.labelFileMask.Name = "labelFileMask";
-            this.labelFileMask.Xalign = 0F;
-            this.labelFileMask.LabelProp = Mono.Unix.Catalog.GetString("_File Mask:");
-            this.labelFileMask.UseUnderline = true;
-            this.tableFindAndReplace.Add(this.labelFileMask);
-            Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.tableFindAndReplace[this.labelFileMask]));
-            w6.TopAttach = ((uint)(2));
-            w6.BottomAttach = ((uint)(3));
-            w6.XOptions = ((Gtk.AttachOptions)(4));
-            w6.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child tableFindAndReplace.Gtk.Table+TableChild
-            this.labelFind = new Gtk.Label();
-            this.labelFind.Name = "labelFind";
-            this.labelFind.Xalign = 0F;
-            this.labelFind.LabelProp = Mono.Unix.Catalog.GetString("_Find:");
-            this.labelFind.UseUnderline = true;
-            this.tableFindAndReplace.Add(this.labelFind);
-            Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.tableFindAndReplace[this.labelFind]));
-            w7.XOptions = ((Gtk.AttachOptions)(4));
-            w7.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child tableFindAndReplace.Gtk.Table+TableChild
-            this.labelScope = new Gtk.Label();
-            this.labelScope.Name = "labelScope";
-            this.labelScope.Xalign = 0F;
-            this.labelScope.LabelProp = Mono.Unix.Catalog.GetString("_Scope:");
-            this.labelScope.UseUnderline = true;
-            this.tableFindAndReplace.Add(this.labelScope);
-            Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.tableFindAndReplace[this.labelScope]));
-            w8.TopAttach = ((uint)(1));
-            w8.BottomAttach = ((uint)(2));
-            w8.XOptions = ((Gtk.AttachOptions)(4));
-            w8.YOptions = ((Gtk.AttachOptions)(4));
-            this.hbox1.Add(this.tableFindAndReplace);
-            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.hbox1[this.tableFindAndReplace]));
-            w9.Position = 0;
-            this.vbox2.Add(this.hbox1);
-            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
-            w10.Position = 0;
-            w10.Expand = false;
-            w10.Fill = false;
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.table1 = new Gtk.Table(((uint)(3)), ((uint)(2)), false);
-            this.table1.Name = "table1";
-            this.table1.RowSpacing = ((uint)(6));
-            this.table1.ColumnSpacing = ((uint)(6));
-            // Container child table1.Gtk.Table+TableChild
-            this.checkbuttonCaseSensitive = new Gtk.CheckButton();
-            this.checkbuttonCaseSensitive.CanFocus = true;
-            this.checkbuttonCaseSensitive.Name = "checkbuttonCaseSensitive";
-            this.checkbuttonCaseSensitive.Label = Mono.Unix.Catalog.GetString("_Case sensitive");
-            this.checkbuttonCaseSensitive.DrawIndicator = true;
-            this.checkbuttonCaseSensitive.UseUnderline = true;
-            this.table1.Add(this.checkbuttonCaseSensitive);
-            Gtk.Table.TableChild w11 = ((Gtk.Table.TableChild)(this.table1[this.checkbuttonCaseSensitive]));
-            w11.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.checkbuttonRegexSearch = new Gtk.CheckButton();
-            this.checkbuttonRegexSearch.CanFocus = true;
-            this.checkbuttonRegexSearch.Name = "checkbuttonRegexSearch";
-            this.checkbuttonRegexSearch.Label = Mono.Unix.Catalog.GetString("Rege_x search");
-            this.checkbuttonRegexSearch.DrawIndicator = true;
-            this.checkbuttonRegexSearch.UseUnderline = true;
-            this.table1.Add(this.checkbuttonRegexSearch);
-            Gtk.Table.TableChild w12 = ((Gtk.Table.TableChild)(this.table1[this.checkbuttonRegexSearch]));
-            w12.TopAttach = ((uint)(2));
-            w12.BottomAttach = ((uint)(3));
-            w12.YOptions = ((Gtk.AttachOptions)(4));
-            // Container child table1.Gtk.Table+TableChild
-            this.checkbuttonWholeWordsOnly = new Gtk.CheckButton();
-            this.checkbuttonWholeWordsOnly.CanFocus = true;
-            this.checkbuttonWholeWordsOnly.Name = "checkbuttonWholeWordsOnly";
-            this.checkbuttonWholeWordsOnly.Label = Mono.Unix.Catalog.GetString("_Whole words only");
-            this.checkbuttonWholeWordsOnly.DrawIndicator = true;
-            this.checkbuttonWholeWordsOnly.UseUnderline = true;
-            this.table1.Add(this.checkbuttonWholeWordsOnly);
-            Gtk.Table.TableChild w13 = ((Gtk.Table.TableChild)(this.table1[this.checkbuttonWholeWordsOnly]));
-            w13.TopAttach = ((uint)(1));
-            w13.BottomAttach = ((uint)(2));
-            w13.YOptions = ((Gtk.AttachOptions)(4));
-            this.vbox2.Add(this.table1);
-            Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.vbox2[this.table1]));
-            w14.Position = 1;
-            w14.Expand = false;
-            w14.Fill = false;
-            w1.Add(this.vbox2);
-            Gtk.Box.BoxChild w15 = ((Gtk.Box.BoxChild)(w1[this.vbox2]));
-            w15.Position = 0;
-            w15.Expand = false;
-            w15.Fill = false;
-            // Internal child MonoDevelop.Ide.FindInFiles.FindInFilesDialog.ActionArea
-            Gtk.HButtonBox w16 = this.ActionArea;
-            w16.Name = "dialog1_ActionArea";
-            w16.Spacing = 6;
-            w16.BorderWidth = ((uint)(5));
-            w16.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
-            // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.buttonStop = new Gtk.Button();
-            this.buttonStop.CanFocus = true;
-            this.buttonStop.Name = "buttonStop";
-            this.buttonStop.UseStock = true;
-            this.buttonStop.UseUnderline = true;
-            this.buttonStop.Label = "gtk-stop";
-            this.AddActionWidget(this.buttonStop, 0);
-            Gtk.ButtonBox.ButtonBoxChild w17 = ((Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonStop]));
-            w17.Expand = false;
-            w17.Fill = false;
-            // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.buttonClose = new Gtk.Button();
-            this.buttonClose.CanDefault = true;
-            this.buttonClose.CanFocus = true;
-            this.buttonClose.Name = "buttonClose";
-            this.buttonClose.UseStock = true;
-            this.buttonClose.UseUnderline = true;
-            this.buttonClose.Label = "gtk-close";
-            this.AddActionWidget(this.buttonClose, -7);
-            Gtk.ButtonBox.ButtonBoxChild w18 = ((Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonClose]));
-            w18.Position = 1;
-            w18.Expand = false;
-            w18.Fill = false;
-            // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.buttonReplace = new Gtk.Button();
-            this.buttonReplace.CanFocus = true;
-            this.buttonReplace.Name = "buttonReplace";
-            this.buttonReplace.UseUnderline = true;
-            // Container child buttonReplace.Gtk.Container+ContainerChild
-            Gtk.Alignment w19 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w20 = new Gtk.HBox();
-            w20.Spacing = 2;
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w21 = new Gtk.Image();
-            w21.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-find-and-replace", Gtk.IconSize.Menu, 16);
-            w20.Add(w21);
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w23 = new Gtk.Label();
-            w23.LabelProp = Mono.Unix.Catalog.GetString("R_eplace");
-            w23.UseUnderline = true;
-            w20.Add(w23);
-            w19.Add(w20);
-            this.buttonReplace.Add(w19);
-            this.AddActionWidget(this.buttonReplace, 0);
-            Gtk.ButtonBox.ButtonBoxChild w27 = ((Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonReplace]));
-            w27.Position = 2;
-            w27.Expand = false;
-            w27.Fill = false;
-            // Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
-            this.buttonSearch = new Gtk.Button();
-            this.buttonSearch.CanDefault = true;
-            this.buttonSearch.CanFocus = true;
-            this.buttonSearch.Name = "buttonSearch";
-            this.buttonSearch.UseStock = true;
-            this.buttonSearch.UseUnderline = true;
-            this.buttonSearch.Label = "gtk-find";
-            this.AddActionWidget(this.buttonSearch, 0);
-            Gtk.ButtonBox.ButtonBoxChild w28 = ((Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonSearch]));
-            w28.Position = 3;
-            w28.Expand = false;
-            w28.Fill = false;
-            if ((this.Child != null)) {
-                this.Child.ShowAll();
-            }
-            this.DefaultWidth = 456;
-            this.DefaultHeight = 288;
-            this.labelFileMask.MnemonicWidget = this.comboboxentryFileMask;
-            this.labelFind.MnemonicWidget = this.comboboxentryFind;
-            this.labelScope.MnemonicWidget = this.comboboxScope;
-            this.Show();
-        }
-    }
+// This file has been generated by the GUI designer. Do not modify.
+namespace MonoDevelop.Ide.FindInFiles
+{
+	public partial class FindInFilesDialog
+	{
+		private global::Gtk.VBox vbox2;
+
+		private global::Gtk.HBox hbox1;
+
+		private global::Gtk.Table tableFindAndReplace;
+
+		private global::Gtk.ComboBoxEntry comboboxentryFind;
+
+		private global::Gtk.HBox hbox2;
+
+		private global::Gtk.ComboBox comboboxScope;
+
+		private global::Gtk.Label labelFileMask;
+
+		private global::Gtk.Label labelFind;
+
+		private global::Gtk.Label labelScope;
+
+		private global::MonoDevelop.Components.SearchEntry searchentry1;
+
+		private global::Gtk.Table table1;
+
+		private global::Gtk.CheckButton checkbuttonCaseSensitive;
+
+		private global::Gtk.CheckButton checkbuttonRegexSearch;
+
+		private global::Gtk.CheckButton checkbuttonWholeWordsOnly;
+
+		private global::Gtk.Button buttonStop;
+
+		private global::Gtk.Button buttonClose;
+
+		private global::Gtk.Button buttonReplace;
+
+		private global::Gtk.Button buttonSearch;
+
+		protected virtual void Build ()
+		{
+			global::Stetic.Gui.Initialize (this);
+			// Widget MonoDevelop.Ide.FindInFiles.FindInFilesDialog
+			this.Name = "MonoDevelop.Ide.FindInFiles.FindInFilesDialog";
+			this.TypeHint = ((global::Gdk.WindowTypeHint)(1));
+			this.WindowPosition = ((global::Gtk.WindowPosition)(4));
+			this.BorderWidth = ((uint)(6));
+			this.DestroyWithParent = true;
+			this.SkipPagerHint = true;
+			this.SkipTaskbarHint = true;
+			// Internal child MonoDevelop.Ide.FindInFiles.FindInFilesDialog.VBox
+			global::Gtk.VBox w1 = this.VBox;
+			w1.Name = "dialog1_VBox";
+			w1.Spacing = 6;
+			w1.BorderWidth = ((uint)(2));
+			// Container child dialog1_VBox.Gtk.Box+BoxChild
+			this.vbox2 = new global::Gtk.VBox ();
+			this.vbox2.Name = "vbox2";
+			this.vbox2.Spacing = 6;
+			this.vbox2.BorderWidth = ((uint)(6));
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1.Name = "hbox1";
+			this.hbox1.Spacing = 6;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.tableFindAndReplace = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
+			this.tableFindAndReplace.Name = "tableFindAndReplace";
+			this.tableFindAndReplace.RowSpacing = ((uint)(6));
+			this.tableFindAndReplace.ColumnSpacing = ((uint)(6));
+			// Container child tableFindAndReplace.Gtk.Table+TableChild
+			this.comboboxentryFind = global::Gtk.ComboBoxEntry.NewText ();
+			this.comboboxentryFind.Name = "comboboxentryFind";
+			this.tableFindAndReplace.Add (this.comboboxentryFind);
+			global::Gtk.Table.TableChild w2 = ((global::Gtk.Table.TableChild)(this.tableFindAndReplace[this.comboboxentryFind]));
+			w2.LeftAttach = ((uint)(1));
+			w2.RightAttach = ((uint)(2));
+			w2.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child tableFindAndReplace.Gtk.Table+TableChild
+			this.hbox2 = new global::Gtk.HBox ();
+			this.hbox2.Name = "hbox2";
+			this.hbox2.Spacing = 6;
+			// Container child hbox2.Gtk.Box+BoxChild
+			this.comboboxScope = global::Gtk.ComboBox.NewText ();
+			this.comboboxScope.Name = "comboboxScope";
+			this.hbox2.Add (this.comboboxScope);
+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2[this.comboboxScope]));
+			w3.Position = 0;
+			w3.Expand = false;
+			w3.Fill = false;
+			this.tableFindAndReplace.Add (this.hbox2);
+			global::Gtk.Table.TableChild w4 = ((global::Gtk.Table.TableChild)(this.tableFindAndReplace[this.hbox2]));
+			w4.TopAttach = ((uint)(1));
+			w4.BottomAttach = ((uint)(2));
+			w4.LeftAttach = ((uint)(1));
+			w4.RightAttach = ((uint)(2));
+			w4.XOptions = ((global::Gtk.AttachOptions)(4));
+			w4.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child tableFindAndReplace.Gtk.Table+TableChild
+			this.labelFileMask = new global::Gtk.Label ();
+			this.labelFileMask.Name = "labelFileMask";
+			this.labelFileMask.Xalign = 0f;
+			this.labelFileMask.LabelProp = global::Mono.Unix.Catalog.GetString ("_File Mask:");
+			this.labelFileMask.UseUnderline = true;
+			this.tableFindAndReplace.Add (this.labelFileMask);
+			global::Gtk.Table.TableChild w5 = ((global::Gtk.Table.TableChild)(this.tableFindAndReplace[this.labelFileMask]));
+			w5.TopAttach = ((uint)(2));
+			w5.BottomAttach = ((uint)(3));
+			w5.XOptions = ((global::Gtk.AttachOptions)(4));
+			w5.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child tableFindAndReplace.Gtk.Table+TableChild
+			this.labelFind = new global::Gtk.Label ();
+			this.labelFind.Name = "labelFind";
+			this.labelFind.Xalign = 0f;
+			this.labelFind.LabelProp = global::Mono.Unix.Catalog.GetString ("_Find:");
+			this.labelFind.UseUnderline = true;
+			this.tableFindAndReplace.Add (this.labelFind);
+			global::Gtk.Table.TableChild w6 = ((global::Gtk.Table.TableChild)(this.tableFindAndReplace[this.labelFind]));
+			w6.XOptions = ((global::Gtk.AttachOptions)(4));
+			w6.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child tableFindAndReplace.Gtk.Table+TableChild
+			this.labelScope = new global::Gtk.Label ();
+			this.labelScope.Name = "labelScope";
+			this.labelScope.Xalign = 0f;
+			this.labelScope.LabelProp = global::Mono.Unix.Catalog.GetString ("_Scope:");
+			this.labelScope.UseUnderline = true;
+			this.tableFindAndReplace.Add (this.labelScope);
+			global::Gtk.Table.TableChild w7 = ((global::Gtk.Table.TableChild)(this.tableFindAndReplace[this.labelScope]));
+			w7.TopAttach = ((uint)(1));
+			w7.BottomAttach = ((uint)(2));
+			w7.XOptions = ((global::Gtk.AttachOptions)(4));
+			w7.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child tableFindAndReplace.Gtk.Table+TableChild
+			this.searchentry1 = new global::MonoDevelop.Components.SearchEntry ();
+			this.searchentry1.Name = "searchentry1";
+			this.searchentry1.ActiveFilterID = 0;
+			this.searchentry1.Ready = false;
+			this.searchentry1.HasFocus = false;
+			this.searchentry1.IsCheckMenu = false;
+			this.tableFindAndReplace.Add (this.searchentry1);
+			global::Gtk.Table.TableChild w8 = ((global::Gtk.Table.TableChild)(this.tableFindAndReplace[this.searchentry1]));
+			w8.TopAttach = ((uint)(2));
+			w8.BottomAttach = ((uint)(3));
+			w8.LeftAttach = ((uint)(1));
+			w8.RightAttach = ((uint)(2));
+			w8.XOptions = ((global::Gtk.AttachOptions)(4));
+			w8.YOptions = ((global::Gtk.AttachOptions)(4));
+			this.hbox1.Add (this.tableFindAndReplace);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.tableFindAndReplace]));
+			w9.Position = 0;
+			this.vbox2.Add (this.hbox1);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hbox1]));
+			w10.Position = 0;
+			w10.Expand = false;
+			w10.Fill = false;
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.table1 = new global::Gtk.Table (((uint)(3)), ((uint)(2)), false);
+			this.table1.Name = "table1";
+			this.table1.RowSpacing = ((uint)(6));
+			this.table1.ColumnSpacing = ((uint)(6));
+			// Container child table1.Gtk.Table+TableChild
+			this.checkbuttonCaseSensitive = new global::Gtk.CheckButton ();
+			this.checkbuttonCaseSensitive.CanFocus = true;
+			this.checkbuttonCaseSensitive.Name = "checkbuttonCaseSensitive";
+			this.checkbuttonCaseSensitive.Label = global::Mono.Unix.Catalog.GetString ("_Case sensitive");
+			this.checkbuttonCaseSensitive.DrawIndicator = true;
+			this.checkbuttonCaseSensitive.UseUnderline = true;
+			this.table1.Add (this.checkbuttonCaseSensitive);
+			global::Gtk.Table.TableChild w11 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonCaseSensitive]));
+			w11.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.checkbuttonRegexSearch = new global::Gtk.CheckButton ();
+			this.checkbuttonRegexSearch.CanFocus = true;
+			this.checkbuttonRegexSearch.Name = "checkbuttonRegexSearch";
+			this.checkbuttonRegexSearch.Label = global::Mono.Unix.Catalog.GetString ("Rege_x search");
+			this.checkbuttonRegexSearch.DrawIndicator = true;
+			this.checkbuttonRegexSearch.UseUnderline = true;
+			this.table1.Add (this.checkbuttonRegexSearch);
+			global::Gtk.Table.TableChild w12 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonRegexSearch]));
+			w12.TopAttach = ((uint)(2));
+			w12.BottomAttach = ((uint)(3));
+			w12.YOptions = ((global::Gtk.AttachOptions)(4));
+			// Container child table1.Gtk.Table+TableChild
+			this.checkbuttonWholeWordsOnly = new global::Gtk.CheckButton ();
+			this.checkbuttonWholeWordsOnly.CanFocus = true;
+			this.checkbuttonWholeWordsOnly.Name = "checkbuttonWholeWordsOnly";
+			this.checkbuttonWholeWordsOnly.Label = global::Mono.Unix.Catalog.GetString ("_Whole words only");
+			this.checkbuttonWholeWordsOnly.DrawIndicator = true;
+			this.checkbuttonWholeWordsOnly.UseUnderline = true;
+			this.table1.Add (this.checkbuttonWholeWordsOnly);
+			global::Gtk.Table.TableChild w13 = ((global::Gtk.Table.TableChild)(this.table1[this.checkbuttonWholeWordsOnly]));
+			w13.TopAttach = ((uint)(1));
+			w13.BottomAttach = ((uint)(2));
+			w13.YOptions = ((global::Gtk.AttachOptions)(4));
+			this.vbox2.Add (this.table1);
+			global::Gtk.Box.BoxChild w14 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.table1]));
+			w14.Position = 1;
+			w14.Expand = false;
+			w14.Fill = false;
+			w1.Add (this.vbox2);
+			global::Gtk.Box.BoxChild w15 = ((global::Gtk.Box.BoxChild)(w1[this.vbox2]));
+			w15.Position = 0;
+			w15.Expand = false;
+			w15.Fill = false;
+			// Internal child MonoDevelop.Ide.FindInFiles.FindInFilesDialog.ActionArea
+			global::Gtk.HButtonBox w16 = this.ActionArea;
+			w16.Name = "dialog1_ActionArea";
+			w16.Spacing = 6;
+			w16.BorderWidth = ((uint)(5));
+			w16.LayoutStyle = ((global::Gtk.ButtonBoxStyle)(4));
+			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.buttonStop = new global::Gtk.Button ();
+			this.buttonStop.CanFocus = true;
+			this.buttonStop.Name = "buttonStop";
+			this.buttonStop.UseStock = true;
+			this.buttonStop.UseUnderline = true;
+			this.buttonStop.Label = "gtk-stop";
+			this.AddActionWidget (this.buttonStop, 0);
+			global::Gtk.ButtonBox.ButtonBoxChild w17 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonStop]));
+			w17.Expand = false;
+			w17.Fill = false;
+			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.buttonClose = new global::Gtk.Button ();
+			this.buttonClose.CanDefault = true;
+			this.buttonClose.CanFocus = true;
+			this.buttonClose.Name = "buttonClose";
+			this.buttonClose.UseStock = true;
+			this.buttonClose.UseUnderline = true;
+			this.buttonClose.Label = "gtk-close";
+			this.AddActionWidget (this.buttonClose, -7);
+			global::Gtk.ButtonBox.ButtonBoxChild w18 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonClose]));
+			w18.Position = 1;
+			w18.Expand = false;
+			w18.Fill = false;
+			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.buttonReplace = new global::Gtk.Button ();
+			this.buttonReplace.CanFocus = true;
+			this.buttonReplace.Name = "buttonReplace";
+			this.buttonReplace.UseUnderline = true;
+			// Container child buttonReplace.Gtk.Container+ContainerChild
+			global::Gtk.Alignment w19 = new global::Gtk.Alignment (0.5f, 0.5f, 0f, 0f);
+			// Container child GtkAlignment.Gtk.Container+ContainerChild
+			global::Gtk.HBox w20 = new global::Gtk.HBox ();
+			w20.Spacing = 2;
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Image w21 = new global::Gtk.Image ();
+			w21.Pixbuf = global::Stetic.IconLoader.LoadIcon (this, "gtk-find-and-replace", global::Gtk.IconSize.Menu, 16);
+			w20.Add (w21);
+			// Container child GtkHBox.Gtk.Container+ContainerChild
+			global::Gtk.Label w23 = new global::Gtk.Label ();
+			w23.LabelProp = global::Mono.Unix.Catalog.GetString ("R_eplace");
+			w23.UseUnderline = true;
+			w20.Add (w23);
+			w19.Add (w20);
+			this.buttonReplace.Add (w19);
+			this.AddActionWidget (this.buttonReplace, 0);
+			global::Gtk.ButtonBox.ButtonBoxChild w27 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonReplace]));
+			w27.Position = 2;
+			w27.Expand = false;
+			w27.Fill = false;
+			// Container child dialog1_ActionArea.Gtk.ButtonBox+ButtonBoxChild
+			this.buttonSearch = new global::Gtk.Button ();
+			this.buttonSearch.CanDefault = true;
+			this.buttonSearch.CanFocus = true;
+			this.buttonSearch.Name = "buttonSearch";
+			this.buttonSearch.UseStock = true;
+			this.buttonSearch.UseUnderline = true;
+			this.buttonSearch.Label = "gtk-find";
+			this.AddActionWidget (this.buttonSearch, 0);
+			global::Gtk.ButtonBox.ButtonBoxChild w28 = ((global::Gtk.ButtonBox.ButtonBoxChild)(w16[this.buttonSearch]));
+			w28.Position = 3;
+			w28.Expand = false;
+			w28.Fill = false;
+			if ((this.Child != null)) {
+				this.Child.ShowAll ();
+			}
+			this.DefaultWidth = 456;
+			this.DefaultHeight = 289;
+			this.labelFind.MnemonicWidget = this.comboboxentryFind;
+			this.labelScope.MnemonicWidget = this.comboboxScope;
+			this.Show ();
+		}
+	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.FindInFiles.SearchResultWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.FindInFiles.SearchResultWidget.cs
index 1d016925c2..2a60d2a70b 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.FindInFiles.SearchResultWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.FindInFiles.SearchResultWidget.cs
@@ -1,121 +1,113 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
 
-namespace MonoDevelop.Ide.FindInFiles {
-    
-    
-    public partial class SearchResultWidget {
-        
-        private Gtk.UIManager UIManager;
-        
-        private Gtk.Action ViewModeAction;
-        
-        private Gtk.HBox hbox1;
-        
-        private Gtk.VBox vbox2;
-        
-        private Gtk.HPaned hpaned1;
-        
-        private Gtk.ScrolledWindow GtkScrolledWindow;
-        
-        private Gtk.TreeView treeviewSearchResults;
-        
-        private Gtk.ScrolledWindow scrolledwindowLogView;
-        
-        private Gtk.TextView textviewLog;
-        
-        private Gtk.Label labelStatus;
-        
-        private Gtk.Toolbar toolbar;
-        
-        protected virtual void Build() {
-            Stetic.Gui.Initialize(this);
-            // Widget MonoDevelop.Ide.FindInFiles.SearchResultWidget
-            Stetic.BinContainer w1 = Stetic.BinContainer.Attach(this);
-            this.UIManager = new Gtk.UIManager();
-            Gtk.ActionGroup w2 = new Gtk.ActionGroup("Default");
-            this.ViewModeAction = new Gtk.Action("ViewModeAction", Mono.Unix.Catalog.GetString("ViewMode"), null, null);
-            this.ViewModeAction.ShortLabel = Mono.Unix.Catalog.GetString("ViewMode");
-            w2.Add(this.ViewModeAction, null);
-            this.UIManager.InsertActionGroup(w2, 0);
-            this.Name = "MonoDevelop.Ide.FindInFiles.SearchResultWidget";
-            // Container child MonoDevelop.Ide.FindInFiles.SearchResultWidget.Gtk.Container+ContainerChild
-            this.hbox1 = new Gtk.HBox();
-            this.hbox1.Name = "hbox1";
-            this.hbox1.Spacing = 6;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.vbox2 = new Gtk.VBox();
-            this.vbox2.Name = "vbox2";
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.hpaned1 = new Gtk.HPaned();
-            this.hpaned1.CanFocus = true;
-            this.hpaned1.Name = "hpaned1";
-            this.hpaned1.Position = 499;
-            // Container child hpaned1.Gtk.Paned+PanedChild
-            this.GtkScrolledWindow = new Gtk.ScrolledWindow();
-            this.GtkScrolledWindow.Name = "GtkScrolledWindow";
-            // Container child GtkScrolledWindow.Gtk.Container+ContainerChild
-            this.treeviewSearchResults = new Gtk.TreeView();
-            this.treeviewSearchResults.CanFocus = true;
-            this.treeviewSearchResults.Name = "treeviewSearchResults";
-            this.GtkScrolledWindow.Add(this.treeviewSearchResults);
-            this.hpaned1.Add(this.GtkScrolledWindow);
-            Gtk.Paned.PanedChild w4 = ((Gtk.Paned.PanedChild)(this.hpaned1[this.GtkScrolledWindow]));
-            w4.Resize = false;
-            // Container child hpaned1.Gtk.Paned+PanedChild
-            this.scrolledwindowLogView = new Gtk.ScrolledWindow();
-            this.scrolledwindowLogView.CanFocus = true;
-            this.scrolledwindowLogView.Name = "scrolledwindowLogView";
-            this.scrolledwindowLogView.ShadowType = ((Gtk.ShadowType)(1));
-            // Container child scrolledwindowLogView.Gtk.Container+ContainerChild
-            this.textviewLog = new Gtk.TextView();
-            this.textviewLog.CanFocus = true;
-            this.textviewLog.Name = "textviewLog";
-            this.textviewLog.Editable = false;
-            this.scrolledwindowLogView.Add(this.textviewLog);
-            this.hpaned1.Add(this.scrolledwindowLogView);
-            this.vbox2.Add(this.hpaned1);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.vbox2[this.hpaned1]));
-            w7.Position = 0;
-            // Container child vbox2.Gtk.Box+BoxChild
-            this.labelStatus = new Gtk.Label();
-            this.labelStatus.Name = "labelStatus";
-            this.labelStatus.Xalign = 0F;
-            this.vbox2.Add(this.labelStatus);
-            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.vbox2[this.labelStatus]));
-            w8.Position = 1;
-            w8.Expand = false;
-            w8.Fill = false;
-            w8.Padding = ((uint)(3));
-            this.hbox1.Add(this.vbox2);
-            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.hbox1[this.vbox2]));
-            w9.Position = 0;
-            // Container child hbox1.Gtk.Box+BoxChild
-            this.UIManager.AddUiFromString("<ui><toolbar name='toolbar'/></ui>");
-            this.toolbar = ((Gtk.Toolbar)(this.UIManager.GetWidget("/toolbar")));
-            this.toolbar.Name = "toolbar";
-            this.toolbar.Orientation = ((Gtk.Orientation)(1));
-            this.toolbar.ShowArrow = false;
-            this.toolbar.ToolbarStyle = ((Gtk.ToolbarStyle)(0));
-            this.toolbar.IconSize = ((Gtk.IconSize)(1));
-            this.hbox1.Add(this.toolbar);
-            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.hbox1[this.toolbar]));
-            w10.Position = 1;
-            w10.Expand = false;
-            w10.Fill = false;
-            this.Add(this.hbox1);
-            if ((this.Child != null)) {
-                this.Child.ShowAll();
-            }
-            w1.SetUiManager(UIManager);
-            this.Hide();
-        }
-    }
+// This file has been generated by the GUI designer. Do not modify.
+namespace MonoDevelop.Ide.FindInFiles
+{
+	public partial class SearchResultWidget
+	{
+		private global::Gtk.UIManager UIManager;
+
+		private global::Gtk.Action ViewModeAction;
+
+		private global::Gtk.HBox hbox1;
+
+		private global::Gtk.VBox vbox2;
+
+		private global::Gtk.HPaned hpaned1;
+
+		private global::Gtk.ScrolledWindow GtkScrolledWindow;
+
+		private global::Gtk.TreeView treeviewSearchResults;
+
+		private global::Gtk.ScrolledWindow scrolledwindowLogView;
+
+		private global::Gtk.TextView textviewLog;
+
+		private global::Gtk.Label labelStatus;
+
+		private global::Gtk.Toolbar toolbar;
+
+		protected virtual void Build ()
+		{
+			global::Stetic.Gui.Initialize (this);
+			// Widget MonoDevelop.Ide.FindInFiles.SearchResultWidget
+			Stetic.BinContainer w1 = global::Stetic.BinContainer.Attach (this);
+			this.UIManager = new global::Gtk.UIManager ();
+			global::Gtk.ActionGroup w2 = new global::Gtk.ActionGroup ("Default");
+			this.ViewModeAction = new global::Gtk.Action ("ViewModeAction", global::Mono.Unix.Catalog.GetString ("ViewMode"), null, null);
+			this.ViewModeAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("ViewMode");
+			w2.Add (this.ViewModeAction, null);
+			this.UIManager.InsertActionGroup (w2, 0);
+			this.Name = "MonoDevelop.Ide.FindInFiles.SearchResultWidget";
+			// Container child MonoDevelop.Ide.FindInFiles.SearchResultWidget.Gtk.Container+ContainerChild
+			this.hbox1 = new global::Gtk.HBox ();
+			this.hbox1.Name = "hbox1";
+			this.hbox1.Spacing = 6;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.vbox2 = new global::Gtk.VBox ();
+			this.vbox2.Name = "vbox2";
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.hpaned1 = new global::Gtk.HPaned ();
+			this.hpaned1.CanFocus = true;
+			this.hpaned1.Name = "hpaned1";
+			this.hpaned1.Position = 499;
+			// Container child hpaned1.Gtk.Paned+PanedChild
+			this.GtkScrolledWindow = new global::Gtk.ScrolledWindow ();
+			this.GtkScrolledWindow.Name = "GtkScrolledWindow";
+			// Container child GtkScrolledWindow.Gtk.Container+ContainerChild
+			this.treeviewSearchResults = new global::Gtk.TreeView ();
+			this.treeviewSearchResults.CanFocus = true;
+			this.treeviewSearchResults.Name = "treeviewSearchResults";
+			this.GtkScrolledWindow.Add (this.treeviewSearchResults);
+			this.hpaned1.Add (this.GtkScrolledWindow);
+			global::Gtk.Paned.PanedChild w4 = ((global::Gtk.Paned.PanedChild)(this.hpaned1[this.GtkScrolledWindow]));
+			w4.Resize = false;
+			// Container child hpaned1.Gtk.Paned+PanedChild
+			this.scrolledwindowLogView = new global::Gtk.ScrolledWindow ();
+			this.scrolledwindowLogView.CanFocus = true;
+			this.scrolledwindowLogView.Name = "scrolledwindowLogView";
+			this.scrolledwindowLogView.ShadowType = ((global::Gtk.ShadowType)(1));
+			// Container child scrolledwindowLogView.Gtk.Container+ContainerChild
+			this.textviewLog = new global::Gtk.TextView ();
+			this.textviewLog.CanFocus = true;
+			this.textviewLog.Name = "textviewLog";
+			this.textviewLog.Editable = false;
+			this.scrolledwindowLogView.Add (this.textviewLog);
+			this.hpaned1.Add (this.scrolledwindowLogView);
+			this.vbox2.Add (this.hpaned1);
+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.hpaned1]));
+			w7.Position = 0;
+			// Container child vbox2.Gtk.Box+BoxChild
+			this.labelStatus = new global::Gtk.Label ();
+			this.labelStatus.Name = "labelStatus";
+			this.labelStatus.Xalign = 0f;
+			this.vbox2.Add (this.labelStatus);
+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.vbox2[this.labelStatus]));
+			w8.Position = 1;
+			w8.Expand = false;
+			w8.Fill = false;
+			w8.Padding = ((uint)(3));
+			this.hbox1.Add (this.vbox2);
+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.vbox2]));
+			w9.Position = 0;
+			// Container child hbox1.Gtk.Box+BoxChild
+			this.UIManager.AddUiFromString ("<ui><toolbar name='toolbar'/></ui>");
+			this.toolbar = ((global::Gtk.Toolbar)(this.UIManager.GetWidget ("/toolbar")));
+			this.toolbar.Name = "toolbar";
+			this.toolbar.Orientation = ((global::Gtk.Orientation)(1));
+			this.toolbar.ShowArrow = false;
+			this.toolbar.ToolbarStyle = ((global::Gtk.ToolbarStyle)(0));
+			this.toolbar.IconSize = ((global::Gtk.IconSize)(1));
+			this.hbox1.Add (this.toolbar);
+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.toolbar]));
+			w10.Position = 1;
+			w10.Expand = false;
+			w10.Fill = false;
+			this.Add (this.hbox1);
+			if ((this.Child != null)) {
+				this.Child.ShowAll ();
+			}
+			w1.SetUiManager (UIManager);
+			this.Hide ();
+		}
+	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/generated.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/generated.cs
index 35f420b49d..193f0a49e2 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/generated.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/generated.cs
@@ -1,115 +1,113 @@
-// ------------------------------------------------------------------------------
-//  <autogenerated>
-//      This code was generated by a tool.
-//      
-// 
-//      Changes to this file may cause incorrect behavior and will be lost if 
-//      the code is regenerated.
-//  </autogenerated>
-// ------------------------------------------------------------------------------
 
-namespace Stetic {
-    
-    
-    internal class Gui {
-        
-        private static bool initialized;
-        
-        internal static void Initialize(Gtk.Widget iconRenderer) {
-            if ((Stetic.Gui.initialized == false)) {
-                Stetic.Gui.initialized = true;
-            }
-        }
-    }
-    
-    internal class BinContainer {
-        
-        private Gtk.Widget child;
-        
-        private Gtk.UIManager uimanager;
-        
-        public static BinContainer Attach(Gtk.Bin bin) {
-            BinContainer bc = new BinContainer();
-            bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
-            bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
-            bin.Added += new Gtk.AddedHandler(bc.OnAdded);
-            return bc;
-        }
-        
-        private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) {
-            if ((this.child != null)) {
-                args.Requisition = this.child.SizeRequest();
-            }
-        }
-        
-        private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) {
-            if ((this.child != null)) {
-                this.child.Allocation = args.Allocation;
-            }
-        }
-        
-        private void OnAdded(object sender, Gtk.AddedArgs args) {
-            this.child = args.Widget;
-        }
-        
-        public void SetUiManager(Gtk.UIManager uim) {
-            this.uimanager = uim;
-            this.child.Realized += new System.EventHandler(this.OnRealized);
-        }
-        
-        private void OnRealized(object sender, System.EventArgs args) {
-            if ((this.uimanager != null)) {
-                Gtk.Widget w;
-                w = this.child.Toplevel;
-                if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) {
-                    ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
-                    this.uimanager = null;
-                }
-            }
-        }
-    }
-    
-    internal class IconLoader {
-        
-        public static Gdk.Pixbuf LoadIcon(Gtk.Widget widget, string name, Gtk.IconSize size, int sz) {
-            Gdk.Pixbuf res = widget.RenderIcon(name, size, null);
-            if ((res != null)) {
-                return res;
-            }
-            else {
-                try {
-                    return Gtk.IconTheme.Default.LoadIcon(name, sz, 0);
-                }
-                catch (System.Exception ) {
-                    if ((name != "gtk-missing-image")) {
-                        return Stetic.IconLoader.LoadIcon(widget, "gtk-missing-image", size, sz);
-                    }
-                    else {
-                        Gdk.Pixmap pmap = new Gdk.Pixmap(Gdk.Screen.Default.RootWindow, sz, sz);
-                        Gdk.GC gc = new Gdk.GC(pmap);
-                        gc.RgbFgColor = new Gdk.Color(255, 255, 255);
-                        pmap.DrawRectangle(gc, true, 0, 0, sz, sz);
-                        gc.RgbFgColor = new Gdk.Color(0, 0, 0);
-                        pmap.DrawRectangle(gc, false, 0, 0, (sz - 1), (sz - 1));
-                        gc.SetLineAttributes(3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
-                        gc.RgbFgColor = new Gdk.Color(255, 0, 0);
-                        pmap.DrawLine(gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
-                        pmap.DrawLine(gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
-                        return Gdk.Pixbuf.FromDrawable(pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
-                    }
-                }
-            }
-        }
-    }
-    
-    internal class ActionGroups {
-        
-        public static Gtk.ActionGroup GetActionGroup(System.Type type) {
-            return Stetic.ActionGroups.GetActionGroup(type.FullName);
-        }
-        
-        public static Gtk.ActionGroup GetActionGroup(string name) {
-            return null;
-        }
-    }
+// This file has been generated by the GUI designer. Do not modify.
+namespace Stetic
+{
+	internal class Gui
+	{
+		private static bool initialized;
+
+		static internal void Initialize (Gtk.Widget iconRenderer)
+		{
+			if ((Stetic.Gui.initialized == false)) {
+				Stetic.Gui.initialized = true;
+			}
+		}
+	}
+
+	internal class BinContainer
+	{
+		private Gtk.Widget child;
+
+		private Gtk.UIManager uimanager;
+
+		public static BinContainer Attach (Gtk.Bin bin)
+		{
+			BinContainer bc = new BinContainer ();
+			bin.SizeRequested += new Gtk.SizeRequestedHandler (bc.OnSizeRequested);
+			bin.SizeAllocated += new Gtk.SizeAllocatedHandler (bc.OnSizeAllocated);
+			bin.Added += new Gtk.AddedHandler (bc.OnAdded);
+			return bc;
+		}
+
+		private void OnSizeRequested (object sender, Gtk.SizeRequestedArgs args)
+		{
+			if ((this.child != null)) {
+				args.Requisition = this.child.SizeRequest ();
+			}
+		}
+
+		private void OnSizeAllocated (object sender, Gtk.SizeAllocatedArgs args)
+		{
+			if ((this.child != null)) {
+				this.child.Allocation = args.Allocation;
+			}
+		}
+
+		private void OnAdded (object sender, Gtk.AddedArgs args)
+		{
+			this.child = args.Widget;
+		}
+
+		public void SetUiManager (Gtk.UIManager uim)
+		{
+			this.uimanager = uim;
+			this.child.Realized += new System.EventHandler (this.OnRealized);
+		}
+
+		private void OnRealized (object sender, System.EventArgs args)
+		{
+			if ((this.uimanager != null)) {
+				Gtk.Widget w;
+				w = this.child.Toplevel;
+				if (((w != null) && typeof(Gtk.Window).IsInstanceOfType (w))) {
+					((Gtk.Window)(w)).AddAccelGroup (this.uimanager.AccelGroup);
+					this.uimanager = null;
+				}
+			}
+		}
+	}
+
+	internal class IconLoader
+	{
+		public static Gdk.Pixbuf LoadIcon (Gtk.Widget widget, string name, Gtk.IconSize size, int sz)
+		{
+			Gdk.Pixbuf res = widget.RenderIcon (name, size, null);
+			if ((res != null)) {
+				return res;
+			} else {
+				try {
+					return Gtk.IconTheme.Default.LoadIcon (name, sz, 0);
+				} catch (System.Exception) {
+					if ((name != "gtk-missing-image")) {
+						return Stetic.IconLoader.LoadIcon (widget, "gtk-missing-image", size, sz);
+					} else {
+						Gdk.Pixmap pmap = new Gdk.Pixmap (Gdk.Screen.Default.RootWindow, sz, sz);
+						Gdk.GC gc = new Gdk.GC (pmap);
+						gc.RgbFgColor = new Gdk.Color (255, 255, 255);
+						pmap.DrawRectangle (gc, true, 0, 0, sz, sz);
+						gc.RgbFgColor = new Gdk.Color (0, 0, 0);
+						pmap.DrawRectangle (gc, false, 0, 0, (sz - 1), (sz - 1));
+						gc.SetLineAttributes (3, Gdk.LineStyle.Solid, Gdk.CapStyle.Round, Gdk.JoinStyle.Round);
+						gc.RgbFgColor = new Gdk.Color (255, 0, 0);
+						pmap.DrawLine (gc, (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)), ((sz - 1) - (sz / 4)));
+						pmap.DrawLine (gc, ((sz - 1) - (sz / 4)), (sz / 4), (sz / 4), ((sz - 1) - (sz / 4)));
+						return Gdk.Pixbuf.FromDrawable (pmap, pmap.Colormap, 0, 0, 0, 0, sz, sz);
+					}
+				}
+			}
+		}
+	}
+
+	internal class ActionGroups
+	{
+		public static Gtk.ActionGroup GetActionGroup (System.Type type)
+		{
+			return Stetic.ActionGroups.GetActionGroup (type.FullName);
+		}
+
+		public static Gtk.ActionGroup GetActionGroup (string name)
+		{
+			return null;
+		}
+	}
 }
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
index d8f4c2b340..728da9d976 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
@@ -5,12 +5,12 @@
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
+    <widget-library name="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <widget-library name="../../../../build/bin/MonoDevelop.Dock.dll" />
     <widget-library name="../../../../build/bin/MonoDevelop.Components.dll" />
     <widget-library name="../../../../build/bin/MonoDevelop.Core.Gui.dll" />
     <widget-library name="../../../../build/bin/MonoDevelop.Projects.Gui.dll" />
     <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
-    <widget-library name="Mono.Addins.Gui, Version=0.5.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" internal="true" />
   </import>
   <widget class="Gtk.Dialog" id="MonoDevelop.Ide.Gui.Dialogs.GoToDialog" design-size="750 579">
@@ -6158,7 +6158,7 @@ Large</property>
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Dialog" id="MonoDevelop.Ide.FindInFiles.FindInFilesDialog" design-size="456 288">
+  <widget class="Gtk.Dialog" id="MonoDevelop.Ide.FindInFiles.FindInFilesDialog" design-size="456 289">
     <property name="MemberName" />
     <property name="TypeHint">Dialog</property>
     <property name="WindowPosition">CenterOnParent</property>
@@ -6190,28 +6190,6 @@ Large</property>
                     <property name="RowSpacing">6</property>
                     <property name="ColumnSpacing">6</property>
                     <child>
-                      <widget class="Gtk.ComboBoxEntry" id="comboboxentryFileMask">
-                        <property name="MemberName" />
-                        <property name="IsTextCombo">True</property>
-                        <property name="Items" translatable="yes" />
-                      </widget>
-                      <packing>
-                        <property name="TopAttach">2</property>
-                        <property name="BottomAttach">3</property>
-                        <property name="LeftAttach">1</property>
-                        <property name="RightAttach">2</property>
-                        <property name="AutoSize">True</property>
-                        <property name="XOptions">Fill</property>
-                        <property name="YOptions">Fill</property>
-                        <property name="XExpand">False</property>
-                        <property name="XFill">True</property>
-                        <property name="XShrink">False</property>
-                        <property name="YExpand">False</property>
-                        <property name="YFill">True</property>
-                        <property name="YShrink">False</property>
-                      </packing>
-                    </child>
-                    <child>
                       <widget class="Gtk.ComboBoxEntry" id="comboboxentryFind">
                         <property name="MemberName" />
                         <property name="IsTextCombo">True</property>
@@ -6328,6 +6306,30 @@ Large</property>
                         <property name="YShrink">False</property>
                       </packing>
                     </child>
+                    <child>
+                      <widget class="MonoDevelop.Components.SearchEntry" id="searchentry1">
+                        <property name="MemberName" />
+                        <property name="ActiveFilterID">0</property>
+                        <property name="Ready">False</property>
+                        <property name="HasFocus">False</property>
+                        <property name="IsCheckMenu">False</property>
+                      </widget>
+                      <packing>
+                        <property name="TopAttach">2</property>
+                        <property name="BottomAttach">3</property>
+                        <property name="LeftAttach">1</property>
+                        <property name="RightAttach">2</property>
+                        <property name="AutoSize">True</property>
+                        <property name="XOptions">Fill</property>
+                        <property name="YOptions">Fill</property>
+                        <property name="XExpand">False</property>
+                        <property name="XFill">True</property>
+                        <property name="XShrink">False</property>
+                        <property name="YExpand">False</property>
+                        <property name="YFill">True</property>
+                        <property name="YShrink">False</property>
+                      </packing>
+                    </child>
                   </widget>
                   <packing>
                     <property name="Position">0</property>