Feature: More dialogs

Author: BornToBeRoot

Source/NETworkManager/ViewModels/HostsFileEditorViewModel.cs

@@ -1,6 +1,5 @@
 using log4net;
 using MahApps.Metro.Controls;
-using MahApps.Metro.Controls.Dialogs;
 using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.Export;

Source/NETworkManager/ViewModels/TigerVNCHostViewModel.cs

@@ -1,5 +1,5 @@
 using Dragablz;
-using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Controls;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models;
@@ -28,8 +28,6 @@ namespace NETworkManager.ViewModels;
 public class TigerVNCHostViewModel : ViewModelBase, IProfileManager
 {
     #region Variables
-
-    private readonly IDialogCoordinator _dialogCoordinator;
     private readonly DispatcherTimer _searchDispatcherTimer = new();
     private bool _searchDisabled;
 
@@ -276,12 +274,10 @@ public GridLength ProfileWidth
 
     #region Constructor, load settings
 
-    public TigerVNCHostViewModel(IDialogCoordinator instance)
+    public TigerVNCHostViewModel()
     {
         _isLoading = true;
 
-        _dialogCoordinator = instance;
-
         CheckSettings();
 
         InterTabClient = new DragablzInterTabClient(ApplicationName.TigerVNC);
@@ -486,16 +482,15 @@ private void CheckSettings()
                        File.Exists(SettingsManager.Current.TigerVNC_ApplicationFilePath);
     }
 
-    private async Task Connect(string host = null)
+    private Task Connect(string host = null)
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.Connect
-        };
+        var childWindow = new TigerVNCConnectChildWindow();
 
-        var connectViewModel = new TigerVNCConnectViewModel(async instance =>
+        var childWindowViewModel = new TigerVNCConnectViewModel(async instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
 
             // Create profile info
@@ -515,17 +510,22 @@ private async Task Connect(string host = null)
             Connect(sessionInfo);
         }, async _ =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
         }, host);
 
-        customDialog.Content = new TigerVNCConnectDialog
-        {
-            DataContext = connectViewModel
-        };
+
+        childWindow.Title = Strings.Connect;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
         ConfigurationManager.OnDialogOpen();
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+
+        return Application.Current.MainWindow.ShowChildWindowAsync(childWindow);
     }
 
     private void ConnectProfile()

Source/NETworkManager/Views/PowerShellConnectChildWindow.xaml.cs

@@ -15,7 +15,10 @@ private void ChildWindow_OnLoaded(object sender, RoutedEventArgs e)
     {
         Dispatcher.BeginInvoke(DispatcherPriority.ContextIdle, new Action(delegate
         {
-            ComboBoxHost.Focus();
+            if (ComboBoxHost.Visibility == Visibility.Visible)
+                ComboBoxHost.Focus();
+            else
+                TextBoxCommand.Focus();
         }));
     }
 }

…Manager/Views/TigerVNCConnectDialog.xaml …er/Views/TigerVNCConnectChildWindow.xamlSource/NETworkManager/Views/TigerVNCConnectDialog.xaml renamed to Source/NETworkManager/Views/TigerVNCConnectChildWindow.xaml Source/NETworkManager/Views/TigerVNCConnectDialog.xaml renamed to Source/NETworkManager/Views/TigerVNCConnectChildWindow.xaml

@@ -1,17 +1,26 @@
-<UserControl x:Class="NETworkManager.Views.TigerVNCConnectDialog"
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.TigerVNCConnectChildWindow"
              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"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:networkManager="clr-namespace:NETworkManager"
+             xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              xmlns:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
+             xmlns:interactivity="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
              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:TigerVNCConnectViewModel}">
-    <UserControl.Resources>
-    </UserControl.Resources>
-    <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:TigerVNCConnectViewModel}">
+    <simpleChildWindow:ChildWindow.Resources>
+        <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
+    </simpleChildWindow:ChildWindow.Resources>
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -35,8 +44,8 @@
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Host}" />
             <ComboBox x:Name="ComboBoxHost" Grid.Column="2" Grid.Row="0" ItemsSource="{Binding HostHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostnameOrIPAddress}"
-                      Style="{StaticResource EditableComboBox}">
+               mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleHostnameOrIPAddress}"
+               Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Host" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -48,8 +57,8 @@
             </ComboBox>
             <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.Port}" />
             <ComboBox x:Name="ComboBoxPort" Grid.Column="2" Grid.Row="2" ItemsSource="{Binding PortHistoryView}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort5900}"
-                      Style="{StaticResource EditableComboBox}">
+               mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort5900}"
+               Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Port" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -62,17 +71,17 @@
         </Grid>
         <StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}"
-                    IsDefault="True" Margin="0,0,10,0">
+             IsDefault="True" 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=ComboBoxHost}"
-                                               Value="False" />
+                                        Value="False" />
                                     <Condition Binding="{Binding Path=(Validation.HasError), ElementName=ComboBoxPort}"
-                                               Value="False" />
+                                        Value="False" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="True" />
@@ -83,7 +92,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/TigerVNCConnectChildWindow.xaml.cs

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

Source/NETworkManager/Views/TigerVNCConnectDialog.xaml.cs

@@ -7,7 +7,6 @@
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
              xmlns:controls="clr-namespace:NETworkManager.Controls;assembly=NETworkManager.Controls"
-             xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
              xmlns:dockablz="clr-namespace:Dragablz.Dockablz;assembly=Dragablz"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
@@ -17,7 +16,6 @@
              xmlns:profiles="clr-namespace:NETworkManager.Profiles;assembly=NETworkManager.Profiles"
              xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
              xmlns:networkManager="clr-namespace:NETworkManager"
-             dialogs:DialogParticipation.Register="{Binding}"
              Loaded="UserControl_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:TigerVNCHostViewModel}">
     <UserControl.Resources>

Source/NETworkManager/Views/TigerVNCHostView.xaml

@@ -2,18 +2,16 @@
 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 TigerVNCHostView
 {
-    private readonly TigerVNCHostViewModel _viewModel = new(DialogCoordinator.Instance);
+    private readonly TigerVNCHostViewModel _viewModel = new();
 
     private bool _loaded;
 
-
     public TigerVNCHostView()
     {
         InitializeComponent();

Source/NETworkManager/Views/TigerVNCHostView.xaml.cs

@@ -34,6 +34,7 @@
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.URL}" />
+            
             <ComboBox x:Name="ComboBoxUrl"
                Grid.Column="2" Grid.Row="0"
                ItemsSource="{Binding UrlHistoryView}"