Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/Files.App/Dialogs/FilesystemOperationDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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}" />
Expand Down
14 changes: 13 additions & 1 deletion src/Files.App/Dialogs/FilesystemOperationDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down
5 changes: 1 addition & 4 deletions src/Files.Backend/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down