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

Version Bump

Browse source
This commit is contained in:
Brett Hewitson 2021-06-20 18:09:42 +10:00
parent 278e8391e6
commit 5dd4abca30
19 changed files with 166 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/ARKServerManager/ARKServerManager.csproj
View file

@ -97,6 +97,15 @@
<ManifestTimestampUrl>
</ManifestTimestampUrl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug - Beta|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\Debug - Beta\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetZip, Version=1.13.8.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
<HintPath>..\packages\DotNetZip.1.13.8\lib\net40\DotNetZip.dll</HintPath>
@ -230,6 +239,9 @@
<Compile Include="Windows\ServerMonitorWindow.xaml.cs">
<DependentUpon>ServerMonitorWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Windows\SupplyCrateOverridesWindow.xaml.cs">
<DependentUpon>SupplyCrateOverridesWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Windows\VersionFeedWindow.xaml.cs">
<DependentUpon>VersionFeedWindow.xaml</DependentUpon>
</Compile>
@ -405,6 +417,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Windows\SupplyCrateOverridesWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Windows\VersionFeedWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>

2
src/ARKServerManager/Windows/MainWindow.xaml.cs
View file

@ -129,7 +129,7 @@ namespace ServerManagerTool
public MainWindow()
{
BetaVersion = App.Instance.BetaVersion;
this.BetaVersion = App.Instance.BetaVersion;
this.CurrentConfig = Config.Default;
InitializeComponent();

3
src/ARKServerManager/Windows/ServerSettingsControl.xaml
View file

@ -5363,6 +5363,9 @@
Command="{Binding ResetActionCommand, ElementName=SettingsControl}" CommandParameter="{x:Static local:ServerSettingsResetAction.SupplyCrateOverridesSection}">
<Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Refresh.ico,Size=32}"/>
</Button>
<Button Width="22" Height="22" Click="OpenSupplyCrateOverridesWindow_Click" Margin="5,0,0,0" Style="{StaticResource ButtonStyle1}" Visibility="{Binding ElementName=SettingsControl, Path=BetaVersion, Converter={StaticResource BooleanToVisibilityConverter}}">
<Image Source="{com:Icon Path=/Ark Server Manager;component/Art/Edit.ico,Size=32}"/>
</Button>
</StackPanel>
</Expander.Header>

18
src/ARKServerManager/Windows/ServerSettingsControl.xaml.cs
View file

@ -97,6 +97,7 @@ namespace ServerManagerTool
public static readonly DependencyProperty BaseTotalConversionsProperty = DependencyProperty.Register(nameof(BaseTotalConversions), typeof(ComboBoxItemList), typeof(ServerSettingsControl), new PropertyMetadata(null));
public static readonly DependencyProperty BaseBranchesProperty = DependencyProperty.Register(nameof(BaseBranches), typeof(ComboBoxItemList), typeof(ServerSettingsControl), new PropertyMetadata(null));
public static readonly DependencyProperty BaseEventsProperty = DependencyProperty.Register(nameof(BaseEvents), typeof(ComboBoxItemList), typeof(ServerSettingsControl), new PropertyMetadata(null));
public static readonly DependencyProperty BetaVersionProperty = DependencyProperty.Register(nameof(BetaVersion), typeof(bool), typeof(ServerSettingsControl), new PropertyMetadata(false));
public static readonly DependencyProperty CurrentConfigProperty = DependencyProperty.Register(nameof(CurrentConfig), typeof(Config), typeof(ServerSettingsControl));
public static readonly DependencyProperty IsAdministratorProperty = DependencyProperty.Register(nameof(IsAdministrator), typeof(bool), typeof(ServerSettingsControl), new PropertyMetadata(false));
public static readonly DependencyProperty NetworkInterfacesProperty = DependencyProperty.Register(nameof(NetworkInterfaces), typeof(List<NetworkAdapterEntry>), typeof(ServerSettingsControl), new PropertyMetadata(new List<NetworkAdapterEntry>()));
@ -192,6 +193,12 @@ namespace ServerManagerTool
set { SetValue(BaseEventsProperty, value); }
}
public bool BetaVersion
{
get { return (bool)GetValue(BetaVersionProperty); }
set { SetValue(BetaVersionProperty, value); }
}
public Config CurrentConfig
{
get { return GetValue(CurrentConfigProperty) as Config; }
@ -357,6 +364,7 @@ namespace ServerManagerTool
public ServerSettingsControl()
{
this.BetaVersion = App.Instance.BetaVersion;
this.CurrentConfig = Config.Default;
this.CurrentCulture = Thread.CurrentThread.CurrentCulture;
@ -4300,5 +4308,15 @@ namespace ServerManagerTool
this.ProfileLastStarted = $"{_globalizer.GetResourceString("ServerSettings_LastStartedLabel")} {date}";
}
#endregion
private void OpenSupplyCrateOverridesWindow_Click(object sender, RoutedEventArgs e)
{
var window = new SupplyCrateOverridesWindow(this.Server.Profile);
window.Owner = Window.GetWindow(this);
window.Closed += Window_Closed;
//window.SavePerformed += SupplyCrateOverridesWindow_SavePerformed;
window.Show();
window.Focus();
}
}
}

29
src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml Normal file
View file

@ -0,0 +1,29 @@
<Window x:Class="ServerManagerTool.SupplyCrateOverridesWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cc="clr-namespace:ServerManagerTool.Common.Converters;assembly=ServerManager.Common"
xmlns:com="clr-namespace:ServerManagerTool.Common;assembly=ServerManager.Common"
Loaded="Window_Loaded" Closing="Window_Closing"
MinWidth="600" MinHeight="480" Width="900" Height="480" ResizeMode="CanResize" WindowStyle="ToolWindow" WindowStartupLocation="CenterOwner" ShowInTaskbar="False"
Name="SupplyCrateUI" Icon="../Art/favicon.ico" Title="SupplyCrateOverridesWindow" >
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="..\Globalization\en-US\en-US.xaml"/>
<ResourceDictionary Source="..\Styles\Default.xaml"/>
</ResourceDictionary.MergedDictionaries>
<cc:InvertBooleanConverter x:Key="InvertBooleanConverter"/>
<cc:IsNullOrWhiteSpaceValueConverter x:Key="IsNullOrWhiteSpaceValueConverter"/>
<LinearGradientBrush x:Key="BeigeGradient" EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#FFECE1D4" Offset="1"/>
<GradientStop Color="#FFEAE8E6"/>
</LinearGradientBrush>
</ResourceDictionary>
</Window.Resources>
<Grid Background="{StaticResource BeigeGradient}">
</Grid>
</Window>

49
src/ARKServerManager/Windows/SupplyCrateOverridesWindow.xaml.cs Normal file
View file

@ -0,0 +1,49 @@
using NLog;
using ServerManagerTool.Common.Utils;
using ServerManagerTool.Lib;
using System;
using System.ComponentModel;
using System.Windows;
using WPFSharp.Globalizer;
namespace ServerManagerTool
{
/// <summary>
/// Interaction logic for SupplyCrateOverridesWindow.xaml
/// </summary>
public partial class SupplyCrateOverridesWindow : Window
{
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
public EventHandler<ProfileEventArgs> SavePerformed;
private readonly GlobalizedApplication _globalizer = GlobalizedApplication.Instance;
private readonly ServerProfile _profile = null;
public SupplyCrateOverridesWindow(ServerProfile profile)
{
InitializeComponent();
WindowUtils.RemoveDefaultResourceDictionary(this, Config.Default.DefaultGlobalizationFile);
_profile = profile;
this.Title = $"{this.Title} - {_profile?.ProfileName}"; // string.Format(_globalizer.GetResourceString("SupplyCrateOverridesWindow_ProfileTitle"), _profile?.ProfileName);
this.DataContext = this;
}
private async void Window_Loaded(object sender, RoutedEventArgs e)
{
}
private void Window_Closing(object sender, CancelEventArgs e)
{
}
protected void OnSavePerformed()
{
SavePerformed?.Invoke(this, new ProfileEventArgs(_profile));
}
}
}