Updated themes

Author: Looky1173

Source/RunActivity/Viewer3D/Debugging/DebugViewerBetaForm.cs

@@ -27,6 +27,7 @@ public partial class DispatchViewerBeta : Form
         public readonly Simulator simulator;
         private readonly MapDataProvider MapDataProvider;
         private readonly MapThemeProvider MapThemeProvider;
+        private string ThemeName = "light";
         private ThemeStyle Theme;
         /// <summary>
         /// Used to periodically check if we should shift the view when the
@@ -140,7 +141,7 @@ void InitializeForm()
         {
             MapDataProvider.SetControls();
             MapThemeProvider.InitializeThemes();
-            Theme = MapThemeProvider.LightTheme;
+            Theme = MapThemeProvider.GetTheme(ThemeName);
 
             float[] dashPattern = { 4, 2 };
             ZoomTargetPen.DashPattern = dashPattern;
@@ -1714,7 +1715,12 @@ private void DispatchViewerBeta_Resize(object sender, EventArgs e)
 
         private void rotateThemesButton_Click(object sender, EventArgs e)
         {
-            Theme = Theme == MapThemeProvider.LightTheme ? MapThemeProvider.DarkTheme : MapThemeProvider.LightTheme;
+            // Cycles through the array of available themes
+            string[] themes = MapThemeProvider.GetThemes();
+            int i = Array.IndexOf(themes, ThemeName);
+            ThemeName = i >= 0 && i < themes.Length - 1 ? themes[i + 1] : themes[0];
+
+            Theme = MapThemeProvider.GetTheme(ThemeName);
 
             ApplyThemeRecursively(this);
             MapCanvasColor = Theme.MapCanvasColor;

Source/RunActivity/Viewer3D/Debugging/MapThemeProvider.cs

@@ -1,16 +1,15 @@
-using System.Drawing;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
 
 namespace Orts.Viewer3D.Debugging
 {
     public class MapThemeProvider
     {
-        public ThemeStyle LightTheme;
-        public ThemeStyle DarkTheme;
-
         public void InitializeThemes()
         {
-            LightTheme = new ThemeStyle
+            ThemeStyle LightTheme = new ThemeStyle
             {
                 BackColor = Color.Transparent,
                 ForeColor = SystemColors.ControlText,
@@ -20,7 +19,7 @@ public void InitializeThemes()
                 TrackColor = Color.FromArgb(46, 64, 83),
             };
 
-            DarkTheme = new ThemeStyle
+            ThemeStyle DarkTheme = new ThemeStyle
             {
                 BackColor = Color.FromArgb(44, 62, 80),
                 ForeColor = Color.FromArgb(247, 249, 249),
@@ -29,6 +28,50 @@ public void InitializeThemes()
                 MapCanvasColor = Color.FromArgb(44, 62, 80),
                 TrackColor = Color.FromArgb(234, 236, 238),
             };
+
+            // Reference for "solarized" themes: https://github.com/altercation/solarized?tab=readme-ov-file#the-values
+            ThemeStyle LightSolarizedTheme = new ThemeStyle
+            {
+                BackColor = Color.FromArgb(253, 246, 227),
+                ForeColor = Color.FromArgb(101, 123, 131),
+                PanelBackColor = Color.FromArgb(238, 232, 213),
+                FlatStyle = FlatStyle.Flat,
+                MapCanvasColor = Color.FromArgb(253, 246, 227),
+                TrackColor = Color.FromArgb(88, 110, 117),
+            };
+
+            ThemeStyle DarkSolarizedTheme = new ThemeStyle
+            {
+                BackColor = Color.FromArgb(0, 43, 54),
+                ForeColor = Color.FromArgb(131, 148, 150),
+                PanelBackColor = Color.FromArgb(28, 40, 51),
+                FlatStyle = FlatStyle.Flat,
+                MapCanvasColor = Color.FromArgb(0, 43, 54),
+                TrackColor = Color.FromArgb(147, 161, 161),
+            };
+
+            Themes.Add("light", LightTheme);
+            Themes.Add("light-solarized", LightSolarizedTheme);
+            Themes.Add("dark-solarized", DarkSolarizedTheme);
+            Themes.Add("dark", DarkTheme);
+        }
+
+        private Dictionary<string, ThemeStyle> Themes = new Dictionary<string, ThemeStyle>();
+
+        public ThemeStyle GetTheme(string themeName)
+        {
+            if (Themes.TryGetValue(themeName, out ThemeStyle theme))
+            {
+                return theme;
+            }
+
+            // Handle the case when the theme doesn't exist
+            return null;
+        }
+
+        public string[] GetThemes()
+        {
+            return Themes.Keys.ToArray();
         }
     }