Make it permanent to cycle between all available themes by using the F9 key.

Author: neumatho

Source/Clients/NostalgicPlayer/Windows/WindowFormBase2.cs

@@ -3,15 +3,15 @@
 /* license of NostalgicPlayer is keep. See the LICENSE file for more          */
 /* information.                                                               */
 /******************************************************************************/
+using System;
 using System.Drawing;
 using System.Windows.Forms;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Containers.Settings;
 using Polycode.NostalgicPlayer.Client.GuiPlayer.Windows.MainWindow;
+using Polycode.NostalgicPlayer.Controls.Events;
 using Polycode.NostalgicPlayer.Controls.Forms;
 using Polycode.NostalgicPlayer.Controls.Images;
 using Polycode.NostalgicPlayer.Controls.Theme.Interfaces;
-using Polycode.NostalgicPlayer.Controls.Theme.Purple;
-using Polycode.NostalgicPlayer.Controls.Theme.Standard;
 using Polycode.NostalgicPlayer.Kit.Utility.Interfaces;
 
 namespace Polycode.NostalgicPlayer.Client.GuiPlayer.Windows
@@ -39,6 +39,7 @@ public class WindowFormBase2 : NostalgicForm, IWindowForm
 
 		private WindowSettings windowSettings;
 		private IThemeManager themeManager;
+		private Guid selectedTheme;
 
 		/********************************************************************/
 		/// <summary>
@@ -56,6 +57,10 @@ public void InitializeBaseForm(IMainWindowApi mainWindowApi, ISettings settings,
 			allWindowSettings = settings;
 			this.themeManager = themeManager;
 
+			// Find current theme ID
+			selectedTheme = themeManager.CurrentTheme.Id;
+			themeManager.ThemeChanged += ThemeManager_ThemeChanged;
+
 			// Set how the window should act in the task bar and task switcher.
 			// Only apply to child windows - the main window (where mainWindowApi.Form
 			// is not yet initialized) should always keep its default ShowInTaskbar = true
@@ -200,11 +205,17 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
 						break;
 					}
 
-					//XX Denne skal slettes når jeg er færdig
-					case Keys.F12:
+					case Keys.F9:
 					{
-						theme = !theme;
-						themeManager.SwitchTheme(theme ? new PurpleTheme() : new StandardTheme());
+						Guid[] availableThemes = themeManager.GetAvailableThemes();
+						int currentThemeIndex = availableThemes.IndexOf(selectedTheme);
+
+						if ((currentThemeIndex + 1) == availableThemes.Length)
+							currentThemeIndex = -1;
+
+						selectedTheme = availableThemes[currentThemeIndex + 1];
+
+						themeManager.SwitchTheme(selectedTheme);
 
 						return true;
 					}
@@ -213,7 +224,18 @@ protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
 
 			return base.ProcessCmdKey(ref msg, keyData);
 		}
-		private bool theme = false;
+
+
+
+		/********************************************************************/
+		/// <summary>
+		/// Is called when the theme changes
+		/// </summary>
+		/********************************************************************/
+		private void ThemeManager_ThemeChanged(object sender, ThemeChangedEventArgs e)
+		{
+			selectedTheme = e.NewTheme.Id;
+		}
 
 
 

Source/NostalgicPlayer.Controls/Theme/Interfaces/IThemeManager.cs

@@ -3,6 +3,8 @@
 /* license of NostalgicPlayer is keep. See the LICENSE file for more          */
 /* information.                                                               */
 /******************************************************************************/
+using System;
+using System.Collections.Generic;
 using Polycode.NostalgicPlayer.Controls.Events;
 
 namespace Polycode.NostalgicPlayer.Controls.Theme.Interfaces
@@ -17,19 +19,24 @@ public interface IThemeManager
 		/// </summary>
 		event ThemeChangedEventHandler ThemeChanged;
 
+		/// <summary>
+		/// Return all available themes that can be used
+		/// </summary>
+		Guid[] GetAvailableThemes();
+
 		/// <summary>
 		/// Return the current theme
 		/// </summary>
-		public ITheme CurrentTheme { get; }
+		ITheme CurrentTheme { get; }
 
 		/// <summary>
 		/// Switch to the new theme given
 		/// </summary>
-		public void SwitchTheme(ITheme newTheme);
+		void SwitchTheme(Guid themeId);
 
 		/// <summary>
 		/// Refresh all controls
 		/// </summary>
-		public void RefreshControls();
+		void RefreshControls();
 	}
 }

Source/NostalgicPlayer.Controls/Theme/ThemeManager.cs

@@ -4,8 +4,11 @@
 /* information.                                                               */
 /******************************************************************************/
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using Polycode.NostalgicPlayer.Controls.Events;
 using Polycode.NostalgicPlayer.Controls.Theme.Interfaces;
+using Polycode.NostalgicPlayer.Controls.Theme.Purple;
 using Polycode.NostalgicPlayer.Controls.Theme.Standard;
 
 namespace Polycode.NostalgicPlayer.Controls.Theme
@@ -17,7 +20,13 @@ namespace Polycode.NostalgicPlayer.Controls.Theme
 	/// </summary>
 	internal class ThemeManager : IThemeManager, IDisposable
 	{
-		private ITheme theme;
+		private readonly ITheme[] embeddedThemes =
+		[
+			new StandardTheme(),
+			new PurpleTheme()
+		];
+
+		private ITheme currentTheme;
 
 		/********************************************************************/
 		/// <summary>
@@ -26,7 +35,7 @@ internal class ThemeManager : IThemeManager, IDisposable
 		/********************************************************************/
 		public ThemeManager()
 		{
-			theme = new StandardTheme();
+			currentTheme = embeddedThemes[0];
 		}
 
 
@@ -38,10 +47,13 @@ public ThemeManager()
 		/********************************************************************/
 		public void Dispose()
 		{
-			if (theme is IDisposable disposable)
-				disposable.Dispose();
+			foreach (ITheme theme in embeddedThemes)
+			{
+				if (theme is IDisposable disposable)
+					disposable.Dispose();
+			}
 
-			theme = null;
+			currentTheme = null;
 		}
 
 
@@ -55,12 +67,24 @@ public void Dispose()
 
 
 
+		/********************************************************************/
+		/// <summary>
+		/// Return all available themes that can be used
+		/// </summary>
+		/********************************************************************/
+		public Guid[] GetAvailableThemes()
+		{
+			return GetThemes().Select(x => x.Id).ToArray();
+		}
+
+
+
 		/********************************************************************/
 		/// <summary>
 		/// Return the current theme
 		/// </summary>
 		/********************************************************************/
-		public ITheme CurrentTheme => theme;
+		public ITheme CurrentTheme => currentTheme;
 
 
 
@@ -69,12 +93,11 @@ public void Dispose()
 		/// Switch to the new theme given
 		/// </summary>
 		/********************************************************************/
-		public void SwitchTheme(ITheme newTheme)
+		public void SwitchTheme(Guid themeId)
 		{
-			if (theme is IDisposable disposable)
-				disposable.Dispose();
-
-			theme = newTheme;
+			currentTheme = GetThemes().FirstOrDefault(x => x.Id == themeId);
+			if (currentTheme == null)
+				currentTheme = embeddedThemes[0];
 
 			RefreshControls();
 		}
@@ -89,7 +112,20 @@ public void SwitchTheme(ITheme newTheme)
 		public void RefreshControls()
 		{
 			if (ThemeChanged != null)
-				ThemeChanged(this, new ThemeChangedEventArgs(theme));
+				ThemeChanged(this, new ThemeChangedEventArgs(currentTheme));
+		}
+
+		#region Private methods
+		/********************************************************************/
+		/// <summary>
+		/// Return all available themes that can be used
+		/// </summary>
+		/********************************************************************/
+		private IEnumerable<ITheme> GetThemes()
+		{
+			foreach (ITheme theme in embeddedThemes)
+				yield return theme;
 		}
+		#endregion
 	}
 }