Automatic merge of T1.5.1-969-g2319f7f14 and 15 pull requests

- Pull request #799 at dfc715e: Consolidated wind simulation
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #882 at 48aa537: Blueprint/train car operations UI window
- Pull request #891 at 9a1d6b2: Auto save
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #896 at 5866028: First implementation of https://blueprints.launchpad.net/or/+spec/specific-sounds-for-ai-trains
- Pull request #900 at c27f32d: DMI updates
- Pull request #903 at c296b32: Downloading route content (Github, zip)
- Pull request #912 at 0cb07c2: New Triple Valve Features Vol. 2
- Pull request #918 at c46eb0d: Manual - News topics updated since 1.5.1
- Pull request #919 at 26cc6a8: Added mouse wheel support for controls which can be moved by pressing t…
- Pull request #922 at abe2e52: Autopilot for timetable mode
- Pull request #923 at 4c27204: Add curve squeal to route
- Pull request #943 at a0ffa96: Dynamic Brakes Behavior & Display Improvements

Author: openrails-bot

Source/Menu/DownloadContentForm.cs

@@ -58,8 +58,8 @@ public DownloadContentForm(UserSettings settings)
             Catalog = new GettextResourceManager("Menu");
             Settings = settings;
 
-            Settings.Routes.LoadContentAndInstalled();
-            Routes = settings.Routes.Routes;
+            Settings.Content.ContentRouteSettings.LoadContent();
+            Routes = Settings.Content.ContentRouteSettings.Routes;
             for (int index = 0; index < Routes.Count; index++)
             {
                 string routeName = Routes.ElementAt(index).Key;
@@ -79,7 +79,12 @@ public DownloadContentForm(UserSettings settings)
                 cell.ToolTipText = cell.Value.ToString();
             }
 
-            InstallPathTextBox.Text = settings.Content.InstallPath;
+            if (string.IsNullOrEmpty(settings.ContentInstallPath))
+            {
+                settings.ContentInstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Open Rails", "Content");
+            }
+
+            InstallPathTextBox.Text = settings.ContentInstallPath;
 
             ImageTempFilename = Path.GetTempFileName();
             InfoTempFilename = Path.GetTempFileName();
@@ -152,7 +157,7 @@ private void dataGridViewDownloadContent_SelectionChanged(object sender, EventAr
         #region InstallPathTextBox
         private void InstallPathTextBox_TextChanged(object sender, EventArgs e)
         {
-            Settings.Content.InstallPath = InstallPathTextBox.Text;
+            Settings.ContentInstallPath = InstallPathTextBox.Text;
         }
         #endregion
 
@@ -296,7 +301,7 @@ private async void DownloadContentButton_Click(object sender, EventArgs e)
             route.DirectoryInstalledIn = installPathRoute;
 
             Settings.Folders.Save();
-            Settings.Routes.Save();
+            Settings.Content.Save();
 
             if (!string.IsNullOrWhiteSpace(route.Start.Route))
             {
@@ -957,17 +962,23 @@ private async void DeleteButton_Click(object sender, EventArgs e)
                 await Task.Run(() => deleteRoute(route.DirectoryInstalledIn));
             }
 
-            if (Settings.Folders.Folders[route.ContentName] == route.ContentDirectory)
+            if (Settings.Folders.Folders.ContainsKey(route.ContentName))
             {
-                Settings.Folders.Folders.Remove(route.ContentName);
+                if (Settings.Folders.Folders[route.ContentName] == route.ContentDirectory)
+                {
+                    Settings.Folders.Folders.Remove(route.ContentName);
+                }
+                Settings.Folders.Save();
             }
-            Settings.Folders.Save();
 
             route.Installed = false;
             route.DateInstalled = DateTime.MinValue;
             route.DirectoryInstalledIn = "";
 
-            Settings.Routes.Save();
+            // remove from registry, but leave entry in Routes for this route name
+            ContentRouteSettings.Route routeSaved = route;
+            Settings.Content.Save();
+            Routes[RouteName] = routeSaved;
 
             dataGridViewDownloadContent.CurrentRow.Cells[1].Value = "";
 
@@ -1053,8 +1064,10 @@ private bool doThePull(ContentRouteSettings.Route route) {
             {
                 using (var repo = new Repository(route.DirectoryInstalledIn))
                 {
-                    LibGit2Sharp.PullOptions options = new LibGit2Sharp.PullOptions();
-                    options.FetchOptions = new FetchOptions();
+                    LibGit2Sharp.PullOptions options = new LibGit2Sharp.PullOptions
+                    {
+                        FetchOptions = new FetchOptions()
+                    };
 
                     // User information to create a merge commit
                     var signature = new LibGit2Sharp.Signature(

Source/ORTS.Settings/ContentRouteSettings.cs

@@ -19,11 +19,9 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using LibGit2Sharp;
-using System.Windows.Forms;
 
 namespace ORTS.Settings
 {
@@ -112,51 +110,18 @@ public DownloadType getDownloadType ()
         // RouteSettings are presented to the user in the menu DownloadContent form 
         // 
         // lines are a mix from:
-        // - routes already downloaded, stored in {ApplicationData}\{ProductName\Settings\ORRoute.json", 
-        //       eg: "C:\\Users\\Siebren\\AppData\\Roaming\\Open Rails\\Settings\ORRoute.json"
+        // - routes already downloaded, stored in registry Computer\HKEY_CURRENT_USER\SOFTWARE\OpenRails\ORTS\ContentRoutes
         // - routes which can be downloaded, stored in GitHub "https://github.com/openrails/content.git" file routes.json
         //
-        // this .cs file is not like all the other *Settings.cs files, which are derived from class SettingsBase
-        // and store their settings in the registry
-        // but since this class stores settings also, be it in a file, it looks like a good place
-        //
         // where above the word route is mentioned, "Installation profile" is ment as can be found in OR's Main menu
 
         public ContentRouteSettings()
         {
             Routes = new Dictionary<string, Route>();
         }
 
-        private string RouteJsonName;
-
-        public void LoadContentAndInstalled()
+        public void LoadContent()
         {
-            // set json route filename
-
-            string userDataSettingsFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Application.ProductName, "Settings");
-            if (!Directory.Exists(userDataSettingsFolder))
-            {
-                Directory.CreateDirectory(userDataSettingsFolder);
-            }
-
-            RouteJsonName = Path.Combine(userDataSettingsFolder, "ORRoute.json");
-
-            if (!string.IsNullOrWhiteSpace(RouteJsonName))
-            {
-                if (File.Exists(RouteJsonName))
-                {
-                    try
-                    {
-                        string json = File.ReadAllText(RouteJsonName);
-                        Routes = JsonConvert.DeserializeObject<IDictionary<string, Route>>(json);
-                    }
-                    catch (Exception error)
-                    {
-                        throw new Exception("Error during reading " + RouteJsonName + ": " + error.Message, error);
-                    }
-                }
-            }
-
             // only for debug purposes
             string definedContentJsonName = @"c:\content\routes.json";
 
@@ -310,21 +275,5 @@ private static void directoryRemoveReadOnlyFlags(string directoryName)
                 directoryRemoveReadOnlyFlags(subDirectoryName);
             }
         }
-
-        public void Save()
-        {
-            IDictionary<string, Route> routes = new Dictionary<string, Route>();
-
-            for (int index = 0; index < Routes.Count; index++)
-            {
-                // only save the installed routes
-                if (Routes.ElementAt(index).Value.Installed)
-                {
-                    routes.Add(Routes.ElementAt(index));
-                }
-            }
-            string json = JsonConvert.SerializeObject(routes, Formatting.Indented);
-            File.WriteAllText(RouteJsonName, json);
-        }
     }
 }

Source/ORTS.Settings/ContentSettings.cs

@@ -15,83 +15,85 @@
 // You should have received a copy of the GNU General Public License
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
-using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
+using Newtonsoft.Json;
 using ORTS.Common;
+using static ORTS.Settings.ContentRouteSettings;
 
 namespace ORTS.Settings
 {
     public class ContentSettings : SettingsBase
     {
         #region User Settings
-
-        [Default("")]
-        public string InstallPath { get; set; }
-
+        public ContentRouteSettings ContentRouteSettings;
         #endregion
 
         public ContentSettings(IEnumerable<string> options)
-        : base(SettingsStore.GetSettingStore(UserSettings.SettingsFilePath, UserSettings.RegistryKey, "Content"))
+        : base(SettingsStore.GetSettingStore(UserSettings.SettingsFilePath, UserSettings.RegistryKey, "ContentRoutes"))
         {
+            ContentRouteSettings = new ContentRouteSettings();
             Load(options);
-            if (string.IsNullOrEmpty(InstallPath))
-            {
-                InstallPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) , "Open Rails", "Content");
-            }
         }
 
         public override object GetDefaultValue(string name)
         {
-            var property = GetType().GetProperty(name);
-
-            if (property.GetCustomAttributes(typeof(DefaultAttribute), false).Length > 0)
-                return (property.GetCustomAttributes(typeof(DefaultAttribute), false)[0] as DefaultAttribute).Value;
-
-            throw new InvalidDataException(String.Format("UserSetting {0} has no default value.", property.Name));
+            return "";
         }
-        public override void Reset()
+
+        protected override object GetValue(string name)
         {
-            throw new System.NotImplementedException();
+            return JsonConvert.SerializeObject(ContentRouteSettings.Routes[name], Formatting.Indented);
         }
 
-        public override void Save()
+        protected override void SetValue(string name, object value)
         {
-            foreach (var property in GetProperties())
-                if (property.GetCustomAttributes(typeof(DoNotSaveAttribute), false).Length == 0)
-                    Save(property.Name, property.PropertyType);
+            ContentRouteSettings.Routes[name] = JsonConvert.DeserializeObject<Route>((string)value);
         }
 
-        public override void Save(string name)
+        protected override void Load(Dictionary<string, string> optionsDictionary)
         {
-            throw new System.NotImplementedException();
+            foreach (var name in SettingStore.GetUserNames())
+            {
+                Load(optionsDictionary, name, typeof(string));
+            }
         }
 
-        protected override object GetValue(string name)
+        public override void Save()
         {
-            return GetProperty(name).GetValue(this, null);
-        }
+            foreach (var name in ContentRouteSettings.Routes.Keys)
+            {
+                if (ContentRouteSettings.Routes.ContainsKey(name))
+                {
+                    if (ContentRouteSettings.Routes[name].Installed)
+                    {
+                        Save(name);
+                    }
+                }
+            }
 
-        PropertyInfo[] GetProperties()
-        { 
-            return GetType().GetProperties();
-        }
+            foreach (var name in SettingStore.GetUserNames())
+            {
+                if (!ContentRouteSettings.Routes.ContainsKey(name) ||
+                    (!ContentRouteSettings.Routes[name].Installed))
+                {
+                    var route = ContentRouteSettings.Routes[name];
+                     // remove from registry
+                    Reset(name);
+                    // ContentRouteSettings.Routes.Add(name, route);
+                }
+
+            }
 
-        protected override void Load(Dictionary<string, string> optionsDictionary)
-        {
-            foreach (var property in GetProperties())
-                Load(optionsDictionary, property.Name, property.PropertyType);
         }
 
-        PropertyInfo GetProperty(string name)
+        public override void Save(string name)
         {
-            return GetType().GetProperty(name, BindingFlags.Public | BindingFlags.Instance | BindingFlags.FlattenHierarchy);
+            Save(name, typeof(string));
         }
 
-        protected override void SetValue(string name, object value)
+        public override void Reset()
         {
-            GetProperty(name).SetValue(this, value, null);
+            throw new System.NotImplementedException();
         }
     }
 }

Source/ORTS.Settings/UserSettings.cs

@@ -438,13 +438,16 @@ public string DirectXFeatureLevel
         [Default(0)] // TrackMonitor.DisplayMode.All
         public int TrackMonitorDisplayMode { get; set; }
 
+        // Content form settings
+        [Default("")]
+        public string ContentInstallPath { get; set; }
+
         #endregion
 
         public FolderSettings Folders { get; private set; }
         public InputSettings Input { get; private set; }
         public RailDriverSettings RailDriver { get; private set; }
-        public ContentSettings Content { get; private set; }
-        public ContentRouteSettings Routes { get; private set; }    
+        public ContentSettings Content { get; private set; }   
 
         public UserSettings(IEnumerable<string> options)
             : base(SettingsStore.GetSettingStore(SettingsFilePath, RegistryKey, null))
@@ -457,7 +460,6 @@ public UserSettings(IEnumerable<string> options)
             Input = new InputSettings(options);
             RailDriver = new RailDriverSettings(options);
             Content = new ContentSettings(options);
-            Routes = new ContentRouteSettings();
         }
 
         /// <summary>