diff options
| author | lempamo <[email protected]> | 2017-10-22 22:19:29 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-10-22 22:19:29 -0500 |
| commit | 405684df5b9b411400996ca6fb8ec902ab947661 (patch) | |
| tree | 121f40478b3c4294a799bb1bba66afa0abed30c3 /Histacom2 | |
| parent | d27790a70f3c1e6e143943ff2f368206ed12360d (diff) | |
| parent | 0a531269cf4ca3c8cb242e42ec06c6a760949916 (diff) | |
| download | histacom2-405684df5b9b411400996ca6fb8ec902ab947661.tar.gz histacom2-405684df5b9b411400996ca6fb8ec902ab947661.tar.bz2 histacom2-405684df5b9b411400996ca6fb8ec902ab947661.zip | |
Merge pull request #165 from jtsshieh/master
Added in all Win Plus Themes
Diffstat (limited to 'Histacom2')
16 files changed, 297 insertions, 1 deletions
diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index 616c442..30c22ed 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -822,6 +822,17 @@ <None Include="Resources\WinClassicRtfFile.png" /> <None Include="Resources\WinClassicNotepad.png" /> <None Include="Resources\Win95Error.png" /> + <None Include="Resources\win95plusdangerouscreatureswallpaper.jpg" /> + <None Include="Resources\win95plusdefaultwallpaper.jpg" /> + <None Include="Resources\win95plusgoldenerawallpaper.jpg" /> + <None Include="Resources\win95plusleowallpaper.jpg" /> + <None Include="Resources\win95plusmorewin.jpg" /> + <None Include="Resources\win95plusmysterywallpaper.jpg" /> + <None Include="Resources\win95plusnaturewallpaper.jpg" /> + <None Include="Resources\win95plussciencewallpaper.jpg" /> + <None Include="Resources\win95plussportswallpaper.jpg" /> + <None Include="Resources\win95plusthe60wallpaper.jpg" /> + <None Include="Resources\win95plustravelwallpaper.jpg" /> <Content Include="Resources\WinClassic\16Color.png" /> <Content Include="Resources\WinClassic\256Color.png" /> <None Include="Resources\WinClassic\tada.wav" /> 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) { diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx index b436cc8..782693e 100644 --- a/Histacom2/Properties/Resources.resx +++ b/Histacom2/Properties/Resources.resx @@ -2062,4 +2062,37 @@ <data name="WinXPTour" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\WinClassic\WinXPTour.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="Win95PlusDangerousCreaturesWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plusdangerouscreatureswallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95PlusDefaultWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plusdefaultwallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95PlusGoldenEraWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plusgoldenerawallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95PlusLeoWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plusleowallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95PlusMoreWin" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plusmorewin.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95PlusMysteryWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plusmysterywallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95PlusNatureWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plusnaturewallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95PlusScienceWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plussciencewallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95PlusSportsWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plussportswallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95PlusThe60Wallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plusthe60wallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> + <data name="Win95PlusTravelWallpaper" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\win95plustravelwallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root>
\ No newline at end of file diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs index 5e0a54b..07a3730 100644 --- a/Histacom2/Properties/Resources1.Designer.cs +++ b/Histacom2/Properties/Resources1.Designer.cs @@ -1329,6 +1329,116 @@ namespace Histacom2.Properties { /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> + public static System.Drawing.Bitmap Win95PlusDangerousCreaturesWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusDangerousCreaturesWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + public static System.Drawing.Bitmap Win95PlusDefaultWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusDefaultWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + public static System.Drawing.Bitmap Win95PlusGoldenEraWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusGoldenEraWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + public static System.Drawing.Bitmap Win95PlusLeoWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusLeoWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + public static System.Drawing.Bitmap Win95PlusMoreWin { + get { + object obj = ResourceManager.GetObject("Win95PlusMoreWin", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + public static System.Drawing.Bitmap Win95PlusMysteryWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusMysteryWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + public static System.Drawing.Bitmap Win95PlusNatureWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusNatureWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + public static System.Drawing.Bitmap Win95PlusScienceWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusScienceWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + public static System.Drawing.Bitmap Win95PlusSportsWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusSportsWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + public static System.Drawing.Bitmap Win95PlusThe60Wallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusThe60Wallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> + public static System.Drawing.Bitmap Win95PlusTravelWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusTravelWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> public static System.Drawing.Bitmap Win95PrintersFolder { get { object obj = ResourceManager.GetObject("Win95PrintersFolder", resourceCulture); diff --git a/Histacom2/Resources/win95plusdangerouscreatureswallpaper.jpg b/Histacom2/Resources/win95plusdangerouscreatureswallpaper.jpg Binary files differnew file mode 100644 index 0000000..eb31a05 --- /dev/null +++ b/Histacom2/Resources/win95plusdangerouscreatureswallpaper.jpg diff --git a/Histacom2/Resources/win95plusdefaultwallpaper.jpg b/Histacom2/Resources/win95plusdefaultwallpaper.jpg Binary files differnew file mode 100644 index 0000000..9b1e6cc --- /dev/null +++ b/Histacom2/Resources/win95plusdefaultwallpaper.jpg diff --git a/Histacom2/Resources/win95plusgoldenerawallpaper.jpg b/Histacom2/Resources/win95plusgoldenerawallpaper.jpg Binary files differnew file mode 100644 index 0000000..fa7cdb2 --- /dev/null +++ b/Histacom2/Resources/win95plusgoldenerawallpaper.jpg diff --git a/Histacom2/Resources/win95plusleowallpaper.jpg b/Histacom2/Resources/win95plusleowallpaper.jpg Binary files differnew file mode 100644 index 0000000..e0350fa --- /dev/null +++ b/Histacom2/Resources/win95plusleowallpaper.jpg diff --git a/Histacom2/Resources/win95plusmorewin.jpg b/Histacom2/Resources/win95plusmorewin.jpg Binary files differnew file mode 100644 index 0000000..d8e3439 --- /dev/null +++ b/Histacom2/Resources/win95plusmorewin.jpg diff --git a/Histacom2/Resources/win95plusmysterywallpaper.jpg b/Histacom2/Resources/win95plusmysterywallpaper.jpg Binary files differnew file mode 100644 index 0000000..7691936 --- /dev/null +++ b/Histacom2/Resources/win95plusmysterywallpaper.jpg diff --git a/Histacom2/Resources/win95plusnaturewallpaper.jpg b/Histacom2/Resources/win95plusnaturewallpaper.jpg Binary files differnew file mode 100644 index 0000000..1d9e237 --- /dev/null +++ b/Histacom2/Resources/win95plusnaturewallpaper.jpg diff --git a/Histacom2/Resources/win95plussciencewallpaper.jpg b/Histacom2/Resources/win95plussciencewallpaper.jpg Binary files differnew file mode 100644 index 0000000..a0d9080 --- /dev/null +++ b/Histacom2/Resources/win95plussciencewallpaper.jpg diff --git a/Histacom2/Resources/win95plussportswallpaper.jpg b/Histacom2/Resources/win95plussportswallpaper.jpg Binary files differnew file mode 100644 index 0000000..4425f1a --- /dev/null +++ b/Histacom2/Resources/win95plussportswallpaper.jpg diff --git a/Histacom2/Resources/win95plusthe60wallpaper.jpg b/Histacom2/Resources/win95plusthe60wallpaper.jpg Binary files differnew file mode 100644 index 0000000..e23fe40 --- /dev/null +++ b/Histacom2/Resources/win95plusthe60wallpaper.jpg diff --git a/Histacom2/Resources/win95plustravelwallpaper.jpg b/Histacom2/Resources/win95plustravelwallpaper.jpg Binary files differnew file mode 100644 index 0000000..ef346da --- /dev/null +++ b/Histacom2/Resources/win95plustravelwallpaper.jpg |
