Fix: 3099 (#3106)

Author: BornToBeRoot

Source/NETworkManager.Converters/ChildWindowIconToRectangleStyleConverter.cs

@@ -0,0 +1,33 @@
+using NETworkManager.Utilities;
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace NETworkManager.Converters;
+
+public sealed class ChildWindowIconToRectangleStyleConverter : IValueConverter
+{
+    public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        if (value is not ChildWindowIcon icon)
+            return null;
+
+        switch (icon)
+        {
+            case ChildWindowIcon.Info:
+                return Application.Current.FindResource("InfoImageRectangle");
+            case ChildWindowIcon.Warn:
+                return Application.Current.FindResource("WarnImageRectangle");
+            case ChildWindowIcon.Error:
+                return Application.Current.FindResource("ErrorImageRectangle");
+            default:
+                return null;
+        }
+    }
+
+    public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}

Source/NETworkManager.Utilities/ChildWindowIcon.cs

@@ -0,0 +1,22 @@
+namespace NETworkManager.Utilities;
+
+/// <summary>
+/// Ions for child dialogs.
+/// </summary>
+public enum ChildWindowIcon
+{
+    /// <summary>
+    /// Information icon.
+    /// </summary>
+    Info,
+
+    /// <summary>
+    /// Warning icon.
+    /// </summary>
+    Warn,
+
+    /// <summary>
+    /// Error icon.
+    /// </summary>
+    Error,
+}

Source/NETworkManager/Resources/Templates/ValidationErrorTemplates.xaml

@@ -11,7 +11,7 @@
           -->
         <Grid>
             <Polygon x:Name="ToolTipCorner" Grid.ZIndex="1" Margin="0" Points="12,12 12,0 0,0"
-                     Fill="{DynamicResource MahApps.Brushes.Accent}" HorizontalAlignment="Right"
+                     Fill="#b95353" HorizontalAlignment="Right"
                      VerticalAlignment="Top" IsHitTestVisible="True" />
             <AdornedElementPlaceholder x:Name="Adorner" />
             <Popup PlacementTarget="{Binding ElementName=Adorner}" PopupAnimation="Fade" HorizontalOffset="5">

Source/NETworkManager/ViewModels/HostsFileEditorViewModel.cs

@@ -452,7 +452,7 @@ private async Task ShowErrorMessageAsync(HostsFileEntryModifyResult result)
         {
             childWindow.IsOpen = false;
             ConfigurationManager.Current.IsChildWindowOpen = false;
-        }, message);
+        }, message, Strings.OK, ChildWindowIcon.Error);
 
         childWindow.Title = Strings.Error;
 

Source/NETworkManager/ViewModels/OKMessageViewModel.cs

@@ -6,13 +6,14 @@ namespace NETworkManager.ViewModels;
 
 public class OKMessageViewModel : ViewModelBase
 {
-    public OKMessageViewModel(Action<OKMessageViewModel> okCommand, string message, string okButtonText = null)
+    public OKMessageViewModel(Action<OKMessageViewModel> okCommand, string message, string okButtonText = null, ChildWindowIcon icon = ChildWindowIcon.Info)
     {
         OKCommand = new RelayCommand(_ => okCommand(this));
 
         Message = message;
 
         OKButtonText = okButtonText ?? Localization.Resources.Strings.OK;
+        Icon = icon;
     }
 
     public ICommand OKCommand { get; }
@@ -46,4 +47,19 @@ private init
             OnPropertyChanged();
         }
     }
+
+    private ChildWindowIcon _icon;
+
+    public ChildWindowIcon Icon
+    {
+        get => _icon;
+        private init
+        {
+            if (value == _icon)
+                return;
+
+            _icon = value;
+            OnPropertyChanged();
+        }
+    }
 }

Source/NETworkManager/Views/OKMessageChildWindow.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"
@@ -17,7 +18,11 @@
              CloseByEscape="False"                               
              OverlayBrush="{DynamicResource ResourceKey=MahApps.Brushes.Gray.SemiTransparent}"                               
              mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:OKMessageViewModel}">
+    <simpleChildWindow:ChildWindow.Resources>
+        <converters:ChildWindowIconToRectangleStyleConverter x:Key="ChildWindowIconToRectangleStyleConverter" />
+    </simpleChildWindow:ChildWindow.Resources>
     <Grid Margin="10">
+        
         <Grid.RowDefinitions>
             <RowDefinition Height="*" />
             <RowDefinition Height="20" />
@@ -34,7 +39,7 @@
                 </Grid.ColumnDefinitions>
                 <Rectangle Grid.Column="0" Grid.Row="0"
                            Width="32" Height="32"
-                           Style="{StaticResource InfoImageRectangle}" />
+                           Style="{Binding Icon, Converter={StaticResource ChildWindowIconToRectangleStyleConverter}}" />
                 <TextBlock Grid.Column="2" Grid.Row="0"
                            VerticalAlignment="Center"
                            Text="{Binding Message}"