diff --git a/src/Files.App/Actions/FileSystem/CopyItemAction.cs b/src/Files.App/Actions/FileSystem/CopyItemAction.cs index 6d99de6316e6..944d64947d30 100644 --- a/src/Files.App/Actions/FileSystem/CopyItemAction.cs +++ b/src/Files.App/Actions/FileSystem/CopyItemAction.cs @@ -33,7 +33,7 @@ public async Task ExecuteAsync() await UIFilesystemHelpers.CopyItem(context.ShellPage); } - public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { if (e.PropertyName is nameof(IContentPageContext.HasSelection)) OnPropertyChanged(nameof(IsExecutable)); diff --git a/src/Files.App/Actions/FileSystem/CreateFolderAction.cs b/src/Files.App/Actions/FileSystem/CreateFolderAction.cs index c674aa715f88..0dcf8fcac1e7 100644 --- a/src/Files.App/Actions/FileSystem/CreateFolderAction.cs +++ b/src/Files.App/Actions/FileSystem/CreateFolderAction.cs @@ -32,7 +32,7 @@ public Task ExecuteAsync() return Task.CompletedTask; } - public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { if (e.PropertyName is nameof(IContentPageContext.HasSelection)) OnPropertyChanged(nameof(IsExecutable)); diff --git a/src/Files.App/Actions/FileSystem/CreateShortcutAction.cs b/src/Files.App/Actions/FileSystem/CreateShortcutAction.cs index 75a778a2e9d1..e1e430685747 100644 --- a/src/Files.App/Actions/FileSystem/CreateShortcutAction.cs +++ b/src/Files.App/Actions/FileSystem/CreateShortcutAction.cs @@ -15,7 +15,7 @@ internal class CreateShortcutAction : ObservableObject, IAction { private readonly IContentPageContext context = Ioc.Default.GetRequiredService(); - public string Label { get; } = "BaseLayoutItemContextFlyoutShortcut/Text".GetLocalizedResource(); + public string Label { get; } = "CreateShortcut".GetLocalizedResource(); public RichGlyph Glyph { get; } = new RichGlyph(opacityStyle: "ColorIconShortcut"); @@ -45,7 +45,7 @@ public async Task ExecuteAsync() } } - public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { if (e.PropertyName is nameof(IContentPageContext.HasSelection)) OnPropertyChanged(nameof(IsExecutable)); diff --git a/src/Files.App/Actions/FileSystem/CreateShortcutFromDialogAction.cs b/src/Files.App/Actions/FileSystem/CreateShortcutFromDialogAction.cs index 03ba2c5701e7..6dd870c13005 100644 --- a/src/Files.App/Actions/FileSystem/CreateShortcutFromDialogAction.cs +++ b/src/Files.App/Actions/FileSystem/CreateShortcutFromDialogAction.cs @@ -30,7 +30,7 @@ public async Task ExecuteAsync() await UIFilesystemHelpers.CreateShortcutFromDialogAsync(context.ShellPage); } - public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { if (e.PropertyName is nameof(IContentPageContext.HasSelection)) OnPropertyChanged(nameof(IsExecutable)); diff --git a/src/Files.App/Actions/FileSystem/CutItemAction.cs b/src/Files.App/Actions/FileSystem/CutItemAction.cs index a97c28f3456d..d204e47bfbee 100644 --- a/src/Files.App/Actions/FileSystem/CutItemAction.cs +++ b/src/Files.App/Actions/FileSystem/CutItemAction.cs @@ -14,7 +14,7 @@ internal class CutItemAction : ObservableObject, IAction { private readonly IContentPageContext context = Ioc.Default.GetRequiredService(); - public string Label { get; } = "BaseLayoutItemContextFlyoutCut/Text".GetLocalizedResource(); + public string Label { get; } = "Cut".GetLocalizedResource(); public RichGlyph Glyph { get; } = new RichGlyph(opacityStyle: "ColorIconCut"); @@ -34,7 +34,7 @@ public Task ExecuteAsync() return Task.CompletedTask; } - public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { if (e.PropertyName is nameof(IContentPageContext.HasSelection)) OnPropertyChanged(nameof(IsExecutable)); diff --git a/src/Files.App/Actions/FileSystem/DeleteItemAction.cs b/src/Files.App/Actions/FileSystem/DeleteItemAction.cs index 6b0d33e33f63..220eddcc1fac 100644 --- a/src/Files.App/Actions/FileSystem/DeleteItemAction.cs +++ b/src/Files.App/Actions/FileSystem/DeleteItemAction.cs @@ -46,7 +46,7 @@ public async Task ExecuteAsync() await context.ShellPage.FilesystemViewModel.ApplyFilesAndFoldersChangesAsync(); } - public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) + private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e) { if (e.PropertyName is nameof(IContentPageContext.HasSelection)) OnPropertyChanged(nameof(IsExecutable)); diff --git a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs index bef4bda5c26b..64ed5732aa1d 100644 --- a/src/Files.App/Helpers/ContextFlyoutItemHelper.cs +++ b/src/Files.App/Helpers/ContextFlyoutItemHelper.cs @@ -380,12 +380,10 @@ public static List GetBaseItemMenuItems( }, new ContextMenuFlyoutItemViewModelBuilder(commands.CutItem) { - IsVisible = itemsSelected, IsPrimary = true, }.Build(), new ContextMenuFlyoutItemViewModelBuilder(commands.CopyItem) { - IsVisible = itemsSelected, IsPrimary = true, }.Build(), new ContextMenuFlyoutItemViewModel() diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw index 7851c0e82834..fc7ec528870e 100644 --- a/src/Files.App/Strings/en-US/Resources.resw +++ b/src/Files.App/Strings/en-US/Resources.resw @@ -528,7 +528,7 @@ Copy to {0} - + Create shortcut diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml index ebe6e96a36e0..779b57c71249 100644 --- a/src/Files.App/UserControls/InnerNavigationToolbar.xaml +++ b/src/Files.App/UserControls/InnerNavigationToolbar.xaml @@ -116,8 +116,8 @@ MinWidth="40" AccessKey="C" AutomationProperties.AutomationId="InnerNavigationToolbarCopyButton" - Command="{x:Bind Commands.CopyItem, Mode=OneWay}" - Label="{x:Bind Commands.CopyItem}" + Command="{x:Bind Commands.CopyItem}" + Label="{x:Bind Commands.CopyItem.Label}" LabelPosition="Collapsed" ToolTipService.ToolTip="{x:Bind Commands.CopyItem.LabelWithHotKey, Mode=OneWay}"> diff --git a/src/Files.App/ViewModels/ToolbarViewModel.cs b/src/Files.App/ViewModels/ToolbarViewModel.cs index 87b1325d7016..3b6c16536a64 100644 --- a/src/Files.App/ViewModels/ToolbarViewModel.cs +++ b/src/Files.App/ViewModels/ToolbarViewModel.cs @@ -572,12 +572,6 @@ public void SearchRegion_LostFocus(object sender, RoutedEventArgs e) private void SearchRegion_Escaped(object? sender, ISearchBox searchBox) => CloseSearchBox(); - public ICommand? SelectAllContentPageItemsCommand { get; set; } - - public ICommand? InvertContentPageSelctionCommand { get; set; } - - public ICommand? ClearContentPageSelectionCommand { get; set; } - public ICommand? PasteItemsFromClipboardCommand { get; set; } public IAsyncRelayCommand? OpenNewWindowCommand { get; set; } diff --git a/src/Files.App/Views/BaseShellPage.cs b/src/Files.App/Views/BaseShellPage.cs index 8c7cb01f63d2..68d72ee5c943 100644 --- a/src/Files.App/Views/BaseShellPage.cs +++ b/src/Files.App/Views/BaseShellPage.cs @@ -627,9 +627,6 @@ protected virtual void ShellPage_NavigationRequested(object sender, PathNavigati protected void InitToolbarCommands() { - ToolbarViewModel.SelectAllContentPageItemsCommand = new RelayCommand(() => SlimContentPage?.ItemManipulationModel.SelectAllItems()); - ToolbarViewModel.InvertContentPageSelctionCommand = new RelayCommand(() => SlimContentPage?.ItemManipulationModel.InvertSelection()); - ToolbarViewModel.ClearContentPageSelectionCommand = new RelayCommand(() => SlimContentPage?.ItemManipulationModel.ClearSelection()); ToolbarViewModel.PasteItemsFromClipboardCommand = new RelayCommand(async () => await UIFilesystemHelpers.PasteItemAsync(FilesystemViewModel.WorkingDirectory, this)); ToolbarViewModel.OpenNewWindowCommand = new AsyncRelayCommand(NavigationHelpers.LaunchNewWindowAsync); ToolbarViewModel.OpenNewPaneCommand = new RelayCommand(() => PaneHolder?.OpenPathInNewPane("Home".GetLocalizedResource()));