Fixed 'Bug 33027 - Assembly Browser navigation is confusing'.

6 files changed, 170 insertions, 149 deletions

diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
index dd46580b4c..dab912b4eb 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
@@ -179,6 +179,7 @@
     <Compile Include="AddinInfo.cs" />
     <Compile Include="MonoDevelop.AssemblyBrowser\NRefactoryStock.cs" />
     <Compile Include="MonoDevelop.AssemblyBrowser\HelpExtensions.cs" />
+    <Compile Include="MonoDevelop.AssemblyBrowser\AssemblyBrowserNavigationPoint.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserNavigationPoint.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserNavigationPoint.cs
new file mode 100644
index 0000000000..b11548c299
--- /dev/null
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserNavigationPoint.cs
@@ -0,0 +1,102 @@
+//
+// AssemblyBrowserNavigationPoint.cs
+//
+// Author:
+//       Mike Krüger <mkrueger@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc. (http://xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+using System.Linq;
+using MonoDevelop.Core;
+using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Navigation;
+using ICSharpCode.NRefactory.TypeSystem;
+using System.Collections.Generic;
+
+namespace MonoDevelop.AssemblyBrowser
+{
+	class AssemblyBrowserNavigationPoint : NavigationPoint
+	{
+		List<AssemblyLoader> definitions;
+		string idString;
+
+		public AssemblyBrowserNavigationPoint (List<AssemblyLoader> definitions, string idString)
+		{
+			this.definitions = definitions;
+			this.idString = idString;
+		}
+
+		Document DoShow ()
+		{
+			Document result = null;
+			foreach (var view in Ide.IdeApp.Workbench.Documents) {
+				if (view.GetContent<AssemblyBrowserViewContent> () != null) {
+					view.Window.SelectWindow ();
+					result = view;
+					break;
+				}
+			}
+
+			if (result == null) {
+				var binding = DisplayBindingService.GetBindings<AssemblyBrowserDisplayBinding> ().FirstOrDefault ();
+				var assemblyBrowserView = binding != null ? binding.GetViewContent () : new AssemblyBrowserViewContent ();
+				assemblyBrowserView.FillWidget ();
+				result = Ide.IdeApp.Workbench.OpenDocument (assemblyBrowserView, true);
+			}
+			if (idString != null) {
+				var view = result.GetContent<AssemblyBrowserViewContent> ();
+				view.Widget.suspendNavigation = true;
+				view.EnsureDefinitionsLoaded (definitions);
+				view.Open (idString, expandNode: false);
+			}
+			return result;
+		}
+
+		public override bool Equals (object obj)
+		{
+			var other = obj as AssemblyBrowserNavigationPoint;
+			if (other == null)
+				return false;
+			return other.idString.Equals (idString);
+		}
+
+		public override int GetHashCode ()
+		{
+			return idString.GetHashCode ();
+		}
+
+		#region implemented abstract members of NavigationPoint
+
+		public override Document ShowDocument ()
+		{
+			return DoShow ();
+		}
+
+		public override string DisplayName {
+			get {
+				return GettextCatalog.GetString ("Assembly Browser");
+			}
+		}
+
+		#endregion
+	}
+}
+
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
index 5199c85d56..177a61db98 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserViewContent.cs
@@ -36,7 +36,8 @@ using MonoDevelop.Ide.Navigation;
 using MonoDevelop.Projects;
 using System.Linq;
 using MonoDevelop.Ide;
-
+using System.Collections.Generic;

+

 namespace MonoDevelop.AssemblyBrowser
 {
 	class AssemblyBrowserViewContent : AbstractViewContent, IOpenNamedElementHandler, INavigable
@@ -77,7 +78,12 @@ namespace MonoDevelop.AssemblyBrowser
 			ContentName = GettextCatalog.GetString ("Assembly Browser");
 			widget.AddReferenceByFileName (fileOpenInformation.FileName);
 		}
-		
+
+		internal void EnsureDefinitionsLoaded (List<AssemblyLoader> definitions)
+		{
+			widget.EnsureDefinitionsLoaded (definitions);
+		}
+
 		public override bool IsFile {
 			get {
 				return false;
@@ -101,24 +107,24 @@ namespace MonoDevelop.AssemblyBrowser
 		
 		public NavigationPoint BuildNavigationPoint ()
 		{
-			return new AssemblyBrowserNavigationPoint ();
+			return widget.BuildNavigationPoint ();
 		}
 		
 		#endregion
 
 		#region IUrlHandler implementation 
 		
-		public void Open (Microsoft.CodeAnalysis.ISymbol element)
+		public void Open (Microsoft.CodeAnalysis.ISymbol element, bool expandNode = true)
 		{
 			var url = element.OriginalDefinition.GetDocumentationCommentId ();//AssemblyBrowserWidget.GetIdString (member); 
 			widget.PublicApiOnly = element.DeclaredAccessibility == Microsoft.CodeAnalysis.Accessibility.Public;
-			widget.Open (url);
+			widget.Open (url, expandNode: expandNode);
 		}
 
-		public void Open (string documentationCommentId, bool openInPublicOnlyMode = true)
+		public void Open (string documentationCommentId, bool openInPublicOnlyMode = true, bool expandNode = true)
 		{
 			widget.PublicApiOnly = openInPublicOnlyMode;
-			widget.Open (documentationCommentId);
+			widget.Open (documentationCommentId, expandNode: expandNode);
 		}
 
 		#endregion 
@@ -164,37 +170,5 @@ namespace MonoDevelop.AssemblyBrowser
 		}
 	}
 
-	class AssemblyBrowserNavigationPoint : NavigationPoint
-	{
-		static Document DoShow ()
-		{
-			foreach (var view in Ide.IdeApp.Workbench.Documents) {
-				if (view.GetContent<AssemblyBrowserViewContent> () != null) {
-					view.Window.SelectWindow ();
-					return view;
-				}
-			}
-
-			var binding = DisplayBindingService.GetBindings<AssemblyBrowserDisplayBinding> ().FirstOrDefault ();
-			var assemblyBrowserView = binding != null ? binding.GetViewContent () : new AssemblyBrowserViewContent ();
-			assemblyBrowserView.FillWidget ();
 
-			return Ide.IdeApp.Workbench.OpenDocument (assemblyBrowserView, true);
-		}
-
-		#region implemented abstract members of NavigationPoint
-
-		public override Document ShowDocument ()
-		{
-			return DoShow ();
-		}
-
-		public override string DisplayName {
-			get {
-				return GettextCatalog.GetString ("Assembly Browser");
-			}
-		}
-
-		#endregion
-	}
 }
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
index 83a1171990..46c9f89360 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
@@ -51,6 +51,8 @@ using MonoDevelop.Components;
 using System.Threading.Tasks;
 using System.Threading;
 using MonoDevelop.Ide.Editor;
+using MonoDevelop.Ide.Navigation;
+using MonoDevelop.Ide.Gui.Content;
 
 namespace MonoDevelop.AssemblyBrowser
 {
@@ -58,8 +60,6 @@ namespace MonoDevelop.AssemblyBrowser
 	[System.ComponentModel.ToolboxItem(true)]
 	partial class AssemblyBrowserWidget : Gtk.Bin
 	{
-		Gtk.Button buttonBack;
-		Gtk.Button buttonForeward;
 		Gtk.ComboBox comboboxVisibilty;
 		MonoDevelop.Components.SearchEntry searchentry1;
 		Gtk.ComboBox languageCombobox;
@@ -165,19 +165,13 @@ namespace MonoDevelop.AssemblyBrowser
 		{
 			this.Build ();
 
-			buttonBack = new Gtk.Button (ImageService.GetImage ("md-breadcrumb-prev", Gtk.IconSize.Menu));
-			buttonBack.Clicked += OnNavigateBackwardActionActivated;
-
-			buttonForeward = new Gtk.Button (ImageService.GetImage ("md-breadcrumb-next", Gtk.IconSize.Menu));
-			buttonForeward.Clicked += OnNavigateForwardActionActivated;
-
 			comboboxVisibilty = ComboBox.NewText ();
 			comboboxVisibilty.InsertText (0, GettextCatalog.GetString ("Only public members"));
 			comboboxVisibilty.InsertText (1, GettextCatalog.GetString ("All members"));
-			comboboxVisibilty.Active = 0;
+			comboboxVisibilty.Active = 0; 
 			comboboxVisibilty.Changed += delegate {
 				TreeView.PublicApiOnly = comboboxVisibilty.Active == 0;
-				FillInspectLabel ();
+				FillInspectLabel (); 
 			};
 
 			searchentry1 = new MonoDevelop.Components.SearchEntry ();
@@ -292,12 +286,6 @@ namespace MonoDevelop.AssemblyBrowser
 
 		internal void SetToolbar (DocumentToolbar toolbar)
 		{
-			toolbar.Add (buttonBack);
-
-			toolbar.Add (buttonForeward);
-
-			toolbar.Add (new VSeparator ());
-
 			Gtk.Label la = new Label (GettextCatalog.GetString ("Visibility"));
 			toolbar.Add (la);
 
@@ -375,20 +363,20 @@ namespace MonoDevelop.AssemblyBrowser
 			TreeView.GrabFocus ();
 		}
 		
-		ITreeNavigator SearchMember (IUnresolvedEntity member)
+		ITreeNavigator SearchMember (IUnresolvedEntity member, bool expandNode = true)
 		{
-			return SearchMember (GetIdString (member));
+			return SearchMember (GetIdString (member), expandNode);
 		}
 			
-		ITreeNavigator SearchMember (string helpUrl)
+		ITreeNavigator SearchMember (string helpUrl, bool expandNode = true)
 		{
-			var nav = SearchMember (TreeView.GetRootNode (), helpUrl);
+			var nav = SearchMember (TreeView.GetRootNode (), helpUrl, expandNode);
 			if (nav != null)
 				return nav;
 			// Constructor may be a generated default without implementation.
 			var ctorIdx = helpUrl.IndexOf (".#ctor", StringComparison.Ordinal);
 			if (helpUrl.StartsWith ("M:", StringComparison.Ordinal) && ctorIdx > 0) {
-				return SearchMember ("T" + helpUrl.Substring (1, ctorIdx - 1));
+				return SearchMember ("T" + helpUrl.Substring (1, ctorIdx - 1), expandNode);
 			}
 			return null;
 		}
@@ -588,7 +576,7 @@ namespace MonoDevelop.AssemblyBrowser
 			return false;
 		}
 		
-		ITreeNavigator SearchMember (ITreeNavigator nav, string helpUrl)
+		ITreeNavigator SearchMember (ITreeNavigator nav, string helpUrl, bool expandNode = true)
 		{
 			if (nav == null)
 				return null;
@@ -597,13 +585,18 @@ namespace MonoDevelop.AssemblyBrowser
 				if (IsMatch (nav, helpUrl, searchType)) {
 					inspectEditor.ClearSelection ();
 					nav.ExpandToNode ();
-					nav.Selected = nav.Expanded = true;
-					nav.ScrollToNode ();
+					if (expandNode) {
+						nav.Selected = nav.Expanded = true;
+						nav.ScrollToNode ();
+					} else {
+						nav.Selected = true;
+						nav.ScrollToNode ();
+					}
 					return nav;
 				}
 				if (!SkipChildren (nav, helpUrl, searchType) && nav.HasChildren ()) {
 					nav.MoveToFirstChild ();
-					ITreeNavigator result = SearchMember (nav, helpUrl);
+					ITreeNavigator result = SearchMember (nav, helpUrl, expandNode);
 					if (result != null)
 						return result;
 					
@@ -613,7 +606,7 @@ namespace MonoDevelop.AssemblyBrowser
 					try {
 						if (nav.DataItem is TypeDefinition && PublicApiOnly) {
 							nav.MoveToFirstChild ();
-							result = SearchMember (nav, helpUrl);
+							result = SearchMember (nav, helpUrl, expandNode);
 							if (result != null)
 								return result;
 							nav.MoveToParent ();
@@ -1215,11 +1208,12 @@ namespace MonoDevelop.AssemblyBrowser
 			this.hpaned1.Position = Math.Min (350, this.Allocation.Width * 2 / 3);
 		}
 		
-		internal void Open (string url, AssemblyLoader currentAssembly = null)
+		internal void Open (string url, AssemblyLoader currentAssembly = null, bool expandNode = true)
 		{
 			Task.WhenAll (this.definitions.Select (d => d.LoadingTask).ToArray ()).ContinueWith (d => {
 				Application.Invoke (delegate {
-					ITreeNavigator nav = SearchMember (url);
+					suspendNavigation = false;
+					ITreeNavigator nav = SearchMember (url, expandNode);
 					if (definitions == null) // we've been disposed
 						return;
 					if (nav != null)
@@ -1237,7 +1231,7 @@ namespace MonoDevelop.AssemblyBrowser
 			});
 		}
 
-		async void OpenFromAssembly (string url, AssemblyLoader currentAssembly)
+		async void OpenFromAssembly (string url, AssemblyLoader currentAssembly, bool expandNode = true)
 		{
 			var cecilObject = loader.GetCecilObject (currentAssembly.UnresolvedAssembly);
 			if (cecilObject == null)
@@ -1262,7 +1256,7 @@ namespace MonoDevelop.AssemblyBrowser
 					if (definitions == null) // disposed
 						return;
 					Application.Invoke (delegate {
-						var nav = SearchMember (url);
+						var nav = SearchMember (url, expandNode);
 						if (nav == null) {
 							if (++i == references.Count)
 								LoggingService.LogError ("Assembly browser: Can't find: " + url + ".");
@@ -1416,15 +1410,6 @@ namespace MonoDevelop.AssemblyBrowser
 //			this.searchEntry.Changed -= SearchEntryhandleChanged;
 			this.searchTreeview.RowActivated -= SearchTreeviewhandleRowActivated;
 			hpaned1.ExposeEvent -= HPaneExpose;
-			if (NavigateBackwardAction != null) {
-				this.NavigateBackwardAction.Dispose ();
-				this.NavigateBackwardAction = null;
-			}
-
-			if (NavigateForwardAction != null) {
-				this.NavigateForwardAction.Dispose ();
-				this.NavigateForwardAction = null;
-			}
 			base.OnDestroyed ();
 		}
 		
@@ -1538,60 +1523,46 @@ namespace MonoDevelop.AssemblyBrowser
 		}
 
 		//MonoDevelop.Components.RoundedFrame popupWidgetFrame;
-	
+
 		#region NavigationHistory
-		Stack<ITreeNavigator> navigationBackwardHistory = new Stack<ITreeNavigator> ();
-		Stack<ITreeNavigator> navigationForwardHistory = new Stack<ITreeNavigator> ();
-		ITreeNavigator currentItem = null;
-		bool inNavigationOperation = false;
+		internal bool suspendNavigation;
 		void HandleCursorChanged (object sender, EventArgs e)
 		{
-			if (!inNavigationOperation) {
-				if (currentItem != null)
-					navigationBackwardHistory.Push (currentItem);
-				currentItem = TreeView.GetSelectedNode ();
-				ActiveMember = currentItem.DataItem as IEntity;
-				navigationForwardHistory.Clear ();
+			if (!suspendNavigation) {
+				var selectedEntity = TreeView.GetSelectedNode ()?.DataItem as IUnresolvedEntity;
+				if (selectedEntity != null)
+					NavigationHistoryService.LogActiveDocument ();
 			}
 			notebook1.Page = 0;
-			UpdateNavigationActions ();
 			CreateOutput ();
 		}
-		
-		void UpdateNavigationActions ()
-		{
-			if (buttonBack != null) {
-				buttonBack.Sensitive = navigationBackwardHistory.Count != 0;
-				buttonForeward.Sensitive = navigationForwardHistory.Count != 0;
-			}
-		}
-		
-		protected virtual void OnNavigateBackwardActionActivated (object sender, System.EventArgs e)
+
+		public NavigationPoint BuildNavigationPoint ()
 		{
-			if (navigationBackwardHistory.Count == 0)
-				return;
-			inNavigationOperation = true;
-			ITreeNavigator item = navigationBackwardHistory.Pop ();
-			item.Selected = true;
-			navigationForwardHistory.Push (currentItem);
-			currentItem = item;
-			inNavigationOperation = false;
-			UpdateNavigationActions ();
+			var selectedEntity = TreeView.GetSelectedNode ()?.DataItem as IUnresolvedEntity;
+			if (selectedEntity == null)
+				return null;
+			return new AssemblyBrowserNavigationPoint (definitions, GetIdString (selectedEntity));
 		}
-	
-		protected virtual void OnNavigateForwardActionActivated (object sender, System.EventArgs e)
+		#endregion
+
+		internal void EnsureDefinitionsLoaded (List<AssemblyLoader> definitions)
 		{
-			if (navigationForwardHistory.Count == 0)
-				return;
-			inNavigationOperation = true;
-			ITreeNavigator item = navigationForwardHistory.Pop ();
-			item.Selected = true;
-			navigationBackwardHistory.Push (currentItem);
-			currentItem = item;
-			inNavigationOperation = false;
-			UpdateNavigationActions ();
+			if (definitions == null)
+				throw new ArgumentNullException (nameof (definitions));
+			foreach (var def in definitions) {
+				if (!this.definitions.Contains (def)) {
+					this.definitions.Add (def);
+					Application.Invoke (delegate {
+						if (definitions.Count + projects.Count == 1) {
+							TreeView.LoadTree (def.LoadingTask.Result);
+						} else {
+							TreeView.AddChild (def.LoadingTask.Result);
+						}
+					});
+				}
+			}
 		}
-		#endregion
 	}
 }
 
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 99e5465de5..b3a9714bcf 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
@@ -6,10 +6,6 @@ namespace MonoDevelop.AssemblyBrowser
 	{
 		private global::Gtk.UIManager UIManager;
 
-		private global::Gtk.Action NavigateBackwardAction;
-
-		private global::Gtk.Action NavigateForwardAction;
-
 		private global::Gtk.VBox vbox1;
 
 		private global::Gtk.HPaned hpaned1;
@@ -35,12 +31,6 @@ namespace MonoDevelop.AssemblyBrowser
 			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.UIManager.InsertActionGroup(w2, 0);
 			this.Name = "MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget";
 			// Container child MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget.Gtk.Container+ContainerChild
@@ -107,8 +97,6 @@ namespace MonoDevelop.AssemblyBrowser
 			}
 			w1.SetUiManager(UIManager);
 			this.Hide();
-			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/gui.stetic b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
index fe7c847d7a..689f8cf582 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/gtk-gui/gui.stetic
@@ -12,22 +12,7 @@
     <widget-library name="../../../../build/AddIns/DisplayBindings/AssemblyBrowser/MonoDevelop.AssemblyBrowser.dll" internal="true" />
   </import>
   <widget class="Gtk.Bin" id="MonoDevelop.AssemblyBrowser.AssemblyBrowserWidget" design-size="702 482">
-    <action-group name="Default">
-      <action id="NavigateBackwardAction">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Navigate backward</property>
-        <property name="ShortLabel" translatable="yes">Navigate backward</property>
-        <property name="StockId">gtk-go-back</property>
-        <signal name="Activated" handler="OnNavigateBackwardActionActivated" />
-      </action>
-      <action id="NavigateForwardAction">
-        <property name="Type">Action</property>
-        <property name="Label" translatable="yes">Navigate forward</property>
-        <property name="ShortLabel" translatable="yes">Navigate forward</property>
-        <property name="StockId">gtk-go-forward</property>
-        <signal name="Activated" handler="OnNavigateForwardActionActivated" />
-      </action>
-    </action-group>
+    <action-group name="Default" />
     <property name="MemberName" />
     <property name="Visible">False</property>
     <child>