Update ExecuteAddNewShortcutCommand for invert

Author: 0x5bfa

src/Files.App/Data/Commands/HotKey/HotKeyCollection.cs

@@ -51,7 +51,7 @@ public string RawLabel
 		/// <remarks>
 		/// For example, this is "Ctrl+A,  Ctrl+Alt+C"
 		/// </remarks>
-		public string HumanizedLabel
+		public string LocalizedLabel
 			=> string.Join(",  ", hotKeys.Where(hotKey => hotKey.IsVisible).Select(hotKey => hotKey.LocalizedLabel));
 
 		// Constructors
@@ -107,7 +107,7 @@ public IEnumerator<HotKey> GetEnumerator()
 		// Default methods
 
 		public override string ToString()
-			=> HumanizedLabel;
+			=> LocalizedLabel;
 
 		public override int GetHashCode()
 			=> hotKeys.GetHashCode();

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

@@ -456,7 +456,7 @@ public string? HotKeyText
 			{
 				get
 				{
-					string text = HotKeys.HumanizedLabel;
+					string text = HotKeys.LocalizedLabel;
 					if (string.IsNullOrEmpty(text))
 						return null;
 					return text;

src/Files.App/ViewModels/Settings/ActionsViewModel.cs

@@ -14,8 +14,8 @@ public class ActionsViewModel : ObservableObject
 
 		// Properties
 
-		public ObservableCollection<ModifiableCommandHotKeyItem> KeyboardShortcuts { get; } = [];
-		public ObservableCollection<ModifiableCommandHotKeyItem> ExcludedKeyboardShortcuts { get; } = [];
+		public ObservableCollection<ModifiableCommandHotKeyItem> ValidKeyboardShortcuts { get; } = [];
+		public ObservableCollection<ModifiableCommandHotKeyItem> AllKeyboardShortcuts { get; } = [];
 
 		private bool _IsResetAllConfirmationTeachingTipOpened;
 		public bool IsResetAllConfirmationTeachingTipOpened
@@ -51,29 +51,29 @@ public ModifiableCommandHotKeyItem? SelectedNewShortcutItem
 		public ICommand ShowResetAllConfirmationCommand { get; set; }
 		public ICommand ShowAddNewShortcutGridCommand { get; set; }
 		public ICommand HideAddNewShortcutGridCommand { get; set; }
-		public ICommand AddNewShortcutGridCommand { get; set; }
+		public ICommand AddNewShortcutCommand { get; set; }
 		public ICommand ResetAllCommand { get; set; }
 
 		// Constructor
 
 		public ActionsViewModel()
 		{
-			LoadCommandsCommand = new AsyncRelayCommand(LoadCommands);
+			LoadCommandsCommand = new AsyncRelayCommand(ExecuteLoadCommandsCommand);
 			ShowResetAllConfirmationCommand = new RelayCommand(ExecuteShowResetAllConfirmationCommand);
 			ShowAddNewShortcutGridCommand = new RelayCommand(ExecuteShowAddNewShortcutGridCommand);
 			HideAddNewShortcutGridCommand = new RelayCommand(ExecuteHideAddNewShortcutGridCommand);
-			AddNewShortcutGridCommand = new RelayCommand(ExecuteAddNewShortcutGridCommand);
+			AddNewShortcutCommand = new RelayCommand(ExecuteAddNewShortcutCommand);
 			ResetAllCommand = new RelayCommand(ExecuteResetAllCommand);
 		}
 
 		// Command methods
 
-		private async Task LoadCommands()
+		private async Task ExecuteLoadCommandsCommand()
 		{
 			await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 			{
-				KeyboardShortcuts.Clear();
-				ExcludedKeyboardShortcuts.Clear();
+				ValidKeyboardShortcuts.Clear();
+				AllKeyboardShortcuts.Clear();
 
 				foreach (var command in Commands)
 				{
@@ -82,25 +82,20 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 					if (command is NoneCommand)
 						continue;
 
-					if (command.HotKeys.IsEmpty)
+					AllKeyboardShortcuts.Add(new()
 					{
-						ExcludedKeyboardShortcuts.Add(new()
-						{
-							CommandCode = command.Code,
-							Label = command.Label,
-							Description = command.Description,
-							HotKey = new(),
-						});
-
-						continue;
-					}
+						CommandCode = command.Code,
+						Label = command.Label,
+						Description = command.Description,
+						HotKey = new(),
+					});
 
 					foreach (var hotkey in command.HotKeys)
 					{
 						if (!hotkey.IsVisible)
 							continue;
 
-						KeyboardShortcuts.Add(new()
+						ValidKeyboardShortcuts.Add(new()
 						{
 							CommandCode = command.Code,
 							Label = command.Label,
@@ -125,7 +120,7 @@ private void ExecuteShowAddNewShortcutGridCommand()
 			ShowAddNewShortcutGrid = true;
 
 			// Reset edit mode for each item
-			foreach (var hotkey in KeyboardShortcuts)
+			foreach (var hotkey in ValidKeyboardShortcuts)
 			{
 				hotkey.IsEditMode = false;
 				hotkey.HotKeyText = hotkey.HotKey.LocalizedLabel;
@@ -143,28 +138,57 @@ private void ExecuteHideAddNewShortcutGridCommand()
 			SelectedNewShortcutItem = null;
 		}
 
-		private void ExecuteAddNewShortcutGridCommand()
+		private void ExecuteAddNewShortcutCommand()
 		{
 			if (SelectedNewShortcutItem is null)
 				return;
 
+			// Check if this hot key is already taken
+			foreach (var hotkey in ValidKeyboardShortcuts)
+			{
+				if (SelectedNewShortcutItem.HotKeyText == hotkey.PreviousHotKey)
+				{
+					IsAlreadyUsedTeachingTipOpened = true;
+					return;
+				}
+			}
+
 			var actions =
 				GeneralSettingsService.Actions is not null
 					? new Dictionary<string, string>(GeneralSettingsService.Actions)
 					: [];
 
-			// Remove existing setting
-			foreach (var action in actions)
+			// Get raw string keys stored in the user setting
+			var storedKeys = actions.GetValueOrDefault(SelectedNewShortcutItem.CommandCode.ToString());
+
+			// Initialize
+			var newHotKey = HotKey.Parse(SelectedNewShortcutItem.HotKeyText);
+			var modifiedCollection = HotKeyCollection.Empty;
+
+			// The first time to customize
+			if (string.IsNullOrEmpty(storedKeys))
+			{
+				// Replace with new one
+				var modifiableDefaultCollection = SelectedNewShortcutItem.DefaultHotKeyCollection.ToList();
+				modifiableDefaultCollection.RemoveAll(x => x.RawLabel == SelectedNewShortcutItem.PreviousHotKey.RawLabel);
+				modifiableDefaultCollection.Add(newHotKey);
+				modifiedCollection = new HotKeyCollection(modifiableDefaultCollection);
+			}
+			// Stored in the user setting
+			else
 			{
-				if (Enum.TryParse(action.Key, true, out CommandCodes code) && code == SelectedNewShortcutItem.CommandCode)
-					actions.Remove(action.Key);
+				// Replace with new one
+				var modifiableCollection = HotKeyCollection.Parse(storedKeys).ToList();
+				modifiableCollection.RemoveAll(x => x.RawLabel == SelectedNewShortcutItem.PreviousHotKey.RawLabel || x.RawLabel == $"!{SelectedNewShortcutItem.PreviousHotKey.RawLabel}");
+				modifiableCollection.Add(newHotKey);
+				modifiedCollection = new HotKeyCollection(modifiableCollection);
 			}
 
-			// Create a new one
-			actions.Add(SelectedNewShortcutItem.CommandCode.ToString(), SelectedNewShortcutItem.HotKeyText);
+			// Remove previous one and add new one
+			actions.Remove(SelectedNewShortcutItem.CommandCode.ToString());
+			actions.Add(SelectedNewShortcutItem.CommandCode.ToString(), modifiedCollection.RawLabel);
 
-			// Set
-			SelectedNewShortcutItem.HotKey = HotKey.Parse(SelectedNewShortcutItem.HotKeyText);
+			// Store
 			GeneralSettingsService.Actions = actions;
 
 			// Create a clone
@@ -173,7 +197,7 @@ GeneralSettingsService.Actions is not null
 				CommandCode = SelectedNewShortcutItem.CommandCode,
 				Label = SelectedNewShortcutItem.Label,
 				Description = SelectedNewShortcutItem.Description,
-				HotKey = HotKey.Parse(SelectedNewShortcutItem.HotKey.RawLabel),
+				HotKey = HotKey.Parse(SelectedNewShortcutItem.HotKeyText),
 				DefaultHotKeyCollection = new(SelectedNewShortcutItem.DefaultHotKeyCollection),
 				PreviousHotKey = HotKey.Parse(SelectedNewShortcutItem.PreviousHotKey.RawLabel),
 			};
@@ -186,15 +210,15 @@ GeneralSettingsService.Actions is not null
 			SelectedNewShortcutItem = null;
 
 			// Add to existing list
-			KeyboardShortcuts.Insert(0, selectedNewItem);
+			ValidKeyboardShortcuts.Insert(0, selectedNewItem);
 		}
 
 		private void ExecuteResetAllCommand()
 		{
 			GeneralSettingsService.Actions = null;
 			IsResetAllConfirmationTeachingTipOpened = false;
 
-			_ = LoadCommands();
+			_ = ExecuteLoadCommandsCommand();
 		}
 	}
 }

src/Files.App/Views/Settings/ActionsPage.xaml

@@ -126,7 +126,7 @@
 				<ComboBox
 					x:Name="NewShortcutItemPickerComboBox"
 					Padding="0"
-					ItemsSource="{x:Bind ViewModel.ExcludedKeyboardShortcuts, Mode=OneWay}"
+					ItemsSource="{x:Bind ViewModel.AllKeyboardShortcuts, Mode=OneWay}"
 					PlaceholderText="{helpers:ResourceString Name=ChooseAnAction}"
 					SelectedItem="{x:Bind ViewModel.SelectedNewShortcutItem, Mode=TwoWay}">
 					<ComboBox.ItemTemplate>
@@ -176,7 +176,7 @@
 					Height="32"
 					Padding="0"
 					AutomationProperties.Name="{helpers:ResourceString Name=Add}"
-					Command="{x:Bind ViewModel.AddNewShortcutGridCommand, Mode=OneWay}"
+					Command="{x:Bind ViewModel.AddNewShortcutCommand, Mode=OneWay}"
 					IsEnabled="{x:Bind ViewModel.SelectedNewShortcutItem, Converter={StaticResource NullToBooleanConverter}, Mode=OneWay}"
 					Style="{StaticResource AccentButtonStyle}"
 					ToolTipService.ToolTip="{helpers:ResourceString Name=Add}">
@@ -206,8 +206,8 @@
 				Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
 
 			<ListView
-				x:Name="KeyboardShortcutsListView"
-				ItemsSource="{x:Bind ViewModel.KeyboardShortcuts, Mode=OneWay}"
+				x:Name="ValidKeyboardShortcutsListView"
+				ItemsSource="{x:Bind ViewModel.ValidKeyboardShortcuts, Mode=OneWay}"
 				ScrollViewer.HorizontalScrollBarVisibility="Hidden"
 				ScrollViewer.HorizontalScrollMode="Disabled"
 				ScrollViewer.VerticalScrollBarVisibility="Hidden"

src/Files.App/Views/Settings/ActionsPage.xaml.cs

@@ -62,7 +62,7 @@ private void EditButton_Click(object sender, RoutedEventArgs e)
 				}
 
 				// Reset edit mode for each item
-				foreach (var hotkey in ViewModel.KeyboardShortcuts)
+				foreach (var hotkey in ViewModel.ValidKeyboardShortcuts)
 				{
 					hotkey.IsEditMode = false;
 					hotkey.HotKeyText = hotkey.HotKey.LocalizedLabel;
@@ -85,7 +85,7 @@ private void SaveButton_Click(object sender, RoutedEventArgs e)
 			}
 
 			// Check if this hot key is already taken
-			foreach (var hotkey in ViewModel.KeyboardShortcuts)
+			foreach (var hotkey in ViewModel.ValidKeyboardShortcuts)
 			{
 				if (item.HotKeyText == hotkey.PreviousHotKey)
 				{
@@ -137,7 +137,7 @@ GeneralSettingsService.Actions is not null
 				item.HotKey = newHotKey;
 
 				// Set as customized
-				foreach (var action in ViewModel.KeyboardShortcuts)
+				foreach (var action in ViewModel.ValidKeyboardShortcuts)
 				{
 					if (action.CommandCode == item.CommandCode)
 						action.IsCustomized = !item.DefaultHotKeyCollection.Contains(action.HotKey);
@@ -172,7 +172,7 @@ GeneralSettingsService.Actions is not null
 				item.HotKey = newHotKey;
 
 				// Set as customized
-				foreach (var action in ViewModel.KeyboardShortcuts)
+				foreach (var action in ViewModel.ValidKeyboardShortcuts)
 				{
 					if (action.CommandCode == item.CommandCode)
 						action.IsCustomized = !item.DefaultHotKeyCollection.Contains(action.HotKey);
@@ -243,7 +243,7 @@ GeneralSettingsService.Actions is not null
 
 				// Exit
 				item.IsEditMode = false;
-				ViewModel.KeyboardShortcuts.Remove(item);
+				ViewModel.ValidKeyboardShortcuts.Remove(item);
 
 				return;
 			}
@@ -257,15 +257,15 @@ GeneralSettingsService.Actions is not null
 				// Remove previous
 				actions.Remove(item.CommandCode.ToString());
 
-				if (modifiedCollection.HumanizedLabel != string.Empty)
+				if (modifiedCollection.LocalizedLabel != string.Empty)
 					actions.Add(item.CommandCode.ToString(), modifiedCollection.RawLabel);
 
 				// Save
 				GeneralSettingsService.Actions = actions;
 
 				// Exit
 				item.IsEditMode = false;
-				ViewModel.KeyboardShortcuts.Remove(item);
+				ViewModel.ValidKeyboardShortcuts.Remove(item);
 
 				return;
 			}