From a0454e65b8a609e02adba423154a30455341db12 Mon Sep 17 00:00:00 2001 From: Sergej Andrejev Date: Mon, 25 May 2009 20:14:25 +0000 Subject: [PATCH] Use "+" in serialized shortcut strings. Fix python binding tests git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4149 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- AddIns/ICSharpCode.SharpDevelop.addin | 42 +++++++++---------- .../Test/AddInFileTestFixture.cs | 2 +- .../HexEditor/Project/HexEditor.addin | 2 +- .../XmlEditor/Project/XmlEditor.addin | 20 ++++----- .../Misc/HtmlHelp2/Project/HtmlHelp2.addin | 2 +- .../Project/SearchAndReplace.addin | 39 +++++++++++++---- .../Project/Src/Internal/Doozers/PadDoozer.cs | 2 +- .../DefaultDoozers/MenuItem/MenuItemDoozer.cs | 2 +- .../Menu/MenuCommand.cs | 8 +++- 9 files changed, 74 insertions(+), 45 deletions(-) diff --git a/AddIns/ICSharpCode.SharpDevelop.addin b/AddIns/ICSharpCode.SharpDevelop.addin index de29b065c0..36e1270258 100644 --- a/AddIns/ICSharpCode.SharpDevelop.addin +++ b/AddIns/ICSharpCode.SharpDevelop.addin @@ -1231,7 +1231,7 @@ @@ -1286,7 +1286,7 @@ @@ -1309,7 +1309,7 @@ @@ -1567,7 +1567,7 @@ @@ -1693,7 +1693,7 @@ class = "ICSharpCode.SharpDevelop.DefaultEditor.Commands.GenerateCodeAction"/> @@ -1710,7 +1710,7 @@ @@ -1933,7 +1933,7 @@ --> @@ -2024,7 +2024,7 @@ class= "ICSharpCode.SharpDevelop.DefaultEditor.Commands.CommentRegion"/> diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs index 905e840990..5c71dc0828 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/AddInFileTestFixture.cs @@ -274,7 +274,7 @@ namespace PythonBinding.Tests [Test] public void PythonRunMenuItemShortcut() { - Assert.AreEqual("Control|Shift|R", pythonRunMenuItemCodon["shortcut"]); + Assert.AreEqual("Ctrl+Shift+R", pythonRunMenuItemCodon["shortcut"]); } [Test] diff --git a/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin b/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin index b52412207d..f7760dc214 100644 --- a/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin +++ b/src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.addin @@ -40,7 +40,7 @@ - - + + @@ -203,17 +203,17 @@ diff --git a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.addin b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.addin index 9071f1e406..9a30d7e1e7 100644 --- a/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.addin +++ b/src/AddIns/Misc/SearchAndReplace/Project/SearchAndReplace.addin @@ -11,30 +11,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + shortcut = "Ctrl+F" + class = "SearchAndReplace.Find" /> + class = "SearchAndReplace.FindNext" /> + shortcut = "Ctrl+F3" + class = "SearchAndReplace.FindNextSelected" /> + shortcut = "Ctrl+R" + class = "SearchAndReplace.Replace" /> diff --git a/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs b/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs index 28bdb80af3..1b864a2509 100644 --- a/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs +++ b/src/Main/Base/Project/Src/Internal/Doozers/PadDoozer.cs @@ -34,7 +34,7 @@ namespace ICSharpCode.SharpDevelop /// "View -> Debugger" menu. /// /// - /// Shortcut that activates the 'Show pad' command (e.g. "Control|Alt|T"). + /// Shortcut that activates the 'Show pad' command (e.g. "Ctrl+Alt+T"). /// /// Only in /Workspace/Parser /// diff --git a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemDoozer.cs b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemDoozer.cs index 398fcba291..3cf917db1a 100644 --- a/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemDoozer.cs +++ b/src/Main/Core/Project/Src/AddInTree/AddIn/DefaultDoozers/MenuItem/MenuItemDoozer.cs @@ -43,7 +43,7 @@ namespace ICSharpCode.Core /// clicking the item. /// /// - /// Shortcut that activates the command (e.g. "Control|S"). + /// Shortcut that activates the command (e.g. "Ctrl+S"). /// /// /// If "type" is "Menu", the item can have sub-menuitems. diff --git a/src/Main/ICSharpCode.Core.WinForms/Menu/MenuCommand.cs b/src/Main/ICSharpCode.Core.WinForms/Menu/MenuCommand.cs index 4148bcf36c..eaec59b7e8 100644 --- a/src/Main/ICSharpCode.Core.WinForms/Menu/MenuCommand.cs +++ b/src/Main/ICSharpCode.Core.WinForms/Menu/MenuCommand.cs @@ -8,6 +8,7 @@ using System; using System.Drawing; using System.Windows.Forms; +using System.Text.RegularExpressions; namespace ICSharpCode.Core.WinForms { @@ -68,8 +69,11 @@ namespace ICSharpCode.Core.WinForms Keys shortCut = Keys.None; if (shortcutString.Length > 0) { try { - foreach (string key in shortcutString.Split('|')) { - shortCut |= (System.Windows.Forms.Keys)Enum.Parse(typeof(System.Windows.Forms.Keys), key); + foreach (string key in Regex.Split(shortcutString, @"\s*\+\s*")) { + string winKey = key; + if(key.ToLower() == "ctrl") winKey = "Control"; + + shortCut |= (System.Windows.Forms.Keys)Enum.Parse(typeof(System.Windows.Forms.Keys), winKey); } } catch (Exception ex) { MessageService.ShowError(ex);