[Monodevelop-patches-list] r508 - in trunk/MonoDevelop: . src/Main/Base/Gui/Components

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-01-16 22:27:58 -0500 (Fri, 16 Jan 2004)
New Revision: 508

Modified:
   trunk/MonoDevelop/RELEASE_REQUIREMENTS
   trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs
Log:
fixed that dumb accel issue


Modified: trunk/MonoDevelop/RELEASE_REQUIREMENTS
===================================================================
--- trunk/MonoDevelop/RELEASE_REQUIREMENTS	2004-01-17 02:58:10 UTC (rev 507)
+++ trunk/MonoDevelop/RELEASE_REQUIREMENTS	2004-01-17 03:27:58 UTC (rev 508)
@@ -10,6 +10,5 @@
   what exactly #D does with unsaved files (need someone with windows to play
   around)
 ~ Finish HtmlControl
-~ Why the hell is new file showing up as Ctrl+O?!?
 ~ Revert back to the old popup mechanism (immediate) and have an option
   'autopopup on/off' to control if it comes up or requires a ctrl+space to popup

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs	2004-01-17 02:58:10 UTC (rev 507)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs	2004-01-17 03:27:58 UTC (rev 508)
@@ -116,7 +116,7 @@
 		public void SetAccel (string[] keys)
 		{
 			Gdk.ModifierType mod = 0;
-			string accel_path = "<MonoDevelop>/MainWindow/" + this.Text;
+			string accel_path = "<MonoDevelop>/MainWindow/" + this.Text + keys[keys.Length - 1];
 			uint ckey = 0;
 			foreach (string key in keys) {
 				if (key == "Control") {
@@ -129,12 +129,10 @@
 					ckey = Gdk.Keyval.FromName (key);
 				}
 			}
-			if (Gtk.Accel.MapLookupEntry (accel_path, new Gtk.AccelKey()) ) {
-				Gtk.Accel.MapChangeEntry (accel_path, ckey, mod, true);
-			} else {
+			if (!Gtk.Accel.MapLookupEntry (accel_path, new Gtk.AccelKey()) ) {
 				Gtk.Accel.MapAddEntry (accel_path, ckey, mod);
+				this.AccelPath = accel_path;
 			}
-			this.AccelPath = accel_path;
 		}
 		
 		protected void OnClick(object o, EventArgs e)