fixup! Review comments

gitextensions · Jan 19, 2022 · 66679e2 · 66679e2
1 parent 247bb48
commit 66679e2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/GitUI/Hotkey/HotkeySettingsManager.cs b/GitUI/Hotkey/HotkeySettingsManager.cs
@@ -303,7 +303,7 @@ public static HotkeySettings[] CreateDefaultSettings()
                     Hk(RevisionGridControl.Command.NextQuickSearch, Keys.Alt | Keys.Down),
                     Hk(RevisionGridControl.Command.OpenCommitsWithDifftool, Keys.None),
                     Hk(RevisionGridControl.Command.PrevQuickSearch, Keys.Alt | Keys.Up),
-                    Hk(RevisionGridControl.Command.ResetPathRevisionFilter, Keys.Control | Keys.Alt | Keys.I),
+                    Hk(RevisionGridControl.Command.ResetPathRevisionFilter, Keys.Control | Keys.Shift | Keys.I),
                     Hk(RevisionGridControl.Command.ResetRevisionFilter, Keys.Control | Keys.I),
                     Hk(RevisionGridControl.Command.RevisionFilter, Keys.Control | Keys.F),
                     Hk(RevisionGridControl.Command.SelectCurrentRevision, Keys.Control | Keys.Shift | Keys.C),

diff --git a/GitUI/Translation/English.xlf b/GitUI/Translation/English.xlf
@@ -3164,7 +3164,7 @@ Do you want to continue?</source>
         <target />
       </trans-unit>
       <trans-unit id="tsmiAdvancedFilter.Text">
-        <source>Advanced filter</source>
+        <source>&amp;Advanced filter</source>
         <target />
       </trans-unit>
       <trans-unit id="tsmiAuthorFilter.Text">
@@ -3212,11 +3212,11 @@ Do you want to continue?</source>
         <target />
       </trans-unit>
       <trans-unit id="tsmiResetAllFilters.Text">
-        <source>Reset revision filters</source>
+        <source>&amp;Reset revision filters</source>
         <target />
       </trans-unit>
       <trans-unit id="tsmiResetPathFilters.Text">
-        <source>Reset path filter</source>
+        <source>Reset &amp;path filter</source>
         <target />
       </trans-unit>
       <trans-unit id="tsmiShowBranchesAll.Text">

diff --git a/GitUI/UserControls/FilterToolBar.Designer.cs b/GitUI/UserControls/FilterToolBar.Designer.cs
diff --git a/GitUI/UserControls/FilterToolBar.cs b/GitUI/UserControls/FilterToolBar.cs
@@ -378,7 +378,7 @@ private void toolStripButtonLevelUp_DropDownOpening(object sender, EventArgs e)
 
         private void tsmiDisablePathFilters_Click(object sender, EventArgs e) => RevisionGridFilter.SetAndApplyPathFilter("");
 
-        private void tsmiDisableAllFilters_Click(object sender, EventArgs e) => RevisionGridFilter.ResetRevisionFilter();
+        private void tsmiDisableAllFilters_Click(object sender, EventArgs e) => RevisionGridFilter.ResetAllFiltersAndRefresh();
 
         private void tsmiAdvancedFilter_Click(object sender, EventArgs e) => RevisionGridFilter.ShowRevisionFilterDialog();
 

diff --git a/GitUI/UserControls/RevisionGrid/IRevisionGridFilter.cs b/GitUI/UserControls/RevisionGrid/IRevisionGridFilter.cs
@@ -16,7 +16,7 @@ public interface IRevisionGridFilter
         /// <summary>
         ///  Resets all revision filters.
         /// </summary>
-        void ResetRevisionFilter();
+        void ResetAllFiltersAndRefresh();
 
         /// <summary>
         ///  Applies a branch filter.

diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs
@@ -382,7 +382,7 @@ public void ResetAllFilters()
             _filterInfo.ResetAllFilters();
         }
 
-        public void ResetRevisionFilter()
+        public void ResetAllFiltersAndRefresh()
         {
             _filterInfo.ResetAllFilters();
             PerformRefreshRevisions();
@@ -2735,7 +2735,7 @@ protected override CommandStatus ExecuteCommand(int cmd)
             {
                 case Command.ToggleRevisionGraph: ToggleRevisionGraphColumn(); break;
                 case Command.RevisionFilter: ShowRevisionFilterDialog(); break;
-                case Command.ResetRevisionFilter: ResetRevisionFilter(); break;
+                case Command.ResetRevisionFilter: ResetAllFiltersAndRefresh(); break;
                 case Command.ResetPathRevisionFilter: SetAndApplyPathFilter(""); break;
                 case Command.ToggleAuthorDateCommitDate: ToggleShowAuthorDate(); break;
                 case Command.ToggleShowRelativeDate: ToggleShowRelativeDate(EventArgs.Empty); break;