tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-05-06 15:17:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Colouring Changes

Browse source 
- changed the control coloring (now blue) that are NOT included in the profile sync
pt-BR Translation file updated
This commit is contained in:
Brett Hewitson 2022-06-24 16:35:22 +10:00
parent b95cf633c4
commit e671abd640
10 changed files with 94 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ARKServerManager/ARKServerManager.csproj
View file

@ -193,6 +193,7 @@
<Compile Include="Interface\ISpawnIniValuesCollection.cs" />
<Compile Include="Lib\Events\ProfileEventArgs.cs" />
<Compile Include="Lib\Model\EngramAutoUnlock.cs" />
<Compile Include="Lib\Model\FindSettingItem.cs" />
<Compile Include="Lib\Model\PreventTransferOverride.cs" />
<Compile Include="Lib\Model\StackSizeOverride.cs" />
<Compile Include="Lib\Model\StatsMultiplierIntegerArray.cs" />

11
src/ARKServerManager/Globalization/pt-BR/pt-BR.xaml
View file

@ -713,6 +713,8 @@
<sys:String x:Key="GlobalSettings_Alerts_ServerStatusChangeTooltip">Esta mensagem será exibida quando o status do servidor for alterado.</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_ModUpdateDetectedLabel">Atualização de mods detectada:</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_ModUpdateDetectedTooltip">Esta mensagem será exibida quando o gerenciador do servidor detectar que um ou mais mods estão desatualizados.</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_OnlinePlayerCountChangeLabel">Alteração na contagem de jogadores online:</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_OnlinePlayerCountChangeTooltip">Esta mensagem será exibida quando a contagem de jogadores online mudar.</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_ForceRespawnDinosLabel">Força Respawn de Dinos:</sys:String>
<sys:String x:Key="GlobalSettings_Alerts_ForceRespawnDinosTooltip">Esta mensagem será exibida quando o servidor estiver sendo iniciado e um wipe do dino selvagem estiver programado.</sys:String>
@ -5765,9 +5767,18 @@
<sys:String x:Key="DiscordBot_StartRequested">Uma solicitação de iníciar para o servidor '{0}' foi enviada.</sys:String>
<sys:String x:Key="DiscordBot_StopRequested">Uma solicitação de parar o servidor '{0}' foi enviada.</sys:String>
<sys:String x:Key="DiscordBot_UpdateRequested">Uma solicitação de atualização para o servidor '{0}' foi enviada.</sys:String>
<sys:String x:Key="DiscordBot_CommandComplete">A solicitação para o servidor '{0}' foi concluída.</sys:String>
<sys:String x:Key="DiscordBot_CountLabel">Quantidade:</sys:String>
<sys:String x:Key="DiscordBot_MapLabel">Mapa:</sys:String>
<!--#endregion-->
<!--#region Find Setting Window -->
<sys:String x:Key="FindSettingWindow_Title">Encontrar configurações</sys:String>
<sys:String x:Key="FindSettingWindow_NotFoundErrorLabel">A configuração não foi encontrada: {0}</sys:String>
<sys:String x:Key="FindSettingWindow_FindButtonLabel">Buscar</sys:String>
<!--#endregion-->
</Globalization:GlobalizationResourceDictionary>

11
src/ARKServerManager/Lib/Model/FindSettingItem.cs Normal file
View file

@ -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; }
}
}

3
src/ARKServerManager/Styles/Default.xaml
View file

@ -35,7 +35,8 @@
<SolidColorBrush x:Key="WarningMessage" Color="Red"/>
<SolidColorBrush x:Key="TabItem.Selected.Background" Color="#FFFFFF"/>
<SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>
<SolidColorBrush x:Key="UnSyncedSetting" Color="OrangeRed"/>
<SolidColorBrush x:Key="UnSyncedSetting" Color="RoyalBlue"/>
<SolidColorBrush x:Key="FoundSetting" Color="AliceBlue"/>
<LinearGradientBrush x:Key="GradientBackground" EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#FFECE1D4" Offset="1"/>

19
src/ARKServerManager/UserControls/ServerSettingsControl.xaml.cs
View file

@ -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<bool> UpdateServer(bool establishLock, bool updateServer, bool updateMods, bool closeProgressWindow)

5
src/ARKServerManager/VersionFeed.xml
View file

@ -9,8 +9,8 @@
<entry>
<id>urn:uuid:FF41F7AB-66B0-4504-9F2C-2E1325DB50E2</id>
<title>1.1.434 (1.1.434.4)</title>
<summary>1.1.434.4</summary>
<title>1.1.434 (1.1.434.5)</title>
<summary>1.1.434.5</summary>
<link href="" />
<updated>2022-06-24T00:00:00Z</updated>
<content type="xhtml">
@ -25,6 +25,7 @@
<br/>
<ul>
<li>Availability Status - Changed the Waiting for Publication status into two new statuses, to clarify the issue.</li>
<li>Main Window - changed the control coloring (now blue) that are NOT included in the profile sync.</li>
<li>Server Monitor - Added a Ports column that shows the main server ports.</li>
<li>Rules Section - Fjordur Settings - added checkbox to enable/disable settings.</li>
<li>Rules Section - Ragnarok Settings - added settings for Ragnarok, located at the bottom of the section.</li>

24
src/ARKServerManager/VersionFeedBeta.xml
View file

@ -7,6 +7,30 @@
<link href="http://arkservermanager.freeforums.net/" />
<updated>2022-06-24T00:00:00Z</updated>
<entry>
<id>urn:uuid:F3965FC7-685F-47DF-9E5B-3BA4D928127F</id>
<title>1.1.434 (1.1.434.5)</title>
<summary>1.1.434.5</summary>
<link href="" />
<updated>2022-06-24T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>Main Window - changed the control coloring (now blue) that are NOT included in the profile sync.</li>
<li>pt-BR Translation file updated.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:F3965FC7-685F-47DF-9E5B-3BA4D928127F</id>
<title>1.1.434 (1.1.434.4)</title>

2
src/ConanServerManager/Styles/Default.xaml
View file

@ -31,7 +31,7 @@
<SolidColorBrush x:Key="DarkBorder" Color="#FF10274F"/>
<SolidColorBrush x:Key="HeaderBrush" Color="#FFF0F0F0"/>
<SolidColorBrush x:Key="SolidBackground" Color="White" />
<SolidColorBrush x:Key="UnSyncedSetting" Color="OrangeRed"/>
<SolidColorBrush x:Key="UnSyncedSetting" Color="RoyalBlue"/>
<SolidColorBrush x:Key="TabItem.Selected.Background" Color="#FFFFFF"/>
<SolidColorBrush x:Key="TabItem.Selected.Border" Color="#ACACAC"/>

7
src/ConanServerManager/VersionFeed.xml
View file

@ -9,10 +9,10 @@
<entry>
<id>urn:uuid:CDD1853D-66EA-4649-AD24-E491D64C853E</id>
<title>1.1.77 (1.1.77.2)</title>
<summary>1.1.77.2</summary>
<title>1.1.77 (1.1.77.3)</title>
<summary>1.1.77.3</summary>
<link href="" />
<updated>2022-06-22T00:00:00Z</updated>
<updated>2022-06-24T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
@ -20,6 +20,7 @@
<br/>
<ul>
<li>Availability Status - Changed the Waiting for Publication status into two new statuses, to clarify the issue.</li>
<li>Main Window - changed the control coloring (now blue) that are NOT included in the profile sync.</li>
<li>Server Monitor - Added a Ports column that shows the main server ports.</li>
<li>3rd Party Libraries - updated all library to latest versions.</li>
</ul>

25
src/ConanServerManager/VersionFeedBeta.xml
View file

@ -5,7 +5,30 @@
<title>Conan Server Manager Version Feed</title>
<subtitle>This is the Conan Server Manager beta version feed.</subtitle>
<link href="http://servermanagers.freeforums.net/" />
<updated>2022-06-22T00:00:00Z</updated>
<updated>2022-06-24T00:00:00Z</updated>
<entry>
<id>urn:uuid:CDD1853D-66EA-4649-AD24-E491D64C853E</id>
<title>1.1.77 (1.1.77.3)</title>
<summary>1.1.77.3</summary>
<link href="" />
<updated>2022-06-24T00:00:00Z</updated>
<content type="xhtml">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
<p>
<u style="font-size: .9em;">CHANGE</u>
<br/>
<ul>
<li>Main Window - changed the control coloring (now blue) that are NOT included in the profile sync.</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:CDD1853D-66EA-4649-AD24-E491D64C853E</id>