Feature: Open in Terminal RichCommand

src/Files.App/Actions/Global/OpenTerminalAction.cs

@@ -0,0 +1,61 @@
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Files.App.Commands;
+using Files.App.Contexts;
+using Files.App.Extensions;
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using Windows.Storage;
+using Windows.System;
+
+namespace Files.App.Actions
+{
+	internal class OpenTerminalAction : IAction
+	{
+		private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
+
+		public string Label { get; } = "OpenTerminal".GetLocalizedResource();
+
+		public virtual HotKey HotKey { get; } = new((VirtualKey)192, VirtualKeyModifiers.Control);
+
+		public RichGlyph Glyph { get; } = new RichGlyph("\uE756");
+
+		public Task ExecuteAsync()
+		{
+			var terminalStartInfo = GetProcessStartInfo();
+			if (terminalStartInfo is not null)
+			{
+				try
+				{
+					App.Window.DispatcherQueue.TryEnqueue(() => Process.Start(terminalStartInfo));
+				}
+				catch (OperationCanceledException)
+				{
+				}
+			}
+
+			return Task.CompletedTask;
+		}
+
+		protected virtual ProcessStartInfo? GetProcessStartInfo()
+		{
+			var path = GetPath();
+			if (path == string.Empty)
+				return null;
+
+			return new()
+			{
+				FileName = "wt.exe",
+				Arguments = $"-d {path}"
+			};
+		}
+
+		protected string GetPath()
+		{
+			// Return folder path if there is a folder selected, otherwise the current directory.
+			return context.ShellPage?.SlimContentPage?.SelectedItem?.PrimaryItemAttribute is StorageItemTypes.Folder
+				? context.ShellPage.SlimContentPage.SelectedItem.ItemPath
+				: context.ShellPage?.FilesystemViewModel.WorkingDirectory ?? string.Empty;
+		}
+	}
+}

src/Files.App/Actions/Global/OpenTerminalAsAdmin.cs

@@ -0,0 +1,26 @@
+using Files.App.Commands;
+using Files.App.Extensions;
+using System.Diagnostics;
+using Windows.System;
+
+namespace Files.App.Actions
+{
+	internal class OpenTerminalAsAdminAction : OpenTerminalAction
+	{
+		public new string Label { get; } = "OpenTerminalAsAdmin".GetLocalizedResource();
+
+		public override HotKey HotKey { get; } = new((VirtualKey)192, VirtualKeyModifiers.Control | VirtualKeyModifiers.Shift);
+
+		protected override ProcessStartInfo? GetProcessStartInfo()
+		{
+			var startInfo = base.GetProcessStartInfo();
+			if (startInfo is not null)
+			{
+				startInfo.Verb = "runas";
+				startInfo.UseShellExecute = true;
+			}
+
+			return startInfo;
+		}
+	}
+}

src/Files.App/Commands/CommandCodes.cs

@@ -6,6 +6,8 @@ public enum CommandCodes
 
 		// global
 		OpenHelp,
+		OpenTerminal,
+		OpenTerminalAsAdmin,
 		ToggleFullScreen,
 
 		// show

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

@@ -28,6 +28,8 @@ internal class CommandManager : ICommandManager
 
 		public IRichCommand None => commands[CommandCodes.None];
 		public IRichCommand OpenHelp => commands[CommandCodes.OpenHelp];
+		public IRichCommand OpenTerminal => commands[CommandCodes.OpenTerminal];
+		public IRichCommand OpenTerminalAsAdmin => commands[CommandCodes.OpenTerminalAsAdmin];
 		public IRichCommand ToggleFullScreen => commands[CommandCodes.ToggleFullScreen];
 		public IRichCommand ToggleShowHiddenItems => commands[CommandCodes.ToggleShowHiddenItems];
 		public IRichCommand ToggleShowFileExtensions => commands[CommandCodes.ToggleShowFileExtensions];
@@ -54,6 +56,8 @@ public CommandManager()
 		private static IDictionary<CommandCodes, IAction> CreateActions() => new Dictionary<CommandCodes, IAction>
 		{
 			[CommandCodes.OpenHelp] = new OpenHelpAction(),
+			[CommandCodes.OpenTerminal] = new OpenTerminalAction(),
+			[CommandCodes.OpenTerminalAsAdmin] = new OpenTerminalAsAdminAction(),
 			[CommandCodes.ToggleFullScreen] = new ToggleFullScreenAction(),
 			[CommandCodes.ToggleShowHiddenItems] = new ToggleShowHiddenItemsAction(),
 			[CommandCodes.ToggleShowFileExtensions] = new ToggleShowFileExtensionsAction(),

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

@@ -13,6 +13,8 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 		IRichCommand None { get; }
 
 		IRichCommand OpenHelp { get; }
+		IRichCommand OpenTerminal { get; }
+		IRichCommand OpenTerminalAsAdmin { get; }
 		IRichCommand ToggleFullScreen { get; }
 
 		IRichCommand ToggleShowHiddenItems { get; }

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

@@ -2601,6 +2601,12 @@
   <data name="ApplyToAllConflictingItems" xml:space="preserve">
     <value>Apply this action to all conflicting items</value>
   </data>
+  <data name="OpenTerminal" xml:space="preserve">
+    <value>Open in terminal</value>
+  </data>
+  <data name="OpenTerminalAsAdmin" xml:space="preserve">
+    <value>Open in terminal as admin</value>
+  </data>
   <data name="Save" xml:space="preserve">
     <value>Save</value>
   </data>

src/Files.App/Views/BaseShellPage.cs

@@ -1,6 +1,7 @@
 using CommunityToolkit.Mvvm.DependencyInjection;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.WinUI;
+using Files.App.Commands;
 using Files.App.DataModels;
 using Files.App.EventArguments;
 using Files.App.Extensions;
@@ -27,12 +28,10 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Windows.Storage;
 using Windows.System;
 using Windows.UI.Core;
 using SortDirection = Files.Shared.Enums.SortDirection;
@@ -56,6 +55,8 @@ public abstract class BaseShellPage : Page, IShellPage, INotifyPropertyChanged
 
 		protected readonly IUpdateService updateSettingsService = Ioc.Default.GetRequiredService<IUpdateService>();
 
+		protected readonly ICommandManager commands = Ioc.Default.GetRequiredService<ICommandManager>();
+
 		public ToolbarViewModel ToolbarViewModel { get; } = new ToolbarViewModel();
 
 		public IBaseLayout SlimContentPage => ContentPage;
@@ -284,19 +285,10 @@ protected void ShellPage_PreviewKeyDown(object sender, KeyRoutedEventArgs args)
 				// Ctrl + ` (accent key), open terminal
 				case (true, _, false, true, (VirtualKey)192):
 
-					// Check if there is a folder selected, if not use the current directory.
-					string path = FilesystemViewModel.WorkingDirectory;
-					if (SlimContentPage?.SelectedItem?.PrimaryItemAttribute == StorageItemTypes.Folder)
-						path = SlimContentPage.SelectedItem.ItemPath;
-
-					var terminalStartInfo = new ProcessStartInfo()
-					{
-						FileName = "wt.exe",
-						Arguments = $"-d {path}",
-						Verb = shift ? "runas" : "",
-						UseShellExecute = true
-					};
-					DispatcherQueue.TryEnqueue(() => Process.Start(terminalStartInfo));
+					if (shift)
+						commands.OpenTerminalAsAdmin.ExecuteAsync();
+					else
+						commands.OpenTerminal.ExecuteAsync();
 
 					args.Handled = true;