RichCommand: InstallFont

src/Files.App/Actions/Content/InstallFontAction.cs

@@ -0,0 +1,47 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using Files.App.Contexts;
+using Files.App.Extensions;
+using Files.App.Filesystem;
+using Files.App.Shell;
+using Files.Backend.Helpers;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Files.App.Actions
+{
+	internal class InstallFontAction : ObservableObject, IAction
+	{
+		private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
+
+		public string Label => "Install".GetLocalizedResource();
+
+		public bool IsExecutable => context.SelectedItems.Any() &&
+			context.SelectedItems.All(x => FileExtensionHelpers.IsFontFile(x.FileExtension)) &&
+			context.PageType is not ContentPageTypes.RecycleBin;
+
+		public InstallFontAction()
+		{
+			context.PropertyChanged += Context_PropertyChanged;
+		}
+
+		public Task ExecuteAsync()
+		{
+			foreach (ListedItem selectedItem in context.SelectedItems)
+				Win32API.InstallFont(selectedItem.ItemPath, false);
+
+			return Task.CompletedTask;
+		}
+
+		public void Context_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
+		{
+			switch (e.PropertyName)
+			{
+				case nameof(IContentPageContext.SelectedItems):
+				case nameof(IContentPageContext.PageType):
+					OnPropertyChanged(nameof(IsExecutable));
+					break;
+			}
+		}
+	}
+}

src/Files.App/Commands/CommandCodes.cs

@@ -102,9 +102,12 @@ public enum CommandCodes
 		GroupAscending,
 		GroupDescending,
 		ToggleGroupDirection,
-    
+
 		// Navigation
 		NewTab,
 		DuplicateTab,
+
+		// Other
+		InstallFont,
 	}
 }

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

@@ -104,6 +104,7 @@ internal class CommandManager : ICommandManager
 		public IRichCommand ToggleGroupDirection => commands[CommandCodes.ToggleGroupDirection];
 		public IRichCommand NewTab => commands[CommandCodes.NewTab];
 		public IRichCommand DuplicateTab => commands[CommandCodes.DuplicateTab];
+		public IRichCommand InstallFont => commands[CommandCodes.InstallFont];
 
 		public CommandManager()
 		{
@@ -205,11 +206,10 @@ public CommandManager()
 			[CommandCodes.GroupByFolderPath] = new GroupByFolderPathAction(),
 			[CommandCodes.GroupAscending] = new GroupAscendingAction(),
 			[CommandCodes.GroupDescending] = new GroupDescendingAction(),
-			[CommandCodes.GroupAscending] = new GroupAscendingAction(),
-			[CommandCodes.GroupDescending] = new GroupDescendingAction(),
 			[CommandCodes.ToggleGroupDirection] = new ToggleGroupDirectionAction(),
 			[CommandCodes.NewTab] = new NewTabAction(),
 			[CommandCodes.DuplicateTab] = new DuplicateTabAction(),
+			[CommandCodes.InstallFont] = new InstallFontAction(),
 		};
 
 		[DebuggerDisplay("Command None")]

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

@@ -96,5 +96,7 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 
 		IRichCommand NewTab { get; }
 		IRichCommand DuplicateTab { get; }
+
+		IRichCommand InstallFont { get; }
 	}
 }

src/Files.App/Helpers/ShellContextMenuHelper.cs

@@ -178,14 +178,14 @@ async void InvokeShellMenuItem(ContextMenu contextMenu, object? tag)
 					case "install" when isFont:
 						{
 							foreach (string path in contextMenu.ItemsPath)
-								InstallFont(path, false);
+								Win32API.InstallFont(path, false);
 						}
 						break;
 
 					case "installAllUsers" when isFont:
 						{
 							foreach (string path in contextMenu.ItemsPath)
-								InstallFont(path, true);
+								Win32API.InstallFont(path, true);
 						}
 						break;
 
@@ -204,16 +204,6 @@ async void InvokeShellMenuItem(ContextMenu contextMenu, object? tag)
 						break;
 				}
 
-				void InstallFont(string path, bool asAdmin)
-				{
-					string dir = asAdmin ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "Fonts")
-						: Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft", "Windows", "Fonts");
-
-					string registryKey = asAdmin ? "HKLM:\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"
-						: "HKCU:\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts";
-
-					Win32API.RunPowershellCommand($"-command \"Copy-Item '{path}' '{dir}'; New-ItemProperty -Name '{Path.GetFileNameWithoutExtension(path)}' -Path '{registryKey}' -PropertyType string -Value '{dir}'\"", asAdmin);
-				}
 				//contextMenu.Dispose(); // Prevents some menu items from working (TBC)
 			}
 		}

src/Files.App/Interacts/BaseLayoutCommandImplementationModel.cs

@@ -407,14 +407,6 @@ public async Task InstallInfDriver()
 				await Win32API.InstallInf(selectedItem.ItemPath);
 		}
 
-		public Task InstallFont()
-		{
-			foreach (ListedItem selectedItem in SlimContentPage.SelectedItems)
-				Win32API.InstallFont(selectedItem.ItemPath);
-
-			return Task.CompletedTask;
-		}
-
 		public async Task PlayAll()
 		{
 			await NavigationHelpers.OpenSelectedItems(associatedInstance);

src/Files.App/Interacts/BaseLayoutCommandsViewModel.cs

@@ -46,7 +46,6 @@ private void InitializeCommands()
 			SearchUnindexedItems = new RelayCommand<RoutedEventArgs>(CommandsModel.SearchUnindexedItems);
 			CreateFolderWithSelection = new AsyncRelayCommand<RoutedEventArgs>(CommandsModel.CreateFolderWithSelection);
 			InstallInfDriver = new AsyncRelayCommand(CommandsModel.InstallInfDriver);
-			InstallFontCommand = new AsyncRelayCommand(CommandsModel.InstallFont);
 			PlayAllCommand = new AsyncRelayCommand(CommandsModel.PlayAll);
 			FormatDriveCommand = new RelayCommand<ListedItem>(CommandsModel.FormatDrive);
 		}
@@ -93,8 +92,6 @@ private void InitializeCommands()
 
 		public ICommand InstallInfDriver { get; set; }
 
-		public ICommand InstallFontCommand { get; private set; }
-
 		public ICommand PlayAllCommand { get; private set; }
 
 		public ICommand FormatDriveCommand { get; private set; }

src/Files.App/Interacts/IBaseLayoutCommandImplementationModel.cs

@@ -47,8 +47,6 @@ public interface IBaseLayoutCommandImplementationModel : IDisposable
 
 		Task InstallInfDriver();
 
-		Task InstallFont();
-
 		Task PlayAll();
 
 		void FormatDrive(ListedItem? obj);

src/Files.App/Shell/Win32API.cs

@@ -805,12 +805,19 @@ public static async Task<bool> InstallInf(string filePath)
 			}
 		}
 
-		public static void InstallFont(string fontFilePath)
+		public static void InstallFont(string fontFilePath, bool forAllUsers)
 		{
-			var userFontDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft", "Windows", "Fonts");
-			var destName = Path.Combine(userFontDir, Path.GetFileName(fontFilePath));
+			string fontDirectory = forAllUsers
+				? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "Fonts")
+				: Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft", "Windows", "Fonts");
 
-			RunPowershellCommand($"-command \"Copy-Item '{fontFilePath}' '{userFontDir}'; New-ItemProperty -Name '{Path.GetFileNameWithoutExtension(fontFilePath)}' -Path 'HKCU:\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts' -PropertyType string -Value '{destName}'\"", false);
+			string registryKey = forAllUsers 
+				? "HKLM:\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"
+				: "HKCU:\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts";
+
+			var destinationPath = Path.Combine(fontDirectory, Path.GetFileName(fontFilePath));
+
+			RunPowershellCommand($"-command \"Copy-Item '{fontFilePath}' '{fontDirectory}'; New-ItemProperty -Name '{Path.GetFileNameWithoutExtension(fontFilePath)}' -Path '{registryKey}' -PropertyType string -Value '{destinationPath}'\"", forAllUsers);
 		}
 	}
 }

src/Files.App/UserControls/InnerNavigationToolbar.xaml

@@ -352,9 +352,9 @@
 				</AppBarButton>
 				<AppBarButton
 					x:Name="InstallFontButton"
-					x:Load="{x:Bind ViewModel.IsFont, Mode=OneWay, FallbackValue=False}"
-					Command="{x:Bind ViewModel.InstallFontCommand, Mode=OneWay}"
-					Label="{helpers:ResourceString Name=Install}"
+					x:Load="{x:Bind Commands.InstallFont.IsExecutable, Mode=OneWay, FallbackValue=False}"
+					Command="{x:Bind Commands.InstallFont, Mode=OneWay}"
+					Label="{x:Bind Commands.InstallFont.Label}"
 					LabelPosition="Default"
 					ToolTipService.ToolTip="{helpers:ResourceString Name=Install}">
 

src/Files.App/ViewModels/ToolbarViewModel.cs

@@ -591,8 +591,6 @@ private void SearchRegion_Escaped(object? sender, ISearchBox searchBox)
 
 		public ICommand? InstallInfCommand { get; set; }
 
-		public ICommand? InstallFontCommand { get; set; }
-
 		public ICommand? UpdateCommand { get; set; }
 
 		public ICommand? PlayAllCommand { get; set; }

src/Files.App/Views/BaseShellPage.cs

@@ -636,7 +636,6 @@ protected void InitToolbarCommands()
 			ToolbarViewModel.RunWithPowerShellCommand = new RelayCommand(async () => await Win32Helpers.InvokeWin32ComponentAsync("powershell", this, PathNormalization.NormalizePath(SlimContentPage?.SelectedItem.ItemPath)));
 			ToolbarViewModel.PropertiesCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.ShowPropertiesCommand.Execute(null));
 			ToolbarViewModel.InstallInfCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.InstallInfDriver.Execute(null));;
-			ToolbarViewModel.InstallFontCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.InstallFontCommand.Execute(null));
 			ToolbarViewModel.UpdateCommand = new AsyncRelayCommand(async () => await updateSettingsService.DownloadUpdates());
 			ToolbarViewModel.PlayAllCommand = new RelayCommand(() => SlimContentPage?.CommandsViewModel.PlayAllCommand.Execute(null));
 		}