Automatic merge of T1.5.1-1741-gf80cfb5d1 and 21 pull requests

- Pull request #570 at f11a428: glTF 2.0 support with PBR lighting
- Pull request #1030 at d3ae4a2: Refactor settings, in prep for settings exporter
- Pull request #1052 at 3b5cb90: Content Manager: Add axle count, and lowest derail force
- Pull request #1062 at bbc0013: Train Forces popup Window.
- Pull request #1064 at cb510d6: Add Train Info tab to Help window (F1)
- Pull request #1066 at 62c89c1: Log derailment, using TraceInformation.
- Pull request #1082 at a3128ae: Allow variable water level in glass gauge
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #1049 at 6a0c471: Re-organise document storage and access
- Pull request #1057 at 84592f7: Switchable brake system
- Pull request #1069 at 99fc9ac: Mouse wheel control only with Alt – Followup for #1051
- Pull request #1070 at f818e40: Fix a NullReferenceException in TCS scripts
- Pull request #1071 at 722dd3f: Change cover image for v1.6
- Pull request #1074 at e9a66c1: Gradient - commit 2024-16-12
- Pull request #1076 at 3bbd537: Allow depart early
- Pull request #1077 at 7e73abd: Fix SME brakes not working
- Pull request #1078 at 9ab642e: Default PowerSupply script for steam locomotives
- Pull request #1079 at 5e37059: Adds Polish transations
- Pull request #1080 at a637cb8: arranges Options > System tab for longer texts
- Pull request #1083 at 7e6fb60: Menu contents route name clash
- Pull request #1081 at 689494b: Brake cuts power unification

Author: openrails-bot

Source/Menu/ContentForm.Designer.cs

@@ -61,6 +61,8 @@ public partial class ContentForm : Form
         private bool In_dataGridViewManualInstall_SelectionChanged = false;
         private bool In_buttonManualInstallAdd_Click = false;
 
+        private bool ManualInstallChangesMade = false;
+
         public ContentForm(UserSettings settings, string baseDocumentationUrl)
         {
             InitializeComponent();
@@ -93,6 +95,10 @@ public ContentForm(UserSettings settings, string baseDocumentationUrl)
                     route.Installed ? route.DateInstalled.ToString(CultureInfo.CurrentCulture.DateTimeFormat) : "",
                     route.Url });
                 dataGridViewAutoInstall.Rows[indexAdded].Cells[2].ToolTipText = route.Url;
+                if (!route.Installed)
+                {
+                    changeManualInstallRoute(routeName);
+                }
             }
 
             dataGridViewAutoInstall.Sort(dataGridViewAutoInstall.Columns[0], ListSortDirection.Ascending);
@@ -113,6 +119,10 @@ public ContentForm(UserSettings settings, string baseDocumentationUrl)
             // set focus to datagridview so that arrow keys can be used to scroll thru the list
             dataGridViewAutoInstall.Select();
 
+            // tab "Auto Installed" does not contain a Cancel button
+            // it's too difficult and not logical to rollback an "Auto Installed" route
+            buttonCancel.Hide();
+
             //
             // "Manually Installed" tab
             //
@@ -130,6 +140,43 @@ public ContentForm(UserSettings settings, string baseDocumentationUrl)
             dataGridViewManualInstall.Sort(dataGridViewManualInstall.Columns[0], ListSortDirection.Ascending);
 
             ManualInstallBrouwseDir = determineBrowseDir();
+            buttonCancel.Enabled = false;
+        }
+
+        void changeManualInstallRoute(string Route)
+        {
+            bool found = false;
+
+            foreach (var folder in Settings.Folders.Folders)
+            {
+                if (folder.Key == Route)
+                {
+                    // Route found in folder settings
+                    found = true;
+                }
+            }
+
+            if (found)
+            {
+                // search for the next route (1), (2) etc. not found in folder settings
+                int seqNr = 1;
+                string route = Route + " (" + seqNr + ")";
+                while (found)
+                {
+                    found = false;
+                    foreach (var folder in Settings.Folders.Folders)
+                    {
+                        if (folder.Key == route)
+                        {
+                            found = true;
+                            seqNr++;
+                            route = Route + " (" + seqNr + ")";
+                        }
+                    }
+                }
+                Settings.Folders.Folders[route] = Settings.Folders.Folders[Route];
+                Settings.Folders.Folders.Remove(Route);
+            }
         }
 
         private void tabControlContent_Selecting(object sender, TabControlCancelEventArgs e)
@@ -138,9 +185,12 @@ private void tabControlContent_Selecting(object sender, TabControlCancelEventArg
             {
                 case "tabPageAutoInstall":
                     dataGridViewAutoInstall.Select();
+                    buttonCancel.Hide();
                     break;
                 case "tabPageManuallyInstall":
                     dataGridViewManualInstall.Select();
+                    buttonCancel.Show();
+                    buttonCancel.Enabled = ManualInstallChangesMade;
                     break;
             }
         }
@@ -1051,7 +1101,6 @@ private void DisableAutoInstallButtons()
             buttonAutoInstallUpdate.Enabled = false;
             buttonAutoInstallDelete.Enabled = false;
             buttonOK.Enabled = false;
-            buttonCancel.Enabled = false;
         }
 
         private void setCursorToWaitCursor()
@@ -1073,7 +1122,6 @@ private void EnableAutoInstalButtons()
             buttonAutoInstallUpdate.Enabled = route.Installed && (route.getDownloadType() == ContentRouteSettings.DownloadType.github);
             buttonAutoInstallDelete.Enabled = route.Installed;
             buttonOK.Enabled = true;
-            buttonCancel.Enabled = true;
 
             setCursorToDefaultCursor();
         }
@@ -1398,6 +1446,18 @@ private void textBoxManualInstallRoute_TextChanged(object sender, EventArgs e)
             {
                 // only update the grid when user is filling/changing the route in the textbox
                 dataGridViewManualInstall.CurrentRow.Cells[0].Value = textBoxManualInstallRoute.Text;
+                ManualInstallChangesMade = true;
+                buttonCancel.Enabled = true;
+            }
+        }
+
+        private void textBoxManualInstallRoute_Leave(object sender, EventArgs e)
+        {
+            string route = textBoxManualInstallRoute.Text;
+            textBoxManualInstallRoute.Text = determineUniqueRoute(route);
+            if (textBoxManualInstallRoute.Text != route)
+            {
+                dataGridViewManualInstall.CurrentRow.Cells[0].Value = textBoxManualInstallRoute.Text;
             }
         }
 
@@ -1452,6 +1512,8 @@ private void buttonManualInstallAdd_Click(object sender, EventArgs e)
                     string route = determineUniqueRoute(Path.GetFileName(folderBrowser.SelectedPath));
                     dataGridViewManualInstall.CurrentRow.Cells[0].Value = route;
                     dataGridViewManualInstall.CurrentRow.Cells[1].Value = folderBrowser.SelectedPath;
+                    ManualInstallChangesMade = true;
+                    buttonCancel.Enabled = ManualInstallChangesMade;
                 }
                 else
                 {
@@ -1477,6 +1539,8 @@ private void buttonManualInstallDelete_Click(object sender, EventArgs e)
             if (dataGridViewManualInstall.CurrentRow != null)
             {
                 dataGridViewManualInstall.Rows.Remove(dataGridViewManualInstall.CurrentRow);
+                ManualInstallChangesMade = true;
+                buttonCancel.Enabled = ManualInstallChangesMade;
             }
         }
 
@@ -1512,17 +1576,18 @@ private void setTextBoxesManualInstall()
         string determineUniqueRoute(string Route)
         {
             string route = Route;
-
+            long seqNr = 0;
             bool found = false;
 
             while (!found)
             {
                 found = true;
                 for (int i = 0; i < dataGridViewManualInstall.Rows.Count - 1; i++)
                 {
-                    if (dataGridViewManualInstall.Rows[i].Cells[0].Value.ToString() == route)
-                    {
-                        route += " copy";
+                    if (((dataGridViewManualInstall.Rows[i].Cells[0].Value.ToString() == route) && (!dataGridViewManualInstall.Rows[i].Selected)) ||
+                            (AutoInstallRoutes.ContainsKey(route))) {
+                        seqNr++;
+                        route = Route + " (" + seqNr + ")";
                         found = false;
                     }
                 }
@@ -1588,6 +1653,21 @@ private static bool isWrongPath(string path, GettextResourceManager catalog)
             return false;
         }
 
+        private void buttonCancel_Click(object sender, EventArgs e)
+        {
+            string message = Catalog.GetString("Cancel: changes made in the 'Manually Installed' tab will not be saved, are you sure?");
+            if (MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
+            {
+                // not sure, cancel the cancel
+                this.DialogResult = DialogResult.None;
+            }
+            else 
+            {
+                // sure to cancel the changes
+                ManualInstallChangesMade = false;
+            }
+        }
+
         private void buttonOK_Click(object sender, EventArgs e)
         {
             // save "Manually Installed" tab changes into the registry/ini file via Settings.Folders.Folders
@@ -1641,6 +1721,8 @@ private void buttonOK_Click(object sender, EventArgs e)
 
             Settings.Save();
 
+            ManualInstallChangesMade = false;
+
             this.Close();
         }
 
@@ -1672,6 +1754,17 @@ private int findIndexDgvManualInstall(string route)
 
         private void DownloadContentForm_FormClosing(object sender, FormClosingEventArgs formClosingEventArgs)
         {
+            if (ManualInstallChangesMade)
+            {
+                string message = Catalog.GetString("Cancel: changes made in the 'Manually Installed' tab will not be saved, are you sure?");
+                if (MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
+                {
+                    // not sure, cancel the cancel
+                    formClosingEventArgs.Cancel = true;
+                    return;
+                }
+            }
+
             if (AutoInstallClosingBlocked)
             {
                 // cancelled event, so continue