File Tree: Make "Expand" and "Collapse" based on selected node

Renaming menu items to be consistent with left panel
gitextensions · Feb 28, 2021 · 33a7b27 · 33a7b27
1 parent 43a6f1b
commit 33a7b27
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 48 deletions.
diff --git a/GitUI/CommandsDialogs/RevisionFileTreeControl.Designer.cs b/GitUI/CommandsDialogs/RevisionFileTreeControl.Designer.cs
diff --git a/GitUI/CommandsDialogs/RevisionFileTreeControl.cs b/GitUI/CommandsDialogs/RevisionFileTreeControl.cs
@@ -427,11 +427,6 @@ private void blameMenuItem_Click(object sender, EventArgs e)
             }
         }
 
-        private void collapseAllToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            tvGitTree.CollapseAll();
-        }
-
         private void copyFilenameToClipboardToolStripMenuItem_Click(object sender, EventArgs e)
         {
             if (tvGitTree.SelectedNode?.Tag is GitItem gitItem)
@@ -498,14 +493,14 @@ private void editCheckedOutFileToolStripMenuItem_Click(object sender, EventArgs
             }
         }
 
-        private void expandAllStripMenuItem_Click(object sender, EventArgs e)
+        private void expandToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            tvGitTree.ExpandAll();
+            tvGitTree.SelectedNode?.ExpandAll();
         }
 
-        private void expandSubtreeToolStripMenuItem_Click(object sender, EventArgs e)
+        private void collapseToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            tvGitTree.SelectedNode?.ExpandAll();
+            tvGitTree.SelectedNode?.Collapse();
         }
 
         private void fileTreeArchiveToolStripMenuItem_Click(object sender, EventArgs e)
@@ -614,7 +609,8 @@ private void FileTreeContextMenu_Opening(object sender, System.ComponentModel.Ca
             toolStripSeparatorGitTrackingActions.Visible = isFile;
 
             findToolStripMenuItem.Enabled = tvGitTree.Nodes.Count > 0;
-            expandSubtreeToolStripMenuItem.Visible = isFolder;
+            expandToolStripMenuItem.Visible = isFolder;
+            collapseToolStripMenuItem.Visible = isFolder;
         }
 
         private void fileTreeOpenContainingFolderToolStripMenuItem_Click(object sender, EventArgs e)

diff --git a/GitUI/Translation/English.xlf b/GitUI/Translation/English.xlf
@@ -8166,7 +8166,7 @@ To show all branches, right click the revision grid, select 'view' and then the
         <source>Collapse</source>
         <target />
       </trans-unit>
-      <trans-unit id="mnubtnCollapseAll.ToolTipText">
+      <trans-unit id="mnubtnCollapse.ToolTipText">
         <source>Collapse all subnodes</source>
         <target />
       </trans-unit>
@@ -8210,7 +8210,7 @@ To show all branches, right click the revision grid, select 'view' and then the
         <source>Expand</source>
         <target />
       </trans-unit>
-      <trans-unit id="mnubtnExpandAll.ToolTipText">
+      <trans-unit id="mnubtnExpand.ToolTipText">
         <source>Expand all subnodes</source>
         <target />
       </trans-unit>
@@ -8357,7 +8357,7 @@ To show all branches, right click the revision grid, select 'view' and then the
         <target />
       </trans-unit>
       <trans-unit id="tsbCollapseAll.ToolTipText">
-        <source>Collapse all nodes</source>
+        <source>Collapse all subnodes</source>
         <target />
       </trans-unit>
       <trans-unit id="tsbShowBranches.Text">
@@ -8622,8 +8622,8 @@ See the changes in the commit form.</source>
         <source>Blame</source>
         <target />
       </trans-unit>
-      <trans-unit id="collapseAllToolStripMenuItem.Text">
-        <source>Collapse all</source>
+      <trans-unit id="collapseToolStripMenuItem.Text">
+        <source>Collapse</source>
         <target />
       </trans-unit>
       <trans-unit id="copyFilenameToClipboardToolStripMenuItem.Text">
@@ -8634,12 +8634,8 @@ See the changes in the commit form.</source>
         <source>Edit working directory file</source>
         <target />
       </trans-unit>
-      <trans-unit id="expandAllToolStripMenuItem.Text">
-        <source>Expand all (takes a while on large trees)</source>
-        <target />
-      </trans-unit>
-      <trans-unit id="expandSubtreeToolStripMenuItem.Text">
-        <source>Expand subtree (takes a while on large subtrees)</source>
+      <trans-unit id="expandToolStripMenuItem.Text">
+        <source>Expand</source>
         <target />
       </trans-unit>
       <trans-unit id="fileHistoryToolStripMenuItem.Text">