[pull] main from BornToBeRoot:main

Source/NETworkManager.Controls/MultiSelectDataGrid.cs

@@ -1,14 +1,17 @@
 using System.Collections;
+using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Controls;
 
 namespace NETworkManager.Controls;
 
 public class MultiSelectDataGrid : DataGrid
 {
+    private bool _isUpdatingSelection;
+
     public static readonly DependencyProperty SelectedItemsListProperty =
         DependencyProperty.Register("SelectedItemsList", typeof(IList), typeof(MultiSelectDataGrid),
-            new PropertyMetadata(null));
+            new PropertyMetadata(null, OnSelectedItemsListChanged));
 
     public MultiSelectDataGrid()
     {
@@ -21,8 +24,81 @@ public IList SelectedItemsList
         set => SetValue(SelectedItemsListProperty, value);
     }
 
+    private static void OnSelectedItemsListChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is not MultiSelectDataGrid dataGrid)
+            return;
+
+        dataGrid.UnsubscribeFromCollectionChanged(e.OldValue as IList);
+        dataGrid.SubscribeToCollectionChanged(e.NewValue as IList);
+        dataGrid.UpdateSelectedItems();
+    }
+
+    private void SubscribeToCollectionChanged(IList list)
+    {
+        if (list is INotifyCollectionChanged observableCollection)
+        {
+            observableCollection.CollectionChanged += OnSelectedItemsListCollectionChanged;
+        }
+    }
+
+    private void UnsubscribeFromCollectionChanged(IList list)
+    {
+        if (list is INotifyCollectionChanged observableCollection)
+        {
+            observableCollection.CollectionChanged -= OnSelectedItemsListCollectionChanged;
+        }
+    }
+
+    private void OnSelectedItemsListCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+    {
+        UpdateSelectedItems();
+    }
+
+    private void UpdateSelectedItems()
+    {
+        if (_isUpdatingSelection)
+            return;
+
+        _isUpdatingSelection = true;
+
+        try
+        {
+            SelectedItems.Clear();
+
+            if (SelectedItemsList != null)
+            {
+                foreach (var item in SelectedItemsList)
+                {
+                    SelectedItems.Add(item);
+                }
+            }
+        }
+        finally
+        {
+            _isUpdatingSelection = false;
+        }
+    }
+
     private void DataGridMultiItemSelect_SelectionChanged(object sender, SelectionChangedEventArgs e)
     {
-        SelectedItemsList = SelectedItems;
+        if (_isUpdatingSelection || SelectedItemsList == null)
+            return;
+
+        _isUpdatingSelection = true;
+
+        try
+        {
+            SelectedItemsList.Clear();
+
+            foreach (var item in SelectedItems)
+            {
+                SelectedItemsList.Add(item);
+            }
+        }
+        finally
+        {
+            _isUpdatingSelection = false;
+        }
     }
 }

Source/NETworkManager.Settings/AppearanceManager.cs

@@ -1,5 +1,4 @@
 using ControlzEx.Theming;
-using MahApps.Metro.Controls.Dialogs;
 using MahApps.Metro.Theming;
 using NETworkManager.Models.Appearance;
 using System;
@@ -42,11 +41,6 @@ public static class AppearanceManager
     /// </summary>
     private const string ThemeFolderName = "Themes";
 
-    /// <summary>
-    ///     Contains the default settings for a new <see cref="BaseMetroDialog" />
-    /// </summary>
-    public static readonly MetroDialogSettings MetroDialog = new();
-
     /// <summary>
     ///     List who contains all MahApps.Metro themes.
     /// </summary>
@@ -83,15 +77,6 @@ static AppearanceManager()
         ThemeManager.Current.ThemeChanged += Current_ThemeChanged;
 
         LoadCustomThemes();
-
-        MetroDialog.CustomResourceDictionary = new ResourceDictionary
-        {
-            Source = new Uri("NETworkManager;component/Resources/Styles/MetroDialogStyles.xaml",
-                UriKind.RelativeOrAbsolute)
-        };
-
-        MetroDialog.DialogButtonFontSize = 14;
-        MetroDialog.DialogMessageFontSize = 14;
     }
     #endregion
 

Source/NETworkManager.Utilities/VisualTreeHelper.cs

@@ -3,8 +3,25 @@
 
 namespace NETworkManager.Utilities;
 
+/// <summary>
+/// Provides helper methods for traversing and querying the visual tree of WPF elements.
+/// </summary>
+/// <remarks>The VisualTreeHelper class contains static methods that facilitate searching for and enumerating
+/// visual child elements within a WPF application's visual tree. These methods are useful for scenarios where you need
+/// to locate elements of a specific type or perform operations on all descendants of a visual element.</remarks>
 public class VisualTreeHelper
 {
+    /// <summary>
+    /// Enumerates all descendant visual children of a specified type from the visual tree starting at the given
+    /// dependency object.
+    /// </summary>
+    /// <remarks>This method performs a recursive depth-first traversal of the visual tree. It yields each
+    /// descendant of the specified type, including those nested at any depth. The enumeration is deferred and elements
+    /// are returned as they are discovered.</remarks>
+    /// <typeparam name="T">The type of visual child to search for. Must derive from DependencyObject.</typeparam>
+    /// <param name="depObj">The root of the visual tree to search. Cannot be null.</param>
+    /// <returns>An enumerable collection of all descendant elements of type T found in the visual tree. The collection is empty
+    /// if no matching elements are found.</returns>
     public static IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) where T : DependencyObject
     {
         if (depObj == null)
@@ -19,4 +36,4 @@ public static IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) wher
             foreach (var childOfChild in FindVisualChildren<T>(child)) yield return childOfChild;
         }
     }
-}
+}

Source/NETworkManager/App.xaml

@@ -35,7 +35,6 @@
                 <ResourceDictionary Source="/Resources/Styles/LoadingIndicatorArcsStyle.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/LoadingIndicatorPulseStyle.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/MenuItemStyles.xaml" />
-                <ResourceDictionary Source="/Resources/Styles/MetroDialogStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/NumericUpDownStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/RadioButtonStyles.xaml" />
                 <ResourceDictionary Source="/Resources/Styles/ScrollBarStyles.xaml" />

Source/NETworkManager/Controls/DragablzTabHostWindow.xaml

@@ -10,12 +10,10 @@
                  xmlns:controls="clr-namespace:NETworkManager.Controls"
                  xmlns:application="clr-namespace:NETworkManager.Models;assembly=NETworkManager.Models"
                  xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-                 xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"
-                 xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
+                 xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"                 
                  mc:Ignorable="d"
                  Style="{DynamicResource DefaultWindow}" MinWidth="800" Width="1024" Height="768" MinHeight="600"
-                 TitleAlignment="Left" Activated="MetroWindow_Activated"
-                 dialogs:DialogParticipation.Register="{Binding}"
+                 TitleAlignment="Left" Activated="MetroWindow_Activated"                 
                  Closing="DragablzTabHostWindow_OnClosing"
                  d:DataContext="{d:DesignInstance controls:DragablzTabHostWindow}">
     <mah:MetroWindow.Resources>

Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs

@@ -1,5 +1,4 @@
 using Dragablz;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models;
@@ -224,13 +223,13 @@ private async void RemoteDesktop_SendCtrlAltDelAction(object view)
         }
         catch (Exception ex)
         {
-            ConfigurationManager.OnDialogOpen();
+            //ConfigurationManager.OnDialogOpen();
 
-            await this.ShowMessageAsync(Strings.Error,
-                string.Format("{0}\n\nMessage:\n{1}",
-                    Strings.CouldNotSendKeystroke, ex.Message));
+            // Use built-in message box because we have visual issues in the dragablz window
+            System.Windows.MessageBox.Show(string.Format("{0}\n\nMessage:\n{1}",
+                    Strings.CouldNotSendKeystroke, ex.Message), Strings.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 
-            ConfigurationManager.OnDialogClose();
+            //ConfigurationManager.OnDialogClose();
         }
     }
 

Source/NETworkManager/Controls/PowerShellControl.xaml

@@ -8,8 +8,7 @@
                        xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
                        xmlns:local="clr-namespace:NETworkManager.Controls"
                        xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-                       xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
-                       mah:DialogParticipation.Register="{Binding}"
+                       xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"                       
                        mc:Ignorable="d" Loaded="UserControl_Loaded"
                        d:DataContext="{d:DesignInstance local:PowerShellControl}">
     <local:UserControlBase.Resources>

Source/NETworkManager/Controls/PowerShellControl.xaml.cs

@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.PowerShell;
 using NETworkManager.Settings;
@@ -29,8 +28,6 @@ private void WindowGrid_SizeChanged(object sender, SizeChangedEventArgs e)
     private bool _initialized;
     private bool _closed;
 
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     private readonly Guid _tabId;
     private readonly PowerShellSessionInfo _sessionInfo;
 
@@ -76,8 +73,6 @@ public PowerShellControl(Guid tabId, PowerShellSessionInfo sessionInfo)
         InitializeComponent();
         DataContext = this;
 
-        _dialogCoordinator = DialogCoordinator.Instance;
-
         ConfigurationManager.Current.PowerShellTabCount++;
 
         _tabId = tabId;
@@ -196,17 +191,8 @@ private async Task Connect()
         catch (Exception ex)
         {
             if (!_closed)
-            {
-                var settings = AppearanceManager.MetroDialog;
-                settings.AffirmativeButtonText = Strings.OK;
-
-                ConfigurationManager.OnDialogOpen();
-
-                await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
-                    ex.Message, MessageDialogStyle.Affirmative, settings);
-
-                ConfigurationManager.OnDialogClose();
-            }
+                // Use built-in message box because we have visual issues in the dragablz window
+                MessageBox.Show(ex.Message, Strings.Error, MessageBoxButton.OK, MessageBoxImage.Error);
         }
 
         IsConnecting = false;

Source/NETworkManager/Controls/PuTTYControl.xaml

@@ -9,7 +9,6 @@
                        xmlns:local="clr-namespace:NETworkManager.Controls"
                        xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                        xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
-                       mah:DialogParticipation.Register="{Binding}"
                        mc:Ignorable="d" Loaded="UserControl_Loaded"
                        d:DataContext="{d:DesignInstance local:PuTTYControl}">
     <local:UserControlBase.Resources>

Source/NETworkManager/Controls/PuTTYControl.xaml.cs

@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.PuTTY;
 using NETworkManager.Settings;
@@ -30,8 +29,6 @@ private void WindowGrid_SizeChanged(object sender, SizeChangedEventArgs e)
     private bool _initialized;
     private bool _closed;
 
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     private readonly Guid _tabId;
     private readonly PuTTYSessionInfo _sessionInfo;
 
@@ -77,8 +74,6 @@ public PuTTYControl(Guid tabId, PuTTYSessionInfo sessionInfo)
         InitializeComponent();
         DataContext = this;
 
-        _dialogCoordinator = DialogCoordinator.Instance;
-
         ConfigurationManager.Current.PuTTYTabCount++;
 
         _tabId = tabId;
@@ -213,17 +208,8 @@ private async Task Connect()
         catch (Exception ex)
         {
             if (!_closed)
-            {
-                var settings = AppearanceManager.MetroDialog;
-                settings.AffirmativeButtonText = Strings.OK;
-
-                ConfigurationManager.OnDialogOpen();
-
-                await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
-                    ex.Message, MessageDialogStyle.Affirmative, settings);
-
-                ConfigurationManager.OnDialogClose();
-            }
+                // Use built-in message box because we have visual issues in the dragablz window
+                MessageBox.Show(ex.Message, Strings.Error, MessageBoxButton.OK, MessageBoxImage.Error);
         }
 
         IsConnecting = false;

Source/NETworkManager/Controls/TigerVNCControl.xaml

@@ -9,7 +9,6 @@
                        xmlns:local="clr-namespace:NETworkManager.Controls"
                        xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
                        xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
-                       mah:DialogParticipation.Register="{Binding}"
                        mc:Ignorable="d" Loaded="UserControl_Loaded"
                        d:DataContext="{d:DesignInstance local:TigerVNCControl}">
     <local:UserControlBase.Resources>

Source/NETworkManager/Controls/TigerVNCControl.xaml.cs

@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Models.TigerVNC;
 using NETworkManager.Settings;
@@ -29,8 +28,6 @@ private void TigerVNCGrid_SizeChanged(object sender, SizeChangedEventArgs e)
     private bool _initialized;
     private bool _closed;
 
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     private readonly Guid _tabId;
     private readonly TigerVNCSessionInfo _sessionInfo;
 
@@ -76,8 +73,6 @@ public TigerVNCControl(Guid tabId, TigerVNCSessionInfo sessionInfo)
         InitializeComponent();
         DataContext = this;
 
-        _dialogCoordinator = DialogCoordinator.Instance;
-
         ConfigurationManager.Current.TigerVNCTabCount++;
 
         _tabId = tabId;
@@ -209,16 +204,8 @@ private async Task Connect()
         catch (Exception ex)
         {
             if (!_closed)
-            {
-                var settings = AppearanceManager.MetroDialog;
-                settings.AffirmativeButtonText = Strings.OK;
-                ConfigurationManager.OnDialogOpen();
-
-                await _dialogCoordinator.ShowMessageAsync(this, Strings.Error,
-                    ex.Message, MessageDialogStyle.Affirmative, settings);
-
-                ConfigurationManager.OnDialogClose();
-            }
+                // Use built-in message box because we have visual issues in the dragablz window
+                MessageBox.Show(ex.Message, Strings.Error, MessageBoxButton.OK, MessageBoxImage.Error);
         }
 
         IsConnecting = false;

Source/NETworkManager/Controls/WebConsoleControl.xaml

@@ -10,7 +10,6 @@
                        xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
                        xmlns:settings="clr-namespace:NETworkManager.Settings;assembly=NETworkManager.Settings"
                        xmlns:webview="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf"
-                       mah:DialogParticipation.Register="{Binding}"
                        mc:Ignorable="d" Loaded="UserControl_Loaded"
                        d:DataContext="{d:DesignInstance local:WebConsoleControl}">
     <local:UserControlBase.Resources>