Chore: ARP dialog

BornToBeRoot · BornToBeRoot · commit dba8983755c4 · 2025-12-16T21:40:21.000+01:00
diff --git a/Source/NETworkManager/ViewModels/ARPTableAddEntryViewModel.cs b/Source/NETworkManager/ViewModels/ARPTableAddEntryViewModel.cs
@@ -7,7 +7,7 @@ namespace NETworkManager.ViewModels;
 /// <summary>
 /// View model for adding an ARP table entry.
 /// </summary>
-public class ArpTableAddEntryViewModel : ViewModelBase
+public class ARPTableAddEntryViewModel : ViewModelBase
 {
     /// <summary>
     /// Backing field for <see cref="IPAddress"/>.
@@ -20,12 +20,12 @@ public class ArpTableAddEntryViewModel : ViewModelBase
     private string _macAddress;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="ArpTableAddEntryViewModel"/> class.
+    /// Initializes a new instance of the <see cref="ARPTableAddEntryViewModel"/> class.
     /// </summary>
     /// <param name="addCommand">The action to execute when the add command is invoked.</param>
     /// <param name="cancelHandler">The action to execute when the cancel command is invoked.</param>
-    public ArpTableAddEntryViewModel(Action<ArpTableAddEntryViewModel> addCommand,
-        Action<ArpTableAddEntryViewModel> cancelHandler)
+    public ARPTableAddEntryViewModel(Action<ARPTableAddEntryViewModel> addCommand,
+        Action<ARPTableAddEntryViewModel> cancelHandler)
     {
         AddCommand = new RelayCommand(_ => addCommand(this));
         CancelCommand = new RelayCommand(_ => cancelHandler(this));
diff --git a/Source/NETworkManager/ViewModels/ARPTableViewModel.cs b/Source/NETworkManager/ViewModels/ARPTableViewModel.cs
@@ -465,14 +465,13 @@ private async Task AddEntryAction()
     {
         IsStatusMessageDisplayed = false;
 
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.AddEntry
-        };
+        var childWindow = new ARPTableAddEntryChildWindow();
 
-        var arpTableAddEntryViewModel = new ArpTableAddEntryViewModel(async instance =>
+
+        var childWindowViewModel = new ARPTableAddEntryViewModel(async instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
 
             try
             {
@@ -489,14 +488,18 @@ private async Task AddEntryAction()
                 StatusMessage = ex.Message;
                 IsStatusMessageDisplayed = true;
             }
-        }, _ => { _dialogCoordinator.HideMetroDialogAsync(this, customDialog); });
+        }, _ => {
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        });
 
-        customDialog.Content = new ARPTableAddEntryDialog
-        {
-            DataContext = arpTableAddEntryViewModel
-        };
+        childWindow.Title = Strings.AddEntry;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     /// <summary>
diff --git a/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs b/Source/NETworkManager/ViewModels/DNSLookupSettingsViewModel.cs
@@ -432,7 +432,7 @@ private async Task AddDNSServer()
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     /// <summary>
@@ -464,7 +464,7 @@ public async Task EditDNSServer()
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     /// <summary>
diff --git a/Source/NETworkManager/ViewModels/HostsFileEditorViewModel.cs b/Source/NETworkManager/ViewModels/HostsFileEditorViewModel.cs
@@ -428,7 +428,7 @@ private async Task AddEntryAction()
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     /// <summary>
@@ -478,7 +478,7 @@ private async Task EditEntryAction()
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     /// <summary>
diff --git a/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs b/Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs
@@ -698,7 +698,7 @@ private Task Connect(string host = null)
 
         ConfigurationManager.OnDialogOpen();
 
-        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     private void ConnectProfile()
diff --git a/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs
@@ -641,7 +641,7 @@ private Task Connect(string host = null)
 
         ConfigurationManager.OnDialogOpen();
 
-        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     private void ConnectProfile()
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
@@ -586,7 +586,7 @@ private Task Connect(string host = null)
 
         ConfigurationManager.OnDialogOpen();
 
-        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     // Connect via Profile
@@ -648,7 +648,7 @@ private Task ConnectProfileAs()
 
         ConfigurationManager.OnDialogOpen();
 
-        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     private void Connect(RemoteDesktopSessionInfo sessionInfo, string header = null)
diff --git a/Source/NETworkManager/ViewModels/SNTPLookupSettingsViewModel.cs b/Source/NETworkManager/ViewModels/SNTPLookupSettingsViewModel.cs
@@ -155,7 +155,7 @@ private async Task AddServer()
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     public async Task EditServer()
@@ -184,7 +184,7 @@ public async Task EditServer()
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     private async Task DeleteServer()
diff --git a/Source/NETworkManager/ViewModels/SettingsProfilesViewModel.cs b/Source/NETworkManager/ViewModels/SettingsProfilesViewModel.cs
@@ -126,7 +126,7 @@ private async Task AddProfileFileAction()
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
 
         // Re-select the profile file
         if (string.IsNullOrEmpty(profileName))
@@ -172,7 +172,7 @@ private async Task EditProfileFileAction()
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
 
         // Re-select the profile file
         if (string.IsNullOrEmpty(profileName))
@@ -249,7 +249,7 @@ await DialogHelper.ShowMessageAsync(Application.Current.MainWindow,
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
 
         // Re-select the profile file
         if (string.IsNullOrEmpty(profileFile))
@@ -302,7 +302,7 @@ await DialogHelper.ShowMessageAsync(Application.Current.MainWindow,
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
 
         // Re-select the profile file
         if (string.IsNullOrEmpty(profileName))
@@ -356,7 +356,7 @@ await DialogHelper.ShowMessageAsync(Application.Current.MainWindow,
 
         ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
 
         // Re-select the profile file
         if (string.IsNullOrEmpty(profileName))
diff --git a/Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs b/Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs
@@ -520,7 +520,7 @@ private Task Connect()
 
         ConfigurationManager.OnDialogOpen();
 
-        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     private void ConnectProfile()
diff --git a/Source/NETworkManager/Views/ARPTableAddEntryChildWindow.xaml b/Source/NETworkManager/Views/ARPTableAddEntryChildWindow.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl x:Class="NETworkManager.Views.ARPTableAddEntryDialog"
+﻿<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.ARPTableAddEntryChildWindow"
              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:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
              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:ArpTableAddEntryViewModel}">
-    <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:ARPTableAddEntryViewModel}">
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="10" />
@@ -32,7 +36,7 @@
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.IPAddress}" />
             <TextBox x:Name="TextBoxIPAddress" Grid.Column="2" Grid.Row="0"
-                     mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Address}">
+             mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleIPv4Address}">
                 <TextBox.Text>
                     <Binding Path="IPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -44,7 +48,7 @@
             </TextBox>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.MACAddress}" />
             <TextBox x:Name="TextBoxMACAddress" Grid.Column="2" Grid.Row="2"
-                     mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleMACAddress}">
+             mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleMACAddress}">
                 <TextBox.Text>
                     <Binding Path="MACAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -57,19 +61,19 @@
         </Grid>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Add}" Command="{Binding AddCommand}" 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" />
                         <Style.Triggers>
                             <MultiDataTrigger>
                                 <MultiDataTrigger.Conditions>
                                     <Condition
-                                        Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxIPAddress}"
-                                        Value="False" />
+                                Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxIPAddress}"
+                                Value="False" />
                                     <Condition
-                                        Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxMACAddress}"
-                                        Value="False" />
+                                Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxMACAddress}"
+                                Value="False" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="True" />
@@ -80,7 +84,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/ARPTableAddEntryChildWindow.xaml.cs b/Source/NETworkManager/Views/ARPTableAddEntryChildWindow.xaml.cs
@@ -0,0 +1,21 @@
+﻿using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
+
+public partial class ARPTableAddEntryChildWindow
+{
+    public ARPTableAddEntryChildWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            TextBoxIPAddress.Focus();
+        }));
+    }
+}
diff --git a/Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml.cs b/Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ private async Task AddDNSServer()`
`432`	`432`
`433`	`433`	`ConfigurationManager.Current.IsChildWindowOpen = true;`
`434`	`434`
`435`		`- await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`435`	`+ await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`/// <summary>`
`@@ -464,7 +464,7 @@ public async Task EditDNSServer()`
`464`	`464`
`465`	`465`	`ConfigurationManager.Current.IsChildWindowOpen = true;`
`466`	`466`
`467`		`- await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`467`	`+ await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`468`	`468`	`}`
`469`	`469`
`470`	`470`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ private async Task AddEntryAction()`
`428`	`428`
`429`	`429`	`ConfigurationManager.Current.IsChildWindowOpen = true;`
`430`	`430`
`431`		`- await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`431`	`+ await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`/// <summary>`
`@@ -478,7 +478,7 @@ private async Task EditEntryAction()`
`478`	`478`
`479`	`479`	`ConfigurationManager.Current.IsChildWindowOpen = true;`
`480`	`480`
`481`		`- await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`481`	`+ await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ private Task Connect(string host = null)`
`698`	`698`
`699`	`699`	`ConfigurationManager.OnDialogOpen();`
`700`	`700`
`701`		`- return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`701`	`+ return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`702`	`702`	`}`
`703`	`703`
`704`	`704`	`private void ConnectProfile()`
Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ private Task Connect(string host = null)`
`641`	`641`
`642`	`642`	`ConfigurationManager.OnDialogOpen();`
`643`	`643`
`644`		`- return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`644`	`+ return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`645`	`645`	`}`
`646`	`646`
`647`	`647`	`private void ConnectProfile()`
Original file line number	Diff line number	Diff line change
`@@ -586,7 +586,7 @@ private Task Connect(string host = null)`
`586`	`586`
`587`	`587`	`ConfigurationManager.OnDialogOpen();`
`588`	`588`
`589`		`- return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`589`	`+ return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`590`	`590`	`}`
`591`	`591`
`592`	`592`	`// Connect via Profile`
`@@ -648,7 +648,7 @@ private Task ConnectProfileAs()`
`648`	`648`
`649`	`649`	`ConfigurationManager.OnDialogOpen();`
`650`	`650`
`651`		`- return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`651`	`+ return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`652`	`652`	`}`
`653`	`653`
`654`	`654`	`private void Connect(RemoteDesktopSessionInfo sessionInfo, string header = null)`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ private async Task AddServer()`
`155`	`155`
`156`	`156`	`ConfigurationManager.Current.IsChildWindowOpen = true;`
`157`	`157`
`158`		`- await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`158`	`+ await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`public async Task EditServer()`
`@@ -184,7 +184,7 @@ public async Task EditServer()`
`184`	`184`
`185`	`185`	`ConfigurationManager.Current.IsChildWindowOpen = true;`
`186`	`186`
`187`		`- await (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`187`	`+ await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`private async Task DeleteServer()`
Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ private Task Connect()`
`520`	`520`
`521`	`521`	`ConfigurationManager.OnDialogOpen();`
`522`	`522`
`523`		`- return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);`
	`523`	`+ return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);`
`524`	`524`	`}`
`525`	`525`
`526`	`526`	`private void ConnectProfile()`