Feature: SNMP Settings dialog

Author: BornToBeRoot

Source/NETworkManager/ViewModels/SNMPSettingsViewModel.cs

@@ -1,5 +1,5 @@
 using Lextm.SharpSnmpLib.Messaging;
-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 SNMPSettingsViewModel : ViewModelBase
 
     private readonly bool _isLoading;
 
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     public ICollectionView OIDProfiles { get; }
 
     private SNMPOIDProfileInfo _selectedOIDProfile = new();
@@ -101,12 +99,10 @@ public int Port
 
     #region Contructor, load settings
 
-    public SNMPSettingsViewModel(IDialogCoordinator instance)
+    public SNMPSettingsViewModel()
     {
         _isLoading = true;
 
-        _dialogCoordinator = instance;
-
         OIDProfiles = CollectionViewSource.GetDefaultView(SettingsManager.Current.SNMP_OidProfiles);
         OIDProfiles.SortDescriptions.Add(new SortDescription(nameof(SNMPOIDProfileInfo.Name),
             ListSortDirection.Ascending));
@@ -155,49 +151,57 @@ private void DeleteOIDProfileAction()
 
     private async Task AddOIDProfile()
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.AddOIDProfile
-        };
+        var childWindow = new SNMPOIDProfileChildWindow();
 
-        var viewModel = new SNMPOIDProfileViewModel(async instance =>
+        var childWindowViewModel = new SNMPOIDProfileViewModel(async instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
+            SettingsManager.Current.SNMP_OidProfiles.Add(new SNMPOIDProfileInfo(
+                instance.Name,
+                instance.OID,
+                instance.Mode)
+             );
+        }, async _ =>
+        {
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        });
 
-            SettingsManager.Current.SNMP_OidProfiles.Add(new SNMPOIDProfileInfo(instance.Name, instance.OID,
-                instance.Mode));
-        }, async _ => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); });
+        childWindow.Title = Strings.AddOIDProfile;
 
-        customDialog.Content = new SNMPOIDProfileDialog
-        {
-            DataContext = viewModel
-        };
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     public async Task EditOIDProfile()
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.EditOIDProfile
-        };
+        var childWindow = new SNMPOIDProfileChildWindow();
 
-        var viewModel = new SNMPOIDProfileViewModel(async instance =>
+        var childWindowViewModel = new SNMPOIDProfileViewModel(async instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
 
             SettingsManager.Current.SNMP_OidProfiles.Remove(SelectedOIDProfile);
             SettingsManager.Current.SNMP_OidProfiles.Add(new SNMPOIDProfileInfo(instance.Name, instance.OID,
                 instance.Mode));
-        }, async _ => { await _dialogCoordinator.HideMetroDialogAsync(this, customDialog); }, true, SelectedOIDProfile);
+        }, async _ => {
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        }, true, SelectedOIDProfile);
 
-        customDialog.Content = new SNMPOIDProfileDialog
-        {
-            DataContext = viewModel
-        };
+        childWindow.Title = Strings.EditOIDProfile;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+        await Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     private async Task DeleteOIDProfile()

…kManager/Views/SNMPOIDProfileDialog.xaml …ger/Views/SNMPOIDProfileChildWindow.xamlSource/NETworkManager/Views/SNMPOIDProfileDialog.xaml renamed to Source/NETworkManager/Views/SNMPOIDProfileChildWindow.xaml Source/NETworkManager/Views/SNMPOIDProfileDialog.xaml renamed to Source/NETworkManager/Views/SNMPOIDProfileChildWindow.xaml

@@ -1,4 +1,4 @@
-<UserControl x:Class="NETworkManager.Views.SNMPOIDProfileDialog"
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.SNMPOIDProfileChildWindow"
              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"
@@ -8,9 +8,13 @@
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             mc:Ignorable="d" Loaded="UserControl_Loaded"
-             d:DataContext="{d:DesignInstance viewModels:SNMPOIDProfileViewModel}">
-    <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:SNMPOIDProfileViewModel}">
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="10" />
@@ -35,7 +39,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.ExampleSNMPMIB}">
+             mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleSNMPMIB}">
                 <TextBox.Style>
                     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                         <Style.Triggers>
@@ -73,11 +77,11 @@
                 <TextBox.Style>
                     <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
                         <Setter Property="mah:TextBoxHelper.Watermark"
-                                Value="{x:Static localization:StaticStrings.ExampleSnmpOid}" />
+                        Value="{x:Static localization:StaticStrings.ExampleSnmpOid}" />
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding Path=Mode}" Value="Get">
                                 <Setter Property="mah:TextBoxHelper.Watermark"
-                                        Value="{x:Static localization:StaticStrings.ExampleSnmpOids}" />
+                                Value="{x:Static localization:StaticStrings.ExampleSnmpOids}" />
                             </DataTrigger>
                         </Style.Triggers>
                     </Style>
@@ -89,7 +93,7 @@
                             <validators:SNMPOIDValidator ValidatesOnTargetUpdated="True">
                                 <validators:SNMPOIDValidator.Wrapper>
                                     <validators:SNMPOIDDependencyObjectWrapper
-                                        Mode="{Binding Data.Mode, Source={StaticResource BindingProxy}}" />
+                                Mode="{Binding Data.Mode, Source={StaticResource BindingProxy}}" />
                                 </validators:SNMPOIDValidator.Wrapper>
                             </validators:SNMPOIDValidator>
                         </Binding.ValidationRules>
@@ -101,17 +105,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=TextBoxOID}"
-                                               Value="False" />
+                                       Value="False" />
                                     <Condition Binding="{Binding InfoChanged}" Value="True" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
@@ -123,7 +127,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>

Source/NETworkManager/Views/SNMPOIDProfileChildWindow.xaml.cs

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

Source/NETworkManager/Views/SNMPOIDProfileDialog.xaml.cs

@@ -9,8 +9,6 @@
              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"
-             xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
-             dialogs:DialogParticipation.Register="{Binding}"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:SNMPSettingsViewModel}">
     <StackPanel>
         <TextBlock Text="{x:Static localization:Strings.SNMP}" Style="{StaticResource HeaderTextBlock}" />

Source/NETworkManager/Views/SNMPSettingsView.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 SNMPSettingsView
 {
-    private readonly SNMPSettingsViewModel _viewModel = new(DialogCoordinator.Instance);
+    private readonly SNMPSettingsViewModel _viewModel = new();
 
     public SNMPSettingsView()
     {