From fdf04e5426d0e6892e4b9be99f975a4107614019 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Fri, 18 Jul 2014 10:50:29 -0400 Subject: [PATCH] Finish implementing ShortcutKeys for CommandBars --- .../MainWindow.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs index 468abde9..69616ebd 100644 --- a/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs +++ b/CSharp/Engines/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs @@ -140,6 +140,7 @@ namespace UniversalEditor.UserInterface.WindowsForms else { ToolStripMenuItem tsmi = new ToolStripMenuItem(); + tsmi.ShortcutKeys = ShortcutKeyToWinFormsKeys(cmd.ShortcutKey); tsi = tsmi; } @@ -167,6 +168,7 @@ namespace UniversalEditor.UserInterface.WindowsForms else { tsi = new ToolStripMenuItem(); + (tsi as ToolStripMenuItem).ShortcutKeys = ShortcutKeyToWinFormsKeys(cmd.ShortcutKey); } tsi.Tag = cmd; tsi.Text = cmd.Title.Replace("_", "&"); @@ -177,6 +179,18 @@ namespace UniversalEditor.UserInterface.WindowsForms return null; } + private Keys ShortcutKeyToWinFormsKeys(CommandShortcutKey sk) + { + Keys keys = Keys.None; + if ((sk.Modifiers & CommandShortcutKeyModifiers.Alt) == CommandShortcutKeyModifiers.Alt) keys |= Keys.Alt; + if ((sk.Modifiers & CommandShortcutKeyModifiers.Control) == CommandShortcutKeyModifiers.Control) keys |= Keys.Control; + if ((sk.Modifiers & CommandShortcutKeyModifiers.Meta) == CommandShortcutKeyModifiers.Meta) keys |= Keys.Alt; + if ((sk.Modifiers & CommandShortcutKeyModifiers.Shift) == CommandShortcutKeyModifiers.Shift) keys |= Keys.Shift; + if ((sk.Modifiers & CommandShortcutKeyModifiers.Super) == CommandShortcutKeyModifiers.Super) keys |= Keys.LWin; + keys |= (Keys)sk.Value; + return keys; + } + private void LoadCommandBarItem(CommandItem item, ToolStripDropDownItem parent) { ToolStripItem tsi = InitializeCommandBarItem(item, true);