Fix: Use x:Load in conflicts dialog again (#11557)

Use x:Load again

Author: hishitetsu

src/Files.App/Dialogs/FilesystemOperationDialog.xaml

@@ -33,7 +33,6 @@
 		<vc2:ConflictResolveOptionToIndexConverter x:Key="ConflictResolveOptionToIndexConverter" />
 		<vc3:VisibilityInvertConverter x:Key="VisibilityInvertConverter" />
 		<tvc:BoolNegationConverter x:Key="BoolNegationConverter" />
-		<tvc:BoolToVisibilityConverter  x:Key="BoolToVisibilityConverter" />
 
 		<DataTemplate x:Key="ConflictItemDataTemplate" x:DataType="vm:FileSystemDialogConflictItemViewModel">
 			<Grid ColumnSpacing="12">
@@ -105,14 +104,14 @@
 				</Grid>
 
 				<!--  Options  -->
-				<!-- Use Visibility because x:Load does not reflect the SelectedIndex value in the combo box -->
 				<ComboBox
 					x:Name="ConflictOptions"
 					Grid.Column="2"
 					Width="200"
 					HorizontalAlignment="Right"
 					VerticalAlignment="Center"
-					Visibility="{x:Bind IsConflict, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+					x:Load="{x:Bind IsConflict, Mode=OneWay}"
+					Loaded="ConflictOptions_Loaded"
 					SelectedIndex="{x:Bind ConflictResolveOption, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, Converter={StaticResource ConflictResolveOptionToIndexConverter}}">
 					<ComboBox.Items>
 						<ComboBoxItem Content="{helpers:ResourceString Name=GenerateNewName}" />

src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs

@@ -129,14 +129,26 @@ private void NameEdit_Loaded(object sender, RoutedEventArgs e)
 			(sender as TextBox)?.Focus(FocusState.Programmatic);
 		}
 
+		private void ConflictOptions_Loaded(object sender, RoutedEventArgs e)
+		{
+			if (sender is ComboBox comboBox)
+				comboBox.SelectedIndex = ViewModel.LoadConflictResolveOption() switch
+				{
+					FileNameConflictResolveOptionType.None => -1,
+					FileNameConflictResolveOptionType.GenerateNewName => 0,
+					FileNameConflictResolveOptionType.ReplaceExisting => 1,
+					FileNameConflictResolveOptionType.Skip => 2,
+					_ => -1
+				};
+		}
+
 		private void FilesystemOperationDialog_Opened(ContentDialog sender, ContentDialogOpenedEventArgs args)
 		{
 			if (ViewModel.FileSystemDialogMode.IsInDeleteMode)
 			{
 				DescriptionText.Foreground = App.Current.Resources["TextControlForeground"] as SolidColorBrush;
 			}
 
-			ViewModel.LoadConflictResolveOption();
 			UpdateDialogLayout();
 		}
 	}

src/Files.Backend/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs

@@ -114,10 +114,7 @@ public void Receive(FileSystemDialogOptionChangedMessage message)
 			}
 		}
 
-		public void LoadConflictResolveOption()
-		{
-			AggregatedResolveOption = UserSettingsService.PreferencesSettingsService.ConflictsResolveOption;
-		}
+		public FileNameConflictResolveOptionType LoadConflictResolveOption() => UserSettingsService.PreferencesSettingsService.ConflictsResolveOption;
 
 		public void SaveConflictResolveOption()
 		{