Add support for Del key to RepoObjectsTree nodes

gitextensions · Oct 8, 2021 · 28321b0 · 28321b0
1 parent 9629c5a
commit 28321b0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/GitUI/BranchTreePanel/ContextMenu/MenuItemsGenerator.cs b/GitUI/BranchTreePanel/ContextMenu/MenuItemsGenerator.cs
@@ -107,9 +107,10 @@ private IEnumerable<ToolStripItemWithKey> CreateDelete()
         {
             if (Implements<ICanDelete>())
             {
-                yield return _menuItemFactory.CreateMenuItem<ToolStripMenuItem, TNode>(
-                    node => ((ICanDelete)node).Delete(), Strings.Delete, GetTooltip(MenuItemKey.Delete), Properties.Images.BranchDelete)
-                    .WithKey(MenuItemKey.Delete);
+                ToolStripMenuItem item = _menuItemFactory.CreateMenuItem<ToolStripMenuItem, TNode>(
+                    node => ((ICanDelete)node).Delete(), Strings.Delete, GetTooltip(MenuItemKey.Delete), Properties.Images.BranchDelete);
+                item.ShortcutKeys = Keys.Delete;
+                yield return item.WithKey(MenuItemKey.Delete);
             }
         }
 

diff --git a/GitUI/BranchTreePanel/RepoObjectsTree.LocalBranchNode.cs b/GitUI/BranchTreePanel/RepoObjectsTree.LocalBranchNode.cs
@@ -55,6 +55,11 @@ internal override void OnRename()
                 Rename();
             }
 
+            internal override void OnDelete()
+            {
+                Delete();
+            }
+
             public bool Checkout()
             {
                 return UICommands.StartCheckoutBranch(ParentWindow(), branch: FullPath, remote: false);

diff --git a/GitUI/BranchTreePanel/RepoObjectsTree.Nodes.Tags.cs b/GitUI/BranchTreePanel/RepoObjectsTree.Nodes.Tags.cs
@@ -41,6 +41,11 @@ internal override void OnDoubleClick()
                 CreateBranch();
             }
 
+            internal override void OnDelete()
+            {
+                Delete();
+            }
+
             public bool CreateBranch()
             {
                 return UICommands.StartCreateBranchDialog(TreeViewNode.TreeView, ObjectId);

diff --git a/GitUI/BranchTreePanel/RepoObjectsTree.Nodes.cs b/GitUI/BranchTreePanel/RepoObjectsTree.Nodes.cs
@@ -506,6 +506,10 @@ internal virtual void OnRename()
             {
             }
 
+            internal virtual void OnDelete()
+            {
+            }
+
             public static Node GetNode(TreeNode treeNode)
             {
                 return (Node)treeNode.Tag;

diff --git a/GitUI/BranchTreePanel/RepoObjectsTree.RemoteBranchNode.cs b/GitUI/BranchTreePanel/RepoObjectsTree.RemoteBranchNode.cs
@@ -48,6 +48,11 @@ private RemoteBranchInfo GetRemoteBranchInfo()
                 return new RemoteBranchInfo(remote, branch);
             }
 
+            internal override void OnDelete()
+            {
+                Delete();
+            }
+
             public bool CreateBranch()
             {
                 return UICommands.StartCreateBranchDialog(TreeViewNode.TreeView, FullPath);

diff --git a/GitUI/BranchTreePanel/RepoObjectsTree.cs b/GitUI/BranchTreePanel/RepoObjectsTree.cs
@@ -531,6 +531,9 @@ private void OnPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
                 case Keys.F3:
                     OnBtnSearchClicked(this, EventArgs.Empty);
                     break;
+                case Keys.Delete:
+                    Node.OnNode<Node>(treeMain.SelectedNode, node => node.OnDelete());
+                    break;
             }
         }