Feature: Migrate dialogs

Author: BornToBeRoot

Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs

@@ -1,5 +1,6 @@
 using Dragablz;
 using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.SimpleChildWindow;
 using Microsoft.Web.WebView2.Core;
 using NETworkManager.Controls;
 using NETworkManager.Localization.Resources;
@@ -485,16 +486,15 @@ private static void OpenWebsiteAction(object url)
 
     #region Methods
 
-    private async Task Connect()
+    private Task Connect()
     {
-        var customDialog = new CustomDialog
-        {
-            Title = Strings.Connect
-        };
+        var childWindow = new WebConsoleConnectChildWindow();
 
-        var connectViewModel = new WebConsoleConnectViewModel(async instance =>
+        var childWindowViewModel = new WebConsoleConnectViewModel(instance =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
 
             // Create profile info
@@ -509,19 +509,23 @@ private async Task Connect()
             AddUrlToHistory(instance.Url);
 
             Connect(info);
-        }, async _ =>
+        }, _ =>
         {
-            await _dialogCoordinator.HideMetroDialogAsync(this, customDialog);
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+
             ConfigurationManager.OnDialogClose();
         });
 
-        customDialog.Content = new WebConsoleConnectDialog
-        {
-            DataContext = connectViewModel
-        };
+        childWindow.Title = Strings.Connect;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
 
         ConfigurationManager.OnDialogOpen();
-        await _dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
+
+        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
     }
 
     private void ConnectProfile()

…nager/Views/WebConsoleConnectDialog.xaml …/Views/WebConsoleConnectChildWindow.xamlSource/NETworkManager/Views/WebConsoleConnectDialog.xaml renamed to Source/NETworkManager/Views/WebConsoleConnectChildWindow.xaml Source/NETworkManager/Views/WebConsoleConnectDialog.xaml renamed to Source/NETworkManager/Views/WebConsoleConnectChildWindow.xaml

@@ -1,17 +1,19 @@
-<UserControl x:Class="NETworkManager.Views.WebConsoleConnectDialog"
-             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:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
-             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:WebConsoleConnectViewModel}">
-    <UserControl.Resources>
-    </UserControl.Resources>
-    <Grid Margin="0,20">
+<simpleChildWindow:ChildWindow x:Class="NETworkManager.Views.WebConsoleConnectChildWindow"
+                               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:validators="clr-namespace:NETworkManager.Validators;assembly=NETworkManager.Validators"
+                               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"
+                               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:WebConsoleConnectViewModel}">    
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
@@ -33,10 +35,10 @@
             </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}"
-                      mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleWebsiteUri}"
-                      Style="{StaticResource EditableComboBox}">
+               Grid.Column="2" Grid.Row="0"
+               ItemsSource="{Binding UrlHistoryView}"
+               mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleWebsiteUri}"
+               Style="{StaticResource EditableComboBox}">
                 <ComboBox.Text>
                     <Binding Path="Url" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                         <Binding.ValidationRules>
@@ -49,15 +51,15 @@
         </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=ComboBoxUrl}"
-                                               Value="False" />
+                                        Value="False" />
                                 </MultiDataTrigger.Conditions>
                                 <MultiDataTrigger.Setters>
                                     <Setter Property="IsEnabled" Value="True" />
@@ -68,7 +70,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/WebConsoleConnectChildWindow.xaml.cs

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

Source/NETworkManager/Views/WebConsoleConnectDialog.xaml.cs

@@ -46,15 +46,19 @@ Release date: **xx.xx.2025**
 
 - Redesign PuTTY connect dialog (migrated from dialog to child window). [#3234](https://github.com/BornToBeRoot/NETworkManager/pull/3234)
 
+**Web Console**
+
+- Redesign Web Console connect dialog (migrated from dialog to child window). [#3234](https://github.com/BornToBeRoot/NETworkManager/pull/3234)
+
 ## Bug Fixes
 
 - The new profile filter popup indroduced in version `2025.10.18.0` was instantly closed when a `PuTTY`, `PowerShell` or `AWS Session Manager` session was opened and the respective application / view was selected. [#3219](https://github.com/BornToBeRoot/NETworkManager/pull/3219)
 
 ## Dependencies, Refactoring & Documentation
 
 - Documentation updated
-- Code cleanup & refactoring 
-    - Introduced a new DialogHelper utility to centralize creation of `OK` and `OK/Cancel` dialogs. This reduces duplication and enforces a consistent layout. [#3231](https://github.com/BornToBeRoot/NETworkManager/pull/3231)
+- Code cleanup & refactoring
+  - Introduced a new DialogHelper utility to centralize creation of `OK` and `OK/Cancel` dialogs. This reduces duplication and enforces a consistent layout. [#3231](https://github.com/BornToBeRoot/NETworkManager/pull/3231)
 - Migrated existing credential and profile dialogs to use DialogHelper, improving usability, accessibility and maintainability across the app. [#3231](https://github.com/BornToBeRoot/NETworkManager/pull/3231)
 - Language files updated via [#transifex](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Ftransifex-integration)
 - Dependencies updated via [#dependabot](https://github.com/BornToBeRoot/NETworkManager/pulls?q=author%3Aapp%2Fdependabot)