Refactor UserSettings and SettingsBase.

The settings store related parts are better defined in SettingsBase, as
they are also used by other settings classes (via the fact that they are
static).

This is in prep for allowing the store to be changed (for the export
tool).

Author: rwf-rr

Source/ORTS.Common/SettingsBase.cs

@@ -16,6 +16,7 @@
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using System.IO;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
@@ -27,6 +28,20 @@ namespace ORTS.Common
     /// </summary>
 	public abstract class SettingsBase
 	{
+        public static string RegistryKey { get; protected set; }        // ie @"SOFTWARE\OpenRails\ORTS"
+        public static string SettingsFilePath { get; protected set; }   // ie @"C:\Program Files\Open Rails\OpenRails.ini"
+
+        static SettingsBase()
+        {
+            // Only one of these is allowed; if the INI file exists, we use that, otherwise we use the registry.
+            RegistryKey = "SOFTWARE\\OpenRails\\ORTS";
+            SettingsFilePath = Path.Combine(ApplicationInfo.ProcessDirectory, "OpenRails.ini");
+            if (File.Exists(SettingsFilePath))
+                RegistryKey = null;
+            else
+                SettingsFilePath = null;
+        }
+
         /// <summary>
         /// Enumeration of the various sources for settings
         /// </summary>
@@ -42,6 +57,7 @@ protected enum Source
 
         /// <summary>The store of the settings</summary>
         protected SettingsStore SettingStore { get; private set; }
+
         /// <summary>Translates name of a setting to its source</summary>
         protected readonly Dictionary<string, Source> Sources = new Dictionary<string, Source>();
 

Source/ORTS.Settings/UserSettings.cs

@@ -43,22 +43,12 @@ public sealed class DoNotSaveAttribute : Attribute
 
     public class UserSettings : SettingsBase
     {
-        public static readonly string RegistryKey;        // ie @"SOFTWARE\OpenRails\ORTS"
-        public static readonly string SettingsFilePath;   // ie @"C:\Program Files\Open Rails\OpenRails.ini"
         public static readonly string UserDataFolder;     // ie @"C:\Users\Wayne\AppData\Roaming\Open Rails"
         public static readonly string DeletedSaveFolder;  // ie @"C:\Users\Wayne\AppData\Roaming\Open Rails\Deleted Saves"
         public static readonly string SavePackFolder;     // ie @"C:\Users\Wayne\AppData\Roaming\Open Rails\Save Packs"
 
         static UserSettings()
         {
-            // Only one of these is allowed; if the INI file exists, we use that, otherwise we use the registry.
-            RegistryKey = "SOFTWARE\\OpenRails\\ORTS";
-            SettingsFilePath = Path.Combine(ApplicationInfo.ProcessDirectory, "OpenRails.ini");
-            if (File.Exists(SettingsFilePath))
-                RegistryKey = null;
-            else
-                SettingsFilePath = null;
-
             UserDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), ApplicationInfo.ProductName);
             // TODO: If using INI file, move these to application directory as well.
             if (!Directory.Exists(UserDataFolder)) Directory.CreateDirectory(UserDataFolder);