From d968d36f0d7715633185ae948368cc32e3c751ab Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 5 Jul 2017 17:15:09 -0400 Subject: Theme wallpapers work! --- TimeHACK.Engine/TimeHACK.Engine.csproj | 3 + .../OS/Win2K/Win2KApps/SurviveTheDay.Designer.cs | 364 ++++++++++----------- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 17 +- TimeHACK.Main/OS/Win95/Win95.cs | 21 ++ TimeHACK.Main/OS/Win95/Win95.resx | 60 ++-- .../FRMWinClassicAddressBookNewContact.Designer.cs | 4 +- .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 4 +- .../Win95Apps/WinClassicFTPClient.Designer.cs | 6 +- .../Win95Apps/WinClassicThemePanel.Designer.cs | 48 ++- .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 68 ++++ TimeHACK.Main/Properties/Resources.Designer.cs | 10 + TimeHACK.Main/Properties/Resources.resx | 3 + TimeHACK.Main/Resources/DCTheme_BG.JPG | Bin 0 -> 99357 bytes .../SaveDialogs/LoadGameProfileItem.Designer.cs | 4 +- TimeHACK.Main/TimeHACK.Main.csproj | 4 + 15 files changed, 372 insertions(+), 244 deletions(-) create mode 100644 TimeHACK.Main/Resources/DCTheme_BG.JPG diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index 0a9a4fa..22e9038 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -78,6 +78,9 @@ WinClassic.cs + + Component + diff --git a/TimeHACK.Main/OS/Win2K/Win2KApps/SurviveTheDay.Designer.cs b/TimeHACK.Main/OS/Win2K/Win2KApps/SurviveTheDay.Designer.cs index e580b9c..0d6ae23 100644 --- a/TimeHACK.Main/OS/Win2K/Win2KApps/SurviveTheDay.Designer.cs +++ b/TimeHACK.Main/OS/Win2K/Win2KApps/SurviveTheDay.Designer.cs @@ -1,182 +1,182 @@ -namespace TimeHACK.OS.Win2K.Win2KApps -{ - partial class SurviveTheDay - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Component Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.words = new System.Windows.Forms.Label(); - this.time = new System.Windows.Forms.Label(); - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); - this.button5 = new System.Windows.Forms.Button(); - this.gameoverlbl = new System.Windows.Forms.Label(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.SuspendLayout(); - // - // words - // - this.words.Font = new System.Drawing.Font("Courier New", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.words.ForeColor = System.Drawing.Color.White; - this.words.Location = new System.Drawing.Point(35, 35); - this.words.Name = "words"; - this.words.Size = new System.Drawing.Size(568, 149); - this.words.TabIndex = 2; - this.words.Text = "Welcome to Survive The Day.\r\nYour goal is simple.\r\nMake it from 4 AM to midnight " + - "without dying.\r\nThe time will be displayed in the bottom right corner.\r\nGood luc" + - "k... you WILL need it."; - // - // time - // - this.time.Font = new System.Drawing.Font("Courier New", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.time.ForeColor = System.Drawing.Color.Red; - this.time.Location = new System.Drawing.Point(514, 409); - this.time.Name = "time"; - this.time.Size = new System.Drawing.Size(89, 19); - this.time.TabIndex = 3; - this.time.Text = "--:-- --"; - this.time.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // button1 - // - this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button1.Font = new System.Drawing.Font("Courier New", 12F); - this.button1.ForeColor = System.Drawing.Color.White; - this.button1.Location = new System.Drawing.Point(35, 227); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(568, 28); - this.button1.TabIndex = 4; - this.button1.Tag = "start"; - this.button1.Text = "Play"; - this.button1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.choice_click); - // - // button2 - // - this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button2.Font = new System.Drawing.Font("Courier New", 12F); - this.button2.ForeColor = System.Drawing.Color.White; - this.button2.Location = new System.Drawing.Point(35, 261); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(568, 28); - this.button2.TabIndex = 5; - this.button2.Text = "--"; - this.button2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button2.UseVisualStyleBackColor = true; - this.button2.Visible = false; - this.button2.Click += new System.EventHandler(this.choice_click); - // - // button3 - // - this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button3.Font = new System.Drawing.Font("Courier New", 12F); - this.button3.ForeColor = System.Drawing.Color.White; - this.button3.Location = new System.Drawing.Point(35, 295); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(568, 28); - this.button3.TabIndex = 6; - this.button3.Text = "--"; - this.button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button3.UseVisualStyleBackColor = true; - this.button3.Visible = false; - this.button3.Click += new System.EventHandler(this.choice_click); - // - // button4 - // - this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button4.Font = new System.Drawing.Font("Courier New", 12F); - this.button4.ForeColor = System.Drawing.Color.White; - this.button4.Location = new System.Drawing.Point(35, 329); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(568, 28); - this.button4.TabIndex = 7; - this.button4.Text = "--"; - this.button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button4.UseVisualStyleBackColor = true; - this.button4.Visible = false; - this.button4.Click += new System.EventHandler(this.choice_click); - // - // button5 - // - this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button5.Font = new System.Drawing.Font("Courier New", 12F); - this.button5.ForeColor = System.Drawing.Color.White; - this.button5.Location = new System.Drawing.Point(35, 363); - this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(568, 28); - this.button5.TabIndex = 8; - this.button5.Text = "--"; - this.button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button5.UseVisualStyleBackColor = true; - this.button5.Visible = false; - this.button5.Click += new System.EventHandler(this.choice_click); - // - // gameoverlbl - // - this.gameoverlbl.Font = new System.Drawing.Font("Courier New", 12F, System.Drawing.FontStyle.Bold); - this.gameoverlbl.ForeColor = System.Drawing.Color.Red; - this.gameoverlbl.Location = new System.Drawing.Point(35, 192); - this.gameoverlbl.Name = "gameoverlbl"; - this.gameoverlbl.Size = new System.Drawing.Size(568, 21); - this.gameoverlbl.TabIndex = 10; - this.gameoverlbl.Text = "GAME OVER: No death, this shouldn\'t show in game!"; - this.gameoverlbl.Visible = false; - // - // SurviveTheDay - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.Black; - this.Controls.Add(this.gameoverlbl); - this.Controls.Add(this.button5); - this.Controls.Add(this.button4); - this.Controls.Add(this.button3); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); - this.Controls.Add(this.time); - this.Controls.Add(this.words); - this.Name = "SurviveTheDay"; - this.Size = new System.Drawing.Size(635, 459); - this.ResumeLayout(false); - - } - - #endregion - private System.Windows.Forms.Label words; - private System.Windows.Forms.Label time; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; - private System.Windows.Forms.Button button5; - private System.Windows.Forms.Label gameoverlbl; - private System.Windows.Forms.Timer timer1; - } -} +namespace TimeHACK.OS.Win2K.Win2KApps +{ + partial class SurviveTheDay + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + this.words = new System.Windows.Forms.Label(); + this.time = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.button5 = new System.Windows.Forms.Button(); + this.gameoverlbl = new System.Windows.Forms.Label(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + this.SuspendLayout(); + // + // words + // + this.words.Font = new System.Drawing.Font("Courier New", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.words.ForeColor = System.Drawing.Color.White; + this.words.Location = new System.Drawing.Point(35, 35); + this.words.Name = "words"; + this.words.Size = new System.Drawing.Size(568, 149); + this.words.TabIndex = 2; + this.words.Text = "Welcome to Survive The Day.\r\nYour goal is simple.\r\nMake it from 4 AM to midnight " + + "without dying.\r\nThe time will be displayed in the bottom right corner.\r\nGood luc" + + "k... you WILL need it."; + // + // time + // + this.time.Font = new System.Drawing.Font("Courier New", 12F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Italic))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.time.ForeColor = System.Drawing.Color.Red; + this.time.Location = new System.Drawing.Point(514, 409); + this.time.Name = "time"; + this.time.Size = new System.Drawing.Size(89, 19); + this.time.TabIndex = 3; + this.time.Text = "--:-- --"; + this.time.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // button1 + // + this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button1.Font = new System.Drawing.Font("Courier New", 12F); + this.button1.ForeColor = System.Drawing.Color.White; + this.button1.Location = new System.Drawing.Point(35, 227); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(568, 28); + this.button1.TabIndex = 4; + this.button1.Tag = "start"; + this.button1.Text = "Play"; + this.button1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.choice_click); + // + // cancelButton + // + this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button2.Font = new System.Drawing.Font("Courier New", 12F); + this.button2.ForeColor = System.Drawing.Color.White; + this.button2.Location = new System.Drawing.Point(35, 261); + this.button2.Name = "cancelButton"; + this.button2.Size = new System.Drawing.Size(568, 28); + this.button2.TabIndex = 5; + this.button2.Text = "--"; + this.button2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button2.UseVisualStyleBackColor = true; + this.button2.Visible = false; + this.button2.Click += new System.EventHandler(this.choice_click); + // + // button3 + // + this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button3.Font = new System.Drawing.Font("Courier New", 12F); + this.button3.ForeColor = System.Drawing.Color.White; + this.button3.Location = new System.Drawing.Point(35, 295); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(568, 28); + this.button3.TabIndex = 6; + this.button3.Text = "--"; + this.button3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button3.UseVisualStyleBackColor = true; + this.button3.Visible = false; + this.button3.Click += new System.EventHandler(this.choice_click); + // + // button4 + // + this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button4.Font = new System.Drawing.Font("Courier New", 12F); + this.button4.ForeColor = System.Drawing.Color.White; + this.button4.Location = new System.Drawing.Point(35, 329); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(568, 28); + this.button4.TabIndex = 7; + this.button4.Text = "--"; + this.button4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button4.UseVisualStyleBackColor = true; + this.button4.Visible = false; + this.button4.Click += new System.EventHandler(this.choice_click); + // + // button5 + // + this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button5.Font = new System.Drawing.Font("Courier New", 12F); + this.button5.ForeColor = System.Drawing.Color.White; + this.button5.Location = new System.Drawing.Point(35, 363); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(568, 28); + this.button5.TabIndex = 8; + this.button5.Text = "--"; + this.button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + this.button5.UseVisualStyleBackColor = true; + this.button5.Visible = false; + this.button5.Click += new System.EventHandler(this.choice_click); + // + // gameoverlbl + // + this.gameoverlbl.Font = new System.Drawing.Font("Courier New", 12F, System.Drawing.FontStyle.Bold); + this.gameoverlbl.ForeColor = System.Drawing.Color.Red; + this.gameoverlbl.Location = new System.Drawing.Point(35, 192); + this.gameoverlbl.Name = "gameoverlbl"; + this.gameoverlbl.Size = new System.Drawing.Size(568, 21); + this.gameoverlbl.TabIndex = 10; + this.gameoverlbl.Text = "GAME OVER: No death, this shouldn\'t show in game!"; + this.gameoverlbl.Visible = false; + // + // SurviveTheDay + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Black; + this.Controls.Add(this.gameoverlbl); + this.Controls.Add(this.button5); + this.Controls.Add(this.button4); + this.Controls.Add(this.button3); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Controls.Add(this.time); + this.Controls.Add(this.words); + this.Name = "SurviveTheDay"; + this.Size = new System.Drawing.Size(635, 459); + this.ResumeLayout(false); + + } + + #endregion + private System.Windows.Forms.Label words; + private System.Windows.Forms.Label time; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.Button button5; + private System.Windows.Forms.Label gameoverlbl; + private System.Windows.Forms.Timer timer1; + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 6464567..e164439 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -143,7 +143,7 @@ namespace TimeHACK.OS.Win95 // // panel1 // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.panel1.AutoSize = true; this.panel1.Controls.Add(this.panel2); @@ -243,7 +243,7 @@ namespace TimeHACK.OS.Win95 this.startmenuitems.Name = "startmenuitems"; this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(145, 311); + this.startmenuitems.Size = new System.Drawing.Size(145, 292); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -273,7 +273,6 @@ namespace TimeHACK.OS.Win95 this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.ProgramsToolStripMenuItem.Text = "Programs"; - this.ProgramsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); // // AccessoriesToolStripMenuItem // @@ -299,7 +298,6 @@ namespace TimeHACK.OS.Win95 this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem"; this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.AccessoriesToolStripMenuItem.Text = "Accessories"; - this.AccessoriesToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); // // CommunicationsToolStripMenuItem // @@ -314,7 +312,6 @@ namespace TimeHACK.OS.Win95 this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem"; this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.CommunicationsToolStripMenuItem.Text = "Communications"; - this.CommunicationsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); // // InternetConnectionWizardToolStripMenuItem // @@ -355,7 +352,6 @@ namespace TimeHACK.OS.Win95 this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem"; this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.MultimediaToolStripMenuItem.Text = "Multimedia"; - this.MultimediaToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); // // CDPlayerToolStripMenuItem // @@ -414,7 +410,6 @@ namespace TimeHACK.OS.Win95 this.SystemToolsToolStripMenuItem.Name = "SystemToolsToolStripMenuItem"; this.SystemToolsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.SystemToolsToolStripMenuItem.Text = "System Tools"; - this.SystemToolsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); // // DiskDefragmenterToolStripMenuItem // @@ -556,7 +551,6 @@ namespace TimeHACK.OS.Win95 this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem"; this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.StartUpToolStripMenuItem.Text = "Online Services"; - this.StartUpToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); // // AOLInternetFREETrialToolStripMenuItem // @@ -610,7 +604,6 @@ namespace TimeHACK.OS.Win95 this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem"; this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.MSDOSPromptToolStripMenuItem.Text = "StartUp"; - this.MSDOSPromptToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); // // EmptyToolStripMenuItem // @@ -645,7 +638,7 @@ namespace TimeHACK.OS.Win95 this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1"; this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt"; - this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(MSDOSPromptToolStripMenuItem1_Click); + this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click); // // OutlookExpressToolStripMenuItem // @@ -748,7 +741,6 @@ namespace TimeHACK.OS.Win95 this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.DocumentsToolStripMenuItem.Text = "Documents"; - this.DocumentsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); // // windowManagerTestToolStripMenuItem // @@ -799,7 +791,6 @@ namespace TimeHACK.OS.Win95 this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.SettingsToolStripMenuItem.Text = "Settings"; - this.SettingsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); // // ControlPanelToolStripMenuItem // @@ -845,7 +836,6 @@ namespace TimeHACK.OS.Win95 this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; this.FindToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.FindToolStripMenuItem.Text = "Find"; - this.FindToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); // // FilesOrFoldersToolStripMenuItem // @@ -1149,6 +1139,7 @@ namespace TimeHACK.OS.Win95 this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(150, 22); this.PropertiesToolStripMenuItem1.Text = "Properties"; + this.PropertiesToolStripMenuItem1.Click += new System.EventHandler(this.PropertiesToolStripMenuItem1_Click); // // Windows95 // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index a24932d..d83d45e 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -36,6 +36,17 @@ namespace TimeHACK.OS.Win95 { InitializeComponent(); startmenu.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + ProgramsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + AccessoriesToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + CommunicationsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + MultimediaToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + SystemToolsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + StartUpToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + MSDOSPromptToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + DocumentsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + SettingsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + FindToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + SetStyle(ControlStyles.SupportsTransparentBackColor, true); foreach (ToolStripMenuItem item in startmenuitems.Items) { item.MouseEnter += new EventHandler(MenuItem_MouseEnter); @@ -405,6 +416,16 @@ namespace TimeHACK.OS.Win95 app.BringToFront(); startmenu.Hide(); } + + private void PropertiesToolStripMenuItem1_Click(object sender, EventArgs e) + { + WinClassicThemePanel theme = new WinClassicThemePanel(); + WinClassic app = wm.StartWin95(theme, "Themes", null, false, true, false); + + AddTaskBarItem(app, app.Tag.ToString(), "Themes", null); + app.BringToFront(); + startmenu.Hide(); + } } public class MyRenderer : ToolStripProfessionalRenderer { diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx index 38f1073..2e8769b 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -117,27 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - iVBORw0KGgoAAAANSUhEUgAAAAMAAAAcCAIAAAArypKmAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABdJREFUKFNjOAADDP9hAEkMSo801oEDAK4uvzipdjzMAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAADYAAAAWCAIAAAAEi/i8AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAARJJREFUSEvdlQEOwjAMA/f0PY2f8JSROl6apg1jgonCCRXHSam1amLZ5mYR5Os+ - K+u61oi3Kfm7iGV0h9b1vBoRqQawfSWDiP3BZQLg1QJVNcO0AK23SSPaakiqJuJeYFPBl5k+pB9OLxqT - DaciejJ/SD88iChHqzCwy+VTTkYUQikEJ2gljWhrTNaBTYQWoLWbLBzmmwhaSS9aw3URWel/ksINLb7l - taClYY7vqlaGr8umwsAuoQaWiJaSQy2+dahNBK2kEW3FRzmI6MtT2kTQSnrRe6Aay4nC8CnSArSAd1Qb - oSuEcvgUm18XykQOhy4jjWirB31C6ysRFZxeodvxpPUp0ojz8FMRRU1LiTg7y/IA/2bUcHiDzYsAAAAA - SUVORK5CYII= - - 17, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N @@ -285,38 +268,37 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACVSURBVDhPlZELEsQgDEI9em7uBhVN2HTtvhmqotBf+4/e - s36ih6mIrgcmARX2CdaJE/brnn+LJZhvYFo3czeFp3/W0U9UYWgjfiq4honsr5I6/EZewDDG8sBNMwgY - iAUvQMG5+7VA9vcTBENKzPCB4T284ikYTFNKao1SH3IBwHwdqIroJ7hJxvxJGf+Hy2RJLLrR2gerBkDv - 4H+zGwAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME + Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu + QmCC - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAC7SURBVDhPdU8BEgQhCOrp/bwT0WKpY4bRCMlGYc05FyqP - CdWSOD98Y5QI7KqaDbqXAX9MwOvu6/EAMQPde9CBD5upez1rvQNQi8DWlaUn1jRCi1ghAg55LwHRbTIA - Qy3hxWjWlxKULttgfTbBQPeotskJaNNMHo0BvVX7kgkNCFwBQFQG+OvAFcCQdwB6bARSp9rmJHpofYZZ - Xs3+CnAysLapAaV+Yw8o+Q0SHgw4d8A93OQGJIdkMDjGD7QCaoJbLIxPAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 + NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j + Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACVSURBVDhPlZCBEoAgCEP9dP6cGrCa5ZG9u51GbKKjxz21 - jZWBwjfYCjE3Ozt9SICGtDzNhBN9hKxPVjUBMNcums22Rr5BQIZwXCjJsK0JwlSNDKHwPmulJ4iA2Kik - 8eyYQQ3lWkHeX1U/ZjOCb6MG8M4zZbuAuQ1QYFcpZeGaPAM6ytIH6OmQUhauyeoNPnj1o/BDww9Iu0V1 - d9BzlgAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m + M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu + QmCC - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACSSURBVDhPrZGBDoAgCET9dP7c5OBSEme2brsw8J6uCiUi - 9Wkf7cXNtZZQX0FW4RGSWWeQvpxKBHCDdEA8sS1Rs5ulgLDGE70UkgKmsNo0QZaAKWyVAYS1bm+AAasD - GNaaArhGM4T1o0ZICuhD+wPqG6jnNhMyAXhC5rajRQxAiPUd4GJj4Qjx/ql+h3wCQEO4lAsJcX7eS0qA - zQAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK + 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC @@ -407,7 +389,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAWABAQFgAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAXABAQFwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs index 4319d9e..7eb3196 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs @@ -124,10 +124,10 @@ this.label4.TabIndex = 4; this.label4.Text = "Emails:"; // - // button2 + // cancelButton // this.button2.Location = new System.Drawing.Point(13, 114); - this.button2.Name = "button2"; + this.button2.Name = "cancelButton"; this.button2.Size = new System.Drawing.Size(75, 23); this.button2.TabIndex = 5; this.button2.Text = "Add"; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index 8fcc79c..b7f9de3 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -230,12 +230,12 @@ this.label7.Text = "To speak, just type in the bottom textbox, then click the Speak button or press E" + "nter."; // - // button2 + // cancelButton // this.button2.BackColor = System.Drawing.Color.Silver; this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button2.Location = new System.Drawing.Point(422, 415); - this.button2.Name = "button2"; + this.button2.Name = "cancelButton"; this.button2.Size = new System.Drawing.Size(71, 23); this.button2.TabIndex = 8; this.button2.Text = "Speak"; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index 45203e1..485b982 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -180,13 +180,13 @@ this.panel1.Size = new System.Drawing.Size(762, 30); this.panel1.TabIndex = 9; // - // button2 + // cancelButton // this.button2.Location = new System.Drawing.Point(3, 2); - this.button2.Name = "button2"; + this.button2.Name = "cancelButton"; this.button2.Size = new System.Drawing.Size(75, 23); this.button2.TabIndex = 0; - this.button2.Text = "button2"; + this.button2.Text = "cancelButton"; this.button2.UseVisualStyleBackColor = true; // // welcomeLabel diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs index 9bef59e..e6bdda1 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs @@ -31,6 +31,9 @@ this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.comboBox1 = new System.Windows.Forms.ComboBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.applyButton = new System.Windows.Forms.Button(); + this.cancelButton = new System.Windows.Forms.Button(); + this.okButton = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); @@ -46,31 +49,71 @@ // // comboBox1 // + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "Default", + "Dangerous Creatures"}); this.comboBox1.Location = new System.Drawing.Point(15, 201); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(269, 21); this.comboBox1.TabIndex = 1; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // // pictureBox2 // this.pictureBox2.BackColor = System.Drawing.Color.Teal; + this.pictureBox2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; 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; // + // applyButton + // + this.applyButton.Location = new System.Drawing.Point(209, 245); + this.applyButton.Name = "applyButton"; + this.applyButton.Size = new System.Drawing.Size(75, 23); + this.applyButton.TabIndex = 3; + this.applyButton.Text = "Apply"; + this.applyButton.UseVisualStyleBackColor = true; + this.applyButton.Click += new System.EventHandler(this.applyButton_Click); + // + // cancelButton + // + this.cancelButton.Location = new System.Drawing.Point(128, 245); + this.cancelButton.Name = "cancelButton"; + this.cancelButton.Size = new System.Drawing.Size(75, 23); + this.cancelButton.TabIndex = 4; + this.cancelButton.Text = "Cancel"; + this.cancelButton.UseVisualStyleBackColor = true; + this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); + // + // okButton + // + this.okButton.Location = new System.Drawing.Point(47, 245); + this.okButton.Name = "okButton"; + this.okButton.Size = new System.Drawing.Size(75, 23); + this.okButton.TabIndex = 5; + this.okButton.Text = "OK"; + this.okButton.UseVisualStyleBackColor = true; + this.okButton.Click += new System.EventHandler(this.okButton_Click); + // // 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.okButton); + this.Controls.Add(this.cancelButton); + this.Controls.Add(this.applyButton); 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); + this.Size = new System.Drawing.Size(301, 281); + this.Load += new System.EventHandler(this.WinClassicThemePanel_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); this.ResumeLayout(false); @@ -82,5 +125,8 @@ private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.Button applyButton; + private System.Windows.Forms.Button cancelButton; + private System.Windows.Forms.Button okButton; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs index 5fc072e..e15bde5 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TimeHACK.Engine; namespace TimeHACK.OS.Win95.Win95Apps { @@ -15,6 +16,73 @@ namespace TimeHACK.OS.Win95.Win95Apps public WinClassicThemePanel() { InitializeComponent(); + applyButton.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + cancelButton.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + okButton.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + } + + private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + switch ((string)comboBox1.SelectedItem) + { + case "Default": + pictureBox2.BackgroundImage = null; + break; + case "Dangerous Creatures": + pictureBox2.BackgroundImage = Properties.Resources.DCTheme_BG; + break; + } + } + + private void WinClassicThemePanel_Load(object sender, EventArgs e) + { + switch (SaveSystem.CurrentSave.ThemeName) + { + case "default95": + comboBox1.SelectedItem = "Default"; + break; + case "dangeranimals": + comboBox1.SelectedItem = "Dangerous Creatures"; + break; + } + } + + private void cancelButton_Click(object sender, EventArgs e) + { + ParentForm.Close(); + } + + private void applyButton_Click(object sender, EventArgs e) + { + switch ((string)comboBox1.SelectedItem) + { + case "Default": + SaveSystem.currentTheme = new Default95Theme(); + TitleScreen.frm95.BackgroundImage = null; + break; + case "Dangerous Creatures": + SaveSystem.currentTheme = new DangerousCreaturesTheme(); + TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; + break; + } + } + + private void okButton_Click(object sender, EventArgs e) + { + switch ((string)comboBox1.SelectedItem) + { + case "Default": + SaveSystem.currentTheme = new Default95Theme(); + TitleScreen.frm95.BackgroundImage = null; + TitleScreen.frm95.desktopicons.BackgroundImage = null; + break; + case "Dangerous Creatures": + SaveSystem.currentTheme = new DangerousCreaturesTheme(); + TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; + TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); + break; + } + ParentForm.Close(); } } } diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 8520a6f..3797b07 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -125,6 +125,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap DCTheme_BG { + get { + object obj = ResourceManager.GetObject("DCTheme_BG", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 3599c0a..355e0eb 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -576,4 +576,7 @@ ..\Resources\WinAboutSeparator95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\DCTheme_BG.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/DCTheme_BG.JPG b/TimeHACK.Main/Resources/DCTheme_BG.JPG new file mode 100644 index 0000000..eb31a05 Binary files /dev/null and b/TimeHACK.Main/Resources/DCTheme_BG.JPG differ diff --git a/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.Designer.cs b/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.Designer.cs index 61a0976..1df1330 100644 --- a/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.Designer.cs +++ b/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.Designer.cs @@ -137,12 +137,12 @@ this.button1.UseVisualStyleBackColor = false; this.button1.Click += new System.EventHandler(this.button1_Click); // - // button2 + // cancelButton // this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(192)))), ((int)(((byte)(0))))); this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.button2.Location = new System.Drawing.Point(136, 20); - this.button2.Name = "button2"; + this.button2.Name = "cancelButton"; this.button2.Size = new System.Drawing.Size(109, 23); this.button2.TabIndex = 1; this.button2.Text = "No"; diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index fc7ae74..ffcd0ca 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -119,6 +119,9 @@ + + ..\..\..\..\Downloads\TransparentListView\TransparentListView.dll + @@ -409,6 +412,7 @@ + -- cgit v1.2.3 From fa18e32a23d001d75afdc550742eeb89e1608328 Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 5 Jul 2017 17:25:36 -0400 Subject: Theme sounds work! --- TimeHACK.Engine/SaveSystem.cs | 13 +++++++++++++ TimeHACK.Engine/Theme.cs | 1 + TimeHACK.Main/OS/Win95/Win95.cs | 7 +++++-- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs | 4 ++++ TimeHACK.Main/Program.cs | 2 +- TimeHACK.Main/TitleScreen.cs | 1 + 6 files changed, 25 insertions(+), 3 deletions(-) diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs index 7110995..5ea5831 100644 --- a/TimeHACK.Engine/SaveSystem.cs +++ b/TimeHACK.Engine/SaveSystem.cs @@ -220,6 +220,19 @@ namespace TimeHACK.Engine // CHANGE THE "JSON" TO "B64" ON A FINAL RELEASE! File.WriteAllText(Path.Combine(ProfileDirectory, ProfileFile), json); } + + public static void SetTheme() + { + switch (CurrentSave.ThemeName) + { + case "default95": + currentTheme = new Default95Theme(); + break; + case "dangeranimals": + currentTheme = new DangerousCreaturesTheme(); + break; + } + } } public class Save diff --git a/TimeHACK.Engine/Theme.cs b/TimeHACK.Engine/Theme.cs index cd82fac..804eb88 100644 --- a/TimeHACK.Engine/Theme.cs +++ b/TimeHACK.Engine/Theme.cs @@ -45,6 +45,7 @@ namespace TimeHACK.Engine public DangerousCreaturesTheme() { startSound = Properties.Resources.Win95PlusDangerousCreaturesStart; + stopSound = Properties.Resources.Win95PlusDangerousCreaturesStart; defaultWallpaper = Properties.Resources.Win95PlusDangerousCreaturesWallpaper; themeName = "dangeranimals"; diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index d83d45e..c6db739 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -47,6 +47,7 @@ namespace TimeHACK.OS.Win95 SettingsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); FindToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); SetStyle(ControlStyles.SupportsTransparentBackColor, true); + BackgroundImage = currentTheme.defaultWallpaper; foreach (ToolStripMenuItem item in startmenuitems.Items) { item.MouseEnter += new EventHandler(MenuItem_MouseEnter); @@ -72,6 +73,7 @@ namespace TimeHACK.OS.Win95 // When New Game is clicked in TitleScreen.cs private void Desktop_Load(object sender, EventArgs e) { + if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, desktopicons.Width, desktopicons.Height); //Start Menu Color - Commented until it works reliably //startmenuitems.Renderer = new MyRenderer(); //ProgramsToolStripMenuItem.DropDown.Renderer = new MyRenderer(); @@ -80,7 +82,7 @@ namespace TimeHACK.OS.Win95 fontLoad(); // Play Windows 95 Start Sound - Stream audio = Properties.Resources.Win95Start; + Stream audio = currentTheme.startSound; startsound = new SoundPlayer(audio); startsound.Play(); @@ -153,7 +155,8 @@ namespace TimeHACK.OS.Win95 // Shutdown button private void ShutdownToolStripMenuItem_Click(object sender, EventArgs e) { - Program.ShutdownApplication(Properties.Resources.tada); + SaveGame(); + Program.ShutdownApplication(currentTheme.stopSound); } #endregion //Region diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs index e15bde5..984de72 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -57,10 +57,12 @@ namespace TimeHACK.OS.Win95.Win95Apps switch ((string)comboBox1.SelectedItem) { case "Default": + SaveSystem.CurrentSave.ThemeName = "default95"; SaveSystem.currentTheme = new Default95Theme(); TitleScreen.frm95.BackgroundImage = null; break; case "Dangerous Creatures": + SaveSystem.CurrentSave.ThemeName = "dangeranimals"; SaveSystem.currentTheme = new DangerousCreaturesTheme(); TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; break; @@ -72,11 +74,13 @@ namespace TimeHACK.OS.Win95.Win95Apps switch ((string)comboBox1.SelectedItem) { case "Default": + SaveSystem.CurrentSave.ThemeName = "default95"; SaveSystem.currentTheme = new Default95Theme(); TitleScreen.frm95.BackgroundImage = null; TitleScreen.frm95.desktopicons.BackgroundImage = null; break; case "Dangerous Creatures": + SaveSystem.CurrentSave.ThemeName = "dangeranimals"; SaveSystem.currentTheme = new DangerousCreaturesTheme(); TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index 5cc011a..e2a4be6 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -82,7 +82,7 @@ namespace TimeHACK } } - public static void ShutdownApplication(System.IO.UnmanagedMemoryStream audio) + public static void ShutdownApplication(System.IO.Stream audio) { System.Threading.Thread.Sleep(500); System.IO.Stream audioPlay = audio; diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 6d11dc6..1b7d006 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -276,6 +276,7 @@ namespace TimeHACK if (loadGameBox.successful == true) { LoadSave(); + SetTheme(); StartGame(); } } -- cgit v1.2.3