From 3486ba04ff582343f82a8d2e947328ed09ba5434 Mon Sep 17 00:00:00 2001 From: Michael Seibt Date: Fri, 15 May 2020 19:06:29 +0200 Subject: [PATCH] Display shortcuts assigned to scripts --- GitUI/CommandsDialogs/UserScriptContextMenuExtensions.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/GitUI/CommandsDialogs/UserScriptContextMenuExtensions.cs b/GitUI/CommandsDialogs/UserScriptContextMenuExtensions.cs index e6dc62f3a3d..6b9b29859a9 100644 --- a/GitUI/CommandsDialogs/UserScriptContextMenuExtensions.cs +++ b/GitUI/CommandsDialogs/UserScriptContextMenuExtensions.cs @@ -1,12 +1,18 @@ using System; +using System.Collections.Generic; using System.Linq; using System.Windows.Forms; +using GitUI.Hotkey; using GitUI.Script; +using ResourceManager; namespace GitUI.CommandsDialogs { public static class UserScriptContextMenuExtensions { + private static readonly Lazy> Hotkeys = new Lazy>(() + => HotkeySettingsManager.LoadHotkeys(FormSettings.HotkeySettingsName)); + /// /// Appends user scripts to the , or under , /// if scripts are marked as . @@ -60,7 +66,8 @@ void AddOwnScripts() { Text = script.Name, Name = script.Name + "_ownScript", - Image = script.GetIcon() + Image = script.GetIcon(), + ShortcutKeyDisplayString = Hotkeys.Value?.FirstOrDefault(h => h.Name == script.Name)?.KeyData.ToShortcutKeyDisplayString() }; item.Click += (s, e) =>