Merge pull request #1018 from twpol/feature/consistent-namespaces/menu

Refactor namespaces in Menu
openrails · Dec 29, 2024 · 20e879b · 20e879b
2 parents 161fc82 + ad5ac8b
commit 20e879b
Show file tree

Hide file tree

Showing 27 changed files with 76 additions and 77 deletions.
diff --git a/Source/Menu/ContentForm.Designer.cs b/Source/Menu/ContentForm.Designer.cs
diff --git 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
diff --git 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
diff --git 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
 {
     /// <summary>
     /// A control for viewing and altering keyboard input settings, in combination with <see cref="KeyInputEditControl"/>.

diff --git a/Source/Menu/KeyInputEditControl.Designer.cs b/Source/Menu/KeyInputEditControl.Designer.cs
diff --git 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
 {
     /// <summary>
     /// A form used to edit keyboard input settings, in combination with <see cref="KeyInputControl"/>.

diff --git a/Source/Menu/MainForm.Designer.cs b/Source/Menu/MainForm.Designer.cs
diff --git 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<List<Path>> PathLoader;
         Task<List<TimetableInfo>> TimetableSetLoader;
         Task<List<WeatherFileInfo>> 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
@@ -3,7 +3,6 @@
     <TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
     <TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>ORTS</RootNamespace>
     <ApplicationIcon>..\ORTS.ico</ApplicationIcon>
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>

diff --git 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
@@ -24,7 +24,7 @@
 using Button = System.Windows.Forms.Button;
 using Image = System.Drawing.Image;
 
-namespace ORTS
+namespace Menu.Notifications
 {
     /// <summary>
     /// 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
@@ -18,7 +18,7 @@
 using System.Collections.Generic;
 
 
-namespace ORTS
+namespace Menu.Notifications
 {
     public class Notifications
     {