Update namings

Author: 0x5bfa

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

@@ -31,11 +31,11 @@ public bool IsAlreadyUsedTeachingTipOpened
 			set => SetProperty(ref _IsAlreadyUsedTeachingTipOpened, value);
 		}
 
-		private bool _ShowAddNewShortcutGrid;
-		public bool ShowAddNewShortcutGrid
+		private bool _ShowAddNewHotKeySection;
+		public bool ShowAddNewHotKeySection
 		{
-			get => _ShowAddNewShortcutGrid;
-			set => SetProperty(ref _ShowAddNewShortcutGrid, value);
+			get => _ShowAddNewHotKeySection;
+			set => SetProperty(ref _ShowAddNewHotKeySection, value);
 		}
 
 		private ModifiableCommandHotKeyItem? _SelectedNewShortcutItem;
@@ -48,22 +48,22 @@ public ModifiableCommandHotKeyItem? SelectedNewShortcutItem
 		// Commands
 
 		public ICommand LoadCommandsCommand { get; set; }
-		public ICommand ShowResetAllConfirmationCommand { get; set; }
-		public ICommand ShowAddNewShortcutGridCommand { get; set; }
-		public ICommand HideAddNewShortcutGridCommand { get; set; }
-		public ICommand AddNewShortcutCommand { get; set; }
-		public ICommand ResetAllCommand { get; set; }
+		public ICommand ShowAddNewHotKeySectionCommand { get; set; }
+		public ICommand HideAddNewHotKeySectionCommand { get; set; }
+		public ICommand AddNewHotKeyCommand { get; set; }
+		public ICommand ShowRestoreDefaultsConfirmationCommand { get; set; }
+		public ICommand RestoreDefaultsCommand { get; set; }
 
 		// Constructor
 
 		public ActionsViewModel()
 		{
 			LoadCommandsCommand = new AsyncRelayCommand(ExecuteLoadCommandsCommand);
-			ShowResetAllConfirmationCommand = new RelayCommand(ExecuteShowResetAllConfirmationCommand);
-			ShowAddNewShortcutGridCommand = new RelayCommand(ExecuteShowAddNewShortcutGridCommand);
-			HideAddNewShortcutGridCommand = new RelayCommand(ExecuteHideAddNewShortcutGridCommand);
-			AddNewShortcutCommand = new RelayCommand(ExecuteAddNewShortcutCommand);
-			ResetAllCommand = new RelayCommand(ExecuteResetAllCommand);
+			ShowAddNewHotKeySectionCommand = new RelayCommand(ExecuteShowAddNewHotKeySectionCommand);
+			HideAddNewHotKeySectionCommand = new RelayCommand(ExecuteHideAddNewHotKeySectionCommand);
+			AddNewHotKeyCommand = new RelayCommand(ExecuteAddNewHotKeyCommand);
+			ShowRestoreDefaultsConfirmationCommand = new RelayCommand(ExecuteShowRestoreDefaultsConfirmationCommand);
+			RestoreDefaultsCommand = new RelayCommand(ExecuteRestoreDefaultsCommand);
 		}
 
 		// Command methods
@@ -110,26 +110,21 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(() =>
 			});
 		}
 
-		private void ExecuteShowResetAllConfirmationCommand()
+		private void ExecuteShowAddNewHotKeySectionCommand()
 		{
-			IsResetAllConfirmationTeachingTipOpened = true;
-		}
-
-		private void ExecuteShowAddNewShortcutGridCommand()
-		{
-			ShowAddNewShortcutGrid = true;
+			ShowAddNewHotKeySection = true;
 
-			// Reset edit mode for each item
+			// Reset edit mode of every item
 			foreach (var hotkey in ValidKeyboardShortcuts)
 			{
 				hotkey.IsEditMode = false;
 				hotkey.HotKeyText = hotkey.HotKey.LocalizedLabel;
 			}
 		}
 
-		private void ExecuteHideAddNewShortcutGridCommand()
+		private void ExecuteHideAddNewHotKeySectionCommand()
 		{
-			ShowAddNewShortcutGrid = false;
+			ShowAddNewHotKeySection = false;
 
 			if (SelectedNewShortcutItem is null)
 				return;
@@ -138,7 +133,7 @@ private void ExecuteHideAddNewShortcutGridCommand()
 			SelectedNewShortcutItem = null;
 		}
 
-		private void ExecuteAddNewShortcutCommand()
+		private void ExecuteAddNewHotKeyCommand()
 		{
 			if (SelectedNewShortcutItem is null)
 				return;
@@ -202,8 +197,8 @@ GeneralSettingsService.Actions is not null
 				PreviousHotKey = HotKey.Parse(SelectedNewShortcutItem.PreviousHotKey.RawLabel),
 			};
 
-			// Hide the grid
-			ShowAddNewShortcutGrid = false;
+			// Hide the section
+			ShowAddNewHotKeySection = false;
 
 			// Remove from excluded list and set null
 			SelectedNewShortcutItem.HotKeyText = "";
@@ -213,7 +208,12 @@ GeneralSettingsService.Actions is not null
 			ValidKeyboardShortcuts.Insert(0, selectedNewItem);
 		}
 
-		private void ExecuteResetAllCommand()
+		private void ExecuteShowRestoreDefaultsConfirmationCommand()
+		{
+			IsResetAllConfirmationTeachingTipOpened = true;
+		}
+
+		private void ExecuteRestoreDefaultsCommand()
 		{
 			GeneralSettingsService.Actions = null;
 			IsResetAllConfirmationTeachingTipOpened = false;

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

@@ -82,35 +82,36 @@
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
 
+				<!--  Subtitle Text  -->
 				<TextBlock
 					Margin="0,8,0,4"
 					FontSize="16"
 					FontWeight="Medium"
 					Text="{helpers:ResourceString Name=Commands}" />
 
-				<!--  Add New Button  -->
+				<!--  Show Add New Section Button  -->
 				<Button
 					x:Name="ShowAddNewGridButton"
 					Grid.Column="1"
-					Command="{x:Bind ViewModel.ShowAddNewShortcutGridCommand, Mode=OneWay}"
+					Command="{x:Bind ViewModel.ShowAddNewHotKeySectionCommand, Mode=OneWay}"
 					Content="{helpers:ResourceString Name=AddCommand}"
 					IsEnabled="{x:Bind ViewModel.SelectedNewShortcutItem, Converter={StaticResource NullToNegateBooleanConverter}, Mode=OneWay}" />
 
-				<!--  Reset All Button  -->
+				<!--  Restore Defaults Button  -->
 				<Button
-					x:Name="ResetAllButton"
+					x:Name="RestoreDefaultsButton"
 					Grid.Column="2"
-					Command="{x:Bind ViewModel.ShowResetAllConfirmationCommand, Mode=OneWay}"
+					Command="{x:Bind ViewModel.ShowRestoreDefaultsConfirmationCommand, Mode=OneWay}"
 					Content="{helpers:ResourceString Name=RestoreDefaults}" />
 			</Grid>
 
 			<!--  Add New  -->
 			<Grid
-				x:Name="CreateNewSectionGrid"
+				x:Name="CreateNewHotKeySection"
 				Height="60"
 				Margin="0,4,0,0"
 				Padding="16,12"
-				x:Load="{x:Bind ViewModel.ShowAddNewShortcutGrid, Mode=OneWay}"
+				x:Load="{x:Bind ViewModel.ShowAddNewHotKeySection, Mode=OneWay}"
 				Background="{ThemeResource ExpanderHeaderBackground}"
 				BorderBrush="{ThemeResource ExpanderHeaderBorderBrush}"
 				BorderThickness="1"
@@ -123,8 +124,9 @@
 					<ColumnDefinition Width="32" />
 				</Grid.ColumnDefinitions>
 
+				<!--  New Command Selector  -->
 				<ComboBox
-					x:Name="NewShortcutItemPickerComboBox"
+					x:Name="NewHotKeyItemPickerComboBox"
 					Padding="0"
 					ItemsSource="{x:Bind ViewModel.AllKeyboardShortcuts, Mode=OneWay}"
 					PlaceholderText="{helpers:ResourceString Name=ChooseAnAction}"
@@ -170,41 +172,43 @@
 
 				<!--  Add Button  -->
 				<Button
-					x:Name="AddNewButton"
+					x:Name="AddButton"
 					Grid.Column="2"
 					Width="32"
 					Height="32"
 					Padding="0"
 					AutomationProperties.Name="{helpers:ResourceString Name=Add}"
-					Command="{x:Bind ViewModel.AddNewShortcutCommand, Mode=OneWay}"
+					Command="{x:Bind ViewModel.AddNewHotKeyCommand, Mode=OneWay}"
 					IsEnabled="{x:Bind ViewModel.SelectedNewShortcutItem, Converter={StaticResource NullToBooleanConverter}, Mode=OneWay}"
 					Style="{StaticResource AccentButtonStyle}"
 					ToolTipService.ToolTip="{helpers:ResourceString Name=Add}">
 					<FontIcon FontSize="14" Glyph="&#xE73E;" />
 				</Button>
 
-				<!--  Delete Button  -->
+				<!--  Cancel Button  -->
 				<Button
-					x:Name="DeleteButton"
+					x:Name="CancelButton"
 					Grid.Column="3"
 					Width="32"
 					Height="32"
 					Padding="0"
 					AutomationProperties.Name="{helpers:ResourceString Name=Cancel}"
-					Command="{x:Bind ViewModel.HideAddNewShortcutGridCommand, Mode=OneWay}"
+					Command="{x:Bind ViewModel.HideAddNewHotKeySectionCommand, Mode=OneWay}"
 					ToolTipService.ToolTip="{helpers:ResourceString Name=Cancel}">
 					<FontIcon FontSize="14" Glyph="&#xE711;" />
 				</Button>
 
 			</Grid>
 
+			<!--  (Divider)  -->
 			<Border
-				x:Name="CreateNewSectionGridDividerBorder"
+				x:Name="NewHotKeySectionDividerBorder"
 				Height="1"
 				Margin="0,4"
-				x:Load="{x:Bind ViewModel.ShowAddNewShortcutGrid, Mode=OneWay}"
+				x:Load="{x:Bind ViewModel.ShowAddNewHotKeySection, Mode=OneWay}"
 				Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
 
+			<!--  List Of Available HotKeys  -->
 			<ListView
 				x:Name="ValidKeyboardShortcutsListView"
 				ItemsSource="{x:Bind ViewModel.ValidKeyboardShortcuts, Mode=OneWay}"
@@ -369,20 +373,23 @@
 				</ListView.ItemContainerStyle>
 
 			</ListView>
+
 		</StackPanel>
 
+		<!--  Restore Defaults Confirmation TeachingTip  -->
 		<TeachingTip
-			x:Name="ResetAllConfirmationTeachingTip"
-			ActionButtonCommand="{x:Bind ViewModel.ResetAllCommand, Mode=OneWay}"
+			x:Name="RestoreDefaultsConfirmationTeachingTip"
+			ActionButtonCommand="{x:Bind ViewModel.RestoreDefaultsCommand, Mode=OneWay}"
 			ActionButtonContent="{helpers:ResourceString Name=Yes}"
 			ActionButtonStyle="{ThemeResource AccentButtonStyle}"
 			CloseButtonContent="{helpers:ResourceString Name=No}"
 			IsLightDismissEnabled="True"
 			IsOpen="{x:Bind ViewModel.IsResetAllConfirmationTeachingTipOpened, Mode=TwoWay}"
 			PreferredPlacement="BottomLeft"
 			Subtitle="{helpers:ResourceString Name=RestoreDefaultKeybindingsConfirmation}"
-			Target="{x:Bind ResetAllButton}" />
+			Target="{x:Bind RestoreDefaultsButton}" />
 
+		<!--  Already Used TeachingTip  -->
 		<TeachingTip
 			x:Name="AlreadyUsedTeachingTip"
 			CloseButtonContent="OK"

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

@@ -54,7 +54,7 @@ private void EditButton_Click(object sender, RoutedEventArgs e)
 			if (sender is Button button && button.DataContext is ModifiableCommandHotKeyItem item)
 			{
 				// Hide the add command grid
-				ViewModel.ShowAddNewShortcutGrid = false;
+				ViewModel.ShowAddNewHotKeySection = false;
 
 				// Reset the selected item's info
 				if (ViewModel.SelectedNewShortcutItem is not null)