From bcb7dce84e8cc319ac17455ec346dc3d72e82953 Mon Sep 17 00:00:00 2001
From: Brett Hewitson <bletch1971@hotmail.com>
Date: Tue, 25 Jan 2022 12:53:13 +1000
Subject: [PATCH] Added server monitor window startup state to global settings.

---
 src/ARKServerManager/App.config               |  3 ++
 src/ARKServerManager/Config.Designer.cs       | 12 +++++++
 src/ARKServerManager/Config.settings          |  3 ++
 .../Globalization/en-US/en-US.xaml            |  1 +
 .../UserControls/GlobalSettingsControl.xaml   | 23 +++++++------
 .../GlobalSettingsControl.xaml.cs             | 32 +++++++++++++++----
 src/ARKServerManager/VersionFeed.xml          |  1 +
 src/ARKServerManager/VersionFeedBeta.xml      |  1 +
 .../Windows/ServerMonitorWindow.xaml.cs       |  1 +
 src/ConanServerManager/App.config             |  3 ++
 src/ConanServerManager/Config.Designer.cs     | 12 +++++++
 src/ConanServerManager/Config.settings        |  3 ++
 .../Globalization/en-US/en-US.xaml            |  1 +
 .../UserControls/GlobalSettingsControl.xaml   | 23 +++++++------
 .../GlobalSettingsControl.xaml.cs             | 32 +++++++++++++++----
 src/ConanServerManager/VersionFeed.xml        |  1 +
 src/ConanServerManager/VersionFeedBeta.xml    |  1 +
 .../Windows/ServerMonitorWindow.xaml.cs       |  1 +
 18 files changed, 122 insertions(+), 32 deletions(-)

diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config
index 2ad8e3a3..10df07b3 100644
--- a/src/ARKServerManager/App.config
+++ b/src/ARKServerManager/App.config
@@ -876,6 +876,9 @@
       <setting name="ServerStartMinimized" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="ServerMonitorWindow_WindowState" serializeAs="String">
+        <value>Normal</value>
+      </setting>
     </ServerManagerTool.Config>
   </userSettings>
 </configuration>
diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs
index 35647261..30062edf 100644
--- a/src/ARKServerManager/Config.Designer.cs
+++ b/src/ARKServerManager/Config.Designer.cs
@@ -3102,5 +3102,17 @@ namespace ServerManagerTool {
                 this["ServerStartMinimized"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Normal")]
+        public global::System.Windows.WindowState ServerMonitorWindow_WindowState {
+            get {
+                return ((global::System.Windows.WindowState)(this["ServerMonitorWindow_WindowState"]));
+            }
+            set {
+                this["ServerMonitorWindow_WindowState"] = value;
+            }
+        }
     }
 }
diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings
index 80430160..2771fdd9 100644
--- a/src/ARKServerManager/Config.settings
+++ b/src/ARKServerManager/Config.settings
@@ -854,5 +854,8 @@
     <Setting Name="ServerStartMinimized" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="ServerMonitorWindow_WindowState" Type="System.Windows.WindowState" Scope="User">
+      <Value Profile="(Default)">Normal</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml
index c6a9f118..f48453df 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -491,6 +491,7 @@
     <sys:String x:Key="GlobalSettings_RunAsAdministratorLabel">Enable Run as Administrator Prompt on Startup</sys:String>
     <sys:String x:Key="GlobalSettings_CheckIfServerManagerRunningOnStartupLabel">Check if Server Manager Running on Startup</sys:String>
     <sys:String x:Key="GlobalSettings_StartModeLabel">Main Window Start Mode:</sys:String>
+    <sys:String x:Key="GlobalSettings_StartModeServerMonitorLabel">Server Monitor Window Start Mode:</sys:String>
     <sys:String x:Key="GlobalSettings_MinimizeToTrayLabel">Minimize To Tray</sys:String>
     <sys:String x:Key="GlobalSettings_ManageFirewallLabel">Manage firewall settings automatically</sys:String>
     <sys:String x:Key="GlobalSettings_ManagePublicIPLabel">Manage Public IP automatically</sys:String>
diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
index 54e87588..95eb6570 100644
--- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
+++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml
@@ -64,20 +64,23 @@
                 <CheckBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_CheckIfServerManagerRunningOnStartupLabel}" IsChecked="{Binding Config.CheckIfServerManagerRunningOnStartup, Mode=TwoWay}" HorizontalAlignment="Left"/>
 
                 <Label    Grid.Row="2" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_StartModeLabel}" VerticalAlignment="Center"/>
-                <ComboBox Name="WindowStateComboBox" Grid.Row="2" Grid.Column="1" Margin="5" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStates}" SelectedValue="{Binding Config.MainWindow_WindowState}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
+                <ComboBox Name="WindowStateMainWindowComboBox" Grid.Row="2" Grid.Column="1" Margin="5" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStates}" SelectedValue="{Binding Config.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 Config.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 Config.ManageFirewallAutomatically, Mode=TwoWay}" HorizontalAlignment="Left"/>
-                <CheckBox Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_ManagePublicIPLabel}" IsChecked="{Binding Config.ManagePublicIPAutomatically, Mode=TwoWay}" HorizontalAlignment="Left"/>
+                <Label    Grid.Row="3" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_StartModeServerMonitorLabel}" VerticalAlignment="Center"/>
+                <ComboBox Name="WindowStateServerMonitorComboBox" Grid.Row="3" Grid.Column="1" Margin="5" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStates}" SelectedValue="{Binding Config.ServerMonitorWindow_WindowState}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
 
-                <Label    Grid.Row="4" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_DataDirectoryLabel}" VerticalAlignment="Center"/>
-                <TextBox  Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.DataDir, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
-                <Button   Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryButtonContent}" Click="SetDataDir_Click" Visibility="Hidden" />
-                <Button   Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryResetButtonContent}" Click="ResetDataDir_Click" />
+                <CheckBox Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_ManageFirewallLabel}" IsChecked="{Binding Config.ManageFirewallAutomatically, Mode=TwoWay}" HorizontalAlignment="Left"/>
+                <CheckBox Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_ManagePublicIPLabel}" IsChecked="{Binding Config.ManagePublicIPAutomatically, Mode=TwoWay}" HorizontalAlignment="Left"/>
 
-                <Label    Grid.Row="5" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_BackupDirectoryLabel}" VerticalAlignment="Center"/>
-                <TextBox  Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.BackupPath, Mode=TwoWay}"  IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center"/>
-                <StackPanel Grid.Row="5" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
+                <Label    Grid.Row="5" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_DataDirectoryLabel}" VerticalAlignment="Center"/>
+                <TextBox  Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.DataDir, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
+                <Button   Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryButtonContent}" Click="SetDataDir_Click" Visibility="Hidden" />
+                <Button   Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryResetButtonContent}" Click="ResetDataDir_Click" />
+
+                <Label    Grid.Row="6" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_BackupDirectoryLabel}" VerticalAlignment="Center"/>
+                <TextBox  Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.BackupPath, Mode=TwoWay}"  IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center"/>
+                <StackPanel Grid.Row="6" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
                     <Button  Margin="5,1,0,1" VerticalAlignment="Center" Content="{DynamicResource BackupDirectoryButtonContent}" Click="SetBackupDir_Click"/>
                     <Button  Margin="5,1,0,1" VerticalAlignment="Center" Content="{DynamicResource ClearButtonContent}" Click="ClearBackupDir_Click"/>
                 </StackPanel>
diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs
index 9cf25d1b..ca01b96e 100644
--- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs
+++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml.cs
@@ -48,7 +48,8 @@ namespace ServerManagerTool
             InitializeComponent();
             WindowUtils.RemoveDefaultResourceDictionary(this, Config.Default.DefaultGlobalizationFile);
 
-            PopulateWindowsStatesComboBox();
+            PopulateWindowsStatesMainWindowComboBox();
+            PopulateWindowsStatesServerMonitorWindowComboBox();
             PopulateDiscordBotLogLevelsComboBox();
 
             DiscordBotWhitelist = new List<DiscordBotWhitelistItem>();
@@ -402,7 +403,8 @@ namespace ServerManagerTool
         {
             Config.CultureName = AvailableLanguages.Instance.SelectedLanguage;
 
-            PopulateWindowsStatesComboBox();
+            PopulateWindowsStatesMainWindowComboBox();
+            PopulateWindowsStatesServerMonitorWindowComboBox();
 
             App.Instance.OnResourceDictionaryChanged(Config.CultureName);
         }
@@ -489,9 +491,9 @@ namespace ServerManagerTool
             }
         }
 
-        private void PopulateWindowsStatesComboBox()
+        private void PopulateWindowsStatesMainWindowComboBox()
         {
-            var selectedValue = this.WindowStateComboBox?.SelectedValue ?? Config.MainWindow_WindowState;
+            var selectedValue = this.WindowStateMainWindowComboBox?.SelectedValue ?? Config.MainWindow_WindowState;
             var comboBoxList = new ComboBoxItemList();
 
             foreach (WindowState windowState in Enum.GetValues(typeof(WindowState)))
@@ -501,9 +503,27 @@ namespace ServerManagerTool
             }
 
             this.WindowStates = comboBoxList;
-            if (this.WindowStateComboBox != null)
+            if (this.WindowStateMainWindowComboBox != null)
             {
-                this.WindowStateComboBox.SelectedValue = selectedValue;
+                this.WindowStateMainWindowComboBox.SelectedValue = selectedValue;
+            }
+        }
+
+        private void PopulateWindowsStatesServerMonitorWindowComboBox()
+        {
+            var selectedValue = this.WindowStateServerMonitorComboBox?.SelectedValue ?? Config.ServerMonitorWindow_WindowState;
+            var comboBoxList = new ComboBoxItemList();
+
+            foreach (WindowState windowState in Enum.GetValues(typeof(WindowState)))
+            {
+                var displayMember = _globalizer.GetResourceString($"WindowState_{windowState}") ?? windowState.ToString();
+                comboBoxList.Add(new Common.Model.ComboBoxItem(windowState.ToString(), displayMember));
+            }
+
+            this.WindowStates = comboBoxList;
+            if (this.WindowStateServerMonitorComboBox != null)
+            {
+                this.WindowStateServerMonitorComboBox.SelectedValue = selectedValue;
             }
         }
 
diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml
index a128440a..b9643f17 100644
--- a/src/ARKServerManager/VersionFeed.xml
+++ b/src/ARKServerManager/VersionFeed.xml
@@ -20,6 +20,7 @@
           <br/>
           <ul>
             <li>Added prefix launcher option to launcher arguments.</li>
+            <li>Added server monitor window startup state to global settings.</li>
           </ul>
         </p>
       </div>
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index af1c85df..051d5428 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -20,6 +20,7 @@
           <br/>
           <ul>
             <li>Added prefix launcher option to launcher arguments.</li>
+            <li>Added server monitor window startup state to global settings.</li>
           </ul>
         </p>
       </div>
diff --git a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml.cs b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml.cs
index 01013611..bf9868a6 100644
--- a/src/ARKServerManager/Windows/ServerMonitorWindow.xaml.cs
+++ b/src/ARKServerManager/Windows/ServerMonitorWindow.xaml.cs
@@ -57,6 +57,7 @@ namespace ServerManagerTool.Windows
             this.Top = Config.Default.ServerMonitorWindow_Top;
             this.Height = Config.Default.ServerMonitorWindow_Height;
             this.Width = Config.Default.ServerMonitorWindow_Width;
+            this.WindowState = Config.Default.ServerMonitorWindow_WindowState;
 
             // hook into the language change event
             GlobalizedApplication.Instance.GlobalizationManager.ResourceDictionaryChangedEvent += ResourceDictionaryChangedEvent;
diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config
index 6d4e0858..2ba9b2cd 100644
--- a/src/ConanServerManager/App.config
+++ b/src/ConanServerManager/App.config
@@ -651,6 +651,9 @@
       <setting name="ServerStartMinimized" serializeAs="String">
         <value>False</value>
       </setting>
+      <setting name="ServerMonitorWindow_WindowState" serializeAs="String">
+        <value>Normal</value>
+      </setting>
     </ServerManagerTool.Config>
   </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs
index 13d8e4d6..b24e40b8 100644
--- a/src/ConanServerManager/Config.Designer.cs
+++ b/src/ConanServerManager/Config.Designer.cs
@@ -2285,5 +2285,17 @@ namespace ServerManagerTool {
                 this["ServerStartMinimized"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Normal")]
+        public global::System.Windows.WindowState ServerMonitorWindow_WindowState {
+            get {
+                return ((global::System.Windows.WindowState)(this["ServerMonitorWindow_WindowState"]));
+            }
+            set {
+                this["ServerMonitorWindow_WindowState"] = value;
+            }
+        }
     }
 }
diff --git a/src/ConanServerManager/Config.settings b/src/ConanServerManager/Config.settings
index d98a6f23..7243fa95 100644
--- a/src/ConanServerManager/Config.settings
+++ b/src/ConanServerManager/Config.settings
@@ -629,5 +629,8 @@
     <Setting Name="ServerStartMinimized" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="ServerMonitorWindow_WindowState" Type="System.Windows.WindowState" Scope="User">
+      <Value Profile="(Default)">Normal</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml
index c2f85d1d..bc5ef2d1 100644
--- a/src/ConanServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml
@@ -671,6 +671,7 @@
     <sys:String x:Key="GlobalSettings_RunAsAdministratorLabel">Enable Run as Administrator Prompt on Startup</sys:String>
     <sys:String x:Key="GlobalSettings_CheckIfServerManagerRunningOnStartupLabel">Check if Server Manager Running on Startup</sys:String>
     <sys:String x:Key="GlobalSettings_StartModeLabel">Main Window Start Mode:</sys:String>
+    <sys:String x:Key="GlobalSettings_StartModeServerMonitorLabel">Server Monitor Window Start Mode:</sys:String>
     <sys:String x:Key="GlobalSettings_MinimizeToTrayLabel">Minimize To Tray</sys:String>
     <sys:String x:Key="GlobalSettings_ManageFirewallLabel">Manage firewall settings automatically</sys:String>
     <sys:String x:Key="GlobalSettings_ManagePublicIPLabel">Manage Public IP automatically</sys:String>
diff --git a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
index a26f6937..d6b07231 100644
--- a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
+++ b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml
@@ -68,20 +68,23 @@
                 <CheckBox Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_CheckIfServerManagerRunningOnStartupLabel}" IsChecked="{Binding Config.CheckIfServerManagerRunningOnStartup, Mode=TwoWay}" HorizontalAlignment="Left"/>
 
                 <Label    Grid.Row="2" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_StartModeLabel}" VerticalAlignment="Center"/>
-                <ComboBox Name="WindowStateComboBox" Grid.Row="2" Grid.Column="1" Margin="5" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStates}" SelectedValue="{Binding Config.MainWindow_WindowState}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
+                <ComboBox Name="WindowStateMainWindowComboBox" Grid.Row="2" Grid.Column="1" Margin="5" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStates}" SelectedValue="{Binding Config.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 Config.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 Config.ManageFirewallAutomatically, Mode=TwoWay}" HorizontalAlignment="Left"/>
-                <CheckBox Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_ManagePublicIPLabel}" IsChecked="{Binding Config.ManagePublicIPAutomatically, Mode=TwoWay}" HorizontalAlignment="Left"/>
+                <Label    Grid.Row="3" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_StartModeServerMonitorLabel}" VerticalAlignment="Center"/>
+                <ComboBox Name="WindowStateServerMonitorComboBox" Grid.Row="3" Grid.Column="1" Margin="5" ItemsSource="{Binding ElementName=GlobalSettings, Path=WindowStates}" SelectedValue="{Binding Config.ServerMonitorWindow_WindowState}" SelectedValuePath="ValueMember" DisplayMemberPath="DisplayMember" PreviewMouseWheel="ComboBox_PreviewMouseWheel"/>
 
-                <Label    Grid.Row="4" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_DataDirectoryLabel}" VerticalAlignment="Center"/>
-                <TextBox  Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.DataPath, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
-                <Button   Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Left" Content="{DynamicResource DataDirectoryButtonContent}" Click="SetDataDir_Click" Visibility="Hidden"/>
-                <Button   Grid.Row="4" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryResetButtonContent}" Click="ResetDataDir_Click" />
+                <CheckBox Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_ManageFirewallLabel}" IsChecked="{Binding Config.ManageFirewallAutomatically, Mode=TwoWay}" HorizontalAlignment="Left"/>
+                <CheckBox Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" Margin="5" Content="{DynamicResource GlobalSettings_ManagePublicIPLabel}" IsChecked="{Binding Config.ManagePublicIPAutomatically, Mode=TwoWay}" HorizontalAlignment="Left"/>
 
-                <Label    Grid.Row="5" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_BackupDirectoryLabel}" VerticalAlignment="Center"/>
-                <TextBox  Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.BackupPath, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
-                <StackPanel Grid.Row="5" Grid.Column="3" Orientation="Horizontal">
+                <Label    Grid.Row="5" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_DataDirectoryLabel}" VerticalAlignment="Center"/>
+                <TextBox  Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.DataPath, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
+                <Button   Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Left" Content="{DynamicResource DataDirectoryButtonContent}" Click="SetDataDir_Click" Visibility="Hidden"/>
+                <Button   Grid.Row="5" Grid.Column="3" Grid.ColumnSpan="2" Margin="5,1,0,1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{DynamicResource DataDirectoryResetButtonContent}" Click="ResetDataDir_Click" />
+
+                <Label    Grid.Row="6" Grid.Column="0" Margin="1" Content="{DynamicResource GlobalSettings_BackupDirectoryLabel}" VerticalAlignment="Center"/>
+                <TextBox  Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="2" Margin="1" Text="{Binding Config.BackupPath, Mode=TwoWay}" IsReadOnly="True" IsReadOnlyCaretVisible="True" VerticalContentAlignment="Center" />
+                <StackPanel Grid.Row="6" Grid.Column="3" Orientation="Horizontal">
                     <Button  Margin="5,1,0,1" VerticalAlignment="Center" Content="{DynamicResource BackupDirectoryButtonContent}" Click="SetBackupDir_Click"/>
                     <Button  Margin="5,1,0,1" VerticalAlignment="Center" Content="{DynamicResource ClearButtonContent}" Click="ClearBackupDir_Click"/>
                 </StackPanel>
diff --git a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs
index 2aa370ed..046b2cc7 100644
--- a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs
+++ b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml.cs
@@ -46,7 +46,8 @@ namespace ServerManagerTool
             InitializeComponent();
             WindowUtils.RemoveDefaultResourceDictionary(this, Config.Default.DefaultGlobalizationFile);
 
-            PopulateWindowsStatesComboBox();
+            PopulateWindowsStatesMainWindowComboBox();
+            PopulateWindowsStatesServerMonitorWindowComboBox();
             PopulateDiscordBotLogLevelsComboBox();
 
             DiscordBotWhitelist = new List<DiscordBotWhitelistItem>();
@@ -404,7 +405,8 @@ namespace ServerManagerTool
         {
             Config.CultureName = AvailableLanguages.Instance.SelectedLanguage;
 
-            PopulateWindowsStatesComboBox();
+            PopulateWindowsStatesMainWindowComboBox();
+            PopulateWindowsStatesServerMonitorWindowComboBox();
 
             App.Instance.OnResourceDictionaryChanged(Config.CultureName);
         }
@@ -491,9 +493,9 @@ namespace ServerManagerTool
             }
         }
 
-        private void PopulateWindowsStatesComboBox()
+        private void PopulateWindowsStatesMainWindowComboBox()
         {
-            var selectedValue = this.WindowStateComboBox?.SelectedValue ?? Config.MainWindow_WindowState;
+            var selectedValue = this.WindowStateMainWindowComboBox?.SelectedValue ?? Config.MainWindow_WindowState;
             var windowStates = new ComboBoxItemList();
 
             foreach (WindowState windowState in Enum.GetValues(typeof(WindowState)))
@@ -503,9 +505,27 @@ namespace ServerManagerTool
             }
 
             this.WindowStates = windowStates;
-            if (this.WindowStateComboBox != null)
+            if (this.WindowStateMainWindowComboBox != null)
             {
-                this.WindowStateComboBox.SelectedValue = selectedValue;
+                this.WindowStateMainWindowComboBox.SelectedValue = selectedValue;
+            }
+        }
+
+        private void PopulateWindowsStatesServerMonitorWindowComboBox()
+        {
+            var selectedValue = this.WindowStateServerMonitorComboBox?.SelectedValue ?? Config.ServerMonitorWindow_WindowState;
+            var comboBoxList = new ComboBoxItemList();
+
+            foreach (WindowState windowState in Enum.GetValues(typeof(WindowState)))
+            {
+                var displayMember = _globalizer.GetResourceString($"WindowState_{windowState}") ?? windowState.ToString();
+                comboBoxList.Add(new Common.Model.ComboBoxItem(windowState.ToString(), displayMember));
+            }
+
+            this.WindowStates = comboBoxList;
+            if (this.WindowStateServerMonitorComboBox != null)
+            {
+                this.WindowStateServerMonitorComboBox.SelectedValue = selectedValue;
             }
         }
 
diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml
index e5478135..fb5ccbb6 100644
--- a/src/ConanServerManager/VersionFeed.xml
+++ b/src/ConanServerManager/VersionFeed.xml
@@ -20,6 +20,7 @@
           <br/>
           <ul>
             <li>Added prefix launcher option to launcher arguments.</li>
+            <li>Added server monitor window startup state to global settings.</li>
           </ul>
         </p>
       </div>
diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml
index 958b0fb6..44a01502 100644
--- a/src/ConanServerManager/VersionFeedBeta.xml
+++ b/src/ConanServerManager/VersionFeedBeta.xml
@@ -20,6 +20,7 @@
           <br/>
           <ul>
             <li>Added prefix launcher option to launcher arguments.</li>
+            <li>Added server monitor window startup state to global settings.</li>
           </ul>
         </p>
       </div>
diff --git a/src/ConanServerManager/Windows/ServerMonitorWindow.xaml.cs b/src/ConanServerManager/Windows/ServerMonitorWindow.xaml.cs
index e6566a57..460d69dc 100644
--- a/src/ConanServerManager/Windows/ServerMonitorWindow.xaml.cs
+++ b/src/ConanServerManager/Windows/ServerMonitorWindow.xaml.cs
@@ -57,6 +57,7 @@ namespace ServerManagerTool.Windows
             this.Top = Config.Default.ServerMonitorWindow_Top;
             this.Height = Config.Default.ServerMonitorWindow_Height;
             this.Width = Config.Default.ServerMonitorWindow_Width;
+            this.WindowState = Config.Default.ServerMonitorWindow_WindowState;
 
             // hook into the language change event
             GlobalizedApplication.Instance.GlobalizationManager.ResourceDictionaryChangedEvent += ResourceDictionaryChangedEvent;