[Monodevelop-patches-list] r2586 - in trunk/MonoDevelop/Core/src: MonoDevelop.Base MonoDevelop.Dock

[John Luke <jluke@cfl.rr.com>]

Author: jluke
Date: 2005-06-04 16:31:33 -0400 (Sat, 04 Jun 2005)
New Revision: 2586

Modified:
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml
   trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog
   trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs
   trunk/MonoDevelop/Core/src/MonoDevelop.Dock/GdlDockTest.cs
Log:
improve fix for bug 61113 by handling shift|f8 in DockPaned


Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-06-03 14:48:42 UTC (rev 2585)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/ChangeLog	2005-06-04 20:31:33 UTC (rev 2586)
@@ -1,3 +1,8 @@
+2005-06-04  John Luke  <john.luke at gmail.com>
+
+	* MonoDevelopCore.addin.xml: remove workaround
+	for Shift|F8 as the dock handles it now
+
 2005-06-03  Jacob Ilsø Christensen  <jacobilsoe at gmail.com>
 
 	* Internal/Project/Combine/Combine.cs: Remove references

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml	2005-06-03 14:48:42 UTC (rev 2585)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Base/MonoDevelopCore.addin.xml	2005-06-04 20:31:33 UTC (rev 2586)
@@ -405,8 +405,7 @@
 				defaultHandler = "MonoDevelop.Commands.TipOfTheDayHandler"
 				_label = "_Tip of the Day..." 
 				icon = "Icons.16x16.TipOfTheDay" 
-				description = "Show tip of the day"
-				shortcut = "Shift|F8" />
+				description = "Show tip of the day" />
 		<Command id = "MonoDevelop.Commands.HelpCommands.About"
 				defaultHandler = "MonoDevelop.Commands.AboutHandler"
 				_label = "_About" 

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog	2005-06-03 14:48:42 UTC (rev 2585)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/ChangeLog	2005-06-04 20:31:33 UTC (rev 2586)
@@ -1,3 +1,8 @@
+2005-06-04  John Luke  <john.luke at gmail.com>
+
+	* DockPaned.cs: handle Shift|F8 to avoid crash for now
+	* GdlDockTest.cs: remove C# 2 features
+
 2005-04-28  John Luke  <john.luke at gmail.com>
 
 	* DockBar.cs: remove redundent RemoveItem call

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs	2005-06-03 14:48:42 UTC (rev 2585)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/DockPaned.cs	2005-06-04 20:31:33 UTC (rev 2586)
@@ -85,6 +85,7 @@
 			
 			Child.AddNotification ("position", new GLib.NotifyHandler (OnNotifyPosition));
 			Child.ButtonReleaseEvent += new ButtonReleaseEventHandler (OnButtonReleased);
+			Child.KeyPressEvent += new KeyPressEventHandler (OnKeyPressed);
 												
 			Child.Parent = this;
 			Child.Show ();
@@ -139,6 +140,7 @@
 			// after that we can remove the Paned child
 			if (Child != null) {
 				Child.ButtonReleaseEvent -= new ButtonReleaseEventHandler (OnButtonReleased);
+				Child.KeyPressEvent -= new KeyPressEventHandler (OnKeyPressed);
 				Child.Unparent ();
 				Child = null;
 			}
@@ -308,6 +310,14 @@
 		}
 
 		[GLib.ConnectBefore]
+		void OnKeyPressed (object sender, KeyPressEventArgs a)
+		{
+			// eat Shift|F8, see http://bugzilla.ximian.com/show_bug.cgi?id=61113
+			if (a.Event.Key == Gdk.Key.F8 && a.Event.State == Gdk.ModifierType.ShiftMask)
+				a.RetVal = true;
+		}
+
+		[GLib.ConnectBefore]
 		void OnButtonReleased (object sender, ButtonReleaseEventArgs a)
 		{
 			if (a.Event.Button == 1 && positionChanged) {

Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Dock/GdlDockTest.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Dock/GdlDockTest.cs	2005-06-03 14:48:42 UTC (rev 2585)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Dock/GdlDockTest.cs	2005-06-04 20:31:33 UTC (rev 2586)
@@ -72,15 +72,15 @@
 		table.PackEnd (box, false, false, 0);
 		
 		Button button = new Button (Gtk.Stock.Save);
-		button.Clicked += OnSaveLayout;
+		button.Clicked += new EventHandler (OnSaveLayout);
 		box.PackEnd (button, false, true, 0);
 		
 		button = new Button ("Layout Manager");
-		button.Clicked += OnRunLayoutManager;
+		button.Clicked += new EventHandler (OnRunLayoutManager);
 		box.PackEnd (button, false, true, 0);
 
 		button = new Button ("Dump XML");
-		button.Clicked += OnDumpXML;
+		button.Clicked += new EventHandler (OnDumpXML);
 		box.PackEnd (button, false, true, 0);
 
 		app.ShowAll ();