Automatic merge of T1.5.1-794-g4cad06780 and 14 pull requests

- Pull request #570 at 3539862: Experimental glTF 2.0 support with PBR lighting
- 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 a055bca: Blueprint/train car operations UI window
- Pull request #885 at d9ce84b: feat: Add notifications to Menu
- Pull request #886 at 6c0785b: Scene viewer extension to TrackViewer
- 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 #897 at 0a9d939: feat: Improved system information collection
- Pull request #899 at 0fb4d1c: Duplex steam engines - Booster Engine addition
- Pull request #903 at 22edf27: Downloading route content (Github, zip)
- Pull request #906 at 5850660: Bug fix for https://bugs.launchpad.net/or/+bug/2047299 Crash loading a 3Dcab-only loco
- Pull request #907 at 9b0b04f: Bug fix for https://bugs.launchpad.net/or/+bug/2047300 Dynamic tracks disappear after long tunnel
- Pull request #908 at a325039: feat: supports switching adhesion precisions

Author: openrails-bot

Source/Menu/DownloadContentForm.Designer.cs

@@ -29,6 +29,7 @@
 using System.ComponentModel;
 using System.Net;
 using System.IO.Compression;
+using System.Drawing;
 
 namespace ORTS
 {
@@ -40,6 +41,9 @@ public partial class DownloadContentForm : Form
 
         private string RouteName;
 
+        private readonly string ImageTempFilename;
+        private Thread ImageThread;
+
         public DownloadContentForm(UserSettings settings)
         {
             InitializeComponent();
@@ -59,13 +63,65 @@ public DownloadContentForm(UserSettings settings)
             dataGridViewDownloadContent.Sort(dataGridViewDownloadContent.Columns[0], ListSortDirection.Ascending);
 
             InstallPathTextBox.Text = settings.Content.InstallPath;
+
+            ImageTempFilename = Path.GetTempFileName();
         }
 
         void dataGridViewDownloadContent_SelectionChanged(object sender, EventArgs e)
         {
             RouteName = dataGridViewDownloadContent.CurrentRow.Cells[0].Value.ToString();
 
             DownloadContentButton.Enabled = string.IsNullOrWhiteSpace(Routes[RouteName].DateInstalled);
+
+            // picture box handling
+
+            if (pictureBoxRoute.Image != null)
+            {
+                pictureBoxRoute.Image.Dispose();
+                pictureBoxRoute.Image = null;
+            }
+
+            if (!string.IsNullOrEmpty(Routes[RouteName].Image))
+            {
+                if (ImageThread != null)
+                {
+                    if (ImageThread.IsAlive)
+                    {
+                        ImageThread.Abort();
+                    }
+                }
+
+                // use a thread as grabbing the picture from the web might take a few seconds
+                ImageThread = new Thread(() =>
+                {
+                    // wait one second as the user might scroll through the list
+                    Stopwatch sw = Stopwatch.StartNew();
+                    while (sw.ElapsedMilliseconds <= 1000) { }
+
+                    try
+                    {
+                        using (WebClient myWebClient = new WebClient())
+                        {
+                            myWebClient.DownloadFile(Routes[RouteName].Image, ImageTempFilename);
+                        }
+                    }
+                    catch
+                    {
+                        // route lives whithout a picture, not such a problem
+                    }
+
+                    if (File.Exists(ImageTempFilename))
+                    {
+                        pictureBoxRoute.Image = new Bitmap(ImageTempFilename);
+                    }
+                });
+                ImageThread.Start();
+            }
+
+
+            // text box with description
+
+            textBoxRoute.Text = Routes[RouteName].Description;
         }
 
         private void InstallPathButton_Click(object sender, EventArgs e)
@@ -397,6 +453,23 @@ private bool insertRowInOptions(string installPathRoute)
             }
             return true;
         }
+
+        private void DownloadContentForm_FormClosing(object sender, FormClosingEventArgs e)
+        {
+            try 
+            {
+                if (pictureBoxRoute.Image != null)
+                {
+                    pictureBoxRoute.Image.Dispose();
+                    pictureBoxRoute.Image = null;
+                }
+                File.Delete(ImageTempFilename);
+            }
+            catch 
+            { 
+                // just ignore, it's a file in the user temp directory anyway
+            }
+        }
     }
 
 }

Source/Menu/DownloadContentForm.cs

@@ -36,12 +36,18 @@ public class Route
             public long DownloadSize;
             public long InstallSize;
 
-            public Route(string dateInstalled, string url, long downloadSize, long installSize)
+            public string Image;
+
+            public string Description;
+
+            public Route(string dateInstalled, string url, long downloadSize, long installSize, string image, string description)
             { 
                 DateInstalled = dateInstalled;
                 Url = url;
                 DownloadSize = downloadSize;
                 InstallSize = installSize;
+                Image = image;
+                Description = description;
             }
         }
 
@@ -116,12 +122,14 @@ public void LoadContentAndInstalled()
                         string url = result["url"].ToString();
                         long downloadSize = convertResultToLong(result, "downloadSize");
                         long installSize = convertResultToLong(result, "installSize");
+                        string image = convertResultToString(result, "image");
+                        string description = convertResultToString(result, "description");
 
                         if (url.EndsWith(".git") || url.EndsWith(".zip"))
                         {
                             if (!Routes.ContainsKey(routeName))
                             {
-                                Routes.Add(routeName, new RouteSettings.Route("", url, downloadSize, installSize));
+                                Routes.Add(routeName, new RouteSettings.Route("", url, downloadSize, installSize, image, description));
                             }
                         }
                     }
@@ -137,7 +145,7 @@ public void LoadContentAndInstalled()
             return;
         }
 
-        long convertResultToLong(JToken result, string fieldName)
+        private long convertResultToLong(JToken result, string fieldName)
         {
             if (result[fieldName] != null)
             {
@@ -149,6 +157,18 @@ long convertResultToLong(JToken result, string fieldName)
             }
         }
 
+        private string convertResultToString(JToken result, string fieldName)
+        {
+            if (result[fieldName] != null)
+            {
+                return result[fieldName].ToString();
+            }
+            else
+            {
+                return "";
+            }
+        }
+
         private void directoryDelete(string directoryName)
         {
             if (Directory.Exists(directoryName))