Author: fejj
Date: 2007-04-02 16:33:25 -0400 (Mon, 02 Apr 2007)
New Revision: 75304
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationHistory.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationService.cs
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
Log:
2007-04-02 Jeffrey Stedfast <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui/NavigationHistory.cs: Implement
NavigationHistoryForward class.
* MonoDevelop.Ide.Gui/NavigationService.cs: After jumping to the new
point, emit the HistoryChanged event.
* MonoDevelop.Ide.addin.xml: The Forward button now uses the same
custom widget.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-04-02
20:25:47 UTC (rev 75303)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/ChangeLog 2007-04-02
20:33:25 UTC (rev 75304)
@@ -1,8 +1,19 @@
+2007-04-02 Jeffrey Stedfast <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Ide.Gui/NavigationHistory.cs: Implement
+ NavigationHistoryForward class.
+
+ * MonoDevelop.Ide.Gui/NavigationService.cs: After jumping to the new
+ point, emit the HistoryChanged event.
+
+ * MonoDevelop.Ide.addin.xml: The Forward button now uses the same
+ custom widget.
+
2007-03-30 Jeffrey Stedfast <[EMAIL PROTECTED]>
* MonoDevelop.Ide.Gui/NavigationHistory.cs: New widget
- implementing the Back
- (and someday Forward?) custom history navigation widget.
+ implementing the Back (and someday Forward?) custom
+ history navigation widget.
* MonoDevelop.Ide.addin.xml: Changed the info for the NavigateBack
button, it is now a custom widget.
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs
2007-04-02 20:25:47 UTC (rev 75303)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Commands/NavigationCommands.cs
2007-04-02 20:33:25 UTC (rev 75304)
@@ -31,7 +31,7 @@
protected override void Update (CommandInfo info)
{
- info.Enabled = NavigationService.CanNavigateForwards;
+ info.Enabled = NavigationService.CanNavigateForward;
}
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationHistory.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationHistory.cs
2007-04-02 20:25:47 UTC (rev 75303)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationHistory.cs
2007-04-02 20:33:25 UTC (rev 75304)
@@ -148,4 +148,57 @@
base.UpdateHistory ();
}
}
+
+ public class NavigationHistoryForward : NavigationHistory {
+ public NavigationHistoryForward () : base ("gtk-go-forward")
+ {
+ UpdateHistory ();
+ }
+
+ protected override void Go ()
+ {
+ NavigationService.Go (1);
+ }
+
+ protected override void UpdateHistory ()
+ {
+ Menu menu = new Menu ();
+
+ navpoints.Clear ();
+
+ if (NavigationService.CanNavigateForward) {
+ List<INavigationPoint> points;
+ INavigationPoint point;
+ MenuItem item;
+ int i;
+
+ points = new List<INavigationPoint>
(NavigationService.Points);
+
+ for (i = 0; i < points.Count; i++) {
+ point = points[i];
+ if (point ==
NavigationService.CurrentPosition) {
+ i++;
+ break;
+ }
+ }
+
+ while (i < points.Count) {
+ point = points[i++];
+ item = new MenuItem
(point.FullDescription);
+ item.Activated += new EventHandler
(GoTo);
+ navpoints.Add (item, point);
+ item.Show ();
+
+ ((MenuShell) menu).Append (item);
+ }
+
+ this.Sensitive = true;
+ } else {
+ this.Sensitive = false;
+ }
+
+ menu.Show ();
+ button.Menu = menu;
+ }
+ }
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationService.cs
2007-04-02 20:25:47 UTC (rev 75303)
+++
trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.Gui/NavigationService.cs
2007-04-02 20:33:25 UTC (rev 75304)
@@ -60,7 +60,7 @@
get { return currentNode != history.First &&
currentNode != null; }
}
- public static bool CanNavigateForwards {
+ public static bool CanNavigateForward {
get { return currentNode != history.Last && currentNode
!= null; }
}
@@ -196,6 +196,8 @@
}
SyncViewWithModel ();
+
+ OnHistoryChanged ();
}
public static void Go (INavigationPoint target)
@@ -215,6 +217,8 @@
}
SyncViewWithModel ();
+
+ OnHistoryChanged ();
}
private static void SyncViewWithModel ()
Modified: trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
2007-04-02 20:25:47 UTC (rev 75303)
+++ trunk/monodevelop/Core/src/MonoDevelop.Ide/MonoDevelop.Ide.addin.xml
2007-04-02 20:33:25 UTC (rev 75304)
@@ -140,9 +140,9 @@
_label = "_Back"
_description = "Navigate Back"/>
<Command id =
"MonoDevelop.Ide.Commands.NavigationCommands.NavigateForward"
- defaultHandler =
"MonoDevelop.Ide.Commands.NavigateForward"
- _label = "_Forward"
- icon = "gtk-go-forward"
+ type = "custom"
+ widget =
"MonoDevelop.Ide.Gui.NavigationHistoryForward"
+ _label = "_Forward"
_description = "Navigate Forward"/>
<!-- ProjectCommands -->
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches