From 9204b7fb3c68774f02beaf863389d9edd6c408ea Mon Sep 17 00:00:00 2001 From: Tichau Date: Tue, 20 Dec 2016 21:00:33 +0100 Subject: [PATCH 01/17] Fixed an issue where scale was corrupted when switching application language (github issue #5) --- Application/FileConverter/Settings.Migration.cs | 16 ++++++++++++++++ Application/FileConverter/Settings.Settings.cs | 2 +- Application/FileConverter/Settings.default.xml | 6 +++--- .../ValueConverters/Generic/StringToValueType.cs | 6 +++--- .../FileConverter/Windows/SettingsWindow.xaml | 16 ++++++++-------- 5 files changed, 31 insertions(+), 15 deletions(-) diff --git a/Application/FileConverter/Settings.Migration.cs b/Application/FileConverter/Settings.Migration.cs index da293e8..0bfb3e6 100644 --- a/Application/FileConverter/Settings.Migration.cs +++ b/Application/FileConverter/Settings.Migration.cs @@ -54,6 +54,22 @@ namespace FileConverter } } } + + if (settingsVersion <= 3) + { + // Try to fix corrupted settings (GitHub issue #5). + string scale = preset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale); + if (scale != null) + { + preset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.ImageScale, scale.Replace(',', '.')); + } + + scale = preset.GetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale); + if (scale != null) + { + preset.SetSettingsValue(ConversionPreset.ConversionSettingKeys.VideoScale, scale.Replace(',', '.')); + } + } } } } \ No newline at end of file diff --git a/Application/FileConverter/Settings.Settings.cs b/Application/FileConverter/Settings.Settings.cs index 022700d..74760f0 100644 --- a/Application/FileConverter/Settings.Settings.cs +++ b/Application/FileConverter/Settings.Settings.cs @@ -9,7 +9,7 @@ namespace FileConverter public partial class Settings : IXmlSerializable { - public const int Version = 3; + public const int Version = 4; private bool exitApplicationWhenConversionsFinished = true; private float durationBetweenEndOfConversionsAndApplicationExit = 3f; diff --git a/Application/FileConverter/Settings.default.xml b/Application/FileConverter/Settings.default.xml index 0f3e212..5c104e6 100644 --- a/Application/FileConverter/Settings.default.xml +++ b/Application/FileConverter/Settings.default.xml @@ -1,5 +1,5 @@ - + true 3 2 @@ -243,7 +243,7 @@ gif webp None - + (p)(f) @@ -504,7 +504,7 @@ xcf webp None - + diff --git a/Application/FileConverter/ValueConverters/Generic/StringToValueType.cs b/Application/FileConverter/ValueConverters/Generic/StringToValueType.cs index 2a19e63..650a959 100644 --- a/Application/FileConverter/ValueConverters/Generic/StringToValueType.cs +++ b/Application/FileConverter/ValueConverters/Generic/StringToValueType.cs @@ -27,7 +27,7 @@ namespace FileConverter.ValueConverters.Generic throw new Exception("Invalid enum type " + typeName + "."); } - return System.Convert.ChangeType(value, type); + return System.Convert.ChangeType(value, type, culture); } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) @@ -36,8 +36,8 @@ namespace FileConverter.ValueConverters.Generic { return null; } - - return value.ToString(); + + return System.Convert.ChangeType(value, typeof(string), culture); } } } diff --git a/Application/FileConverter/Windows/SettingsWindow.xaml b/Application/FileConverter/Windows/SettingsWindow.xaml index 63f3e6e..36ce718 100644 --- a/Application/FileConverter/Windows/SettingsWindow.xaml +++ b/Application/FileConverter/Windows/SettingsWindow.xaml @@ -6,7 +6,7 @@ xmlns:generic="clr-namespace:FileConverter.ValueConverters.Generic" xmlns:windows="clr-namespace:FileConverter.Windows" xmlns:project="clr-namespace:FileConverter.Properties" - xmlns:System="clr-namespace:System;assembly=mscorlib" + xmlns:globalization="clr-namespace:System.Globalization;assembly=mscorlib" x:Name="window" x:Class="FileConverter.SettingsWindow" MinWidth="640" MinHeight="480" Width="900" Height="675" @@ -288,7 +288,7 @@ - +