Feature: Migrate password dialogs to childwindow

BornToBeRoot · BornToBeRoot · commit e5ea852c3bce · 2025-11-08T23:56:41.000+01:00
diff --git a/Source/NETworkManager/DialogHelper.cs b/Source/NETworkManager/DialogHelper.cs
@@ -0,0 +1,36 @@
+﻿using MahApps.Metro.SimpleChildWindow;
+using NETworkManager.Localization.Resources;
+using NETworkManager.Settings;
+using NETworkManager.Utilities;
+using NETworkManager.ViewModels;
+using NETworkManager.Views;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace NETworkManager
+{
+    public static class DialogHelper
+    {
+        public static Task ShowOKMessageAsync(Window parentWindow, string title, string message, ChildWindowIcon icon = ChildWindowIcon.Info, string buttonOK = null)
+        {
+            if (string.IsNullOrEmpty(buttonOK))
+                buttonOK = Strings.OK;
+
+            var childWindow = new OKMessageChildWindow();
+
+            var childWindowViewModel = new OKMessageViewModel(_ =>
+            {
+                childWindow.IsOpen = false;
+                ConfigurationManager.Current.IsChildWindowOpen = false;
+            }, message, buttonOK, icon);
+
+            childWindow.Title = title;
+
+            childWindow.DataContext = childWindowViewModel;
+
+            ConfigurationManager.Current.IsChildWindowOpen = true;
+
+            return parentWindow.ShowChildWindowAsync(childWindow);
+        }
+    }
+}
diff --git a/Source/NETworkManager/ViewModels/ProfileFileViewModel.cs b/Source/NETworkManager/ViewModels/ProfileFileViewModel.cs
@@ -11,10 +11,10 @@ public class ProfileFileViewModel : ViewModelBase
 
     private string _name;
 
-    public ProfileFileViewModel(Action<ProfileFileViewModel> addCommand, Action<ProfileFileViewModel> cancelHandler,
+    public ProfileFileViewModel(Action<ProfileFileViewModel> okCommand, Action<ProfileFileViewModel> cancelHandler,
         ProfileFileInfo info = null)
     {
-        AcceptCommand = new RelayCommand(_ => addCommand(this));
+        OKCommand = new RelayCommand(_ => okCommand(this));
         CancelCommand = new RelayCommand(_ => cancelHandler(this));
 
         if (info == null)
@@ -25,7 +25,7 @@ public ProfileFileViewModel(Action<ProfileFileViewModel> addCommand, Action<Prof
         IsEdit = true;
     }
 
-    public ICommand AcceptCommand { get; }
+    public ICommand OKCommand { get; }
 
     public ICommand CancelCommand { get; }
 
diff --git a/Source/NETworkManager/ViewModels/SettingsProfilesViewModel.cs b/Source/NETworkManager/ViewModels/SettingsProfilesViewModel.cs
@@ -213,7 +213,7 @@ private async Task EditProfileFileAction()
     }
 
     public ICommand DeleteProfileFileCommand =>
-        new RelayCommand(_ => DeleteProfileFileAction().ConfigureAwait(false), DeleteProfileFile_CanExecute);
+        new RelayCommand(async _ => await DeleteProfileFileAction().ConfigureAwait(false), DeleteProfileFile_CanExecute);
 
     private bool DeleteProfileFile_CanExecute(object obj)
     {
@@ -361,50 +361,50 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.DecryptionError,
         await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
     }
 
-    public ICommand DisableEncryptionCommand => new RelayCommand(_ => DisableEncryptionAction());
+    public ICommand DisableEncryptionCommand => new RelayCommand(async _ => await DisableEncryptionAction().ConfigureAwait(false));
 
-    private async void DisableEncryptionAction()
+    private Task DisableEncryptionAction()
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.MasterPassword
-        };
+        var childWindow = new CredentialsPasswordChildWindow();
 
-        var credentialsPasswordViewModel = new CredentialsPasswordViewModel(async instance =>
+        var childWindowViewModel = new CredentialsPasswordViewModel(async instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
 
             try
             {
                 ProfileManager.DisableEncryption(SelectedProfileFile, instance.Password);
             }
             catch (CryptographicException)
             {
-                var settings = AppearanceManager.MetroDialog;
-                settings.AffirmativeButtonText = Strings.OK;
-
-                await _dialogCoordinator.ShowMessageAsync(this, Strings.WrongPassword,
-                    Strings.WrongPasswordDecryptionFailedMessage, MessageDialogStyle.Affirmative,
-                    settings);
+                await DialogHelper.ShowOKMessageAsync(Application.Current.MainWindow,
+                    Strings.WrongPassword,
+                    Strings.WrongPasswordDecryptionFailedMessage,
+                    ChildWindowIcon.Error).ConfigureAwait(false);
             }
             catch (Exception ex)
             {
-                var settings = AppearanceManager.MetroDialog;
-                settings.AffirmativeButtonText = Strings.OK;
-
-                await _dialogCoordinator.ShowMessageAsync(this, Strings.DecryptionError,
+                await DialogHelper.ShowOKMessageAsync(Application.Current.MainWindow,
+                    Strings.DecryptionError,
                     $"{Strings.DecryptionErrorMessage}\n\n{ex.Message}",
-                    MessageDialogStyle.Affirmative, settings);
+                    ChildWindowIcon.Error).ConfigureAwait(false);
             }
-        }, async _1 => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); });
 
-        customDialog.Content = new CredentialsPasswordDialog
+            }, _ =>
         {
-            DataContext = credentialsPasswordViewModel
-        };
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        });
 
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
-    }
+        childWindow.Title = Strings.MasterPassword;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
+
+        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+    }    
 
     #endregion
 }
diff --git a/Source/NETworkManager/Views/CredentialsChangePasswordDialog.xaml b/Source/NETworkManager/Views/CredentialsChangePasswordDialog.xaml
@@ -7,7 +7,7 @@
              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"
+             mc:Ignorable="d" Loaded="ChildWindow_OnLoaded"
              d:DataContext="{d:DesignInstance viewModels:CredentialsChangePasswordViewModel}">
     <Grid Margin="0,20">
         <Grid.RowDefinitions>
diff --git a/Source/NETworkManager/Views/CredentialsChangePasswordDialog.xaml.cs b/Source/NETworkManager/Views/CredentialsChangePasswordDialog.xaml.cs
@@ -1,4 +1,6 @@
-﻿using System.Windows;
+﻿using System;
+using System.Windows;
+using System.Windows.Threading;
 
 namespace NETworkManager.Views;
 
@@ -9,8 +11,11 @@ public CredentialsChangePasswordDialog()
         InitializeComponent();
     }
 
-    private void UserControl_Loaded(object sender, RoutedEventArgs e)
+    private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
     {
-        PasswordBoxPassword.Focus();
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            PasswordBoxPassword.Focus();
+        }));
     }
 }
diff --git a/Source/NETworkManager/Views/CredentialsPasswordChildWindow.xaml b/Source/NETworkManager/Views/CredentialsPasswordChildWindow.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl x:Class="NETworkManager.Views.CredentialsPasswordDialog"
+﻿<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.CredentialsPasswordChildWindow"
              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:CredentialsPasswordViewModel}">
-    <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:CredentialsPasswordViewModel}">    
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="10" />
@@ -30,16 +33,16 @@
             </Grid.ColumnDefinitions>
             <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>
         </Grid>
         <StackPanel Grid.Row="2" 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" />
@@ -52,7 +55,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>
diff --git a/Source/NETworkManager/Views/CredentialsPasswordChildWindow.xaml.cs b/Source/NETworkManager/Views/CredentialsPasswordChildWindow.xaml.cs
@@ -0,0 +1,21 @@
+﻿using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
+
+public partial class CredentialsPasswordChildWindow
+{
+    public CredentialsPasswordChildWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            PasswordBoxPassword.Focus();
+        }));
+    }
+}
diff --git a/Source/NETworkManager/Views/CredentialsPasswordDialog.xaml.cs b/Source/NETworkManager/Views/CredentialsPasswordDialog.xaml.cs
diff --git a/Source/NETworkManager/Views/ProfileFileChildWindow.xaml b/Source/NETworkManager/Views/ProfileFileChildWindow.xaml
@@ -47,7 +47,7 @@
             </TextBox>
         </Grid>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
-            <Button Command="{Binding AcceptCommand}" IsDefault="True" Margin="0,0,10,0">
+            <Button Command="{Binding OKCommand}" IsDefault="True" Margin="0,0,10,0">
                 <Button.Style>
                     <Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
                         <Setter Property="IsEnabled" Value="False" />

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-using System.Windows;`
	`1`	`+using System;`
	`2`	`+using System.Windows;`
	`3`	`+using System.Windows.Threading;`
`2`	`4`
`3`	`5`	`namespace NETworkManager.Views;`
`4`	`6`
`@@ -9,8 +11,11 @@ public CredentialsChangePasswordDialog()`
`9`	`11`	`InitializeComponent();`
`10`	`12`	`}`
`11`	`13`
`12`		`- private void UserControl_Loaded(object sender, RoutedEventArgs e)`
	`14`	`+ private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)`
`13`	`15`	`{`
`14`		`- PasswordBoxPassword.Focus();`
	`16`	`+ Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate`
	`17`	`+ {`
	`18`	`+ PasswordBoxPassword.Focus();`
	`19`	`+ }));`
`15`	`20`	`}`
`16`	`21`	`}`