Feature: More dialogs

BornToBeRoot · BornToBeRoot · commit b7a63006e4e6 · 2025-12-17T21:29:26.000+01:00
diff --git a/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs b/Source/NETworkManager/ViewModels/IPScannerSettingsViewModel.cs
@@ -1,5 +1,4 @@
-﻿using MahApps.Metro.Controls.Dialogs;
-using MahApps.Metro.SimpleChildWindow;
+﻿using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Settings;
 using NETworkManager.Utilities;
diff --git a/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs b/Source/NETworkManager/ViewModels/PortScannerSettingsViewModel.cs
@@ -1,4 +1,4 @@
-﻿using MahApps.Metro.Controls.Dialogs;
+﻿using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.Network;
 using NETworkManager.Settings;
@@ -22,8 +22,6 @@ public class PortScannerSettingsViewModel : ViewModelBase
 
     private readonly bool _isLoading;
 
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     /// <summary>
     /// Gets the collection view of port profiles.
     /// </summary>
@@ -159,13 +157,10 @@ public int MaxPortThreads
     /// <summary>
     /// Initializes a new instance of the <see cref="PortScannerSettingsViewModel"/> class.
     /// </summary>
-    /// <param name="instance">The dialog coordinator instance.</param>
-    public PortScannerSettingsViewModel(IDialogCoordinator instance)
+    public PortScannerSettingsViewModel()
     {
         _isLoading = true;
 
-        _dialogCoordinator = instance;
-
         PortProfiles = CollectionViewSource.GetDefaultView(SettingsManager.Current.PortScanner_PortProfiles);
         PortProfiles.SortDescriptions.Add(
             new SortDescription(nameof(PortProfileInfo.Name), ListSortDirection.Ascending));
@@ -215,51 +210,57 @@ private void DeletePortProfileAction()
 
     #region Methods
 
-    private async Task AddPortProfile()
+    private Task AddPortProfile()
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.AddPortProfile
-        };
+        var childWindow = new PortProfileChildWindow();
 
-        var viewModel = new PortProfileViewModel(async instance =>
+        var childWindowViewModel = new PortProfileViewModel(async instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
 
             SettingsManager.Current.PortScanner_PortProfiles.Add(new PortProfileInfo(instance.Name, instance.Ports));
-        }, async _ => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); });
-
-        customDialog.Content = new PortProfileDialog
+        }, async _ =>
         {
-            DataContext = viewModel
-        };
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        });
+
+        childWindow.Title = Strings.AddPortProfile;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
-    public async Task EditPortProfile()
+    public Task EditPortProfile()
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.EditPortProfile
-        };
+        var childWindow = new PortProfileChildWindow();
 
-        var viewModel = new PortProfileViewModel(async instance =>
-            {
-                await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+        var childWindowViewModel = new PortProfileViewModel(async instance =>
+        {
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
 
-                SettingsManager.Current.PortScanner_PortProfiles.Remove(SelectedPortProfile);
-                SettingsManager.Current.PortScanner_PortProfiles.Add(new PortProfileInfo(instance.Name,
-                    instance.Ports));
-            }, async _ => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, true,
+            SettingsManager.Current.PortScanner_PortProfiles.Remove(SelectedPortProfile);
+            SettingsManager.Current.PortScanner_PortProfiles.Add(new PortProfileInfo(instance.Name,
+                instance.Ports));
+        }, async _ =>
+        {
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        }, true,
             SelectedPortProfile);
 
-        customDialog.Content = new PortProfileDialog
-        {
-            DataContext = viewModel
-        };
+        childWindow.Title = Strings.EditPortProfile;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     private async Task DeletePortProfile()
diff --git a/Source/NETworkManager/Views/IPScannerHostView.xaml.cs b/Source/NETworkManager/Views/IPScannerHostView.xaml.cs
@@ -1,7 +1,6 @@
 ﻿using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;
diff --git a/Source/NETworkManager/Views/PortProfileChildWindow.xaml b/Source/NETworkManager/Views/PortProfileChildWindow.xaml
@@ -1,4 +1,4 @@
-﻿<UserControl x:Class="NETworkManager.Views.PortProfileDialog"
+﻿<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.PortProfileChildWindow"
              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:PortProfileViewModel}">
-    <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:PortProfileViewModel}">
+    <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.Name}" />
             <TextBox x:Name="TextBoxName" Grid.Column="2" Grid.Row="0"
-                     mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleGroupServers}">
+             mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleGroupServers}">
                 <TextBox.Style>
                     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                         <Style.Triggers>
@@ -64,7 +68,7 @@
             </TextBox>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Ports}" />
             <TextBox x:Name="TextBoxPorts" Grid.Column="2" Grid.Row="2"
-                     mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePortScanRange}">
+             mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePortScanRange}">
                 <TextBox.Text>
                     <Binding Path="Ports" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -77,17 +81,17 @@
         </Grid>
         <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Save}" Command="{Binding SaveCommand}" 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=TextBoxName}"
-                                               Value="False" />
+                                       Value="False" />
                                     <Condition Binding="{Binding Path=(Validation.HasError), ElementName=TextBoxPorts}"
-                                               Value="False" />
+                                       Value="False" />
                                     <Condition Binding="{Binding InfoChanged}" Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
@@ -99,7 +103,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/PortProfileChildWindow.xaml.cs b/Source/NETworkManager/Views/PortProfileChildWindow.xaml.cs
@@ -0,0 +1,21 @@
+﻿using System;
+using System.Windows;
+using System.Windows.Threading;
+
+namespace NETworkManager.Views;
+
+public partial class PortProfileChildWindow
+{
+    public PortProfileChildWindow()
+    {
+        InitializeComponent();
+    }
+
+    private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
+    {
+        Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
+        {
+            TextBoxName.Focus();
+        }));
+    }
+}
diff --git a/Source/NETworkManager/Views/PortProfileDialog.xaml.cs b/Source/NETworkManager/Views/PortProfileDialog.xaml.cs
diff --git a/Source/NETworkManager/Views/PortScannerHostView.xaml.cs b/Source/NETworkManager/Views/PortScannerHostView.xaml.cs
@@ -1,7 +1,6 @@
 ﻿using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;
diff --git a/Source/NETworkManager/Views/PortScannerSettingsView.xaml b/Source/NETworkManager/Views/PortScannerSettingsView.xaml
@@ -7,9 +7,7 @@
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:network="clr-namespace:NETworkManager.Models.Network;assembly=NETworkManager.Models"
-             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}"
+             xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"             
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:PortScannerSettingsViewModel}">
     <StackPanel>
         <TextBlock Text="{x:Static localization:Strings.PortScanner}" Style="{StaticResource HeaderTextBlock}" />
diff --git a/Source/NETworkManager/Views/PortScannerSettingsView.xaml.cs b/Source/NETworkManager/Views/PortScannerSettingsView.xaml.cs
@@ -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 PortScannerSettingsView
 {
-    private readonly PortScannerSettingsViewModel _viewModel = new(DialogCoordinator.Instance);
+    private readonly PortScannerSettingsViewModel _viewModel = new();
 
     public PortScannerSettingsView()
     {
diff --git a/Source/NETworkManager/Views/SNMPHostView.xaml.cs b/Source/NETworkManager/Views/SNMPHostView.xaml.cs
@@ -1,7 +1,6 @@
 ﻿using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.ViewModels;
 
 namespace NETworkManager.Views;

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,13 @@`
`1`	`1`	`using System.Windows;`
`2`	`2`	`using System.Windows.Controls;`
`3`	`3`	`using System.Windows.Input;`
`4`		`-using MahApps.Metro.Controls.Dialogs;`
`5`	`4`	`using NETworkManager.ViewModels;`
`6`	`5`
`7`	`6`	`namespace NETworkManager.Views;`
`8`	`7`
`9`	`8`	`public partial class PortScannerSettingsView`
`10`	`9`	`{`
`11`		`- private readonly PortScannerSettingsViewModel _viewModel = new(DialogCoordinator.Instance);`
	`10`	`+ private readonly PortScannerSettingsViewModel _viewModel = new();`
`12`	`11`
`13`	`12`	`public PortScannerSettingsView()`
`14`	`13`	`{`