diff --git a/src/ARKServerManager/Lib/ServerProfile.cs b/src/ARKServerManager/Lib/ServerProfile.cs index ead64e39..6fd637a4 100644 --- a/src/ARKServerManager/Lib/ServerProfile.cs +++ b/src/ARKServerManager/Lib/ServerProfile.cs @@ -6040,19 +6040,23 @@ namespace ServerManagerTool.Lib private void SyncAutomaticManagement(ServerProfile sourceProfile) { - this.SetValue(EnableAutoBackupProperty, sourceProfile.EnableAutoBackup); this.SetValue(EnableAutoStartProperty, sourceProfile.EnableAutoStart); - this.SetValue(EnableAutoUpdateProperty, sourceProfile.EnableAutoUpdate); + this.SetValue(AutoStartOnLoginProperty, sourceProfile.AutoStartOnLogin); + this.SetValue(EnableAutoShutdown1Property, sourceProfile.EnableAutoShutdown1); this.SetValue(AutoShutdownTime1Property, sourceProfile.AutoShutdownTime1); this.SetValue(ShutdownDaysOfTheWeek1Property, sourceProfile.ShutdownDaysOfTheWeek1); this.SetValue(RestartAfterShutdown1Property, sourceProfile.RestartAfterShutdown1); this.SetValue(UpdateAfterShutdown1Property, sourceProfile.UpdateAfterShutdown1); + this.SetValue(EnableAutoShutdown2Property, sourceProfile.EnableAutoShutdown2); this.SetValue(AutoShutdownTime2Property, sourceProfile.AutoShutdownTime2); this.SetValue(ShutdownDaysOfTheWeek2Property, sourceProfile.ShutdownDaysOfTheWeek2); this.SetValue(RestartAfterShutdown2Property, sourceProfile.RestartAfterShutdown2); this.SetValue(UpdateAfterShutdown2Property, sourceProfile.UpdateAfterShutdown2); + + this.SetValue(EnableAutoBackupProperty, sourceProfile.EnableAutoBackup); + this.SetValue(EnableAutoUpdateProperty, sourceProfile.EnableAutoUpdate); this.SetValue(AutoRestartIfShutdownProperty, sourceProfile.AutoRestartIfShutdown); } diff --git a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml index b677c851..d73f16b8 100644 --- a/src/ARKServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ARKServerManager/UserControls/ServerSettingsControl.xaml @@ -1402,8 +1402,8 @@ - - + + diff --git a/src/ARKServerManager/VersionFeed.xml b/src/ARKServerManager/VersionFeed.xml index 899a33d7..f61a5af5 100644 --- a/src/ARKServerManager/VersionFeed.xml +++ b/src/ARKServerManager/VersionFeed.xml @@ -5,14 +5,14 @@ Ark Server Manager Version Feed This is the Ark Server Manager release version feed. - 2022-08-08T00:00:00Z + 2022-08-15T00:00:00Z urn:uuid:84E1DDF9-EFA4-4A8B-90DE-564AE3B3B633 - 1.1.437 (1.1.437.6) - 1.1.437.6 + 1.1.437 (1.1.437.7) + 1.1.437.7 - 2022-08-09T00:00:00Z + 2022-08-15T00:00:00Z

diff --git a/src/ARKServerManager/VersionFeedBeta.xml b/src/ARKServerManager/VersionFeedBeta.xml index 5045130f..041fb27b 100644 --- a/src/ARKServerManager/VersionFeedBeta.xml +++ b/src/ARKServerManager/VersionFeedBeta.xml @@ -5,7 +5,30 @@ Ark Server Manager Version Feed This is the Ark Server Manager beta version feed. - 2022-08-09T00:00:00Z + 2022-08-15T00:00:00Z + + + urn:uuid:84E1DDF9-EFA4-4A8B-90DE-564AE3B3B633 + 1.1.437 (1.1.437.7) +

1.1.437.7 + + 2022-08-15T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Automatic Management Section - fixed on Login selection of the Auto-Start option.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:84E1DDF9-EFA4-4A8B-90DE-564AE3B3B633 diff --git a/src/ConanServerManager/Lib/ServerProfile.cs b/src/ConanServerManager/Lib/ServerProfile.cs index b8bd7cfd..50281430 100644 --- a/src/ConanServerManager/Lib/ServerProfile.cs +++ b/src/ConanServerManager/Lib/ServerProfile.cs @@ -1667,19 +1667,23 @@ namespace ServerManagerTool.Lib private void SyncAutomaticManagement(ServerProfile sourceProfile) { - this.SetValue(EnableAutoBackupProperty, sourceProfile.EnableAutoBackup); this.SetValue(EnableAutoStartProperty, sourceProfile.EnableAutoStart); - this.SetValue(EnableAutoUpdateProperty, sourceProfile.EnableAutoUpdate); + this.SetValue(AutoStartOnLoginProperty, sourceProfile.AutoStartOnLogin); + this.SetValue(EnableAutoShutdown1Property, sourceProfile.EnableAutoShutdown1); this.SetValue(AutoShutdownTime1Property, sourceProfile.AutoShutdownTime1); this.SetValue(ShutdownDaysOfTheWeek1Property, sourceProfile.ShutdownDaysOfTheWeek1); this.SetValue(RestartAfterShutdown1Property, sourceProfile.RestartAfterShutdown1); this.SetValue(UpdateAfterShutdown1Property, sourceProfile.UpdateAfterShutdown1); + this.SetValue(EnableAutoShutdown2Property, sourceProfile.EnableAutoShutdown2); this.SetValue(AutoShutdownTime2Property, sourceProfile.AutoShutdownTime2); this.SetValue(ShutdownDaysOfTheWeek2Property, sourceProfile.ShutdownDaysOfTheWeek2); this.SetValue(RestartAfterShutdown2Property, sourceProfile.RestartAfterShutdown2); this.SetValue(UpdateAfterShutdown2Property, sourceProfile.UpdateAfterShutdown2); + + this.SetValue(EnableAutoBackupProperty, sourceProfile.EnableAutoBackup); + this.SetValue(EnableAutoUpdateProperty, sourceProfile.EnableAutoUpdate); this.SetValue(AutoRestartIfShutdownProperty, sourceProfile.AutoRestartIfShutdown); } diff --git a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml index e2a963fc..126f904c 100644 --- a/src/ConanServerManager/UserControls/ServerSettingsControl.xaml +++ b/src/ConanServerManager/UserControls/ServerSettingsControl.xaml @@ -983,8 +983,8 @@ - - + + diff --git a/src/ConanServerManager/VersionFeed.xml b/src/ConanServerManager/VersionFeed.xml index 4a3dd3ad..979489cd 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-08-08T00:00:00Z + 2022-08-15T00:00:00Z + + + urn:uuid:BFC591B5-6DF6-48FF-9107-E5B9C41EC1C1 + 1.1.81 (1.1.81.1) + 1.1.81.1 + + 2022-08-15T00:00:00Z + +
+

+ BUGFIX +
+

    +
  • Automatic Management Section - fixed on Login selection of the Auto-Start option.
    • +
+

+
+ + + bletch + bletch1971@hotmail.com + + urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C diff --git a/src/ConanServerManager/VersionFeedBeta.xml b/src/ConanServerManager/VersionFeedBeta.xml index d74220d2..c31de57c 100644 --- a/src/ConanServerManager/VersionFeedBeta.xml +++ b/src/ConanServerManager/VersionFeedBeta.xml @@ -5,137 +5,21 @@ Conan Server Manager Version Feed This is the Conan Server Manager beta version feed. - 2022-08-08T00:00:00Z + 2022-08-15T00:00:00Z - urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C - 1.1.80 (1.1.80.6) - 1.1.80.6 + urn:uuid:BFC591B5-6DF6-48FF-9107-E5B9C41EC1C1 + 1.1.81 (1.1.81.1) + 1.1.81.1 - 2022-08-08T00:00:00Z + 2022-08-15T00:00:00Z

BUGFIX

    -
  • Automatic Management - fixed a bug with the shutdown server day selection. Both Shutdown 1 and Shutdown 2 days would affect each other, now they are independant.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C - 1.1.80 (1.1.80.5) - 1.1.80.5 - - 2022-08-08T00:00:00Z - -
-

- CHANGE -
-

    -
  • Support Zip - added missing settings.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C - 1.1.80 (1.1.80.4) - 1.1.80.4 - - 2022-08-08T00:00:00Z - -
-

- CHANGE -
-

    -
  • Automatic Management - rearranged the options so they are grouped correctly.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C - 1.1.80 (1.1.80.3) - 1.1.80.3 - - 2022-08-07T00:00:00Z - -
-

- CHANGE -
-

    -
  • Auto-Start Server Option - added a new option selection for on Boot and on Login.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C - 1.1.80 (1.1.80.2) - 1.1.80.2 - - 2022-08-07T00:00:00Z - -
-

- CHANGE -
-

    -
  • Settings Coloring - Set the coloring of the settings window to Blue when Testlive option selected.
    • -
-

-
- - - bletch - bletch1971@hotmail.com - - - - - urn:uuid:6D1F49A0-06E6-415F-AA92-AACD598BC50C - 1.1.80 (1.1.80.1) - 1.1.80.1 - - 2022-08-07T00:00:00Z - -
-

- CHANGE -
-

    -
  • Server Details Section - added new option to use the Conan Testlive Dedicated Server files. This new option will switch the steam application id of the server files to use the Conan Testlive Dedicated Server files, instead of the Conan Dedicated Server files.
    • -
  • Server Update - updated the code to determine which set of dedicated server files (Conan or Conan Testlive) is required when performing server and mod file updates. Separate Cache folders will be maintained for each.
    • +
  • Automatic Management Section - fixed on Login selection of the Auto-Start option.

diff --git a/src/ServerManager.Common/Converters/BooleanEqualsConverter.cs b/src/ServerManager.Common/Converters/BooleanEqualsConverter.cs new file mode 100644 index 00000000..b3b66202 --- /dev/null +++ b/src/ServerManager.Common/Converters/BooleanEqualsConverter.cs @@ -0,0 +1,29 @@ +using System; +using System.Globalization; +using System.Windows.Data; +using System.Windows.Markup; + +namespace ServerManagerTool.Common.Converters +{ + public class BooleanEqualsConverter : MarkupExtension, IValueConverter + { + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + var convertedValue = System.Convert.ToBoolean(value); + var parameterValue = System.Convert.ToBoolean(parameter); + return convertedValue.Equals(parameterValue); + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + var convertedValue = System.Convert.ToBoolean(value); + var parameterValue = System.Convert.ToBoolean(parameter); + return convertedValue ? parameterValue : Binding.DoNothing; + } + + public override object ProvideValue(IServiceProvider serviceProvider) + { + return this; + } + } +}