From cc84a858503caa4500637a71d16fcc42aa003082 Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Wed, 2 Mar 2022 12:58:54 +1000 Subject: [PATCH] Branch and Event Details moved to new Server Details section, easier to perform profile sync. --- src/ARKServerManager/App.config | 3 + src/ARKServerManager/Config.Designer.cs | 12 + src/ARKServerManager/Config.settings | 3 + .../Enums/ServerProfileCategory.cs | 1 + .../Enums/ServerSettingsResetAction.cs | 1 + .../Globalization/en-US/en-US.xaml | 28 +- .../Globalization/pt-BR/pt-BR.xaml | 7 +- .../Globalization/ru-RU/ru-RU.xaml | 8 +- src/ARKServerManager/Lib/ServerProfile.cs | 77 +++--- .../UserControls/ServerSettingsControl.xaml | 255 ++++++++++-------- .../ServerSettingsControl.xaml.cs | 4 + src/ARKServerManager/VersionFeed.xml | 27 +- src/ARKServerManager/VersionFeedBeta.xml | 61 +---- .../Windows/ProfileSyncWindow.xaml.cs | 1 + src/ConanServerManager/App.config | 3 + src/ConanServerManager/Config.Designer.cs | 12 + src/ConanServerManager/Config.settings | 3 + .../Enums/ServerProfileCategory.cs | 1 + .../Enums/ServerSettingsResetAction.cs | 1 + .../Globalization/en-US/en-US.xaml | 18 +- src/ConanServerManager/Lib/ServerProfile.cs | 55 ++-- .../UserControls/ServerSettingsControl.xaml | 137 ++++++---- .../ServerSettingsControl.xaml.cs | 4 + src/ConanServerManager/VersionFeed.xml | 25 +- src/ConanServerManager/VersionFeedBeta.xml | 59 +--- .../Windows/ProfileSyncWindow.xaml.cs | 1 + 26 files changed, 464 insertions(+), 343 deletions(-) diff --git a/src/ARKServerManager/App.config b/src/ARKServerManager/App.config index 10df07b3..243db532 100644 --- a/src/ARKServerManager/App.config +++ b/src/ARKServerManager/App.config @@ -879,6 +879,9 @@ Normal + + False + diff --git a/src/ARKServerManager/Config.Designer.cs b/src/ARKServerManager/Config.Designer.cs index 30062edf..79ca36dd 100644 --- a/src/ARKServerManager/Config.Designer.cs +++ b/src/ARKServerManager/Config.Designer.cs @@ -3114,5 +3114,17 @@ namespace ServerManagerTool { this["ServerMonitorWindow_WindowState"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool SectionServerDetailsIsExpanded { + get { + return ((bool)(this["SectionServerDetailsIsExpanded"])); + } + set { + this["SectionServerDetailsIsExpanded"] = value; + } + } } } diff --git a/src/ARKServerManager/Config.settings b/src/ARKServerManager/Config.settings index 2771fdd9..393c59de 100644 --- a/src/ARKServerManager/Config.settings +++ b/src/ARKServerManager/Config.settings @@ -857,5 +857,8 @@ Normal + + False + \ No newline at end of file diff --git a/src/ARKServerManager/Enums/ServerProfileCategory.cs b/src/ARKServerManager/Enums/ServerProfileCategory.cs index 12c68784..905f996e 100644 --- a/src/ARKServerManager/Enums/ServerProfileCategory.cs +++ b/src/ARKServerManager/Enums/ServerProfileCategory.cs @@ -6,6 +6,7 @@ Administration, AutomaticManagement, DiscordBot, + ServerDetails, Rules, ChatAndNotifications, HudAndVisuals, diff --git a/src/ARKServerManager/Enums/ServerSettingsResetAction.cs b/src/ARKServerManager/Enums/ServerSettingsResetAction.cs index 09b629fc..f3a86bac 100644 --- a/src/ARKServerManager/Enums/ServerSettingsResetAction.cs +++ b/src/ARKServerManager/Enums/ServerSettingsResetAction.cs @@ -5,6 +5,7 @@ // Sections AdministrationSection, DiscordBotSection, + ServerDetailsSection, RulesSection, ChatAndNotificationsSection, HudAndVisualsSection, diff --git a/src/ARKServerManager/Globalization/en-US/en-US.xaml b/src/ARKServerManager/Globalization/en-US/en-US.xaml index 7f8a9e16..efbfe0f7 100644 --- a/src/ARKServerManager/Globalization/en-US/en-US.xaml +++ b/src/ARKServerManager/Globalization/en-US/en-US.xaml @@ -1191,18 +1191,6 @@ NOTE: The server manager does not provide the Web Alarms functionality, it just allows you to enable/disable the Web Alarms and create the necessary AlarmPostCredentials file. Web Alarm Error - Branch Details - Branch Name: - The name of the branch to download (leave blank to use the release branch). - Branch Password: - The password that is used to access the branch download. - Clear Branch Error - - Event Details - NOTE: Enabling an event on your server should only be done when the official event is running. If you enable the event before or after the official dates, the event may cause your server to become unstable, or may not work at all. - Active Event: - The name of the event to enable (leave blank to disable the event). - Command Line Priority: Set the application priority when starting the server. @@ -1262,6 +1250,22 @@ If enabled, the profile will listen for update commands from discord. + + Server Details + + Branch Details + Branch Name: + The name of the branch to download (leave blank to use the release branch). + Branch Password: + The password that is used to access the branch download. + Clear Branch Error + + Event Details + NOTE: Enabling an event on your server should only be done when the official event is running. If you enable the event before or after the official dates, the event may cause your server to become unstable, or may not work at all. + Active Event: + The name of the event to enable (leave blank to disable the event). + + Rules Enable Hardcore Mode diff --git a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml index 7386c5be..2199b14d 100644 --- a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml +++ b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml @@ -490,7 +490,8 @@ Isso redefinirá TODAS as configurações globais do usuário para o gerenciador do servidor. O gerenciador do servidor será fechado se for bem-sucedido. Ativar e executar como Prompt de Administrador na Inicialização Verificar se o Server Manager está em execução na inicialização - Modo de início da janela principal: + Modo de iníciar a janela ASM: + Modo de iníciar O Monitor do servidor: Minimizar para a bandeja Gerenciar configurações de firewall automaticamente Gerenciar IP público automaticamente @@ -538,6 +539,8 @@ Se ativado, quando você iniciar manualmente o servidor, uma validação básica será executada nos arquivos server e mod. NOTA: Não será realizado se o Ark Mod Management estiver ativado. Executar atualização do servidor e mod no início do servidor Se habilitado, quando você iniciar manualmente o servidor, o servidor e os arquivos mod serão atualizados para a versão mais recente. NOTA: Não será realizado se o Ark Mod Management estiver ativado. + Iniciar servidor minimizado + Se ativado, quando o servidor for iniciado, a janela de comando será minimizada, caso contrário, abrirá normalmente. Configurações da Steam Parar o fechamento do SteamCMD (use apenas para depuração) @@ -1211,6 +1214,8 @@ Args de linha de comando adicionais para o ativador do servidor. Use isso com cautela! Para mais informações, consulte 'Microsoft Start Command' na internet. Substituir lançador Se ativado, o arquivo RunServer.cmd conterá apenas o que está incluído no campo Argumentos do ativador. + Prefixo Launcher + Se ativado, o arquivo RunServer.cmd incluirá o campo Launcher Args antes do início do servidor (permitirá que outros arquivos sejam executados antes que o servidor seja iniciado). Args do servidor: Args de linha de comando adicionais para o servidor. Se você especificar isso, adicione os argumentos que começam com? Primeiro, seguidos por quaisquer outros argumentos. Por exemplo:?MaxPlayers=5?QueryPort=9999-nosteamclient Mostrar comando ... diff --git a/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml b/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml index c84c54c0..4016902e 100644 --- a/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml +++ b/src/ARKServerManager/Globalization/ru-RU/ru-RU.xaml @@ -9,7 +9,7 @@ Последнее обновление: - 27.01.2022 от Varlonec, Эдван + 18.02.2022 от Varlonec, Эдван Ошибка @@ -328,17 +328,17 @@ Синхронизировать профиль - {0} Ошибка при синхронизации профиля Процесс синхронизации профиля - Перезаписывание выбранных параметров раздела текущего профиля с настройками выбранного профиля. Вы не сможете отменить, вы хотите продолжить? + В указанных вами профилях будут перезаписаны параметры выбранных вами разделов настройками из текущего профиля. Операция не обратима, вы не сможете вернуть прежние настройки выбранных профилей. Хотите продолжить? Ошибка процесса синхронизации профиля Вы не выбрали профиль для копирования. Вы не выбрали разделы для копирования настроек. - Настройки из выбранных разделов были успешно скопированы из выбранного профиля в текущий профиль. + Настройки выбранных разделов были успешно скопированы из текущего профиля в выбранные профили. Выбрать все Снять все выделения Процесс Отмена - Эта форма скопирует выбранные настройки из выбранного профиля в текущий профиль. + Эта форма скопирует указанные настройки из текущего профиля в выбранные профили. Копировать Профиль diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs index a629771e..a801308b 100644 --- a/src/ARKServerManager/Lib/ServerProfile.cs +++ b/src/ARKServerManager/Lib/ServerProfile.cs @@ -780,30 +780,6 @@ namespace ServerManagerTool.Lib set { SetValue(ClusterDirOverrideProperty, value); } } - public static readonly DependencyProperty BranchNameProperty = DependencyProperty.Register(nameof(BranchName), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty)); - [DataMember] - public string BranchName - { - get { return (string)GetValue(BranchNameProperty); } - set { SetValue(BranchNameProperty, value); } - } - - public static readonly DependencyProperty BranchPasswordProperty = DependencyProperty.Register(nameof(BranchPassword), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty)); - [DataMember] - public string BranchPassword - { - get { return (string)GetValue(BranchPasswordProperty); } - set { SetValue(BranchPasswordProperty, value); } - } - - public static readonly DependencyProperty EventNameProperty = DependencyProperty.Register(nameof(EventName), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty)); - [DataMember] - public string EventName - { - get { return (string)GetValue(EventNameProperty); } - set { SetValue(EventNameProperty, value); } - } - public static readonly DependencyProperty ProcessPriorityProperty = DependencyProperty.Register(nameof(ProcessPriority), typeof(string), typeof(ServerProfile), new PropertyMetadata("normal")); [DataMember] public string ProcessPriority @@ -1033,6 +1009,32 @@ namespace ServerManagerTool.Lib } #endregion + #region Server Details + public static readonly DependencyProperty BranchNameProperty = DependencyProperty.Register(nameof(BranchName), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty)); + [DataMember] + public string BranchName + { + get { return (string)GetValue(BranchNameProperty); } + set { SetValue(BranchNameProperty, value); } + } + + public static readonly DependencyProperty BranchPasswordProperty = DependencyProperty.Register(nameof(BranchPassword), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty)); + [DataMember] + public string BranchPassword + { + get { return (string)GetValue(BranchPasswordProperty); } + set { SetValue(BranchPasswordProperty, value); } + } + + public static readonly DependencyProperty EventNameProperty = DependencyProperty.Register(nameof(EventName), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty)); + [DataMember] + public string EventName + { + get { return (string)GetValue(EventNameProperty); } + set { SetValue(EventNameProperty, value); } + } + #endregion + #region Rules public static readonly DependencyProperty EnableHardcoreProperty = DependencyProperty.Register(nameof(EnableHardcore), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false)); [IniFileEntry(IniFiles.GameUserSettings, IniSections.GUS_ServerSettings, ServerProfileCategory.Rules, "ServerHardcore")] @@ -5253,10 +5255,6 @@ namespace ServerManagerTool.Lib this.ClearValue(CrossArkClusterIdProperty); this.ClearValue(ClusterDirOverrideProperty); - this.ClearValue(BranchNameProperty); - this.ClearValue(BranchPasswordProperty); - this.ClearValue(EventNameProperty); - this.ClearValue(ProcessPriorityProperty); this.ClearValue(ProcessAffinityProperty); @@ -5610,6 +5608,14 @@ namespace ServerManagerTool.Lib this.ClearNullableValue(ItemStatClamps_HyperthermalInsulationProperty); } + public void ResetServerDetailsSection() + { + this.ClearValue(BranchNameProperty); + this.ClearValue(BranchPasswordProperty); + + this.ClearValue(EventNameProperty); + } + public void ResetSOTFSection() { this.ClearValue(SOTF_EnabledProperty); @@ -5731,6 +5737,9 @@ namespace ServerManagerTool.Lib case ServerProfileCategory.DiscordBot: SyncDiscordBot(sourceProfile); break; + case ServerProfileCategory.ServerDetails: + SyncServerDetails(sourceProfile); + break; case ServerProfileCategory.Rules: SyncRulesSection(sourceProfile); break; @@ -5857,10 +5866,6 @@ namespace ServerManagerTool.Lib this.SetValue(WebAlarmKeyProperty, sourceProfile.WebAlarmKey); this.SetValue(WebAlarmUrlProperty, sourceProfile.WebAlarmUrl); - this.SetValue(BranchNameProperty, sourceProfile.BranchName); - this.SetValue(BranchPasswordProperty, sourceProfile.BranchPassword); - this.SetValue(EventNameProperty, sourceProfile.EventName); - this.SetValue(LauncherArgsOverrideProperty, sourceProfile.LauncherArgsOverride); this.SetValue(LauncherArgsProperty, sourceProfile.LauncherArgs); this.SetValue(AdditionalArgsProperty, sourceProfile.AdditionalArgs); @@ -6318,6 +6323,14 @@ namespace ServerManagerTool.Lib this.SetNullableValue(ItemStatClamps_HyperthermalInsulationProperty, sourceProfile.ItemStatClamps_HyperthermalInsulation); } + private void SyncServerDetails(ServerProfile sourceProfile) + { + this.SetValue(BranchNameProperty, sourceProfile.BranchName); + this.SetValue(BranchPasswordProperty, sourceProfile.BranchPassword); + + this.SetValue(EventNameProperty, sourceProfile.EventName); + } + private void SyncServerFiles(ServerProfile sourceProfile) { this.SetValue(ServerFilesAdminsProperty, sourceProfile.ServerFilesAdmins); diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml index 52f2f030..53660bdd 100644 --- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml @@ -1254,112 +1254,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1654,6 +1548,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs index 6f09b704..0d73fa76 100644 --- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs +++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs @@ -4025,6 +4025,10 @@ namespace ServerManagerTool this.Settings.ResetRulesSection(); break; + case ServerSettingsResetAction.ServerDetailsSection: + this.Settings.ResetServerDetailsSection(); + break; + case ServerSettingsResetAction.SOTFSection: this.Settings.ResetSOTFSection(); break; diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index afd72fd9..b1254bcd 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -5,7 +5,32 @@ Ark Server Manager Version Feed This is the Ark Server Manager release version feed. - 2022-02-17T00:00:00Z + 2022-03-02T00:00:00Z + + + urn:uuid:F70DF42B-2D85-43DA-93EC-D20DF620A119 + 1.1.418 (1.1.418.1) + 1.1.418.1 + + 2022-03-02T00:00:00Z + +
+

+ CHANGE +
+

    +
  • Branch and Event Details moved to new Server Details section, easier to perform profile sync.
    • +
  • pt-BR Translation file updated.
    • +
  • ru-RU Translation file updated.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:65FE9F13-6403-4A18-A8DB-366564B0456E diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index 9de62914..3b7b7eba 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -5,68 +5,23 @@ Ark Server Manager Version Feed This is the Ark Server Manager beta version feed. - 2022-02-17T00:00:00Z + 2022-03-02T00:00:00Z - urn:uuid:3EB18641-5510-4FC6-9788-543682BA37DC - 1.1.417 (1.1.417.3) - 1.1.417.3 + urn:uuid:F70DF42B-2D85-43DA-93EC-D20DF620A119 + 1.1.418 (1.1.418.1) + 1.1.418.1 - 2022-02-17T00:00:00Z + 2022-03-02T00:00:00Z

CHANGE

    -
  • Added confirmation message box when stopping server.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:3EB18641-5510-4FC6-9788-543682BA37DC - 1.1.417 (1.1.417.2) - 1.1.417.2 - - 2022-01-25T00:00:00Z - -
-

- BUGFIX -
-

    -
  • Fixed prefix launcher option bug.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:65FE9F13-6403-4A18-A8DB-366564B0456E - 1.1.417 (1.1.417.1) - 1.1.417.1 - - 2022-01-25T00:00:00Z - -
-

- CHANGE -
-

    -
  • Added prefix launcher option to launcher arguments.
    • -
  • Added server monitor window startup state to global settings.
    • +
  • Branch and Event Details moved to new Server Details section, easier to perform profile sync.
    • +
  • pt-BR Translation file updated.
    • +
  • ru-RU Translation file updated.

diff --git a/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs b/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs index 368e51e9..3b468bc9 100644 --- a/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs +++ b/src/ARKServerManager/Windows/ProfileSyncWindow.xaml.cs @@ -217,6 +217,7 @@ namespace ServerManagerTool SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.AutomaticManagement, SectionName = _globalizer.GetResourceString("ServerSettings_AutomaticManagementLabel") }); if (Config.Default.DiscordBotEnabled) SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.DiscordBot, SectionName = _globalizer.GetResourceString("ServerSettings_DiscordBotLabel") }); + SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.ServerDetails, SectionName = _globalizer.GetResourceString("ServerSettings_ServerDetailsLabel") }); SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.Rules, SectionName = _globalizer.GetResourceString("ServerSettings_RulesLabel") }); SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.ChatAndNotifications, SectionName = _globalizer.GetResourceString("ServerSettings_ChatAndNotificationsLabel") }); SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.HudAndVisuals, SectionName = _globalizer.GetResourceString("ServerSettings_HUDAndVisualsLabel") }); diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config index 2ba9b2cd..b86bafda 100644 --- a/src/ConanServerManager/App.config +++ b/src/ConanServerManager/App.config @@ -654,6 +654,9 @@ Normal + + False + \ No newline at end of file diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs index b24e40b8..2e2eab69 100644 --- a/src/ConanServerManager/Config.Designer.cs +++ b/src/ConanServerManager/Config.Designer.cs @@ -2297,5 +2297,17 @@ namespace ServerManagerTool { this["ServerMonitorWindow_WindowState"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool SectionServerDetailsIsExpanded { + get { + return ((bool)(this["SectionServerDetailsIsExpanded"])); + } + set { + this["SectionServerDetailsIsExpanded"] = value; + } + } } } diff --git a/src/ConanServerManager/Config.settings b/src/ConanServerManager/Config.settings index 7243fa95..b831c96a 100644 --- a/src/ConanServerManager/Config.settings +++ b/src/ConanServerManager/Config.settings @@ -632,5 +632,8 @@ Normal + + False + \ No newline at end of file diff --git a/src/ConanServerManager/Enums/ServerProfileCategory.cs b/src/ConanServerManager/Enums/ServerProfileCategory.cs index 6319d9cc..378c3e38 100644 --- a/src/ConanServerManager/Enums/ServerProfileCategory.cs +++ b/src/ConanServerManager/Enums/ServerProfileCategory.cs @@ -5,6 +5,7 @@ Administration, AutomaticManagement, DiscordBot, + ServerDetails, ServerFiles, } } diff --git a/src/ConanServerManager/Enums/ServerSettingsResetAction.cs b/src/ConanServerManager/Enums/ServerSettingsResetAction.cs index 5441d7b1..d999e9b4 100644 --- a/src/ConanServerManager/Enums/ServerSettingsResetAction.cs +++ b/src/ConanServerManager/Enums/ServerSettingsResetAction.cs @@ -5,6 +5,7 @@ // Sections AdministrationSection, DiscordBotSection, + ServerDetailsSection, // Properties RconWindowExtents, diff --git a/src/ConanServerManager/Globalization/en-US/en-US.xaml b/src/ConanServerManager/Globalization/en-US/en-US.xaml index 650752d9..5af13fec 100644 --- a/src/ConanServerManager/Globalization/en-US/en-US.xaml +++ b/src/ConanServerManager/Globalization/en-US/en-US.xaml @@ -1136,13 +1136,6 @@ Can Import Directly from Same Server If enabled, will allow players to directly import characters that were exported from exactly the same server. - Branch Details - Branch Name: - The name of the branch to download (leave blank to use the release branch). - Branch Password: - The password that is used to access the branch download. - Clear Branch Error - Command Line Priority: Set the application priority when starting the server. @@ -1202,6 +1195,17 @@ If enabled, the profile will listen for update commands from discord. + + Server Details + + Branch Details + Branch Name: + The name of the branch to download (leave blank to use the release branch). + Branch Password: + The password that is used to access the branch download. + Clear Branch Error + + Server File Details NOTE: Any changes will require a server restart to take effect. diff --git a/src/ConanServerManager/Lib/ServerProfile.cs b/src/ConanServerManager/Lib/ServerProfile.cs index 8d6abed1..a1962da5 100644 --- a/src/ConanServerManager/Lib/ServerProfile.cs +++ b/src/ConanServerManager/Lib/ServerProfile.cs @@ -396,22 +396,6 @@ namespace ServerManagerTool.Lib set { SetValue(CanImportDirectlyFromSameServerProperty, value); } } - public static readonly DependencyProperty BranchNameProperty = DependencyProperty.Register(nameof(BranchName), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty)); - [DataMember] - public string BranchName - { - get { return (string)GetValue(BranchNameProperty); } - set { SetValue(BranchNameProperty, value); } - } - - public static readonly DependencyProperty BranchPasswordProperty = DependencyProperty.Register(nameof(BranchPassword), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty)); - [DataMember] - public string BranchPassword - { - get { return (string)GetValue(BranchPasswordProperty); } - set { SetValue(BranchPasswordProperty, value); } - } - public static readonly DependencyProperty ProcessPriorityProperty = DependencyProperty.Register(nameof(ProcessPriority), typeof(string), typeof(ServerProfile), new PropertyMetadata("normal")); [DataMember] public string ProcessPriority @@ -641,6 +625,24 @@ namespace ServerManagerTool.Lib } #endregion + #region Server Details + public static readonly DependencyProperty BranchNameProperty = DependencyProperty.Register(nameof(BranchName), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty)); + [DataMember] + public string BranchName + { + get { return (string)GetValue(BranchNameProperty); } + set { SetValue(BranchNameProperty, value); } + } + + public static readonly DependencyProperty BranchPasswordProperty = DependencyProperty.Register(nameof(BranchPassword), typeof(string), typeof(ServerProfile), new PropertyMetadata(String.Empty)); + [DataMember] + public string BranchPassword + { + get { return (string)GetValue(BranchPasswordProperty); } + set { SetValue(BranchPasswordProperty, value); } + } + #endregion + #region Server Files public static readonly DependencyProperty ServerFilesBlacklistedProperty = DependencyProperty.Register(nameof(ServerFilesBlacklisted), typeof(PlayerUserList), typeof(ServerProfile), new PropertyMetadata(null)); [DataMember] @@ -1470,9 +1472,6 @@ namespace ServerManagerTool.Lib ResetServerOptions(); - this.ClearValue(BranchNameProperty); - this.ClearValue(BranchPasswordProperty); - this.ClearValue(ProcessPriorityProperty); this.ClearValue(ProcessAffinityProperty); @@ -1493,6 +1492,12 @@ namespace ServerManagerTool.Lib this.ClearValue(AllowDiscordStopProperty); this.ClearValue(AllowDiscordUpdateProperty); } + + public void ResetServerDetailsSection() + { + this.ClearValue(BranchNameProperty); + this.ClearValue(BranchPasswordProperty); + } #endregion #region Sync Methods @@ -1512,6 +1517,9 @@ namespace ServerManagerTool.Lib case ServerProfileCategory.DiscordBot: SyncDiscordBot(sourceProfile); break; + case ServerProfileCategory.ServerDetails: + SyncServerDetails(sourceProfile); + break; case ServerProfileCategory.ServerFiles: SyncServerFiles(sourceProfile); break; @@ -1535,9 +1543,6 @@ namespace ServerManagerTool.Lib this.SetValue(KickIdlePlayersPercentageProperty, sourceProfile.KickIdlePlayersPercentage); this.SetValue(KickIdlePlayersPeriodProperty, sourceProfile.KickIdlePlayersPeriod); - this.SetValue(BranchNameProperty, sourceProfile.BranchName); - this.SetValue(BranchPasswordProperty, sourceProfile.BranchPassword); - this.SetValue(LauncherArgsOverrideProperty, sourceProfile.LauncherArgsOverride); this.SetValue(LauncherArgsProperty, sourceProfile.LauncherArgs); this.SetValue(AdditionalArgsProperty, sourceProfile.AdditionalArgs); @@ -1574,6 +1579,12 @@ namespace ServerManagerTool.Lib this.SetValue(AllowDiscordUpdateProperty, sourceProfile.AllowDiscordUpdate); } + private void SyncServerDetails(ServerProfile sourceProfile) + { + this.SetValue(BranchNameProperty, sourceProfile.BranchName); + this.SetValue(BranchPasswordProperty, sourceProfile.BranchPassword); + } + private void SyncServerFiles(ServerProfile sourceProfile) { this.SetValue(ServerFilesBlacklistedProperty, sourceProfile.ServerFilesBlacklisted); diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml index d0ad9c8c..394787c4 100644 --- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml @@ -800,57 +800,6 @@ - - - - - - - - - - - - - - - - - - - @@ -1129,6 +1078,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs index 5657642e..c05448a9 100644 --- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs +++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml.cs @@ -1356,6 +1356,10 @@ namespace ServerManagerTool this.Settings.ResetRconWindowExtents(); break; + case ServerSettingsResetAction.ServerDetailsSection: + this.Settings.ResetServerDetailsSection(); + break; + case ServerSettingsResetAction.ServerOptions: this.Settings.ResetServerOptions(); break; diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index b6cbc292..79cae698 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -5,7 +5,30 @@ Conan Server Manager Version Feed This is the Conan Server Manager release version feed. - 2022-02-17T00:00:00Z + 2022-03-02T00:00:00Z + + + urn:uuid:C6DE07B3-ADA8-4AE4-BFE4-1F87CDFF6284 + 1.1.63 (1.1.63.1) + 1.1.63.1 + + 2022-03-02T00:00:00Z + +
+

+ CHANGE +
+

    +
  • Branch Details moved to new Server Details section, easier to perform profile sync.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:6F91598E-D62C-4F48-A205-C9C4A66BBB65 diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index d6f5607b..7bdd2509 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -5,68 +5,21 @@ Conan Server Manager Version Feed This is the Conan Server Manager beta version feed. - 2022-02-17T00:00:00Z + 2022-03-02T00:00:00Z - urn:uuid:153F64B2-16DA-40A5-9436-659F9BE24C21 - 1.1.62 (1.1.62.3) - 1.1.62.3 + urn:uuid:C6DE07B3-ADA8-4AE4-BFE4-1F87CDFF6284 + 1.1.63 (1.1.63.1) + 1.1.63.1 - 2022-02-17T00:00:00Z + 2022-03-02T00:00:00Z

CHANGE

    -
  • Added confirmation message box when stopping server.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:153F64B2-16DA-40A5-9436-659F9BE24C21 - 1.1.62 (1.1.62.2) - 1.1.62.2 - - 2022-01-25T00:00:00Z - -
-

- BUGFIX -
-

    -
  • Fixed prefix launcher option bug.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:6F91598E-D62C-4F48-A205-C9C4A66BBB65 - 1.1.62 (1.1.62.1) - 1.1.62.1 - - 2022-01-25T00:00:00Z - -
-

- CHANGE -
-

    -
  • Added prefix launcher option to launcher arguments.
    • -
  • Added server monitor window startup state to global settings.
    • +
  • Branch Details moved to new Server Details section, easier to perform profile sync.

diff --git a/src/ConanServerManager/Windows/ProfileSyncWindow.xaml.cs b/src/ConanServerManager/Windows/ProfileSyncWindow.xaml.cs index 434914a5..e3ca60a1 100644 --- a/src/ConanServerManager/Windows/ProfileSyncWindow.xaml.cs +++ b/src/ConanServerManager/Windows/ProfileSyncWindow.xaml.cs @@ -217,6 +217,7 @@ namespace ServerManagerTool SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.AutomaticManagement, SectionName = _globalizer.GetResourceString("ServerSettings_AutomaticManagementLabel") }); if (Config.Default.DiscordBotEnabled) SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.DiscordBot, SectionName = _globalizer.GetResourceString("ServerSettings_DiscordBotLabel") }); + SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.ServerDetails, SectionName = _globalizer.GetResourceString("ServerSettings_ServerDetailsLabel") }); SyncSections.Add(new SyncSection() { Selected = false, Category = ServerProfileCategory.ServerFiles, SectionName = _globalizer.GetResourceString("ServerSettings_ServerFilesLabel") }); }