Feature: RichCommands Cut/Copy (#11752)

cinqmilleans · web-flow · commit 06032a6d9c66 · 2023-03-17T09:30:10.000-04:00
diff --git 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
@@ -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
@@ -15,7 +15,7 @@ internal class CreateShortcutAction : ObservableObject, IAction
 	{
 		private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
 
-		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
@@ -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
@@ -14,7 +14,7 @@ internal class CutItemAction : ObservableObject, IAction
 	{
 		private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();
 
-		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
@@ -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
@@ -380,12 +380,10 @@ public static List<ContextMenuFlyoutItemViewModel> 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
@@ -528,7 +528,7 @@
   <data name="CopyToFolderCaptionText" xml:space="preserve">
     <value>Copy to {0}</value>
   </data>
-  <data name="BaseLayoutItemContextFlyoutShortcut.Text" xml:space="preserve">
+  <data name="CreateShortcut" xml:space="preserve">
     <value>Create shortcut</value>
   </data>
   <data name="OpenFileLocation" xml:space="preserve">
diff --git 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}">
 					<local:OpacityIcon Style="{x:Bind Commands.CopyItem.OpacityStyle}" />
diff --git 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
@@ -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()));

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public async Task ExecuteAsync()`
`33`	`33`	`await UIFilesystemHelpers.CopyItem(context.ShellPage);`
`34`	`34`	`}`
`35`	`35`
`36`		`- public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
	`36`	`+ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
`37`	`37`	`{`
`38`	`38`	`if (e.PropertyName is nameof(IContentPageContext.HasSelection))`
`39`	`39`	`OnPropertyChanged(nameof(IsExecutable));`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public Task ExecuteAsync()`
`32`	`32`	`return Task.CompletedTask;`
`33`	`33`	`}`
`34`	`34`
`35`		`- public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
	`35`	`+ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
`36`	`36`	`{`
`37`	`37`	`if (e.PropertyName is nameof(IContentPageContext.HasSelection))`
`38`	`38`	`OnPropertyChanged(nameof(IsExecutable));`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ internal class CreateShortcutAction : ObservableObject, IAction`
`15`	`15`	`{`
`16`	`16`	`private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();`
`17`	`17`
`18`		`- public string Label { get; } = "BaseLayoutItemContextFlyoutShortcut/Text".GetLocalizedResource();`
	`18`	`+ public string Label { get; } = "CreateShortcut".GetLocalizedResource();`
`19`	`19`
`20`	`20`	`public RichGlyph Glyph { get; } = new RichGlyph(opacityStyle: "ColorIconShortcut");`
`21`	`21`
`@@ -45,7 +45,7 @@ public async Task ExecuteAsync()`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
	`48`	`+ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
`49`	`49`	`{`
`50`	`50`	`if (e.PropertyName is nameof(IContentPageContext.HasSelection))`
`51`	`51`	`OnPropertyChanged(nameof(IsExecutable));`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public async Task ExecuteAsync()`
`30`	`30`	`await UIFilesystemHelpers.CreateShortcutFromDialogAsync(context.ShellPage);`
`31`	`31`	`}`
`32`	`32`
`33`		`- public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
	`33`	`+ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
`34`	`34`	`{`
`35`	`35`	`if (e.PropertyName is nameof(IContentPageContext.HasSelection))`
`36`	`36`	`OnPropertyChanged(nameof(IsExecutable));`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal class CutItemAction : ObservableObject, IAction`
`14`	`14`	`{`
`15`	`15`	`private readonly IContentPageContext context = Ioc.Default.GetRequiredService<IContentPageContext>();`
`16`	`16`
`17`		`- public string Label { get; } = "BaseLayoutItemContextFlyoutCut/Text".GetLocalizedResource();`
	`17`	`+ public string Label { get; } = "Cut".GetLocalizedResource();`
`18`	`18`
`19`	`19`	`public RichGlyph Glyph { get; } = new RichGlyph(opacityStyle: "ColorIconCut");`
`20`	`20`
`@@ -34,7 +34,7 @@ public Task ExecuteAsync()`
`34`	`34`	`return Task.CompletedTask;`
`35`	`35`	`}`
`36`	`36`
`37`		`- public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
	`37`	`+ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
`38`	`38`	`{`
`39`	`39`	`if (e.PropertyName is nameof(IContentPageContext.HasSelection))`
`40`	`40`	`OnPropertyChanged(nameof(IsExecutable));`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public async Task ExecuteAsync()`
`46`	`46`	`await context.ShellPage.FilesystemViewModel.ApplyFilesAndFoldersChangesAsync();`
`47`	`47`	`}`
`48`	`48`
`49`		`- public void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
	`49`	`+ private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)`
`50`	`50`	`{`
`51`	`51`	`if (e.PropertyName is nameof(IContentPageContext.HasSelection))`
`52`	`52`	`OnPropertyChanged(nameof(IsExecutable));`
Original file line number	Diff line number	Diff line change
`@@ -380,12 +380,10 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(`
`380`	`380`	`},`
`381`	`381`	`new ContextMenuFlyoutItemViewModelBuilder(commands.CutItem)`
`382`	`382`	`{`
`383`		`- IsVisible = itemsSelected,`
`384`	`383`	`IsPrimary = true,`
`385`	`384`	`}.Build(),`
`386`	`385`	`new ContextMenuFlyoutItemViewModelBuilder(commands.CopyItem)`
`387`	`386`	`{`
`388`		`- IsVisible = itemsSelected,`
`389`	`387`	`IsPrimary = true,`
`390`	`388`	`}.Build(),`
`391`	`389`	`new ContextMenuFlyoutItemViewModel()`
Original file line number	Diff line number	Diff line change
`@@ -627,9 +627,6 @@ protected virtual void ShellPage_NavigationRequested(object sender, PathNavigati`
`627`	`627`
`628`	`628`	`protected void InitToolbarCommands()`
`629`	`629`	`{`
`630`		`- ToolbarViewModel.SelectAllContentPageItemsCommand = new RelayCommand(() => SlimContentPage?.ItemManipulationModel.SelectAllItems());`
`631`		`- ToolbarViewModel.InvertContentPageSelctionCommand = new RelayCommand(() => SlimContentPage?.ItemManipulationModel.InvertSelection());`
`632`		`- ToolbarViewModel.ClearContentPageSelectionCommand = new RelayCommand(() => SlimContentPage?.ItemManipulationModel.ClearSelection());`
`633`	`630`	`ToolbarViewModel.PasteItemsFromClipboardCommand = new RelayCommand(async () => await UIFilesystemHelpers.PasteItemAsync(FilesystemViewModel.WorkingDirectory, this));`
`634`	`631`	`ToolbarViewModel.OpenNewWindowCommand = new AsyncRelayCommand(NavigationHelpers.LaunchNewWindowAsync);`
`635`	`632`	`ToolbarViewModel.OpenNewPaneCommand = new RelayCommand(() => PaneHolder?.OpenPathInNewPane("Home".GetLocalizedResource()));`