From 9e96ca19ed0904e7c80496071b0d7efdde405414 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 24 Sep 2017 15:20:55 -0400 Subject: some more installer stuff --- .../InstallerPanes/EULAPane.Designer.cs | 1 + .../GlobalPrograms/InstallerPanes/EULAPane.cs | 6 + .../InstallerPanes/ProgressPane.Designer.cs | 131 +++++++++++++++++++++ .../GlobalPrograms/InstallerPanes/ProgressPane.cs | 38 ++++++ .../InstallerPanes/ProgressPane.resx | 120 +++++++++++++++++++ .../GlobalPrograms/WinClassicInstaller.Designer.cs | 3 +- Histacom2/GlobalPrograms/WinClassicInstaller.cs | 25 ++++ 7 files changed, 322 insertions(+), 2 deletions(-) create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.Designer.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.resx (limited to 'Histacom2/GlobalPrograms') diff --git a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs index 90dbbb1..5f78c44 100644 --- a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs +++ b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.Designer.cs @@ -111,6 +111,7 @@ this.radioButton1.TabIndex = 3; this.radioButton1.Text = "I &accept the agreement"; this.radioButton1.UseVisualStyleBackColor = false; + this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); // // radioButton2 // diff --git a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs index c477836..e584117 100644 --- a/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs +++ b/Histacom2/GlobalPrograms/InstallerPanes/EULAPane.cs @@ -24,5 +24,11 @@ namespace Histacom2.GlobalPrograms.InstallerPanes radioButton1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular); radioButton2.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular); } + + private void radioButton1_CheckedChanged(object sender, EventArgs e) + { + if (radioButton1.Checked) ((WinClassicInstaller)Parent.Parent).classicButton2.Enabled = true; + else ((WinClassicInstaller)Parent.Parent).classicButton2.Enabled = false; + } } } diff --git a/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.Designer.cs b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.Designer.cs new file mode 100644 index 0000000..e0e8e04 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.Designer.cs @@ -0,0 +1,131 @@ +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + partial class ProgressPane + { + /// + /// 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.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.progressBar1 = new Histacom2.Engine.UI.ProgressBar(); + this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.White; + this.panel1.Controls.Add(this.pictureBox1); + this.panel1.Controls.Add(this.classicLabel2); + this.panel1.Controls.Add(this.classicLabel1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(495, 58); + this.panel1.TabIndex = 0; + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicInstallIcon; + this.pictureBox1.Location = new System.Drawing.Point(440, 2); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(53, 53); + this.pictureBox1.TabIndex = 2; + this.pictureBox1.TabStop = false; + // + // classicLabel2 + // + this.classicLabel2.Location = new System.Drawing.Point(40, 28); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(380, 13); + this.classicLabel2.TabIndex = 1; + this.classicLabel2.Text = "Please   wait   while   setup   installs   Program   on   your   computer.       " + + "  "; + // + // classicLabel1 + // + this.classicLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel1.Location = new System.Drawing.Point(25, 12); + this.classicLabel1.Name = "classicLabel1"; + this.classicLabel1.Size = new System.Drawing.Size(274, 13); + this.classicLabel1.TabIndex = 0; + this.classicLabel1.Text = "Installi n g"; + // + // classicLabel3 + // + this.classicLabel3.Location = new System.Drawing.Point(25, 73); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(446, 13); + this.classicLabel3.TabIndex = 1; + this.classicLabel3.Text = "Extracting Files..."; + // + // progressBar1 + // + this.progressBar1.BlockSpacing = 5; + this.progressBar1.BlockWidth = 20; + this.progressBar1.Location = new System.Drawing.Point(25, 93); + this.progressBar1.MarqueeWidth = 125; + this.progressBar1.Maximum = 100D; + this.progressBar1.Minimum = 0D; + this.progressBar1.Name = "progressBar1"; + this.progressBar1.ProgressColor = System.Drawing.Color.DarkBlue; + this.progressBar1.ShowText = false; + this.progressBar1.Size = new System.Drawing.Size(436, 23); + this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks; + this.progressBar1.TabIndex = 2; + this.progressBar1.Text = "progressBar1"; + this.progressBar1.Value = 0D; + // + // ProgressPane + // + 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.progressBar1); + this.Controls.Add(this.classicLabel3); + this.Controls.Add(this.panel1); + this.Name = "ProgressPane"; + this.Size = new System.Drawing.Size(495, 314); + this.Load += new System.EventHandler(this.DirectoryPane_Load); + this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private Engine.UI.ClassicLabel classicLabel1; + private Engine.UI.ClassicLabel classicLabel2; + private System.Windows.Forms.PictureBox pictureBox1; + private Engine.UI.ClassicLabel classicLabel3; + private Engine.UI.ProgressBar progressBar1; + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs new file mode 100644 index 0000000..0a5cb60 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs @@ -0,0 +1,38 @@ +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 Histacom2.Engine; + +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + public partial class ProgressPane : UserControl + { + public ProgressPane() + { + InitializeComponent(); + } + + private void DirectoryPane_Load(object sender, EventArgs e) + { + classicLabel2.Text = $"Please   wait   while   setup   installs   {((WinClassicInstaller)Parent.Parent).progName}   on   your   computer.         "; + Timer t = new Timer(); + t.Interval = 200; + t.Tick += (s, a) => + { + if (progressBar1.Value == 100) + { + ((WinClassicInstaller)Parent.Parent).classicButton2.PerformClick(); + t.Stop(); + } + progressBar1.Value += 4; + }; + t.Start(); + } + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.resx b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs index 20688b5..6fcbf49 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs @@ -90,7 +90,6 @@ this.classicButton3.AdaptForeColorWithTheme = true; this.classicButton3.BackColor = System.Drawing.Color.Silver; this.classicButton3.DialogResult = System.Windows.Forms.DialogResult.None; - this.classicButton3.Enabled = false; this.classicButton3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.classicButton3.ForeColor = System.Drawing.Color.Black; this.classicButton3.Location = new System.Drawing.Point(248, 326); @@ -125,7 +124,7 @@ private System.Windows.Forms.Panel panel1; private System.Windows.Forms.PictureBox pictureBox1; private Engine.UI.ClassicButton classicButton1; - private Engine.UI.ClassicButton classicButton2; private Engine.UI.ClassicButton classicButton3; + public Engine.UI.ClassicButton classicButton2; } } diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.cs index 4e0098c..e37ae24 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.cs @@ -15,6 +15,13 @@ namespace Histacom2.GlobalPrograms public string progName; public int state = 0; + public event EventHandler InstallCompleted; + + protected void OnInstallCompleted(EventArgs e) + { + if (InstallCompleted != null) InstallCompleted(this, e); + } + public WinClassicInstaller(string prog) { InitializeComponent(); @@ -40,6 +47,24 @@ namespace Histacom2.GlobalPrograms state = 1; classicButton2.Enabled = false; } + else if (state == 1) + { + var dir = new InstallerPanes.DirectoryPane(); + dir.Parent = panel1; + state = 2; + } + else if (state == 2) + { + classicButton3.Hide(); + classicButton1.Enabled = false; + var p = new InstallerPanes.ProgressPane(); + p.Parent = panel1; + state = 3; + } + else if (state == 3) + { + OnInstallCompleted(EventArgs.Empty); + } } } } -- cgit v1.2.3 From 2ad35b2bdc3968f1cca98164d78ec264f3af43b3 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 1 Oct 2017 15:38:15 -0400 Subject: i am a man of my word --- .../InstallerPanes/CompletePane.Designer.cs | 136 +++++++++++++++++++++ .../GlobalPrograms/InstallerPanes/CompletePane.cs | 26 ++++ .../InstallerPanes/CompletePane.resx | 120 ++++++++++++++++++ Histacom2/GlobalPrograms/WinClassicInstaller.cs | 9 ++ Histacom2/Histacom2.csproj | 9 ++ 5 files changed, 300 insertions(+) create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/CompletePane.Designer.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/CompletePane.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/CompletePane.resx (limited to 'Histacom2/GlobalPrograms') diff --git a/Histacom2/GlobalPrograms/InstallerPanes/CompletePane.Designer.cs b/Histacom2/GlobalPrograms/InstallerPanes/CompletePane.Designer.cs new file mode 100644 index 0000000..1479469 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/CompletePane.Designer.cs @@ -0,0 +1,136 @@ +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + partial class CompletePane + { + /// + /// 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.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.panel3 = new System.Windows.Forms.Panel(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // classicLabel3 + // + this.classicLabel3.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel3.Location = new System.Drawing.Point(13, 114); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(307, 13); + this.classicLabel3.TabIndex = 8; + this.classicLabel3.Text = "Click Finish to exit Setup."; + // + // classicLabel2 + // + this.classicLabel2.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel2.Location = new System.Drawing.Point(13, 66); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(307, 38); + this.classicLabel2.TabIndex = 7; + this.classicLabel2.Text = "Setup has finished installing Program on your computer. The application may be la" + + "unched by selecting the installed icons."; + // + // classicLabel1 + // + this.classicLabel1.Dock = System.Windows.Forms.DockStyle.Top; + this.classicLabel1.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel1.Location = new System.Drawing.Point(13, 16); + this.classicLabel1.Name = "classicLabel1"; + this.classicLabel1.Size = new System.Drawing.Size(307, 40); + this.classicLabel1.TabIndex = 6; + this.classicLabel1.Text = "Completing the Program Setup Wizard"; + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicInstallSidebar; + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Left; + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(164, 314); + this.pictureBox1.TabIndex = 5; + this.pictureBox1.TabStop = false; + // + // panel1 + // + this.panel1.Controls.Add(this.classicLabel3); + this.panel1.Controls.Add(this.panel3); + this.panel1.Controls.Add(this.classicLabel2); + this.panel1.Controls.Add(this.panel2); + this.panel1.Controls.Add(this.classicLabel1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Right; + this.panel1.Location = new System.Drawing.Point(164, 0); + this.panel1.Name = "panel1"; + this.panel1.Padding = new System.Windows.Forms.Padding(13, 16, 11, 0); + this.panel1.Size = new System.Drawing.Size(331, 314); + this.panel1.TabIndex = 9; + // + // panel2 + // + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(13, 56); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(307, 10); + this.panel2.TabIndex = 8; + // + // panel3 + // + this.panel3.Dock = System.Windows.Forms.DockStyle.Top; + this.panel3.Location = new System.Drawing.Point(13, 104); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(307, 10); + this.panel3.TabIndex = 9; + // + // CompletePane + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.White; + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.panel1); + this.Name = "CompletePane"; + this.Size = new System.Drawing.Size(495, 314); + this.Load += new System.EventHandler(this.CompletePane_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + private Engine.UI.ClassicLabel classicLabel3; + private Engine.UI.ClassicLabel classicLabel2; + private Engine.UI.ClassicLabel classicLabel1; + private System.Windows.Forms.PictureBox pictureBox1; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Panel panel2; + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/CompletePane.cs b/Histacom2/GlobalPrograms/InstallerPanes/CompletePane.cs new file mode 100644 index 0000000..ab89316 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/CompletePane.cs @@ -0,0 +1,26 @@ +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 Histacom2.GlobalPrograms.InstallerPanes +{ + public partial class CompletePane : UserControl + { + public CompletePane() + { + InitializeComponent(); + } + + private void CompletePane_Load(object sender, EventArgs e) + { + classicLabel1.Text = $"Completing the {((WinClassicInstaller)Parent.Parent).progName} Setup Wizard"; + classicLabel2.Text = $"Setup has finished installing {((WinClassicInstaller)Parent.Parent).progName} on your computer. The application may be launched by selecting the installed icons."; + } + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/CompletePane.resx b/Histacom2/GlobalPrograms/InstallerPanes/CompletePane.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/CompletePane.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.cs index e37ae24..016ad23 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.cs @@ -64,6 +64,15 @@ namespace Histacom2.GlobalPrograms else if (state == 3) { OnInstallCompleted(EventArgs.Empty); + var c = new InstallerPanes.CompletePane(); + c.Parent = panel1; + classicButton3.Enabled = false; + classicButton2.Text = "Finish"; + state = 4; + } + else + { + ParentForm.Close(); } } } diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index 474b6bd..e167468 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -132,6 +132,12 @@ AchievementBox.cs + + UserControl + + + CompletePane.cs + UserControl @@ -431,6 +437,9 @@ AchievementBox.cs + + CompletePane.cs + ProgressPane.cs -- cgit v1.2.3 From fcc9810a8e5ba613c43c185f7a8b32292d22191b Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 1 Oct 2017 20:18:03 -0400 Subject: webchat 1999 is created --- Histacom2.Engine/Paintbrush.cs | 6 +- Histacom2/GlobalPrograms/WinClassicInstaller.cs | 12 +- Histacom2/Histacom2.csproj | 9 + .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 38 +++- .../OS/Win98/Win98Apps/WebChat1999.Designer.cs | 193 +++++++++++++++++++++ Histacom2/OS/Win98/Win98Apps/WebChat1999.cs | 20 +++ Histacom2/OS/Win98/Win98Apps/WebChat1999.resx | 120 +++++++++++++ .../Win98/Win98Apps/WinClassicWindowsExplorer.cs | 7 +- 8 files changed, 382 insertions(+), 23 deletions(-) create mode 100644 Histacom2/OS/Win98/Win98Apps/WebChat1999.Designer.cs create mode 100644 Histacom2/OS/Win98/Win98Apps/WebChat1999.cs create mode 100644 Histacom2/OS/Win98/Win98Apps/WebChat1999.resx (limited to 'Histacom2/GlobalPrograms') diff --git a/Histacom2.Engine/Paintbrush.cs b/Histacom2.Engine/Paintbrush.cs index ff715d2..defd055 100644 --- a/Histacom2.Engine/Paintbrush.cs +++ b/Histacom2.Engine/Paintbrush.cs @@ -50,18 +50,20 @@ namespace Histacom2.Engine { if (basecolor == Color.Silver) return Color.White; if (basecolor == Color.Green) return Color.FromArgb(64, 255, 64); + if (basecolor == Color.NavajoWhite) return Color.FromArgb(255, 239, 215); if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(184, 184, 184); if (basecolor == Color.FromArgb(169, 200, 169)) return Color.FromArgb(218, 223, 218); - return ControlPaint.Light(basecolor, 70); + return ControlPaint.Light(basecolor, 5); } public static Color GetDarkFromColor(Color basecolor) { if (basecolor == Color.Silver) return Color.Gray; if (basecolor == Color.Green) return Color.FromArgb(0, 83, 0); + if (basecolor == Color.NavajoWhite) return Color.FromArgb(255, 164, 28); if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(72, 72, 72); if (basecolor == Color.FromArgb(169, 200, 169)) return Color.FromArgb(95, 153, 95); - return ControlPaint.Dark(basecolor, 70); + return ControlPaint.Dark(basecolor, 5); } } } diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.cs index 016ad23..f73e547 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.cs @@ -1,11 +1,4 @@ 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 Histacom2.GlobalPrograms @@ -70,10 +63,7 @@ namespace Histacom2.GlobalPrograms classicButton2.Text = "Finish"; state = 4; } - else - { - ParentForm.Close(); - } + else ParentForm.Close(); } } } diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index e167468..8e7b31b 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -322,6 +322,12 @@ IENoPage.cs + + UserControl + + + WebChat1999.cs + UserControl @@ -534,6 +540,9 @@ IENoPage.cs Designer + + WebChat1999.cs + WinClassicIE4.cs diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs index ea9d0cd..e57ff1b 100644 --- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -75,7 +75,7 @@ this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label1.Location = new System.Drawing.Point(506, 13); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(85, 13); + this.label1.Size = new System.Drawing.Size(96, 13); this.label1.TabIndex = 1; this.label1.Text = "Users Logged In"; // @@ -106,18 +106,22 @@ // // label5 // - this.label5.Location = new System.Drawing.Point(13, 18); + this.label5.Location = new System.Drawing.Point(10, 18); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(84, 13); + this.label5.Size = new System.Drawing.Size(87, 13); this.label5.TabIndex = 1; this.label5.Text = "skin95setup.exe"; // // button5 // + this.button5.AdaptBackColorWithTheme = true; + this.button5.AdaptFontWithTheme = true; + this.button5.AdaptForeColorWithTheme = true; this.button5.BackColor = System.Drawing.Color.Silver; + this.button5.DialogResult = System.Windows.Forms.DialogResult.None; this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.button5.ForeColor = System.Drawing.Color.Black; - this.button5.Location = new System.Drawing.Point(101, 13); + this.button5.Location = new System.Drawing.Point(103, 13); this.button5.Name = "button5"; this.button5.Size = new System.Drawing.Size(75, 23); this.button5.TabIndex = 0; @@ -128,7 +132,7 @@ this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label6.Location = new System.Drawing.Point(504, 374); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(62, 13); + this.label6.Size = new System.Drawing.Size(70, 13); this.label6.TabIndex = 4; this.label6.Text = "File Sharing"; // @@ -158,7 +162,7 @@ // this.label2.Location = new System.Drawing.Point(328, 161); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(149, 13); + this.label2.Size = new System.Drawing.Size(166, 13); this.label2.TabIndex = 6; this.label2.Text = "Please type in a screen name."; // @@ -171,7 +175,11 @@ // // button1 // + this.button1.AdaptBackColorWithTheme = true; + this.button1.AdaptFontWithTheme = true; + this.button1.AdaptForeColorWithTheme = true; this.button1.BackColor = System.Drawing.Color.Silver; + this.button1.DialogResult = System.Windows.Forms.DialogResult.None; this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.button1.ForeColor = System.Drawing.Color.Black; this.button1.Location = new System.Drawing.Point(331, 208); @@ -183,9 +191,9 @@ // // label3 // - this.label3.Location = new System.Drawing.Point(202, 16); + this.label3.Location = new System.Drawing.Point(198, 16); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(112, 13); + this.label3.Size = new System.Drawing.Size(116, 13); this.label3.TabIndex = 3; this.label3.Text = "Welcome to WebChat"; // @@ -193,7 +201,7 @@ // this.label4.Location = new System.Drawing.Point(118, 56); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(93, 13); + this.label4.Size = new System.Drawing.Size(100, 13); this.label4.TabIndex = 2; this.label4.Text = "Chat Room Rules:"; // @@ -234,8 +242,12 @@ // // button2 // + this.button2.AdaptBackColorWithTheme = true; + this.button2.AdaptFontWithTheme = true; + this.button2.AdaptForeColorWithTheme = true; this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.button2.BackColor = System.Drawing.Color.Silver; + this.button2.DialogResult = System.Windows.Forms.DialogResult.None; this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.button2.ForeColor = System.Drawing.Color.Black; this.button2.Location = new System.Drawing.Point(422, 415); @@ -247,7 +259,11 @@ // // button3 // + this.button3.AdaptBackColorWithTheme = true; + this.button3.AdaptFontWithTheme = true; + this.button3.AdaptForeColorWithTheme = true; this.button3.BackColor = System.Drawing.Color.Silver; + this.button3.DialogResult = System.Windows.Forms.DialogResult.None; this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.button3.ForeColor = System.Drawing.Color.Black; this.button3.Location = new System.Drawing.Point(149, 427); @@ -259,7 +275,11 @@ // // button4 // + this.button4.AdaptBackColorWithTheme = true; + this.button4.AdaptFontWithTheme = true; + this.button4.AdaptForeColorWithTheme = true; this.button4.BackColor = System.Drawing.Color.Silver; + this.button4.DialogResult = System.Windows.Forms.DialogResult.None; this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.button4.ForeColor = System.Drawing.Color.Black; this.button4.Location = new System.Drawing.Point(235, 427); diff --git a/Histacom2/OS/Win98/Win98Apps/WebChat1999.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WebChat1999.Designer.cs new file mode 100644 index 0000000..cdc1f49 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/WebChat1999.Designer.cs @@ -0,0 +1,193 @@ +namespace Histacom2.OS.Win98.Win98Apps +{ + partial class WebChat1999 + { + /// + /// 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.button2 = new Histacom2.Engine.UI.ClassicButton(); + this.label7 = new Histacom2.Engine.UI.ClassicLabel(); + this.typechat = new System.Windows.Forms.TextBox(); + this.label6 = new Histacom2.Engine.UI.ClassicLabel(); + this.panel1 = new System.Windows.Forms.Panel(); + this.label5 = new Histacom2.Engine.UI.ClassicLabel(); + this.button5 = new Histacom2.Engine.UI.ClassicButton(); + this.history = new System.Windows.Forms.TextBox(); + this.label1 = new Histacom2.Engine.UI.ClassicLabel(); + this.listBox1 = new System.Windows.Forms.ListBox(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // button2 + // + this.button2.AdaptBackColorWithTheme = false; + this.button2.AdaptFontWithTheme = false; + this.button2.AdaptForeColorWithTheme = false; + this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.button2.BackColor = System.Drawing.Color.NavajoWhite; + this.button2.DialogResult = System.Windows.Forms.DialogResult.None; + this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.button2.ForeColor = System.Drawing.Color.Black; + this.button2.Location = new System.Drawing.Point(425, 419); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(71, 23); + this.button2.TabIndex = 16; + this.button2.Text = "Speak"; + // + // label7 + // + this.label7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label7.Location = new System.Drawing.Point(13, 17); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(483, 14); + this.label7.TabIndex = 15; + this.label7.Text = "To speak, just type in the bottom textbox, then click the Speak button or press E" + + "nter."; + // + // typechat + // + this.typechat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.typechat.BackColor = System.Drawing.Color.PapayaWhip; + this.typechat.Location = new System.Drawing.Point(13, 419); + this.typechat.Name = "typechat"; + this.typechat.Size = new System.Drawing.Size(405, 20); + this.typechat.TabIndex = 14; + // + // label6 + // + this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.label6.Font = new System.Drawing.Font("Courier New", 8.75F); + this.label6.Location = new System.Drawing.Point(552, 378); + this.label6.Name = "label6"; + this.label6.Size = new System.Drawing.Size(98, 14); + this.label6.TabIndex = 13; + this.label6.Text = "File Sharing"; + // + // panel1 + // + this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.panel1.BackColor = System.Drawing.Color.Linen; + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.label5); + this.panel1.Controls.Add(this.button5); + this.panel1.Location = new System.Drawing.Point(507, 397); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(195, 51); + this.panel1.TabIndex = 12; + // + // label5 + // + this.label5.Location = new System.Drawing.Point(10, 18); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(87, 13); + this.label5.TabIndex = 1; + this.label5.Text = "tdistortv2.exe"; + // + // button5 + // + this.button5.AdaptBackColorWithTheme = true; + this.button5.AdaptFontWithTheme = true; + this.button5.AdaptForeColorWithTheme = true; + this.button5.BackColor = System.Drawing.Color.NavajoWhite; + this.button5.DialogResult = System.Windows.Forms.DialogResult.None; + this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.button5.ForeColor = System.Drawing.Color.Black; + this.button5.Location = new System.Drawing.Point(103, 13); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(75, 23); + this.button5.TabIndex = 0; + this.button5.Text = "Download"; + // + // history + // + this.history.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.history.BackColor = System.Drawing.Color.LemonChiffon; + this.history.Location = new System.Drawing.Point(13, 36); + this.history.Multiline = true; + this.history.Name = "history"; + this.history.ReadOnly = true; + this.history.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.history.Size = new System.Drawing.Size(483, 377); + this.history.TabIndex = 11; + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label1.Font = new System.Drawing.Font("Calibri", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(557, 17); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(94, 17); + this.label1.TabIndex = 10; + this.label1.Text = "Users Logged In"; + // + // listBox1 + // + this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.listBox1.BackColor = System.Drawing.Color.PapayaWhip; + this.listBox1.FormattingEnabled = true; + this.listBox1.Location = new System.Drawing.Point(507, 36); + this.listBox1.Name = "listBox1"; + this.listBox1.Size = new System.Drawing.Size(195, 329); + this.listBox1.TabIndex = 9; + // + // WebChat1999 + // + 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.button2); + this.Controls.Add(this.label7); + this.Controls.Add(this.typechat); + this.Controls.Add(this.label6); + this.Controls.Add(this.panel1); + this.Controls.Add(this.history); + this.Controls.Add(this.label1); + this.Controls.Add(this.listBox1); + this.Name = "WebChat1999"; + this.Size = new System.Drawing.Size(724, 462); + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Engine.UI.ClassicButton button2; + private Engine.UI.ClassicLabel label7; + private System.Windows.Forms.TextBox typechat; + private Engine.UI.ClassicLabel label6; + private System.Windows.Forms.Panel panel1; + private Engine.UI.ClassicLabel label5; + private Engine.UI.ClassicButton button5; + private System.Windows.Forms.TextBox history; + private Engine.UI.ClassicLabel label1; + private System.Windows.Forms.ListBox listBox1; + } +} diff --git a/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs b/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs new file mode 100644 index 0000000..25c4298 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs @@ -0,0 +1,20 @@ +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 Histacom2.OS.Win98.Win98Apps +{ + public partial class WebChat1999 : UserControl + { + public WebChat1999() + { + InitializeComponent(); + } + } +} diff --git a/Histacom2/OS/Win98/Win98Apps/WebChat1999.resx b/Histacom2/OS/Win98/Win98Apps/WebChat1999.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/WebChat1999.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index a0cbadb..9f896e1 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -60,6 +60,8 @@ namespace Histacom2.OS.Win95.Win95Apps mainView.LargeImageList = new ImageList(); mainView.LargeImageList.ImageSize = new Size(32, 32); + // Icons 17, 18, 19 reserved for exclusive apps + mainView.LargeImageList.Images.AddRange(new Bitmap[] { Properties.Resources.Win95Computer, // 0 Properties.Resources.WinClassicFolder, Properties.Resources.WinClassicIE4, @@ -77,7 +79,10 @@ namespace Histacom2.OS.Win95.Win95Apps Properties.Resources.WinClassicNotepadBig, Properties.Resources.WinClassicRegedit, // 15 Properties.Resources.WinClassicWordpad, - Properties.Resources.WinClassicRtfFile}); + Properties.Resources.TimeDistorter1, + Properties.Resources.WinClassicGTN, + Properties.Resources.WinClassicFTP, + Properties.Resources.WinClassicRtfFile}); //20 program.BringToFront(); -- cgit v1.2.3 From 3dbe19613d4a492c228b60bad54bbafc48c21202 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 14 Oct 2017 10:46:30 -0400 Subject: made installer completely functional this time --- Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs | 2 +- Histacom2/GlobalPrograms/WinClassicInstaller.cs | 3 +++ Histacom2/OS/Win98/Win98.cs | 2 +- Histacom2/OS/Win98/Win98Apps/WebChat1999.cs | 2 ++ .../OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs | 16 ++++++++-------- 5 files changed, 15 insertions(+), 10 deletions(-) (limited to 'Histacom2/GlobalPrograms') diff --git a/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs index 0a5cb60..3eff2f1 100644 --- a/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs +++ b/Histacom2/GlobalPrograms/InstallerPanes/ProgressPane.cs @@ -30,7 +30,7 @@ namespace Histacom2.GlobalPrograms.InstallerPanes ((WinClassicInstaller)Parent.Parent).classicButton2.PerformClick(); t.Stop(); } - progressBar1.Value += 4; + else progressBar1.Value += 4; }; t.Start(); } diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.cs index f73e547..3d16381 100644 --- a/Histacom2/GlobalPrograms/WinClassicInstaller.cs +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.cs @@ -50,6 +50,7 @@ namespace Histacom2.GlobalPrograms { classicButton3.Hide(); classicButton1.Enabled = false; + classicButton2.Enabled = false; var p = new InstallerPanes.ProgressPane(); p.Parent = panel1; state = 3; @@ -60,7 +61,9 @@ namespace Histacom2.GlobalPrograms var c = new InstallerPanes.CompletePane(); c.Parent = panel1; classicButton3.Enabled = false; + classicButton2.Enabled = true; classicButton2.Text = "Finish"; + classicButton2.Invalidate(); state = 4; } else ParentForm.Close(); diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Win98.cs index 351456d..417c91c 100644 --- a/Histacom2/OS/Win98/Win98.cs +++ b/Histacom2/OS/Win98/Win98.cs @@ -342,7 +342,7 @@ namespace Histacom2.OS.Win98 { nonimportantapps.Remove((WinClassic)sender); } - private void InternetExplorer4_Closing(object sender, FormClosingEventArgs e) + public void InternetExplorer4_Closing(object sender, FormClosingEventArgs e) { ie = null; } diff --git a/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs b/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs index 9528b5a..004d99f 100644 --- a/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs +++ b/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs @@ -126,6 +126,8 @@ namespace Histacom2.OS.Win98.Win98Apps await Task.Delay(3000); history.AppendText("12padams: its the only way to make sure that time travel works properly" + Environment.NewLine); receive.Play(); await Task.Delay(4500); history.AppendText("HiddenHacker: ok, so what do i need to do again?" + Environment.NewLine); receive.Play(); await Task.Delay(3500); history.AppendText($"12padams: as i said before, make sure that {SaveSystem.ProfileName} arrives safely in 2000" + Environment.NewLine); receive.Play(); + await Task.Delay(3000); history.AppendText("HiddenHacker: but what if he doesnt make it?" + Environment.NewLine); receive.Play(); + await Task.Delay(3500); history.AppendText("12padams: we will cross that bridge when we come to it" + Environment.NewLine); receive.Play(); } private void button2_Click(object sender, EventArgs e) diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index 9f896e1..2f27899 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -310,23 +310,23 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "ie": - if (TitleScreen.frm95.ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); return; } - TitleScreen.frm95.ie = wm.Init(new WinClassicIE4(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); - Program.AddTaskbarItem(TitleScreen.frm95.ie, TitleScreen.frm95.ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4); - TitleScreen.frm95.ie.BringToFront(); - TitleScreen.frm95.ie.FormClosing += new FormClosingEventHandler(TitleScreen.frm95.InternetExplorer4_Closing); + if (TitleScreen.frm98.ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); return; } + TitleScreen.frm98.ie = wm.Init(new WinClassicIE4(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); + Program.AddTaskbarItem(TitleScreen.frm98.ie, TitleScreen.frm98.ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4); + TitleScreen.frm98.ie.BringToFront(); + TitleScreen.frm98.ie.FormClosing += new FormClosingEventHandler(TitleScreen.frm98.InternetExplorer4_Closing); break; case "web chat 99 setup": - Win95Installer inst = new Win95Installer("Web Chat 1999"); - inst.InstallCompleted += (sendr, args) => TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; + WinClassicInstaller inst = new WinClassicInstaller("Web Chat 1999"); + inst.InstallCompleted += (sendr, args) => TitleScreen.frm98.WebChatToolStripMenuItem.Visible = true; WinClassic appInstaller = wm.Init(inst, "Web Chat Setup", null, true, true); Program.AddTaskbarItem(appInstaller, appInstaller.Tag.ToString(), "Web Chat Setup", null); appInstaller.BringToFront(); break; case "time distorter setup": - Win95Installer instTd = new Win95Installer("Time Distorter 0.2"); + WinClassicInstaller instTd = new WinClassicInstaller("Time Distorter 0.2"); instTd.InstallCompleted += (sendr, args) => { TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true; -- cgit v1.2.3 From 718fc7c680c17508b9d97cc92e8a3632cb999bb7 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 15 Oct 2017 00:45:50 -0400 Subject: the hype is real, folks --- Histacom2/GlobalPrograms/WinClassicDownloader.cs | 3 + Histacom2/Histacom2.csproj | 10 ++ Histacom2/OS/Win98/Win98.cs | 11 +- .../OS/Win98/Win98Apps/WebChat1999.Designer.cs | 1 + Histacom2/OS/Win98/Win98Apps/WebChat1999.cs | 13 +++ .../Win98Apps/WinClassicTimeDistorter2.Designer.cs | 117 ++++++++++++++++++++ .../OS/Win98/Win98Apps/WinClassicTimeDistorter2.cs | 20 ++++ .../Win98/Win98Apps/WinClassicTimeDistorter2.resx | 120 +++++++++++++++++++++ .../Win98/Win98Apps/WinClassicWindowsExplorer.cs | 2 +- 9 files changed, 291 insertions(+), 6 deletions(-) create mode 100644 Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs create mode 100644 Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.cs create mode 100644 Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.resx (limited to 'Histacom2/GlobalPrograms') diff --git a/Histacom2/GlobalPrograms/WinClassicDownloader.cs b/Histacom2/GlobalPrograms/WinClassicDownloader.cs index eaf253a..3778de8 100644 --- a/Histacom2/GlobalPrograms/WinClassicDownloader.cs +++ b/Histacom2/GlobalPrograms/WinClassicDownloader.cs @@ -58,6 +58,9 @@ namespace Histacom2.GlobalPrograms case "Downloading: Web Chat 1999": CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop"), "Web Chat Setup.exe", "web chat 99 setup", 11, 37048); break; + case "Downloading: Time Distorter 0.2": + CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop"), "tdistortv2.exe", "time distorter setup", 11, 21583); + break; } /* if (appName.Text == "Downloading: Skindows 95") { diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index 8e7b31b..da772b6 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -334,6 +334,12 @@ WinClassicIE4.cs + + UserControl + + + WinClassicTimeDistorter2.cs + UserControl @@ -546,6 +552,9 @@ WinClassicIE4.cs + + WinClassicTimeDistorter2.cs + WinClassicWindowsExplorer.cs Designer @@ -859,6 +868,7 @@ + diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Win98.cs index 417c91c..3365def 100644 --- a/Histacom2/OS/Win98/Win98.cs +++ b/Histacom2/OS/Win98/Win98.cs @@ -31,6 +31,7 @@ namespace Histacom2.OS.Win98 public bool webchatInstalled = false; public bool hiddenpadamsFound = false; + private WinClassicTimeDistorter2 distort; // Init the form public Windows98() @@ -455,11 +456,11 @@ namespace Histacom2.OS.Win98 private void TimeDistorterToolStripMenuItem_Click(object sender, EventArgs e) { - //distort = new Histacom2WinClassicTimeDistorter("1998", "1999", 150, Hack2.StartObjective); - //WinClassic app = wm.StartWin95(distort, "Time Distorter", null, false, true); - //AddTaskBarItem(app, app.Tag.ToString(), "Time Distorter", null); - //app.BringToFront(); - //startmenu.Hide(); + distort = new WinClassicTimeDistorter2(); + WinClassic app = wm.Init(distort, "Time Distorter", null, false, false, false); + AddTaskBarItem(app, app.Tag.ToString(), "Time Distorter", null); + app.BringToFront(); + startmenu.Hide(); } private void FTPClientToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/Histacom2/OS/Win98/Win98Apps/WebChat1999.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WebChat1999.Designer.cs index 8b3a5bb..f6714a2 100644 --- a/Histacom2/OS/Win98/Win98Apps/WebChat1999.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WebChat1999.Designer.cs @@ -131,6 +131,7 @@ this.button5.Size = new System.Drawing.Size(75, 23); this.button5.TabIndex = 0; this.button5.Text = "Download"; + this.button5.Click += new System.EventHandler(this.button5_Click); // // history // diff --git a/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs b/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs index 004d99f..75786d9 100644 --- a/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs +++ b/Histacom2/OS/Win98/Win98Apps/WebChat1999.cs @@ -10,6 +10,7 @@ using System.Windows.Forms; using System.Media; using Histacom2.Engine; using Histacom2.Engine.Template; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win98.Win98Apps { @@ -128,6 +129,9 @@ namespace Histacom2.OS.Win98.Win98Apps await Task.Delay(3500); history.AppendText($"12padams: as i said before, make sure that {SaveSystem.ProfileName} arrives safely in 2000" + Environment.NewLine); receive.Play(); await Task.Delay(3000); history.AppendText("HiddenHacker: but what if he doesnt make it?" + Environment.NewLine); receive.Play(); await Task.Delay(3500); history.AppendText("12padams: we will cross that bridge when we come to it" + Environment.NewLine); receive.Play(); + await Task.Delay(3500); history.AppendText("12padams: anyways, im gonna upload 0.2 right now" + Environment.NewLine); receive.Play(); + await Task.Delay(4500); history.AppendText("System: File \"tdistortv2\" has been uploaded." + Environment.NewLine); label5.Show(); button5.Show(); file.Play(); + await Task.Delay(4500); history.AppendText($"12padams: go ahead and install it {SaveSystem.ProfileName}, we'll wait" + Environment.NewLine); receive.Play(); } private void button2_Click(object sender, EventArgs e) @@ -147,5 +151,14 @@ namespace Histacom2.OS.Win98.Win98Apps break; } } + + private void button5_Click(object sender, EventArgs e) + { + WinClassicDownloader opendownload = new WinClassicDownloader(); + WindowManager wm = new WindowManager(); + wm.Init(opendownload, "Downloader", null, false, true); + opendownload.appName.Text = "Downloading: Time Distorter 0.2"; + opendownload.amountToDL = 42; + } } } diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs new file mode 100644 index 0000000..1b32d32 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs @@ -0,0 +1,117 @@ +namespace Histacom2.OS.Win98.Win98Apps +{ + partial class WinClassicTimeDistorter2 + { + /// + /// 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.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); + this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel4 = new Histacom2.Engine.UI.ClassicLabel(); + this.SuspendLayout(); + // + // classicButton1 + // + this.classicButton1.AdaptBackColorWithTheme = true; + this.classicButton1.AdaptFontWithTheme = false; + this.classicButton1.AdaptForeColorWithTheme = true; + this.classicButton1.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.classicButton1.BackColor = System.Drawing.Color.Silver; + this.classicButton1.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton1.ForeColor = System.Drawing.Color.Black; + this.classicButton1.Location = new System.Drawing.Point(21, 174); + this.classicButton1.Name = "classicButton1"; + this.classicButton1.Size = new System.Drawing.Size(276, 23); + this.classicButton1.TabIndex = 0; + this.classicButton1.Text = "Take me to 2000!"; + // + // classicLabel1 + // + this.classicLabel1.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.classicLabel1.Font = new System.Drawing.Font("Microsoft Sans Serif", 72F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel1.Location = new System.Drawing.Point(25, 34); + this.classicLabel1.Name = "classicLabel1"; + this.classicLabel1.Size = new System.Drawing.Size(270, 120); + this.classicLabel1.TabIndex = 1; + this.classicLabel1.Text = "1999"; + // + // classicLabel2 + // + this.classicLabel2.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.classicLabel2.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel2.Location = new System.Drawing.Point(104, 13); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(108, 18); + this.classicLabel2.TabIndex = 2; + this.classicLabel2.Text = "Current Year:"; + // + // classicLabel3 + // + this.classicLabel3.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.classicLabel3.Location = new System.Drawing.Point(24, 154); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(289, 13); + this.classicLabel3.TabIndex = 3; + this.classicLabel3.Text = "Click the button to take a one-way trip to the year 2000!"; + // + // classicLabel4 + // + this.classicLabel4.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel4.Location = new System.Drawing.Point(21, 177); + this.classicLabel4.Name = "classicLabel4"; + this.classicLabel4.Size = new System.Drawing.Size(276, 17); + this.classicLabel4.TabIndex = 4; + this.classicLabel4.Text = "Preparing to travel. ETA: N/A secs."; + this.classicLabel4.Visible = false; + // + // WinClassicTimeDistorter2 + // + 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.classicLabel4); + this.Controls.Add(this.classicLabel3); + this.Controls.Add(this.classicLabel2); + this.Controls.Add(this.classicLabel1); + this.Controls.Add(this.classicButton1); + this.Name = "WinClassicTimeDistorter2"; + this.Size = new System.Drawing.Size(313, 211); + this.ResumeLayout(false); + + } + + #endregion + + private Engine.UI.ClassicButton classicButton1; + private Engine.UI.ClassicLabel classicLabel1; + private Engine.UI.ClassicLabel classicLabel2; + private Engine.UI.ClassicLabel classicLabel3; + private Engine.UI.ClassicLabel classicLabel4; + } +} diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.cs new file mode 100644 index 0000000..62c055b --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.cs @@ -0,0 +1,20 @@ +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 Histacom2.OS.Win98.Win98Apps +{ + public partial class WinClassicTimeDistorter2 : UserControl + { + public WinClassicTimeDistorter2() + { + InitializeComponent(); + } + } +} diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.resx b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index 2f27899..f261cb2 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -329,7 +329,7 @@ namespace Histacom2.OS.Win95.Win95Apps WinClassicInstaller instTd = new WinClassicInstaller("Time Distorter 0.2"); instTd.InstallCompleted += (sendr, args) => { - TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true; + TitleScreen.frm98.TimeDistorterToolStripMenuItem.Visible = true; }; WinClassic appTd = wm.Init(instTd, "Time Distorter Setup", null, true, true); Program.AddTaskbarItem(appTd, appTd.Tag.ToString(), "Time Distorter Setup", null); -- cgit v1.2.3