Display shortcut keys for Filter items

gitextensions · Jan 18, 2022 · 247bb48 · 247bb48
1 parent 9be1f07
commit 247bb48
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -992,6 +992,9 @@ private void SetShortcutKeyDisplayStringsFromHotkeySettings()
             rebaseToolStripMenuItem.ShortcutKeyDisplayString = GetShortcutKeys(Command.Rebase).ToShortcutKeyDisplayString();
             rebaseToolStripMenuItem1.ShortcutKeyDisplayString = GetShortcutKeys(Command.Rebase).ToShortcutKeyDisplayString();
 
+            // Set shortcuts on the Browse toolbar with commands in RevGrid
+            RevisionGrid.SetFilterShortcutKeys(ToolStripFilters);
+
             // TODO: add more
         }
 

diff --git a/GitUI/UserControls/FilterToolBar.cs b/GitUI/UserControls/FilterToolBar.cs
@@ -292,6 +292,13 @@ public void UpdateBranchFilterItems(Func<RefsFilter, IReadOnlyList<IGitRef>> get
             }).FileAndForget();
         }
 
+        public void SetShortcutKeys(Action<ToolStripMenuItem, RevisionGridControl.Command> setShortcutString)
+        {
+            setShortcutString(tsmiResetPathFilters, RevisionGridControl.Command.ResetPathRevisionFilter);
+            setShortcutString(tsmiResetAllFilters, RevisionGridControl.Command.ResetRevisionFilter);
+            setShortcutString(tsmiAdvancedFilter, RevisionGridControl.Command.RevisionFilter);
+        }
+
         private void revisionGridFilter_FilterChanged(object? sender, FilterChangedEventArgs e)
         {
             tsmiShowFirstParent.Checked = e.ShowFirstParent;

diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs
@@ -2473,6 +2473,11 @@ public void GoToRef(string? refName, bool showNoRevisionMsg, bool toggleSelectio
             }
         }
 
+        internal void SetFilterShortcutKeys(FilterToolBar filterBar)
+        {
+            filterBar.SetShortcutKeys(SetShortcutString);
+        }
+
         internal void SetShortcutKeys()
         {
             SetShortcutString(fixupCommitToolStripMenuItem, Command.CreateFixupCommit);