Feature: Reset settings dialog redesigned

BornToBeRoot · BornToBeRoot · commit d0e57dbd05af · 2025-08-11T00:09:12.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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();
+        }
+    }
 }
diff --git 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
@@ -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
-}
+}
diff --git 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
@@ -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}"

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@ public object Convert(object value, Type targetType, object parameter, CultureIn`
`17`	`17`	`{`
`18`	`18`	`case ChildWindowIcon.Info:`
`19`	`19`	`return Application.Current.FindResource("InfoImageRectangle");`
	`20`	`+ case ChildWindowIcon.Question:`
	`21`	`+ return Application.Current.FindResource("QuestionImageRectangle");`
`20`	`22`	`case ChildWindowIcon.Warn:`
`21`	`23`	`return Application.Current.FindResource("WarnImageRectangle");`
`22`	`24`	`case ChildWindowIcon.Error:`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace NETworkManager.ViewModels;`
`7`	`7`	`public class OKCancelInfoMessageViewModel : ViewModelBase`
`8`	`8`	`{`
`9`	`9`	`public OKCancelInfoMessageViewModel(Action<OKCancelInfoMessageViewModel> okCommand,`
`10`		`- Action<OKCancelInfoMessageViewModel> cancelHandler, string message, string okButtonText = null, string cancelButtonText = null)`
	`10`	`+ Action<OKCancelInfoMessageViewModel> cancelHandler, string message, string okButtonText = null, string cancelButtonText = null, ChildWindowIcon icon = ChildWindowIcon.Info)`
`11`	`11`	`{`
`12`	`12`	`OKCommand = new RelayCommand(_ => okCommand(this));`
`13`	`13`	`CancelCommand = new RelayCommand(_ => cancelHandler(this));`
`@@ -23,7 +23,6 @@ public OKCancelInfoMessageViewModel(Action<OKCancelInfoMessageViewModel> okComma`
`23`	`23`	`public ICommand CancelCommand { get; }`
`24`	`24`
`25`	`25`	`private readonly string _message;`
`26`		`-`
`27`	`26`	`public string Message`
`28`	`27`	`{`
`29`	`28`	`get => _message;`
`@@ -38,7 +37,6 @@ private init`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`private readonly string _okButtonText;`
`41`		`-`
`42`	`40`	`public string OKButtonText`
`43`	`41`	`{`
`44`	`42`	`get => _okButtonText;`
`@@ -53,7 +51,6 @@ private init`
`53`	`51`	`}`
`54`	`52`
`55`	`53`	`private readonly string _cancelButtonText;`
`56`		`-`
`57`	`54`	`public string CancelButtonText`
`58`	`55`	`{`
`59`	`56`	`get => _cancelButtonText;`
`@@ -66,4 +63,18 @@ private init`
`66`	`63`	`OnPropertyChanged();`
`67`	`64`	`}`
`68`	`65`	`}`
	`66`	`+`
	`67`	`+ private ChildWindowIcon _icon;`
	`68`	`+ public ChildWindowIcon Icon`
	`69`	`+ {`
	`70`	`+ get => _icon;`
	`71`	`+ private init`
	`72`	`+ {`
	`73`	`+ if (value == _icon)`
	`74`	`+ return;`
	`75`	`+`
	`76`	`+ _icon = value;`
	`77`	`+ OnPropertyChanged();`
	`78`	`+ }`
	`79`	`+ }`
`69`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public OKMessageViewModel(Action<OKMessageViewModel> okCommand, string message,`
`19`	`19`	`public ICommand OKCommand { get; }`
`20`	`20`
`21`	`21`	`private readonly string _message;`
`22`		`-`
`23`	`22`	`public string Message`
`24`	`23`	`{`
`25`	`24`	`get => _message;`
`@@ -34,7 +33,6 @@ private init`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`private readonly string _okButtonText;`
`37`		`-`
`38`	`36`	`public string OKButtonText`
`39`	`37`	`{`
`40`	`38`	`get => _okButtonText;`
`@@ -49,7 +47,6 @@ private init`
`49`	`47`	`}`
`50`	`48`
`51`	`49`	`private ChildWindowIcon _icon;`
`52`		`-`
`53`	`50`	`public ChildWindowIcon Icon`
`54`	`51`	`{`
`55`	`52`	`get => _icon;`