[Monodevelop-patches-list] r698 - in trunk/MonoDevelop: build/AddIns src/Main/Base/Gui/Components src/Main/Base/Internal/Codons/MenuItems

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

Author: tberman
Date: 2004-01-27 22:44:23 -0500 (Tue, 27 Jan 2004)
New Revision: 698

Modified:
   trunk/MonoDevelop/build/AddIns/MonoDevelopBufferCommands.addin
   trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs
   trunk/MonoDevelop/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs
Log:
bit of fixing


Modified: trunk/MonoDevelop/build/AddIns/MonoDevelopBufferCommands.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/MonoDevelopBufferCommands.addin	2004-01-28 03:23:32 UTC (rev 697)
+++ trunk/MonoDevelop/build/AddIns/MonoDevelopBufferCommands.addin	2004-01-28 03:44:23 UTC (rev 698)
@@ -381,8 +381,7 @@
 			          insertafter = "Separator2"
 			          label = "${res:XML.MainMenu.ToolMenu.GenerateCode}" 
 			          description = "${res:XML.MainMenu.ToolMenu.GenerateCode.Description}" 
-			          shortcut = "Control|W"
-			          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GenerateCodeAction"/>  
+			          class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GenerateCodeAction"/>
 			<MenuItem id = "ShowQuickHelp"
 			          label = "${res:XML.MainMenu.ToolMenu.QuickXmlDoc}" 
 			          description = "${res:XML.MainMenu.ToolMenu.QuickXmlDoc.Description}" 
@@ -412,4 +411,4 @@
 		<EditAction id = "TemplateCompletion" class = "ICSharpCode.SharpDevelop.DefaultEditor.Actions.TemplateCompletion"  keys = "Control|J"/>		
 		<EditAction id = "IndentSelection" class = "ICSharpCode.TextEditor.Actions.IndentSelection"  keys = "Control|I"/>		
 	</Extension>
-</AddIn>
\ No newline at end of file
+</AddIn>

Modified: trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs	2004-01-28 03:23:32 UTC (rev 697)
+++ trunk/MonoDevelop/src/Main/Base/Gui/Components/SdMenuCommand.cs	2004-01-28 03:44:23 UTC (rev 698)
@@ -106,7 +106,7 @@
 			UpdateStatus();
 		}
 
-		public void SetAccel (string[] keys)
+		public void SetAccel (string[] keys, string pathmod)
 		{
 			Gdk.ModifierType mod = 0;
 			string accel_path = "<MonoDevelop>/MainWindow/" + this.Text + keys[keys.Length - 1];

Modified: trunk/MonoDevelop/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs	2004-01-28 03:23:32 UTC (rev 697)
+++ trunk/MonoDevelop/src/Main/Base/Internal/Codons/MenuItems/MenuItemCodon.cs	2004-01-28 03:44:23 UTC (rev 698)
@@ -147,15 +147,11 @@
 			
 			if (Shortcut != null && newItem is SdMenuCommand) {
 				try {
-					((SdMenuCommand)newItem).SetAccel (shortcut);
-					//foreach (string key in this.shortcut) {
-					//	((SdMenuCommand)newItem).Shortcut |= (System.Windows.Forms.Keys)Enum.Parse(typeof(System.Windows.Forms.Keys), key);
-					//}
+					((SdMenuCommand)newItem).SetAccel (shortcut, owner.ToString ());
 				} catch (Exception) {
-					//((SdMenuCommand)newItem).Shortcut = System.Windows.Forms.Keys.None;
 				}
 			}
-			//newItem.IsEnabled = true; //action != ConditionFailedAction.Disable;
+			newItem.Sensitive = true; //action != ConditionFailedAction.Disable;
 			return newItem;
 		}
 	}