Feature: Migrate more dialogs

BornToBeRoot · BornToBeRoot · commit a178a256f95f · 2025-12-14T00:51:44.000+01:00
diff --git a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
@@ -19,7 +19,6 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace NETworkManager.ViewModels;
 
diff --git a/Source/NETworkManager/ViewModels/DiscoveryProtocolViewModel.cs b/Source/NETworkManager/ViewModels/DiscoveryProtocolViewModel.cs
@@ -1,5 +1,4 @@
 ﻿using log4net;
-using MahApps.Metro.Controls.Dialogs;
 using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.Export;
@@ -26,11 +25,6 @@ public class DiscoveryProtocolViewModel : ViewModelBase
     #region Variables
     private static readonly ILog Log = LogManager.GetLogger(typeof(DiscoveryProtocolViewModel));
 
-    /// <summary>
-    /// The dialog coordinator instance.
-    /// </summary>
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     /// <summary>
     /// The discovery protocol capture instance.
     /// </summary>
@@ -296,12 +290,10 @@ private set
     /// Initializes a new instance of the <see cref="DiscoveryProtocolViewModel"/> class.
     /// </summary>
     /// <param name="instance">The dialog coordinator instance.</param>
-    public DiscoveryProtocolViewModel(IDialogCoordinator instance)
+    public DiscoveryProtocolViewModel()
     {
         _isLoading = true;
 
-        _dialogCoordinator = instance;
-
         _discoveryProtocolCapture.PackageReceived += DiscoveryProtocol_PackageReceived;
         _discoveryProtocolCapture.ErrorReceived += DiscoveryProtocol_ErrorReceived;
         _discoveryProtocolCapture.WarningReceived += DiscoveryProtocol_WarningReceived;
@@ -351,8 +343,7 @@ private async Task RestartAsAdminAction()
         }
         catch (Exception ex)
         {
-            await _dialogCoordinator.ShowMessageAsync(this, Strings.Error, ex.Message,
-                MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
+            await DialogHelper.ShowMessageAsync(Application.Current.MainWindow, Strings.Error, ex.Message, ChildWindowIcon.Error);
         }
     }
 
@@ -392,8 +383,7 @@ private async Task CaptureAction()
         {
             Log.Error("Error while trying to capture", ex);
 
-            await _dialogCoordinator.ShowMessageAsync(this, Strings.Error, ex.Message,
-                MessageDialogStyle.Affirmative, AppearanceManager.MetroDialog);
+            await DialogHelper.ShowMessageAsync(Application.Current.MainWindow, Strings.Error, ex.Message, ChildWindowIcon.Error);
         }
     }
 
@@ -423,12 +413,9 @@ private Task ExportAction()
             {
                 Log.Error("Error while exporting data as " + instance.FileType, ex);
 
-                var settings = AppearanceManager.MetroDialog;
-                settings.AffirmativeButtonText = Strings.OK;
-
-                await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
-                    Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
-                    Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                await DialogHelper.ShowMessageAsync(Application.Current.MainWindow, Strings.Error,
+                   Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
+                   Environment.NewLine + ex.Message, ChildWindowIcon.Error);
             }
 
             SettingsManager.Current.DiscoveryProtocol_ExportFileType = instance.FileType;
@@ -449,7 +436,7 @@ await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     #endregion
diff --git a/Source/NETworkManager/ViewModels/ListenersViewModel.cs b/Source/NETworkManager/ViewModels/ListenersViewModel.cs
@@ -19,7 +19,6 @@
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace NETworkManager.ViewModels;
 
diff --git a/Source/NETworkManager/ViewModels/LookupPortViewModel.cs b/Source/NETworkManager/ViewModels/LookupPortViewModel.cs
@@ -20,7 +20,6 @@
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace NETworkManager.ViewModels;
 
diff --git a/Source/NETworkManager/ViewModels/PowerShellSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PowerShellSettingsViewModel.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.PowerShell;
 using NETworkManager.Settings;
@@ -17,9 +16,6 @@ namespace NETworkManager.ViewModels;
 public class PowerShellSettingsViewModel : ViewModelBase
 {
     #region Variables
-
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     private readonly bool _isLoading;
 
     private string _applicationFilePath;
@@ -130,12 +126,10 @@ public bool IsConfigured
 
     #region Contructor, load settings
 
-    public PowerShellSettingsViewModel(IDialogCoordinator instance)
+    public PowerShellSettingsViewModel()
     {
         _isLoading = true;
 
-        _dialogCoordinator = instance;
-
         LoadSettings();
 
         _isLoading = false;
diff --git a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
@@ -1,6 +1,5 @@
 ﻿using Dragablz;
 using log4net;
-using MahApps.Metro.Controls.Dialogs;
 using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Controls;
 using NETworkManager.Localization.Resources;
@@ -33,8 +32,6 @@ public class PuTTYHostViewModel : ViewModelBase, IProfileManager
 
     private static readonly ILog Log = LogManager.GetLogger(typeof(PuTTYHostViewModel));
 
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     private readonly DispatcherTimer _searchDispatcherTimer = new();
     private bool _searchDisabled;
 
@@ -313,12 +310,10 @@ public bool ProfileContextMenuIsOpen
 
     #region Constructor, load settings
 
-    public PuTTYHostViewModel(IDialogCoordinator instance)
+    public PuTTYHostViewModel()
     {
         _isLoading = true;
 
-        _dialogCoordinator = instance;
-
         // Check if PuTTY executable is configured
         CheckExecutable();
 
diff --git a/Source/NETworkManager/ViewModels/PuTTYSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYSettingsViewModel.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.PuTTY;
 using NETworkManager.Settings;
@@ -18,9 +17,6 @@ namespace NETworkManager.ViewModels;
 public class PuTTYSettingsViewModel : ViewModelBase
 {
     #region Variables
-
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     public bool IsPortable => ConfigurationManager.Current.IsPortable;
 
     public string PortableLogPath => PuTTY.PortableLogPath;
@@ -393,12 +389,10 @@ public int RloginPort
 
     #region Contructor, load settings
 
-    public PuTTYSettingsViewModel(IDialogCoordinator instance)
+    public PuTTYSettingsViewModel()
     {
         _isLoading = true;
 
-        _dialogCoordinator = instance;
-
         LoadSettings();
 
         _isLoading = false;
diff --git a/Source/NETworkManager/ViewModels/SNTPLookupSettingsViewModel.cs b/Source/NETworkManager/ViewModels/SNTPLookupSettingsViewModel.cs
@@ -1,5 +1,4 @@
-﻿using MahApps.Metro.Controls.Dialogs;
-using MahApps.Metro.SimpleChildWindow;
+﻿using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.Network;
 using NETworkManager.Settings;
@@ -24,8 +23,6 @@ public class SNTPLookupSettingsViewModel : ViewModelBase
     private readonly ServerConnectionInfo _profileDialogDefaultValues =
         new("time.example.com", 123, TransportProtocol.Tcp);
 
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     private readonly ICollectionView _sntpServers;
 
     public ICollectionView SNTPServers
@@ -81,12 +78,10 @@ public int Timeout
 
     #region Constructor, load settings
 
-    public SNTPLookupSettingsViewModel(IDialogCoordinator instance)
+    public SNTPLookupSettingsViewModel()
     {
         _isLoading = true;
 
-        _dialogCoordinator = instance;
-
         SNTPServers = CollectionViewSource.GetDefaultView(SettingsManager.Current.SNTPLookup_SNTPServers);
         SNTPServers.SortDescriptions.Add(new SortDescription(nameof(ServerConnectionInfoProfile.Name),
             ListSortDirection.Ascending));
diff --git a/Source/NETworkManager/ViewModels/SettingsProfilesViewModel.cs b/Source/NETworkManager/ViewModels/SettingsProfilesViewModel.cs
@@ -1,5 +1,4 @@
-﻿using MahApps.Metro.Controls.Dialogs;
-using MahApps.Metro.SimpleChildWindow;
+﻿using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Profiles;
 using NETworkManager.Settings;
@@ -21,8 +20,6 @@ public class SettingsProfilesViewModel : ViewModelBase
 {
     #region Variables
 
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     public Action CloseAction { get; set; }
 
     private string _location;
@@ -74,10 +71,8 @@ public ProfileFileInfo SelectedProfileFile
 
     #region Constructor, LoadSettings
 
-    public SettingsProfilesViewModel(IDialogCoordinator instance)
+    public SettingsProfilesViewModel()
     {
-        _dialogCoordinator = instance;
-
         ProfileFiles = new CollectionViewSource { Source = ProfileManager.ProfileFiles }.View;
         ProfileFiles.SortDescriptions.Add(
             new SortDescription(nameof(ProfileFileInfo.Name), ListSortDirection.Ascending));
diff --git a/Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs b/Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs
@@ -1,5 +1,4 @@
 ﻿using Dragablz;
-using MahApps.Metro.Controls.Dialogs;
 using MahApps.Metro.SimpleChildWindow;
 using Microsoft.Web.WebView2.Core;
 using NETworkManager.Controls;
@@ -29,8 +28,6 @@ public class WebConsoleHostViewModel : ViewModelBase, IProfileManager
 {
     #region Variables
 
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     private readonly DispatcherTimer _searchDispatcherTimer = new();
     private bool _searchDisabled;
 
@@ -283,12 +280,10 @@ public GridLength ProfileWidth
 
     #region Constructor, load settings
 
-    public WebConsoleHostViewModel(IDialogCoordinator instance)
+    public WebConsoleHostViewModel()
     {
         _isLoading = true;
 
-        _dialogCoordinator = instance;
-
         try
         {
             CoreWebView2Environment.GetAvailableBrowserVersionString();
diff --git a/Source/NETworkManager/Views/DiscoveryProtocolView.xaml b/Source/NETworkManager/Views/DiscoveryProtocolView.xaml
@@ -6,11 +6,9 @@
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:networkManager="clr-namespace:NETworkManager"
              xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
-             xmlns:dialog="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
-             dialog:DialogParticipation.Register="{Binding}"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:DiscoveryProtocolViewModel}">
     <UserControl.Resources>
         <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
diff --git a/Source/NETworkManager/Views/DiscoveryProtocolView.xaml.cs b/Source/NETworkManager/Views/DiscoveryProtocolView.xaml.cs
@@ -1,11 +1,10 @@
-﻿using MahApps.Metro.Controls.Dialogs;
-using NETworkManager.ViewModels;
+﻿using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;
 
 public partial class DiscoveryProtocolView
 {
-    private readonly DiscoveryProtocolViewModel _viewModel = new(DialogCoordinator.Instance);
+    private readonly DiscoveryProtocolViewModel _viewModel = new();
 
     public DiscoveryProtocolView()
     {
diff --git a/Source/NETworkManager/Views/PowerShellSettingsView.xaml b/Source/NETworkManager/Views/PowerShellSettingsView.xaml
@@ -5,10 +5,8 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
-             xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             dialogs:DialogParticipation.Register="{Binding}"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PowerShellSettingsViewModel}">
     <StackPanel>
         <TextBlock Text="{x:Static localization:Strings.PowerShell}" Style="{StaticResource HeaderTextBlock}" />
diff --git a/Source/NETworkManager/Views/PowerShellSettingsView.xaml.cs b/Source/NETworkManager/Views/PowerShellSettingsView.xaml.cs
@@ -1,12 +1,11 @@
 ﻿using System.Windows;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;
 
 public partial class PowerShellSettingsView
 {
-    private readonly PowerShellSettingsViewModel _viewModel = new(DialogCoordinator.Instance);
+    private readonly PowerShellSettingsViewModel _viewModel = new();
 
     public PowerShellSettingsView()
     {
diff --git a/Source/NETworkManager/Views/PuTTYHostView.xaml b/Source/NETworkManager/Views/PuTTYHostView.xaml
@@ -8,7 +8,6 @@
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
-             xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
              xmlns:internalControls="clr-namespace:NETworkManager.Controls"
@@ -18,7 +17,6 @@
              xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
              xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              xmlns:networkManager="clr-namespace:NETworkManager"
-             dialogs:DialogParticipation.Register="{Binding}"
              Loaded="UserControl_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PuTTYHostViewModel}">
     <UserControl.Resources>
diff --git a/Source/NETworkManager/Views/PuTTYHostView.xaml.cs b/Source/NETworkManager/Views/PuTTYHostView.xaml.cs
@@ -3,14 +3,13 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;
 
 public partial class PuTTYHostView
 {
-    private readonly PuTTYHostViewModel _viewModel = new(DialogCoordinator.Instance);
+    private readonly PuTTYHostViewModel _viewModel = new();
 
     private bool _loaded;
 
diff --git a/Source/NETworkManager/Views/PuTTYSettingsView.xaml b/Source/NETworkManager/Views/PuTTYSettingsView.xaml
@@ -5,11 +5,9 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
-             xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
              xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             dialogs:DialogParticipation.Register="{Binding}"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PuTTYSettingsViewModel}">
     <UserControl.Resources>
         <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
diff --git a/Source/NETworkManager/Views/PuTTYSettingsView.xaml.cs b/Source/NETworkManager/Views/PuTTYSettingsView.xaml.cs
@@ -1,5 +1,4 @@
 ﻿using System.Windows;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;
@@ -9,7 +8,7 @@ public partial class PuTTYSettingsView
     /// <summary>
     ///     Variable to hold an instance of the view model.
     /// </summary>
-    private readonly PuTTYSettingsViewModel _viewModel = new(DialogCoordinator.Instance);
+    private readonly PuTTYSettingsViewModel _viewModel = new();
 
     /// <summary>
     ///     Create a new instance of <see cref="PuTTYSettingsView" />.
diff --git a/Source/NETworkManager/Views/SNTPLookupSettingsView.xaml b/Source/NETworkManager/Views/SNTPLookupSettingsView.xaml
diff --git a/Source/NETworkManager/Views/SNTPLookupSettingsView.xaml.cs b/Source/NETworkManager/Views/SNTPLookupSettingsView.xaml.cs
diff --git a/Source/NETworkManager/Views/SettingsProfilesView.xaml b/Source/NETworkManager/Views/SettingsProfilesView.xaml
diff --git a/Source/NETworkManager/Views/SettingsProfilesView.xaml.cs b/Source/NETworkManager/Views/SettingsProfilesView.xaml.cs
diff --git a/Source/NETworkManager/Views/WebConsoleHostView.xaml b/Source/NETworkManager/Views/WebConsoleHostView.xaml
diff --git a/Source/NETworkManager/Views/WebConsoleHostView.xaml.cs b/Source/NETworkManager/Views/WebConsoleHostView.xaml.cs
