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 From 497b5cf0971964c7dac407cb97b695d28be0c90d Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 5 Jul 2017 18:41:55 -0400 Subject: Added "Inside Your Computer" Theme --- TimeHACK.Engine/Properties/Resources.Designer.cs | 28 +++++++++++++++++++++ TimeHACK.Engine/Properties/Resources.resx | 9 +++++++ .../Resources/Win95PlusInsideComputerStart.wav | Bin 0 -> 50162 bytes .../Resources/Win95PlusInsideComputerStop.wav | Bin 0 -> 27780 bytes .../Resources/Win95PlusInsideComputerWallpaper.jpg | Bin 0 -> 76769 bytes TimeHACK.Engine/SaveSystem.cs | 3 +++ TimeHACK.Engine/Theme.cs | 12 +++++++++ TimeHACK.Engine/TimeHACK.Engine.csproj | 3 +++ .../Win95Apps/WinClassicThemePanel.Designer.cs | 3 ++- .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 20 +++++++++++++++ TimeHACK.Main/Properties/Resources.Designer.cs | 10 ++++++++ TimeHACK.Main/Properties/Resources.resx | 3 +++ TimeHACK.Main/Resources/ICTheme_BG.jpg | Bin 0 -> 76769 bytes TimeHACK.Main/TimeHACK.Main.csproj | 1 + 14 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 TimeHACK.Engine/Resources/Win95PlusInsideComputerStart.wav create mode 100644 TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav create mode 100644 TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg create mode 100644 TimeHACK.Main/Resources/ICTheme_BG.jpg diff --git a/TimeHACK.Engine/Properties/Resources.Designer.cs b/TimeHACK.Engine/Properties/Resources.Designer.cs index b0186e9..6801231 100644 --- a/TimeHACK.Engine/Properties/Resources.Designer.cs +++ b/TimeHACK.Engine/Properties/Resources.Designer.cs @@ -218,6 +218,34 @@ namespace TimeHACK.Engine.Properties { } } + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream Win95PlusInsideComputerStart { + get { + return ResourceManager.GetStream("Win95PlusInsideComputerStart", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream Win95PlusInsideComputerStop { + get { + return ResourceManager.GetStream("Win95PlusInsideComputerStop", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95PlusInsideComputerWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusInsideComputerWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// diff --git a/TimeHACK.Engine/Properties/Resources.resx b/TimeHACK.Engine/Properties/Resources.resx index aeb1500..08e94f6 100644 --- a/TimeHACK.Engine/Properties/Resources.resx +++ b/TimeHACK.Engine/Properties/Resources.resx @@ -199,4 +199,13 @@ ..\Resources\Win98Stop.WAV;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\Win95PlusInsideComputerStart.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Win95PlusInsideComputerStop.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Win95PlusInsideComputerWallpaper.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.Engine/Resources/Win95PlusInsideComputerStart.wav b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStart.wav new file mode 100644 index 0000000..22ca7df Binary files /dev/null and b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStart.wav differ diff --git a/TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav new file mode 100644 index 0000000..d7a25a6 Binary files /dev/null and b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav differ diff --git a/TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg b/TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg new file mode 100644 index 0000000..ae577da Binary files /dev/null and b/TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg differ diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs index 5ea5831..cd8bb2f 100644 --- a/TimeHACK.Engine/SaveSystem.cs +++ b/TimeHACK.Engine/SaveSystem.cs @@ -231,6 +231,9 @@ namespace TimeHACK.Engine case "dangeranimals": currentTheme = new DangerousCreaturesTheme(); break; + case "insidepc": + currentTheme = new InsideComputerTheme(); + break; } } } diff --git a/TimeHACK.Engine/Theme.cs b/TimeHACK.Engine/Theme.cs index 804eb88..89c913d 100644 --- a/TimeHACK.Engine/Theme.cs +++ b/TimeHACK.Engine/Theme.cs @@ -51,4 +51,16 @@ namespace TimeHACK.Engine themeName = "dangeranimals"; } } + + public class InsideComputerTheme: Theme + { + public InsideComputerTheme() + { + startSound = Properties.Resources.Win95PlusInsideComputerStart; + stopSound = Properties.Resources.Win95PlusInsideComputerStop; + + defaultWallpaper = Properties.Resources.Win95PlusInsideComputerWallpaper; + themeName = "insidepc"; + } + } } diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index 22e9038..695b2d8 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -118,6 +118,9 @@ + + + diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs index e6bdda1..a82ea29 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs @@ -53,7 +53,8 @@ this.comboBox1.FormattingEnabled = true; this.comboBox1.Items.AddRange(new object[] { "Default", - "Dangerous Creatures"}); + "Dangerous Creatures", + "Inside Your Computer"}); this.comboBox1.Location = new System.Drawing.Point(15, 201); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(269, 21); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs index 984de72..98ad7bc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -31,6 +31,9 @@ namespace TimeHACK.OS.Win95.Win95Apps case "Dangerous Creatures": pictureBox2.BackgroundImage = Properties.Resources.DCTheme_BG; break; + case "Inside Your Computer": + pictureBox2.BackgroundImage = Properties.Resources.ICTheme_BG; + break; } } @@ -44,6 +47,9 @@ namespace TimeHACK.OS.Win95.Win95Apps case "dangeranimals": comboBox1.SelectedItem = "Dangerous Creatures"; break; + case "insidepc": + comboBox1.SelectedItem = "Inside Your Computer"; + break; } } @@ -60,11 +66,19 @@ namespace TimeHACK.OS.Win95.Win95Apps 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); + break; + case "Inside Your Computer": + SaveSystem.CurrentSave.ThemeName = "insidepc"; + SaveSystem.currentTheme = new InsideComputerTheme(); + TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG; + TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); break; } } @@ -85,6 +99,12 @@ namespace TimeHACK.OS.Win95.Win95Apps 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; + case "Inside Your Computer": + SaveSystem.CurrentSave.ThemeName = "insidepc"; + SaveSystem.currentTheme = new InsideComputerTheme(); + TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_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 3797b07..abdd38c 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -165,6 +165,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ICTheme_BG { + get { + object obj = ResourceManager.GetObject("ICTheme_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 355e0eb..af91fe3 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -579,4 +579,7 @@ ..\Resources\DCTheme_BG.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ICTheme_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/ICTheme_BG.jpg b/TimeHACK.Main/Resources/ICTheme_BG.jpg new file mode 100644 index 0000000..ae577da Binary files /dev/null and b/TimeHACK.Main/Resources/ICTheme_BG.jpg differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index ffcd0ca..6fba178 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -414,6 +414,7 @@ + -- cgit v1.2.3 From 5ff581c5a68b4ed2beebde103b2b358d14c30cca Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 5 Jul 2017 19:39:27 -0400 Subject: removed unnecessary file --- TimeHACK.Engine/TimeHACK.Engine.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index 695b2d8..380541b 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -78,9 +78,6 @@ WinClassic.cs - - Component - -- cgit v1.2.3 From 29fdc4c04f031f88159d8d300329208d44ce7b9e Mon Sep 17 00:00:00 2001 From: JayXKanz666 Date: Thu, 6 Jul 2017 01:59:15 +0200 Subject: Made the Welcome screen look MUCH better Next time, Justin, do it right. ;) --- .../Win95/Win95Apps/WinClassicWelcome.Designer.cs | 137 ++++++++------------- .../OS/Win95/Win95Apps/WinClassicWelcome.cs | 6 +- TimeHACK.Main/Properties/Resources.Designer.cs | 30 +++++ TimeHACK.Main/Properties/Resources.resx | 9 ++ TimeHACK.Main/Resources/win95_splitter.png | Bin 0 -> 451 bytes TimeHACK.Main/Resources/win95_welcome.png | Bin 0 -> 3816 bytes TimeHACK.Main/Resources/win95_welcometip.png | Bin 0 -> 30703 bytes TimeHACK.Main/TimeHACK.Main.csproj | 3 + 8 files changed, 98 insertions(+), 87 deletions(-) create mode 100644 TimeHACK.Main/Resources/win95_splitter.png create mode 100644 TimeHACK.Main/Resources/win95_welcome.png create mode 100644 TimeHACK.Main/Resources/win95_welcometip.png diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs index 8e26658..2caa0f9 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs @@ -28,45 +28,45 @@ /// private void InitializeComponent() { - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.imgTip = new System.Windows.Forms.PictureBox(); + this.imgPnl = new System.Windows.Forms.PictureBox(); this.btnClose = new System.Windows.Forms.Button(); this.btnOnline = new System.Windows.Forms.Button(); - this.btnNew = new System.Windows.Forms.Button(); this.btnTour = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.imgWelcome = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.imgTip)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.imgPnl)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.imgWelcome)).BeginInit(); this.SuspendLayout(); // - // pictureBox1 + // imgTip // - this.pictureBox1.Image = global::TimeHACK.Properties.Resources.Win95Help; - this.pictureBox1.Location = new System.Drawing.Point(27, 69); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(384, 248); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox1.TabIndex = 17; - this.pictureBox1.TabStop = false; + this.imgTip.BackgroundImage = global::TimeHACK.Properties.Resources.win95_welcometip; + this.imgTip.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imgTip.Location = new System.Drawing.Point(16, 49); + this.imgTip.Name = "imgTip"; + this.imgTip.Size = new System.Drawing.Size(330, 255); + this.imgTip.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.imgTip.TabIndex = 17; + this.imgTip.TabStop = false; // - // pictureBox2 + // imgPnl // - this.pictureBox2.Image = global::TimeHACK.Properties.Resources.WinAboutSeparator95; - this.pictureBox2.Location = new System.Drawing.Point(445, 154); - this.pictureBox2.Name = "pictureBox2"; - this.pictureBox2.Size = new System.Drawing.Size(115, 10); - this.pictureBox2.TabIndex = 16; - this.pictureBox2.TabStop = false; + this.imgPnl.Image = global::TimeHACK.Properties.Resources.win95_splitter; + this.imgPnl.Location = new System.Drawing.Point(358, 142); + this.imgPnl.Name = "imgPnl"; + this.imgPnl.Size = new System.Drawing.Size(112, 2); + this.imgPnl.TabIndex = 16; + this.imgPnl.TabStop = false; // // btnClose // this.btnClose.BackColor = System.Drawing.Color.Silver; + this.btnClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClose.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnClose.Location = new System.Drawing.Point(443, 167); + this.btnClose.Location = new System.Drawing.Point(358, 156); this.btnClose.Name = "btnClose"; - this.btnClose.Size = new System.Drawing.Size(117, 23); + this.btnClose.Size = new System.Drawing.Size(119, 23); this.btnClose.TabIndex = 15; this.btnClose.Text = "Close"; this.btnClose.UseVisualStyleBackColor = false; @@ -75,99 +75,64 @@ // btnOnline // this.btnOnline.BackColor = System.Drawing.Color.Silver; + this.btnOnline.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOnline.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnOnline.Location = new System.Drawing.Point(443, 125); + this.btnOnline.Location = new System.Drawing.Point(356, 78); this.btnOnline.Name = "btnOnline"; - this.btnOnline.Size = new System.Drawing.Size(117, 23); + this.btnOnline.Size = new System.Drawing.Size(119, 23); this.btnOnline.TabIndex = 14; this.btnOnline.Text = "Online Registration"; this.btnOnline.UseVisualStyleBackColor = false; // - // btnNew - // - this.btnNew.BackColor = System.Drawing.Color.Silver; - this.btnNew.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnNew.Location = new System.Drawing.Point(443, 96); - this.btnNew.Name = "btnNew"; - this.btnNew.Size = new System.Drawing.Size(117, 23); - this.btnNew.TabIndex = 13; - this.btnNew.Text = "What\'s new"; - this.btnNew.UseVisualStyleBackColor = false; - // // btnTour // this.btnTour.BackColor = System.Drawing.Color.Silver; + this.btnTour.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTour.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnTour.Location = new System.Drawing.Point(445, 69); + this.btnTour.Location = new System.Drawing.Point(356, 49); this.btnTour.Name = "btnTour"; - this.btnTour.Size = new System.Drawing.Size(117, 23); + this.btnTour.Size = new System.Drawing.Size(119, 23); this.btnTour.TabIndex = 12; - this.btnTour.Text = "Windows Tour"; + this.btnTour.Text = "What\'s New"; this.btnTour.UseVisualStyleBackColor = false; // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("Segoe UI", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.ForeColor = System.Drawing.Color.White; - this.label3.Location = new System.Drawing.Point(378, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(62, 50); - this.label3.TabIndex = 11; - this.label3.Text = "95"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Segoe UI", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(209, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(184, 50); - this.label2.TabIndex = 10; - this.label2.Text = "Windows"; - // - // label1 + // imgWelcome // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Segoe UI", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label1.Location = new System.Drawing.Point(3, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(219, 50); - this.label1.TabIndex = 9; - this.label1.Text = "Welcome to"; + this.imgWelcome.BackgroundImage = global::TimeHACK.Properties.Resources.win95_welcome; + this.imgWelcome.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.imgWelcome.Location = new System.Drawing.Point(19, 17); + this.imgWelcome.Name = "imgWelcome"; + this.imgWelcome.Size = new System.Drawing.Size(292, 19); + this.imgWelcome.TabIndex = 18; + this.imgWelcome.TabStop = false; // // WinClassicWelcome // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.pictureBox1); - this.Controls.Add(this.pictureBox2); + this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.imgWelcome); + this.Controls.Add(this.imgTip); + this.Controls.Add(this.imgPnl); this.Controls.Add(this.btnClose); this.Controls.Add(this.btnOnline); - this.Controls.Add(this.btnNew); this.Controls.Add(this.btnTour); - this.Controls.Add(this.label3); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); this.Name = "WinClassicWelcome"; - this.Size = new System.Drawing.Size(577, 344); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.Size = new System.Drawing.Size(483, 322); + ((System.ComponentModel.ISupportInitialize)(this.imgTip)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.imgPnl)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.imgWelcome)).EndInit(); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.PictureBox imgTip; + private System.Windows.Forms.PictureBox imgPnl; private System.Windows.Forms.Button btnClose; private System.Windows.Forms.Button btnOnline; - private System.Windows.Forms.Button btnNew; private System.Windows.Forms.Button btnTour; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.PictureBox imgWelcome; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.cs index 52a8938..b0761b1 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.cs @@ -15,11 +15,15 @@ namespace TimeHACK.OS.Win95.Win95Apps public WinClassicWelcome() { InitializeComponent(); + + btnTour.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + btnOnline.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + btnClose.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); } private void btnClose_Click(object sender, EventArgs e) { - this.ParentForm.Close(); + ParentForm.Close(); } } } diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index abdd38c..610ce9c 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -454,6 +454,36 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap win95_splitter { + get { + object obj = ResourceManager.GetObject("win95_splitter", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap win95_welcome { + get { + object obj = ResourceManager.GetObject("win95_welcome", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap win95_welcometip { + get { + object obj = ResourceManager.GetObject("win95_welcometip", 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 af91fe3..c5d7bff 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -582,4 +582,13 @@ ..\Resources\ICTheme_BG.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\win95_splitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\win95_welcome.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\win95_welcometip.png;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/win95_splitter.png b/TimeHACK.Main/Resources/win95_splitter.png new file mode 100644 index 0000000..44ab7ce Binary files /dev/null and b/TimeHACK.Main/Resources/win95_splitter.png differ diff --git a/TimeHACK.Main/Resources/win95_welcome.png b/TimeHACK.Main/Resources/win95_welcome.png new file mode 100644 index 0000000..e438706 Binary files /dev/null and b/TimeHACK.Main/Resources/win95_welcome.png differ diff --git a/TimeHACK.Main/Resources/win95_welcometip.png b/TimeHACK.Main/Resources/win95_welcometip.png new file mode 100644 index 0000000..705be84 Binary files /dev/null and b/TimeHACK.Main/Resources/win95_welcometip.png differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 6fba178..0adb956 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -451,6 +451,9 @@ + + + -- cgit v1.2.3 From eb5b4265492b47bb477767cc524ff99401baaac9 Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 5 Jul 2017 21:19:56 -0400 Subject: Fixed the Welcome Screen buttons --- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs | 6 +++--- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.cs | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs index 2caa0f9..fee95d5 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.Designer.cs @@ -66,7 +66,7 @@ this.btnClose.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnClose.Location = new System.Drawing.Point(358, 156); this.btnClose.Name = "btnClose"; - this.btnClose.Size = new System.Drawing.Size(119, 23); + this.btnClose.Size = new System.Drawing.Size(115, 26); this.btnClose.TabIndex = 15; this.btnClose.Text = "Close"; this.btnClose.UseVisualStyleBackColor = false; @@ -79,7 +79,7 @@ this.btnOnline.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnOnline.Location = new System.Drawing.Point(356, 78); this.btnOnline.Name = "btnOnline"; - this.btnOnline.Size = new System.Drawing.Size(119, 23); + this.btnOnline.Size = new System.Drawing.Size(115, 26); this.btnOnline.TabIndex = 14; this.btnOnline.Text = "Online Registration"; this.btnOnline.UseVisualStyleBackColor = false; @@ -91,7 +91,7 @@ this.btnTour.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnTour.Location = new System.Drawing.Point(356, 49); this.btnTour.Name = "btnTour"; - this.btnTour.Size = new System.Drawing.Size(119, 23); + this.btnTour.Size = new System.Drawing.Size(115, 26); this.btnTour.TabIndex = 12; this.btnTour.Text = "What\'s New"; this.btnTour.UseVisualStyleBackColor = false; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.cs index b0761b1..b830391 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWelcome.cs @@ -16,8 +16,11 @@ namespace TimeHACK.OS.Win95.Win95Apps { InitializeComponent(); + btnTour.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); btnTour.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + btnOnline.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); btnOnline.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + btnClose.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); btnClose.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); } -- cgit v1.2.3 From 6958c950223e1b1db9648f92a40fe7dd925ca466 Mon Sep 17 00:00:00 2001 From: lempamo Date: Thu, 6 Jul 2017 00:28:38 -0400 Subject: New Installer for Win95 --- .../GlobalPrograms/WinClassicInstaller.Designer.cs | 877 --------------------- .../GlobalPrograms/WinClassicInstaller.cs | 145 ---- .../GlobalPrograms/WinClassicInstaller.resx | 152 ---- TimeHACK.Main/OS/Win95/Win95.cs | 4 +- .../OS/Win95/Win95Apps/Win95Installer.Designer.cs | 144 ++++ TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs | 29 + .../OS/Win95/Win95Apps/Win95Installer.resx | 132 ++++ TimeHACK.Main/OS/Win98/Win98.cs | 4 +- TimeHACK.Main/Properties/Resources.Designer.cs | 10 + TimeHACK.Main/Properties/Resources.resx | 3 + .../Resources/WinClassic/WinClassicInstallPic.png | Bin 0 -> 3465 bytes TimeHACK.Main/TimeHACK.Main.csproj | 19 +- 12 files changed, 332 insertions(+), 1187 deletions(-) delete mode 100644 TimeHACK.Main/GlobalPrograms/WinClassicInstaller.Designer.cs delete mode 100644 TimeHACK.Main/GlobalPrograms/WinClassicInstaller.cs delete mode 100644 TimeHACK.Main/GlobalPrograms/WinClassicInstaller.resx create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx create mode 100644 TimeHACK.Main/Resources/WinClassic/WinClassicInstallPic.png diff --git a/TimeHACK.Main/GlobalPrograms/WinClassicInstaller.Designer.cs b/TimeHACK.Main/GlobalPrograms/WinClassicInstaller.Designer.cs deleted file mode 100644 index 64da2e9..0000000 --- a/TimeHACK.Main/GlobalPrograms/WinClassicInstaller.Designer.cs +++ /dev/null @@ -1,877 +0,0 @@ -namespace TimeHACK.WinClassicForms -{ - partial class WinClassicInstaller - { - /// - /// 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(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicInstaller)); - this.installerproccess = new System.Windows.Forms.Panel(); - this.PictureBox5 = new System.Windows.Forms.PictureBox(); - this.Panel5 = new System.Windows.Forms.Panel(); - this.PictureBox4 = new System.Windows.Forms.PictureBox(); - this.PictureBox2 = new System.Windows.Forms.PictureBox(); - this.Label9 = new System.Windows.Forms.Label(); - this.Label13 = new System.Windows.Forms.Label(); - this.Label14 = new System.Windows.Forms.Label(); - this.ProgressBar1 = new System.Windows.Forms.ProgressBar(); - this.Complete = new System.Windows.Forms.Panel(); - this.PictureBox3 = new System.Windows.Forms.PictureBox(); - this.Panel6 = new System.Windows.Forms.Panel(); - this.finishinstallimage = new System.Windows.Forms.PictureBox(); - this.Label17 = new System.Windows.Forms.Label(); - this.Label16 = new System.Windows.Forms.Label(); - this.Label18 = new System.Windows.Forms.Label(); - this.welcome = new System.Windows.Forms.Panel(); - this.PictureBox9 = new System.Windows.Forms.PictureBox(); - this.Label1 = new System.Windows.Forms.Label(); - this.programimage = new System.Windows.Forms.Panel(); - this.installimage = new System.Windows.Forms.PictureBox(); - this.Label3 = new System.Windows.Forms.Label(); - this.Label2 = new System.Windows.Forms.Label(); - this.Label4 = new System.Windows.Forms.Label(); - this.TextBox1 = new System.Windows.Forms.TextBox(); - this.toprightcorner = new System.Windows.Forms.Panel(); - this.bottomrightcorner = new System.Windows.Forms.Panel(); - this.bottomleftcorner = new System.Windows.Forms.Panel(); - this.topleftcorner = new System.Windows.Forms.Panel(); - this.look = new System.Windows.Forms.Timer(this.components); - this.pullbs = new System.Windows.Forms.Timer(this.components); - this.pullbottom = new System.Windows.Forms.Timer(this.components); - this.pullside = new System.Windows.Forms.Timer(this.components); - this.Timer1 = new System.Windows.Forms.Timer(this.components); - this.TextBox4 = new System.Windows.Forms.TextBox(); - this.program = new System.Windows.Forms.Panel(); - this.Panel1 = new System.Windows.Forms.Panel(); - this.Panel7 = new System.Windows.Forms.Panel(); - this.Panel9 = new System.Windows.Forms.Panel(); - this.Panel2 = new System.Windows.Forms.Panel(); - this.iconpic = new System.Windows.Forms.PictureBox(); - this.installname = new System.Windows.Forms.Label(); - this.Button3 = new System.Windows.Forms.Button(); - this.Button2 = new System.Windows.Forms.Button(); - this.Button1 = new System.Windows.Forms.Button(); - this.licenseagreement = new System.Windows.Forms.Panel(); - this.PictureBox8 = new System.Windows.Forms.PictureBox(); - this.PictureBox1 = new System.Windows.Forms.PictureBox(); - this.Panel3 = new System.Windows.Forms.Panel(); - this.licenceagreementinstallpic = new System.Windows.Forms.PictureBox(); - this.Label6 = new System.Windows.Forms.Label(); - this.Label5 = new System.Windows.Forms.Label(); - this.RadioButton2 = new System.Windows.Forms.RadioButton(); - this.RadioButton1 = new System.Windows.Forms.RadioButton(); - this.TextBox3 = new System.Windows.Forms.TextBox(); - this.summary = new System.Windows.Forms.Panel(); - this.PictureBox7 = new System.Windows.Forms.PictureBox(); - this.Panel4 = new System.Windows.Forms.Panel(); - this.PictureBox6 = new System.Windows.Forms.PictureBox(); - this.suminstallpic = new System.Windows.Forms.PictureBox(); - this.Label7 = new System.Windows.Forms.Label(); - this.Label12 = new System.Windows.Forms.Label(); - this.Label11 = new System.Windows.Forms.Label(); - this.Label10 = new System.Windows.Forms.Label(); - this.Label8 = new System.Windows.Forms.Label(); - this.installerproccess.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox5)).BeginInit(); - this.Panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox2)).BeginInit(); - this.Complete.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox3)).BeginInit(); - this.Panel6.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.finishinstallimage)).BeginInit(); - this.welcome.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox9)).BeginInit(); - this.programimage.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.installimage)).BeginInit(); - this.program.SuspendLayout(); - this.Panel1.SuspendLayout(); - this.Panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.iconpic)).BeginInit(); - this.licenseagreement.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).BeginInit(); - this.Panel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.licenceagreementinstallpic)).BeginInit(); - this.summary.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox7)).BeginInit(); - this.Panel4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox6)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.suminstallpic)).BeginInit(); - this.SuspendLayout(); - // - // installerproccess - // - this.installerproccess.Controls.Add(this.PictureBox5); - this.installerproccess.Controls.Add(this.Panel5); - this.installerproccess.Controls.Add(this.Label14); - this.installerproccess.Controls.Add(this.ProgressBar1); - this.installerproccess.Location = new System.Drawing.Point(0, 0); - this.installerproccess.Name = "installerproccess"; - this.installerproccess.Size = new System.Drawing.Size(564, 342); - this.installerproccess.TabIndex = 15; - // - // PictureBox5 - // - this.PictureBox5.Dock = System.Windows.Forms.DockStyle.Bottom; - this.PictureBox5.Location = new System.Drawing.Point(0, 340); - this.PictureBox5.Name = "PictureBox5"; - this.PictureBox5.Size = new System.Drawing.Size(564, 2); - this.PictureBox5.TabIndex = 22; - this.PictureBox5.TabStop = false; - // - // Panel5 - // - this.Panel5.BackColor = System.Drawing.Color.White; - this.Panel5.Controls.Add(this.PictureBox4); - this.Panel5.Controls.Add(this.PictureBox2); - this.Panel5.Controls.Add(this.Label9); - this.Panel5.Controls.Add(this.Label13); - this.Panel5.Dock = System.Windows.Forms.DockStyle.Top; - this.Panel5.Location = new System.Drawing.Point(0, 0); - this.Panel5.Name = "Panel5"; - this.Panel5.Size = new System.Drawing.Size(564, 55); - this.Panel5.TabIndex = 21; - // - // PictureBox4 - // - this.PictureBox4.Dock = System.Windows.Forms.DockStyle.Bottom; - this.PictureBox4.Location = new System.Drawing.Point(0, 53); - this.PictureBox4.Name = "PictureBox4"; - this.PictureBox4.Size = new System.Drawing.Size(564, 2); - this.PictureBox4.TabIndex = 8; - this.PictureBox4.TabStop = false; - // - // PictureBox2 - // - this.PictureBox2.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.PictureBox2.Location = new System.Drawing.Point(512, 4); - this.PictureBox2.Name = "PictureBox2"; - this.PictureBox2.Size = new System.Drawing.Size(48, 48); - this.PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.PictureBox2.TabIndex = 2; - this.PictureBox2.TabStop = false; - // - // Label9 - // - this.Label9.AutoSize = true; - this.Label9.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label9.Location = new System.Drawing.Point(14, 9); - this.Label9.Name = "Label9"; - this.Label9.Size = new System.Drawing.Size(57, 14); - this.Label9.TabIndex = 0; - this.Label9.Text = "Installing"; - // - // Label13 - // - this.Label13.AutoSize = true; - this.Label13.Location = new System.Drawing.Point(27, 27); - this.Label13.Name = "Label13"; - this.Label13.Size = new System.Drawing.Size(263, 13); - this.Label13.TabIndex = 1; - this.Label13.Text = "Please wait while Guess The Number is being installed"; - // - // Label14 - // - this.Label14.AutoSize = true; - this.Label14.Location = new System.Drawing.Point(22, 80); - this.Label14.Name = "Label14"; - this.Label14.Size = new System.Drawing.Size(143, 13); - this.Label14.TabIndex = 20; - this.Label14.Text = "Installing Guess The Number"; - // - // ProgressBar1 - // - this.ProgressBar1.Location = new System.Drawing.Point(22, 99); - this.ProgressBar1.Name = "ProgressBar1"; - this.ProgressBar1.Size = new System.Drawing.Size(476, 23); - this.ProgressBar1.TabIndex = 19; - // - // Complete - // - this.Complete.BackColor = System.Drawing.Color.White; - this.Complete.Controls.Add(this.PictureBox3); - this.Complete.Controls.Add(this.Panel6); - this.Complete.Controls.Add(this.Label17); - this.Complete.Controls.Add(this.Label16); - this.Complete.Controls.Add(this.Label18); - this.Complete.Location = new System.Drawing.Point(0, 0); - this.Complete.Name = "Complete"; - this.Complete.Size = new System.Drawing.Size(564, 342); - this.Complete.TabIndex = 17; - // - // PictureBox3 - // - this.PictureBox3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.PictureBox3.Location = new System.Drawing.Point(180, 340); - this.PictureBox3.Name = "PictureBox3"; - this.PictureBox3.Size = new System.Drawing.Size(384, 2); - this.PictureBox3.TabIndex = 16; - this.PictureBox3.TabStop = false; - // - // Panel6 - // - this.Panel6.Controls.Add(this.finishinstallimage); - this.Panel6.Dock = System.Windows.Forms.DockStyle.Left; - this.Panel6.Location = new System.Drawing.Point(0, 0); - this.Panel6.Name = "Panel6"; - this.Panel6.Size = new System.Drawing.Size(180, 342); - this.Panel6.TabIndex = 15; - // - // finishinstallimage - // - this.finishinstallimage.Dock = System.Windows.Forms.DockStyle.Fill; - this.finishinstallimage.Location = new System.Drawing.Point(0, 0); - this.finishinstallimage.Name = "finishinstallimage"; - this.finishinstallimage.Size = new System.Drawing.Size(180, 342); - this.finishinstallimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.finishinstallimage.TabIndex = 0; - this.finishinstallimage.TabStop = false; - // - // Label17 - // - this.Label17.AutoSize = true; - this.Label17.Location = new System.Drawing.Point(263, 307); - this.Label17.Name = "Label17"; - this.Label17.Size = new System.Drawing.Size(167, 13); - this.Label17.TabIndex = 2; - this.Label17.Text = "Click Finish to complete the Setup"; - // - // Label16 - // - this.Label16.AutoSize = true; - this.Label16.Location = new System.Drawing.Point(263, 55); - this.Label16.Name = "Label16"; - this.Label16.Size = new System.Drawing.Size(225, 13); - this.Label16.TabIndex = 1; - this.Label16.Text = "Guess The Number was successfully installed."; - // - // Label18 - // - this.Label18.AutoSize = true; - this.Label18.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label18.Location = new System.Drawing.Point(259, 17); - this.Label18.Name = "Label18"; - this.Label18.Size = new System.Drawing.Size(158, 24); - this.Label18.TabIndex = 0; - this.Label18.Text = "Install Complete"; - // - // welcome - // - this.welcome.BackColor = System.Drawing.Color.White; - this.welcome.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.welcome.Controls.Add(this.PictureBox9); - this.welcome.Controls.Add(this.Label1); - this.welcome.Controls.Add(this.programimage); - this.welcome.Controls.Add(this.Label3); - this.welcome.Controls.Add(this.Label2); - this.welcome.Controls.Add(this.Label4); - this.welcome.Controls.Add(this.TextBox1); - this.welcome.Location = new System.Drawing.Point(0, 0); - this.welcome.Name = "welcome"; - this.welcome.Size = new System.Drawing.Size(564, 342); - this.welcome.TabIndex = 14; - // - // PictureBox9 - // - this.PictureBox9.Dock = System.Windows.Forms.DockStyle.Bottom; - this.PictureBox9.Location = new System.Drawing.Point(180, 338); - this.PictureBox9.Name = "PictureBox9"; - this.PictureBox9.Size = new System.Drawing.Size(382, 2); - this.PictureBox9.TabIndex = 16; - this.PictureBox9.TabStop = false; - // - // Label1 - // - this.Label1.AutoSize = true; - this.Label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label1.Location = new System.Drawing.Point(188, 31); - this.Label1.Name = "Label1"; - this.Label1.Size = new System.Drawing.Size(117, 20); - this.Label1.TabIndex = 15; - this.Label1.Text = "Setup Wizard"; - // - // programimage - // - this.programimage.Controls.Add(this.installimage); - this.programimage.Dock = System.Windows.Forms.DockStyle.Left; - this.programimage.Location = new System.Drawing.Point(0, 0); - this.programimage.Name = "programimage"; - this.programimage.Size = new System.Drawing.Size(180, 340); - this.programimage.TabIndex = 14; - // - // installimage - // - this.installimage.Dock = System.Windows.Forms.DockStyle.Fill; - this.installimage.Location = new System.Drawing.Point(0, 0); - this.installimage.Name = "installimage"; - this.installimage.Size = new System.Drawing.Size(180, 340); - this.installimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.installimage.TabIndex = 0; - this.installimage.TabStop = false; - // - // Label3 - // - this.Label3.AutoSize = true; - this.Label3.Location = new System.Drawing.Point(186, 182); - this.Label3.Name = "Label3"; - this.Label3.Size = new System.Drawing.Size(114, 13); - this.Label3.TabIndex = 13; - this.Label3.Text = "Click Next to continue "; - // - // Label2 - // - this.Label2.AutoSize = true; - this.Label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label2.Location = new System.Drawing.Point(185, 7); - this.Label2.Name = "Label2"; - this.Label2.Size = new System.Drawing.Size(266, 20); - this.Label2.TabIndex = 6; - this.Label2.Text = "Welcome To Guess The Number"; - // - // Label4 - // - this.Label4.AutoSize = true; - this.Label4.Location = new System.Drawing.Point(187, 71); - this.Label4.Name = "Label4"; - this.Label4.Size = new System.Drawing.Size(348, 13); - this.Label4.TabIndex = 7; - this.Label4.Text = "This Wizard will guide you throught the installation of Guess The Number"; - // - // TextBox1 - // - this.TextBox1.BackColor = System.Drawing.Color.White; - this.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.TextBox1.Location = new System.Drawing.Point(190, 104); - this.TextBox1.Multiline = true; - this.TextBox1.Name = "TextBox1"; - this.TextBox1.ReadOnly = true; - this.TextBox1.Size = new System.Drawing.Size(270, 62); - this.TextBox1.TabIndex = 8; - this.TextBox1.Text = "It is recommended that you close all other applications before starting Setup. Th" + - "is will make it possible to update relevant system files without having to reboo" + - "t your computer."; - // - // toprightcorner - // - this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.toprightcorner.Location = new System.Drawing.Point(569, 0); - this.toprightcorner.Name = "toprightcorner"; - this.toprightcorner.Size = new System.Drawing.Size(4, 4); - this.toprightcorner.TabIndex = 6; - // - // bottomrightcorner - // - this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE; - this.bottomrightcorner.Location = new System.Drawing.Point(569, 417); - this.bottomrightcorner.Name = "bottomrightcorner"; - this.bottomrightcorner.Size = new System.Drawing.Size(4, 4); - this.bottomrightcorner.TabIndex = 4; - // - // bottomleftcorner - // - this.bottomleftcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.bottomleftcorner.Location = new System.Drawing.Point(0, 417); - this.bottomleftcorner.Name = "bottomleftcorner"; - this.bottomleftcorner.Size = new System.Drawing.Size(4, 4); - this.bottomleftcorner.TabIndex = 2; - // - // topleftcorner - // - this.topleftcorner.Location = new System.Drawing.Point(0, 0); - this.topleftcorner.Name = "topleftcorner"; - this.topleftcorner.Size = new System.Drawing.Size(4, 4); - this.topleftcorner.TabIndex = 1; - // - // pullbs - // - this.pullbs.Interval = 1; - // - // pullbottom - // - this.pullbottom.Interval = 1; - // - // pullside - // - this.pullside.Interval = 1; - // - // Timer1 - // - this.Timer1.Tick += new System.EventHandler(this.Timer1_Tick); - // - // TextBox4 - // - this.TextBox4.BackColor = System.Drawing.Color.Gainsboro; - this.TextBox4.Location = new System.Drawing.Point(28, 129); - this.TextBox4.Multiline = true; - this.TextBox4.Name = "TextBox4"; - this.TextBox4.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.TextBox4.Size = new System.Drawing.Size(497, 133); - this.TextBox4.TabIndex = 3; - this.TextBox4.Text = resources.GetString("TextBox4.Text"); - // - // program - // - this.program.BackColor = System.Drawing.Color.LightGray; - this.program.Controls.Add(this.Panel1); - this.program.Controls.Add(this.toprightcorner); - this.program.Controls.Add(this.bottomrightcorner); - this.program.Controls.Add(this.bottomleftcorner); - this.program.Controls.Add(this.topleftcorner); - this.program.Dock = System.Windows.Forms.DockStyle.Fill; - this.program.Location = new System.Drawing.Point(0, 0); - this.program.Name = "program"; - this.program.Size = new System.Drawing.Size(573, 421); - this.program.TabIndex = 6; - // - // Panel1 - // - this.Panel1.BackColor = System.Drawing.Color.OldLace; - this.Panel1.Controls.Add(this.Panel7); - this.Panel1.Controls.Add(this.Panel9); - this.Panel1.Controls.Add(this.Panel2); - this.Panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.Panel1.Location = new System.Drawing.Point(0, 0); - this.Panel1.Name = "Panel1"; - this.Panel1.Size = new System.Drawing.Size(573, 421); - this.Panel1.TabIndex = 9; - // - // Panel7 - // - this.Panel7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Panel7.Location = new System.Drawing.Point(0, 417); - this.Panel7.Name = "Panel7"; - this.Panel7.Size = new System.Drawing.Size(5, 4); - this.Panel7.TabIndex = 10; - // - // Panel9 - // - this.Panel9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Panel9.Cursor = System.Windows.Forms.Cursors.SizeNWSE; - this.Panel9.Location = new System.Drawing.Point(569, 417); - this.Panel9.Name = "Panel9"; - this.Panel9.Size = new System.Drawing.Size(4, 4); - this.Panel9.TabIndex = 4; - // - // Panel2 - // - this.Panel2.BackColor = System.Drawing.Color.Gainsboro; - this.Panel2.Controls.Add(this.iconpic); - this.Panel2.Controls.Add(this.installname); - this.Panel2.Controls.Add(this.Button3); - this.Panel2.Controls.Add(this.Button2); - this.Panel2.Controls.Add(this.Button1); - this.Panel2.Controls.Add(this.licenseagreement); - this.Panel2.Controls.Add(this.summary); - this.Panel2.Controls.Add(this.installerproccess); - this.Panel2.Controls.Add(this.Complete); - this.Panel2.Controls.Add(this.welcome); - this.Panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.Panel2.Location = new System.Drawing.Point(0, 0); - this.Panel2.Name = "Panel2"; - this.Panel2.Size = new System.Drawing.Size(573, 421); - this.Panel2.TabIndex = 21; - // - // iconpic - // - this.iconpic.Location = new System.Drawing.Point(96, 350); - this.iconpic.Name = "iconpic"; - this.iconpic.Size = new System.Drawing.Size(60, 31); - this.iconpic.TabIndex = 19; - this.iconpic.TabStop = false; - this.iconpic.Visible = false; - // - // installname - // - this.installname.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.installname.AutoSize = true; - this.installname.Location = new System.Drawing.Point(5, 391); - this.installname.Name = "installname"; - this.installname.Size = new System.Drawing.Size(45, 13); - this.installname.TabIndex = 18; - this.installname.Text = "Label18"; - // - // Button3 - // - this.Button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button3.Location = new System.Drawing.Point(404, 390); - this.Button3.Name = "Button3"; - this.Button3.Size = new System.Drawing.Size(75, 23); - this.Button3.TabIndex = 12; - this.Button3.Text = "Next >"; - this.Button3.UseVisualStyleBackColor = true; - this.Button3.Click += new System.EventHandler(this.Button3_Click); - // - // Button2 - // - this.Button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button2.Location = new System.Drawing.Point(323, 390); - this.Button2.Name = "Button2"; - this.Button2.Size = new System.Drawing.Size(75, 23); - this.Button2.TabIndex = 11; - this.Button2.Text = "< Back"; - this.Button2.UseVisualStyleBackColor = true; - // - // Button1 - // - this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button1.Location = new System.Drawing.Point(485, 390); - this.Button1.Name = "Button1"; - this.Button1.Size = new System.Drawing.Size(75, 23); - this.Button1.TabIndex = 10; - this.Button1.Text = "Cancel"; - this.Button1.UseVisualStyleBackColor = true; - this.Button1.Click += new System.EventHandler(this.Button1_Click); - // - // licenseagreement - // - this.licenseagreement.Controls.Add(this.PictureBox8); - this.licenseagreement.Controls.Add(this.PictureBox1); - this.licenseagreement.Controls.Add(this.Panel3); - this.licenseagreement.Controls.Add(this.RadioButton2); - this.licenseagreement.Controls.Add(this.RadioButton1); - this.licenseagreement.Controls.Add(this.TextBox4); - this.licenseagreement.Controls.Add(this.TextBox3); - this.licenseagreement.Location = new System.Drawing.Point(0, 0); - this.licenseagreement.Name = "licenseagreement"; - this.licenseagreement.Size = new System.Drawing.Size(564, 342); - this.licenseagreement.TabIndex = 15; - // - // PictureBox8 - // - this.PictureBox8.Dock = System.Windows.Forms.DockStyle.Bottom; - this.PictureBox8.Location = new System.Drawing.Point(0, 340); - this.PictureBox8.Name = "PictureBox8"; - this.PictureBox8.Size = new System.Drawing.Size(564, 2); - this.PictureBox8.TabIndex = 9; - this.PictureBox8.TabStop = false; - // - // PictureBox1 - // - this.PictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.PictureBox1.Location = new System.Drawing.Point(0, 55); - this.PictureBox1.Name = "PictureBox1"; - this.PictureBox1.Size = new System.Drawing.Size(564, 2); - this.PictureBox1.TabIndex = 7; - this.PictureBox1.TabStop = false; - // - // Panel3 - // - this.Panel3.BackColor = System.Drawing.Color.White; - this.Panel3.Controls.Add(this.licenceagreementinstallpic); - this.Panel3.Controls.Add(this.Label6); - this.Panel3.Controls.Add(this.Label5); - this.Panel3.Dock = System.Windows.Forms.DockStyle.Top; - this.Panel3.Location = new System.Drawing.Point(0, 0); - this.Panel3.Name = "Panel3"; - this.Panel3.Size = new System.Drawing.Size(564, 55); - this.Panel3.TabIndex = 6; - // - // licenceagreementinstallpic - // - this.licenceagreementinstallpic.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.licenceagreementinstallpic.Location = new System.Drawing.Point(512, 4); - this.licenceagreementinstallpic.Name = "licenceagreementinstallpic"; - this.licenceagreementinstallpic.Size = new System.Drawing.Size(48, 48); - this.licenceagreementinstallpic.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.licenceagreementinstallpic.TabIndex = 2; - this.licenceagreementinstallpic.TabStop = false; - // - // Label6 - // - this.Label6.AutoSize = true; - this.Label6.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label6.Location = new System.Drawing.Point(14, 9); - this.Label6.Name = "Label6"; - this.Label6.Size = new System.Drawing.Size(170, 14); - this.Label6.TabIndex = 0; - this.Label6.Text = "Software License Agreement"; - // - // Label5 - // - this.Label5.AutoSize = true; - this.Label5.Location = new System.Drawing.Point(36, 27); - this.Label5.Name = "Label5"; - this.Label5.Size = new System.Drawing.Size(216, 13); - this.Label5.TabIndex = 1; - this.Label5.Text = "Terms and conditions for using this software."; - // - // RadioButton2 - // - this.RadioButton2.AutoSize = true; - this.RadioButton2.Location = new System.Drawing.Point(28, 288); - this.RadioButton2.Name = "RadioButton2"; - this.RadioButton2.Size = new System.Drawing.Size(275, 17); - this.RadioButton2.TabIndex = 5; - this.RadioButton2.Text = "I do NOT accept the terms of the License Agreement"; - this.RadioButton2.UseVisualStyleBackColor = true; - this.RadioButton2.CheckedChanged += new System.EventHandler(this.RadioButton2_CheckedChanged); - // - // RadioButton1 - // - this.RadioButton1.AutoSize = true; - this.RadioButton1.Checked = true; - this.RadioButton1.Location = new System.Drawing.Point(28, 269); - this.RadioButton1.Name = "RadioButton1"; - this.RadioButton1.Size = new System.Drawing.Size(234, 17); - this.RadioButton1.TabIndex = 4; - this.RadioButton1.TabStop = true; - this.RadioButton1.Text = "I accept the terms of the License Agreement"; - this.RadioButton1.UseVisualStyleBackColor = true; - this.RadioButton1.CheckedChanged += new System.EventHandler(this.RadioButton1_CheckedChanged); - // - // TextBox3 - // - this.TextBox3.BackColor = System.Drawing.Color.Gainsboro; - this.TextBox3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.TextBox3.Location = new System.Drawing.Point(28, 92); - this.TextBox3.Multiline = true; - this.TextBox3.Name = "TextBox3"; - this.TextBox3.Size = new System.Drawing.Size(424, 39); - this.TextBox3.TabIndex = 2; - this.TextBox3.Text = "Please read the following license agreement, use the scroll bar to view the rest " + - "of this agreement"; - // - // summary - // - this.summary.Controls.Add(this.PictureBox7); - this.summary.Controls.Add(this.Panel4); - this.summary.Controls.Add(this.Label11); - this.summary.Controls.Add(this.Label10); - this.summary.Controls.Add(this.Label8); - this.summary.Location = new System.Drawing.Point(0, 0); - this.summary.Name = "summary"; - this.summary.Size = new System.Drawing.Size(564, 342); - this.summary.TabIndex = 16; - // - // PictureBox7 - // - this.PictureBox7.Dock = System.Windows.Forms.DockStyle.Bottom; - this.PictureBox7.Location = new System.Drawing.Point(0, 340); - this.PictureBox7.Name = "PictureBox7"; - this.PictureBox7.Size = new System.Drawing.Size(564, 2); - this.PictureBox7.TabIndex = 9; - this.PictureBox7.TabStop = false; - // - // Panel4 - // - this.Panel4.BackColor = System.Drawing.Color.White; - this.Panel4.Controls.Add(this.PictureBox6); - this.Panel4.Controls.Add(this.suminstallpic); - this.Panel4.Controls.Add(this.Label7); - this.Panel4.Controls.Add(this.Label12); - this.Panel4.Dock = System.Windows.Forms.DockStyle.Top; - this.Panel4.Location = new System.Drawing.Point(0, 0); - this.Panel4.Name = "Panel4"; - this.Panel4.Size = new System.Drawing.Size(564, 55); - this.Panel4.TabIndex = 7; - // - // PictureBox6 - // - this.PictureBox6.Dock = System.Windows.Forms.DockStyle.Bottom; - this.PictureBox6.Location = new System.Drawing.Point(0, 53); - this.PictureBox6.Name = "PictureBox6"; - this.PictureBox6.Size = new System.Drawing.Size(564, 2); - this.PictureBox6.TabIndex = 9; - this.PictureBox6.TabStop = false; - // - // suminstallpic - // - this.suminstallpic.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.suminstallpic.Location = new System.Drawing.Point(512, 4); - this.suminstallpic.Name = "suminstallpic"; - this.suminstallpic.Size = new System.Drawing.Size(48, 48); - this.suminstallpic.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.suminstallpic.TabIndex = 2; - this.suminstallpic.TabStop = false; - // - // Label7 - // - this.Label7.AutoSize = true; - this.Label7.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Label7.Location = new System.Drawing.Point(14, 9); - this.Label7.Name = "Label7"; - this.Label7.Size = new System.Drawing.Size(60, 14); - this.Label7.TabIndex = 0; - this.Label7.Text = "Summary"; - // - // Label12 - // - this.Label12.AutoSize = true; - this.Label12.Location = new System.Drawing.Point(31, 27); - this.Label12.Name = "Label12"; - this.Label12.Size = new System.Drawing.Size(207, 13); - this.Label12.TabIndex = 1; - this.Label12.Text = "Ready to start installing Guess the Number"; - // - // Label11 - // - this.Label11.AutoSize = true; - this.Label11.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Label11.Location = new System.Drawing.Point(35, 110); - this.Label11.Name = "Label11"; - this.Label11.Size = new System.Drawing.Size(187, 15); - this.Label11.TabIndex = 5; - this.Label11.Text = "C:\\Program Files\\ Guess The Number"; - // - // Label10 - // - this.Label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Label10.AutoSize = true; - this.Label10.Location = new System.Drawing.Point(14, 308); - this.Label10.Name = "Label10"; - this.Label10.Size = new System.Drawing.Size(111, 13); - this.Label10.TabIndex = 4; - this.Label10.Text = "Click Next to continue"; - // - // Label8 - // - this.Label8.AutoSize = true; - this.Label8.Location = new System.Drawing.Point(30, 88); - this.Label8.Name = "Label8"; - this.Label8.Size = new System.Drawing.Size(277, 13); - this.Label8.TabIndex = 2; - this.Label8.Text = "Guess The Number will be installed the following location:"; - // - // WinClassicInstaller - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.program); - this.Name = "WinClassicInstaller"; - this.Size = new System.Drawing.Size(573, 421); - this.Load += new System.EventHandler(this.WinClassicInstaller_Load); - this.installerproccess.ResumeLayout(false); - this.installerproccess.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox5)).EndInit(); - this.Panel5.ResumeLayout(false); - this.Panel5.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox2)).EndInit(); - this.Complete.ResumeLayout(false); - this.Complete.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox3)).EndInit(); - this.Panel6.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.finishinstallimage)).EndInit(); - this.welcome.ResumeLayout(false); - this.welcome.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox9)).EndInit(); - this.programimage.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.installimage)).EndInit(); - this.program.ResumeLayout(false); - this.Panel1.ResumeLayout(false); - this.Panel2.ResumeLayout(false); - this.Panel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.iconpic)).EndInit(); - this.licenseagreement.ResumeLayout(false); - this.licenseagreement.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox1)).EndInit(); - this.Panel3.ResumeLayout(false); - this.Panel3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.licenceagreementinstallpic)).EndInit(); - this.summary.ResumeLayout(false); - this.summary.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox7)).EndInit(); - this.Panel4.ResumeLayout(false); - this.Panel4.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PictureBox6)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.suminstallpic)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - internal System.Windows.Forms.Panel installerproccess; - internal System.Windows.Forms.PictureBox PictureBox5; - internal System.Windows.Forms.Panel Panel5; - internal System.Windows.Forms.PictureBox PictureBox4; - internal System.Windows.Forms.PictureBox PictureBox2; - internal System.Windows.Forms.Label Label9; - internal System.Windows.Forms.Label Label13; - internal System.Windows.Forms.Label Label14; - internal System.Windows.Forms.ProgressBar ProgressBar1; - internal System.Windows.Forms.Panel Complete; - internal System.Windows.Forms.PictureBox PictureBox3; - internal System.Windows.Forms.Panel Panel6; - internal System.Windows.Forms.PictureBox finishinstallimage; - internal System.Windows.Forms.Label Label17; - internal System.Windows.Forms.Label Label16; - internal System.Windows.Forms.Label Label18; - internal System.Windows.Forms.Panel welcome; - internal System.Windows.Forms.PictureBox PictureBox9; - internal System.Windows.Forms.Label Label1; - internal System.Windows.Forms.Panel programimage; - internal System.Windows.Forms.PictureBox installimage; - internal System.Windows.Forms.Label Label3; - internal System.Windows.Forms.Label Label2; - internal System.Windows.Forms.Label Label4; - internal System.Windows.Forms.TextBox TextBox1; - internal System.Windows.Forms.Panel toprightcorner; - internal System.Windows.Forms.Panel bottomrightcorner; - internal System.Windows.Forms.Panel bottomleftcorner; - internal System.Windows.Forms.Panel topleftcorner; - internal System.Windows.Forms.Timer look; - internal System.Windows.Forms.Timer pullbs; - internal System.Windows.Forms.Timer pullbottom; - internal System.Windows.Forms.Timer pullside; - internal System.Windows.Forms.Timer Timer1; - internal System.Windows.Forms.TextBox TextBox4; - internal System.Windows.Forms.Panel program; - internal System.Windows.Forms.Panel Panel1; - internal System.Windows.Forms.Panel Panel7; - internal System.Windows.Forms.Panel Panel9; - internal System.Windows.Forms.Panel Panel2; - internal System.Windows.Forms.PictureBox iconpic; - internal System.Windows.Forms.Label installname; - internal System.Windows.Forms.Button Button3; - internal System.Windows.Forms.Button Button2; - internal System.Windows.Forms.Button Button1; - internal System.Windows.Forms.Panel licenseagreement; - internal System.Windows.Forms.PictureBox PictureBox8; - internal System.Windows.Forms.PictureBox PictureBox1; - internal System.Windows.Forms.Panel Panel3; - internal System.Windows.Forms.PictureBox licenceagreementinstallpic; - internal System.Windows.Forms.Label Label6; - internal System.Windows.Forms.Label Label5; - internal System.Windows.Forms.RadioButton RadioButton2; - internal System.Windows.Forms.RadioButton RadioButton1; - internal System.Windows.Forms.TextBox TextBox3; - internal System.Windows.Forms.Panel summary; - internal System.Windows.Forms.PictureBox PictureBox7; - internal System.Windows.Forms.Panel Panel4; - internal System.Windows.Forms.PictureBox PictureBox6; - internal System.Windows.Forms.PictureBox suminstallpic; - internal System.Windows.Forms.Label Label7; - internal System.Windows.Forms.Label Label12; - internal System.Windows.Forms.Label Label11; - internal System.Windows.Forms.Label Label10; - internal System.Windows.Forms.Label Label8; - } -} diff --git a/TimeHACK.Main/GlobalPrograms/WinClassicInstaller.cs b/TimeHACK.Main/GlobalPrograms/WinClassicInstaller.cs deleted file mode 100644 index a15b1e1..0000000 --- a/TimeHACK.Main/GlobalPrograms/WinClassicInstaller.cs +++ /dev/null @@ -1,145 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using TimeHACK.OS.Win95; - -namespace TimeHACK.WinClassicForms -{ - public partial class WinClassicInstaller : UserControl - { - public WinClassicInstaller() - { - InitializeComponent(); - } - - string programtoinstall; - - private void WinClassicInstaller_Load(object sender, EventArgs e) - { - welcome.Show(); - programtoinstall = installname.Text; - installname.Hide(); - //programname.Text = (programtoinstall & " Setup") - Label1.Text = ("Setup Wizard "); - Label2.Text = ("Welcome To " + programtoinstall); - Label3.Text = ("Click Next to continue"); - Label4.Text = ("This Wizard will guide you through the installation of " + programtoinstall); - Label11.Text = ("C:\\Program Files\\ " + programtoinstall); - Label12.Text = ("Ready to start installing " + programtoinstall); - Label13.Text = ("Please wait while " + programtoinstall + " is being installed"); - Label14.Text = ("Installing " + programtoinstall); - Label16.Text = (programtoinstall + " was successfully installed."); - finishinstallimage.Image = installimage.Image; - look.Start(); - licenceagreementinstallpic.Image = iconpic.Image; - suminstallpic.Image = iconpic.Image; - PictureBox2.Image = iconpic.Image; - } - - private void Button3_Click(object sender, EventArgs e) - { - if (Button3.Text == "Finish") - { - if (programtoinstall == "Web Chat 1998") - { - TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; - ((Form)this.TopLevelControl).Close(); - } - if (programtoinstall == "Guess The Number 2") - { - ((Form)this.TopLevelControl).Close(); - //Windows2000.GuessTheNumberToolStripMenuItem.Visible = true; - } - if (programtoinstall == "Start Runner 2000") - { - ((Form)this.TopLevelControl).Close(); - //Windows2000.StartRunnerToolStripMenuItem.Visible = true; - } - if (programtoinstall == "Error Blaster 2000") - { - ((Form)this.TopLevelControl).Close(); - //Windows2000.ErrorBlasterToolStripMenuItem.Visible = true; - } - if (programtoinstall == "Skindows 95") - { - ((Windows95)this.ParentForm.ParentForm).SkindowsToolStripMenuItem.Visible = true; - ((Form)this.TopLevelControl).Close(); - } - if (programtoinstall == "Web Chat 2000") - { - ((Form)this.TopLevelControl).Close(); - //Windows2000.WebChatToolStripMenuItem.Visible = true; - } - if (programtoinstall == "Time Distorter 0.3") - { - ((Form)this.TopLevelControl).Close(); - //Windows2000.TimeDistorter03ToolStripMenuItem.Visible = true; - } - if (programtoinstall == "Survive The Day") - { - ((Form)this.TopLevelControl).Close(); - //Windows2000.SurviveTheDayToolStripMenuItem.Visible = true; - } - } - if (summary.Visible == true & licenseagreement.Visible == false) - { - summary.Hide(); - Button3.Hide(); - Timer1.Start(); - } - if (licenseagreement.Visible == true & welcome.Visible == false) - { - licenseagreement.Hide(); - } - if (welcome.Visible == true) - { - welcome.Hide(); - } - } - - private void Timer1_Tick(object sender, EventArgs e) - { - if (ProgressBar1.Value < 100) - { - ProgressBar1.Value = ProgressBar1.Value + 1; - } - if (ProgressBar1.Value == 100) - { - Button3.Show(); - installerproccess.Hide(); - Button3.Text = "Finish"; - Timer1.Stop(); - } - } - - private void Button1_Click(object sender, EventArgs e) - { - ((Form)this.TopLevelControl).Close(); - } - - private void RadioButton2_CheckedChanged(object sender, EventArgs e) - { - if(RadioButton2.Checked == true){ - Button3.Enabled = false; - }else{ - Button3.Enabled = true; - } - } - - private void RadioButton1_CheckedChanged(object sender, EventArgs e) - { - if (RadioButton2.Checked == true) - { - Button3.Enabled = false; - }else{ - Button3.Enabled = true; - } - } - } -} diff --git a/TimeHACK.Main/GlobalPrograms/WinClassicInstaller.resx b/TimeHACK.Main/GlobalPrograms/WinClassicInstaller.resx deleted file mode 100644 index 33801ef..0000000 --- a/TimeHACK.Main/GlobalPrograms/WinClassicInstaller.resx +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 200, 57 - - - 275, 57 - - - 359, 57 - - - 472, 57 - - - 566, 57 - - - By installing this software you agree that you will not try to reverse engineer it in anyway or claim it as your own work. - -You agree that you will not try to spread this software or any of its components to other companies without rightful permission from the owner. - -You agree that if you bought this program, you own it and that nobody else is allowed to use it on your computer or on their computer. - -You understand that trying to upload this software online or any other forms of spreading this software will result in the FBI coming into your home and killing you with knives. - -You agree that taking a picture of this software and sending it to someone will cause you to get 15 years in jail for software exposing. - -You agree that if you tell someone else about this software's features that you will wake up dead in the morning because the owner would have killed you in your sleep. - -You know that using this software will alert the maker of it and then cause him to monitor every moment of your life after you install this software. - -You agree to all of the above and will not commit any of the crimes otherwise you will go to Hell. - - \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index c6db739..e6ea876 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -238,7 +238,7 @@ namespace TimeHACK.OS.Win95 private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassicInstaller openinstaller = new WinClassicInstaller(); + Win95Installer openinstaller = new Win95Installer(); WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true); AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); @@ -278,7 +278,7 @@ namespace TimeHACK.OS.Win95 } else if (objListViewItem.Text == "Web Chat Setup") { - WinClassicInstaller inst = new WinClassicInstaller(); + Win95Installer inst = new Win95Installer(); inst.installname.Text = "Web Chat 1998"; WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs new file mode 100644 index 0000000..0bfab81 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs @@ -0,0 +1,144 @@ +namespace TimeHACK.OS.Win95.Win95Apps +{ + partial class Win95Installer + { + /// + /// 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() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Win95Installer)); + this.installPic = new System.Windows.Forms.PictureBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.label1 = new System.Windows.Forms.Label(); + this.installname = new System.Windows.Forms.Label(); + this.cancelbutton1 = new System.Windows.Forms.Button(); + this.nextbutton1 = new System.Windows.Forms.Button(); + this.backbutton1 = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // installPic + // + this.installPic.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicInstallPic; + this.installPic.Location = new System.Drawing.Point(18, 16); + this.installPic.Name = "installPic"; + this.installPic.Size = new System.Drawing.Size(120, 260); + this.installPic.TabIndex = 0; + this.installPic.TabStop = false; + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::TimeHACK.Properties.Resources.WinAboutSeparator95; + this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.pictureBox1.Location = new System.Drawing.Point(18, 292); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(450, 2); + this.pictureBox1.TabIndex = 1; + this.pictureBox1.TabStop = false; + // + // label1 + // + this.label1.Location = new System.Drawing.Point(147, 16); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(321, 260); + this.label1.TabIndex = 2; + this.label1.Text = resources.GetString("label1.Text"); + // + // installname + // + this.installname.AutoSize = true; + this.installname.Location = new System.Drawing.Point(18, 301); + this.installname.Name = "installname"; + this.installname.Size = new System.Drawing.Size(35, 13); + this.installname.TabIndex = 3; + this.installname.Text = "label2"; + this.installname.Visible = false; + // + // cancelbutton1 + // + this.cancelbutton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.cancelbutton1.Location = new System.Drawing.Point(393, 301); + this.cancelbutton1.Name = "cancelbutton1"; + this.cancelbutton1.Size = new System.Drawing.Size(75, 23); + this.cancelbutton1.TabIndex = 4; + this.cancelbutton1.Text = "Cancel"; + this.cancelbutton1.UseVisualStyleBackColor = true; + // + // nextbutton1 + // + this.nextbutton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.nextbutton1.Location = new System.Drawing.Point(312, 301); + this.nextbutton1.Name = "nextbutton1"; + this.nextbutton1.Size = new System.Drawing.Size(75, 23); + this.nextbutton1.TabIndex = 5; + this.nextbutton1.Text = "Next"; + this.nextbutton1.UseVisualStyleBackColor = true; + // + // backbutton1 + // + this.backbutton1.Enabled = false; + this.backbutton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.backbutton1.Location = new System.Drawing.Point(241, 301); + this.backbutton1.Name = "backbutton1"; + this.backbutton1.Size = new System.Drawing.Size(75, 23); + this.backbutton1.TabIndex = 6; + this.backbutton1.Text = "Back"; + this.backbutton1.UseVisualStyleBackColor = true; + // + // Win95Installer + // + 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.backbutton1); + this.Controls.Add(this.nextbutton1); + this.Controls.Add(this.cancelbutton1); + this.Controls.Add(this.installname); + this.Controls.Add(this.label1); + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.installPic); + this.Name = "Win95Installer"; + this.Size = new System.Drawing.Size(488, 340); + this.Load += new System.EventHandler(this.Win95Installer_Load); + ((System.ComponentModel.ISupportInitialize)(this.installPic)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.PictureBox installPic; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Label label1; + internal System.Windows.Forms.Label installname; + private System.Windows.Forms.Button cancelbutton1; + private System.Windows.Forms.Button nextbutton1; + private System.Windows.Forms.Button backbutton1; + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs new file mode 100644 index 0000000..0ae74df --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TimeHACK.OS.Win95.Win95Apps +{ + public partial class Win95Installer : UserControl + { + public Win95Installer() + { + InitializeComponent(); + label1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + cancelbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + nextbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + backbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + } + + private void Win95Installer_Load(object sender, EventArgs e) + { + label1.Text.Replace("GenericName", installname.Text); + } + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx new file mode 100644 index 0000000..3c5d753 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Welcome to the GenericName Setup program. This program will install GenericName on your computer. + +It is strongly recommended that you exit all Windows programs before running this setup program. + +Click Cancel to quit Setup and then close any programs you have running. Click Next to continue with the Setup program. + + +WARNING: This program is protected by copyright law and international treaties. + +Unauthorized reproduction or distribution of this program, or any portion of it, may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law. + + \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index b80d943..198108d 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -218,7 +218,7 @@ namespace TimeHACK.OS.Win98 private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassicInstaller openinstaller = new WinClassicInstaller(); + Win95Installer openinstaller = new Win95Installer(); WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true); AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); @@ -258,7 +258,7 @@ namespace TimeHACK.OS.Win98 } else if (objListViewItem.Text == "Web Chat Setup") { - WinClassicInstaller inst = new WinClassicInstaller(); + Win95Installer inst = new Win95Installer(); inst.installname.Text = "Web Chat 1998"; WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null); diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 610ce9c..95327fa 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -911,6 +911,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap WinClassicInstallPic { + get { + object obj = ResourceManager.GetObject("WinClassicInstallPic", 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 c5d7bff..09baced 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -591,4 +591,7 @@ ..\Resources\win95_welcometip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicInstallPic.png;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/WinClassic/WinClassicInstallPic.png b/TimeHACK.Main/Resources/WinClassic/WinClassicInstallPic.png new file mode 100644 index 0000000..8a7a689 Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/WinClassicInstallPic.png differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 0adb956..5d55c25 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -137,6 +137,12 @@ SurviveTheDay.cs + + UserControl + + + Win95Installer.cs + UserControl @@ -251,12 +257,6 @@ WinClassicIE4.cs - - UserControl - - - WinClassicInstaller.cs - UserControl @@ -300,6 +300,9 @@ SurviveTheDay.cs + + Win95Installer.cs + WinClassicFTPClient.cs @@ -363,9 +366,6 @@ WinClassicIE4.cs - - WinClassicInstaller.cs - WinClassicNotepad.cs @@ -498,6 +498,7 @@ + -- cgit v1.2.3 From e4ee95004a1655a61355d64818d633bcca00fd52 Mon Sep 17 00:00:00 2001 From: lempamo Date: Thu, 6 Jul 2017 10:41:05 -0400 Subject: Changed Installer and added EULA --- .../OS/Win95/Win95Apps/Win95Installer.Designer.cs | 61 +++++++++++++++++++++- TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs | 24 +++++++++ .../OS/Win95/Win95Apps/Win95Installer.resx | 17 ++++++ .../Win95Apps/WinClassicFTPClient.Designer.cs | 10 ++-- .../OS/Win95/Win95Apps/WinClassicFTPClient.cs | 7 ++- .../OS/Win95/Win95Apps/WinClassicFTPClient.resx | 2 +- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs | 9 ++++ .../OS/Win95/Win95Apps/WinClassicIE4.resx | 1 + .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 2 +- TimeHACK.Main/Resources/IE4/padams.html | 1 + 10 files changed, 124 insertions(+), 10 deletions(-) diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs index 0bfab81..d19c533 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs @@ -36,8 +36,13 @@ this.cancelbutton1 = new System.Windows.Forms.Button(); this.nextbutton1 = new System.Windows.Forms.Button(); this.backbutton1 = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.panel1 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // installPic @@ -97,23 +102,69 @@ this.nextbutton1.TabIndex = 5; this.nextbutton1.Text = "Next"; this.nextbutton1.UseVisualStyleBackColor = true; + this.nextbutton1.Click += new System.EventHandler(this.nextbutton1_Click); // // backbutton1 // this.backbutton1.Enabled = false; this.backbutton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.backbutton1.Location = new System.Drawing.Point(241, 301); + this.backbutton1.Location = new System.Drawing.Point(235, 301); this.backbutton1.Name = "backbutton1"; this.backbutton1.Size = new System.Drawing.Size(75, 23); this.backbutton1.TabIndex = 6; this.backbutton1.Text = "Back"; this.backbutton1.UseVisualStyleBackColor = true; // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(-3, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(263, 13); + this.label2.TabIndex = 7; + this.label2.Text = "Please read and agree to the EULA before continuing."; + // + // textBox1 + // + this.textBox1.AcceptsReturn = true; + this.textBox1.BackColor = System.Drawing.Color.White; + this.textBox1.Location = new System.Drawing.Point(0, 28); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textBox1.Size = new System.Drawing.Size(318, 209); + this.textBox1.TabIndex = 8; + this.textBox1.Text = resources.GetString("textBox1.Text"); + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(0, 243); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(215, 17); + this.checkBox1.TabIndex = 9; + this.checkBox1.Text = "I hereby agree to the terms in the EULA."; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); + // + // panel1 + // + this.panel1.Controls.Add(this.checkBox1); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.textBox1); + this.panel1.Location = new System.Drawing.Point(150, 16); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(318, 260); + this.panel1.TabIndex = 10; + this.panel1.Visible = false; + // // Win95Installer // 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.panel1); this.Controls.Add(this.backbutton1); this.Controls.Add(this.nextbutton1); this.Controls.Add(this.cancelbutton1); @@ -122,10 +173,12 @@ this.Controls.Add(this.pictureBox1); this.Controls.Add(this.installPic); this.Name = "Win95Installer"; - this.Size = new System.Drawing.Size(488, 340); + this.Size = new System.Drawing.Size(483, 340); this.Load += new System.EventHandler(this.Win95Installer_Load); ((System.ComponentModel.ISupportInitialize)(this.installPic)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -140,5 +193,9 @@ private System.Windows.Forms.Button cancelbutton1; private System.Windows.Forms.Button nextbutton1; private System.Windows.Forms.Button backbutton1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.Panel panel1; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs index 0ae74df..8377d54 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs @@ -12,10 +12,14 @@ namespace TimeHACK.OS.Win95.Win95Apps { public partial class Win95Installer : UserControl { + public int installStage = 0; + public Win95Installer() { InitializeComponent(); label1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + label2.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + checkBox1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); cancelbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); nextbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); backbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); @@ -25,5 +29,25 @@ namespace TimeHACK.OS.Win95.Win95Apps { label1.Text.Replace("GenericName", installname.Text); } + + private void nextbutton1_Click(object sender, EventArgs e) + { + switch (installStage) + { + case 0: + label1.Hide(); + panel1.Show(); + backbutton1.Enabled = true; + nextbutton1.Enabled = false; + installStage = 1; + break; + } + } + + private void checkBox1_CheckedChanged(object sender, EventArgs e) + { + if (checkBox1.Checked) nextbutton1.Enabled = true; + else nextbutton1.Enabled = false; + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx index 3c5d753..535ee98 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx @@ -129,4 +129,21 @@ WARNING: This program is protected by copyright law and international treaties. Unauthorized reproduction or distribution of this program, or any portion of it, may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law. + + By installing this software you agree that you will not try to reverse engineer it in anyway or claim it as your own work. + +You agree that you will not try to spread this software or any of its components to other companies without rightful permission from the owner. + +You agree that if you bought this program, you own it and that nobody else is allowed to use it on your computer or on their computer. + +You understand that trying to upload this software online or any other forms of spreading this software will result in the FBI coming into your home and killing you with knives. + +You agree that taking a picture of this software and sending it to someone will cause you to get 15 years in jail for software exposing. + +You agree that if you tell someone else about this software's features that you will wake up dead in the morning because the owner would have killed you in your sleep. + +You know that using this software will alert the maker of it and then cause him to monitor every moment of your life after you install this software. + +You agree to all of the above and will not commit any of the crimes otherwise you will go to Hell. + \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index 485b982..2e83e62 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -30,11 +30,11 @@ { this.components = new System.ComponentModel.Container(); System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem(new string[] { - "/software/"}, -1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); + "/software/"}, 0, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem(new string[] { - "index.html"}, -1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); + "index.html"}, 1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem(new string[] { - "???.html"}, -1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); + "???.html"}, 1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicFTPClient)); this.topBar = new System.Windows.Forms.Panel(); this.button1 = new System.Windows.Forms.Button(); @@ -180,10 +180,10 @@ this.panel1.Size = new System.Drawing.Size(762, 30); this.panel1.TabIndex = 9; // - // cancelButton + // button2 // this.button2.Location = new System.Drawing.Point(3, 2); - this.button2.Name = "cancelButton"; + this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(75, 23); this.button2.TabIndex = 0; this.button2.Text = "cancelButton"; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs index ab7e61f..b1caef9 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -33,6 +33,7 @@ namespace TimeHACK.OS.Win95.Win95Apps infoLabel.Text = "[200] OK"; welcomeLabel.Hide(); infoLabel.Show(); + ftpFiles.Show(); } else { @@ -57,9 +58,13 @@ namespace TimeHACK.OS.Win95.Win95Apps { Point objDrawingPoint = ftpFiles.PointToClient(Cursor.Position); ListViewItem objListViewItem = new ListViewItem(); - if (objListViewItem.Text == "/software/") + if (objDrawingPoint != null) { + objListViewItem = ftpFiles.GetItemAt(objDrawingPoint.X, objDrawingPoint.Y); + if (objListViewItem.Text == "/software/") + { + } } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx index 7b49ca1..28053de 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO - DwAAAk1TRnQBSQFMAgEBAgEAAQgBAAEIAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DwAAAk1TRnQBSQFMAgEBAgEAARABAAEQAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs index d70b520..81b8504 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs @@ -206,6 +206,7 @@ namespace TimeHACK.OS.Win95.Win95Apps break; case "12PADAMS": webBrowser1.Document.GetElementById("wc_b").Click += new HtmlElementEventHandler(WCDownloadButton_Click); + webBrowser1.Document.GetElementById("ftp_b").Click += new HtmlElementEventHandler(FTPDownloadButton_Click); if (!TitleScreen.frm95.hiddenpadamsFound) webBrowser1.Document.GetElementById("distort").Style += "visibility:hidden;"; break; case "GOOGLE": @@ -221,6 +222,14 @@ namespace TimeHACK.OS.Win95.Win95Apps } } + private void FTPDownloadButton_Click(object sender, HtmlElementEventArgs e) + { + WinClassicDownloader opendownload = new WinClassicDownloader(); + WindowManager wm = new WindowManager(); + wm.StartWin95(opendownload, "Downloader", null, false, true); + opendownload.appName.Text = "Downloading: FTP Client"; + } + //TODO: Add more websites //TODO: Relabel Buttons And Things } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx index 02cc277..f508cca 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx @@ -301,6 +301,7 @@ Where do you want to go today?</p> <h1>Games/Software</h1> <p class="app" id="gtn">Guess the Number V1 <button id="gtn_b">Download</button></p> <p class="app" id="wc">Web Chat 1998 <button id="wc_b">Download</button></p> + <p class="app" id="ftp">FTP Client <button id="ftp_b">Download</button></p> <p class="app" id="distort">Time Distorter 0.1 <button id="distort_b">Download</button></p> </div></td> <td><div class="customize"> diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs index 98ad7bc..4e731fe 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -103,7 +103,7 @@ namespace TimeHACK.OS.Win95.Win95Apps SaveSystem.CurrentSave.ThemeName = "insidepc"; SaveSystem.currentTheme = new InsideComputerTheme(); TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG; - TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); + TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); break; } ParentForm.Close(); diff --git a/TimeHACK.Main/Resources/IE4/padams.html b/TimeHACK.Main/Resources/IE4/padams.html index af12151..cc16191 100644 --- a/TimeHACK.Main/Resources/IE4/padams.html +++ b/TimeHACK.Main/Resources/IE4/padams.html @@ -50,6 +50,7 @@

Games/Software

Guess the Number V1

Web Chat 1998

+

FTP Client

Time Distorter 0.1

-- cgit v1.2.3 From 4b44847216ac4b498d088c11db5f928cc037d605 Mon Sep 17 00:00:00 2001 From: JayXKanz666 Date: Thu, 6 Jul 2017 18:31:20 +0200 Subject: Added Time distorter Look at the source if you want to know more *wink* --- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 4 +- TimeHACK.Main/OS/Win95/Win95.cs | 9 ++ TimeHACK.Main/OS/Win95/Win95.resx | 2 +- .../Win95Apps/WinClassicTimeDistorter.Designer.cs | 159 +++++++++++++++++++++ .../OS/Win95/Win95Apps/WinClassicTimeDistorter.cs | 47 ++++++ .../Win95/Win95Apps/WinClassicTimeDistorter.resx | 123 ++++++++++++++++ TimeHACK.Main/TimeHACK.Main.csproj | 9 ++ 7 files changed, 350 insertions(+), 3 deletions(-) create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.resx diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index e164439..998ece1 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -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, 292); + this.startmenuitems.Size = new System.Drawing.Size(145, 311); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -723,7 +723,7 @@ namespace TimeHACK.OS.Win95 this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem"; this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; - this.TimeDistorterToolStripMenuItem.Visible = false; + this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click); // // DocumentsToolStripMenuItem // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index e6ea876..c326c64 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -429,6 +429,15 @@ namespace TimeHACK.OS.Win95 app.BringToFront(); startmenu.Hide(); } + + private void TimeDistorterToolStripMenuItem_Click(object sender, EventArgs e) + { + WinClassic app = wm.StartWin95(new WinClassicTimeDistorter("2017", "20XX", 10), "Time Distorter", null, false, true); + + AddTaskBarItem(app, app.Tag.ToString(), "Time Distorter", 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 2e8769b..e4cbaa8 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -389,7 +389,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAXABAQFwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAYABAQGAAQEBIAEAASABAAT/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/WinClassicTimeDistorter.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs new file mode 100644 index 0000000..e8397b6 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs @@ -0,0 +1,159 @@ +namespace TimeHACK.OS.Win95 +{ + partial class WinClassicTimeDistorter + { + /// + /// 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.lblDest = new System.Windows.Forms.Label(); + this.lblDestYear = new System.Windows.Forms.Label(); + this.lblCurrent = new System.Windows.Forms.Label(); + this.lblYear = new System.Windows.Forms.Label(); + this.lblTo = new System.Windows.Forms.Label(); + this.btnGo = new System.Windows.Forms.Button(); + this.lblCountDown = new System.Windows.Forms.Label(); + this.countDownTimer = new System.Windows.Forms.Timer(this.components); + this.SuspendLayout(); + // + // lblDest + // + this.lblDest.AutoSize = true; + this.lblDest.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.lblDest.Location = new System.Drawing.Point(286, 6); + this.lblDest.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblDest.Name = "lblDest"; + this.lblDest.Size = new System.Drawing.Size(168, 25); + this.lblDest.TabIndex = 0; + this.lblDest.Text = "Destination year"; + this.lblDest.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lblDestYear + // + this.lblDestYear.AutoSize = true; + this.lblDestYear.Font = new System.Drawing.Font("Arial", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.lblDestYear.Location = new System.Drawing.Point(333, 32); + this.lblDestYear.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblDestYear.Name = "lblDestYear"; + this.lblDestYear.Size = new System.Drawing.Size(61, 33); + this.lblDestYear.TabIndex = 1; + this.lblDestYear.Text = "null"; + this.lblDestYear.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lblCurrent + // + this.lblCurrent.AutoSize = true; + this.lblCurrent.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.lblCurrent.Location = new System.Drawing.Point(8, 6); + this.lblCurrent.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblCurrent.Name = "lblCurrent"; + this.lblCurrent.Size = new System.Drawing.Size(131, 25); + this.lblCurrent.TabIndex = 0; + this.lblCurrent.Text = "Current year"; + this.lblCurrent.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lblYear + // + this.lblYear.AutoSize = true; + this.lblYear.Font = new System.Drawing.Font("Arial", 21.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.lblYear.Location = new System.Drawing.Point(29, 32); + this.lblYear.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblYear.Name = "lblYear"; + this.lblYear.Size = new System.Drawing.Size(61, 33); + this.lblYear.TabIndex = 1; + this.lblYear.Text = "null"; + this.lblYear.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // lblTo + // + this.lblTo.AutoSize = true; + this.lblTo.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.lblTo.Location = new System.Drawing.Point(151, 43); + this.lblTo.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblTo.Name = "lblTo"; + this.lblTo.Size = new System.Drawing.Size(135, 20); + this.lblTo.TabIndex = 6; + this.lblTo.Text = ">>>>>>>>>>>>>>\r\n"; + // + // btnGo + // + this.btnGo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnGo.Location = new System.Drawing.Point(162, 133); + this.btnGo.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.btnGo.Name = "btnGo"; + this.btnGo.Size = new System.Drawing.Size(124, 23); + this.btnGo.TabIndex = 7; + this.btnGo.Text = "Go to destination year"; + this.btnGo.UseVisualStyleBackColor = true; + this.btnGo.Click += new System.EventHandler(this.btnGo_Click); + // + // lblCountDown + // + this.lblCountDown.AutoSize = true; + this.lblCountDown.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.lblCountDown.Location = new System.Drawing.Point(48, 87); + this.lblCountDown.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.lblCountDown.Name = "lblCountDown"; + this.lblCountDown.Size = new System.Drawing.Size(46, 25); + this.lblCountDown.TabIndex = 8; + this.lblCountDown.Text = "null"; + this.lblCountDown.Visible = false; + // + // countDownTimer + // + this.countDownTimer.Interval = 1000; + this.countDownTimer.Tick += new System.EventHandler(this.countDownTimer_Tick); + // + // WinClassicTimeDistorter + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lblCountDown); + this.Controls.Add(this.lblCurrent); + this.Controls.Add(this.lblDest); + this.Controls.Add(this.lblYear); + this.Controls.Add(this.btnGo); + this.Controls.Add(this.lblDestYear); + this.Controls.Add(this.lblTo); + this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.Name = "WinClassicTimeDistorter"; + this.Size = new System.Drawing.Size(464, 166); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.Label lblDest; + private System.Windows.Forms.Label lblDestYear; + private System.Windows.Forms.Label lblCurrent; + private System.Windows.Forms.Label lblYear; + private System.Windows.Forms.Label lblTo; + private System.Windows.Forms.Button btnGo; + private System.Windows.Forms.Label lblCountDown; + private System.Windows.Forms.Timer countDownTimer; + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs new file mode 100644 index 0000000..b0542ba --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.cs @@ -0,0 +1,47 @@ +using System; +using System.Windows.Forms; +using TimeHACK.Engine; +using TimeHACK.Engine.Template; + +namespace TimeHACK.OS.Win95 +{ + public partial class WinClassicTimeDistorter : UserControl + { + private int _counter; + private Form _action; + + public WinClassicTimeDistorter(string currentYear, string yearToTravel, int counter, Form action = null) + { + InitializeComponent(); + + btnGo.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2); + lblYear.Text = currentYear; + lblDestYear.Text = yearToTravel; + _action = action; + _counter = counter; + } + + private void btnGo_Click(object sender, EventArgs e) + { + lblCountDown.Visible = true; + btnGo.Enabled = false; + countDownTimer.Start(); + + lblCountDown.Text = $"Preparing to travel... ETA: {_counter.ToString()} seconds"; + } + + private void countDownTimer_Tick(object sender, EventArgs e) + { + _counter--; + + if (_counter == 0) + { + countDownTimer.Stop(); + + if (_action != null) + _action.ShowDialog(); + } + lblCountDown.Text = $"Preparing to travel... ETA: {_counter.ToString()} seconds"; + } + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.resx new file mode 100644 index 0000000..933551f --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTimeDistorter.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 5d55c25..1590896 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -179,6 +179,12 @@ Win95SaveAs.cs + + UserControl + + + WinClassicTimeDistorter.cs + Form @@ -312,6 +318,9 @@ WinClassicThemePanel.cs + + WinClassicTimeDistorter.cs + WinClassicWelcome.cs -- cgit v1.2.3 From 44a5fb97c89311364b013f5ed610d59de0b0ccf0 Mon Sep 17 00:00:00 2001 From: lempamo Date: Thu, 6 Jul 2017 12:34:00 -0400 Subject: Installer is nearly done --- .../OS/Win95/Win95Apps/Win95Installer.Designer.cs | 126 ++++++++++++++++++++- TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs | 65 ++++++++++- .../Win95Apps/WinClassicFTPClient.Designer.cs | 5 - 3 files changed, 189 insertions(+), 7 deletions(-) diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs index d19c533..29369e2 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs @@ -40,9 +40,21 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.label3 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.panel3 = new System.Windows.Forms.Panel(); + this.label6 = new System.Windows.Forms.Label(); + this.panel4 = new System.Windows.Forms.Panel(); + this.label7 = new System.Windows.Forms.Label(); + this.progressBar1 = new TimeHACK.UI.ProgressBar(); ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.panel3.SuspendLayout(); + this.panel4.SuspendLayout(); this.SuspendLayout(); // // installPic @@ -92,6 +104,7 @@ this.cancelbutton1.TabIndex = 4; this.cancelbutton1.Text = "Cancel"; this.cancelbutton1.UseVisualStyleBackColor = true; + this.cancelbutton1.Click += new System.EventHandler(this.cancelbutton1_Click); // // nextbutton1 // @@ -108,12 +121,13 @@ // this.backbutton1.Enabled = false; this.backbutton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.backbutton1.Location = new System.Drawing.Point(235, 301); + this.backbutton1.Location = new System.Drawing.Point(237, 301); this.backbutton1.Name = "backbutton1"; this.backbutton1.Size = new System.Drawing.Size(75, 23); this.backbutton1.TabIndex = 6; this.backbutton1.Text = "Back"; this.backbutton1.UseVisualStyleBackColor = true; + this.backbutton1.Click += new System.EventHandler(this.backbutton1_Click); // // label2 // @@ -159,11 +173,106 @@ this.panel1.TabIndex = 10; this.panel1.Visible = false; // + // panel2 + // + this.panel2.Controls.Add(this.label5); + this.panel2.Controls.Add(this.label4); + this.panel2.Controls.Add(this.label3); + this.panel2.Location = new System.Drawing.Point(150, 16); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(318, 260); + this.panel2.TabIndex = 11; + this.panel2.Visible = false; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(-3, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(268, 13); + this.label3.TabIndex = 0; + this.label3.Text = "Setup will install GenericName in the following directory:"; + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(23, 67); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(214, 13); + this.label4.TabIndex = 1; + this.label4.Text = "C:\\Program Files\\12padams\\GenericName\\"; + // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(-3, 28); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(178, 13); + this.label5.TabIndex = 2; + this.label5.Text = "To install in this directory, click Next."; + // + // panel3 + // + this.panel3.Controls.Add(this.label6); + this.panel3.Controls.Add(this.progressBar1); + this.panel3.Location = new System.Drawing.Point(150, 16); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(318, 260); + this.panel3.TabIndex = 12; + this.panel3.Visible = false; + // + // label6 + // + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(4, 12); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(57, 13); + this.label6.TabIndex = 1; + this.label6.Text = "Installing..."; + // + // panel4 + // + this.panel4.Controls.Add(this.label7); + this.panel4.Location = new System.Drawing.Point(150, 16); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(318, 260); + this.panel4.TabIndex = 13; + this.panel4.Visible = false; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Location = new System.Drawing.Point(7, 12); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(205, 13); + this.label7.TabIndex = 0; + this.label7.Text = "GenericName Setup has been completed."; + // + // progressBar1 + // + this.progressBar1.BlockSpacing = 5; + this.progressBar1.BlockWidth = 20; + this.progressBar1.Location = new System.Drawing.Point(3, 115); + this.progressBar1.MarqueeWidth = 125; + this.progressBar1.Maximum = 100D; + this.progressBar1.Minimum = 0D; + this.progressBar1.Name = "progressBar1"; + this.progressBar1.ProgressColor = System.Drawing.Color.Navy; + this.progressBar1.ShowText = false; + this.progressBar1.Size = new System.Drawing.Size(312, 28); + this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks; + this.progressBar1.TabIndex = 0; + this.progressBar1.Text = "progressBar1"; + this.progressBar1.Value = 0D; + // // Win95Installer // 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.panel4); + this.Controls.Add(this.panel3); + this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); this.Controls.Add(this.backbutton1); this.Controls.Add(this.nextbutton1); @@ -179,6 +288,12 @@ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + this.panel3.ResumeLayout(false); + this.panel3.PerformLayout(); + this.panel4.ResumeLayout(false); + this.panel4.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -197,5 +312,14 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.CheckBox checkBox1; private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Panel panel3; + private UI.ProgressBar progressBar1; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Label label7; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs index 8377d54..e3924ee 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs @@ -13,12 +13,16 @@ namespace TimeHACK.OS.Win95.Win95Apps public partial class Win95Installer : UserControl { public int installStage = 0; + private Timer installbar = new Timer(); public Win95Installer() { InitializeComponent(); label1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); label2.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + label3.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + label4.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + label5.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); checkBox1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); cancelbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); nextbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); @@ -28,6 +32,27 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Win95Installer_Load(object sender, EventArgs e) { label1.Text.Replace("GenericName", installname.Text); + label3.Text.Replace("GenericName", installname.Text); + label4.Text.Replace("GenericName", installname.Text); + installbar.Tick += Installbar_Tick; + } + + private void Installbar_Tick(object sender, EventArgs e) + { + if (progressBar1.Value < 100) + { + progressBar1.Value = progressBar1.Value + 1; + } + else + { + panel3.Hide(); + panel4.Show(); + backbutton1.Hide(); + nextbutton1.Hide(); + cancelbutton1.Enabled = true; + cancelbutton1.Text = "Finish"; + installbar.Stop(); + } } private void nextbutton1_Click(object sender, EventArgs e) @@ -38,9 +63,22 @@ namespace TimeHACK.OS.Win95.Win95Apps label1.Hide(); panel1.Show(); backbutton1.Enabled = true; - nextbutton1.Enabled = false; + if (!checkBox1.Checked) nextbutton1.Enabled = false; installStage = 1; break; + case 1: + panel1.Hide(); + panel2.Show(); + installStage = 2; + break; + case 2: + panel2.Hide(); + panel3.Show(); + backbutton1.Enabled = false; + nextbutton1.Enabled = false; + cancelbutton1.Enabled = false; + installbar.Start(); + break; } } @@ -49,5 +87,30 @@ namespace TimeHACK.OS.Win95.Win95Apps if (checkBox1.Checked) nextbutton1.Enabled = true; else nextbutton1.Enabled = false; } + + private void backbutton1_Click(object sender, EventArgs e) + { + switch (installStage) + { + case 1: + panel1.Hide(); + label1.Show(); + backbutton1.Enabled = false; + nextbutton1.Enabled = true; + installStage = 0; + break; + case 2: + panel2.Hide(); + panel1.Show(); + if (!checkBox1.Checked) nextbutton1.Enabled = false; + installStage = 1; + break; + } + } + + private void cancelbutton1_Click(object sender, EventArgs e) + { + ParentForm.Close(); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index 2e83e62..e7280ea 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -209,11 +209,6 @@ this.ftpFiles.Cursor = System.Windows.Forms.Cursors.Default; this.ftpFiles.Dock = System.Windows.Forms.DockStyle.Fill; this.ftpFiles.ForeColor = System.Drawing.Color.White; - listViewItem1.StateImageIndex = 0; - listViewItem2.Checked = true; - listViewItem2.StateImageIndex = 1; - listViewItem3.Checked = true; - listViewItem3.StateImageIndex = 1; this.ftpFiles.Items.AddRange(new System.Windows.Forms.ListViewItem[] { listViewItem1, listViewItem2, -- cgit v1.2.3 From 77f783fe2b6999720c900aaf32103bec906f9da9 Mon Sep 17 00:00:00 2001 From: lempamo Date: Thu, 6 Jul 2017 13:17:41 -0400 Subject: You can install WebChat again --- TimeHACK.Main/OS/Win95/Win95.cs | 6 +++--- TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs | 11 ++++++++++- TimeHACK.Main/OS/Win98/Win98.cs | 18 +++++++++--------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index c326c64..c5e7799 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -238,7 +238,7 @@ namespace TimeHACK.OS.Win95 private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) { - Win95Installer openinstaller = new Win95Installer(); + Win95Installer openinstaller = new Win95Installer("Testing"); WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true); AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); @@ -278,8 +278,8 @@ namespace TimeHACK.OS.Win95 } else if (objListViewItem.Text == "Web Chat Setup") { - Win95Installer inst = new Win95Installer(); - inst.installname.Text = "Web Chat 1998"; + Win95Installer inst = new Win95Installer("Web Chat 1998"); + inst.InstallCompleted += (sendr, args) => WebChatToolStripMenuItem.Visible = true; WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null); app.BringToFront(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs index e3924ee..8178a30 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs @@ -13,9 +13,17 @@ namespace TimeHACK.OS.Win95.Win95Apps public partial class Win95Installer : UserControl { public int installStage = 0; + private string prog; private Timer installbar = new Timer(); - public Win95Installer() + public event EventHandler InstallCompleted; + + protected void OnInstallCompleted(EventArgs e) + { + if (InstallCompleted != null) InstallCompleted(this, e); + } + + public Win95Installer(string progName) { InitializeComponent(); label1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); @@ -45,6 +53,7 @@ namespace TimeHACK.OS.Win95.Win95Apps } else { + OnInstallCompleted(EventArgs.Empty); panel3.Hide(); panel4.Show(); backbutton1.Hide(); diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index 198108d..175719a 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -218,12 +218,12 @@ namespace TimeHACK.OS.Win98 private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) { - Win95Installer openinstaller = new Win95Installer(); - WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true); + //Win95Installer openinstaller = new Win95Installer(); + //WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true); - AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); + //AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); - app.BringToFront(); + //app.BringToFront(); startmenu.Hide(); } @@ -258,11 +258,11 @@ namespace TimeHACK.OS.Win98 } else if (objListViewItem.Text == "Web Chat Setup") { - Win95Installer inst = new Win95Installer(); - inst.installname.Text = "Web Chat 1998"; - WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true); - AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null); - app.BringToFront(); + //Win95Installer inst = new Win95Installer(); + //inst.installname.Text = "Web Chat 1998"; + //WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true); + //AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null); + //app.BringToFront(); startmenu.Hide(); } } -- cgit v1.2.3 From 88711b440b3a55d09118d2c42b1bb8930936eb90 Mon Sep 17 00:00:00 2001 From: lempamo Date: Thu, 6 Jul 2017 13:49:20 -0400 Subject: And you can install and open FTP Client --- TimeHACK.Main/GlobalPrograms/WinClassicDownloader.cs | 4 ++++ TimeHACK.Main/OS/Win95/Win95.Designer.cs | 16 +++++++++++++++- TimeHACK.Main/OS/Win95/Win95.cs | 17 +++++++++++++++++ TimeHACK.Main/OS/Win95/Win95.resx | 2 +- TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs | 10 +++++++--- 5 files changed, 44 insertions(+), 5 deletions(-) diff --git a/TimeHACK.Main/GlobalPrograms/WinClassicDownloader.cs b/TimeHACK.Main/GlobalPrograms/WinClassicDownloader.cs index 418444a..c5d00a2 100644 --- a/TimeHACK.Main/GlobalPrograms/WinClassicDownloader.cs +++ b/TimeHACK.Main/GlobalPrograms/WinClassicDownloader.cs @@ -67,6 +67,10 @@ namespace TimeHACK.OS.Win95.Win95Apps { Windows95.desktopicons.Items.Add("Time Distorter Setup", imageIndex: 13); } + if (appName.Text == "Downloading: FTP Client") + { + TitleScreen.frm95.desktopicons.Items.Add("FTP Client Setup", imageIndex: 11); + } ((Form)this.TopLevelControl).Close(); dlTimer.Stop(); } diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 998ece1..46485ee 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -130,6 +130,7 @@ namespace TimeHACK.OS.Win95 this.BitmapImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MicrosoftDataLinkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.FTPClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1.SuspendLayout(); this.taskbar.SuspendLayout(); this.clockPanel.SuspendLayout(); @@ -265,7 +266,8 @@ namespace TimeHACK.OS.Win95 this.ErrorBlasterToolStripMenuItem, this.SkindowsToolStripMenuItem, this.WebChatToolStripMenuItem, - this.TimeDistorterToolStripMenuItem}); + this.TimeDistorterToolStripMenuItem, + this.FTPClientToolStripMenuItem}); this.ProgramsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicPrograms; this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; @@ -725,6 +727,17 @@ namespace TimeHACK.OS.Win95 this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click); // + // FTPClientToolStripMenuItem + // + this.FTPClientToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.FTPClientToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; + this.FTPClientToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.FTPClientToolStripMenuItem.Name = "FTPClientToolStripMenuItem"; + this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.FTPClientToolStripMenuItem.Text = "FTP Client"; + this.FTPClientToolStripMenuItem.Visible = false; + this.FTPClientToolStripMenuItem.Click += new System.EventHandler(this.FTPClientToolStripMenuItem_Click); + // // DocumentsToolStripMenuItem // this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; @@ -1267,5 +1280,6 @@ namespace TimeHACK.OS.Win95 private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem; private System.Windows.Forms.Panel taskbarItems; private System.Windows.Forms.ToolStripMenuItem storyTest1ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem FTPClientToolStripMenuItem; } } \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index c5e7799..32d619f 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -285,6 +285,15 @@ namespace TimeHACK.OS.Win95 app.BringToFront(); startmenu.Hide(); } + else if (objListViewItem.Text == "FTP Client Setup") + { + Win95Installer inst = new Win95Installer("FTP Client"); + inst.InstallCompleted += (sendr, args) => WebChatToolStripMenuItem.Visible = true; + WinClassic app = wm.StartWin95(inst, "FTP Client Setup", null, true, true); + AddTaskBarItem(app, app.Tag.ToString(), "FTP Client Setup", null); + app.BringToFront(); + startmenu.Hide(); + } } } } @@ -438,6 +447,14 @@ namespace TimeHACK.OS.Win95 app.BringToFront(); startmenu.Hide(); } + private void FTPClientToolStripMenuItem_Click(object sender, EventArgs e) + { + WinClassic app = wm.StartWin95(new WinClassicFTPClient(), "FTP Client", null, true, true); + + AddTaskBarItem(app, app.Tag.ToString(), "FTP Client", 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 e4cbaa8..8285d12 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -389,7 +389,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAYABAQGAAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAYgBAQGIAQEBIAEAASABAAT/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/Win95Installer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs index 8178a30..c6e125f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs @@ -31,17 +31,21 @@ namespace TimeHACK.OS.Win95.Win95Apps label3.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); label4.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); label5.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + label6.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + label7.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); checkBox1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); cancelbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); nextbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); backbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + prog = progName; } private void Win95Installer_Load(object sender, EventArgs e) { - label1.Text.Replace("GenericName", installname.Text); - label3.Text.Replace("GenericName", installname.Text); - label4.Text.Replace("GenericName", installname.Text); + label1.Text = label1.Text.Replace("GenericName", prog); + label3.Text = label3.Text.Replace("GenericName", prog); + label4.Text = label4.Text.Replace("GenericName", prog); + label7.Text = label7.Text.Replace("GenericName", prog); installbar.Tick += Installbar_Tick; } -- cgit v1.2.3