Added ctrl+shift+k shortcut to duplicate tab (#7901)

Co-authored-by: Blair Currey <[email protected]>

Author: BlairCurrey

src/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml

@@ -37,6 +37,7 @@
                         <MenuFlyoutItem
                             x:Uid="HorizontalMultitaskingControlDuplicateTab"
                             Click="{x:Bind vm:MainPageViewModel.DuplicateTabAtIndex}"
+                            KeyboardAcceleratorTextOverride="Ctrl+Shift+K"
                             Text="Duplicate tab">
                             <MenuFlyoutItem.Icon>
                                 <FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF11B;" />

src/Files/ViewModels/MainPageViewModel.cs

@@ -49,13 +49,16 @@ public TabItem SelectedTabItem
 
         public ICommand AddNewInstanceAcceleratorCommand { get; private set; }
 
+        public ICommand ReopenClosedTabAcceleratorCommand { get; private set; }
+
         public MainPageViewModel()
         {
             // Create commands
             NavigateToNumberedTabKeyboardAcceleratorCommand = new RelayCommand<KeyboardAcceleratorInvokedEventArgs>(NavigateToNumberedTabKeyboardAccelerator);
             OpenNewWindowAcceleratorCommand = new RelayCommand<KeyboardAcceleratorInvokedEventArgs>(OpenNewWindowAccelerator);
             CloseSelectedTabKeyboardAcceleratorCommand = new RelayCommand<KeyboardAcceleratorInvokedEventArgs>(CloseSelectedTabKeyboardAccelerator);
             AddNewInstanceAcceleratorCommand = new RelayCommand<KeyboardAcceleratorInvokedEventArgs>(AddNewInstanceAccelerator);
+            ReopenClosedTabAcceleratorCommand = new RelayCommand<KeyboardAcceleratorInvokedEventArgs>(ReopenClosedTabAccelerator);
         }
 
         private void NavigateToNumberedTabKeyboardAccelerator(KeyboardAcceleratorInvokedEventArgs e)
@@ -162,16 +165,13 @@ private void CloseSelectedTabKeyboardAccelerator(KeyboardAcceleratorInvokedEvent
 
         private async void AddNewInstanceAccelerator(KeyboardAcceleratorInvokedEventArgs e)
         {
-            bool shift = e.KeyboardAccelerator.Modifiers.HasFlag(VirtualKeyModifiers.Shift);
+            await AddNewTabAsync();
+            e.Handled = true;
+        }
 
-            if (!shift)
-            {
-                await AddNewTabAsync();
-            }
-            else // ctrl + shift + t, restore recently closed tab
-            {
-                ((BaseMultitaskingControl)MultitaskingControl).ReopenClosedTab(null, null);
-            }
+        private void ReopenClosedTabAccelerator(KeyboardAcceleratorInvokedEventArgs e)
+        {
+            ((BaseMultitaskingControl)MultitaskingControl).ReopenClosedTab(null, null);
             e.Handled = true;
         }
 

src/Files/Views/ColumnShellPage.xaml

@@ -132,7 +132,7 @@
             Key="K"
             Invoked="KeyboardAccelerator_Invoked"
             IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}"
-            Modifiers="Control" />
+            Modifiers="Control,Shift" />
     </Page.KeyboardAccelerators>
     <Grid
         x:Name="RootGrid"

src/Files/Views/ColumnShellPage.xaml.cs

@@ -719,7 +719,7 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
                     UserSettingsService.PreferencesSettingsService.AreHiddenItemsVisible = !UserSettingsService.PreferencesSettingsService.AreHiddenItemsVisible;
                     break;
 
-                case (true, false, false, true, VirtualKey.K): // ctrl + k, duplicate tab
+                case (true, true, false, true, VirtualKey.K): // ctrl + shift + k, duplicate tab
                     await NavigationHelpers.OpenPathInNewTab(this.FilesystemViewModel.WorkingDirectory);
                     break;
 

src/Files/Views/MainPage.xaml

@@ -160,11 +160,11 @@
         <KeyboardAccelerator Key="T" Modifiers="Control,Shift">
             <i:Interaction.Behaviors>
                 <icore:EventTriggerBehavior EventName="Invoked">
-                    <icore:InvokeCommandAction Command="{x:Bind ViewModel.AddNewInstanceAcceleratorCommand}" />
+                    <icore:InvokeCommandAction Command="{x:Bind ViewModel.ReopenClosedTabAcceleratorCommand}" />
                 </icore:EventTriggerBehavior>
             </i:Interaction.Behaviors>
         </KeyboardAccelerator>
-        <KeyboardAccelerator Key="K" Modifiers="Control">
+        <KeyboardAccelerator Key="K" Modifiers="Control,Shift">
             <i:Interaction.Behaviors>
                 <icore:EventTriggerBehavior EventName="Invoked">
                     <icore:InvokeCommandAction Command="{x:Bind ViewModel.AddNewInstanceAcceleratorCommand}" />

src/Files/Views/ModernShellPage.xaml

@@ -108,7 +108,7 @@
             Key="K"
             Invoked="KeyboardAccelerator_Invoked"
             IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}"
-            Modifiers="Control" />
+            Modifiers="Control,Shift" />
         <KeyboardAccelerator
             Key="F2"
             Invoked="KeyboardAccelerator_Invoked"

src/Files/Views/ModernShellPage.xaml.cs

@@ -776,7 +776,7 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
                     UserSettingsService.PreferencesSettingsService.AreHiddenItemsVisible = !UserSettingsService.PreferencesSettingsService.AreHiddenItemsVisible;
                     break;
 
-                case (true, false, false, true, VirtualKey.K): // ctrl + k, duplicate tab
+                case (true, true, false, true, VirtualKey.K): // ctrl + shift + k, duplicate tab
                     await NavigationHelpers.OpenPathInNewTab(this.FilesystemViewModel.WorkingDirectory);
                     break;