From d0e57dbd05af3f222b2dc9112fc94870c393ef66 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Mon, 11 Aug 2025 00:09:12 +0200
Subject: [PATCH 1/2] Feature: Reset settings dialog redesigned

---
 ...hildWindowIconToRectangleStyleConverter.cs |  2 +
 .../ChildWindowIcon.cs                        |  5 ++
 .../Resources/Styles/RectangleStyles.xaml     | 14 ++++
 .../OKCancelInfoMessageViewModel.cs           | 19 ++++--
 .../ViewModels/OKMessageViewModel.cs          |  3 -
 .../ViewModels/SettingsSettingsViewModel.cs   | 64 +++++++++++++------
 .../ViewModels/WebConsoleSettingsViewModel.cs |  7 +-
 .../Views/OKCancelInfoMessageChildWindow.xaml |  8 ++-
 8 files changed, 89 insertions(+), 33 deletions(-)

diff --git a/Source/NETworkManager.Converters/ChildWindowIconToRectangleStyleConverter.cs b/Source/NETworkManager.Converters/ChildWindowIconToRectangleStyleConverter.cs
index 284d989e50..70a230222f 100644
--- a/Source/NETworkManager.Converters/ChildWindowIconToRectangleStyleConverter.cs
+++ b/Source/NETworkManager.Converters/ChildWindowIconToRectangleStyleConverter.cs
@@ -17,6 +17,8 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         {
             case ChildWindowIcon.Info:
                 return Application.Current.FindResource("InfoImageRectangle");
+            case ChildWindowIcon.Question:
+                return Application.Current.FindResource("QuestionImageRectangle");
             case ChildWindowIcon.Warn:
                 return Application.Current.FindResource("WarnImageRectangle");
             case ChildWindowIcon.Error:
diff --git a/Source/NETworkManager.Utilities/ChildWindowIcon.cs b/Source/NETworkManager.Utilities/ChildWindowIcon.cs
index f5b75971c9..be174ce035 100644
--- a/Source/NETworkManager.Utilities/ChildWindowIcon.cs
+++ b/Source/NETworkManager.Utilities/ChildWindowIcon.cs
@@ -10,6 +10,11 @@ public enum ChildWindowIcon
     /// </summary>
     Info,
 
+    /// <summary>
+    /// Question icon.
+    /// </summary>
+    Question,
+
     /// <summary>
     /// Warning icon.
     /// </summary>
diff --git a/Source/NETworkManager/Resources/Styles/RectangleStyles.xaml b/Source/NETworkManager/Resources/Styles/RectangleStyles.xaml
index 31585c9008..3a2365c7de 100644
--- a/Source/NETworkManager/Resources/Styles/RectangleStyles.xaml
+++ b/Source/NETworkManager/Resources/Styles/RectangleStyles.xaml
@@ -36,6 +36,20 @@
         <Setter Property="ToolTipService.ShowDuration" Value="600000" />
     </Style>
 
+    <Style x:Key="QuestionImageRectangle" TargetType="{x:Type Rectangle}">
+        <Style.Resources>
+            <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource DefaultToolTip}" />
+        </Style.Resources>
+        <Setter Property="Fill" Value="{DynamicResource MahApps.Brushes.Gray3}" />
+        <Setter Property="OpacityMask">
+            <Setter.Value>
+                <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=HelpCircleOutline}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ToolTipService.InitialShowDelay" Value="0" />
+        <Setter Property="ToolTipService.ShowDuration" Value="600000" />
+    </Style>
+
     <Style x:Key="WarnImageRectangle" TargetType="{x:Type Rectangle}">
         <Style.Resources>
             <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource DefaultToolTip}" />
diff --git a/Source/NETworkManager/ViewModels/OKCancelInfoMessageViewModel.cs b/Source/NETworkManager/ViewModels/OKCancelInfoMessageViewModel.cs
index 29e039650b..69f4f83266 100644
--- a/Source/NETworkManager/ViewModels/OKCancelInfoMessageViewModel.cs
+++ b/Source/NETworkManager/ViewModels/OKCancelInfoMessageViewModel.cs
@@ -7,7 +7,7 @@ namespace NETworkManager.ViewModels;
 public class OKCancelInfoMessageViewModel : ViewModelBase
 {
     public OKCancelInfoMessageViewModel(Action<OKCancelInfoMessageViewModel> okCommand,
-        Action<OKCancelInfoMessageViewModel> cancelHandler, string message, string okButtonText = null, string cancelButtonText = null)
+        Action<OKCancelInfoMessageViewModel> cancelHandler, string message, string okButtonText = null, string cancelButtonText = null, ChildWindowIcon icon = ChildWindowIcon.Info)
     {
         OKCommand = new RelayCommand(_ => okCommand(this));
         CancelCommand = new RelayCommand(_ => cancelHandler(this));
@@ -23,7 +23,6 @@ public OKCancelInfoMessageViewModel(Action<OKCancelInfoMessageViewModel> okComma
     public ICommand CancelCommand { get; }
 
     private readonly string _message;
-
     public string Message
     {
         get => _message;
@@ -38,7 +37,6 @@ private init
     }
 
     private readonly string _okButtonText;
-
     public string OKButtonText
     {
         get => _okButtonText;
@@ -53,7 +51,6 @@ private init
     }
 
     private readonly string _cancelButtonText;
-
     public string CancelButtonText
     {
         get => _cancelButtonText;
@@ -66,4 +63,18 @@ private init
             OnPropertyChanged();
         }
     }
+
+    private ChildWindowIcon _icon;
+    public ChildWindowIcon Icon
+    {
+        get => _icon;
+        private init
+        {
+            if (value == _icon)
+                return;
+
+            _icon = value;
+            OnPropertyChanged();
+        }
+    }
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/OKMessageViewModel.cs b/Source/NETworkManager/ViewModels/OKMessageViewModel.cs
index fca5f22912..3547003cb6 100644
--- a/Source/NETworkManager/ViewModels/OKMessageViewModel.cs
+++ b/Source/NETworkManager/ViewModels/OKMessageViewModel.cs
@@ -19,7 +19,6 @@ public OKMessageViewModel(Action<OKMessageViewModel> okCommand, string message,
     public ICommand OKCommand { get; }
 
     private readonly string _message;
-
     public string Message
     {
         get => _message;
@@ -34,7 +33,6 @@ private init
     }
 
     private readonly string _okButtonText;
-
     public string OKButtonText
     {
         get => _okButtonText;
@@ -49,7 +47,6 @@ private init
     }
 
     private ChildWindowIcon _icon;
-
     public ChildWindowIcon Icon
     {
         get => _icon;
diff --git a/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs b/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs
index c7a65a8283..b19fdc86a0 100644
--- a/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs
@@ -1,11 +1,14 @@
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Input;
-using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.Controls.Dialogs;
+using MahApps.Metro.SimpleChildWindow;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Settings;
 using NETworkManager.Utilities;
+using NETworkManager.Views;
+using System;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Input;
 
 namespace NETworkManager.ViewModels;
 
@@ -61,26 +64,47 @@ private static void OpenLocationAction()
 
     public ICommand ResetSettingsCommand => new RelayCommand(_ => ResetSettingsAction());
 
-    private async void ResetSettingsAction()
+    private void ResetSettingsAction()
     {
-        var settings = AppearanceManager.MetroDialog;
+        ResetSettings().ConfigureAwait(false);
+    }
 
-        settings.AffirmativeButtonText = Strings.Reset;
-        settings.NegativeButtonText = Strings.Cancel;
+    #endregion
 
-        settings.DefaultButtonFocus = MessageDialogResult.Affirmative;
+    #region Methods
 
-        if (await _dialogCoordinator.ShowMessageAsync(this, Strings.ResetSettingsQuestion,
-                Strings.SettingsAreResetAndApplicationWillBeRestartedMessage,
-                MessageDialogStyle.AffirmativeAndNegative, settings) != MessageDialogResult.Affirmative)
-            return;
+    private Task ResetSettings()
+    {
+        var childWindow = new OKCancelInfoMessageChildWindow();
 
-        // Init default settings
-        SettingsManager.Initialize();
+        var childWindowViewModel = new OKCancelInfoMessageViewModel(_ =>
+        {
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
 
-        // Restart the application
-        (Application.Current.MainWindow as MainWindow)?.RestartApplication();
-    }
+            // Init default settings
+            SettingsManager.Initialize();
+
+            // Restart the application
+            (Application.Current.MainWindow as MainWindow)?.RestartApplication();
+        }, _ =>
+        {
+            childWindow.IsOpen = false;
+            ConfigurationManager.Current.IsChildWindowOpen = false;
+        },
+            Strings.SettingsAreResetAndApplicationWillBeRestartedMessage,
+            Strings.Reset,
+            Strings.Cancel,
+            ChildWindowIcon.Question
+        );
 
+        childWindow.Title = Strings.ResetSettingsQuestion;
+
+        childWindow.DataContext = childWindowViewModel;
+
+        ConfigurationManager.Current.IsChildWindowOpen = true;
+
+        return (Application.Current.MainWindow as MainWindow).ShowChildWindowAsync(childWindow);
+    }
     #endregion
-}
\ No newline at end of file
+}
diff --git a/Source/NETworkManager/ViewModels/WebConsoleSettingsViewModel.cs b/Source/NETworkManager/ViewModels/WebConsoleSettingsViewModel.cs
index 7910035f28..0c9e6e6360 100644
--- a/Source/NETworkManager/ViewModels/WebConsoleSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/WebConsoleSettingsViewModel.cs
@@ -1,14 +1,13 @@
-using System;
-using MahApps.Metro.SimpleChildWindow;
+using MahApps.Metro.SimpleChildWindow;
+using Microsoft.Web.WebView2.Core;
 using NETworkManager.Localization.Resources;
 using NETworkManager.Settings;
 using NETworkManager.Utilities;
 using NETworkManager.Views;
+using System;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
-using Microsoft.Web.WebView2.Core;
-using Microsoft.Web.WebView2.Wpf;
 
 namespace NETworkManager.ViewModels;
 
diff --git a/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml b/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml
index fe50336b9d..52fbde4a9e 100644
--- a/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml
+++ b/Source/NETworkManager/Views/OKCancelInfoMessageChildWindow.xaml
@@ -7,6 +7,7 @@
              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"
+             xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
              ChildWindowWidth="450"
              ChildWindowMaxHeight="500"
              ShowTitleBar="True"
@@ -20,6 +21,9 @@
              OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"         
              Loaded="ChildWindow_Loaded"
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:OKCancelInfoMessageViewModel}">
+    <simpleChildWindow:ChildWindow.Resources>
+        <converters:ChildWindowIconToRectangleStyleConverter x:Key="ChildWindowIconToRectangleStyleConverter" />
+    </simpleChildWindow:ChildWindow.Resources>
     <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
@@ -36,8 +40,8 @@
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Rectangle Grid.Column="0" Grid.Row="0"
-                           Width="32" Height="32"
-                           Style="{StaticResource InfoImageRectangle}" />
+           Width="32" Height="32"
+           Style="{Binding Icon, Converter={StaticResource ChildWindowIconToRectangleStyleConverter}}" />
                 <TextBlock Grid.Column="2" Grid.Row="0"
                            VerticalAlignment="Center"
                            Text="{Binding Message}"

From 35caeaefd26199f029d4cbf30db2679004cf18d9 Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Mon, 11 Aug 2025 00:16:44 +0200
Subject: [PATCH 2/2] Chore: Increase version after upgrade

---
 Source/GlobalAssemblyInfo.cs                  |  4 ++--
 .../SettingsManager.cs                        | 20 +++++++++++++++----
 .../ViewModels/SettingsSettingsViewModel.cs   | 11 ++--------
 .../Views/SettingsSettingsView.xaml           |  2 --
 .../Views/SettingsSettingsView.xaml.cs        |  7 +++----
 Website/docs/changelog/next-release.md        |  2 ++
 6 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/Source/GlobalAssemblyInfo.cs b/Source/GlobalAssemblyInfo.cs
index 09a20cd912..9f4ab23345 100644
--- a/Source/GlobalAssemblyInfo.cs
+++ b/Source/GlobalAssemblyInfo.cs
@@ -6,5 +6,5 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("2025.6.13.0")]
-[assembly: AssemblyFileVersion("2025.6.13.0")]
+[assembly: AssemblyVersion("2025.8.11.0")]
+[assembly: AssemblyFileVersion("2025.8.11.0")]
diff --git a/Source/NETworkManager.Settings/SettingsManager.cs b/Source/NETworkManager.Settings/SettingsManager.cs
index 1386298412..5f15514d66 100644
--- a/Source/NETworkManager.Settings/SettingsManager.cs
+++ b/Source/NETworkManager.Settings/SettingsManager.cs
@@ -190,6 +190,10 @@ public static void Upgrade(Version fromVersion, Version toVersion)
         if (fromVersion < new Version(2024, 11, 11, 0))
             UpgradeTo_2024_11_11_0();
 
+        // 2025.8.11.0
+        if (fromVersion < new Version(2025, 8, 11, 0))
+            UpgradeTo_2025_8_11_0();
+
         // Latest
         if (fromVersion < toVersion)
             UpgradeToLatest(toVersion);
@@ -311,12 +315,11 @@ private static void UpgradeTo_2024_11_11_0()
     }
 
     /// <summary>
-    ///     Method to apply changes for the latest version.
+    ///     Method to apply changes for version 2025.8.11.0.
     /// </summary>
-    /// <param name="version">Latest version.</param>
-    private static void UpgradeToLatest(Version version)
+    private static void UpgradeTo_2025_8_11_0()
     {
-        Log.Info($"Apply upgrade to {version}...");
+        Log.Info("Apply upgrade to 2025.8.11.0...");
 
         // Add Hosts editor application
         Log.Info("Add new app \"Hosts File Editor\"...");
@@ -326,5 +329,14 @@ private static void UpgradeToLatest(Version version)
             ApplicationManager.GetDefaultList().First(x => x.Name == ApplicationName.HostsFileEditor));
     }
 
+    /// <summary>
+    ///     Method to apply changes for the latest version.
+    /// </summary>
+    /// <param name="version">Latest version.</param>
+    private static void UpgradeToLatest(Version version)
+    {
+        Log.Info($"Apply upgrade to {version}...");
+    }
+
     #endregion
 }
\ No newline at end of file
diff --git a/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs b/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs
index b19fdc86a0..aef50dee2f 100644
--- a/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/SettingsSettingsViewModel.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;
@@ -15,9 +14,6 @@ namespace NETworkManager.ViewModels;
 public class SettingsSettingsViewModel : ViewModelBase
 {
     #region Variables
-
-    private readonly IDialogCoordinator _dialogCoordinator;
-
     public Action CloseAction { get; set; }
 
     private string _location;
@@ -34,15 +30,12 @@ public string Location
             OnPropertyChanged();
         }
     }
-
     #endregion
 
     #region Constructor, LoadSettings
 
-    public SettingsSettingsViewModel(IDialogCoordinator instance)
+    public SettingsSettingsViewModel()
     {
-        _dialogCoordinator = instance;
-
         LoadSettings();
     }
 
diff --git a/Source/NETworkManager/Views/SettingsSettingsView.xaml b/Source/NETworkManager/Views/SettingsSettingsView.xaml
index 48dcfc83e4..7f91995927 100644
--- a/Source/NETworkManager/Views/SettingsSettingsView.xaml
+++ b/Source/NETworkManager/Views/SettingsSettingsView.xaml
@@ -4,10 +4,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
-             xmlns:dialogs="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
              xmlns:viewModels="clr-namespace:NETworkManager.ViewModels"
              xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
-             dialogs:DialogParticipation.Register="{Binding}"
              mc:Ignorable="d" Loaded="UserControl_Loaded"
              d:DataContext="{d:DesignInstance viewModels:SettingsSettingsViewModel}">
     <StackPanel>
diff --git a/Source/NETworkManager/Views/SettingsSettingsView.xaml.cs b/Source/NETworkManager/Views/SettingsSettingsView.xaml.cs
index 57db5b411c..cb53ea39e5 100644
--- a/Source/NETworkManager/Views/SettingsSettingsView.xaml.cs
+++ b/Source/NETworkManager/Views/SettingsSettingsView.xaml.cs
@@ -1,12 +1,11 @@
-using System.Windows;
-using MahApps.Metro.Controls.Dialogs;
-using NETworkManager.ViewModels;
+using NETworkManager.ViewModels;
+using System.Windows;
 
 namespace NETworkManager.Views;
 
 public partial class SettingsSettingsView
 {
-    private readonly SettingsSettingsViewModel _viewModel = new(DialogCoordinator.Instance);
+    private readonly SettingsSettingsViewModel _viewModel = new();
 
     public SettingsSettingsView()
     {
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index e9c3a4c9b9..0de6318d03 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -21,6 +21,8 @@ Release date: **xx.xx.2025**
 
 ## Improvements
 
+- Redesign settings reset dialog. [#3138](https://github.com/BornToBeRoot/NETworkManager/pull/3138)
+
 ## Bugfixes
 
 ## Dependencies, Refactoring & Documentation