Rich command: NewTab + DuplicateTab

src/Files.App/Actions/Navigation/DuplicateTabAction.cs

@@ -0,0 +1,17 @@
+using Files.App.Commands;
+using Files.App.Extensions;
+using Files.App.ViewModels;
+using System.Threading.Tasks;
+using Windows.System;
+
+namespace Files.App.Actions
+{
+	internal class DuplicateTabAction : IAction
+	{
+		public string Label { get; } = "DuplicateTab".GetLocalizedResource();
+
+		public HotKey HotKey { get; } = new(VirtualKey.K, VirtualKeyModifiers.Control | VirtualKeyModifiers.Shift);
+
+		public Task ExecuteAsync() => MainPageViewModel.DuplicateTabAsync();
+	}
+}

src/Files.App/Actions/Navigation/NewTabAction.cs

@@ -0,0 +1,17 @@
+using Files.App.Commands;
+using Files.App.Extensions;
+using Files.App.ViewModels;
+using System.Threading.Tasks;
+using Windows.System;
+
+namespace Files.App.Actions
+{
+	internal class NewTabAction : IAction
+	{
+		public string Label { get; } = "NewTab".GetLocalizedResource();
+
+		public HotKey HotKey { get; } = new(VirtualKey.T, VirtualKeyModifiers.Control);
+
+		public Task ExecuteAsync() => MainPageViewModel.AddNewTabAsync();
+	}
+}

src/Files.App/Commands/CommandCodes.cs

@@ -53,6 +53,10 @@ public enum CommandCodes
 
 		// Image Edition
 		RotateLeft,
-		RotateRight
+		RotateRight,
+
+		// Navigation
+		NewTab,
+		DuplicateTab,
 	}
 }

src/Files.App/Commands/Manager/CommandManager.cs

@@ -60,6 +60,8 @@ internal class CommandManager : ICommandManager
 		public IRichCommand CompressIntoZip => commands[CommandCodes.CompressIntoZip];
 		public IRichCommand RotateLeft => commands[CommandCodes.RotateLeft];
 		public IRichCommand RotateRight => commands[CommandCodes.RotateRight];
+		public IRichCommand NewTab => commands[CommandCodes.NewTab];
+		public IRichCommand DuplicateTab => commands[CommandCodes.DuplicateTab];
 
 		public CommandManager()
 		{
@@ -119,7 +121,9 @@ public CommandManager()
 			[CommandCodes.CompressIntoSevenZip] = new CompressIntoSevenZipAction(),
 			[CommandCodes.CompressIntoZip] = new CompressIntoZipAction(),
 			[CommandCodes.RotateLeft] = new RotateLeftAction(),
-			[CommandCodes.RotateRight] = new RotateRightAction()
+			[CommandCodes.RotateRight] = new RotateRightAction(),
+			[CommandCodes.NewTab] = new NewTabAction(),
+			[CommandCodes.DuplicateTab] = new DuplicateTabAction(),
 		};
 
 		[DebuggerDisplay("Command None")]

src/Files.App/Commands/Manager/ICommandManager.cs

@@ -48,5 +48,8 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 
 		IRichCommand RotateLeft { get; }
 		IRichCommand RotateRight { get; }
+
+		IRichCommand NewTab { get; }
+		IRichCommand DuplicateTab { get; }
 	}
 }

src/Files.App/Helpers/MultitaskingTabsHelpers.cs

@@ -51,27 +51,5 @@ public static Task MoveTabToNewWindow(TabItem tab, IMultitaskingControl multitas
 				? NavigationHelpers.OpenTabInNewWindowAsync(tabItemArguments.Serialize())
 				: NavigationHelpers.OpenPathInNewWindowAsync("Home");
 		}
-
-		public static async Task AddNewTab(Type type, object tabViewItemArgs, int atIndex = -1)
-		{
-			FontIconSource fontIconSource = new FontIconSource();
-			fontIconSource.FontFamily = App.AppModel.SymbolFontFamily;
-
-			TabItem tabItem = new TabItem()
-			{
-				Header = null,
-				IconSource = fontIconSource,
-				Description = null,
-				ToolTipText = null
-			};
-			tabItem.Control.NavigationArguments = new TabItemArguments()
-			{
-				InitialPageType = type,
-				NavigationArg = tabViewItemArgs
-			};
-			tabItem.Control.ContentChanged += MainPageViewModel.Control_ContentChanged;
-			await MainPageViewModel.UpdateTabInfo(tabItem, tabViewItemArgs);
-			MainPageViewModel.AppInstances.Insert(atIndex == -1 ? MainPageViewModel.AppInstances.Count : atIndex, tabItem);
-		}
 	}
 }

src/Files.App/Strings/en-US/Resources.resw

@@ -987,18 +987,15 @@
   <data name="SideBarEjectDevice.Text" xml:space="preserve">
     <value>Eject</value>
   </data>
-  <data name="HorizontalMultitaskingControlDuplicateTab.Text" xml:space="preserve">
+  <data name="DuplicateTab" xml:space="preserve">
     <value>Duplicate tab</value>
   </data>
   <data name="HorizontalMultitaskingControlMoveTabToNewWindow.Text" xml:space="preserve">
     <value>Move tab to new window</value>
   </data>
-  <data name="HorizontalMultitaskingControlNewTab.Text" xml:space="preserve">
+  <data name="NewTab" xml:space="preserve">
     <value>New tab</value>
   </data>
-  <data name="NewTabCtrlT" xml:space="preserve">
-    <value>New tab (Ctrl+T)</value>
-  </data>
   <data name="ClearPropertiesFlyoutText.Text" xml:space="preserve">
     <value>Some properties may contain personal information.</value>
   </data>
@@ -1881,9 +1878,6 @@
   <data name="BaseLayoutContextFlyoutColumn.KeyboardAcceleratorTextOverride" xml:space="preserve">
     <value>Ctrl+Shift+6</value>
   </data>
-  <data name="HorizontalMultitaskingControlNewTab.KeyboardAcceleratorTextOverride" xml:space="preserve">
-    <value>Ctrl+T</value>
-  </data>
   <data name="HorizontalMultitaskingControlReopenClosedTab.KeyboardAcceleratorTextOverride" xml:space="preserve">
     <value>Ctrl+Shift+T</value>
   </data>

src/Files.App/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml

@@ -20,20 +20,13 @@
 						x:Name="TabItemContextMenu"
 						Opening="TabItemContextMenu_Opening">
 						<MenuFlyoutItem
-							Click="{x:Bind vm:MainPageViewModel.AddNewTabAtIndex}"
-							KeyboardAcceleratorTextOverride="{helpers:ResourceString Name=HorizontalMultitaskingControlNewTab/KeyboardAcceleratorTextOverride}"
-							Text="{helpers:ResourceString Name=HorizontalMultitaskingControlNewTab/Text}">
-							<MenuFlyoutItem.KeyboardAccelerators>
-								<KeyboardAccelerator
-									Key="T"
-									IsEnabled="False"
-									Modifiers="Control" />
-							</MenuFlyoutItem.KeyboardAccelerators>
-						</MenuFlyoutItem>
+							Command="{x:Bind Commands.NewTab}"
+							KeyboardAcceleratorTextOverride="{x:Bind Commands.NewTab.HotKeyText, Mode=OneWay}"
+							Text="{x:Bind Commands.NewTab.Label}" />
 						<MenuFlyoutItem
-							Click="{x:Bind vm:MainPageViewModel.DuplicateTabAtIndex}"
-							KeyboardAcceleratorTextOverride="{helpers:ResourceString Name=HorizontalMultitaskingControlDuplicateTab/KeyboardAcceleratorTextOverride}"
-							Text="{helpers:ResourceString Name=HorizontalMultitaskingControlDuplicateTab/Text}" />
+							Command="{x:Bind Commands.DuplicateTab}"
+							KeyboardAcceleratorTextOverride="{x:Bind Commands.DuplicateTab.HotKeyText, Mode=OneWay}"
+							Text="{x:Bind Commands.DuplicateTab.Label}" />
 						<MenuFlyoutItem
 							x:Name="MenuItemMoveTabToNewWindow"
 							Click="MoveTabToNewWindow"

src/Files.App/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs

@@ -1,4 +1,6 @@
+using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.WinUI.UI;
+using Files.App.Commands;
 using Files.App.Extensions;
 using Files.App.Helpers;
 using Files.App.ViewModels;
@@ -9,14 +11,15 @@
 using System.Linq;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Tab;
 
 // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
 namespace Files.App.UserControls.MultitaskingControl
 {
 	public sealed partial class HorizontalMultitaskingControl : BaseMultitaskingControl
 	{
+		private ICommandManager Commands { get; } = Ioc.Default.GetRequiredService<ICommandManager>();
+
 		private readonly DispatcherTimer tabHoverTimer = new DispatcherTimer();
 		private TabViewItem? hoveredTabViewItem;
 

src/Files.App/ViewModels/MainPageViewModel.cs

@@ -12,7 +12,6 @@
 using Files.Backend.Services.Settings;
 using Files.Backend.ViewModels.Dialogs;
 using Files.Shared.Extensions;
-using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Navigation;
 using System;
@@ -53,7 +52,6 @@ public bool IsWindowCompactOverlay
 		public ICommand NavigateToNumberedTabKeyboardAcceleratorCommand { get; private set; }
 		public IAsyncRelayCommand OpenNewWindowAcceleratorCommand { get; private set; }
 		public ICommand CloseSelectedTabKeyboardAcceleratorCommand { get; private set; }
-		public IAsyncRelayCommand AddNewInstanceAcceleratorCommand { get; private set; }
 		public ICommand ReopenClosedTabAcceleratorCommand { get; private set; }
 		public ICommand OpenSettingsCommand { get; private set; }
 
@@ -63,7 +61,6 @@ public MainPageViewModel()
 			NavigateToNumberedTabKeyboardAcceleratorCommand = new RelayCommand<KeyboardAcceleratorInvokedEventArgs>(NavigateToNumberedTabKeyboardAccelerator);
 			OpenNewWindowAcceleratorCommand = new AsyncRelayCommand<KeyboardAcceleratorInvokedEventArgs>(OpenNewWindowAccelerator);
 			CloseSelectedTabKeyboardAcceleratorCommand = new RelayCommand<KeyboardAcceleratorInvokedEventArgs>(CloseSelectedTabKeyboardAccelerator);
-			AddNewInstanceAcceleratorCommand = new AsyncRelayCommand<KeyboardAcceleratorInvokedEventArgs>(AddNewInstanceAccelerator);
 			ReopenClosedTabAcceleratorCommand = new RelayCommand<KeyboardAcceleratorInvokedEventArgs>(ReopenClosedTabAccelerator);
 			OpenSettingsCommand = new RelayCommand(OpenSettings);
 		}
@@ -155,12 +152,6 @@ private void CloseSelectedTabKeyboardAccelerator(KeyboardAcceleratorInvokedEvent
 			e!.Handled = true;
 		}
 
-		private async Task AddNewInstanceAccelerator(KeyboardAcceleratorInvokedEventArgs? e)
-		{
-			await AddNewTabAsync();
-			e!.Handled = true;
-		}
-
 		private void ReopenClosedTabAccelerator(KeyboardAcceleratorInvokedEventArgs? e)
 		{
 			(MultitaskingControl as BaseMultitaskingControl)?.ReopenClosedTab(null, null);
@@ -414,19 +405,16 @@ public void AddNewTab()
 			AddNewTabAsync();
 		}
 
-		public static async void AddNewTabAtIndex(object sender, RoutedEventArgs e)
+		public static async Task DuplicateTabAsync()
 		{
-			await AddNewTabAsync();
-		}
+			var tabItem = AppInstances.FirstOrDefault(instance => instance.Control.TabItemContent.IsCurrentInstance);
+			if (tabItem is null)
+				return;
 
-		public static async void DuplicateTabAtIndex(object sender, RoutedEventArgs e)
-		{
-			var tabItem = (TabItem)((FrameworkElement)sender).DataContext;
 			var index = AppInstances.IndexOf(tabItem);
-
-			if (AppInstances[index].TabItemArguments is not null)
+			if (tabItem.TabItemArguments is not null)
 			{
-				var tabArgs = AppInstances[index].TabItemArguments;
+				var tabArgs = tabItem.TabItemArguments;
 				await AddNewTabByParam(tabArgs.InitialPageType, tabArgs.NavigationArg, index + 1);
 			}
 			else

src/Files.App/Views/ColumnShellPage.xaml

@@ -89,11 +89,6 @@
 			Key="F3"
 			Invoked="KeyboardAccelerator_Invoked"
 			IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}" />
-		<KeyboardAccelerator
-			Key="K"
-			Invoked="KeyboardAccelerator_Invoked"
-			IsEnabled="{x:Bind IsCurrentInstance, Mode=OneWay}"
-			Modifiers="Control,Shift" />
 		<KeyboardAccelerator
 			Key="H"
 			Invoked="KeyboardAccelerator_Invoked"

src/Files.App/Views/ColumnShellPage.xaml.cs

@@ -208,10 +208,6 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
 					ToolbarViewModel.IsEditModeEnabled = true;
 					break;
 
-				case (true, true, false, true, VirtualKey.K): // ctrl + shift + k, duplicate tab
-					await NavigationHelpers.OpenPathInNewTab(FilesystemViewModel.WorkingDirectory);
-					break;
-
 				case (true, false, false, true, VirtualKey.H): // ctrl + h, toggle hidden folder visibility
 					userSettingsService.FoldersSettingsService.ShowHiddenItems ^= true; // flip bool
 					break;

src/Files.App/Views/MainPage.xaml

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

src/Files.App/Views/ModernShellPage.xaml

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

src/Files.App/Views/ModernShellPage.xaml.cs

@@ -275,10 +275,6 @@ private async void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, Keybo
 
 					break;
 
-				case (true, true, false, true, VirtualKey.K): // ctrl + shift + k, duplicate tab
-					await NavigationHelpers.OpenPathInNewTab(FilesystemViewModel.WorkingDirectory);
-					break;
-
 				case (true, false, false, true, VirtualKey.H): // ctrl + h, toggle hidden folder visibility
 					userSettingsService.FoldersSettingsService.ShowHiddenItems ^= true; // flip bool
 					break;