Merge pull request #165 from jtsshieh/master

Added in all Win Plus Themes

2 files changed, 143 insertions, 1 deletions

diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
index 6b92d11..5caf02f 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs
@@ -53,8 +53,18 @@
             this.comboBox1.FormattingEnabled = true;
             this.comboBox1.Items.AddRange(new object[] {
             "Default",
+            "Windows 95 Default Plus",
             "Dangerous Creatures",
-            "Inside Your Computer"});
+            "Inside Your Computer",
+            "Leonardo da Vinci",
+            "More Windows",
+            "Mystery",
+            "Nature",
+            "Science",
+            "Sports",
+            "The 60\'s USA",
+            "The Golden Era",
+            "Travel"});
             this.comboBox1.Location = new System.Drawing.Point(15, 201);
             this.comboBox1.Name = "comboBox1";
             this.comboBox1.Size = new System.Drawing.Size(269, 21);
@@ -73,6 +83,13 @@
             // 
             // applyButton
             // 
+            this.applyButton.AdaptBackColorWithTheme = true;
+            this.applyButton.AdaptFontWithTheme = true;
+            this.applyButton.AdaptForeColorWithTheme = true;
+            this.applyButton.BackColor = System.Drawing.Color.Silver;
+            this.applyButton.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.applyButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.applyButton.ForeColor = System.Drawing.Color.Black;
             this.applyButton.Location = new System.Drawing.Point(209, 245);
             this.applyButton.Name = "applyButton";
             this.applyButton.Size = new System.Drawing.Size(75, 23);
@@ -82,6 +99,13 @@
             // 
             // cancelButton
             // 
+            this.cancelButton.AdaptBackColorWithTheme = true;
+            this.cancelButton.AdaptFontWithTheme = true;
+            this.cancelButton.AdaptForeColorWithTheme = true;
+            this.cancelButton.BackColor = System.Drawing.Color.Silver;
+            this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.cancelButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.cancelButton.ForeColor = System.Drawing.Color.Black;
             this.cancelButton.Location = new System.Drawing.Point(128, 245);
             this.cancelButton.Name = "cancelButton";
             this.cancelButton.Size = new System.Drawing.Size(75, 23);
@@ -91,6 +115,13 @@
             // 
             // okButton
             // 
+            this.okButton.AdaptBackColorWithTheme = true;
+            this.okButton.AdaptFontWithTheme = true;
+            this.okButton.AdaptForeColorWithTheme = true;
+            this.okButton.BackColor = System.Drawing.Color.Silver;
+            this.okButton.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.okButton.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.okButton.ForeColor = System.Drawing.Color.Black;
             this.okButton.Location = new System.Drawing.Point(47, 245);
             this.okButton.Name = "okButton";
             this.okButton.Size = new System.Drawing.Size(75, 23);
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
index 2529e10..cac1bb1 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs
@@ -35,6 +35,36 @@ namespace Histacom2.OS.Win95.Win95Apps
                 case "Inside Your Computer":
                     pictureBox2.BackgroundImage = Properties.Resources.ICTheme_BG;
                     break;
+                case "Windows 95 Default Plus":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusDefaultWallpaper;
+                    break;
+                case "The Golden Era":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusGoldenEraWallpaper;
+                    break;
+                case "Leonardo da Vinci":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusLeoWallpaper;
+                    break;
+                case "Mystery":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusMysteryWallpaper;
+                    break;
+                case "Nature":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusNatureWallpaper;
+                    break;
+                case "Science":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusScienceWallpaper;
+                    break;
+                case "Sports":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusSportsWallpaper;
+                    break;
+                case "The 60's USA":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusThe60Wallpaper;
+                    break;
+                case "Travel":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusTravelWallpaper;
+                    break;
+                case "More Windows":
+                    pictureBox2.BackgroundImage = Properties.Resources.Win95PlusMoreWin;
+                    break;
             }
         }
 
@@ -51,6 +81,37 @@ namespace Histacom2.OS.Win95.Win95Apps
                 case "insidepc":
                     comboBox1.SelectedItem = "Inside Your Computer";
                     break;
+                case "default95plus":
+                    comboBox1.SelectedItem = "Windows 95 Default Plus";
+                    break;
+                case "goldenera":
+                    comboBox1.SelectedItem = "The Golden Era";
+                    break;
+                case "Leo":
+                    comboBox1.SelectedItem = "Leonardo da Vinci";
+                    break;
+                case "Mystery":
+                    comboBox1.SelectedItem = "Mystery";
+                    break;
+                case "Nature":
+                    comboBox1.SelectedItem = "Nature";
+                    break;
+                case "Science":
+                    comboBox1.SelectedItem = "Science";
+                    break;
+                case "Sports":
+                    comboBox1.SelectedItem = "Sports";
+                    break;
+                case "The60":
+                    comboBox1.SelectedItem = "The 60's USA";
+                    break;
+                case "Travel":
+                    comboBox1.SelectedItem = "Travel";
+                    break;
+                case "MoreWin":
+                    comboBox1.SelectedItem = "More Windows";
+                    break;
+
             }
         }
 
@@ -89,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 = new Bitmap(Properties.Resources.Win95PlusDefaultWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "The Golden Era":
+                    SaveSystem.CurrentSave.ThemeName = "goldenera";
+                    SaveSystem.currentTheme = new GoldenEraTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusGoldenEraWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Leonardo da Vinci":
+                    SaveSystem.CurrentSave.ThemeName = "Leo";
+                    SaveSystem.currentTheme = new LeoTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusLeoWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Mystery":
+                    SaveSystem.CurrentSave.ThemeName = "Mystery";
+                    SaveSystem.currentTheme = new MysteryTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusMysteryWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Nature":
+                    SaveSystem.CurrentSave.ThemeName = "Nature";
+                    SaveSystem.currentTheme = new NatureTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusNatureWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Science":
+                    SaveSystem.CurrentSave.ThemeName = "Science";
+                    SaveSystem.currentTheme = new ScienceTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusScienceWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Sports":
+                    SaveSystem.CurrentSave.ThemeName = "Sports";
+                    SaveSystem.currentTheme = new SportsTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusSportsWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "The 60's USA":
+                    SaveSystem.CurrentSave.ThemeName = "The60";
+                    SaveSystem.currentTheme = new The60Theme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusThe60Wallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "Travel":
+                    SaveSystem.CurrentSave.ThemeName = "Travel";
+                    SaveSystem.currentTheme = new TravelTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusTravelWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
+                case "More Windows":
+                    SaveSystem.CurrentSave.ThemeName = "MoreWin";
+                    SaveSystem.currentTheme = new MoreWinTheme();
+                    TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.Win95PlusMoreWin, TitleScreen.frm95.Width, TitleScreen.frm95.Height);
+                    break;
             }
             foreach (Form f in Application.OpenForms)
             {