Feature: More dialogs

Author: BornToBeRoot

Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs

@@ -1,4 +1,5 @@
 using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Settings;
 using NETworkManager.Utilities;
@@ -23,11 +24,6 @@ public class IPScannerSettingsViewModel : ViewModelBase
     /// </summary>
     private readonly bool _isLoading;
 
-    /// <summary>
-    /// The dialog coordinator instance.
-    /// </summary>
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     /// <summary>
     /// Backing field for <see cref="ShowAllResults"/>.
     /// </summary>
@@ -373,13 +369,10 @@ public int MaxPortThreads
     /// <summary>
     /// Initializes a new instance of the <see cref="IPScannerSettingsViewModel"/> class.
     /// </summary>
-    /// <param name="instance">The dialog coordinator instance.</param>
-    public IPScannerSettingsViewModel(IDialogCoordinator instance)
+    public IPScannerSettingsViewModel()
     {
         _isLoading = true;
 
-        _dialogCoordinator = instance;
-
         CustomCommands = CollectionViewSource.GetDefaultView(SettingsManager.Current.IPScanner_CustomCommands);
         CustomCommands.SortDescriptions.Add(new SortDescription(nameof(CustomCommandInfo.Name),
             ListSortDirection.Ascending));
@@ -457,56 +450,67 @@ private void DeleteCustomCommandAction()
     #region Methods
 
     /// <summary>
-    /// Adds a new custom command.
+    /// Add a new custom command.
     /// </summary>
-    private async void AddCustomCommand()
+    private Task AddCustomCommand()
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.AddCustomCommand
-        };
+        var childWindow = new CustomCommandChildWindow();
 
-        var customCommandViewModel = new CustomCommandViewModel(instance =>
+        var childWindowViewModel = new CustomCommandViewModel(instance =>
+        {
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
+            SettingsManager.Current.IPScanner_CustomCommands.Add(new CustomCommandInfo(
+                instance.ID,
+                instance.Name,
+                instance.FilePath,
+                instance.Arguments)
+            );
+        }, _ =>
         {
-            _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        });
 
-            SettingsManager.Current.IPScanner_CustomCommands.Add(new CustomCommandInfo(instance.ID, instance.Name,
-                instance.FilePath, instance.Arguments));
-        }, _ => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); });
+        childWindow.Title = Strings.AddCustomCommand;
 
-        customDialog.Content = new CustomCommandDialog
-        {
-            DataContext = customCommandViewModel
-        };
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     /// <summary>
-    /// Edits the selected custom command.
+    /// Edit the selected custom command.
     /// </summary>
-    public async void EditCustomCommand()
+    public Task EditCustomCommand()
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.EditCustomCommand
-        };
 
-        var customCommandViewModel = new CustomCommandViewModel(instance =>
+        var childWindow = new CustomCommandChildWindow();
+
+        var childWindowViewModel = new CustomCommandViewModel(instance =>
         {
-            _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
 
             SettingsManager.Current.IPScanner_CustomCommands.Remove(SelectedCustomCommand);
             SettingsManager.Current.IPScanner_CustomCommands.Add(new CustomCommandInfo(instance.ID, instance.Name,
                 instance.FilePath, instance.Arguments));
-        }, _ => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, true, SelectedCustomCommand);
-
-        customDialog.Content = new CustomCommandDialog
+        }, _ =>
         {
-            DataContext = customCommandViewModel
-        };
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        }, true, SelectedCustomCommand);
+
+        childWindow.Title = Strings.EditCustomCommand;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     /// <summary>

…rkManager/Views/CustomCommandDialog.xaml …ager/Views/CustomCommandChildWindow.xamlSource/NETworkManager/Views/CustomCommandDialog.xaml renamed to Source/NETworkManager/Views/CustomCommandChildWindow.xaml Source/NETworkManager/Views/CustomCommandDialog.xaml renamed to Source/NETworkManager/Views/CustomCommandChildWindow.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="NETworkManager.Views.CustomCommandDialog"
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.CustomCommandChildWindow"
              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,13 @@
              xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
              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:CustomCommandViewModel}">
-    <Grid Margin="0,20">
+             xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
+             xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+             CloseButtonCommand="{Binding Path=CancelCommand}"
+             Style="{StaticResource DefaultChildWindow}"
+             Loaded="ChildWindow_OnLoaded"
+             mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:CustomCommandViewModel}">
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="10" />
@@ -34,8 +38,10 @@
                 <RowDefinition Height="10" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
-            <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Name}" />
-            <TextBox x:Name="TextBoxName" Grid.Column="2" Grid.Row="0"
+            <TextBlock Grid.Column="0" Grid.Row="0"
+                       Text="{x:Static localization:Strings.Name}" />
+            <TextBox x:Name="TextBoxName"
+                     Grid.Column="2" Grid.Row="0"
                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.InternetExplorer}">
                 <TextBox.Style>
                     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
@@ -66,7 +72,8 @@
                     </Style>
                 </TextBox.Style>
             </TextBox>
-            <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.FilePath}" />
+            <TextBlock Grid.Column="0" Grid.Row="2"
+                       Text="{x:Static localization:Strings.FilePath}" />
             <TextBox x:Name="TextBoxFilePath" Grid.Column="2" Grid.Row="2"
                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.IExploreExe}">
                 <TextBox.Text>
@@ -77,18 +84,23 @@
                     </Binding>
                 </TextBox.Text>
             </TextBox>
-            <Rectangle Grid.Column="4" Grid.Row="2" Width="24" Height="24" VerticalAlignment="Top"
+            <Rectangle Grid.Column="4" Grid.Row="2"
+                       Width="24" Height="24"
+                       VerticalAlignment="Top"
                        ToolTip="{x:Static localization:Strings.HelpMessage_CustomCommandVariables}"
                        Style="{StaticResource HelpImageRectangle}">
                 <Rectangle.Resources>
                     <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                 </Rectangle.Resources>
             </Rectangle>
             <TextBlock Grid.Column="0" Grid.Row="4" Text="{x:Static localization:Strings.Arguments}" />
-            <TextBox x:Name="TextBoxArguments" Grid.Column="2" Grid.Row="4"
+            <TextBox x:Name="TextBoxArguments"
+                     Grid.Column="2" Grid.Row="4"
                      Text="{Binding Arguments, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleCustomCommandVariableHostname}" />
-            <Rectangle Grid.Column="4" Grid.Row="4" Width="24" Height="24" VerticalAlignment="Top"
+            <Rectangle Grid.Column="4" Grid.Row="4"
+                       Width="24" Height="24"
+                       VerticalAlignment="Top"
                        ToolTip="{x:Static localization:Strings.HelpMessage_CustomCommandVariables}"
                        Style="{StaticResource HelpImageRectangle}">
                 <Rectangle.Resources>
@@ -106,7 +118,7 @@
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
                                     <Condition Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxName}"
-                                               Value="False" />
+                                       Value="False" />
                                     <Condition
                                         Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxFilePath}"
                                         Value="False" />
@@ -127,4 +139,4 @@
                     Style="{StaticResource DefaultButton}" />
         </StackPanel>
     </Grid>
-</UserControl>
+</simpleChildWindow:ChildWindow>

Source/NETworkManager/Views/CustomCommandChildWindow.xaml.cs

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

Source/NETworkManager/Views/CustomCommandDialog.xaml.cs

@@ -9,8 +9,6 @@
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:utilities="clr-namespace:NETworkManager.Utilities;assembly=NETworkManager.Utilities"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
-             dialogs:DialogParticipation.Register="{Binding}"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:IPScannerSettingsViewModel}">
     <StackPanel>
         <TextBlock Text="{x:Static localization:Strings.IPScanner}" Style="{StaticResource HeaderTextBlock}" />

Source/NETworkManager/Views/IPScannerSettingsView.xaml

@@ -1,14 +1,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 IPScannerSettingsView
 {
-    private readonly IPScannerSettingsViewModel _viewModel = new(DialogCoordinator.Instance);
+    private readonly IPScannerSettingsViewModel _viewModel = new();
 
     public IPScannerSettingsView()
     {