Author: fejj
Date: 2007-07-20 15:15:26 -0400 (Fri, 20 Jul 2007)
New Revision: 82383

Modified:
   trunk/monodevelop/Core/src/MonoDevelop.Components/ChangeLog
   
trunk/monodevelop/Core/src/MonoDevelop.Components/MonoDevelop.Components.Commands/KeyBindingManager.cs
Log:
2007-07-20  Jeffrey Stedfast  <[EMAIL PROTECTED]>

        * MonoDevelop.Components.Commands/KeyBindingManager.cs
        (AccelToKey): Fixed to properly parse keys like % and others that
        are valid characters but have a named enum value.



Modified: trunk/monodevelop/Core/src/MonoDevelop.Components/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Components/ChangeLog 2007-07-20 
18:58:54 UTC (rev 82382)
+++ trunk/monodevelop/Core/src/MonoDevelop.Components/ChangeLog 2007-07-20 
19:15:26 UTC (rev 82383)
@@ -1,3 +1,9 @@
+2007-07-20  Jeffrey Stedfast  <[EMAIL PROTECTED]>
+
+       * MonoDevelop.Components.Commands/KeyBindingManager.cs
+       (AccelToKey): Fixed to properly parse keys like % and others that
+       are valid characters but have a named enum value.
+
 2007-07-18  Jeffrey Stedfast  <[EMAIL PROTECTED]>
 
        * MonoDevelop.Components.Commands/KeyBindingService.cs (LoadBinding):

Modified: 
trunk/monodevelop/Core/src/MonoDevelop.Components/MonoDevelop.Components.Commands/KeyBindingManager.cs
===================================================================
--- 
trunk/monodevelop/Core/src/MonoDevelop.Components/MonoDevelop.Components.Commands/KeyBindingManager.cs
      2007-07-20 18:58:54 UTC (rev 82382)
+++ 
trunk/monodevelop/Core/src/MonoDevelop.Components/MonoDevelop.Components.Commands/KeyBindingManager.cs
      2007-07-20 19:15:26 UTC (rev 82383)
@@ -144,10 +144,13 @@
                                
                                str = accel.Substring (i, j - i);
                                if ((mod = ModifierMask (str)) == 
Gdk.ModifierType.None) {
-                                       if (str != "Space")
+                                       if (str == "Space")
+                                               k = (uint) Gdk.Key.space;
+                                       else if (str.Length > 1)
                                                k = Gdk.Keyval.FromName (str);
                                        else
-                                               k = (uint) Gdk.Key.space;
+                                               k = (uint) str[0];
+                                       
                                        break;
                                }
                                
@@ -303,7 +306,10 @@
                                
                                str = shortcut.Substring (i, j - i);
                                if ((mod = ModifierMask (str)) == 
Gdk.ModifierType.None) {
-                                       key = (Gdk.Key) Gdk.Key.Parse (typeof 
(Gdk.Key), str);
+                                       if (str.Length > 1)
+                                               key = (Gdk.Key) Gdk.Key.Parse 
(typeof (Gdk.Key), str);
+                                       else
+                                               key = (Gdk.Key) str[0];
                                        
                                        if (j < shortcut.Length)
                                                Console.WriteLine ("WARNING: 
trailing data after Gdk.Key portion of shortcut {0}", shortcut);

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to