Automatic merge of T1.6-145-g7915033ac and 12 pull requests

- Pull request #1082 at 8538170: Allow variable water level in glass gauge
- Pull request #1156 at f46d5f2: Fix incorrectly disabled options in train operations window
- Pull request #1091 at 492795a: Automatic speed control
- Pull request #1122 at 73c47b4: Wagon Size and Centering Controls
- Pull request #1124 at e241a0d: Built-in PBL2 brake controller
- Pull request #1128 at d116396: Particle Emitter Overhaul
- Pull request #1157 at 39cd994: Dynamic brake authorization by TCS
- Pull request #1166 at 51e7f7a: Simplify loading of internal and game textures
- Pull request #1167 at 115325f: Fix: RunActivity slow to terminate because of long sleep in Host Process
- Pull request #1168 at 6e2942f: Fix exception when exiting with MapForm or SoundDebugForm open.
- Pull request #1169 at 8fe03b1: Better Handling of Wagons with Invalid Bogie Configuration
- Pull request #1171 at 8fd2066: no internet connection is available, not possible to open the Menu Content Form

Author: openrails-bot

Source/Menu/ContentForm.cs

@@ -63,6 +63,8 @@ public partial class ContentForm : Form
 
         private bool ManualInstallChangesMade = false;
 
+        private readonly bool NoInternet = false;
+
         public ContentForm(UserSettings settings, string baseDocumentationUrl)
         {
             InitializeComponent();
@@ -84,7 +86,14 @@ public ContentForm(UserSettings settings, string baseDocumentationUrl)
             //
             // "Auto Installed" tab
             //
-            Settings.Content.ContentRouteSettings.LoadContent();
+            string errorMsg = "";
+            Settings.Content.ContentRouteSettings.LoadContent(ref errorMsg);
+            if (!string.IsNullOrEmpty(errorMsg))
+            {
+                string message = Catalog.GetStringFmt("Not connected to internet, automatic download not available. Error: {0}", errorMsg);
+                MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.OK, MessageBoxIcon.Error);
+                NoInternet = true;
+            }
             AutoInstallRoutes = Settings.Content.ContentRouteSettings.Routes;
             for (int index = 0; index < AutoInstallRoutes.Count; index++)
             {
@@ -143,6 +152,19 @@ public ContentForm(UserSettings settings, string baseDocumentationUrl)
             buttonCancel.Enabled = false;
 
             setTextBoxesManualInstall();
+
+            if (NoInternet)
+            {
+                // open the Manually Installed tab since the Auto Installed tab needs internet
+                tabControlContent.SelectTab(tabPageManuallyInstall);
+            }
+
+            if (dataGridViewAutoInstall.Rows.Count == 0) 
+            {
+                // disable all auto install buttons for a complete empty auto install grid
+                // might be the case when no internet available
+                DisableAutoInstallButtonsWithoutWait();
+            }
         }
 
         void changeManualInstallRoute(string Route)
@@ -272,9 +294,9 @@ private void dataGridViewAutoInstall_SelectionChanged(object sender, EventArgs e
                     try
                     {
                         using (WebClient myWebClient = new WebClient())
-                        {
+                                {
                             myWebClient.DownloadFile(AutoInstallRoutes[AutoInstallRouteName].Image, ImageTempFilename);
-                        }
+                            }
                         if (File.Exists(ImageTempFilename))
                         {
                             pictureBoxAutoInstallRoute.Image = new Bitmap(ImageTempFilename);
@@ -1094,7 +1116,11 @@ void buttonAutoInstallOK_Click(object sender, EventArgs e)
         private void DisableAutoInstallButtons()
         {
             setCursorToWaitCursor();
+            DisableAutoInstallButtonsWithoutWait();
+        }
 
+        private void DisableAutoInstallButtonsWithoutWait()
+        {
             dataGridViewAutoInstall.Enabled = false;
             textBoxAutoInstallPath.Enabled = false;
             buttonAutoInstallBrowse.Enabled = false;
@@ -1119,9 +1145,9 @@ private void EnableAutoInstalButtons()
             dataGridViewAutoInstall.Enabled = true;
             textBoxAutoInstallPath.Enabled = true;
             buttonAutoInstallBrowse.Enabled = true;
-            buttonAutoInstallInfo.Enabled = true;
-            buttonAutoInstallInstall.Enabled = !route.Installed;
-            buttonAutoInstallUpdate.Enabled = route.Installed && (route.getDownloadType() == ContentRouteSettings.DownloadType.github);
+            buttonAutoInstallInfo.Enabled = !NoInternet;
+            buttonAutoInstallInstall.Enabled = !(route.Installed || NoInternet);
+            buttonAutoInstallUpdate.Enabled = route.Installed && (route.getDownloadType() == ContentRouteSettings.DownloadType.github) && !NoInternet;
             buttonAutoInstallDelete.Enabled = route.Installed;
             buttonOK.Enabled = true;
 

Source/Orts.Settings/ContentRouteSettings.cs

@@ -120,7 +120,7 @@ public ContentRouteSettings()
             Routes = new Dictionary<string, Route>();
         }
 
-        public void LoadContent()
+        public void LoadContent(ref string errorMsg)
         {
             // only for debug purposes
             string definedContentJsonName = @"c:\content\routes.json";
@@ -142,8 +142,8 @@ public void LoadContent()
                     definedContentJsonName = Path.Combine(definedContentJsonDirectoryName, "routes.json");
                 }
                 catch (Exception error) 
-                { 
-                    throw new Exception("Error during retrieving routes.json from \"" + githubUrl + "\": " + error.Message, error); 
+                {
+                    errorMsg = error.Message;
                 }  
             }