From e671abd6403e1e96205c0c27c600ce5ee097cef0 Mon Sep 17 00:00:00 2001 From: Brett Hewitson Date: Fri, 24 Jun 2022 16:35:22 +1000 Subject: [PATCH] Colouring Changes - changed the control coloring (now blue) that are NOT included in the profile sync pt-BR Translation file updated --- src/ARKServerManager/ARKServerManager.csproj | 1 + .../Globalization/pt-BR/pt-BR.xaml | 11 ++++++++ .../Lib/Model/FindSettingItem.cs | 11 ++++++++ src/ARKServerManager/Styles/Default.xaml | 3 ++- .../ServerSettingsControl.xaml.cs | 19 +++++++++----- src/ARKServerManager/VersionFeed.xml | 5 ++-- src/ARKServerManager/VersionFeedBeta.xml | 24 ++++++++++++++++++ src/ConanServerManager/Styles/Default.xaml | 2 +- src/ConanServerManager/VersionFeed.xml | 7 +++--- src/ConanServerManager/VersionFeedBeta.xml | 25 ++++++++++++++++++- 10 files changed, 94 insertions(+), 14 deletions(-) create mode 100644 src/ARKServerManager/Lib/Model/FindSettingItem.cs diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj index 5bc77930..5ec713e2 100644 --- a/src/ARKServerManager/ARKServerManager.csproj +++ b/src/ARKServerManager/ARKServerManager.csproj @@ -193,6 +193,7 @@ + diff --git a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml index d5ecc5b2..d3e474ce 100644 --- a/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml +++ b/src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml @@ -713,6 +713,8 @@ Esta mensagem será exibida quando o status do servidor for alterado. Atualização de mods detectada: Esta mensagem será exibida quando o gerenciador do servidor detectar que um ou mais mods estão desatualizados. + Alteração na contagem de jogadores online: + Esta mensagem será exibida quando a contagem de jogadores online mudar. Força Respawn de Dinos: Esta mensagem será exibida quando o servidor estiver sendo iniciado e um wipe do dino selvagem estiver programado. @@ -5765,9 +5767,18 @@ Uma solicitação de iníciar para o servidor '{0}' foi enviada. Uma solicitação de parar o servidor '{0}' foi enviada. Uma solicitação de atualização para o servidor '{0}' foi enviada. + A solicitação para o servidor '{0}' foi concluída. Quantidade: Mapa: + + + Encontrar configurações + + A configuração não foi encontrada: {0} + + Buscar + \ No newline at end of file diff --git a/src/ARKServerManager/Lib/Model/FindSettingItem.cs b/src/ARKServerManager/Lib/Model/FindSettingItem.cs new file mode 100644 index 00000000..31a76c3c --- /dev/null +++ b/src/ARKServerManager/Lib/Model/FindSettingItem.cs @@ -0,0 +1,11 @@ +using System.Windows.Controls; +using System.Windows.Media; + +namespace ServerManagerTool.Lib.Model +{ + public class FindSettingItem + { + public Control FoundControl { get; set; } + public Brush BackgroundBrush { get; set; } + } +} diff --git a/src/ARKServerManager/Styles/Default.xaml b/src/ARKServerManager/Styles/Default.xaml index 27b5b82e..9e31c1a5 100644 --- a/src/ARKServerManager/Styles/Default.xaml +++ b/src/ARKServerManager/Styles/Default.xaml @@ -35,7 +35,8 @@ - + + diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs index 328f1f92..5b75fe8b 100644 --- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs +++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs @@ -8,6 +8,7 @@ using ServerManagerTool.Common.Serialization; using ServerManagerTool.Common.Utils; using ServerManagerTool.Enums; using ServerManagerTool.Lib; +using ServerManagerTool.Lib.Model; using ServerManagerTool.Lib.ViewModel; using ServerManagerTool.Plugin.Common; using ServerManagerTool.Utils; @@ -36,7 +37,7 @@ namespace ServerManagerTool private readonly GlobalizedApplication _globalizer = GlobalizedApplication.Instance; private CancellationTokenSource _upgradeCancellationSource = null; private FindSettingWindow _findSettingWindow = null; - private Control _lastFoundControl = null; + private FindSettingItem _lastFoundSetting = null; // Using a DependencyProperty as the backing store for ServerManager. This enables animation, styling, binding, etc... public static readonly DependencyProperty BaseDinoModListProperty = DependencyProperty.Register(nameof(BaseDinoModList), typeof(ComboBoxItemList), typeof(ServerSettingsControl), new PropertyMetadata(null)); @@ -4380,7 +4381,13 @@ namespace ServerManagerTool parent.IsExpanded = true; } - control.Background = Brushes.AliceBlue; + var item = new FindSettingItem() + { + FoundControl = control, + BackgroundBrush = control.Background, + }; + + control.Background = (Brush)FindResource("FoundSetting"); control.BringIntoView(); if (control is AnnotatedSlider) @@ -4408,7 +4415,7 @@ namespace ServerManagerTool focused = control.Focus(); } - _lastFoundControl = control; + _lastFoundSetting = item; }); return true; @@ -4416,11 +4423,11 @@ namespace ServerManagerTool public void UnselectControl() { - if (_lastFoundControl is null) + if (_lastFoundSetting is null) return; - _lastFoundControl.Background = null; - _lastFoundControl = null; + _lastFoundSetting.FoundControl.Background = _lastFoundSetting.BackgroundBrush; + _lastFoundSetting = null; } private async Task UpdateServer(bool establishLock, bool updateServer, bool updateMods, bool closeProgressWindow) diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 1cb3775d..64a36843 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -9,8 +9,8 @@ urn:uuid:FF41F7AB-66B0-4504-9F2C-2E1325DB50E2 - 1.1.434 (1.1.434.4) - 1.1.434.4 + 1.1.434 (1.1.434.5) + 1.1.434.5 2022-06-24T00:00:00Z @@ -25,6 +25,7 @@
  • Availability Status - Changed the Waiting for Publication status into two new statuses, to clarify the issue.
    • +
  • Main Window - changed the control coloring (now blue) that are NOT included in the profile sync.
  • Server Monitor - Added a Ports column that shows the main server ports.
  • Rules Section - Fjordur Settings - added checkbox to enable/disable settings.
  • Rules Section - Ragnarok Settings - added settings for Ragnarok, located at the bottom of the section.
    • diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index 9ddd3381..4c0f86d4 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -7,6 +7,30 @@ 2022-06-24T00:00:00Z + + urn:uuid:F3965FC7-685F-47DF-9E5B-3BA4D928127F + 1.1.434 (1.1.434.5) + 1.1.434.5 + + 2022-06-24T00:00:00Z + +
    +

    + CHANGE +
    +

      +
    • Main Window - changed the control coloring (now blue) that are NOT included in the profile sync.
      • +
    • pt-BR Translation file updated.
      • +
    +

    +
    +     + + bletch + bletch1971@hotmail.com + +     + urn:uuid:F3965FC7-685F-47DF-9E5B-3BA4D928127F 1.1.434 (1.1.434.4) diff --git a/src/ConanServerManager/Styles/Default.xaml b/src/ConanServerManager/Styles/Default.xaml index b8914ee6..a8211ea4 100644 --- a/src/ConanServerManager/Styles/Default.xaml +++ b/src/ConanServerManager/Styles/Default.xaml @@ -31,7 +31,7 @@ - + diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index d42adf6f..b343fb15 100644 --- a/src/ConanServerManager/VersionFeed.xml +++ b/src/ConanServerManager/VersionFeed.xml @@ -9,10 +9,10 @@ urn:uuid:CDD1853D-66EA-4649-AD24-E491D64C853E - 1.1.77 (1.1.77.2) - 1.1.77.2 + 1.1.77 (1.1.77.3) + 1.1.77.3 - 2022-06-22T00:00:00Z + 2022-06-24T00:00:00Z

    @@ -20,6 +20,7 @@

    • Availability Status - Changed the Waiting for Publication status into two new statuses, to clarify the issue.
      • +
    • Main Window - changed the control coloring (now blue) that are NOT included in the profile sync.
    • Server Monitor - Added a Ports column that shows the main server ports.
    • 3rd Party Libraries - updated all library to latest versions.
    diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index 8474803e..67cc76d0 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -5,7 +5,30 @@ Conan Server Manager Version Feed This is the Conan Server Manager beta version feed. - 2022-06-22T00:00:00Z + 2022-06-24T00:00:00Z + + + urn:uuid:CDD1853D-66EA-4649-AD24-E491D64C853E + 1.1.77 (1.1.77.3) + 1.1.77.3 + + 2022-06-24T00:00:00Z + +
    +

    + CHANGE +
    +

      +
    • Main Window - changed the control coloring (now blue) that are NOT included in the profile sync.
      • +
    +

    +
    +     + + bletch + bletch1971@hotmail.com + +     urn:uuid:CDD1853D-66EA-4649-AD24-E491D64C853E