From d2ce321273ecfff2a7251d30e1254b651266050a Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Fri, 14 Jan 2022 17:44:34 +1000 Subject: [PATCH] Added new option to start the server windows minimzed. --- src/ARKServerManager/App.config | 3 +++ src/ARKServerManager/Config.Designer.cs | 12 +++++++++ src/ARKServerManager/Config.settings | 3 +++ .../Globalization/en-US/en-US.xaml | 2 ++ src/ARKServerManager/Lib/ServerProfile.cs | 5 ++++ .../UserControls/GlobalSettingsControl.xaml | 1 + src/ARKServerManager/VersionFeed.xml | 7 +++--- src/ARKServerManager/VersionFeedBeta.xml | 25 ++++++++++++++++++- src/ConanServerManager/App.config | 3 +++ src/ConanServerManager/Config.Designer.cs | 12 +++++++++ src/ConanServerManager/Config.settings | 3 +++ .../Globalization/en-US/en-US.xaml | 2 ++ src/ConanServerManager/Lib/ServerProfile.cs | 5 ++++ .../UserControls/GlobalSettingsControl.xaml | 1 + src/ConanServerManager/VersionFeed.xml | 7 +++--- src/ConanServerManager/VersionFeedBeta.xml | 25 ++++++++++++++++++- 16 files changed, 108 insertions(+), 8 deletions(-) diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config index 4650a137..2ad8e3a3 100644 --- a/src/ARKServerManager/App.config +++ b/src/ARKServerManager/App.config @@ -873,6 +873,9 @@ True + + False + diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs index 9cb08be9..35647261 100644 --- a/src/ARKServerManager/Config.Designer.cs +++ b/src/ARKServerManager/Config.Designer.cs @@ -3090,5 +3090,17 @@ namespace ServerManagerTool { this["CheckIfServerManagerRunningOnStartup"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ServerStartMinimized { + get { + return ((bool)(this["ServerStartMinimized"])); + } + set { + this["ServerStartMinimized"] = value; + } + } } } diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings index 271f57e8..80430160 100644 --- a/src/ARKServerManager/Config.settings +++ b/src/ARKServerManager/Config.settings @@ -851,5 +851,8 @@ True + + False + \ 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 5005fdb1..7a3e8c46 100644 --- a/src/ARKServerManager/Globalization/en-US/en-US.xaml +++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml @@ -538,6 +538,8 @@ If enabled, when you manually start the server, a basic validation is performed on the server and mod files. NOTE: Will not be performed if Ark Mod Management enabled. Perform server and mod update on server start If enabled, when you manually start the server, the server and mod files will be updated to the latest version. NOTE: Will not be performed if Ark Mod Management enabled. + Start Server Minimized + If enabled, when the server is started the command window will be minimized, otherwise it will open in normally. Steam Settings Stop SteamCMD closing (use for debugging only) diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs index 0174aee7..34dcd19b 100644 --- a/src/ARKServerManager/Lib/ServerProfile.cs +++ b/src/ARKServerManager/Lib/ServerProfile.cs @@ -4360,6 +4360,11 @@ namespace ServerManagerTool.Lib commandArgs.Append("start"); commandArgs.Append($" \"{this.ProfileName}\""); + if (Config.Default.ServerStartMinimized) + { + commandArgs.Append($" /min"); + } + commandArgs.Append($" /{ProcessPriority}"); if (ProcessAffinity > 0 && ProcessUtils.IsProcessorAffinityValid(ProcessAffinity)) { diff --git a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml index 6dc62179..54e87588 100644 --- a/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/GlobalSettingsControl.xaml @@ -326,6 +326,7 @@ + diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 4ee93ce1..7b54995c 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -9,8 +9,8 @@ urn:uuid:9B66118D-DDFE-4E72-9CB9-299642AD29FF - 1.1.416 (1.1.416.2) - 1.1.416.2 + 1.1.416 (1.1.416.3) + 1.1.416.3 2022-01-14T00:00:00Z @@ -19,7 +19,8 @@ CHANGE
    -
  • Minor tweaks to the Auto-Update process to prevent intermittent exceptions.
    • +
  • Global Settings - Server Startup Options - Added new option to start the server windows minimzed.
    • +
  • Minor tweaks to the Auto-Update process to help prevent intermittent exceptions.
  • Server manager language will default to the computers language setting on first start, if possible.
  • pt-BR Translation file updated.
  • zh-CN Translation file updated.
    • diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index 86a9acb9..db301b61 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2022-01-14T00:00:00Z + + urn:uuid:E3D74FC6-9D7D-4EDC-98A4-5710880C8FD9 + 1.1.416 (1.1.416.3) + 1.1.416.3 + + 2022-01-14T00:00:00Z + +
    +

    + CHANGE +
    +

      +
    • Global Settings - Server Startup Options - Added new option to start the server windows minimzed.
      • +
    +

    +
    +     + + bletch + bletch1971@hotmail.com + +     + urn:uuid:0427B4A2-8C1A-426D-BCDB-ADBFF0A74825 1.1.416 (1.1.416.2) @@ -43,7 +66,7 @@ CHANGE
      -
    • Minor tweaks to the Auto-Update process to prevent intermittent exceptions.
      • +
    • Minor tweaks to the Auto-Update process to help prevent intermittent exceptions.
    • zh-CN Translation file updated.

    diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config index c2b96f10..6d4e0858 100644 --- a/src/ConanServerManager/App.config +++ b/src/ConanServerManager/App.config @@ -648,6 +648,9 @@ True + + False + \ No newline at end of file diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs index cdd999e4..13d8e4d6 100644 --- a/src/ConanServerManager/Config.Designer.cs +++ b/src/ConanServerManager/Config.Designer.cs @@ -2273,5 +2273,17 @@ namespace ServerManagerTool { this["CheckIfServerManagerRunningOnStartup"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ServerStartMinimized { + get { + return ((bool)(this["ServerStartMinimized"])); + } + set { + this["ServerStartMinimized"] = value; + } + } } } diff --git a/src/ConanServerManager/Config.settings b/src/ConanServerManager/Config.settings index a45de1ad..d98a6f23 100644 --- a/src/ConanServerManager/Config.settings +++ b/src/ConanServerManager/Config.settings @@ -626,5 +626,8 @@ True + + False + \ 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 a449a3c6..752aa397 100644 --- a/src/ConanServerManager/Globalization/en-US/en-US.xaml +++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml @@ -699,6 +699,8 @@ If enabled, when you manually start the server, a basic validation is performed on the server and mod files. Perform server and mod update on server start If enabled, when you manually start the server, the server and mod files will be updated to the latest version. + Start Server Minimized + If enabled, when the server is started the command window will be minimized, otherwise it will open in normally. Steam Settings Stop SteamCMD closing (use for debugging only) diff --git a/src/ConanServerManager/Lib/ServerProfile.cs b/src/ConanServerManager/Lib/ServerProfile.cs index a5c73077..34b7e704 100644 --- a/src/ConanServerManager/Lib/ServerProfile.cs +++ b/src/ConanServerManager/Lib/ServerProfile.cs @@ -1085,6 +1085,11 @@ namespace ServerManagerTool.Lib commandArgs.Append("start"); commandArgs.Append($" \"{this.ProfileName}\""); + if (Config.Default.ServerStartMinimized) + { + commandArgs.Append($" /min"); + } + commandArgs.Append($" /{ProcessPriority}"); if (ProcessAffinity > 0 && ProcessUtils.IsProcessorAffinityValid(ProcessAffinity)) { diff --git a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml index dac1bf4f..a26f6937 100644 --- a/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml +++ b/src/ConanServerManager/UserControls/GlobalSettingsControl.xaml @@ -277,6 +277,7 @@ + diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index 497146fe..d8ae2fd5 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -9,8 +9,8 @@ urn:uuid:189B95FA-8ACA-4E37-9A34-443B6C5E27EE - 1.1.61 (1.1.61.2) - 1.1.61.2 + 1.1.61 (1.1.61.3) + 1.1.61.3 2022-01-14T00:00:00Z @@ -19,7 +19,8 @@ CHANGE
      -
    • Minor tweaks to the Auto-Update process to prevent intermittent exceptions.
      • +
    • Global Settings - Server Startup Options - Added new option to start the server windows minimzed.
      • +
    • Minor tweaks to the Auto-Update process to help prevent intermittent exceptions.
    • Server manager language will default to the computers language setting on first start, if possible.

    diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index bedda50d..75ca993b 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -7,6 +7,29 @@ 2022-01-14T00:00:00Z + + urn:uuid:BF3FA549-5DC9-4576-B225-6D8519ED3B98 + 1.1.61 (1.1.61.3) + 1.1.61.3 + + 2022-01-14T00:00:00Z + +
    +

    + CHANGE +
    +

      +
    • Global Settings - Server Startup Options - Added new option to start the server windows minimzed.
      • +
    +

    +
    +     + + bletch + bletch1971@hotmail.com + +     + urn:uuid:16704347-28FE-41BD-9913-465982E6C3C3 1.1.61 (1.1.61.2) @@ -42,7 +65,7 @@ CHANGE
      -
    • Minor tweaks to the Auto-Update process to prevent intermittent exceptions.
      • +
    • Minor tweaks to the Auto-Update process to help prevent intermittent exceptions.