Feature: Migrate to simplechildwindow

Author: BornToBeRoot

Source/NETworkManager.Profiles/IProfileManagerMinimal.cs

@@ -11,12 +11,14 @@ public interface IProfileManagerMinimal
     /// </summary>
     public void OnProfileManagerDialogOpen()
     {
+
     }
 
     /// <summary>
     ///     Event is fired when a dialog in the <see cref="ProfileManager" /> is closed.
     /// </summary>
     public void OnProfileManagerDialogClose()
     {
+
     }
-}
+}

Source/NETworkManager/MainWindow.xaml.cs

@@ -472,7 +472,6 @@ await this.ShowMessageAsync(Strings.SettingsHaveBeenReset,
         // Show welcome dialog
         if (SettingsManager.Current.WelcomeDialog_Show)
         {
-
             var childWindow = new WelcomeChildWindow();
 
             var viewModel = new WelcomeViewModel(instance =>

Source/NETworkManager/ProfileDialogManager.cs

@@ -9,9 +9,11 @@
 using NETworkManager.Views;
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Security;
 using System.Threading.Tasks;
 using System.Windows;
+using MahApps.Metro.SimpleChildWindow;
 
 namespace NETworkManager;
 
@@ -466,36 +468,36 @@ private static GroupInfo ParseGroupInfo(GroupViewModel instance)
 
     #region Dialog to add, edit, copy as and delete profile
 
-    public static Task ShowAddProfileDialog(object context, IProfileManagerMinimal viewModel,
-        IDialogCoordinator dialogCoordinator, ProfileInfo profile = null, string group = null,
+    public static Task ShowAddProfileDialog(Window parentWindow,IProfileManagerMinimal viewModel,
+        ProfileInfo profile = null, string group = null,
         ApplicationName applicationName = ApplicationName.None)
     {
-        CustomDialog customDialog = new()
-        {
-            Title = Strings.AddProfile,
-            Style = (Style)Application.Current.FindResource(DialogResourceKey)
-        };
 
-        ProfileViewModel profileViewModel = new(async instance =>
+        var childWindow = new ProfileChildWindow(parentWindow);
+
+        ProfileViewModel profileViewModel = new(instance =>
         {
-            await dialogCoordinator.HideMetroDialogAsync(context, customDialog);
+            childWindow.IsOpen = false;
+         Settings.ConfigurationManager.Current.IsChildWindowOpen = false;
+            
             viewModel.OnProfileManagerDialogClose();
-
+            
             ProfileManager.AddProfile(ParseProfileInfo(instance));
-        }, async _ =>
+        }, _ =>
         {
-            await dialogCoordinator.HideMetroDialogAsync(context, customDialog);
+            childWindow.IsOpen = false;
+            Settings.ConfigurationManager.Current.IsChildWindowOpen = false;
+            
             viewModel.OnProfileManagerDialogClose();
         }, ProfileManager.GetGroupNames(), group, ProfileEditMode.Add, profile, applicationName);
 
-        customDialog.Content = new ProfileDialog
-        {
-            DataContext = profileViewModel
-        };
-
-        viewModel.OnProfileManagerDialogOpen();
-
-        return dialogCoordinator.ShowMetroDialogAsync(context, customDialog);
+        childWindow.Title = Strings.AddProfile;
+        
+            childWindow.DataContext = profileViewModel;
+        
+        Settings.ConfigurationManager.Current.IsChildWindowOpen = true;
+        
+        return parentWindow.ShowChildWindowAsync(childWindow);
     }
 
     public static Task ShowEditProfileDialog(IProfileManagerMinimal viewModel,

Source/NETworkManager/ViewModels/AWSSessionManagerHostViewModel.cs

@@ -443,7 +443,7 @@ private void ConnectProfileExternalAction()
     private void AddProfileAction()
     {
         ProfileDialogManager
-            .ShowAddProfileDialog(this, this, _dialogCoordinator, null, null, ApplicationName.AWSSessionManager)
+            .ShowAddProfileDialog(Application.Current.MainWindow, this, null, null, ApplicationName.AWSSessionManager)
             .ConfigureAwait(false);
     }
 
@@ -999,8 +999,8 @@ private void SetProfilesView(ProfileInfo profile = null)
         Profiles.Filter = o =>
         {
             if (string.IsNullOrEmpty(Search))
-                         return true ;
-            
+                return true;
+
             if (o is not ProfileInfo info)
                 return false;
 

Source/NETworkManager/ViewModels/DNSLookupHostViewModel.cs

@@ -251,7 +251,7 @@ private void LookupProfileAction()
 
     private void AddProfileAction()
     {
-        ProfileDialogManager.ShowAddProfileDialog(this, this, _dialogCoordinator, null, null, ApplicationName.DNSLookup)
+        ProfileDialogManager.ShowAddProfileDialog(Application.Current.MainWindow, this, null, null, ApplicationName.DNSLookup)
             .ConfigureAwait(false);
     }
 

Source/NETworkManager/ViewModels/IPGeolocationHostViewModel.cs

@@ -252,7 +252,7 @@ private void QueryProfileAction()
     private void AddProfileAction()
     {
         ProfileDialogManager
-            .ShowAddProfileDialog(this, this, _dialogCoordinator, null, null, ApplicationName.IPGeolocation)
+            .ShowAddProfileDialog(Application.Current.MainWindow, this, null, null, ApplicationName.IPGeolocation)
             .ConfigureAwait(false);
     }
 

Source/NETworkManager/ViewModels/IPScannerHostViewModel.cs

@@ -251,7 +251,7 @@ private void ScanProfileAction()
 
     private void AddProfileAction()
     {
-        ProfileDialogManager.ShowAddProfileDialog(this, this, _dialogCoordinator, null, null, ApplicationName.IPScanner)
+        ProfileDialogManager.ShowAddProfileDialog(Application.Current.MainWindow, this, null, null, ApplicationName.IPScanner)
             .ConfigureAwait(false);
     }
 

Source/NETworkManager/ViewModels/IPScannerViewModel.cs

@@ -344,7 +344,7 @@ private async void AddProfileSelectedHostAction()
 
         var window = Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive);
 
-        await ProfileDialogManager.ShowAddProfileDialog(window, this, _dialogCoordinator, profileInfo, null,
+        await ProfileDialogManager.ShowAddProfileDialog(window, this, profileInfo, null,
             ApplicationName.IPScanner);
     }
 

Source/NETworkManager/ViewModels/NetworkInterfaceViewModel.cs

@@ -751,7 +751,7 @@ private void ApplyProfileProfileAction()
     private void AddProfileAction()
     {
         ProfileDialogManager
-            .ShowAddProfileDialog(this, this, _dialogCoordinator, null, null, ApplicationName.NetworkInterface)
+            .ShowAddProfileDialog(Application.Current.MainWindow, this, null, null, ApplicationName.NetworkInterface)
             .ConfigureAwait(false);
     }
 

Source/NETworkManager/ViewModels/PingMonitorHostViewModel.cs

@@ -357,7 +357,7 @@ private void ExportAction()
     private void AddProfileAction()
     {
         ProfileDialogManager
-            .ShowAddProfileDialog(this, this, _dialogCoordinator, null, null, ApplicationName.PingMonitor)
+            .ShowAddProfileDialog(Application.Current.MainWindow, this, null, null, ApplicationName.PingMonitor)
             .ConfigureAwait(false);
     }