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/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs') 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/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs') 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/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs') 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