Feature: Migrate dialog

Author: BornToBeRoot

Source/NETworkManager/ViewModels/SettingsProfilesViewModel.cs

@@ -224,48 +224,58 @@ private async Task DeleteProfileFileAction()
         SelectedProfileFile = ProfileFiles.Cast<ProfileFileInfo>().FirstOrDefault();
     }
 
-    public ICommand EnableEncryptionCommand => new RelayCommand(_ => EnableEncryptionAction());
+    public ICommand EnableEncryptionCommand => new RelayCommand(async _ => await EnableEncryptionAction().ConfigureAwait(false));
 
-    private async void EnableEncryptionAction()
+    private async Task EnableEncryptionAction()
     {
         // Show encryption disclaimer
         if (!await DialogHelper.ShowOKCancelMessageAsync(Application.Current.MainWindow,
              Strings.Disclaimer,
              Strings.ProfileEncryptionDisclaimer))
             return;
 
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.SetMasterPassword
-        };
 
-        var credentialsSetPasswordViewModel = new CredentialsSetPasswordViewModel(async instance =>
-        {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+        var profileFile = SelectedProfileFile.Name;
 
+        var childWindow = new CredentialsSetPasswordChildWindow();
+
+        var childWindowViewModel = new CredentialsSetPasswordViewModel(async instance =>
+        {
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
             try
             {
                 ProfileManager.EnableEncryption(SelectedProfileFile, instance.Password);
             }
             catch (Exception ex)
             {
-                var metroDialogSettings = AppearanceManager.MetroDialog;
-                metroDialogSettings.AffirmativeButtonText = Strings.OK;
-
-                await _dialogCoordinator.ShowMessageAsync(this, Strings.EncryptionError,
+                await DialogHelper.ShowOKMessageAsync(Application.Current.MainWindow,
+                    Strings.EncryptionError,
                     $"{Strings.EncryptionErrorMessage}\n\n{ex.Message}",
-                    MessageDialogStyle.Affirmative, metroDialogSettings);
+                    ChildWindowIcon.Error).ConfigureAwait(false);
             }
-        }, async _ => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); });
-
-        customDialog.Content = new CredentialsSetPasswordDialog
+        }, _ =>
         {
-            DataContext = credentialsSetPasswordViewModel
-        };
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        });
+
+        childWindow.Title = Strings.SetMasterPassword;
+
+        childWindow.DataContext = childWindowViewModel;
 
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        ConfigurationManager.Current.IsChildWindowOpen = true;
+
+        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+
+        // Re-select the profile file
+        if (string.IsNullOrEmpty(profileFile))
+            return;
+
+        SelectedProfileFile = ProfileFiles.Cast<ProfileFileInfo>()
+            .FirstOrDefault(p => p.Name.Equals(profileFile, StringComparison.OrdinalIgnoreCase));
     }
-   
+
     public ICommand ChangeMasterPasswordCommand => new RelayCommand(async _ => await ChangeMasterPasswordAction().ConfigureAwait(false));
 
     private async Task ChangeMasterPasswordAction()

…/Views/CredentialsSetPasswordDialog.xaml …s/CredentialsSetPasswordChildWindow.xamlSource/NETworkManager/Views/CredentialsSetPasswordDialog.xaml renamed to Source/NETworkManager/Views/CredentialsSetPasswordChildWindow.xaml Source/NETworkManager/Views/CredentialsSetPasswordDialog.xaml renamed to Source/NETworkManager/Views/CredentialsSetPasswordChildWindow.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="NETworkManager.Views.CredentialsSetPasswordDialog"
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.CredentialsSetPasswordChildWindow"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -7,9 +7,12 @@
              xmlns:interactivity="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             mc:Ignorable="d" Loaded="UserControl_Loaded"
-             d:DataContext="{d:DesignInstance viewModels:CredentialsSetPasswordViewModel}">
-    <Grid Margin="0,20">
+             xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"             
+             CloseButtonCommand="{Binding Path=CancelCommand}"
+             Style="{StaticResource DefaultChildWindow}"
+             Loaded="ChildWindow_OnLoaded"                            
+             mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:CredentialsSetPasswordViewModel}">    
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
@@ -33,23 +36,23 @@
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Password}" />
             <PasswordBox x:Name="PasswordBoxPassword" Grid.Column="2" Grid.Row="0"
-                         Style="{StaticResource DefaultPasswordBox}">
+                   Style="{StaticResource DefaultPasswordBox}">
                 <interactivity:Interaction.Behaviors>
                     <wpfHelpers:PasswordBoxBindingBehavior
-                        Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                  Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </interactivity:Interaction.Behaviors>
             </PasswordBox>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Repeat}" />
             <PasswordBox x:Name="PasswordBoxPasswordRepeat" Grid.Column="2" Grid.Row="2"
-                         Style="{StaticResource DefaultPasswordBox}">
+                   Style="{StaticResource DefaultPasswordBox}">
                 <interactivity:Interaction.Behaviors>
                     <wpfHelpers:PasswordBoxBindingBehavior
-                        Password="{Binding PasswordRepeat, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                  Password="{Binding PasswordRepeat, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                 </interactivity:Interaction.Behaviors>
             </PasswordBox>
         </Grid>
         <TextBlock Grid.Row="1" Foreground="{DynamicResource MahApps.Brushes.Accent}"
-                   Text="{x:Static localization:Strings.PasswordsDoNotMatch}" Margin="0,10,0,0">
+             Text="{x:Static localization:Strings.PasswordsDoNotMatch}" Margin="0,10,0,0">
             <TextBlock.Style>
                 <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource DefaultTextBlock}">
                     <Setter Property="Visibility" Value="Collapsed" />
@@ -69,7 +72,7 @@
         </TextBlock>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True"
-                    Margin="0,0,10,0">
+              Margin="0,0,10,0">
                 <Button.Style>
                     <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
                         <Setter Property="IsEnabled" Value="False" />
@@ -88,7 +91,7 @@
                 </Button.Style>
             </Button>
             <Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True"
-                    Style="{StaticResource DefaultButton}" />
+              Style="{StaticResource DefaultButton}" />
         </StackPanel>
     </Grid>
-</UserControl>
+</simpleChildWindow:ChildWindow>

Source/NETworkManager/Views/CredentialsSetPasswordChildWindow.xaml.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
+
+public partial class CredentialsSetPasswordChildWindow
+{
+    public CredentialsSetPasswordChildWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            PasswordBoxPassword.Focus();
+        }));
+    }
+}