Moved general settings to .settings file

Author: rkapka

RetailCoder.VBE/Properties/Settings.Designer.cs

@@ -180,5 +180,18 @@
   <DefaultTestStubInNewModule>false</DefaultTestStubInNewModule>
 &lt;/UnitTestSettings&gt;</Value>
     </Setting>
+    <Setting Name="GeneralSettings" Type="Rubberduck.Settings.GeneralSettings" Scope="Application">
+      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;GeneralSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
+  &lt;Language Code="en-US" /&gt;
+  &lt;CanShowSplash&gt;true&lt;/CanShowSplash&gt;
+  &lt;CanCheckVersion&gt;true&lt;/CanCheckVersion&gt;
+  &lt;IsSmartIndenterPrompted&gt;false&lt;/IsSmartIndenterPrompted&gt;
+  &lt;IsAutoSaveEnabled&gt;false&lt;/IsAutoSaveEnabled&gt;
+  &lt;AutoSavePeriod&gt;10&lt;/AutoSavePeriod&gt;
+  &lt;MinimumLogLevel&gt;6&lt;/MinimumLogLevel&gt;
+  &lt;EnableExperimentalFeatures /&gt;
+&lt;/GeneralSettings&gt;</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

RetailCoder.VBE/Properties/Settings.settings

@@ -10,9 +10,11 @@ public class DisplayLanguageSetting
         [XmlAttribute]
         public string Code { get; set; }
 
+        /// <Summary>
+        /// Default constructor required for XML serialization.
+        /// </Summary>
         public DisplayLanguageSetting()
         {
-            // serialization constructor
         }
 
         public DisplayLanguageSetting(string code)
@@ -43,8 +45,7 @@ public DisplayLanguageSetting(string code)
 
         public override bool Equals(object obj)
         {
-            var other = obj as DisplayLanguageSetting;
-            return other != null && Code.Equals(other.Code);
+            return obj is DisplayLanguageSetting other && Code.Equals(other.Code);
         }
 
         public override int GetHashCode()

RetailCoder.VBE/Settings/DisplayLanguageSetting.cs

@@ -7,16 +7,17 @@ public class GeneralConfigProvider : IConfigProvider<GeneralSettings>
     {
         private GeneralSettings _current;
         private readonly IPersistanceService<GeneralSettings> _persister;
+        private readonly GeneralSettings _defaultSettings;
 
         public GeneralConfigProvider(IPersistanceService<GeneralSettings> persister)
         {
             _persister = persister;
+            _defaultSettings = new DefaultSettings<GeneralSettings>().Default;
         }
 
         public GeneralSettings Create()
         {
-            var prototype = new GeneralSettings();
-            var updated = _persister.Load(prototype) ?? prototype;
+            var updated = _persister.Load(_defaultSettings) ?? _defaultSettings;
 
             CheckForEventsToRaise(updated);
             _current = updated;
@@ -26,7 +27,7 @@ public GeneralSettings Create()
 
         public GeneralSettings CreateDefaults()
         {
-            return new GeneralSettings();
+            return _defaultSettings;
         }
 
         public void Save(GeneralSettings settings)

RetailCoder.VBE/Settings/GeneralConfigProvider.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Linq;
-using NLog;
 using System.Xml.Serialization;
 using Rubberduck.Common;
 
@@ -19,6 +19,7 @@ public interface IGeneralSettings
         List<ExperimentalFeatures> EnableExperimentalFeatures { get; set; }
     }
 
+    [SettingsSerializeAs(SettingsSerializeAs.Xml)]
     [XmlType(AnonymousType = true)]
     public class GeneralSettings : IGeneralSettings, IEquatable<GeneralSettings>
     {
@@ -50,19 +51,7 @@ public int MinimumLogLevel
             }
         }
 
-        public List<ExperimentalFeatures> EnableExperimentalFeatures { get; set; }
-
-        public GeneralSettings()
-        {
-            Language = new DisplayLanguageSetting("en-US");
-            CanShowSplash = true;
-            CanCheckVersion = true;
-            IsSmartIndenterPrompted = false;
-            IsAutoSaveEnabled = false;
-            AutoSavePeriod = 10;
-            MinimumLogLevel = LogLevel.Off.Ordinal;
-            EnableExperimentalFeatures = new List<ExperimentalFeatures>();
-        }
+        public List<ExperimentalFeatures> EnableExperimentalFeatures { get; set; } = new List<ExperimentalFeatures>();
 
         public bool Equals(GeneralSettings other)
         {

RetailCoder.VBE/Settings/GeneralSettings.cs

@@ -231,6 +231,21 @@
           </UnitTestSettings>
         </value>
       </setting>
+      <setting name="GeneralSettings" serializeAs="Xml">
+        <value>
+          <GeneralSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <Language Code="en-US" />
+            <CanShowSplash>true</CanShowSplash>
+            <CanCheckVersion>true</CanCheckVersion>
+            <IsSmartIndenterPrompted>false</IsSmartIndenterPrompted>
+            <IsAutoSaveEnabled>false</IsAutoSaveEnabled>
+            <AutoSavePeriod>10</AutoSavePeriod>
+            <MinimumLogLevel>6</MinimumLogLevel>
+            <EnableExperimentalFeatures />
+          </GeneralSettings>
+        </value>
+      </setting>
     </Rubberduck.Properties.Settings>
   </applicationSettings>
 </configuration>