Skip to content

Commit 118b69d

Browse files
committed
Automatic merge of T1.5.1-963-g375f79869 and 16 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 3ca0eb1: 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 de10375: Downloading route content (Github, zip) - Pull request #912 at 982afb6: New Triple Valve Features Vol. 2 - 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 #939 at 15ba46b: Add KM/HOUR/MIN to Cabview Units + Custom Units - Pull request #940 at f8b5b15: Browser HUD column alignment improvements - Pull request #943 at 7eebedc: Cab View Dynamic Brakes Indication Fix
18 parents a461afe + 375f798 + dfc715e + d00beb9 + f92de76 + 3ca0eb1 + 9a1d6b2 + 1f5ba4c + 5866028 + c27f32d + de10375 + 982afb6 + 26cc6a8 + abe2e52 + 4c27204 + 15ba46b + f8b5b15 + 7eebedc commit 118b69d

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

Source/Menu/DownloadContentForm.Designer.cs

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/Menu/DownloadContentForm.cs

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,13 @@ public DownloadContentForm(UserSettings settings)
7272

7373
dataGridViewDownloadContent.Sort(dataGridViewDownloadContent.Columns[0], ListSortDirection.Ascending);
7474

75+
for (int index = 0; index < Routes.Count; index++)
76+
{
77+
DataGridViewRow row = dataGridViewDownloadContent.Rows[index];
78+
DataGridViewCell cell = row.Cells[2];
79+
cell.ToolTipText = cell.Value.ToString();
80+
}
81+
7582
InstallPathTextBox.Text = settings.Content.InstallPath;
7683

7784
ImageTempFilename = Path.GetTempFileName();
@@ -611,6 +618,7 @@ private void writeAndStartInfoFile()
611618
else
612619
{
613620
outputFile.WriteLine("- " + Catalog.GetString("Installation profile") + ": " + RouteName + "<br>");
621+
outputFile.WriteLine("- " + Catalog.GetString("Activity") + ": " + route.Start.Activity + "<br>");
614622
outputFile.WriteLine("- " + Catalog.GetString("Route") + ": " + route.Start.Route + "<br>");
615623
outputFile.WriteLine("- " + Catalog.GetString("Locomotive") + ": " + route.Start.Locomotive + "<br>");
616624
outputFile.WriteLine("- " + Catalog.GetString("Consist") + ": " + route.Start.Consist + "<br>");
@@ -722,7 +730,7 @@ private bool infoChangedAndAddedFileForGitHubDownloadType(ContentRouteSettings.R
722730
outputFile.WriteLine(changedFile + "<br>");
723731
}
724732
outputFile.WriteLine("</p>");
725-
}
733+
}
726734

727735
outputFile.WriteLine("<p>" + Catalog.GetString("Remote GitHub Updates available:") + "<br>");
728736

@@ -739,8 +747,8 @@ private bool infoChangedAndAddedFileForGitHubDownloadType(ContentRouteSettings.R
739747
}
740748
outputFile.WriteLine("</p>");
741749
}
742-
else
743-
{
750+
else
751+
{
744752
outputFile.WriteLine("- " + Catalog.GetString("No updates found") + "<br></p>");
745753
}
746754

@@ -940,8 +948,7 @@ private async void DeleteButton_Click(object sender, EventArgs e)
940948

941949
if (areThereChangedAddedFiles(route))
942950
{
943-
writeAndStartInfoFile();
944-
message = Catalog.GetStringFmt("Changed or added local files found in Directory \"{0}\", see Info at the bottom for more information. Do you want to continue?", route.DirectoryInstalledIn);
951+
message = Catalog.GetStringFmt("Changed or added local files found in Directory \"{0}\". Do you want to continue?", route.DirectoryInstalledIn);
945952
if (MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) != DialogResult.Yes)
946953
{
947954
// cancelled
@@ -1011,8 +1018,7 @@ private void updateButton_Click(object sender, EventArgs e)
10111018
List<string> commitStrings = getCommits(route.DirectoryInstalledIn);
10121019
if (commitStrings.Count > 0)
10131020
{
1014-
writeAndStartInfoFile();
1015-
message = Catalog.GetString("Remote updates found, see Info at the bottom for more information. Do you want to continue?");
1021+
message = Catalog.GetString("Remote updates found. Do you want to continue?");
10161022
if (MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) != DialogResult.Yes)
10171023
{
10181024
// cancelled
@@ -1021,7 +1027,7 @@ private void updateButton_Click(object sender, EventArgs e)
10211027
}
10221028
if (areThereChangedAddedFiles(route))
10231029
{
1024-
message = Catalog.GetString("Changed or added local files found, Update might fail, see Info at the bottom for more information. Do you want to continue?");
1030+
message = Catalog.GetString("Changed or added local files found, Update might fail. Do you want to continue?");
10251031
if (MessageBox.Show(message, Catalog.GetString("Attention"), MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) != DialogResult.Yes)
10261032
{
10271033
// cancelled

0 commit comments

Comments
 (0)