Merge pull request #8763 from keco2/feature/issue8596_stageall

Review feedback on PR #8731 (StageAll,UnstageAll)
gitextensions · Jan 18, 2021 · 37e7501 · 37e7501
2 parents 32e4467 + 797f269
commit 37e7501
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 23 deletions.
diff --git a/GitUI/CommandsDialogs/FormCommit.Designer.cs b/GitUI/CommandsDialogs/FormCommit.Designer.cs
diff --git a/GitUI/Translation/English.xlf b/GitUI/Translation/English.xlf
@@ -3677,10 +3677,6 @@ You can unset the template:
         <source>Refresh</source>
         <target />
       </trans-unit>
-      <trans-unit id="toolStageAllItem.Text">
-        <source>Stage all</source>
-        <target />
-      </trans-unit>
       <trans-unit id="toolStageItem.Text">
         <source>&amp;Stage</source>
         <target />
@@ -3693,10 +3689,6 @@ You can unset the template:
         <source>&amp;Options</source>
         <target />
       </trans-unit>
-      <trans-unit id="toolUnstageAllItem.Text">
-        <source>Unstage all</source>
-        <target />
-      </trans-unit>
       <trans-unit id="toolUnstageItem.Text">
         <source>&amp;Unstage</source>
         <target />

diff --git a/GitUI/UserControls/FileStatusList.cs b/GitUI/UserControls/FileStatusList.cs
@@ -1525,25 +1525,13 @@ private void FileStatusList_Enter(object sender, EventArgs e)
         private readonly Subject<string> _filterSubject = new Subject<string>();
         [CanBeNull] private Regex _filter;
         private bool _filterVisible = false;
-        private bool _filterActive = false;
 
         public void SetFilter(string value)
         {
             FilterComboBox.Text = value;
             FilterFiles(value);
         }
 
-        private void OnFilterChanged()
-        {
-            if (_filterActive == IsFilterActive)
-            {
-                return;
-            }
-
-            _filterActive = IsFilterActive;
-            FilterChanged?.Invoke(this, EventArgs.Empty);
-        }
-
         private void DeleteFilterButton_Click(object sender, EventArgs e)
         {
             SetFilter(string.Empty);
@@ -1554,7 +1542,7 @@ private int FilterFiles(string value)
             StoreFilter(value);
 
             UpdateFileStatusListView(updateCausedByFilter: true);
-            OnFilterChanged();
+            FilterChanged?.Invoke(this, EventArgs.Empty);
             return FileStatusListView.Items.Count;
         }