* gtk-gui/gui.stetic:

* MonoDevelop.Ide.Gui.OptionPanels/KeyBindingsPanel.cs:
* gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs:
  Implement a filter entry for the keybindings panel.

* gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs:
* gtk-gui/MonoDevelop.Ide.Gui.Dialogs.SelectReferenceDialog.cs:
* gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs: Flush.

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

5 files changed, 263 insertions, 129 deletions

diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.SelectReferenceDialog.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.SelectReferenceDialog.cs
index becd939a2e..67398ccf4e 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.SelectReferenceDialog.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.SelectReferenceDialog.cs
@@ -127,8 +127,7 @@ namespace MonoDevelop.Ide.Gui.Dialogs {
             this.vbox70.Name = "vbox70";
             // Container child vbox70.Gtk.Box+BoxChild
             this.RemoveReferenceButton = new Gtk.Button();
-            Gtk.Tooltips w7 = new Gtk.Tooltips();
-            w7.SetTip(this.RemoveReferenceButton, "Remove", "Remove");
+            this.RemoveReferenceButton.TooltipMarkup = "Remove";
             this.RemoveReferenceButton.Name = "RemoveReferenceButton";
             // Container child RemoveReferenceButton.Gtk.Container+ContainerChild
             this.but = new Gtk.Image();
@@ -139,33 +138,33 @@ namespace MonoDevelop.Ide.Gui.Dialogs {
             this.RemoveReferenceButton.Add(this.but);
             this.RemoveReferenceButton.Label = null;
             this.vbox70.Add(this.RemoveReferenceButton);
-            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox70[this.RemoveReferenceButton]));
-            w9.Position = 0;
+            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.vbox70[this.RemoveReferenceButton]));
+            w8.Position = 0;
+            w8.Expand = false;
+            w8.Fill = false;
+            this.hbox4.Add(this.vbox70);
+            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.hbox4[this.vbox70]));
+            w9.Position = 1;
             w9.Expand = false;
             w9.Fill = false;
-            this.hbox4.Add(this.vbox70);
-            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.hbox4[this.vbox70]));
-            w10.Position = 1;
-            w10.Expand = false;
-            w10.Fill = false;
             this.vbox76.Add(this.hbox4);
-            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox76[this.hbox4]));
-            w11.Position = 1;
+            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.vbox76[this.hbox4]));
+            w10.Position = 1;
             this.vpaned1.Add(this.vbox76);
-            Gtk.Paned.PanedChild w12 = ((Gtk.Paned.PanedChild)(this.vpaned1[this.vbox76]));
-            w12.Resize = false;
+            Gtk.Paned.PanedChild w11 = ((Gtk.Paned.PanedChild)(this.vpaned1[this.vbox76]));
+            w11.Resize = false;
             this.vbox5.Add(this.vpaned1);
-            Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.vbox5[this.vpaned1]));
-            w13.Position = 0;
+            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox5[this.vpaned1]));
+            w12.Position = 0;
             w1.Add(this.vbox5);
-            Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(w1[this.vbox5]));
-            w14.Position = 0;
+            Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(w1[this.vbox5]));
+            w13.Position = 0;
             // Internal child MonoDevelop.Ide.Gui.Dialogs.SelectReferenceDialog.ActionArea
-            Gtk.HButtonBox w15 = this.ActionArea;
-            w15.Name = "dialog-action_area2";
-            w15.Spacing = 10;
-            w15.BorderWidth = ((uint)(5));
-            w15.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
+            Gtk.HButtonBox w14 = this.ActionArea;
+            w14.Name = "dialog-action_area2";
+            w14.Spacing = 10;
+            w14.BorderWidth = ((uint)(5));
+            w14.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
             // Container child dialog-action_area2.Gtk.ButtonBox+ButtonBoxChild
             this.cancelbutton = new Gtk.Button();
             this.cancelbutton.Name = "cancelbutton";
@@ -180,8 +179,8 @@ namespace MonoDevelop.Ide.Gui.Dialogs {
             this.okbutton.UseUnderline = true;
             this.okbutton.Label = "gtk-ok";
             this.AddActionWidget(this.okbutton, -5);
-            Gtk.ButtonBox.ButtonBoxChild w17 = ((Gtk.ButtonBox.ButtonBoxChild)(w15[this.okbutton]));
-            w17.Position = 1;
+            Gtk.ButtonBox.ButtonBoxChild w16 = ((Gtk.ButtonBox.ButtonBoxChild)(w14[this.okbutton]));
+            w16.Position = 1;
             if ((this.Child != null)) {
                 this.Child.ShowAll();
             }
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs
index 3493cf4eb4..dba127a57a 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.Dialogs.TipOfTheDayWindow.cs
@@ -119,7 +119,6 @@ namespace MonoDevelop.Ide.Gui.Dialogs {
             w7.Fill = false;
             // Container child hbox5.Gtk.Box+BoxChild
             this.hbuttonbox1 = new Gtk.HButtonBox();
-            this.hbuttonbox1.Name = "hbuttonbox1";
             this.hbuttonbox1.Spacing = 10;
             this.hbuttonbox1.LayoutStyle = ((Gtk.ButtonBoxStyle)(4));
             // Container child hbuttonbox1.Gtk.ButtonBox+ButtonBoxChild
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs
index 32463bf010..b97744321d 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.BuildPanelWidget.cs
@@ -141,6 +141,7 @@ namespace MonoDevelop.Ide.Gui.OptionPanels {
             // Container child vbox67.Gtk.Box+BoxChild
             this.saveChangesRadioButton = new Gtk.RadioButton(Mono.Unix.Catalog.GetString("_Save changes to open documents"));
             this.saveChangesRadioButton.Name = "saveChangesRadioButton";
+            this.saveChangesRadioButton.Active = true;
             this.saveChangesRadioButton.DrawIndicator = true;
             this.saveChangesRadioButton.UseUnderline = true;
             this.saveChangesRadioButton.Group = new GLib.SList(System.IntPtr.Zero);
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs
index 3b88e43fde..5887e846ed 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel.cs
@@ -21,9 +21,23 @@ namespace MonoDevelop.Ide.Gui.OptionPanels {
         
         private Gtk.ComboBox schemeCombo;
         
+        private Gtk.HSeparator hseparator2;
+        
+        private Gtk.HBox hbox2;
+        
+        private Gtk.Label label1;
+        
+        private Gtk.Entry searchEntry;
+        
+        private Gtk.Button clearFilterButton;
+        
+        private Gtk.Image image25;
+        
         private Gtk.VBox globalWarningBox;
         
-        private Gtk.HSeparator hseparator1;
+        private Gtk.Frame frame1;
+        
+        private Gtk.Alignment alignment1;
         
         private Gtk.HBox warningBox;
         
@@ -84,18 +98,68 @@ namespace MonoDevelop.Ide.Gui.OptionPanels {
             w3.Expand = false;
             w3.Fill = false;
             // Container child vbox.Gtk.Box+BoxChild
+            this.hseparator2 = new Gtk.HSeparator();
+            this.hseparator2.Name = "hseparator2";
+            this.vbox.Add(this.hseparator2);
+            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.vbox[this.hseparator2]));
+            w4.Position = 1;
+            w4.Expand = false;
+            w4.Fill = false;
+            // Container child vbox.Gtk.Box+BoxChild
+            this.hbox2 = new Gtk.HBox();
+            this.hbox2.Name = "hbox2";
+            this.hbox2.Spacing = 6;
+            // Container child hbox2.Gtk.Box+BoxChild
+            this.label1 = new Gtk.Label();
+            this.label1.Name = "label1";
+            this.label1.LabelProp = Mono.Unix.Catalog.GetString("_Search:");
+            this.label1.UseUnderline = true;
+            this.hbox2.Add(this.label1);
+            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.hbox2[this.label1]));
+            w5.Position = 0;
+            w5.Expand = false;
+            w5.Fill = false;
+            // Container child hbox2.Gtk.Box+BoxChild
+            this.searchEntry = new Gtk.Entry();
+            this.searchEntry.CanFocus = true;
+            this.searchEntry.Name = "searchEntry";
+            this.searchEntry.IsEditable = true;
+            this.searchEntry.InvisibleChar = '●';
+            this.hbox2.Add(this.searchEntry);
+            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.hbox2[this.searchEntry]));
+            w6.Position = 1;
+            // Container child hbox2.Gtk.Box+BoxChild
+            this.clearFilterButton = new Gtk.Button();
+            this.clearFilterButton.CanFocus = true;
+            this.clearFilterButton.Name = "clearFilterButton";
+            // Container child clearFilterButton.Gtk.Container+ContainerChild
+            this.image25 = new Gtk.Image();
+            this.image25.Name = "image25";
+            this.image25.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-clear", Gtk.IconSize.Menu, 16);
+            this.clearFilterButton.Add(this.image25);
+            this.clearFilterButton.Label = null;
+            this.hbox2.Add(this.clearFilterButton);
+            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.hbox2[this.clearFilterButton]));
+            w8.Position = 2;
+            w8.Expand = false;
+            w8.Fill = false;
+            this.vbox.Add(this.hbox2);
+            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox[this.hbox2]));
+            w9.Position = 2;
+            w9.Expand = false;
+            w9.Fill = false;
+            // Container child vbox.Gtk.Box+BoxChild
             this.globalWarningBox = new Gtk.VBox();
             this.globalWarningBox.Name = "globalWarningBox";
             this.globalWarningBox.Spacing = 6;
             // Container child globalWarningBox.Gtk.Box+BoxChild
-            this.hseparator1 = new Gtk.HSeparator();
-            this.hseparator1.Name = "hseparator1";
-            this.globalWarningBox.Add(this.hseparator1);
-            Gtk.Box.BoxChild w4 = ((Gtk.Box.BoxChild)(this.globalWarningBox[this.hseparator1]));
-            w4.Position = 0;
-            w4.Expand = false;
-            w4.Fill = false;
-            // Container child globalWarningBox.Gtk.Box+BoxChild
+            this.frame1 = new Gtk.Frame();
+            this.frame1.Name = "frame1";
+            // Container child frame1.Gtk.Container+ContainerChild
+            this.alignment1 = new Gtk.Alignment(0.5F, 0.5F, 1F, 1F);
+            this.alignment1.Name = "alignment1";
+            this.alignment1.BorderWidth = ((uint)(2));
+            // Container child alignment1.Gtk.Container+ContainerChild
             this.warningBox = new Gtk.HBox();
             this.warningBox.Name = "warningBox";
             this.warningBox.Spacing = 6;
@@ -104,18 +168,18 @@ namespace MonoDevelop.Ide.Gui.OptionPanels {
             this.image3.Name = "image3";
             this.image3.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-dialog-warning", Gtk.IconSize.Menu, 16);
             this.warningBox.Add(this.image3);
-            Gtk.Box.BoxChild w5 = ((Gtk.Box.BoxChild)(this.warningBox[this.image3]));
-            w5.Position = 0;
-            w5.Expand = false;
-            w5.Fill = false;
+            Gtk.Box.BoxChild w10 = ((Gtk.Box.BoxChild)(this.warningBox[this.image3]));
+            w10.Position = 0;
+            w10.Expand = false;
+            w10.Fill = false;
             // Container child warningBox.Gtk.Box+BoxChild
             this.label2 = new Gtk.Label();
             this.label2.Name = "label2";
             this.label2.Xalign = 0F;
             this.label2.LabelProp = Mono.Unix.Catalog.GetString("The current scheme has conflicting key bindings");
             this.warningBox.Add(this.label2);
-            Gtk.Box.BoxChild w6 = ((Gtk.Box.BoxChild)(this.warningBox[this.label2]));
-            w6.Position = 1;
+            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.warningBox[this.label2]));
+            w11.Position = 1;
             // Container child warningBox.Gtk.Box+BoxChild
             this.conflicButton = new MonoDevelop.Components.MenuButton();
             this.conflicButton.CanFocus = true;
@@ -124,20 +188,22 @@ namespace MonoDevelop.Ide.Gui.OptionPanels {
             this.conflicButton.UseMarkup = false;
             this.conflicButton.Label = "View Conflicts";
             this.warningBox.Add(this.conflicButton);
-            Gtk.Box.BoxChild w7 = ((Gtk.Box.BoxChild)(this.warningBox[this.conflicButton]));
-            w7.Position = 2;
-            w7.Expand = false;
-            w7.Fill = false;
-            this.globalWarningBox.Add(this.warningBox);
-            Gtk.Box.BoxChild w8 = ((Gtk.Box.BoxChild)(this.globalWarningBox[this.warningBox]));
-            w8.Position = 1;
-            w8.Expand = false;
-            w8.Fill = false;
+            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.warningBox[this.conflicButton]));
+            w12.Position = 2;
+            w12.Expand = false;
+            w12.Fill = false;
+            this.alignment1.Add(this.warningBox);
+            this.frame1.Add(this.alignment1);
+            this.globalWarningBox.Add(this.frame1);
+            Gtk.Box.BoxChild w15 = ((Gtk.Box.BoxChild)(this.globalWarningBox[this.frame1]));
+            w15.Position = 0;
+            w15.Expand = false;
+            w15.Fill = false;
             this.vbox.Add(this.globalWarningBox);
-            Gtk.Box.BoxChild w9 = ((Gtk.Box.BoxChild)(this.vbox[this.globalWarningBox]));
-            w9.Position = 1;
-            w9.Expand = false;
-            w9.Fill = false;
+            Gtk.Box.BoxChild w16 = ((Gtk.Box.BoxChild)(this.vbox[this.globalWarningBox]));
+            w16.Position = 3;
+            w16.Expand = false;
+            w16.Fill = false;
             // Container child vbox.Gtk.Box+BoxChild
             this.scrolledwindow = new Gtk.ScrolledWindow();
             this.scrolledwindow.CanFocus = true;
@@ -149,18 +215,18 @@ namespace MonoDevelop.Ide.Gui.OptionPanels {
             this.keyTreeView.Name = "keyTreeView";
             this.scrolledwindow.Add(this.keyTreeView);
             this.vbox.Add(this.scrolledwindow);
-            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.vbox[this.scrolledwindow]));
-            w11.Position = 2;
+            Gtk.Box.BoxChild w18 = ((Gtk.Box.BoxChild)(this.vbox[this.scrolledwindow]));
+            w18.Position = 4;
             // Container child vbox.Gtk.Box+BoxChild
             this.labelMessage = new Gtk.Label();
             this.labelMessage.Name = "labelMessage";
             this.labelMessage.Xalign = 0F;
             this.labelMessage.UseMarkup = true;
             this.vbox.Add(this.labelMessage);
-            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.vbox[this.labelMessage]));
-            w12.Position = 3;
-            w12.Expand = false;
-            w12.Fill = false;
+            Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.vbox[this.labelMessage]));
+            w19.Position = 5;
+            w19.Expand = false;
+            w19.Fill = false;
             // Container child vbox.Gtk.Box+BoxChild
             this.hbox = new Gtk.HBox();
             this.hbox.Name = "hbox";
@@ -170,10 +236,10 @@ namespace MonoDevelop.Ide.Gui.OptionPanels {
             this.labelEditBinding.Name = "labelEditBinding";
             this.labelEditBinding.LabelProp = Mono.Unix.Catalog.GetString("Edit Binding");
             this.hbox.Add(this.labelEditBinding);
-            Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.hbox[this.labelEditBinding]));
-            w13.Position = 0;
-            w13.Expand = false;
-            w13.Fill = false;
+            Gtk.Box.BoxChild w20 = ((Gtk.Box.BoxChild)(this.hbox[this.labelEditBinding]));
+            w20.Position = 0;
+            w20.Expand = false;
+            w20.Fill = false;
             // Container child hbox.Gtk.Box+BoxChild
             this.accelEntry = new Gtk.Entry();
             this.accelEntry.CanFocus = true;
@@ -181,43 +247,44 @@ namespace MonoDevelop.Ide.Gui.OptionPanels {
             this.accelEntry.IsEditable = true;
             this.accelEntry.InvisibleChar = '●';
             this.hbox.Add(this.accelEntry);
-            Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.hbox[this.accelEntry]));
-            w14.Position = 1;
+            Gtk.Box.BoxChild w21 = ((Gtk.Box.BoxChild)(this.hbox[this.accelEntry]));
+            w21.Position = 1;
             // Container child hbox.Gtk.Box+BoxChild
             this.updateButton = new Gtk.Button();
             this.updateButton.CanFocus = true;
             this.updateButton.Name = "updateButton";
             this.updateButton.UseUnderline = true;
             // Container child updateButton.Gtk.Container+ContainerChild
-            Gtk.Alignment w15 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
+            Gtk.Alignment w22 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
             // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w16 = new Gtk.HBox();
-            w16.Spacing = 2;
+            Gtk.HBox w23 = new Gtk.HBox();
+            w23.Spacing = 2;
             // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w17 = new Gtk.Image();
-            w17.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-apply", Gtk.IconSize.Button, 20);
-            w16.Add(w17);
+            Gtk.Image w24 = new Gtk.Image();
+            w24.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-apply", Gtk.IconSize.Button, 20);
+            w23.Add(w24);
             // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w19 = new Gtk.Label();
-            w19.LabelProp = Mono.Unix.Catalog.GetString("Apply");
-            w19.UseUnderline = true;
-            w16.Add(w19);
-            w15.Add(w16);
-            this.updateButton.Add(w15);
+            Gtk.Label w26 = new Gtk.Label();
+            w26.LabelProp = Mono.Unix.Catalog.GetString("Apply");
+            w26.UseUnderline = true;
+            w23.Add(w26);
+            w22.Add(w23);
+            this.updateButton.Add(w22);
             this.hbox.Add(this.updateButton);
-            Gtk.Box.BoxChild w23 = ((Gtk.Box.BoxChild)(this.hbox[this.updateButton]));
-            w23.Position = 2;
-            w23.Expand = false;
-            w23.Fill = false;
+            Gtk.Box.BoxChild w30 = ((Gtk.Box.BoxChild)(this.hbox[this.updateButton]));
+            w30.Position = 2;
+            w30.Expand = false;
+            w30.Fill = false;
             this.vbox.Add(this.hbox);
-            Gtk.Box.BoxChild w24 = ((Gtk.Box.BoxChild)(this.vbox[this.hbox]));
-            w24.Position = 4;
-            w24.Expand = false;
-            w24.Fill = false;
+            Gtk.Box.BoxChild w31 = ((Gtk.Box.BoxChild)(this.vbox[this.hbox]));
+            w31.Position = 6;
+            w31.Expand = false;
+            w31.Fill = false;
             this.Add(this.vbox);
             if ((this.Child != null)) {
                 this.Child.ShowAll();
             }
+            this.label1.MnemonicWidget = this.searchEntry;
             this.globalWarningBox.Hide();
             this.labelMessage.Hide();
             this.Show();
diff --git a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
index b797710ac3..242b0645cd 100644
--- a/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
+++ b/main/src/core/MonoDevelop.Ide/gtk-gui/gui.stetic
@@ -1271,7 +1271,7 @@
       </widget>
     </child>
   </widget>
-  <widget class="Gtk.Bin" id="MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel" design-size="491 460">
+  <widget class="Gtk.Bin" id="MonoDevelop.Ide.Gui.OptionPanels.KeyBindingsPanel" design-size="720 460">
     <property name="MemberName" />
     <child>
       <widget class="Gtk.VBox" id="vbox">
@@ -1316,13 +1316,26 @@
           </packing>
         </child>
         <child>
-          <widget class="Gtk.VBox" id="globalWarningBox">
+          <widget class="Gtk.HSeparator" id="hseparator2">
+            <property name="MemberName" />
+          </widget>
+          <packing>
+            <property name="Position">1</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.HBox" id="hbox2">
             <property name="MemberName" />
-            <property name="Visible">False</property>
             <property name="Spacing">6</property>
             <child>
-              <widget class="Gtk.HSeparator" id="hseparator1">
+              <widget class="Gtk.Label" id="label1">
                 <property name="MemberName" />
+                <property name="LabelProp" translatable="yes">_Search:</property>
+                <property name="UseUnderline">True</property>
+                <property name="MnemonicWidget">searchEntry</property>
               </widget>
               <packing>
                 <property name="Position">0</property>
@@ -1332,60 +1345,115 @@
               </packing>
             </child>
             <child>
-              <widget class="Gtk.HBox" id="warningBox">
+              <widget class="Gtk.Entry" id="searchEntry">
                 <property name="MemberName" />
-                <property name="Spacing">6</property>
-                <child>
-                  <widget class="Gtk.Image" id="image3">
-                    <property name="MemberName" />
-                    <property name="Pixbuf">stock:gtk-dialog-warning Menu</property>
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
-                </child>
+                <property name="CanFocus">True</property>
+                <property name="IsEditable">True</property>
+                <property name="InvisibleChar">●</property>
+              </widget>
+              <packing>
+                <property name="Position">1</property>
+                <property name="AutoSize">True</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="Gtk.Button" id="clearFilterButton">
+                <property name="MemberName" />
+                <property name="CanFocus">True</property>
+                <property name="Type">Custom</property>
                 <child>
-                  <widget class="Gtk.Label" id="label2">
+                  <widget class="Gtk.Image" id="image25">
                     <property name="MemberName" />
-                    <property name="Xalign">0</property>
-                    <property name="LabelProp" translatable="yes">The current scheme has conflicting key bindings</property>
+                    <property name="Pixbuf">stock:gtk-clear Menu</property>
                   </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">False</property>
-                  </packing>
                 </child>
+              </widget>
+              <packing>
+                <property name="Position">2</property>
+                <property name="AutoSize">False</property>
+                <property name="Expand">False</property>
+                <property name="Fill">False</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="Position">2</property>
+            <property name="AutoSize">True</property>
+            <property name="Expand">False</property>
+            <property name="Fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="Gtk.VBox" id="globalWarningBox">
+            <property name="MemberName" />
+            <property name="Visible">False</property>
+            <property name="Spacing">6</property>
+            <child>
+              <widget class="Gtk.Frame" id="frame1">
+                <property name="MemberName" />
                 <child>
-                  <widget class="MonoDevelop.Components.MenuButton" id="conflicButton">
+                  <widget class="Gtk.Alignment" id="alignment1">
                     <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextOnly</property>
-                    <property name="Label">View Conflicts</property>
-                    <property name="UseUnderline">True</property>
-                    <property name="UseMarkup">False</property>
+                    <property name="BorderWidth">2</property>
+                    <child>
+                      <widget class="Gtk.HBox" id="warningBox">
+                        <property name="MemberName" />
+                        <property name="Spacing">6</property>
+                        <child>
+                          <widget class="Gtk.Image" id="image3">
+                            <property name="MemberName" />
+                            <property name="Pixbuf">stock:gtk-dialog-warning Menu</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">0</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.Label" id="label2">
+                            <property name="MemberName" />
+                            <property name="Xalign">0</property>
+                            <property name="LabelProp" translatable="yes">The current scheme has conflicting key bindings</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">1</property>
+                            <property name="AutoSize">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="MonoDevelop.Components.MenuButton" id="conflicButton">
+                            <property name="MemberName" />
+                            <property name="CanFocus">True</property>
+                            <property name="Type">TextOnly</property>
+                            <property name="Label">View Conflicts</property>
+                            <property name="UseUnderline">True</property>
+                            <property name="UseMarkup">False</property>
+                          </widget>
+                          <packing>
+                            <property name="Position">2</property>
+                            <property name="AutoSize">True</property>
+                            <property name="Expand">False</property>
+                            <property name="Fill">False</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
                   </widget>
-                  <packing>
-                    <property name="Position">2</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
                 </child>
               </widget>
               <packing>
-                <property name="Position">1</property>
-                <property name="AutoSize">True</property>
+                <property name="Position">0</property>
+                <property name="AutoSize">False</property>
                 <property name="Expand">False</property>
                 <property name="Fill">False</property>
               </packing>
             </child>
           </widget>
           <packing>
-            <property name="Position">1</property>
-            <property name="AutoSize">True</property>
+            <property name="Position">3</property>
+            <property name="AutoSize">False</property>
             <property name="Expand">False</property>
             <property name="Fill">False</property>
           </packing>
@@ -1403,7 +1471,7 @@
             </child>
           </widget>
           <packing>
-            <property name="Position">2</property>
+            <property name="Position">4</property>
             <property name="AutoSize">True</property>
           </packing>
         </child>
@@ -1415,7 +1483,7 @@
             <property name="UseMarkup">True</property>
           </widget>
           <packing>
-            <property name="Position">3</property>
+            <property name="Position">5</property>
             <property name="AutoSize">True</property>
             <property name="Expand">False</property>
             <property name="Fill">False</property>
@@ -1467,7 +1535,7 @@
             </child>
           </widget>
           <packing>
-            <property name="Position">4</property>
+            <property name="Position">6</property>
             <property name="AutoSize">True</property>
             <property name="Expand">False</property>
             <property name="Fill">False</property>