Fixed "Bug 1865 - NullReferenceException from the texteditor".

4 files changed, 392 insertions, 369 deletions

diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
index e36b156ec9..27039fb3b6 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
@@ -69,7 +69,7 @@ namespace MonoDevelop.AssemblyBrowser
 		Mono.TextEditor.TextEditor inspectEditor = new Mono.TextEditor.TextEditor ();
 		public AssemblyBrowserWidget ()
 		{
-			this.Build();
+			this.Build( );
 			TreeView = new ExtensibleTreeView (new NodeBuilder[] { 
 				new ErrorNodeBuilder (),
 				new AssemblyNodeBuilder (this),
@@ -92,7 +92,6 @@ namespace MonoDevelop.AssemblyBrowser
 			});
 			TreeView.Tree.Selection.Mode = Gtk.SelectionMode.Single;
 			TreeView.Tree.CursorChanged += HandleCursorChanged;
-			inspectEditor.ButtonPressEvent += HandleInspectEditorButtonPressEvent;
 			TreeView.ShadowType = ShadowType.In;
 			treeViewPlaceholder.Add (TreeView);
 			treeViewPlaceholder.ShowAll ();
@@ -102,7 +101,9 @@ namespace MonoDevelop.AssemblyBrowser
 			this.documentationLabel.ModifyBg (Gtk.StateType.Normal, new Gdk.Color (255, 255, 225));
 			this.documentationLabel.Wrap = true;
 			
-			Mono.TextEditor.TextEditorOptions options = new Mono.TextEditor.TextEditorOptions ();
+			PropertyService.PropertyChanged += HandlePropertyChanged;
+			
+			var options = new Mono.TextEditor.TextEditorOptions ();
 			options.FontName = PropertyService.Get<string> ("FontName");
 			options.ShowFoldMargin = false;
 			options.ShowIconMargin = false;
@@ -114,7 +115,7 @@ namespace MonoDevelop.AssemblyBrowser
 			options.ColorScheme = PropertyService.Get ("ColorScheme", "Default");
 			this.inspectEditor.Options = options;
 			
-			PropertyService.PropertyChanged += HandlePropertyChanged;
+			inspectEditor.ButtonPressEvent += HandleInspectEditorButtonPressEvent;
 			this.inspectEditor.Document.ReadOnly = true;
 //			this.inspectEditor.Document.SyntaxMode = new Mono.TextEditor.Highlighting.MarkupSyntaxMode ();
 			this.inspectEditor.TextViewMargin.GetLink = delegate(Mono.TextEditor.MarginMouseEventArgs arg) {
@@ -150,7 +151,7 @@ namespace MonoDevelop.AssemblyBrowser
 				return referencedSegment.Reference.ToString ();
 			};
 			this.inspectEditor.LinkRequest += InspectEditorhandleLinkRequest;
-			
+			this.scrolledwindowEditor.Child = this.inspectEditor;
 //			this.inspectLabel.ModifyBg (Gtk.StateType.Normal, new Gdk.Color (255, 255, 250));
 			
 //			this.vpaned1.ExposeEvent += VPaneExpose;
@@ -159,7 +160,7 @@ namespace MonoDevelop.AssemblyBrowser
 				// Hack for the switch page select all bug.
 //				this.inspectLabel.Selectable = false;
 			};*/
-			this.notebook1.GetNthPage (0).Hide ();
+
 			this.languageCombobox.AppendText (GettextCatalog.GetString ("Summary"));
 			this.languageCombobox.AppendText (GettextCatalog.GetString ("IL"));
 			this.languageCombobox.AppendText (GettextCatalog.GetString ("C#"));
@@ -194,7 +195,7 @@ namespace MonoDevelop.AssemblyBrowser
 			comboboxVisibilty.Active = 0;
 			comboboxVisibilty.Changed += delegate {
 				PublicApiOnly = comboboxVisibilty.Active == 0;
-				this.TreeView.GetRootNode ().Options["PublicApiOnly"] = PublicApiOnly;
+				this.TreeView.GetRootNode ().Options[ "PublicApiOnly"] = PublicApiOnly;
 				FillInspectLabel ();
 			};
 			/*
@@ -202,7 +203,7 @@ namespace MonoDevelop.AssemblyBrowser
 			this.searchInCombobox.Changed += SearchInComboboxhandleChanged;
 			*/
 			this.notebook1.SetTabLabel (this.documentationScrolledWindow, new Label (GettextCatalog.GetString ("Documentation")));
-			this.notebook1.SetTabLabel (this.vboxInspect, new Label (GettextCatalog.GetString ("Inspect")));
+			this.notebook1.SetTabLabel (this.notebookInspection, new Label (GettextCatalog.GetString ("Inspect")));
 			this.notebook1.SetTabLabel (this.searchWidget, new Label (GettextCatalog.GetString ("Search")));
 			//this.searchWidget.Visible = false;
 				
@@ -226,7 +227,9 @@ namespace MonoDevelop.AssemblyBrowser
 			this.searchentry1.ShowAll ();
 			this.buttonBack.Clicked += this.OnNavigateBackwardActionActivated;
 			this.buttonForeward.Clicked += this.OnNavigateForwardActionActivated;
-			
+			this.notebook1.ShowTabs = false;
+			this.notebookInspection.ShowTabs = false;
+			this.ShowAll ();
 		}
 		
 		[CommandHandler (EditCommands.Copy)]
@@ -268,7 +271,7 @@ namespace MonoDevelop.AssemblyBrowser
 //						this.inspectLabel.SelectRegion (idx, idx + searchEntry.Text.Length);
 				}
 				if (searchMode == SearchMode.Decompiler) {
-					this.notebook1.Page = 1;
+					this.notebook1.Page = 0;
 //						int idx = DomMethodNodeBuilder.Decompile ((DomCecilMethod)member, false).ToUpper ().IndexOf (searchEntry.Text.ToUpper ());
 //						this.inspectLabel.Selectable = true;
 //						this.inspectLabel.SelectRegion (idx, idx + searchEntry.Text.Length);
@@ -283,7 +286,7 @@ namespace MonoDevelop.AssemblyBrowser
 		
 		void LanguageComboboxhandleChanged (object sender, EventArgs e)
 		{
-			this.notebook1.Page = 1;
+			this.notebook1.Page = 0;
 			PropertyService.Set ("AssemblyBrowser.InspectLanguage", this.languageCombobox.Active);
 			SetInspectWidget ();
 			FillInspectLabel ();
@@ -450,11 +453,11 @@ namespace MonoDevelop.AssemblyBrowser
 				searchBackgoundWorker.CancelAsync ();
 			
 			if (string.IsNullOrEmpty (query)) {
-				notebook1.Page = 1;
+				notebook1.Page = 0;
 				return;
 			}
 			
-			this.notebook1.Page = 2;
+			this.notebook1.Page = 1;
 			
 			switch (searchMode) {
 			case SearchMode.Member:
@@ -824,19 +827,11 @@ namespace MonoDevelop.AssemblyBrowser
 		
 		void SetInspectWidget ()
 		{
-			if (this.scrolledwindow3.Child != null)
-				this.scrolledwindow3.Remove (this.scrolledwindow3.Child);
 			if (this.languageCombobox.Active <= 0) {
-				documentationPanel.Markup = "No Documentation Available";
-				if (documentationPanel.Parent != null) {
-					this.scrolledwindow3.Child = documentationPanel.Parent;
-				} else {
-					this.scrolledwindow3.AddWithViewport (documentationPanel);
-				}
+				notebookInspection.Page = 0;
 			} else {
-				this.scrolledwindow3.Child = inspectEditor;
+				notebookInspection.Page = 1;
 			}
-			this.scrolledwindow3.ShowAll ();
 		}
 		
 		List<ReferenceSegment> ReferencedSegments = new List<ReferenceSegment>();
@@ -899,7 +894,7 @@ namespace MonoDevelop.AssemblyBrowser
 				this.inspectEditor.Document.Text = "Invalid combobox value: " + this.languageCombobox.Active;
 				break;
 			}
-			this.scrolledwindow3.QueueDraw ();
+			this.inspectEditor.QueueDraw ();
 		}
 			
 		void CreateOutput ()
@@ -1093,7 +1088,7 @@ namespace MonoDevelop.AssemblyBrowser
 		public void ShowSearchWidget ()
 		{
 			//this.searchWidget.Visible = true;
-			this.notebook1.Page = 2;
+			this.notebook1.Page = 1;
 //			this.searchEntry.GrabFocus ();
 		}
 	
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs
index 7e905b8503..334fbb9363 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.cs
@@ -1,250 +1,262 @@
-
-// This file has been generated by the GUI designer. Do not modify.
+

+// This file has been generated by the GUI designer. Do not modify.

 namespace MonoDevelop.AssemblyBrowser
-{
+{

 	internal partial class AssemblyBrowserWidget
-	{
-		private global::Gtk.UIManager UIManager;
-		private global::Gtk.Action NavigateBackwardAction;
-		private global::Gtk.Action NavigateForwardAction;
-		private global::Gtk.Action goBackAction;
-		private global::Gtk.Action goForwardAction;
-		private global::Gtk.Action goBackAction1;
-		private global::Gtk.VBox vbox1;
-		private global::Gtk.HBox hbox2;
-		private global::Gtk.Button buttonBack;
-		private global::Gtk.Button buttonForeward;
-		private global::Gtk.Label label3;
-		private global::Gtk.ComboBox languageCombobox;
-		private global::Gtk.Label label1;
-		private global::MonoDevelop.Components.SearchEntry searchentry1;
-		private global::Gtk.Label label2;
-		private global::Gtk.ComboBox comboboxVisibilty;
-		private global::Gtk.HPaned hpaned1;
-		private global::Gtk.Alignment treeViewPlaceholder;
-		private global::Gtk.VBox vbox3;
-		private global::Gtk.Notebook notebook1;
-		private global::Gtk.ScrolledWindow documentationScrolledWindow;
-		private global::Gtk.Label documentationLabel;
-		private global::Gtk.VBox vboxInspect;
-		private global::Gtk.ScrolledWindow scrolledwindow3;
-		private global::Gtk.VBox searchWidget;
-		private global::Gtk.ScrolledWindow scrolledwindow1;
-		private global::Gtk.TreeView searchTreeview;
-		
+	{

+		private global::Gtk.UIManager UIManager;

+		private global::Gtk.Action NavigateBackwardAction;

+		private global::Gtk.Action NavigateForwardAction;

+		private global::Gtk.Action goBackAction;

+		private global::Gtk.Action goForwardAction;

+		private global::Gtk.Action goBackAction1;

+		private global::Gtk.VBox vbox1;

+		private global::Gtk.HBox hbox2;

+		private global::Gtk.Button buttonBack;

+		private global::Gtk.Button buttonForeward;

+		private global::Gtk.Label label3;

+		private global::Gtk.ComboBox languageCombobox;

+		private global::Gtk.Label label1;

+		private global::MonoDevelop.Components.SearchEntry searchentry1;

+		private global::Gtk.Label label2;

+		private global::Gtk.ComboBox comboboxVisibilty;

+		private global::Gtk.HPaned hpaned1;

+		private global::Gtk.Alignment treeViewPlaceholder;

+		private global::Gtk.VBox vbox3;

+		private global::Gtk.Notebook notebook1;

+		private global::Gtk.Notebook notebookInspection;

+		private global::Gtk.ScrolledWindow documentationScrolledWindow;

+		private global::Gtk.Label documentationLabel;

+		private global::Gtk.Label label4;

+		private global::Gtk.ScrolledWindow scrolledwindowEditor;

+		private global::Gtk.Label label5;

+		private global::Gtk.VBox searchWidget;

+		private global::Gtk.ScrolledWindow scrolledwindow1;

+		private global::Gtk.TreeView searchTreeview;

+		

 		protected virtual void Build ()
-		{
-			global::Stetic.Gui.Initialize (this);
-			// Widget MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget
-			Stetic.BinContainer w1 = global::Stetic.BinContainer.Attach (this);
-			this.UIManager = new global::Gtk.UIManager ();
-			global::Gtk.ActionGroup w2 = new global::Gtk.ActionGroup ("Default");
-			this.NavigateBackwardAction = new global::Gtk.Action ("NavigateBackwardAction", global::Mono.Unix.Catalog.GetString ("Navigate backward"), null, "gtk-go-back");
-			this.NavigateBackwardAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Navigate backward");
-			w2.Add (this.NavigateBackwardAction, null);
-			this.NavigateForwardAction = new global::Gtk.Action ("NavigateForwardAction", global::Mono.Unix.Catalog.GetString ("Navigate forward"), null, "gtk-go-forward");
-			this.NavigateForwardAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Navigate forward");
-			w2.Add (this.NavigateForwardAction, null);
-			this.goBackAction = new global::Gtk.Action ("goBackAction", null, null, "gtk-go-back");
-			w2.Add (this.goBackAction, null);
-			this.goForwardAction = new global::Gtk.Action ("goForwardAction", null, null, "gtk-go-forward");
-			w2.Add (this.goForwardAction, null);
-			this.goBackAction1 = new global::Gtk.Action ("goBackAction1", null, null, "gtk-go-back");
-			w2.Add (this.goBackAction1, null);
-			this.UIManager.InsertActionGroup (w2, 0);
-			this.Name = "MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget";
-			// Container child MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.Gtk.Container+ContainerChild
-			this.vbox1 = new global::Gtk.VBox ();
-			this.vbox1.Name = "vbox1";
-			this.vbox1.Spacing = 2;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.hbox2 = new global::Gtk.HBox ();
-			this.hbox2.Name = "hbox2";
-			this.hbox2.Spacing = 6;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.buttonBack = new global::Gtk.Button ();
-			this.buttonBack.CanFocus = true;
-			this.buttonBack.Name = "buttonBack";
-			this.buttonBack.UseStock = true;
-			this.buttonBack.UseUnderline = true;
-			this.buttonBack.Label = "gtk-go-back";
-			this.hbox2.Add (this.buttonBack);
-			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonBack]));
-			w3.Position = 0;
-			w3.Expand = false;
-			w3.Fill = false;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.buttonForeward = new global::Gtk.Button ();
-			this.buttonForeward.CanFocus = true;
-			this.buttonForeward.Name = "buttonForeward";
-			this.buttonForeward.UseStock = true;
-			this.buttonForeward.UseUnderline = true;
-			this.buttonForeward.Label = "gtk-go-forward";
-			this.hbox2.Add (this.buttonForeward);
-			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonForeward]));
-			w4.Position = 1;
-			w4.Expand = false;
-			w4.Fill = false;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.label3 = new global::Gtk.Label ();
-			this.label3.Name = "label3";
-			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("_Visibility:");
-			this.label3.UseUnderline = true;
-			this.hbox2.Add (this.label3);
-			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label3]));
-			w5.Position = 2;
-			w5.Expand = false;
-			w5.Fill = false;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.languageCombobox = global::Gtk.ComboBox.NewText ();
-			this.languageCombobox.Name = "languageCombobox";
-			this.hbox2.Add (this.languageCombobox);
-			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.languageCombobox]));
-			w6.PackType = ((global::Gtk.PackType)(1));
-			w6.Position = 3;
-			w6.Expand = false;
-			w6.Fill = false;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.label1 = new global::Gtk.Label ();
-			this.label1.Name = "label1";
-			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Language:");
-			this.label1.UseUnderline = true;
-			this.hbox2.Add (this.label1);
-			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label1]));
-			w7.PackType = ((global::Gtk.PackType)(1));
-			w7.Position = 4;
-			w7.Expand = false;
-			w7.Fill = false;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.searchentry1 = new global::MonoDevelop.Components.SearchEntry ();
-			this.searchentry1.Name = "searchentry1";
-			this.searchentry1.ForceFilterButtonVisible = false;
-			this.searchentry1.IsCheckMenu = false;
-			this.searchentry1.ActiveFilterID = 0;
-			this.searchentry1.Ready = false;
-			this.searchentry1.HasFocus = false;
-			this.hbox2.Add (this.searchentry1);
-			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.searchentry1]));
-			w8.PackType = ((global::Gtk.PackType)(1));
-			w8.Position = 5;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.label2 = new global::Gtk.Label ();
-			this.label2.Name = "label2";
-			this.label2.Xalign = 1F;
-			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("_Search:");
-			this.label2.UseUnderline = true;
-			this.hbox2.Add (this.label2);
-			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label2]));
-			w9.PackType = ((global::Gtk.PackType)(1));
-			w9.Position = 6;
-			// Container child hbox2.Gtk.Box+BoxChild
-			this.comboboxVisibilty = global::Gtk.ComboBox.NewText ();
-			this.comboboxVisibilty.Name = "comboboxVisibilty";
-			this.hbox2.Add (this.comboboxVisibilty);
-			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.comboboxVisibilty]));
-			w10.PackType = ((global::Gtk.PackType)(1));
-			w10.Position = 7;
-			w10.Expand = false;
-			w10.Fill = false;
-			this.vbox1.Add (this.hbox2);
-			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox2]));
-			w11.Position = 0;
-			w11.Expand = false;
-			w11.Fill = false;
-			// Container child vbox1.Gtk.Box+BoxChild
-			this.hpaned1 = new global::Gtk.HPaned ();
-			this.hpaned1.CanFocus = true;
-			this.hpaned1.Name = "hpaned1";
-			this.hpaned1.Position = 271;
-			// Container child hpaned1.Gtk.Paned+PanedChild
-			this.treeViewPlaceholder = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);
-			this.treeViewPlaceholder.Name = "treeViewPlaceholder";
-			this.hpaned1.Add (this.treeViewPlaceholder);
-			global::Gtk.Paned.PanedChild w12 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.treeViewPlaceholder]));
-			w12.Resize = false;
-			// Container child hpaned1.Gtk.Paned+PanedChild
-			this.vbox3 = new global::Gtk.VBox ();
-			this.vbox3.Name = "vbox3";
-			this.vbox3.Spacing = 6;
-			// Container child vbox3.Gtk.Box+BoxChild
-			this.notebook1 = new global::Gtk.Notebook ();
-			this.notebook1.CanFocus = true;
-			this.notebook1.Name = "notebook1";
-			this.notebook1.CurrentPage = 0;
-			this.notebook1.ShowBorder = false;
-			this.notebook1.ShowTabs = false;
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.documentationScrolledWindow = new global::Gtk.ScrolledWindow ();
-			this.documentationScrolledWindow.Name = "documentationScrolledWindow";
-			this.documentationScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child documentationScrolledWindow.Gtk.Container+ContainerChild
-			global::Gtk.Viewport w13 = new global::Gtk.Viewport ();
-			w13.ShadowType = ((global::Gtk.ShadowType)(0));
-			// Container child GtkViewport.Gtk.Container+ContainerChild
-			this.documentationLabel = new global::Gtk.Label ();
-			this.documentationLabel.Name = "documentationLabel";
-			this.documentationLabel.Xpad = 6;
-			this.documentationLabel.Ypad = 6;
-			this.documentationLabel.Xalign = 0F;
-			this.documentationLabel.Yalign = 0F;
-			this.documentationLabel.UseMarkup = true;
-			this.documentationLabel.Selectable = true;
-			w13.Add (this.documentationLabel);
-			this.documentationScrolledWindow.Add (w13);
-			this.notebook1.Add (this.documentationScrolledWindow);
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.vboxInspect = new global::Gtk.VBox ();
-			this.vboxInspect.Name = "vboxInspect";
-			this.vboxInspect.Spacing = 6;
-			// Container child vboxInspect.Gtk.Box+BoxChild
-			this.scrolledwindow3 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow3.CanFocus = true;
-			this.scrolledwindow3.Name = "scrolledwindow3";
-			this.scrolledwindow3.ShadowType = ((global::Gtk.ShadowType)(1));
-			this.vboxInspect.Add (this.scrolledwindow3);
-			global::Gtk.Box.BoxChild w17 = ((global::Gtk.Box.BoxChild)(this.vboxInspect [this.scrolledwindow3]));
-			w17.Position = 0;
-			this.notebook1.Add (this.vboxInspect);
-			global::Gtk.Notebook.NotebookChild w18 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.vboxInspect]));
-			w18.Position = 1;
-			// Container child notebook1.Gtk.Notebook+NotebookChild
-			this.searchWidget = new global::Gtk.VBox ();
-			this.searchWidget.Name = "searchWidget";
-			this.searchWidget.Spacing = 6;
-			// Container child searchWidget.Gtk.Box+BoxChild
-			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();
-			this.scrolledwindow1.CanFocus = true;
-			this.scrolledwindow1.Name = "scrolledwindow1";
-			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));
-			// Container child scrolledwindow1.Gtk.Container+ContainerChild
-			this.searchTreeview = new global::Gtk.TreeView ();
-			this.searchTreeview.CanFocus = true;
-			this.searchTreeview.Name = "searchTreeview";
-			this.scrolledwindow1.Add (this.searchTreeview);
-			this.searchWidget.Add (this.scrolledwindow1);
-			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.searchWidget [this.scrolledwindow1]));
-			w20.Position = 0;
-			this.notebook1.Add (this.searchWidget);
-			global::Gtk.Notebook.NotebookChild w21 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.searchWidget]));
-			w21.Position = 2;
-			this.vbox3.Add (this.notebook1);
-			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.notebook1]));
-			w22.Position = 0;
-			this.hpaned1.Add (this.vbox3);
-			this.vbox1.Add (this.hpaned1);
-			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hpaned1]));
-			w24.Position = 1;
-			this.Add (this.vbox1);
-			if ((this.Child != null)) {
-				this.Child.ShowAll ();
-			}
-			w1.SetUiManager (UIManager);
-			this.label3.MnemonicWidget = this.comboboxVisibilty;
-			this.label1.MnemonicWidget = this.languageCombobox;
-			this.label2.MnemonicWidget = this.searchentry1;
-			this.Show ();
-			this.NavigateBackwardAction.Activated += new global::System.EventHandler (this.OnNavigateBackwardActionActivated);
-			this.NavigateForwardAction.Activated += new global::System.EventHandler (this.OnNavigateForwardActionActivated);
-		}
-	}
-}
+		{

+			global::Stetic.Gui.Initialize (this);

+			// Widget MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget

+			Stetic.BinContainer w1 = global::Stetic.BinContainer.Attach (this);

+			this.UIManager = new global::Gtk.UIManager ();

+			global::Gtk.ActionGroup w2 = new global::Gtk.ActionGroup ("Default");

+			this.NavigateBackwardAction = new global::Gtk.Action ("NavigateBackwardAction", global::Mono.Unix.Catalog.GetString ("Navigate backward"), null, "gtk-go-back");

+			this.NavigateBackwardAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Navigate backward");

+			w2.Add (this.NavigateBackwardAction, null);

+			this.NavigateForwardAction = new global::Gtk.Action ("NavigateForwardAction", global::Mono.Unix.Catalog.GetString ("Navigate forward"), null, "gtk-go-forward");

+			this.NavigateForwardAction.ShortLabel = global::Mono.Unix.Catalog.GetString ("Navigate forward");

+			w2.Add (this.NavigateForwardAction, null);

+			this.goBackAction = new global::Gtk.Action ("goBackAction", null, null, "gtk-go-back");

+			w2.Add (this.goBackAction, null);

+			this.goForwardAction = new global::Gtk.Action ("goForwardAction", null, null, "gtk-go-forward");

+			w2.Add (this.goForwardAction, null);

+			this.goBackAction1 = new global::Gtk.Action ("goBackAction1", null, null, "gtk-go-back");

+			w2.Add (this.goBackAction1, null);

+			this.UIManager.InsertActionGroup (w2, 0);

+			this.Name = "MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget";

+			// Container child MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.Gtk.Container+ContainerChild

+			this.vbox1 = new global::Gtk.VBox ();

+			this.vbox1.Name = "vbox1";

+			this.vbox1.Spacing = 2;

+			// Container child vbox1.Gtk.Box+BoxChild

+			this.hbox2 = new global::Gtk.HBox ();

+			this.hbox2.Name = "hbox2";

+			this.hbox2.Spacing = 6;

+			// Container child hbox2.Gtk.Box+BoxChild

+			this.buttonBack = new global::Gtk.Button ();

+			this.buttonBack.CanFocus = true;

+			this.buttonBack.Name = "buttonBack";

+			this.buttonBack.UseStock = true;

+			this.buttonBack.UseUnderline = true;

+			this.buttonBack.Label = "gtk-go-back";

+			this.hbox2.Add (this.buttonBack);

+			global::Gtk.Box.BoxChild w3 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonBack]));

+			w3.Position = 0;

+			w3.Expand = false;

+			w3.Fill = false;

+			// Container child hbox2.Gtk.Box+BoxChild

+			this.buttonForeward = new global::Gtk.Button ();

+			this.buttonForeward.CanFocus = true;

+			this.buttonForeward.Name = "buttonForeward";

+			this.buttonForeward.UseStock = true;

+			this.buttonForeward.UseUnderline = true;

+			this.buttonForeward.Label = "gtk-go-forward";

+			this.hbox2.Add (this.buttonForeward);

+			global::Gtk.Box.BoxChild w4 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.buttonForeward]));

+			w4.Position = 1;

+			w4.Expand = false;

+			w4.Fill = false;

+			// Container child hbox2.Gtk.Box+BoxChild

+			this.label3 = new global::Gtk.Label ();

+			this.label3.Name = "label3";

+			this.label3.LabelProp = global::Mono.Unix.Catalog.GetString ("_Visibility:");

+			this.label3.UseUnderline = true;

+			this.hbox2.Add (this.label3);

+			global::Gtk.Box.BoxChild w5 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label3]));

+			w5.Position = 2;

+			w5.Expand = false;

+			w5.Fill = false;

+			// Container child hbox2.Gtk.Box+BoxChild

+			this.languageCombobox = global::Gtk.ComboBox.NewText ();

+			this.languageCombobox.Name = "languageCombobox";

+			this.hbox2.Add (this.languageCombobox);

+			global::Gtk.Box.BoxChild w6 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.languageCombobox]));

+			w6.PackType = ((global::Gtk.PackType)(1));

+			w6.Position = 3;

+			w6.Expand = false;

+			w6.Fill = false;

+			// Container child hbox2.Gtk.Box+BoxChild

+			this.label1 = new global::Gtk.Label ();

+			this.label1.Name = "label1";

+			this.label1.LabelProp = global::Mono.Unix.Catalog.GetString ("_Language:");

+			this.label1.UseUnderline = true;

+			this.hbox2.Add (this.label1);

+			global::Gtk.Box.BoxChild w7 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label1]));

+			w7.PackType = ((global::Gtk.PackType)(1));

+			w7.Position = 4;

+			w7.Expand = false;

+			w7.Fill = false;

+			// Container child hbox2.Gtk.Box+BoxChild

+			this.searchentry1 = new global::MonoDevelop.Components.SearchEntry ();

+			this.searchentry1.Name = "searchentry1";

+			this.searchentry1.ForceFilterButtonVisible = false;

+			this.searchentry1.IsCheckMenu = false;

+			this.searchentry1.ActiveFilterID = 0;

+			this.searchentry1.Ready = false;

+			this.searchentry1.HasFocus = false;

+			this.hbox2.Add (this.searchentry1);

+			global::Gtk.Box.BoxChild w8 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.searchentry1]));

+			w8.PackType = ((global::Gtk.PackType)(1));

+			w8.Position = 5;

+			// Container child hbox2.Gtk.Box+BoxChild

+			this.label2 = new global::Gtk.Label ();

+			this.label2.Name = "label2";

+			this.label2.Xalign = 1F;

+			this.label2.LabelProp = global::Mono.Unix.Catalog.GetString ("_Search:");

+			this.label2.UseUnderline = true;

+			this.hbox2.Add (this.label2);

+			global::Gtk.Box.BoxChild w9 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.label2]));

+			w9.PackType = ((global::Gtk.PackType)(1));

+			w9.Position = 6;

+			// Container child hbox2.Gtk.Box+BoxChild

+			this.comboboxVisibilty = global::Gtk.ComboBox.NewText ();

+			this.comboboxVisibilty.Name = "comboboxVisibilty";

+			this.hbox2.Add (this.comboboxVisibilty);

+			global::Gtk.Box.BoxChild w10 = ((global::Gtk.Box.BoxChild)(this.hbox2 [this.comboboxVisibilty]));

+			w10.PackType = ((global::Gtk.PackType)(1));

+			w10.Position = 7;

+			w10.Expand = false;

+			w10.Fill = false;

+			this.vbox1.Add (this.hbox2);

+			global::Gtk.Box.BoxChild w11 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hbox2]));

+			w11.Position = 0;

+			w11.Expand = false;

+			w11.Fill = false;

+			// Container child vbox1.Gtk.Box+BoxChild

+			this.hpaned1 = new global::Gtk.HPaned ();

+			this.hpaned1.CanFocus = true;

+			this.hpaned1.Name = "hpaned1";

+			this.hpaned1.Position = 271;

+			// Container child hpaned1.Gtk.Paned+PanedChild

+			this.treeViewPlaceholder = new global::Gtk.Alignment (0.5F, 0.5F, 1F, 1F);

+			this.treeViewPlaceholder.Name = "treeViewPlaceholder";

+			this.hpaned1.Add (this.treeViewPlaceholder);

+			global::Gtk.Paned.PanedChild w12 = ((global::Gtk.Paned.PanedChild)(this.hpaned1 [this.treeViewPlaceholder]));

+			w12.Resize = false;

+			// Container child hpaned1.Gtk.Paned+PanedChild

+			this.vbox3 = new global::Gtk.VBox ();

+			this.vbox3.Name = "vbox3";

+			this.vbox3.Spacing = 6;

+			// Container child vbox3.Gtk.Box+BoxChild

+			this.notebook1 = new global::Gtk.Notebook ();

+			this.notebook1.CanFocus = true;

+			this.notebook1.Name = "notebook1";

+			this.notebook1.CurrentPage = 0;

+			this.notebook1.ShowBorder = false;

+			// Container child notebook1.Gtk.Notebook+NotebookChild

+			this.notebookInspection = new global::Gtk.Notebook ();

+			this.notebookInspection.CanFocus = true;

+			this.notebookInspection.Name = "notebookInspection";

+			this.notebookInspection.CurrentPage = 1;

+			// Container child notebookInspection.Gtk.Notebook+NotebookChild

+			this.documentationScrolledWindow = new global::Gtk.ScrolledWindow ();

+			this.documentationScrolledWindow.Name = "documentationScrolledWindow";

+			this.documentationScrolledWindow.ShadowType = ((global::Gtk.ShadowType)(1));

+			// Container child documentationScrolledWindow.Gtk.Container+ContainerChild

+			global::Gtk.Viewport w13 = new global::Gtk.Viewport ();

+			w13.ShadowType = ((global::Gtk.ShadowType)(0));

+			// Container child GtkViewport.Gtk.Container+ContainerChild

+			this.documentationLabel = new global::Gtk.Label ();

+			this.documentationLabel.Name = "documentationLabel";

+			this.documentationLabel.Xpad = 6;

+			this.documentationLabel.Ypad = 6;

+			this.documentationLabel.Xalign = 0F;

+			this.documentationLabel.Yalign = 0F;

+			this.documentationLabel.UseMarkup = true;

+			this.documentationLabel.Selectable = true;

+			w13.Add (this.documentationLabel);

+			this.documentationScrolledWindow.Add (w13);

+			this.notebookInspection.Add (this.documentationScrolledWindow);

+			// Notebook tab

+			this.label4 = new global::Gtk.Label ();

+			this.label4.Name = "label4";

+			this.label4.LabelProp = global::Mono.Unix.Catalog.GetString ("summary");

+			this.notebookInspection.SetTabLabel (this.documentationScrolledWindow, this.label4);

+			this.label4.ShowAll ();

+			// Container child notebookInspection.Gtk.Notebook+NotebookChild

+			this.scrolledwindowEditor = new global::Gtk.ScrolledWindow ();

+			this.scrolledwindowEditor.CanFocus = true;

+			this.scrolledwindowEditor.Name = "scrolledwindowEditor";

+			this.scrolledwindowEditor.ShadowType = ((global::Gtk.ShadowType)(1));

+			this.notebookInspection.Add (this.scrolledwindowEditor);

+			global::Gtk.Notebook.NotebookChild w17 = ((global::Gtk.Notebook.NotebookChild)(this.notebookInspection [this.scrolledwindowEditor]));

+			w17.Position = 1;

+			// Notebook tab

+			this.label5 = new global::Gtk.Label ();

+			this.label5.Name = "label5";

+			this.label5.LabelProp = global::Mono.Unix.Catalog.GetString ("decompiler");

+			this.notebookInspection.SetTabLabel (this.scrolledwindowEditor, this.label5);

+			this.label5.ShowAll ();

+			this.notebook1.Add (this.notebookInspection);

+			// Container child notebook1.Gtk.Notebook+NotebookChild

+			this.searchWidget = new global::Gtk.VBox ();

+			this.searchWidget.Name = "searchWidget";

+			this.searchWidget.Spacing = 6;

+			// Container child searchWidget.Gtk.Box+BoxChild

+			this.scrolledwindow1 = new global::Gtk.ScrolledWindow ();

+			this.scrolledwindow1.CanFocus = true;

+			this.scrolledwindow1.Name = "scrolledwindow1";

+			this.scrolledwindow1.ShadowType = ((global::Gtk.ShadowType)(1));

+			// Container child scrolledwindow1.Gtk.Container+ContainerChild

+			this.searchTreeview = new global::Gtk.TreeView ();

+			this.searchTreeview.CanFocus = true;

+			this.searchTreeview.Name = "searchTreeview";

+			this.scrolledwindow1.Add (this.searchTreeview);

+			this.searchWidget.Add (this.scrolledwindow1);

+			global::Gtk.Box.BoxChild w20 = ((global::Gtk.Box.BoxChild)(this.searchWidget [this.scrolledwindow1]));

+			w20.Position = 0;

+			this.notebook1.Add (this.searchWidget);

+			global::Gtk.Notebook.NotebookChild w21 = ((global::Gtk.Notebook.NotebookChild)(this.notebook1 [this.searchWidget]));

+			w21.Position = 1;

+			this.vbox3.Add (this.notebook1);

+			global::Gtk.Box.BoxChild w22 = ((global::Gtk.Box.BoxChild)(this.vbox3 [this.notebook1]));

+			w22.Position = 0;

+			this.hpaned1.Add (this.vbox3);

+			this.vbox1.Add (this.hpaned1);

+			global::Gtk.Box.BoxChild w24 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.hpaned1]));

+			w24.Position = 1;

+			this.Add (this.vbox1);

+			if ((this.Child != null)) {

+				this.Child.ShowAll ();

+			}

+			w1.SetUiManager (UIManager);

+			this.label3.MnemonicWidget = this.comboboxVisibilty;

+			this.label1.MnemonicWidget = this.languageCombobox;

+			this.label2.MnemonicWidget = this.searchentry1;

+			this.Show ();

+			this.NavigateBackwardAction.Activated += new global::System.EventHandler (this.OnNavigateBackwardActionActivated);

+			this.NavigateForwardAction.Activated += new global::System.EventHandler (this.OnNavigateForwardActionActivated);

+		}

+	}

+}

diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs
index 8d3a3ae5d9..fbd31747d9 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/generated.cs
@@ -1,81 +1,82 @@
-
-// This file has been generated by the GUI designer. Do not modify.
+

+// This file has been generated by the GUI designer. Do not modify.

 namespace Stetic
-{
+{

 	internal class Gui
-	{
-		private static bool initialized;
-		
+	{

+		private static bool initialized;

+		

 		internal static void Initialize (Gtk.Widget iconRenderer)
-		{
-			if ((Stetic.Gui.initialized == false)) {
-				Stetic.Gui.initialized = true;
-			}
-		}
-	}
-	
+		{

+			if ((Stetic.Gui.initialized == false)) {

+				Stetic.Gui.initialized = true;

+			}

+		}

+	}

+	

 	internal class BinContainer
-	{
-		private Gtk.Widget child;
-		private Gtk.UIManager uimanager;
-		
+	{

+		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;
-		}
-		
+		{

+			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 ();
-			}
-		}
-		
+		{

+			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;
-			}
-		}
-		
+		{

+			if ((this.child != null)) {

+				this.child.Allocation = args.Allocation;

+			}

+		}

+		

 		private void OnAdded (object sender, Gtk.AddedArgs args)
-		{
-			this.child = args.Widget;
-		}
-		
+		{

+			this.child = args.Widget;

+		}

+		

 		public void SetUiManager (Gtk.UIManager uim)
-		{
-			this.uimanager = uim;
-			this.child.Realized += new System.EventHandler (this.OnRealized);
-		}
-		
+		{

+			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;
-				}
-			}
-		}
-	}
-	
+		{

+			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 ActionGroups
-	{
+	{

 		public static Gtk.ActionGroup GetActionGroup (System.Type type)
-		{
-			return Stetic.ActionGroups.GetActionGroup (type.FullName);
-		}
-		
+		{

+			return Stetic.ActionGroups.GetActionGroup (type.FullName);

+		}

+		

 		public static Gtk.ActionGroup GetActionGroup (string name)
-		{
-			return null;
-		}
-	}
-}
+		{

+			return null;

+		}

+	}

+}

diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
index 0214748846..8202f0622b 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <stetic-interface>
   <configuration>
-    <images-root-path>..</images-root-path>
+    <images-root-path>..\..\MonoDevelop.AssemblyBrowser</images-root-path>
     <target-gtk-version>2.12</target-gtk-version>
   </configuration>
   <import>
     <widget-library name="../../../../build/bin/MonoDevelop.Ide.dll" />
     <widget-library name="../../../../build/bin/Mono.TextEditor.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll" />
+    <widget-library name="../../../../build/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll" />
     <widget-library name="../../../../build/AddIns/MonoDevelop.AssemblyBrowser.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget" design-size="702 482">
@@ -204,43 +205,52 @@
                     <property name="CanFocus">True</property>
                     <property name="CurrentPage">0</property>
                     <property name="ShowBorder">False</property>
-                    <property name="ShowTabs">False</property>
                     <child>
-                      <widget class="Gtk.ScrolledWindow" id="documentationScrolledWindow">
+                      <widget class="Gtk.Notebook" id="notebookInspection">
                         <property name="MemberName" />
-                        <property name="ShadowType">In</property>
+                        <property name="CanFocus">True</property>
+                        <property name="CurrentPage">1</property>
                         <child>
-                          <widget class="Gtk.Viewport" id="GtkViewport">
+                          <widget class="Gtk.ScrolledWindow" id="documentationScrolledWindow">
                             <property name="MemberName" />
-                            <property name="ShadowType">None</property>
+                            <property name="ShadowType">In</property>
                             <child>
-                              <widget class="Gtk.Label" id="documentationLabel">
+                              <widget class="Gtk.Viewport" id="GtkViewport">
                                 <property name="MemberName" />
-                                <property name="ShowScrollbars">True</property>
-                                <property name="Xpad">6</property>
-                                <property name="Ypad">6</property>
-                                <property name="Xalign">0</property>
-                                <property name="Yalign">0</property>
-                                <property name="UseMarkup">True</property>
-                                <property name="MnemonicWidget">titleTextBox</property>
-                                <property name="Selectable">True</property>
+                                <property name="ShadowType">None</property>
+                                <child>
+                                  <widget class="Gtk.Label" id="documentationLabel">
+                                    <property name="MemberName" />
+                                    <property name="ShowScrollbars">True</property>
+                                    <property name="Xpad">6</property>
+                                    <property name="Ypad">6</property>
+                                    <property name="Xalign">0</property>
+                                    <property name="Yalign">0</property>
+                                    <property name="UseMarkup">True</property>
+                                    <property name="MnemonicWidget">titleTextBox</property>
+                                    <property name="Selectable">True</property>
+                                  </widget>
+                                </child>
                               </widget>
                             </child>
                           </widget>
                         </child>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="Gtk.VBox" id="vboxInspect">
-                        <property name="MemberName" />
-                        <property name="Spacing">6</property>
                         <child>
-                          <widget class="Gtk.ScrolledWindow" id="scrolledwindow3">
+                          <widget class="Gtk.Label" id="label4">
+                            <property name="MemberName" />
+                            <property name="LabelProp" translatable="yes">summary</property>
+                          </widget>
+                          <packing>
+                            <property name="type">tab</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.ScrolledWindow" id="scrolledwindowEditor">
                             <property name="MemberName" />
                             <property name="CanFocus">True</property>
                             <property name="ShadowType">In</property>
                             <child>
-                              <widget class="Gtk.Viewport" id="GtkViewport3">
+                              <widget class="Gtk.Viewport" id="GtkViewport1">
                                 <property name="MemberName" />
                                 <property name="ShadowType">None</property>
                                 <child>
@@ -250,14 +260,19 @@
                             </child>
                           </widget>
                           <packing>
-                            <property name="Position">0</property>
-                            <property name="AutoSize">True</property>
+                            <property name="Position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="Gtk.Label" id="label5">
+                            <property name="MemberName" />
+                            <property name="LabelProp" translatable="yes">decompiler</property>
+                          </widget>
+                          <packing>
+                            <property name="type">tab</property>
                           </packing>
                         </child>
                       </widget>
-                      <packing>
-                        <property name="Position">1</property>
-                      </packing>
                     </child>
                     <child>
                       <widget class="Gtk.VBox" id="searchWidget">
@@ -283,7 +298,7 @@
                         </child>
                       </widget>
                       <packing>
-                        <property name="Position">2</property>
+                        <property name="Position">1</property>
                       </packing>
                     </child>
                   </widget>