From ae4241e7572470ae44d45c6531497ba15b67b032 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Tue, 30 Nov 2021 11:54:54 +1000
Subject: [PATCH] Added globalization to the Main Window Start Mode setting in
 the Global Settings.

---
 .../Globalization/en-US/en-US.xaml                 |  6 ++++++
 src/ARKServerManager/VersionFeed.xml               |  1 +
 src/ARKServerManager/VersionFeedBeta.xml           |  1 +
 .../Windows/GlobalSettingsControl.xaml             |  2 +-
 .../Windows/GlobalSettingsControl.xaml.cs          | 14 ++++++++------
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml
index b1d5d60b..16869a5b 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -51,6 +51,12 @@
     <sys:String x:Key="ProcessorAffinity_All">All</sys:String>
     <!--#endregion-->
 
+    <!--#region Processor Window States -->
+    <sys:String x:Key="WindowState_Normal">Normal</sys:String>
+    <sys:String x:Key="WindowState_Minimized">Minimized</sys:String>
+    <sys:String x:Key="WindowState_Maximized">Maximized</sys:String>
+    <!--#endregion-->
+
     <!--#region Application -->
     <sys:String x:Key="Application_RunAsAdministratorTitle">Run as Administrator</sys:String>
     <sys:String x:Key="Application_RunAsAdministratorLabel">This application requires administration priviledges to access ALL functionality. Would you like to Run as Administrator?</sys:String>
diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml
index 2d11fc16..c21ed38f 100644
--- a/src/ARKServerManager/VersionFeed.xml
+++ b/src/ARKServerManager/VersionFeed.xml
@@ -19,6 +19,7 @@
           <u style="font-size: .9em;">CHANGE</u>
           <br/>
           <ul>
+            <li>Added globalization to the Main Window Start Mode setting in the Global Settings.</li>
             <li>zh-CN Translation file updated.</li>
           </ul>
         </p>
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index 1480403e..5d8591a6 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -19,6 +19,7 @@
           <u style="font-size: .9em;">CHANGE</u>
           <br/>
           <ul>
+            <li>Added globalization to the Main Window Start Mode setting in the Global Settings.</li>
             <li>zh-CN Translation file updated.</li>
           </ul>
         </p>
diff --git a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
index 0a274c0b..675f64f1 100644
--- a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
+++ b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
@@ -94,7 +94,7 @@
                 <CheckBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_RunAsAdministratorLabel}" IsChecked="{Binding CurrentConfig.RunAsAdministratorPrompt, Mode=TwoWay}" HorizontalAlignment="Left"/>
 
                 <Label    Grid.Row="2" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_StartModeLabel}" VerticalAlignment="Center"/>
-                <ComboBox Grid.Row="2" Grid.Column="1" Margin="5" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStates}" SelectedValue="{Binding CurrentConfig.MainWindow_WindowState}" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
+                <ComboBox Grid.Row="2" Grid.Column="1" Margin="5" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStates}" SelectedValue="{Binding CurrentConfig.MainWindow_WindowState}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
                 <CheckBox Grid.Row="2" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_MinimizeToTrayLabel}" IsChecked="{Binding CurrentConfig.MainWindow_MinimizeToTray, Mode=TwoWay}" HorizontalAlignment="Left" VerticalAlignment="Center"/>
 
                 <CheckBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_ManageFirewallLabel}" IsChecked="{Binding CurrentConfig.ManageFirewallAutomatically, Mode=TwoWay}" HorizontalAlignment="Left"/>
diff --git a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml.cs b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml.cs
index 0313abb3..451aa454 100644
--- a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml.cs
+++ b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml.cs
@@ -2,6 +2,7 @@
 using NLog;
 using ServerManagerTool.Common;
 using ServerManagerTool.Common.Lib;
+using ServerManagerTool.Common.Model;
 using ServerManagerTool.Common.Utils;
 using System;
 using System.Collections.Generic;
@@ -29,7 +30,7 @@ namespace ServerManagerTool
         public static readonly DependencyProperty IsAdministratorProperty = DependencyProperty.Register(nameof(IsAdministrator), typeof(bool), typeof(GlobalSettingsControl), new PropertyMetadata(false));
         public static readonly DependencyProperty CurrentConfigProperty = DependencyProperty.Register(nameof(CurrentConfig), typeof(Config), typeof(GlobalSettingsControl), new PropertyMetadata(null));
         public static readonly DependencyProperty CommonConfigProperty = DependencyProperty.Register(nameof(CommonConfig), typeof(CommonConfig), typeof(GlobalSettingsControl), new PropertyMetadata(null));
-        public static readonly DependencyProperty WindowStatesProperty = DependencyProperty.Register(nameof(WindowStates), typeof(List<WindowState>), typeof(GlobalSettingsControl), new PropertyMetadata(new List<WindowState>()));
+        public static readonly DependencyProperty WindowStatesProperty = DependencyProperty.Register(nameof(WindowStates), typeof(ComboBoxItemList), typeof(GlobalSettingsControl), new PropertyMetadata(null));
 
         public GlobalSettingsControl()
         {
@@ -39,10 +40,11 @@ namespace ServerManagerTool
             this.CommonConfig = CommonConfig.Default;
             this.DataContext = this;
 
-            this.WindowStates = new List<WindowState>();    
-            foreach (var windowState in Enum.GetValues(typeof(WindowState)))
+            this.WindowStates = new ComboBoxItemList();    
+            foreach (WindowState windowState in Enum.GetValues(typeof(WindowState)))
             {
-                this.WindowStates.Add((WindowState)windowState);
+                var displayMember = _globalizer.GetResourceString($"WindowState_{windowState}") ?? windowState.ToString();
+                this.WindowStates.Add(new Common.Model.ComboBoxItem(windowState.ToString(), displayMember));
             }
 
             InitializeComponent();
@@ -75,9 +77,9 @@ namespace ServerManagerTool
             set { SetValue(IsAdministratorProperty, value); }
         }
 
-        public List<WindowState> WindowStates
+        public ComboBoxItemList WindowStates
         {
-            get { return (List<WindowState>)GetValue(WindowStatesProperty); }
+            get { return (ComboBoxItemList)GetValue(WindowStatesProperty); }
             set { SetValue(WindowStatesProperty, value); }
         }