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

Added new server transfer options

Browse source
This commit is contained in:
Brett Hewitson 2021-08-22 11:18:01 +10:00
parent 7bf0db289c
commit 02cd45c80d
5 changed files with 53 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ConanServerManager/Globalization/en-US/en-US.xaml
View file

@ -1043,6 +1043,10 @@
<sys:String x:Key="ServerSettings_KickIdlePlayersPeriodTooltip">Set the amount of AFK time before a character is kicked.</sys:String>
<sys:String x:Key="ServerSettings_ServerRegionLabel">Server Region:</sys:String>
<sys:String x:Key="ServerSettings_ServerRegionTooltip">Selecting a server region will affect how your server is filtered in the list. Select your region to help players find a server that is close to them.</sys:String>
<sys:String x:Key="ServerSettings_ServerTransferEnabledLabel">Enable Server Transfers</sys:String>
<sys:String x:Key="ServerSettings_ServerTransferEnabledTooltip">If enabled, will enable character server transfers.</sys:String>
<sys:String x:Key="ServerSettings_CanImportDirectlyFromSameServerLabel">Can Import Directly from Same Server</sys:String>
<sys:String x:Key="ServerSettings_CanImportDirectlyFromSameServerTooltip">If enabled, will allow players to directly import characters that were exported from exactly the same server.</sys:String>
<sys:String x:Key="ServerSettings_BranchLabel">Branch Details</sys:String>
<sys:String x:Key="ServerSettings_BranchNameLabel">Branch Name:</sys:String>

16
src/ConanServerManager/Lib/ServerProfile.cs
View file

@ -380,6 +380,22 @@ namespace ServerManagerTool.Lib
set { SetValue(KickIdlePlayersPeriodProperty, value); }
}
public static readonly DependencyProperty ServerTransferEnabledProperty = DependencyProperty.Register(nameof(ServerTransferEnabled), typeof(bool), typeof(ServerProfile), new PropertyMetadata(true));
[IniFileEntry(IniFiles.ServerSettings, IniSections.ServerSettings_ServerSettings, ServerProfileCategory.Administration)]
public bool ServerTransferEnabled
{
get { return (bool)GetValue(ServerTransferEnabledProperty); }
set { SetValue(ServerTransferEnabledProperty, value); }
}
public static readonly DependencyProperty CanImportDirectlyFromSameServerProperty = DependencyProperty.Register(nameof(CanImportDirectlyFromSameServer), typeof(bool), typeof(ServerProfile), new PropertyMetadata(false));
[IniFileEntry(IniFiles.ServerSettings, IniSections.ServerSettings_ServerSettings, ServerProfileCategory.Administration)]
public bool CanImportDirectlyFromSameServer
{
get { return (bool)GetValue(CanImportDirectlyFromSameServerProperty); }
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

25
src/ConanServerManager/VersionFeed.xml
View file

@ -5,7 +5,30 @@
<title>Conan Server Manager Version Feed</title>
<subtitle>This is the Conan Server Manager release version feed.</subtitle>
<link href="http://servermanagers.freeforums.net/" />
<updated>2020-11-25T00:00:00Z</updated>
<updated>2021-08-22T00:00:00Z</updated>
<entry>
<id>urn:uuid:2B49A030-A742-476B-B811-6F0D7780B117</id>
<title>1.1.51 (1.1.51.1)</title>
<summary>1.1.51.1</summary>
<link href="" />
<updated>2021-08-22T00: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;">NEW</u>
<br/>
<ul>
<li>Server Settings - Added new server transfer options (server whitelist option in future version).</li>
</ul>
</p>
</div>
</content>
<author>
<name>bletch</name>
<email>bletch1971@hotmail.com</email>
</author>
</entry>
<entry>
<id>urn:uuid:6914861A-2D4E-4F08-89A3-D3D7A77F74C1</id>

12
src/ConanServerManager/VersionFeedBeta.xml
View file

@ -5,21 +5,21 @@
<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>2020-11-25T00:00:00Z</updated>
<updated>2021-08-22T00:00:00Z</updated>
<entry>
<id>urn:uuid:6914861A-2D4E-4F08-89A3-D3D7A77F74C1</id>
<title>1.1.50 (1.1.50.1)</title>
<summary>1.1.50.1</summary>
<id>urn:uuid:2B49A030-A742-476B-B811-6F0D7780B117</id>
<title>1.1.51 (1.1.51.1)</title>
<summary>1.1.51.1</summary>
<link href="" />
<updated>2020-11-25T00:00:00Z</updated>
<updated>2021-08-22T00: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;">NEW</u>
<br/>
<ul>
<li>Global Settings - Added option to automatically manage the Public IP, default to True. If disabled, then the Public IP must be updated manually.</li>
<li>Server Settings - Added new server transfer options (server whitelist option in future version).</li>
</ul>
</p>
</div>

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

@ -1156,6 +1156,9 @@
<cctl:AnnotatedSlider Grid.Row="3" Grid.Column="1" Margin="1" VerticalAlignment="Center" Minimum="0" Maximum="100" LargeChange="10" SmallChange="5" TickFrequency="10" LabelRelativeWidth="Auto" SuffixRelativeWidth="Auto" Value="{Binding KickIdlePlayersPercentage, Converter={cc:IntRangeValueConverter 0, 100}}" ToolTip="{DynamicResource ServerSettings_KickIdlePlayersPercentageTooltip}"/>
<Label Grid.Row="3" Grid.Column="2" Content="{DynamicResource ServerSettings_KickIdlePlayersPeriodLabel}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_KickIdlePlayersPeriodTooltip}"/>
<cctl:AnnotatedSlider Grid.Row="3" Grid.Column="3" Margin="1" VerticalAlignment="Center" Minimum="1" Maximum="1440" LargeChange="100" SmallChange="10" TickFrequency="100" LabelRelativeWidth="Auto" SuffixRelativeWidth="Auto" Value="{Binding KickIdlePlayersPeriod, Converter={StaticResource SecondsToMinutesConverter}}" Suffix="{DynamicResource SliderUnits_Minutes}" ToolTip="{DynamicResource ServerSettings_KickIdlePlayersPeriodTooltip}"/>
<CheckBox Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" Margin="5,5,5,0" Content="{DynamicResource ServerSettings_ServerTransferEnabledLabel}" IsChecked="{Binding ServerTransferEnabled}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_ServerTransferEnabledTooltip}" HorizontalAlignment="Left"/>
<CheckBox Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="2" Margin="5,5,5,0" Content="{DynamicResource ServerSettings_CanImportDirectlyFromSameServerLabel}" IsChecked="{Binding CanImportDirectlyFromSameServer}" VerticalAlignment="Center" ToolTip="{DynamicResource ServerSettings_CanImportDirectlyFromSameServerTooltip}" HorizontalAlignment="Left"/>
</Grid>
</GroupBox>