FormBrowse: let the user add fetch/pull custom icons in the toolbar

gitextensions · Oct 27, 2022 · ce3ae45 · ce3ae45
1 parent 4d96462
commit ce3ae45
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/GitUI/CommandsDialogs/BrowseDialog/FormBrowseMenus.cs b/GitUI/CommandsDialogs/BrowseDialog/FormBrowseMenus.cs
@@ -197,7 +197,7 @@ private static void CreateToolStripSubMenus(ToolStrip senderToolStrip, ToolStrip
 
             return;
 
-            bool IsVisibleByDefault(string buttonKey) => !buttonKey.Contains(FilterToolBar.ReflogButtonName);
+            bool IsVisibleByDefault(string buttonKey) => !buttonKey.Contains(FilterToolBar.ReflogButtonName) && !buttonKey.Contains(FormBrowse.FetchPullToolbarShortcutsPrefix);
             static void SaveVisibilitySetting(string key, bool visible, bool defaultValue = true)
                 => AppSettings.SetBool(toolbarSettingsPrefix + key, visible == defaultValue ? null : visible);
             static bool LoadVisibilitySetting(string key, bool defaultValue = true)

diff --git a/GitUI/CommandsDialogs/FormBrowse.InitMenusAndToolbars.cs b/GitUI/CommandsDialogs/FormBrowse.InitMenusAndToolbars.cs
@@ -12,6 +12,8 @@ partial class FormBrowse
     {
         // This file is dedicated to init logic for FormBrowse menus and toolbars
 
+        internal const string FetchPullToolbarShortcutsPrefix = "pull_shortcut_";
+
         private void InitMenusAndToolbars(string? revFilter, string? pathFilter)
         {
             commandsToolStripMenuItem.DropDownOpening += CommandsToolStripMenuItem_DropDownOpening;
@@ -44,6 +46,8 @@ private void InitMenusAndToolbars(string? revFilter, string? pathFilter)
                 branchToolStripMenuItem,
             }.ForEach(ColorHelper.AdaptImageLightness);
 
+            InsertFetchPullShortcuts();
+
             if (!EnvUtils.RunningOnWindows())
             {
                 toolStripSeparator6.Visible = false;
@@ -139,6 +143,35 @@ void WorkaroundToolbarLocationBug()
             }
         }
 
+        private void InsertFetchPullShortcuts()
+        {
+            var i = ToolStripMain.Items.IndexOf(toolStripButtonPull);
+            ToolStripMain.Items.Insert(i++, CreateCorrespondingToolbarButton(fetchToolStripMenuItem));
+            ToolStripMain.Items.Insert(i++, CreateCorrespondingToolbarButton(fetchAllToolStripMenuItem));
+            ToolStripMain.Items.Insert(i++, CreateCorrespondingToolbarButton(fetchPruneAllToolStripMenuItem));
+            ToolStripMain.Items.Insert(i++, CreateCorrespondingToolbarButton(mergeToolStripMenuItem));
+            ToolStripMain.Items.Insert(i++, CreateCorrespondingToolbarButton(rebaseToolStripMenuItem1));
+            ToolStripMain.Items.Insert(i++, CreateCorrespondingToolbarButton(pullToolStripMenuItem1));
+
+            ToolStripButton CreateCorrespondingToolbarButton(ToolStripMenuItem toolStripMenuItem)
+            {
+                string toolTipText = toolStripMenuItem.Text.Replace("&", string.Empty);
+                ToolStripButton duplicateToolStripMenuItem = new()
+                {
+                    Image = toolStripMenuItem.Image,
+                    ImageTransparentColor = toolStripMenuItem.ImageTransparentColor,
+                    Name = FetchPullToolbarShortcutsPrefix + toolStripMenuItem.Name,
+                    Size = toolStripMenuItem.Size,
+                    Text = toolTipText,
+                    ToolTipText = toolTipText,
+                    DisplayStyle = ToolStripItemDisplayStyle.Image,
+                };
+
+                duplicateToolStripMenuItem.Click += (_, _) => toolStripMenuItem.PerformClick();
+                return duplicateToolStripMenuItem;
+            }
+        }
+
         private void FillNextPullActionAsDefaultToolStripMenuItems()
         {
             var setDefaultPullActionDropDown = (ToolStripDropDownMenu)setDefaultPullButtonActionToolStripMenuItem.DropDown;