More advanced options for the Filesystem dialog

Files/DataModels/FilesystemItemsOperationDataModel.cs

@@ -1,5 +1,6 @@
 using Files.Enums;
 using Files.ViewModels.Dialogs;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Windows.UI.Xaml;
@@ -52,7 +53,7 @@ public FilesystemItemsOperationDataModel(FilesystemOperationType operationType,
             this.ConflictingItems = conflictingItems;
         }
 
-        public List<FilesystemOperationItemViewModel> ToItems()
+        public List<FilesystemOperationItemViewModel> ToItems(Action updatePrimaryButtonEnabled, Action optionGenerateNewName, Action optionReplaceExisting, Action optionSkip)
         {
             List<FilesystemOperationItemViewModel> items = new List<FilesystemOperationItemViewModel>();
 
@@ -61,31 +62,32 @@ public List<FilesystemOperationItemViewModel> ToItems()
             // Add conflicting items first
             foreach (var item in ConflictingItems)
             {
-                items.Add(new FilesystemOperationItemViewModel()
+                items.Add(new FilesystemOperationItemViewModel(updatePrimaryButtonEnabled, optionGenerateNewName, optionReplaceExisting, optionSkip)
                 {
+                    IsConflict = true,
                     OperationIconGlyph = GetOperationIconGlyph(item.OperationType),
                     SourcePath = item.SourcePath,
-                    PlusIconVisibility = Visibility.Collapsed,
                     DestinationPath = item.DestinationPath,
-                    IsConflicting = true,
+                    ConflictResolveOption = FileNameConflictResolveOptionType.GenerateNewName,
                     ExclamationMarkVisibility = Visibility.Visible,
-                    ItemOperation = item.OperationType
+                    ItemOperation = item.OperationType,
+                    ActionTaken = false
                 });
             }
 
             // Then add non-conflicting items
             foreach (var item in nonConflictingItems)
             {
-                items.Add(new FilesystemOperationItemViewModel()
+                items.Add(new FilesystemOperationItemViewModel(updatePrimaryButtonEnabled, optionGenerateNewName, optionReplaceExisting, optionSkip)
                 {
+                    IsConflict = false,
                     OperationIconGlyph = GetOperationIconGlyph(item.OperationType),
                     SourcePath = item.SourcePath,
-                    ArrowIconVisibility = item.OperationType == FilesystemOperationType.Delete ? Visibility.Collapsed : Visibility.Visible,
-                    PlusIconVisibility = item.OperationType == FilesystemOperationType.Delete ? Visibility.Collapsed : Visibility.Visible,
                     DestinationPath = item.DestinationPath,
-                    IsConflicting = false,
+                    ConflictResolveOption = FileNameConflictResolveOptionType.NotAConflict,
                     ExclamationMarkVisibility = Visibility.Collapsed,
-                    ItemOperation = item.OperationType
+                    ItemOperation = item.OperationType,
+                    ActionTaken = true
                 });
             }
 

Files/Dialogs/FilesystemOperationDialog.xaml.cs

@@ -1,23 +1,32 @@
 using Files.ViewModels.Dialogs;
+using System.Collections.Generic;
 using Windows.UI.Xaml.Controls;
 
 // The Content Dialog item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
 namespace Files.Dialogs
 {
-    public sealed partial class FilesystemOperationDialog : ContentDialog
+    public sealed partial class FilesystemOperationDialog : ContentDialog, IFilesystemOperationDialogView
     {
         public FilesystemOperationDialogViewModel ViewModel
         {
             get => (FilesystemOperationDialogViewModel)DataContext;
             set => DataContext = value;
         }
 
+        public IList<object> SelectedItems => DetailsGrid.SelectedItems;
+
         public FilesystemOperationDialog(FilesystemOperationDialogViewModel viewModel)
         {
             this.InitializeComponent();
 
             ViewModel = viewModel;
+            ViewModel.View = this;
         }
     }
+
+    public interface IFilesystemOperationDialogView
+    {
+        IList<object> SelectedItems { get; }
+    }
 }

Files/Enums/FileNameConflictResolveOptionType.cs

@@ -1,10 +1,10 @@
 namespace Files.Enums
 {
-    public enum FileNameConflictResolveOptionType
+    public enum FileNameConflictResolveOptionType : uint
     {
-        None = 0,
-        GenerateNewName = 1,
-        ReplaceExisting = 2,
-        Skip = 4
+        GenerateNewName = 0,
+        ReplaceExisting = 1,
+        Skip = 2,
+        NotAConflict = 4
     }
 }

Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs

@@ -891,7 +891,7 @@ not when file name has changed
             for (int i = 0; i < source.Count(); i++)
             {
                 incomingItems.Add(new FilesystemItemsOperationItemModel(operationType, source.ElementAt(i).Path ?? source.ElementAt(i).Item.Path, destination.ElementAt(i)));
-                collisions.Add(incomingItems.ElementAt(i).SourcePath, FileNameConflictResolveOptionType.None);
+                collisions.Add(incomingItems.ElementAt(i).SourcePath, FileNameConflictResolveOptionType.GenerateNewName);
 
                 if (destination.Count() > 0 && StorageItemHelpers.Exists(destination.ElementAt(i))) // Same item names in both directories
                 {
@@ -915,7 +915,7 @@ not when file name has changed
 
                 if (mustResolveConflicts) // If there were conflicts, result buttons are different
                 {
-                    if (result != ContentDialogResult.Primary && result != ContentDialogResult.Secondary) // Operation was cancelled
+                    if (result != ContentDialogResult.Primary) // Operation was cancelled
                     {
                         return (new List<FileNameConflictResolveOptionType>(), true);
                     }

Files/Helpers/EnumConversionHelpers.cs

@@ -27,9 +27,6 @@ public static NameCollisionOption Convert(this FileNameConflictResolveOptionType
         {
             switch (option)
             {
-                case FileNameConflictResolveOptionType.None:
-                    return NameCollisionOption.GenerateUniqueName;
-
                 case FileNameConflictResolveOptionType.GenerateNewName:
                     return NameCollisionOption.GenerateUniqueName;
 

Files/Strings/en-US/Resources.resw

@@ -2034,23 +2034,20 @@
   <data name="DeleteItemsDialogSubtitleMultiple" xml:space="preserve">
     <value>{0} items will be deleted</value>
   </data>
-  <data name="ConflictingItemsDialogCloseButtonText" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
   <data name="ConflictingItemsDialogPrimaryButtonText" xml:space="preserve">
-    <value>Generate new name</value>
+    <value>Continue</value>
   </data>
   <data name="ConflictingItemsDialogSecondaryButtonText" xml:space="preserve">
-    <value>Replace existing</value>
+    <value>Cancel</value>
   </data>
-  <data name="ConflictingItemsDialogSubtitleMultiple" xml:space="preserve">
-    <value>There are {0} conflicting file names, and {1} outgoing item(s)</value>
+  <data name="ConflictingItemsDialogSubtitleMultipleConflictsMultipleNonConflicts" xml:space="preserve">
+    <value>There are {0} conflicting file names, and {1} outgoing item(s).</value>
   </data>
   <data name="ConflictingItemsDialogTitle" xml:space="preserve">
     <value>Conflicting file name(s)</value>
   </data>
-  <data name="ConflictingItemsDialogSubtitleSingle" xml:space="preserve">
-    <value>There is one conflicting file name, and {0} outgoing item(s)</value>
+  <data name="ConflictingItemsDialogSubtitleSingleConflictMultipleNonConflicts" xml:space="preserve">
+    <value>There is one conflicting file name, and {0} outgoing item(s).</value>
   </data>
   <data name="CopyItemsDialogSubtitleSingle" xml:space="preserve">
     <value>One item will be copied</value>
@@ -2094,9 +2091,27 @@
   <data name="NavToolbarManageWidgetsFlyoutHeader.Text" xml:space="preserve">
     <value>Manage Widgets</value>
   </data>
-    <data name="SettingsAppearanceOpenThemesFolderButton.Content" xml:space="preserve">
+  <data name="SettingsAppearanceOpenThemesFolderButton.Content" xml:space="preserve">
     <value>Open themes folder</value>
   </data>
+  <data name="ConflictingItemsDialogItemOptionGenerateNewName.Text" xml:space="preserve">
+    <value>Generate new name</value>
+  </data>
+  <data name="ConflictingItemsDialogItemOptionReplaceExisting.Text" xml:space="preserve">
+    <value>Replace existing</value>
+  </data>
+  <data name="ConflictingItemsDialogItemOptionSkip.Text" xml:space="preserve">
+    <value>Skip</value>
+  </data>
+  <data name="ConflictingItemsDialogOptionGenerateNewName.Text" xml:space="preserve">
+    <value>Generate new name</value>
+  </data>
+  <data name="ConflictingItemsDialogOptionReplaceExisting.Text" xml:space="preserve">
+    <value>Replace existing</value>
+  </data>
+  <data name="ConflictingItemsDialogOptionSkip.Text" xml:space="preserve">
+    <value>Skip</value>
+  </data>
   <data name="SettingsUseNewDetailsView.Header" xml:space="preserve">
     <value>Use new details view</value>
   </data>
@@ -2109,4 +2124,28 @@
   <data name="FileBrowserSortOption_FileType.Text" xml:space="preserve">
     <value>Type</value>
   </data>
+  <data name="FileOperationsDialogDetailsExpander.Header" xml:space="preserve">
+    <value>Details</value>
+  </data>
+  <data name="ConflictingItemsDialogTakenActionGenerateNewName" xml:space="preserve">
+    <value>Generate new name</value>
+  </data>
+  <data name="ConflictingItemsDialogTakenActionReplaceExisting" xml:space="preserve">
+    <value>Replace existing</value>
+  </data>
+  <data name="ConflictingItemsDialogTakenActionSkip" xml:space="preserve">
+    <value>Skip</value>
+  </data>
+  <data name="ConflictingItemsDialogItemDefaultOption.Content" xml:space="preserve">
+    <value>Generate new name</value>
+  </data>
+  <data name="ConflictingItemsDialogUndoOption.Text" xml:space="preserve">
+    <value>Undo</value>
+  </data>
+  <data name="ConflictingItemsDialogSubtitleMultipleConflictsNoNonConflicts" xml:space="preserve">
+    <value>There are {0} conflicting file names.</value>
+  </data>
+  <data name="ConflictingItemsDialogSubtitleSingleConflictNoNonConflicts" xml:space="preserve">
+    <value>There is one conflicting file name.</value>
+  </data>
 </root>