Move refernces to RegistryKey and SettingsFilePath to SettingsBase.

This completes the refactoring of the Settings, so that the other
settings no longer depend on UserSettings.

There are no behaviour changes so far.

Author: rwf-rr

Source/ORTS.Settings/ContentSettings.cs

@@ -29,7 +29,7 @@ public class ContentSettings : SettingsBase
         #endregion
 
         public ContentSettings(IEnumerable<string> options)
-        : base(SettingsStore.GetSettingStore(UserSettings.SettingsFilePath, UserSettings.RegistryKey, "ContentRoutes"))
+        : base(SettingsStore.GetSettingStore(SettingsBase.SettingsFilePath, SettingsBase.RegistryKey, "ContentRoutes"))
         {
             ContentRouteSettings = new ContentRouteSettings();
             Load(options);

Source/ORTS.Settings/FolderSettings.cs

@@ -29,7 +29,7 @@ public class FolderSettings : SettingsBase
         public readonly Dictionary<string, string> Folders;
 
         public FolderSettings(IEnumerable<string> options)
-            : base(SettingsStore.GetSettingStore(UserSettings.SettingsFilePath, UserSettings.RegistryKey, "Folders"))
+            : base(SettingsStore.GetSettingStore(SettingsBase.SettingsFilePath, SettingsBase.RegistryKey, "Folders"))
         {
             Folders = new Dictionary<string, string>();
             Load(options);

Source/ORTS.Settings/InputSettings.cs

@@ -79,7 +79,7 @@ static InputSettings()
         /// </summary>
         /// <param name="options">The list of one-time options to override persisted settings, if any.</param>
         public InputSettings(IEnumerable<string> options)
-        : base(SettingsStore.GetSettingStore(UserSettings.SettingsFilePath, UserSettings.RegistryKey, "Keys"))
+        : base(SettingsStore.GetSettingStore(SettingsBase.SettingsFilePath, SettingsBase.RegistryKey, "Keys"))
         {
             InitializeCommands(Commands);
             Load(options);

Source/ORTS.Settings/RailDriverSettings.cs

@@ -119,7 +119,7 @@ static RailDriverSettings()
         /// </summary>
         /// <param name="options">The list of one-time options to override persisted settings, if any.</param>
         public RailDriverSettings(IEnumerable<string> options)
-        : base(SettingsStore.GetSettingStore(UserSettings.SettingsFilePath, UserSettings.RegistryKey, "RailDriver"))
+        : base(SettingsStore.GetSettingStore(SettingsBase.SettingsFilePath, SettingsBase.RegistryKey, "RailDriver"))
         {
             CalibrationSettings = new byte[DefaultCalibrationSettings.Length];
 

Source/ORTS.Settings/UpdateState.cs

@@ -41,7 +41,7 @@ public class UpdateState : SettingsBase
         #endregion
 
         public UpdateState()
-            : base(SettingsStore.GetSettingStore(UserSettings.SettingsFilePath, UserSettings.RegistryKey, "UpdateState"))
+            : base(SettingsStore.GetSettingStore(SettingsBase.SettingsFilePath, SettingsBase.RegistryKey, "UpdateState"))
         {
             Load(new string[0]);
         }

Source/ORTS.Settings/UserSettings.cs

@@ -477,7 +477,7 @@ public string DirectXFeatureLevel
         public ContentSettings Content { get; private set; }   
 
         public UserSettings(IEnumerable<string> options)
-            : base(SettingsStore.GetSettingStore(SettingsFilePath, RegistryKey, null))
+            : base(SettingsStore.GetSettingStore(SettingsBase.SettingsFilePath, SettingsBase.RegistryKey, null))
         {
             CustomDefaultValues["LoggingPath"] = Environment.GetFolderPath(Environment.SpecialFolder.DesktopDirectory);
             CustomDefaultValues["ScreenshotPath"] = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures), ApplicationInfo.ProductName);

Source/ORTS.Updater/UpdateManager.cs

@@ -205,7 +205,7 @@ void UpdateStoredLatestVersionNumber()
         {
             if (Settings.Channel.Length > 0 && VersionInfo.Version.Length > 0)
             {
-                var store = SettingsStore.GetSettingStore(UserSettings.SettingsFilePath, UserSettings.RegistryKey, "Version");
+                var store = SettingsStore.GetSettingStore(SettingsBase.SettingsFilePath, SettingsBase.RegistryKey, "Version");
                 var oldVersion = (long)(store.GetUserValue(Settings.Channel, typeof(long)) ?? 0L);
                 var newVersion = VersionInfo.GetVersionLong(VersionInfo.ParseVersion(VersionInfo.Version));
                 if (newVersion > oldVersion)