- added wait cursor

- fixed hanging delete "Portugal 79" route
- inserted "Auto Installed" route added to "Manually Installed" grid also
- deleted route from "Auto Installed" also deleted from "Manually Installed" grid

Author: sweiland-openrails

Source/Menu/ContentForm.cs

@@ -644,16 +644,18 @@ private bool downloadRoute(string installPathRoute)
 
             while (downloadThread.IsAlive)
             {
-                Stopwatch sw = Stopwatch.StartNew();
-
                 TotalBytes = 0;
+
                 sumMB(installPathRoute);
                 AutoInstallSynchronizationContext.Post(new SendOrPostCallback(o =>
                 {
+                    ((MainForm)Owner).Cursor = Cursors.WaitCursor;
+
                     dataGridViewAutoInstall.CurrentRow.Cells[1].Value = 
                         string.Format("Downloaded: {0} kB", (string)o);
                 }), (TotalBytes / 1024).ToString("N0"));
 
+                Stopwatch sw = Stopwatch.StartNew();
                 while ((downloadThread.IsAlive) && (sw.ElapsedMilliseconds <= 1000)) { }
             }
 
@@ -671,16 +673,17 @@ private bool downloadRoute(string installPathRoute)
 
                     while (installThread.IsAlive)
                     {
-                        Stopwatch sw = Stopwatch.StartNew();
-
                         TotalBytes = -bytesZipfile;
                         sumMB(installPathRoute);
                         AutoInstallSynchronizationContext.Post(new SendOrPostCallback(o =>
                         {
+                            ((MainForm)Owner).Cursor = Cursors.WaitCursor;
+
                             dataGridViewAutoInstall.CurrentRow.Cells[1].Value = 
                                 string.Format("Installed: {0} kB", (string)o);
                         }), (TotalBytes / 1024).ToString("N0"));
 
+                        Stopwatch sw = Stopwatch.StartNew();
                         while ((installThread.IsAlive) && (sw.ElapsedMilliseconds <= 1000)) { }
                     }
                 }
@@ -838,6 +841,15 @@ private bool insertRowInOptions(string installPathRoute)
             AutoInstallRoutes[AutoInstallRouteName].ContentName = routeName;
             AutoInstallRoutes[AutoInstallRouteName].ContentDirectory = installPathRouteReal;
 
+            // insert into Manually Installed data grid
+            int indexAdded = dataGridViewManualInstall.Rows.Add(new string[] {
+                routeName,
+                installPathRouteReal
+            });
+            dataGridViewManualInstall.Rows[indexAdded].Cells[1].ToolTipText = installPathRouteReal;
+            dataGridViewManualInstall.Rows[indexAdded].DefaultCellStyle.ForeColor = Color.Gray;
+            dataGridViewManualInstall.Sort(dataGridViewManualInstall.Columns[0], ListSortDirection.Ascending);
+
             return true;
         }
 
@@ -954,6 +966,11 @@ private async void buttonAutoInstallDelete_Click(object sender, EventArgs e)
                 if (Settings.Folders.Folders[route.ContentName] == route.ContentDirectory)
                 {
                     Settings.Folders.Folders.Remove(route.ContentName);
+                    int index = findIndexDgvManualInstall(route.ContentName);
+                    if (index > -1)
+                    {
+                        dataGridViewManualInstall.Rows.RemoveAt(index);
+                    }
                 }
                 Settings.Folders.Save();
             }
@@ -991,19 +1008,21 @@ private void deleteRoute(string directoryInstalledIn)
                 // this will stop the delete until the sum is done
                 AutoInstallDoingTheSumOfTheFileBytes = true;
 
-                Stopwatch sw = Stopwatch.StartNew();
                 TotalBytes = 0;
                 if (sumMB(directoryInstalledIn))
                 {
                     AutoInstallSynchronizationContext.Post(new SendOrPostCallback(o =>
                     {
+                        ((MainForm)Owner).Cursor = Cursors.WaitCursor;
+
                         dataGridViewAutoInstall.CurrentRow.Cells[1].Value =
                             string.Format("Left: {0} kB", (string)o);
                     }), (TotalBytes / 1024).ToString("N0"));
                 }
 
                 AutoInstallDoingTheSumOfTheFileBytes = false;
 
+                Stopwatch sw = Stopwatch.StartNew();
                 while (deleteThread.IsAlive && (sw.ElapsedMilliseconds <= 1000)) { }
             }
         }
@@ -1032,8 +1051,7 @@ private void setCursorToWaitCursor()
         {
             AutoInstallClosingBlocked = true;
 
-            MainForm mainForm = (MainForm)Owner;
-            mainForm.Cursor = Cursors.WaitCursor;
+            ((MainForm)Owner).Cursor = Cursors.WaitCursor;
         }
 
         private void EnableAutoInstalButtons()
@@ -1055,8 +1073,7 @@ private void EnableAutoInstalButtons()
 
         private void setCursorToDefaultCursor()
         {
-            MainForm mainForm = (MainForm)Owner;
-            mainForm.Cursor = Cursors.Default;
+            ((MainForm)Owner).Cursor = Cursors.Default;
 
             AutoInstallClosingBlocked = false;
         }
@@ -1632,6 +1649,18 @@ private string findPathInDgvManualInstall(string route)
             return "";
         }
 
+        private int findIndexDgvManualInstall(string route)
+        {
+            for (int i = 0; i < dataGridViewManualInstall.Rows.Count; i++)
+            {
+                if (dataGridViewManualInstall.Rows[i].Cells[0].Value.ToString().Equals(route)) 
+                {
+                    return i;
+                }
+            }
+            return - 1;
+        }
+
         private void DownloadContentForm_FormClosing(object sender, FormClosingEventArgs formClosingEventArgs)
         {
             if (AutoInstallClosingBlocked)

Source/ORTS.Settings/ContentRouteSettings.cs

@@ -268,7 +268,7 @@ private static void directoryRemoveReadOnlyFlagsAndDeleteFile(string directoryNa
             {
                 while (doingTheSumOfTheFileBytes)
                 {
-                    // stop deleteing file while summing in progress,
+                    // stop deleting file while summing in progress,
                     // sum is for feedback to the user
                     System.Threading.Thread.Sleep(10); 
                 }