diff --git a/Filtration/App.config b/Filtration/App.config index 6ab6fc5..c1ab924 100644 --- a/Filtration/App.config +++ b/Filtration/App.config @@ -4,11 +4,8 @@
- -
- - + @@ -19,18 +16,6 @@ True - - 0 - - - False - - - 0 - - - 2016-01-01 - False @@ -79,17 +64,4 @@ - - - - http://ben-wallis.github.io/Filtration/ItemBaseTypes.txt - - - http://ben-wallis.github.io/Filtration/ItemClasses.txt - - - http://ben-wallis.github.io/Filtration/filtration_version.xml - - - diff --git a/Filtration/Properties/AssemblyInfo.cs b/Filtration/Properties/AssemblyInfo.cs index 00fd569..cde6da8 100644 --- a/Filtration/Properties/AssemblyInfo.cs +++ b/Filtration/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ using System.Runtime.CompilerServices; [assembly: AssemblyCulture("")] [assembly: AssemblyVersion("1.1.0")] -[assembly: AssemblyInformationalVersion("1.1.0-beta5")] +[assembly: AssemblyInformationalVersion("1.1.0-beta6")] [assembly: InternalsVisibleTo("Filtration.Tests")] [assembly: InternalsVisibleTo("Filtration.ItemFilterPreview.Tests")] diff --git a/Filtration/Properties/Settings.Designer.cs b/Filtration/Properties/Settings.Designer.cs index d6e7a4d..6f2df82 100644 --- a/Filtration/Properties/Settings.Designer.cs +++ b/Filtration/Properties/Settings.Designer.cs @@ -47,81 +47,6 @@ namespace Filtration.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0")] - public int SuppressUpdatesUpToVersionMajorPart { - get { - return ((int)(this["SuppressUpdatesUpToVersionMajorPart"])); - } - set { - this["SuppressUpdatesUpToVersionMajorPart"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool SuppressUpdates { - get { - return ((bool)(this["SuppressUpdates"])); - } - set { - this["SuppressUpdates"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0")] - public int SuppressUpdatesUpToVersionMinorPart { - get { - return ((int)(this["SuppressUpdatesUpToVersionMinorPart"])); - } - set { - this["SuppressUpdatesUpToVersionMinorPart"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("2016-01-01")] - public global::System.DateTime StaticDataLastUpdated { - get { - return ((global::System.DateTime)(this["StaticDataLastUpdated"])); - } - set { - this["StaticDataLastUpdated"] = value; - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://ben-wallis.github.io/Filtration/ItemBaseTypes.txt")] - public string ItemBaseTypesStaticDataUrl { - get { - return ((string)(this["ItemBaseTypesStaticDataUrl"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://ben-wallis.github.io/Filtration/ItemClasses.txt")] - public string ItemClassesStaticDataUrl { - get { - return ((string)(this["ItemClassesStaticDataUrl"])); - } - } - - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://ben-wallis.github.io/Filtration/filtration_version.xml")] - public string UpdateDataUrl { - get { - return ((string)(this["UpdateDataUrl"])); - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] diff --git a/Filtration/Properties/Settings.settings b/Filtration/Properties/Settings.settings index 551f84b..9766541 100644 --- a/Filtration/Properties/Settings.settings +++ b/Filtration/Properties/Settings.settings @@ -8,27 +8,6 @@ True - - 0 - - - False - - - 0 - - - 2016-01-01 - - - http://ben-wallis.github.io/Filtration/ItemBaseTypes.txt - - - http://ben-wallis.github.io/Filtration/ItemClasses.txt - - - http://ben-wallis.github.io/Filtration/filtration_version.xml - False diff --git a/Filtration/Services/ItemFilterPersistenceService.cs b/Filtration/Services/ItemFilterPersistenceService.cs index 5bb22fe..cc9cc29 100644 --- a/Filtration/Services/ItemFilterPersistenceService.cs +++ b/Filtration/Services/ItemFilterPersistenceService.cs @@ -25,6 +25,8 @@ namespace Filtration.Services { _fileSystemService = fileSystemService; _itemFilterScriptTranslator = itemFilterScriptTranslator; + + ItemFilterScriptDirectory = Settings.Default.DefaultFilterDirectory; } public string ItemFilterScriptDirectory { get; private set; } @@ -47,6 +49,7 @@ namespace Filtration.Services ItemFilterScriptDirectory = path; Settings.Default.DefaultFilterDirectory = path; + Settings.Default.Save(); } public async Task LoadItemFilterScriptAsync(string filePath) @@ -62,7 +65,7 @@ namespace Filtration.Services { loadedScript.FilePath = filePath; } - + return loadedScript; }