Skip to content

Commit 91cf586

Browse files
committed
Automatic merge of T1.5.1-1192-gad17762377 and 17 pull requests
- Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value - 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 #885 at 8f473ce: feat: Add notifications to Menu - Pull request #891 at 9a1d6b2: Auto save - Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH - Pull request #952 at 8347095: Investigation - Pulsing graphics - Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes - Pull request #954 at 53e9cc6: Multiple Track Profiles & Superelevation Improvements - Pull request #962 at 46d0472: Fix pantographs on unpowered cars - Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed - Pull request #974 at 5faea6f: Bug fix for https://bugs.launchpad.net/or/+bug/2076034 Doors remain open in AI trains - Pull request #978 at 91f3ee8: fix: adds MilepostUnitsMiles to Manual - Pull request #979 at 57cade4: fix: update to news items - Pull request #980 at a7406de: Downloading route content (Github, zip) second part - Pull request #900 at c27f32d: DMI updates - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
19 parents 2a92f35 + ad17762 + 2452cb0 + dfc715e + d00beb9 + 8f473ce + 9a1d6b2 + 1f5ba4c + 8347095 + a519452 + 53e9cc6 + 46d0472 + e90a2aa + 5faea6f + 91f3ee8 + 57cade4 + a7406de + c27f32d + f92de76 commit 91cf586

File tree

3 files changed

+141
-92
lines changed

3 files changed

+141
-92
lines changed

Source/Menu/DownloadContentForm.Designer.cs

Lines changed: 126 additions & 79 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: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ public DownloadContentForm(UserSettings settings)
5555
{
5656
InitializeComponent();
5757

58+
// Windows 2000 and XP should use 8.25pt Tahoma, while Windows
59+
// Vista and later should use 9pt "Segoe UI". We'll use the
60+
// Message Box font to allow for user-customizations, though.
61+
Font = SystemFonts.MessageBoxFont;
62+
5863
this.FormBorderStyle = FormBorderStyle.FixedSingle; // remove resize control
5964
this.MaximizeBox = false; // disable maximize button
6065

@@ -1035,11 +1040,11 @@ private void DisableButtons()
10351040
dataGridViewDownloadContent.Enabled = false;
10361041
InstallPathTextBox.Enabled = false;
10371042
InstallPathBrowseButton.Enabled = false;
1038-
infoButton.Enabled = false;
1039-
downloadContentButton.Enabled = false;
1040-
updateButton.Enabled = false;
1041-
deleteButton.Enabled = false;
1042-
okButton.Enabled = false;
1043+
buttonInfo.Enabled = false;
1044+
buttonInstall.Enabled = false;
1045+
buttonUpdate.Enabled = false;
1046+
buttonDelete.Enabled = false;
1047+
buttonOK.Enabled = false;
10431048
}
10441049

10451050
private void setCursorToWaitCursor()
@@ -1057,11 +1062,11 @@ private void EnableButtons()
10571062
dataGridViewDownloadContent.Enabled = true;
10581063
InstallPathTextBox.Enabled = true;
10591064
InstallPathBrowseButton.Enabled = true;
1060-
infoButton.Enabled = true;
1061-
downloadContentButton.Enabled = !route.Installed;
1062-
updateButton.Enabled = route.Installed && (route.getDownloadType() == ContentRouteSettings.DownloadType.github);
1063-
deleteButton.Enabled = route.Installed;
1064-
okButton.Enabled = true;
1065+
buttonInfo.Enabled = true;
1066+
buttonInstall.Enabled = !route.Installed;
1067+
buttonUpdate.Enabled = route.Installed && (route.getDownloadType() == ContentRouteSettings.DownloadType.github);
1068+
buttonDelete.Enabled = route.Installed;
1069+
buttonOK.Enabled = true;
10651070

10661071
setCursorToDefaultCursor();
10671072
}

Source/Menu/DownloadContentForm.resx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,4 @@
120120
<metadata name="InstallPathDirectoryEntry.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
121121
<value>17, 17</value>
122122
</metadata>
123-
<metadata name="textBoxRoute.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124-
<value>True</value>
125-
</metadata>
126123
</root>

0 commit comments

Comments
 (0)