From 1babfac033b8add0dee2a8c9a4b34fd6f90ac222 Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 5 Jul 2017 09:51:37 -0400 Subject: Some more theme things --- TimeHACK.Engine/Properties/Resources.Designer.cs | 45 +++++++++++++++++++++ TimeHACK.Engine/Properties/Resources.resx | 15 +++++++ .../Resources/Win95PlusDangerousCreaturesStart.WAV | Bin 0 -> 93144 bytes TimeHACK.Engine/Resources/Win95Start.wav | Bin 0 -> 270382 bytes TimeHACK.Engine/Resources/Win95Stop.wav | Bin 0 -> 27804 bytes TimeHACK.Engine/Resources/Win98Start.wav | Bin 0 -> 693212 bytes TimeHACK.Engine/Resources/Win98Stop.WAV | Bin 0 -> 313116 bytes TimeHACK.Engine/Theme.cs | 39 ++++++++++++++++++ TimeHACK.Engine/TimeHACK.Engine.csproj | 6 +++ .../Win95Apps/WinClassicThemePanel.Designer.cs | 14 +++++++ 10 files changed, 119 insertions(+) create mode 100644 TimeHACK.Engine/Resources/Win95PlusDangerousCreaturesStart.WAV create mode 100644 TimeHACK.Engine/Resources/Win95Start.wav create mode 100644 TimeHACK.Engine/Resources/Win95Stop.wav create mode 100644 TimeHACK.Engine/Resources/Win98Start.wav create mode 100644 TimeHACK.Engine/Resources/Win98Stop.WAV create mode 100644 TimeHACK.Engine/Theme.cs diff --git a/TimeHACK.Engine/Properties/Resources.Designer.cs b/TimeHACK.Engine/Properties/Resources.Designer.cs index 0153858..e8b970e 100644 --- a/TimeHACK.Engine/Properties/Resources.Designer.cs +++ b/TimeHACK.Engine/Properties/Resources.Designer.cs @@ -199,6 +199,33 @@ namespace TimeHACK.Engine.Properties { } } + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream Win95PlusDangerousCreaturesStart { + get { + return ResourceManager.GetStream("Win95PlusDangerousCreaturesStart", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream Win95Start { + get { + return ResourceManager.GetStream("Win95Start", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream Win95Stop { + get { + return ResourceManager.GetStream("Win95Stop", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -209,6 +236,24 @@ namespace TimeHACK.Engine.Properties { } } + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream Win98Start { + get { + return ResourceManager.GetStream("Win98Start", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream Win98Stop { + get { + return ResourceManager.GetStream("Win98Stop", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Engine/Properties/Resources.resx b/TimeHACK.Engine/Properties/Resources.resx index ce1326d..4009cc9 100644 --- a/TimeHACK.Engine/Properties/Resources.resx +++ b/TimeHACK.Engine/Properties/Resources.resx @@ -181,4 +181,19 @@ ..\resources\chord.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\Win95PlusDangerousCreaturesStart.WAV;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Win95Start.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Win95Stop.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Win98Start.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Win98Stop.WAV;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/TimeHACK.Engine/Resources/Win95PlusDangerousCreaturesStart.WAV b/TimeHACK.Engine/Resources/Win95PlusDangerousCreaturesStart.WAV new file mode 100644 index 0000000..3b9666f Binary files /dev/null and b/TimeHACK.Engine/Resources/Win95PlusDangerousCreaturesStart.WAV differ diff --git a/TimeHACK.Engine/Resources/Win95Start.wav b/TimeHACK.Engine/Resources/Win95Start.wav new file mode 100644 index 0000000..d6ef0e2 Binary files /dev/null and b/TimeHACK.Engine/Resources/Win95Start.wav differ diff --git a/TimeHACK.Engine/Resources/Win95Stop.wav b/TimeHACK.Engine/Resources/Win95Stop.wav new file mode 100644 index 0000000..b3127d1 Binary files /dev/null and b/TimeHACK.Engine/Resources/Win95Stop.wav differ diff --git a/TimeHACK.Engine/Resources/Win98Start.wav b/TimeHACK.Engine/Resources/Win98Start.wav new file mode 100644 index 0000000..4d27f3d Binary files /dev/null and b/TimeHACK.Engine/Resources/Win98Start.wav differ diff --git a/TimeHACK.Engine/Resources/Win98Stop.WAV b/TimeHACK.Engine/Resources/Win98Stop.WAV new file mode 100644 index 0000000..2bc524e Binary files /dev/null and b/TimeHACK.Engine/Resources/Win98Stop.WAV differ diff --git a/TimeHACK.Engine/Theme.cs b/TimeHACK.Engine/Theme.cs new file mode 100644 index 0000000..645e714 --- /dev/null +++ b/TimeHACK.Engine/Theme.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TimeHACK.Engine +{ + public class Theme + { + public Stream startSound { get; set; } + public Stream stopSound { get; set; } + + public Stream asteriskSound { get; set; } + public Stream critStopSound { get; set; } + public Stream progErrorSound { get; set; } + public Stream questionSound { get; set; } + + public Image defaultWallpaper; + } + + public class Default95Theme: Theme + { + public Default95Theme() + { + startSound = Properties.Resources.Win95Start; + stopSound = Properties.Resources.Win95Stop; + + asteriskSound = Properties.Resources.CHORD; + critStopSound = Properties.Resources.CHORD; + progErrorSound = Properties.Resources.CHORD; + questionSound = Properties.Resources.CHORD; + + defaultWallpaper = null; + } + } +} diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index 3043220..a158eb7 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -77,6 +77,7 @@ WinClassic.cs + @@ -108,6 +109,11 @@ + + + + + diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs index 91ea2c6..9bef59e 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs @@ -30,7 +30,9 @@ { this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); // // pictureBox1 @@ -50,16 +52,27 @@ this.comboBox1.Size = new System.Drawing.Size(269, 21); this.comboBox1.TabIndex = 1; // + // pictureBox2 + // + this.pictureBox2.BackColor = System.Drawing.Color.Teal; + this.pictureBox2.Location = new System.Drawing.Point(74, 32); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(152, 112); + this.pictureBox2.TabIndex = 2; + this.pictureBox2.TabStop = false; + // // WinClassicThemePanel // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.pictureBox2); this.Controls.Add(this.comboBox1); this.Controls.Add(this.pictureBox1); this.Name = "WinClassicThemePanel"; this.Size = new System.Drawing.Size(301, 314); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); } @@ -68,5 +81,6 @@ private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.PictureBox pictureBox2; } } -- cgit v1.2.3