Skip to content

Commit 404907e

Browse files
committed
refactor: Remove custom root namespace from Menu
1 parent e5b8414 commit 404907e

27 files changed

+75
-77
lines changed

Source/Menu/ContentForm.Designer.cs

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

Source/Menu/ContentForm.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
using System.Threading.Tasks;
3434
using GNU.Gettext.WinForms;
3535

36-
namespace ORTS
36+
namespace Menu
3737
{
3838
public partial class ContentForm : Form
3939
{
@@ -1120,25 +1120,25 @@ private int determineSelectedIndex(ComboBox comboBox, string compareWith)
11201120
switch (classOfItem)
11211121
{
11221122
case "Folder":
1123-
comboboxName = ((Menu.Folder)comboBox.Items[index]).Name;
1123+
comboboxName = ((ORTS.Menu.Folder)comboBox.Items[index]).Name;
11241124
break;
11251125
case "Route":
1126-
comboboxName = ((Menu.Route)comboBox.Items[index]).Name;
1126+
comboboxName = ((ORTS.Menu.Route)comboBox.Items[index]).Name;
11271127
break;
11281128
case "DefaultExploreActivity":
1129-
comboboxName = ((Menu.Activity)comboBox.Items[index]).Name;
1129+
comboboxName = ((ORTS.Menu.Activity)comboBox.Items[index]).Name;
11301130
break;
11311131
case "Locomotive":
1132-
comboboxName = ((Menu.Locomotive)comboBox.Items[index]).Name;
1132+
comboboxName = ((ORTS.Menu.Locomotive)comboBox.Items[index]).Name;
11331133
break;
11341134
case "Consist":
1135-
comboboxName = ((Menu.Consist)comboBox.Items[index]).Name;
1135+
comboboxName = ((ORTS.Menu.Consist)comboBox.Items[index]).Name;
11361136
break;
11371137
case "String":
11381138
comboboxName = (string)comboBox.Items[index];
11391139
break;
11401140
case "Path":
1141-
comboboxName = ((Menu.Path)comboBox.Items[index]).End;
1141+
comboboxName = ((ORTS.Menu.Path)comboBox.Items[index]).End;
11421142
break;
11431143
case "KeyedComboBoxItem":
11441144
comboboxName = ((MainForm.KeyedComboBoxItem)comboBox.Items[index]).Value;

Source/Menu/ImportExportSaveForm.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/Menu/ImportExportSaveForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
using GNU.Gettext.WinForms;
2626
using ORTS.Settings;
2727

28-
namespace ORTS
28+
namespace Menu
2929
{
3030
public partial class ImportExportSaveForm : Form
3131
{

Source/Menu/KeyInputControl.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/Menu/KeyInputControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using System.Windows.Forms;
2121
using ORTS.Settings;
2222

23-
namespace ORTS
23+
namespace Menu
2424
{
2525
/// <summary>
2626
/// A control for viewing and altering keyboard input settings, in combination with <see cref="KeyInputEditControl"/>.

Source/Menu/KeyInputEditControl.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/Menu/KeyInputEditControl.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
using ORTS.Settings;
2424
using Xna = Microsoft.Xna.Framework.Input;
2525

26-
namespace ORTS
26+
namespace Menu
2727
{
2828
/// <summary>
2929
/// A form used to edit keyboard input settings, in combination with <see cref="KeyInputControl"/>.

Source/Menu/MainForm.Designer.cs

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

Source/Menu/MainForm.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
using Activity = ORTS.Menu.Activity;
3636
using Path = ORTS.Menu.Path;
3737

38-
namespace ORTS
38+
namespace Menu
3939
{
4040
public partial class MainForm : Form
4141
{
@@ -69,7 +69,7 @@ public enum UserAction
6969
Task<List<Path>> PathLoader;
7070
Task<List<TimetableInfo>> TimetableSetLoader;
7171
Task<List<WeatherFileInfo>> TimetableWeatherFileLoader;
72-
readonly ResourceManager Resources = new ResourceManager("ORTS.Properties.Resources", typeof(MainForm).Assembly);
72+
readonly ResourceManager Resources = new ResourceManager("Menu.Properties.Resources", typeof(MainForm).Assembly);
7373
readonly UpdateManager UpdateManager;
7474
readonly Image ElevationIcon;
7575
NotificationManager NotificationManager;

0 commit comments

Comments
 (0)