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(-) 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