diff --git a/Source/Menu/ContentForm.Designer.cs b/Source/Menu/ContentForm.Designer.cs index e73463364..a3ece4ada 100644 --- a/Source/Menu/ContentForm.Designer.cs +++ b/Source/Menu/ContentForm.Designer.cs @@ -17,7 +17,7 @@ using System.Windows.Forms; -namespace ORTS +namespace Menu { partial class ContentForm : Form { @@ -418,7 +418,7 @@ private void InitializeComponent() // // pbContent // - this.pbContent.Image = global::ORTS.Properties.Resources.info_18_hover; + this.pbContent.Image = global::Menu.Properties.Resources.info_18_hover; this.pbContent.Location = new System.Drawing.Point(598, 12); this.pbContent.Name = "pbContent"; this.pbContent.Size = new System.Drawing.Size(18, 18); diff --git a/Source/Menu/ContentForm.cs b/Source/Menu/ContentForm.cs index e76a2f7b5..54bb4d37e 100644 --- a/Source/Menu/ContentForm.cs +++ b/Source/Menu/ContentForm.cs @@ -33,7 +33,7 @@ using System.Threading.Tasks; using GNU.Gettext.WinForms; -namespace ORTS +namespace Menu { public partial class ContentForm : Form { @@ -1120,25 +1120,25 @@ private int determineSelectedIndex(ComboBox comboBox, string compareWith) switch (classOfItem) { case "Folder": - comboboxName = ((Menu.Folder)comboBox.Items[index]).Name; + comboboxName = ((ORTS.Menu.Folder)comboBox.Items[index]).Name; break; case "Route": - comboboxName = ((Menu.Route)comboBox.Items[index]).Name; + comboboxName = ((ORTS.Menu.Route)comboBox.Items[index]).Name; break; case "DefaultExploreActivity": - comboboxName = ((Menu.Activity)comboBox.Items[index]).Name; + comboboxName = ((ORTS.Menu.Activity)comboBox.Items[index]).Name; break; case "Locomotive": - comboboxName = ((Menu.Locomotive)comboBox.Items[index]).Name; + comboboxName = ((ORTS.Menu.Locomotive)comboBox.Items[index]).Name; break; case "Consist": - comboboxName = ((Menu.Consist)comboBox.Items[index]).Name; + comboboxName = ((ORTS.Menu.Consist)comboBox.Items[index]).Name; break; case "String": comboboxName = (string)comboBox.Items[index]; break; case "Path": - comboboxName = ((Menu.Path)comboBox.Items[index]).End; + comboboxName = ((ORTS.Menu.Path)comboBox.Items[index]).End; break; case "KeyedComboBoxItem": comboboxName = ((MainForm.KeyedComboBoxItem)comboBox.Items[index]).Value; diff --git a/Source/Menu/ImportExportSaveForm.Designer.cs b/Source/Menu/ImportExportSaveForm.Designer.cs index 442b9452f..7e7476593 100644 --- a/Source/Menu/ImportExportSaveForm.Designer.cs +++ b/Source/Menu/ImportExportSaveForm.Designer.cs @@ -1,4 +1,4 @@ -namespace ORTS { +namespace Menu { partial class ImportExportSaveForm { /// /// Required designer variable. diff --git a/Source/Menu/ImportExportSaveForm.cs b/Source/Menu/ImportExportSaveForm.cs index cf3db721a..71cc104df 100644 --- a/Source/Menu/ImportExportSaveForm.cs +++ b/Source/Menu/ImportExportSaveForm.cs @@ -25,7 +25,7 @@ using GNU.Gettext.WinForms; using ORTS.Settings; -namespace ORTS +namespace Menu { public partial class ImportExportSaveForm : Form { diff --git a/Source/Menu/KeyInputControl.Designer.cs b/Source/Menu/KeyInputControl.Designer.cs index eb4f13177..5650ecdd4 100644 --- a/Source/Menu/KeyInputControl.Designer.cs +++ b/Source/Menu/KeyInputControl.Designer.cs @@ -1,6 +1,6 @@  -namespace ORTS +namespace Menu { partial class KeyInputControl { diff --git a/Source/Menu/KeyInputControl.cs b/Source/Menu/KeyInputControl.cs index ba10cf90b..835eee20d 100644 --- a/Source/Menu/KeyInputControl.cs +++ b/Source/Menu/KeyInputControl.cs @@ -20,7 +20,7 @@ using System.Windows.Forms; using ORTS.Settings; -namespace ORTS +namespace Menu { /// /// A control for viewing and altering keyboard input settings, in combination with . diff --git a/Source/Menu/KeyInputEditControl.Designer.cs b/Source/Menu/KeyInputEditControl.Designer.cs index fe7f27b3d..52165e995 100644 --- a/Source/Menu/KeyInputEditControl.Designer.cs +++ b/Source/Menu/KeyInputEditControl.Designer.cs @@ -1,4 +1,4 @@ -namespace ORTS +namespace Menu { partial class KeyInputEditControl { diff --git a/Source/Menu/KeyInputEditControl.cs b/Source/Menu/KeyInputEditControl.cs index 8a7cc266b..ef235f894 100644 --- a/Source/Menu/KeyInputEditControl.cs +++ b/Source/Menu/KeyInputEditControl.cs @@ -23,7 +23,7 @@ using ORTS.Settings; using Xna = Microsoft.Xna.Framework.Input; -namespace ORTS +namespace Menu { /// /// A form used to edit keyboard input settings, in combination with . diff --git a/Source/Menu/MainForm.Designer.cs b/Source/Menu/MainForm.Designer.cs index 89817271d..e91b52ce6 100644 --- a/Source/Menu/MainForm.Designer.cs +++ b/Source/Menu/MainForm.Designer.cs @@ -1,6 +1,6 @@ // #define INCLUDE_TIMETABLE_INPUT -namespace ORTS +namespace Menu { partial class MainForm { @@ -894,7 +894,7 @@ private void InitializeComponent() // pbNotificationsSome // this.pbNotificationsSome.BackColor = System.Drawing.Color.Transparent; - this.pbNotificationsSome.Image = global::ORTS.Properties.Resources.chat_icon_new_message_transparent; + this.pbNotificationsSome.Image = global::Menu.Properties.Resources.chat_icon_new_message_transparent; this.pbNotificationsSome.Location = new System.Drawing.Point(805, 0); this.pbNotificationsSome.Name = "pbNotificationsSome"; this.pbNotificationsSome.Size = new System.Drawing.Size(37, 31); @@ -905,7 +905,7 @@ private void InitializeComponent() // // pbNotificationsNone // - this.pbNotificationsNone.Image = global::ORTS.Properties.Resources.chat_icon_no_message_transparent; + this.pbNotificationsNone.Image = global::Menu.Properties.Resources.chat_icon_no_message_transparent; this.pbNotificationsNone.InitialImage = ((System.Drawing.Image)(resources.GetObject("pbNotificationsNone.InitialImage"))); this.pbNotificationsNone.Location = new System.Drawing.Point(805, 0); this.pbNotificationsNone.Name = "pbNotificationsNone"; diff --git a/Source/Menu/MainForm.cs b/Source/Menu/MainForm.cs index c9310a096..c41fd76a4 100644 --- a/Source/Menu/MainForm.cs +++ b/Source/Menu/MainForm.cs @@ -27,6 +27,7 @@ using System.Windows.Forms; using GNU.Gettext; using GNU.Gettext.WinForms; +using Menu.Notifications; using Orts.Formats.OR; using ORTS.Common; using ORTS.Menu; @@ -35,7 +36,7 @@ using Activity = ORTS.Menu.Activity; using Path = ORTS.Menu.Path; -namespace ORTS +namespace Menu { public partial class MainForm : Form { @@ -69,7 +70,7 @@ public enum UserAction Task> PathLoader; Task> TimetableSetLoader; Task> TimetableWeatherFileLoader; - readonly ResourceManager Resources = new ResourceManager("ORTS.Properties.Resources", typeof(MainForm).Assembly); + readonly ResourceManager Resources = new ResourceManager("Menu.Properties.Resources", typeof(MainForm).Assembly); readonly UpdateManager UpdateManager; readonly Image ElevationIcon; NotificationManager NotificationManager; diff --git a/Source/Menu/Menu.csproj b/Source/Menu/Menu.csproj index ada9eac59..2558d7369 100644 --- a/Source/Menu/Menu.csproj +++ b/Source/Menu/Menu.csproj @@ -3,7 +3,6 @@ net6-windows net472 WinExe - ORTS ..\ORTS.ico true true diff --git a/Source/Menu/Notifications/NotificationManager.cs b/Source/Menu/Notifications/NotificationManager.cs index 3bf5b28a8..060b47179 100644 --- a/Source/Menu/Notifications/NotificationManager.cs +++ b/Source/Menu/Notifications/NotificationManager.cs @@ -31,7 +31,7 @@ using ORTS.Settings; using ORTS.Updater; using static ORTS.Common.SystemInfo; -using static ORTS.NotificationPage; +using static Menu.Notifications.NotificationPage; // Behaviour // Notifications are read only once as a background task at start into Notifications. @@ -40,7 +40,7 @@ // the visibility of each notification in NotificationList is re-assessed. Also its date. // Every time the user selects a different notification page, the panel is re-loaded with items for that page. -namespace ORTS +namespace Menu.Notifications { public class NotificationManager { diff --git a/Source/Menu/Notifications/NotificationPage.cs b/Source/Menu/Notifications/NotificationPage.cs index 3c30b2c84..98c110899 100644 --- a/Source/Menu/Notifications/NotificationPage.cs +++ b/Source/Menu/Notifications/NotificationPage.cs @@ -24,7 +24,7 @@ using Button = System.Windows.Forms.Button; using Image = System.Drawing.Image; -namespace ORTS +namespace Menu.Notifications { /// /// Holds presentation details of the current notification displayed on the panel. diff --git a/Source/Menu/Notifications/Notifications.cs b/Source/Menu/Notifications/Notifications.cs index 7745586c3..10575bcab 100644 --- a/Source/Menu/Notifications/Notifications.cs +++ b/Source/Menu/Notifications/Notifications.cs @@ -18,7 +18,7 @@ using System.Collections.Generic; -namespace ORTS +namespace Menu.Notifications { public class Notifications { diff --git a/Source/Menu/Options.Designer.cs b/Source/Menu/Options.Designer.cs index 69fef6b26..5fcd1e6be 100644 --- a/Source/Menu/Options.Designer.cs +++ b/Source/Menu/Options.Designer.cs @@ -1,4 +1,4 @@ -namespace ORTS +namespace Menu { partial class OptionsForm { @@ -479,7 +479,7 @@ private void InitializeComponent() // // pbOverspeedMonitor // - this.pbOverspeedMonitor.Image = global::ORTS.Properties.Resources.info_18; + this.pbOverspeedMonitor.Image = global::Menu.Properties.Resources.info_18; this.pbOverspeedMonitor.Location = new System.Drawing.Point(296, 7); this.pbOverspeedMonitor.Name = "pbOverspeedMonitor"; this.pbOverspeedMonitor.Size = new System.Drawing.Size(18, 18); @@ -491,7 +491,7 @@ private void InitializeComponent() // // pbEnableTcsScripts // - this.pbEnableTcsScripts.Image = global::ORTS.Properties.Resources.info_18; + this.pbEnableTcsScripts.Image = global::Menu.Properties.Resources.info_18; this.pbEnableTcsScripts.Location = new System.Drawing.Point(6, 263); this.pbEnableTcsScripts.Name = "pbEnableTcsScripts"; this.pbEnableTcsScripts.Size = new System.Drawing.Size(18, 18); @@ -503,7 +503,7 @@ private void InitializeComponent() // // pbOtherUnits // - this.pbOtherUnits.Image = global::ORTS.Properties.Resources.info_18; + this.pbOtherUnits.Image = global::Menu.Properties.Resources.info_18; this.pbOtherUnits.Location = new System.Drawing.Point(6, 234); this.pbOtherUnits.Name = "pbOtherUnits"; this.pbOtherUnits.Size = new System.Drawing.Size(18, 18); @@ -515,7 +515,7 @@ private void InitializeComponent() // // pbPressureUnit // - this.pbPressureUnit.Image = global::ORTS.Properties.Resources.info_18; + this.pbPressureUnit.Image = global::Menu.Properties.Resources.info_18; this.pbPressureUnit.Location = new System.Drawing.Point(6, 207); this.pbPressureUnit.Name = "pbPressureUnit"; this.pbPressureUnit.Size = new System.Drawing.Size(18, 18); @@ -527,7 +527,7 @@ private void InitializeComponent() // // pbBrakePipeChargingRate // - this.pbBrakePipeChargingRate.Image = global::ORTS.Properties.Resources.info_18; + this.pbBrakePipeChargingRate.Image = global::Menu.Properties.Resources.info_18; this.pbBrakePipeChargingRate.Location = new System.Drawing.Point(6, 145); this.pbBrakePipeChargingRate.Name = "pbBrakePipeChargingRate"; this.pbBrakePipeChargingRate.Size = new System.Drawing.Size(18, 18); @@ -539,7 +539,7 @@ private void InitializeComponent() // // pbGraduatedRelease // - this.pbGraduatedRelease.Image = global::ORTS.Properties.Resources.info_18; + this.pbGraduatedRelease.Image = global::Menu.Properties.Resources.info_18; this.pbGraduatedRelease.Location = new System.Drawing.Point(6, 122); this.pbGraduatedRelease.Name = "pbGraduatedRelease"; this.pbGraduatedRelease.Size = new System.Drawing.Size(18, 18); @@ -551,7 +551,7 @@ private void InitializeComponent() // // pbRetainers // - this.pbRetainers.Image = global::ORTS.Properties.Resources.info_18; + this.pbRetainers.Image = global::Menu.Properties.Resources.info_18; this.pbRetainers.Location = new System.Drawing.Point(6, 99); this.pbRetainers.Name = "pbRetainers"; this.pbRetainers.Size = new System.Drawing.Size(18, 18); @@ -563,7 +563,7 @@ private void InitializeComponent() // // pbAlerter // - this.pbAlerter.Image = global::ORTS.Properties.Resources.info_18; + this.pbAlerter.Image = global::Menu.Properties.Resources.info_18; this.pbAlerter.Location = new System.Drawing.Point(6, 7); this.pbAlerter.Name = "pbAlerter"; this.pbAlerter.Size = new System.Drawing.Size(18, 18); @@ -683,7 +683,7 @@ private void InitializeComponent() // // pbExternalSoundPassThruPercent // - this.pbExternalSoundPassThruPercent.Image = global::ORTS.Properties.Resources.info_18; + this.pbExternalSoundPassThruPercent.Image = global::Menu.Properties.Resources.info_18; this.pbExternalSoundPassThruPercent.Location = new System.Drawing.Point(11, 73); this.pbExternalSoundPassThruPercent.Name = "pbExternalSoundPassThruPercent"; this.pbExternalSoundPassThruPercent.Size = new System.Drawing.Size(18, 18); @@ -695,7 +695,7 @@ private void InitializeComponent() // // pbSoundDetailLevel // - this.pbSoundDetailLevel.Image = global::ORTS.Properties.Resources.info_18; + this.pbSoundDetailLevel.Image = global::Menu.Properties.Resources.info_18; this.pbSoundDetailLevel.Location = new System.Drawing.Point(11, 41); this.pbSoundDetailLevel.Name = "pbSoundDetailLevel"; this.pbSoundDetailLevel.Size = new System.Drawing.Size(18, 18); @@ -707,7 +707,7 @@ private void InitializeComponent() // // pbSoundVolumePercent // - this.pbSoundVolumePercent.Image = global::ORTS.Properties.Resources.info_18; + this.pbSoundVolumePercent.Image = global::Menu.Properties.Resources.info_18; this.pbSoundVolumePercent.Location = new System.Drawing.Point(11, 9); this.pbSoundVolumePercent.Name = "pbSoundVolumePercent"; this.pbSoundVolumePercent.Size = new System.Drawing.Size(18, 18); @@ -863,7 +863,7 @@ private void InitializeComponent() // // pbViewingFOV // - this.pbViewingFOV.Image = global::ORTS.Properties.Resources.info_18; + this.pbViewingFOV.Image = global::Menu.Properties.Resources.info_18; this.pbViewingFOV.Location = new System.Drawing.Point(312, 233); this.pbViewingFOV.Name = "pbViewingFOV"; this.pbViewingFOV.Size = new System.Drawing.Size(18, 18); @@ -885,7 +885,7 @@ private void InitializeComponent() // // pbLODBias // - this.pbLODBias.Image = global::ORTS.Properties.Resources.info_18; + this.pbLODBias.Image = global::Menu.Properties.Resources.info_18; this.pbLODBias.Location = new System.Drawing.Point(312, 169); this.pbLODBias.Name = "pbLODBias"; this.pbLODBias.Size = new System.Drawing.Size(18, 18); @@ -897,7 +897,7 @@ private void InitializeComponent() // // pbWorldObjectDensity // - this.pbWorldObjectDensity.Image = global::ORTS.Properties.Resources.info_18; + this.pbWorldObjectDensity.Image = global::Menu.Properties.Resources.info_18; this.pbWorldObjectDensity.Location = new System.Drawing.Point(312, 137); this.pbWorldObjectDensity.Name = "pbWorldObjectDensity"; this.pbWorldObjectDensity.Size = new System.Drawing.Size(18, 18); @@ -909,7 +909,7 @@ private void InitializeComponent() // // pbAntiAliasing // - this.pbAntiAliasing.Image = global::ORTS.Properties.Resources.info_18; + this.pbAntiAliasing.Image = global::Menu.Properties.Resources.info_18; this.pbAntiAliasing.Location = new System.Drawing.Point(312, 73); this.pbAntiAliasing.Name = "pbAntiAliasing"; this.pbAntiAliasing.Size = new System.Drawing.Size(18, 18); @@ -921,7 +921,7 @@ private void InitializeComponent() // // pbVerticalSync // - this.pbVerticalSync.Image = global::ORTS.Properties.Resources.info_18; + this.pbVerticalSync.Image = global::Menu.Properties.Resources.info_18; this.pbVerticalSync.Location = new System.Drawing.Point(312, 41); this.pbVerticalSync.Name = "pbVerticalSync"; this.pbVerticalSync.Size = new System.Drawing.Size(18, 18); @@ -933,7 +933,7 @@ private void InitializeComponent() // // pbModelInstancing // - this.pbModelInstancing.Image = global::ORTS.Properties.Resources.info_18; + this.pbModelInstancing.Image = global::Menu.Properties.Resources.info_18; this.pbModelInstancing.Location = new System.Drawing.Point(312, 9); this.pbModelInstancing.Name = "pbModelInstancing"; this.pbModelInstancing.Size = new System.Drawing.Size(18, 18); @@ -945,7 +945,7 @@ private void InitializeComponent() // // pbDayAmbientLight // - this.pbDayAmbientLight.Image = global::ORTS.Properties.Resources.info_18; + this.pbDayAmbientLight.Image = global::Menu.Properties.Resources.info_18; this.pbDayAmbientLight.Location = new System.Drawing.Point(11, 297); this.pbDayAmbientLight.Name = "pbDayAmbientLight"; this.pbDayAmbientLight.Size = new System.Drawing.Size(18, 18); @@ -957,7 +957,7 @@ private void InitializeComponent() // // pbSignalLightGlow // - this.pbSignalLightGlow.Image = global::ORTS.Properties.Resources.info_18; + this.pbSignalLightGlow.Image = global::Menu.Properties.Resources.info_18; this.pbSignalLightGlow.Location = new System.Drawing.Point(11, 265); this.pbSignalLightGlow.Name = "pbSignalLightGlow"; this.pbSignalLightGlow.Size = new System.Drawing.Size(18, 18); @@ -969,7 +969,7 @@ private void InitializeComponent() // // pbDoubleWire // - this.pbDoubleWire.Image = global::ORTS.Properties.Resources.info_18; + this.pbDoubleWire.Image = global::Menu.Properties.Resources.info_18; this.pbDoubleWire.Location = new System.Drawing.Point(11, 233); this.pbDoubleWire.Name = "pbDoubleWire"; this.pbDoubleWire.Size = new System.Drawing.Size(18, 18); @@ -981,7 +981,7 @@ private void InitializeComponent() // // pbWire // - this.pbWire.Image = global::ORTS.Properties.Resources.info_18; + this.pbWire.Image = global::Menu.Properties.Resources.info_18; this.pbWire.Location = new System.Drawing.Point(11, 201); this.pbWire.Name = "pbWire"; this.pbWire.Size = new System.Drawing.Size(18, 18); @@ -993,7 +993,7 @@ private void InitializeComponent() // // pbShadowAllShapes // - this.pbShadowAllShapes.Image = global::ORTS.Properties.Resources.info_18; + this.pbShadowAllShapes.Image = global::Menu.Properties.Resources.info_18; this.pbShadowAllShapes.Location = new System.Drawing.Point(11, 169); this.pbShadowAllShapes.Name = "pbShadowAllShapes"; this.pbShadowAllShapes.Size = new System.Drawing.Size(18, 18); @@ -1005,7 +1005,7 @@ private void InitializeComponent() // // pbDynamicShadows // - this.pbDynamicShadows.Image = global::ORTS.Properties.Resources.info_18; + this.pbDynamicShadows.Image = global::Menu.Properties.Resources.info_18; this.pbDynamicShadows.Location = new System.Drawing.Point(11, 137); this.pbDynamicShadows.Name = "pbDynamicShadows"; this.pbDynamicShadows.Size = new System.Drawing.Size(18, 18); @@ -1017,7 +1017,7 @@ private void InitializeComponent() // // pbLODViewingExtension // - this.pbLODViewingExtension.Image = global::ORTS.Properties.Resources.info_18; + this.pbLODViewingExtension.Image = global::Menu.Properties.Resources.info_18; this.pbLODViewingExtension.Location = new System.Drawing.Point(11, 105); this.pbLODViewingExtension.Name = "pbLODViewingExtension"; this.pbLODViewingExtension.Size = new System.Drawing.Size(18, 18); @@ -1029,7 +1029,7 @@ private void InitializeComponent() // // pbDistantMountains // - this.pbDistantMountains.Image = global::ORTS.Properties.Resources.info_18; + this.pbDistantMountains.Image = global::Menu.Properties.Resources.info_18; this.pbDistantMountains.Location = new System.Drawing.Point(11, 41); this.pbDistantMountains.Name = "pbDistantMountains"; this.pbDistantMountains.Size = new System.Drawing.Size(18, 18); @@ -1041,7 +1041,7 @@ private void InitializeComponent() // // pbViewingDistance // - this.pbViewingDistance.Image = global::ORTS.Properties.Resources.info_18; + this.pbViewingDistance.Image = global::Menu.Properties.Resources.info_18; this.pbViewingDistance.Location = new System.Drawing.Point(11, 9); this.pbViewingDistance.Name = "pbViewingDistance"; this.pbViewingDistance.Size = new System.Drawing.Size(18, 18); @@ -1970,7 +1970,7 @@ private void InitializeComponent() // // pbPerformanceTuner // - this.pbPerformanceTuner.Image = global::ORTS.Properties.Resources.info_18; + this.pbPerformanceTuner.Image = global::Menu.Properties.Resources.info_18; this.pbPerformanceTuner.Location = new System.Drawing.Point(11, 330); this.pbPerformanceTuner.Name = "pbPerformanceTuner"; this.pbPerformanceTuner.Size = new System.Drawing.Size(18, 18); @@ -2034,7 +2034,7 @@ private void InitializeComponent() // // pbWebServerPort // - this.pbWebServerPort.Image = global::ORTS.Properties.Resources.info_18; + this.pbWebServerPort.Image = global::Menu.Properties.Resources.info_18; this.pbWebServerPort.Location = new System.Drawing.Point(11, 298); this.pbWebServerPort.Name = "pbWebServerPort"; this.pbWebServerPort.Size = new System.Drawing.Size(18, 18); @@ -2078,7 +2078,7 @@ private void InitializeComponent() // // pbControlConfirmations // - this.pbControlConfirmations.Image = global::ORTS.Properties.Resources.info_18; + this.pbControlConfirmations.Image = global::Menu.Properties.Resources.info_18; this.pbControlConfirmations.Location = new System.Drawing.Point(11, 266); this.pbControlConfirmations.Name = "pbControlConfirmations"; this.pbControlConfirmations.Size = new System.Drawing.Size(18, 18); @@ -2112,7 +2112,7 @@ private void InitializeComponent() // // pbWindowGlass // - this.pbWindowGlass.Image = global::ORTS.Properties.Resources.info_18; + this.pbWindowGlass.Image = global::Menu.Properties.Resources.info_18; this.pbWindowGlass.Location = new System.Drawing.Point(11, 234); this.pbWindowGlass.Name = "pbWindowGlass"; this.pbWindowGlass.Size = new System.Drawing.Size(18, 18); @@ -2172,7 +2172,7 @@ private void InitializeComponent() // // pbWindowed // - this.pbWindowed.Image = global::ORTS.Properties.Resources.info_18; + this.pbWindowed.Image = global::Menu.Properties.Resources.info_18; this.pbWindowed.Location = new System.Drawing.Point(11, 169); this.pbWindowed.Name = "pbWindowed"; this.pbWindowed.Size = new System.Drawing.Size(18, 18); @@ -2195,7 +2195,7 @@ private void InitializeComponent() // // pbUpdateMode // - this.pbUpdateMode.Image = global::ORTS.Properties.Resources.info_18; + this.pbUpdateMode.Image = global::Menu.Properties.Resources.info_18; this.pbUpdateMode.Location = new System.Drawing.Point(11, 52); this.pbUpdateMode.Name = "pbUpdateMode"; this.pbUpdateMode.Size = new System.Drawing.Size(18, 18); @@ -2207,7 +2207,7 @@ private void InitializeComponent() // // pbLanguage // - this.pbLanguage.Image = global::ORTS.Properties.Resources.info_18; + this.pbLanguage.Image = global::Menu.Properties.Resources.info_18; this.pbLanguage.Location = new System.Drawing.Point(11, 9); this.pbLanguage.Name = "pbLanguage"; this.pbLanguage.Size = new System.Drawing.Size(18, 18); @@ -2614,7 +2614,7 @@ private void InitializeComponent() // // pbSuperElevation // - this.pbSuperElevation.Image = global::ORTS.Properties.Resources.info_18; + this.pbSuperElevation.Image = global::Menu.Properties.Resources.info_18; this.pbSuperElevation.Location = new System.Drawing.Point(6, 23); this.pbSuperElevation.Name = "pbSuperElevation"; this.pbSuperElevation.Size = new System.Drawing.Size(18, 18); @@ -2626,7 +2626,7 @@ private void InitializeComponent() // // pbAutoSave // - this.pbAutoSave.Image = global::ORTS.Properties.Resources.info_18; + this.pbAutoSave.Image = global::Menu.Properties.Resources.info_18; this.pbAutoSave.Location = new System.Drawing.Point(6, 299); this.pbAutoSave.Name = "pbAutoSave"; this.pbAutoSave.Size = new System.Drawing.Size(18, 18); diff --git a/Source/Menu/Options.cs b/Source/Menu/Options.cs index 625b0e124..431b32246 100644 --- a/Source/Menu/Options.cs +++ b/Source/Menu/Options.cs @@ -32,7 +32,7 @@ using ORTS.Settings; using ORTS.Updater; -namespace ORTS +namespace Menu { public partial class OptionsForm : Form { diff --git a/Source/Menu/OptionsRailDriver.cs b/Source/Menu/OptionsRailDriver.cs index ee843731b..d99b598dc 100644 --- a/Source/Menu/OptionsRailDriver.cs +++ b/Source/Menu/OptionsRailDriver.cs @@ -8,10 +8,9 @@ using System.Windows.Forms; using ORTS.Common; using ORTS.Common.Input; -using Orts.Menu; using ORTS.Settings; -namespace ORTS +namespace Menu { public partial class OptionsForm : Form { diff --git a/Source/Menu/Program.cs b/Source/Menu/Program.cs index 6e97c4a64..895b09da2 100644 --- a/Source/Menu/Program.cs +++ b/Source/Menu/Program.cs @@ -21,7 +21,7 @@ using System.Diagnostics; using System.Windows.Forms; -namespace ORTS +namespace Menu { static class Program { diff --git a/Source/Menu/Properties/Resources.Designer.cs b/Source/Menu/Properties/Resources.Designer.cs index 8f1438fca..6f4fcc3f9 100644 --- a/Source/Menu/Properties/Resources.Designer.cs +++ b/Source/Menu/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace ORTS.Properties { +namespace Menu.Properties { using System; @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ORTS.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Menu.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Source/Menu/RDButtonInputControl.Designer.cs b/Source/Menu/RDButtonInputControl.Designer.cs index 3fd74f609..855b0c949 100644 --- a/Source/Menu/RDButtonInputControl.Designer.cs +++ b/Source/Menu/RDButtonInputControl.Designer.cs @@ -1,6 +1,6 @@  -namespace Orts.Menu +namespace Menu { partial class RDButtonInputControl { diff --git a/Source/Menu/RDButtonInputControl.cs b/Source/Menu/RDButtonInputControl.cs index c81eb6c63..6a49d3d1f 100644 --- a/Source/Menu/RDButtonInputControl.cs +++ b/Source/Menu/RDButtonInputControl.cs @@ -21,7 +21,7 @@ using ORTS.Common.Input; -namespace Orts.Menu +namespace Menu { /// /// A control for viewing and altering keyboard input settings, in combination with . diff --git a/Source/Menu/ResumeForm.Designer.cs b/Source/Menu/ResumeForm.Designer.cs index 5a1d50130..48b65c6d2 100644 --- a/Source/Menu/ResumeForm.Designer.cs +++ b/Source/Menu/ResumeForm.Designer.cs @@ -1,4 +1,4 @@ -namespace ORTS { +namespace Menu { partial class ResumeForm { /// /// Required designer variable. @@ -127,7 +127,7 @@ private void InitializeComponent() { // // saveBindingSource // - this.saveBindingSource.DataSource = typeof(ORTS.ResumeForm.Save); + this.saveBindingSource.DataSource = typeof(Menu.ResumeForm.Save); // // buttonResume // diff --git a/Source/Menu/ResumeForm.cs b/Source/Menu/ResumeForm.cs index e424c059e..6e4eb8a57 100644 --- a/Source/Menu/ResumeForm.cs +++ b/Source/Menu/ResumeForm.cs @@ -62,7 +62,7 @@ but displayed as a thumbnail. using ORTS.Settings; using Path = System.IO.Path; -namespace ORTS +namespace Menu { public partial class ResumeForm : Form { diff --git a/Source/Menu/SortableBindingList.cs b/Source/Menu/SortableBindingList.cs index 24c428095..7cfe8cb24 100644 --- a/Source/Menu/SortableBindingList.cs +++ b/Source/Menu/SortableBindingList.cs @@ -22,7 +22,7 @@ using System.Linq; using System.Text; -namespace ORTS +namespace Menu { public class SortableBindingList : BindingList { diff --git a/Source/Menu/Task.cs b/Source/Menu/Task.cs index 5ea91590c..4f98b980c 100644 --- a/Source/Menu/Task.cs +++ b/Source/Menu/Task.cs @@ -26,7 +26,7 @@ using System.Threading; using System.Windows.Forms; -namespace ORTS +namespace Menu { /// /// Allows work to be done as a background task so that the form remains responsive (e.g. to a cancel or close button). diff --git a/Source/Menu/TestingForm.Designer.cs b/Source/Menu/TestingForm.Designer.cs index d51ca31f5..a744b17a7 100644 --- a/Source/Menu/TestingForm.Designer.cs +++ b/Source/Menu/TestingForm.Designer.cs @@ -1,4 +1,4 @@ -namespace ORTS { +namespace Menu { partial class TestingForm { /// /// Required designer variable. @@ -250,7 +250,7 @@ private void InitializeComponent() { // // testBindingSource // - this.testBindingSource.DataSource = typeof(ORTS.TestingForm.TestActivity); + this.testBindingSource.DataSource = typeof(Menu.TestingForm.TestActivity); // // buttonDetails // diff --git a/Source/Menu/TestingForm.cs b/Source/Menu/TestingForm.cs index 3134297b4..d4d73a665 100644 --- a/Source/Menu/TestingForm.cs +++ b/Source/Menu/TestingForm.cs @@ -31,7 +31,7 @@ using Activity = ORTS.Menu.Activity; using Path = System.IO.Path; -namespace ORTS +namespace Menu { public partial class TestingForm : Form {