diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config
index db7962cd..7c2b5ef3 100644
--- a/src/ARKServerManager/App.config
+++ b/src/ARKServerManager/App.config
@@ -792,6 +792,15 @@
100
+
+ Normal
+
+
+ 50
+
+
+ 50
+
diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs
index 973bdae4..34541533 100644
--- a/src/ARKServerManager/Config.Designer.cs
+++ b/src/ARKServerManager/Config.Designer.cs
@@ -2767,5 +2767,41 @@ namespace ServerManagerTool {
this["MOTDHeight"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("Normal")]
+ public global::System.Windows.WindowState MainWindow_WindowState {
+ get {
+ return ((global::System.Windows.WindowState)(this["MainWindow_WindowState"]));
+ }
+ set {
+ this["MainWindow_WindowState"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("50")]
+ public double MainWindow_Left {
+ get {
+ return ((double)(this["MainWindow_Left"]));
+ }
+ set {
+ this["MainWindow_Left"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("50")]
+ public double MainWindow_Top {
+ get {
+ return ((double)(this["MainWindow_Top"]));
+ }
+ set {
+ this["MainWindow_Top"] = value;
+ }
+ }
}
}
diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings
index 79f022f3..893b744d 100644
--- a/src/ARKServerManager/Config.settings
+++ b/src/ARKServerManager/Config.settings
@@ -767,5 +767,14 @@
100
+
+ Normal
+
+
+ 50
+
+
+ 50
+
\ 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 ce6a2c42..6f2131da 100644
--- a/src/ARKServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml
@@ -421,6 +421,7 @@
ResetThis will reset ALL the user global settings for the server manager. The server manager will be closed if successful.Enable Run as Administrator Prompt on Startup
+ Main Window Start Mode:Minimize To TrayManage firewall settings automaticallyManage Public IP automatically
diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml
index 97e1f2d1..365c572a 100644
--- a/src/ARKServerManager/VersionFeed.xml
+++ b/src/ARKServerManager/VersionFeed.xml
@@ -7,6 +7,30 @@
2021-11-23T00:00:00Z
+
+ urn:uuid:50F06456-861E-483C-82BB-6072A428C652
+ 1.1.408 (1.1.408.1)
+ 1.1.408.1
+
+ 2021-11-24T00:00:00Z
+
+
+
+ NEW
+
+
+
Global Settings - Added option to set the Main Window start mode - Normal, Maximized, Minimized.
+
Main Window - now sotres the Left and Top positions of the window, when in Normal mode. Will restore the window position when started. Defaults to 50,50.
+
+
+
+
+
+ bletch
+ bletch1971@hotmail.com
+
+
+
urn:uuid:2FF0893A-1412-4062-BF87-058F14E787FC1.1.407 (1.1.407.2)
diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml
index 29104c46..4bbc309f 100644
--- a/src/ARKServerManager/VersionFeedBeta.xml
+++ b/src/ARKServerManager/VersionFeedBeta.xml
@@ -5,45 +5,22 @@
Ark Server Manager Version FeedThis is the Ark Server Manager beta version feed.
- 2021-11-23T00:00:00Z
+ 2021-11-24T00:00:00Z
- urn:uuid:CCE4B82B-122A-4BBF-A79F-934B79E41382
- 1.1.407 (1.1.407.2)
- 1.1.407.2
+ urn:uuid:50F06456-861E-483C-82BB-6072A428C652
+ 1.1.408 (1.1.408.1)
+ 1.1.408.1
- 2021-11-23T00:00:00Z
+ 2021-11-24T00:00:00Z
Server Status checks - a few code tweaks to the server status checks.
-
pt-BR Translation file updated.
+
Global Settings - Added option to set the Main Window start mode - Normal, Maximized, Minimized.
+
Main Window - now sotres the Left and Top positions of the window, when in Normal mode. Will restore the window position when started. Defaults to 50,50.
diff --git a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
index b88b7807..0a274c0b 100644
--- a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
+++ b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml
@@ -7,7 +7,8 @@
xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
xmlns:globcntrls="clr-namespace:WPFSharp.Globalizer.Controls;assembly=WPFSharp.Globalizer"
mc:Ignorable="d"
- d:DesignWidth="800">
+ d:DesignWidth="800"
+ x:Name="GlobalSettings">
@@ -47,8 +48,8 @@
-
-
+
+
@@ -74,6 +75,7 @@
+
@@ -90,10 +92,13 @@
-
-
-
+
+
+
+
+
+
diff --git a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml.cs b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml.cs
index d18a0611..0313abb3 100644
--- a/src/ARKServerManager/Windows/GlobalSettingsControl.xaml.cs
+++ b/src/ARKServerManager/Windows/GlobalSettingsControl.xaml.cs
@@ -4,6 +4,7 @@ using ServerManagerTool.Common;
using ServerManagerTool.Common.Lib;
using ServerManagerTool.Common.Utils;
using System;
+using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Reflection;
@@ -11,6 +12,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Input;
using System.Xml;
using WPFSharp.Globalizer;
@@ -27,6 +29,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), typeof(GlobalSettingsControl), new PropertyMetadata(new List()));
public GlobalSettingsControl()
{
@@ -36,6 +39,12 @@ namespace ServerManagerTool
this.CommonConfig = CommonConfig.Default;
this.DataContext = this;
+ this.WindowStates = new List();
+ foreach (var windowState in Enum.GetValues(typeof(WindowState)))
+ {
+ this.WindowStates.Add((WindowState)windowState);
+ }
+
InitializeComponent();
WindowUtils.RemoveDefaultResourceDictionary(this, Config.Default.DefaultGlobalizationFile);
@@ -66,6 +75,12 @@ namespace ServerManagerTool
set { SetValue(IsAdministratorProperty, value); }
}
+ public List WindowStates
+ {
+ get { return (List)GetValue(WindowStatesProperty); }
+ set { SetValue(WindowStatesProperty, value); }
+ }
+
private string GetDeployedVersion()
{
XmlDocument xmlDoc = new XmlDocument();
@@ -278,6 +293,18 @@ namespace ServerManagerTool
}
}
+ private void ComboBox_PreviewMouseWheel(object sender, MouseWheelEventArgs e)
+ {
+ var comboBox = sender as ComboBox;
+ if (comboBox == null)
+ return;
+
+ if (comboBox.IsDropDownOpen)
+ return;
+
+ e.Handled = true;
+ }
+
private void LanguageSelectionComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
CurrentConfig.CultureName = AvailableLanguages.Instance.SelectedLanguage;
diff --git a/src/ARKServerManager/Windows/MainWindow.xaml b/src/ARKServerManager/Windows/MainWindow.xaml
index f787948e..422c1c1c 100644
--- a/src/ARKServerManager/Windows/MainWindow.xaml
+++ b/src/ARKServerManager/Windows/MainWindow.xaml
@@ -9,8 +9,8 @@
xmlns:cvr="clr-namespace:ServerManagerTool.Common.ValidationRules;assembly=ServerManager.Common"
xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
xmlns:enum="clr-namespace:ServerManagerTool.Enums"
- MinWidth="900" MinHeight="600" Width="1100" Height="900" Left="50" Top="50"
- Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" StateChanged="Window_StateChanged"
+ MinWidth="900" MinHeight="600" Width="1100" Height="900" Left="50" Top="50" WindowState="Normal"
+ Loaded="Window_Loaded" SizeChanged="Window_SizeChanged" StateChanged="Window_StateChanged" LocationChanged="Window_LocationChanged"
Name="Main" Icon="../Art/favicon.ico" Title="{DynamicResource MainWindow_Title}">
diff --git a/src/ARKServerManager/Windows/MainWindow.xaml.cs b/src/ARKServerManager/Windows/MainWindow.xaml.cs
index 0375d9c8..e76dd231 100644
--- a/src/ARKServerManager/Windows/MainWindow.xaml.cs
+++ b/src/ARKServerManager/Windows/MainWindow.xaml.cs
@@ -159,8 +159,11 @@ namespace ServerManagerTool
}
}
+ this.Left = Config.Default.MainWindow_Left;
+ this.Top = Config.Default.MainWindow_Top;
this.Height = Config.Default.MainWindow_Height;
this.Width = Config.Default.MainWindow_Width;
+ this.WindowState = Config.Default.MainWindow_WindowState;
// hook into the language change event
GlobalizedApplication.Instance.GlobalizationManager.ResourceDictionaryChangedEvent += ResourceDictionaryChangedEvent;
@@ -204,6 +207,15 @@ namespace ServerManagerTool
this.Activate();
}
+ private void Window_LocationChanged(object sender, EventArgs e)
+ {
+ if (this.WindowState == WindowState.Normal)
+ {
+ Config.Default.MainWindow_Left = Math.Max(0D, this.Left);
+ Config.Default.MainWindow_Top = Math.Max(0D, this.Top);
+ }
+ }
+
private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
{
if (this.WindowState != WindowState.Minimized)
diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config
index a36f5c71..aba565ad 100644
--- a/src/ConanServerManager/App.config
+++ b/src/ConanServerManager/App.config
@@ -552,6 +552,15 @@
True
+
+ 50
+
+
+ 50
+
+
+ Normal
+
\ No newline at end of file
diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs
index e86d991c..5cb093de 100644
--- a/src/ConanServerManager/Config.Designer.cs
+++ b/src/ConanServerManager/Config.Designer.cs
@@ -1896,5 +1896,41 @@ namespace ServerManagerTool {
this["ManagePublicIPAutomatically"] = value;
}
}
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("50")]
+ public double MainWindow_Left {
+ get {
+ return ((double)(this["MainWindow_Left"]));
+ }
+ set {
+ this["MainWindow_Left"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("50")]
+ public double MainWindow_Top {
+ get {
+ return ((double)(this["MainWindow_Top"]));
+ }
+ set {
+ this["MainWindow_Top"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("Normal")]
+ public global::System.Windows.WindowState MainWindow_WindowState {
+ get {
+ return ((global::System.Windows.WindowState)(this["MainWindow_WindowState"]));
+ }
+ set {
+ this["MainWindow_WindowState"] = value;
+ }
+ }
}
}
diff --git a/src/ConanServerManager/Config.settings b/src/ConanServerManager/Config.settings
index b74388f1..24cfab22 100644
--- a/src/ConanServerManager/Config.settings
+++ b/src/ConanServerManager/Config.settings
@@ -527,5 +527,14 @@
True
+
+ 50
+
+
+ 50
+
+
+ Normal
+
\ 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 4dba9c62..62024801 100644
--- a/src/ConanServerManager/Globalization/en-US/en-US.xaml
+++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml
@@ -623,6 +623,7 @@
ResetThis will reset ALL the user global settings for the server manager. The server manager will be closed if successful.Enable Run as Administrator Prompt on Startup
+ Main Window Start Mode:Minimize To TrayManage firewall settings automaticallyManage Public IP automatically
diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml
index d443aacc..6ce0416c 100644
--- a/src/ConanServerManager/VersionFeed.xml
+++ b/src/ConanServerManager/VersionFeed.xml
@@ -5,7 +5,31 @@
Conan Server Manager Version FeedThis is the Conan Server Manager release version feed.
- 2021-11-21T00:00:00Z
+ 2021-11-24T00:00:00Z
+
+
+ urn:uuid:80B2DFDC-E9BE-4B56-A1FE-DD57E64647D1
+ 1.1.53 (1.1.53.1)
+ 1.1.53.1
+
+ 2021-11-24T00:00:00Z
+
+
+
+ NEW
+
+
+
Global Settings - Added option to set the Main Window start mode - Normal, Maximized, Minimized.
+
Main Window - now sotres the Left and Top positions of the window, when in Normal mode. Will restore the window position when started. Defaults to 50,50.
+
+
+
+
+
+ bletch
+ bletch1971@hotmail.com
+
+ urn:uuid:285E9972-4FC6-49EA-8FAD-1086F7FC5354
diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml
index 1c658dad..5beccf81 100644
--- a/src/ConanServerManager/VersionFeedBeta.xml
+++ b/src/ConanServerManager/VersionFeedBeta.xml
@@ -5,21 +5,22 @@
Conan Server Manager Version FeedThis is the Conan Server Manager beta version feed.
- 2021-11-21T00:00:00Z
+ 2021-11-24T00:00:00Z
- urn:uuid:285E9972-4FC6-49EA-8FAD-1086F7FC5354
- 1.1.52 (1.1.52.1)
- 1.1.52.1
+ urn:uuid:80B2DFDC-E9BE-4B56-A1FE-DD57E64647D1
+ 1.1.53 (1.1.53.1)
+ 1.1.53.1
- 2021-11-21T00:00:00Z
+ 2021-11-24T00:00:00Z
- CHANGE
+ NEW
-
Server Status checks - a few code tweaks to the server status checks.
+
Global Settings - Added option to set the Main Window start mode - Normal, Maximized, Minimized.
+
Main Window - now sotres the Left and Top positions of the window, when in Normal mode. Will restore the window position when started. Defaults to 50,50.