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 +++++++++++++++++++ 5 files changed, 296 insertions(+) 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/InstallerPanes') 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 -- 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/InstallerPanes') 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 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/InstallerPanes') 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