Feature: More dialogs

Author: BornToBeRoot

Source/NETworkManager/ViewModels/IPScannerViewModel.cs

@@ -1,6 +1,5 @@
 using log4net;
 using MahApps.Metro.Controls;
-using MahApps.Metro.Controls.Dialogs;
 using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Controls;
 using NETworkManager.Localization;
@@ -39,8 +38,6 @@ public class IPScannerViewModel : ViewModelBase, IProfileManagerMinimal
     #region Variables
     private static readonly ILog Log = LogManager.GetLogger(typeof(IPScannerViewModel));
 
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     private CancellationTokenSource _cancellationTokenSource;
 
     private readonly Guid _tabId;
@@ -285,13 +282,10 @@ private set
     /// <summary>
     /// Initializes a new instance of the <see cref="IPScannerViewModel"/> class.
     /// </summary>
-    /// <param name="instance">The dialog coordinator instance.</param>
     /// <param name="tabId">The unique identifier for the tab.</param>
     /// <param name="hostOrIPRange">The initial host or IP range to scan.</param>
-    public IPScannerViewModel(IDialogCoordinator instance, Guid tabId, string hostOrIPRange)
+    public IPScannerViewModel(Guid tabId, string hostOrIPRange)
     {
-        _dialogCoordinator = instance;
-
         ConfigurationManager.Current.IPScannerTabCount++;
 
         _tabId = tabId;
@@ -564,15 +558,17 @@ private async Task DetectIPRange()
             }
 
             if (!subnetmaskDetected)
-                await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
-                    Strings.CouldNotDetectSubnetmask, MessageDialogStyle.Affirmative,
-                    AppearanceManager.MetroDialog);
+            {
+                var window = Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive);
+
+                await DialogHelper.ShowMessageAsync(window, Strings.Error, Strings.CouldNotDetectSubnetmask, ChildWindowIcon.Error);
+            }
         }
         else
         {
-            await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
-                Strings.CouldNotDetectLocalIPAddressMessage, MessageDialogStyle.Affirmative,
-                AppearanceManager.MetroDialog);
+            var window = Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive);
+
+            await DialogHelper.ShowMessageAsync(window, Strings.Error, Strings.CouldNotDetectLocalIPAddressMessage, ChildWindowIcon.Error);
         }
 
         IsSubnetDetectionRunning = false;
@@ -614,10 +610,9 @@ private async Task CustomCommand(object guid)
             {
                 Log.Error("Error trying to run custom command", ex);
 
-                await _dialogCoordinator.ShowMessageAsync(this,
-                    Strings.ResourceManager.GetString("Error",
-                        LocalizationManager.GetInstance().Culture), ex.Message, MessageDialogStyle.Affirmative,
-                    AppearanceManager.MetroDialog);
+                var window = Application.Current.Windows.OfType<Window>().FirstOrDefault(x => x.IsActive);
+
+                await DialogHelper.ShowMessageAsync(window, Strings.Error, ex.Message, ChildWindowIcon.Error);
             }
         }
     }
@@ -667,12 +662,9 @@ private Task Export()
             {
                 Log.Error("Error while exporting data as " + instance.FileType, ex);
 
-                var settings = AppearanceManager.MetroDialog;
-                settings.AffirmativeButtonText = Strings.OK;
-
-                await _dialogCoordinator.ShowMessageAsync(window, Strings.Error,
+                await DialogHelper.ShowMessageAsync(window, Strings.Error,
                     Strings.AnErrorOccurredWhileExportingTheData + Environment.NewLine +
-                    Environment.NewLine + ex.Message, MessageDialogStyle.Affirmative, settings);
+                    Environment.NewLine + ex.Message, ChildWindowIcon.Error);
             }
 
             SettingsManager.Current.IPScanner_ExportFileType = instance.FileType;

Source/NETworkManager/Views/IPScannerView.xaml

@@ -15,8 +15,6 @@
              xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
              xmlns:models="clr-namespace:NETworkManager.Models;assembly=NETworkManager.Models"
-             xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
-             dialogs:DialogParticipation.Register="{Binding}"
              Loaded="UserControl_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:IPScannerViewModel}">
     <UserControl.Resources>

Source/NETworkManager/Views/IPScannerView.xaml.cs

@@ -5,7 +5,6 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Controls;
 using NETworkManager.Models.Network;
 using NETworkManager.Utilities;
@@ -22,7 +21,7 @@ public IPScannerView(Guid tabId, string hostOrIPRange = null)
     {
         InitializeComponent();
 
-        _viewModel = new IPScannerViewModel(DialogCoordinator.Instance, tabId, hostOrIPRange);
+        _viewModel = new IPScannerViewModel(tabId, hostOrIPRange);
 
         DataContext = _viewModel;