added in the validating for the themes

2 files changed, 70 insertions, 20 deletions

diff --git a/Histacom2.Engine/Theme.cs b/Histacom2.Engine/Theme.cs
index defe419..c6bba98 100644
--- a/Histacom2.Engine/Theme.cs
+++ b/Histacom2.Engine/Theme.cs
@@ -171,9 +171,9 @@ namespace Histacom2.Engine
         }
     }
 
-    public class Default95Plus : Theme
+    public class Default95PlusTheme : Theme
     {
-        public Default95Plus()
+        public Default95PlusTheme()
         {
             startSound = Properties.Resources.Win95PlusDefaultStop;
             stopSound = Properties.Resources.Win95PlusDefaultStop;
@@ -204,9 +204,9 @@ namespace Histacom2.Engine
         }
     }
 
-    public class GoldenEra : Theme
+    public class GoldenEraTheme : Theme
     {
-        public GoldenEra()
+        public GoldenEraTheme()
         {
             startSound = Properties.Resources.Win95PlusGoldenEraStop;
             stopSound = Properties.Resources.Win95PlusGoldenEraStop;
@@ -238,9 +238,9 @@ namespace Histacom2.Engine
     }
 
 
-    public class Leo : Theme
+    public class LeoTheme : Theme
     {
-        public Leo()
+        public LeoTheme()
         {
             startSound = Properties.Resources.Win95PlusLeoStart;
             stopSound = Properties.Resources.Win95PlusLeoStart;
@@ -271,9 +271,9 @@ namespace Histacom2.Engine
         }
     }
 
-    public class Mystery : Theme
+    public class MysteryTheme : Theme
     {
-        public Mystery()
+        public MysteryTheme()
         {
             startSound = Properties.Resources.Win95PlusMysteryStart;
             stopSound = Properties.Resources.Win95PlusMysteryStop;
@@ -304,9 +304,9 @@ namespace Histacom2.Engine
         }
     }
 
-    public class Nature : Theme
+    public class NatureTheme : Theme
     {
-        public Nature()
+        public NatureTheme()
         {
             startSound = Properties.Resources.Win95PlusNatureStart;
             stopSound = Properties.Resources.Win95PlusNatureStop;
@@ -337,9 +337,9 @@ namespace Histacom2.Engine
         }
     }
 
-    public class Science : Theme
+    public class ScienceTheme : Theme
     {
-        public Science()
+        public ScienceTheme()
         {
             startSound = Properties.Resources.Win95PlusScienceStart;
             stopSound = Properties.Resources.Win95PlusScienceStop;
@@ -370,9 +370,9 @@ namespace Histacom2.Engine
         }
     }
 
-    public class Sports : Theme
+    public class SportsTheme : Theme
     {
-        public Sports()
+        public SportsTheme()
         {
             startSound = Properties.Resources.Win95PlusSportsStart;
             stopSound = Properties.Resources.Win95PlusSportsStop;
@@ -403,9 +403,9 @@ namespace Histacom2.Engine
         }
     }
 
-    public class The60 : Theme
+    public class The60Theme : Theme
     {
-        public The60()
+        public The60Theme()
         {
             startSound = Properties.Resources.Win95PlusThe60Start;
             stopSound = Properties.Resources.Win95PlusThe60Stop;
@@ -436,9 +436,9 @@ namespace Histacom2.Engine
         }
     }
 
-    public class Travel : Theme
+    public class TravelTheme : Theme
     {
-        public Travel()
+        public TravelTheme()
         {
             startSound = Properties.Resources.Win95PlusTravelStart;
             stopSound = Properties.Resources.Win95PlusTravelStop;
@@ -469,9 +469,9 @@ namespace Histacom2.Engine
         }
     }
 
-    public class MoreWin : Default95Plus
+    public class MoreWinTheme : Default95PlusTheme
     {
-        public MoreWin()
+        public MoreWinTheme()
         {
             defaultWallpaper = Properties.Resources.Win95PlusMoreWin;
             themeName = "MoreWin";
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
index ca23b2b..a086f51 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
@@ -150,6 +150,56 @@ namespace Histacom2.OS.Win95.Win95Apps
                     SaveSystem.currentTheme = new InsideComputerTheme();
                     TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
                     break;
+                case "Windows 95 Default Plus":
+                    SaveSystem.CurrentSave.ThemeName = "default95plus";
+                    SaveSystem.currentTheme = new Default95PlusTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
+                    break;
+                case "The Golden Era":
+                    SaveSystem.CurrentSave.ThemeName = "goldenera";
+                    SaveSystem.currentTheme = new GoldenEraTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
+                    break;
+                case "Leonardo da Vinci":
+                    SaveSystem.CurrentSave.ThemeName = "Leo";
+                    SaveSystem.currentTheme = new LeoTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
+                    break;
+                case "Mystery":
+                    SaveSystem.CurrentSave.ThemeName = "Mystery";
+                    SaveSystem.currentTheme = new MysteryTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
+                    break;
+                case "Nature":
+                    SaveSystem.CurrentSave.ThemeName = "Nature";
+                    SaveSystem.currentTheme = new NatureTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
+                    break;
+                case "Science":
+                    SaveSystem.CurrentSave.ThemeName = "Science";
+                    SaveSystem.currentTheme = new ScienceTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
+                    break;
+                case "Sports":
+                    SaveSystem.CurrentSave.ThemeName = "Sports";
+                    SaveSystem.currentTheme = new SportsTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
+                    break;
+                case "The 60's USA":
+                    SaveSystem.CurrentSave.ThemeName = "The60";
+                    SaveSystem.currentTheme = new The60Theme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
+                    break;
+                case "Travel":
+                    SaveSystem.CurrentSave.ThemeName = "Travel";
+                    SaveSystem.currentTheme = new TravelTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
+                    break;
+                case "More Windows":
+                    SaveSystem.CurrentSave.ThemeName = "MoreWin";
+                    SaveSystem.currentTheme = new MoreWinTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = null;
+                    break;
             }
             foreach (Form f in Application.OpenForms)
             {