From 552c590b20d3046037cb33ca992a4116b9bd8fd1 Mon Sep 17 00:00:00 2001 From: Michael Seibt Date: Thu, 17 Mar 2022 23:18:18 +0100 Subject: [PATCH] fixup! FormCommit: Replace OnKeyUp & ProcessCmdKey with Hotkeys Review comment: rename hotkeys --- GitUI/CommandsDialogs/FormCommit.cs | 16 ++++++++-------- GitUI/Hotkey/HotkeySettingsManager.cs | 12 ++++++------ .../RevisionGrid/RevisionGridControl.Command.cs | 4 ++-- .../RevisionGrid/RevisionGridControl.cs | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/GitUI/CommandsDialogs/FormCommit.cs b/GitUI/CommandsDialogs/FormCommit.cs index 92d0b1e6384..b507b46cb88 100644 --- a/GitUI/CommandsDialogs/FormCommit.cs +++ b/GitUI/CommandsDialogs/FormCommit.cs @@ -674,11 +674,11 @@ internal enum Command CreateBranch = 17, Refresh = 18, SelectNext = 19, // Ctrl+N - SelectNext2 = 20, // Alt+Down - SelectNext3 = 21, // Alt+Right + SelectNext_AlternativeHotkey1 = 20, // Alt+Down + SelectNext_AlternativeHotkey2 = 21, // Alt+Right SelectPrevious = 22, // Ctrl+P - SelectPrevious2 = 23, // Alt+Up - SelectPrevious3 = 24, // Alt+Left + SelectPrevious_AlternativeHotkey1 = 23, // Alt+Up + SelectPrevious_AlternativeHotkey2 = 24, // Alt+Left } private string GetShortcutKeyDisplayString(Command cmd) @@ -868,11 +868,11 @@ protected override CommandStatus ExecuteCommand(int cmd) case Command.CreateBranch: createBranchToolStripButton.PerformClick(); return true; case Command.Refresh: RescanChanges(); return true; case Command.SelectNext: - case Command.SelectNext2: - case Command.SelectNext3: MoveSelection(1); return true; + case Command.SelectNext_AlternativeHotkey1: + case Command.SelectNext_AlternativeHotkey2: MoveSelection(1); return true; case Command.SelectPrevious: - case Command.SelectPrevious2: - case Command.SelectPrevious3: MoveSelection(-1); return true; + case Command.SelectPrevious_AlternativeHotkey1: + case Command.SelectPrevious_AlternativeHotkey2: MoveSelection(-1); return true; default: return base.ExecuteCommand(cmd); } } diff --git a/GitUI/Hotkey/HotkeySettingsManager.cs b/GitUI/Hotkey/HotkeySettingsManager.cs index 7ef36438c12..e78975172f8 100644 --- a/GitUI/Hotkey/HotkeySettingsManager.cs +++ b/GitUI/Hotkey/HotkeySettingsManager.cs @@ -241,11 +241,11 @@ public static HotkeySettings[] CreateDefaultSettings() Hk(FormCommit.Command.Refresh, Keys.F5), Hk(FormCommit.Command.ResetSelectedFiles, Keys.R), Hk(FormCommit.Command.SelectNext, Keys.Control | Keys.N), - Hk(FormCommit.Command.SelectNext2, Keys.Alt | Keys.Down), - Hk(FormCommit.Command.SelectNext3, Keys.Alt | Keys.Right), + Hk(FormCommit.Command.SelectNext_AlternativeHotkey1, Keys.Alt | Keys.Down), + Hk(FormCommit.Command.SelectNext_AlternativeHotkey2, Keys.Alt | Keys.Right), Hk(FormCommit.Command.SelectPrevious, Keys.Control | Keys.P), - Hk(FormCommit.Command.SelectPrevious2, Keys.Alt | Keys.Up), - Hk(FormCommit.Command.SelectPrevious3, Keys.Alt | Keys.Left), + Hk(FormCommit.Command.SelectPrevious_AlternativeHotkey1, Keys.Alt | Keys.Up), + Hk(FormCommit.Command.SelectPrevious_AlternativeHotkey2, Keys.Alt | Keys.Left), Hk(FormCommit.Command.StageSelectedFile, Keys.S), Hk(FormCommit.Command.UnStageSelectedFile, Keys.U), Hk(FormCommit.Command.ShowHistory, ShowHistoryHotkey), @@ -318,9 +318,9 @@ public static HotkeySettings[] CreateDefaultSettings() Hk(RevisionGridControl.Command.GoToMergeBase, Keys.Control | Keys.Shift | Keys.K), Hk(RevisionGridControl.Command.GoToParent, Keys.Control | Keys.P), Hk(RevisionGridControl.Command.NavigateBackward, Keys.Alt | Keys.Left), - Hk(RevisionGridControl.Command.NavigateBackward2, Keys.BrowserBack), + Hk(RevisionGridControl.Command.NavigateBackward_AlternativeHotkey, Keys.BrowserBack), Hk(RevisionGridControl.Command.NavigateForward, Keys.Alt | Keys.Right), - Hk(RevisionGridControl.Command.NavigateForward2, Keys.BrowserForward), + Hk(RevisionGridControl.Command.NavigateForward_AlternativeHotkey, Keys.BrowserForward), Hk(RevisionGridControl.Command.NextQuickSearch, Keys.Alt | Keys.Down), Hk(RevisionGridControl.Command.OpenCommitsWithDifftool, Keys.None), Hk(RevisionGridControl.Command.PrevQuickSearch, Keys.Alt | Keys.Up), diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.Command.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.Command.cs index 7b6814b9dbc..a65c3fb8384 100644 --- a/GitUI/UserControls/RevisionGrid/RevisionGridControl.Command.cs +++ b/GitUI/UserControls/RevisionGrid/RevisionGridControl.Command.cs @@ -43,8 +43,8 @@ internal enum Command ResetRevisionFilter = 36, ResetRevisionPathFilter = 37, SelectNextForkPointAsDiffBase = 38, - NavigateBackward2 = 39, - NavigateForward2 = 40, + NavigateBackward_AlternativeHotkey = 39, + NavigateForward_AlternativeHotkey = 40, DeleteRef = 41, RenameRef = 42, } diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs index ecc02d679f4..510b17785ad 100644 --- a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs +++ b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs @@ -2846,9 +2846,9 @@ protected override CommandStatus ExecuteCommand(int cmd) case Command.NextQuickSearch: _quickSearchProvider.NextResult(down: true); break; case Command.PrevQuickSearch: _quickSearchProvider.NextResult(down: false); break; case Command.NavigateBackward: - case Command.NavigateBackward2: NavigateBackward(); break; + case Command.NavigateBackward_AlternativeHotkey: NavigateBackward(); break; case Command.NavigateForward: - case Command.NavigateForward2: NavigateForward(); break; + case Command.NavigateForward_AlternativeHotkey: NavigateForward(); break; case Command.SelectAsBaseToCompare: selectAsBaseToolStripMenuItem_Click(this, EventArgs.Empty); break; case Command.CompareToBase: compareToBaseToolStripMenuItem_Click(this, EventArgs.Empty); break; case Command.CreateFixupCommit: FixupCommitToolStripMenuItemClick(this, EventArgs.Empty); break;