new installer prototype

9 files changed, 99 insertions, 54 deletions

diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs
index 926aea0..38129ab 100644
--- a/Histacom2/OS/Win95/Win95.cs
+++ b/Histacom2/OS/Win95/Win95.cs
@@ -12,6 +12,7 @@ using Histacom2.OS.Win95.Win95Apps.Story;
 using static Histacom2.Engine.SaveSystem;
 using Histacom2.OS.Win95.Win95Apps._12padamViruses;
 using Histacom2.OS.Win95.Win95Apps._12padamsViruses;
+using Histacom2.GlobalPrograms;
 
 namespace Histacom2.OS.Win95
 {
diff --git a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs
index a6c67df..9f4bfbd 100644
--- a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs
+++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using Histacom2.Engine;
 using System.Threading;
+using Histacom2.GlobalPrograms;
 
 namespace Histacom2.OS.Win95.Win95Apps.IE3Sites
 {
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs
index 20a51c7..5592445 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs
@@ -41,14 +41,14 @@
             this.checkBox1 = new System.Windows.Forms.CheckBox();
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel2 = new System.Windows.Forms.Panel();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
             this.panel3 = new System.Windows.Forms.Panel();
             this.label6 = new System.Windows.Forms.Label();
+            this.progressBar1 = new Histacom2.Engine.UI.ProgressBar();
             this.panel4 = new System.Windows.Forms.Panel();
             this.label7 = new System.Windows.Forms.Label();
-            this.progressBar1 = new Histacom2.Engine.UI.ProgressBar();
             ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panel1.SuspendLayout();
@@ -184,14 +184,14 @@
             this.panel2.TabIndex = 11;
             this.panel2.Visible = false;
             // 
-            // label3
+            // label5
             // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(-3, 0);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(268, 13);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "Setup will install GenericName in the following directory:";
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(-3, 28);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(178, 13);
+            this.label5.TabIndex = 2;
+            this.label5.Text = "To install in this directory, click Next.";
             // 
             // label4
             // 
@@ -202,14 +202,14 @@
             this.label4.TabIndex = 1;
             this.label4.Text = "C:\\Program Files\\12padams\\GenericName\\";
             // 
-            // label5
+            // label3
             // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(-3, 28);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(178, 13);
-            this.label5.TabIndex = 2;
-            this.label5.Text = "To install in this directory, click Next.";
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(-3, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(268, 13);
+            this.label3.TabIndex = 0;
+            this.label3.Text = "Setup will install GenericName in the following directory:";
             // 
             // panel3
             // 
@@ -230,6 +230,23 @@
             this.label6.TabIndex = 1;
             this.label6.Text = "Installing...";
             // 
+            // progressBar1
+            // 
+            this.progressBar1.BlockSpacing = 5;
+            this.progressBar1.BlockWidth = 20;
+            this.progressBar1.Location = new System.Drawing.Point(3, 115);
+            this.progressBar1.MarqueeWidth = 125;
+            this.progressBar1.Maximum = 100D;
+            this.progressBar1.Minimum = 0D;
+            this.progressBar1.Name = "progressBar1";
+            this.progressBar1.ProgressColor = System.Drawing.Color.Navy;
+            this.progressBar1.ShowText = false;
+            this.progressBar1.Size = new System.Drawing.Size(312, 28);
+            this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks;
+            this.progressBar1.TabIndex = 0;
+            this.progressBar1.Text = "progressBar1";
+            this.progressBar1.Value = 0D;
+            // 
             // panel4
             // 
             this.panel4.Controls.Add(this.label7);
@@ -248,23 +265,6 @@
             this.label7.TabIndex = 0;
             this.label7.Text = "GenericName Setup has been completed.";
             // 
-            // progressBar1
-            // 
-            this.progressBar1.BlockSpacing = 5;
-            this.progressBar1.BlockWidth = 20;
-            this.progressBar1.Location = new System.Drawing.Point(3, 115);
-            this.progressBar1.MarqueeWidth = 125;
-            this.progressBar1.Maximum = 100D;
-            this.progressBar1.Minimum = 0D;
-            this.progressBar1.Name = "progressBar1";
-            this.progressBar1.ProgressColor = System.Drawing.Color.Navy;
-            this.progressBar1.ShowText = false;
-            this.progressBar1.Size = new System.Drawing.Size(312, 28);
-            this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks;
-            this.progressBar1.TabIndex = 0;
-            this.progressBar1.Text = "progressBar1";
-            this.progressBar1.Value = 0D;
-            // 
             // Win95Installer
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index 519e14d..fa1e0ce 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -14,6 +14,7 @@ using Newtonsoft.Json;
 using Histacom2.Engine.Template;
 using System.Diagnostics;
 using Histacom2.OS.Win95.Win95Apps._12padamViruses;
+using Histacom2.GlobalPrograms;
 
 namespace Histacom2.OS.Win95.Win95Apps
 {
diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
index 4dd74fb..1a0836b 100644
--- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
+++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs
@@ -8,6 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Histacom2.Engine;
+using Histacom2.GlobalPrograms;
 
 namespace Histacom2.OS.Win95.Win95Apps
 {
diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Win98.cs
index f4a9c07..32b7aca 100644
--- a/Histacom2/OS/Win98/Win98.cs
+++ b/Histacom2/OS/Win98/Win98.cs
@@ -11,6 +11,7 @@ using Histacom2.OS.Win95.Win95Apps;
 using Histacom2.OS.Win95.Win95Apps.Story;
 using static Histacom2.Engine.SaveSystem;
 using Histacom2.OS.Win98.Win98Apps;
+using Histacom2.GlobalPrograms;
 
 namespace Histacom2.OS.Win98
 {
@@ -232,7 +233,7 @@ namespace Histacom2.OS.Win98
 
         private void installerTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Win95Installer openinstaller = new Win95Installer("Testing");
+            WinClassicInstaller openinstaller = new WinClassicInstaller("Testing");
             WinClassic app = wm.Init(openinstaller, "Installer", null, false, true);
 
             AddTaskBarItem(app, app.Tag.ToString(), "Installer", null);
diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs
index aa8aae4..5a252ef 100644
--- a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs
+++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs
@@ -58,6 +58,8 @@
             this.classicLabel13 = new Histacom2.Engine.UI.ClassicLabel();
             this.classicButton6 = new Histacom2.Engine.UI.ClassicButton();
             this.classicLabel14 = new Histacom2.Engine.UI.ClassicLabel();
+            this.classicLabel15 = new Histacom2.Engine.UI.ClassicLabel();
+            this.classicLabel16 = new Histacom2.Engine.UI.ClassicLabel();
             this.panel1.SuspendLayout();
             this.panel2.SuspendLayout();
             this.panel3.SuspendLayout();
@@ -99,7 +101,7 @@
             this.panel1.Controls.Add(this.classicLabel8);
             this.panel1.Controls.Add(this.classicButton1);
             this.panel1.Controls.Add(this.panel2);
-            this.panel1.Location = new System.Drawing.Point(104, 90);
+            this.panel1.Location = new System.Drawing.Point(104, 78);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(225, 209);
             this.panel1.TabIndex = 2;
@@ -126,6 +128,7 @@
             this.classicButton1.Size = new System.Drawing.Size(72, 23);
             this.classicButton1.TabIndex = 1;
             this.classicButton1.Text = "Download";
+            this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click);
             // 
             // panel2
             // 
@@ -158,7 +161,7 @@
             this.panel3.Controls.Add(this.classicLabel13);
             this.panel3.Controls.Add(this.classicButton6);
             this.panel3.Controls.Add(this.panel4);
-            this.panel3.Location = new System.Drawing.Point(630, 90);
+            this.panel3.Location = new System.Drawing.Point(630, 78);
             this.panel3.Name = "panel3";
             this.panel3.Size = new System.Drawing.Size(225, 209);
             this.panel3.TabIndex = 3;
@@ -194,7 +197,7 @@
             this.panel5.Controls.Add(this.classicLabel10);
             this.panel5.Controls.Add(this.classicButton3);
             this.panel5.Controls.Add(this.panel6);
-            this.panel5.Location = new System.Drawing.Point(369, 90);
+            this.panel5.Location = new System.Drawing.Point(369, 78);
             this.panel5.Name = "panel5";
             this.panel5.Size = new System.Drawing.Size(225, 209);
             this.panel5.TabIndex = 4;
@@ -225,8 +228,9 @@
             this.panel7.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panel7.BackColor = System.Drawing.Color.Lime;
             this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel7.Controls.Add(this.classicLabel15);
             this.panel7.Controls.Add(this.panel8);
-            this.panel7.Location = new System.Drawing.Point(104, 314);
+            this.panel7.Location = new System.Drawing.Point(104, 302);
             this.panel7.Name = "panel7";
             this.panel7.Size = new System.Drawing.Size(353, 135);
             this.panel7.TabIndex = 5;
@@ -257,8 +261,9 @@
             this.panel9.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panel9.BackColor = System.Drawing.Color.Lime;
             this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel9.Controls.Add(this.classicLabel16);
             this.panel9.Controls.Add(this.panel10);
-            this.panel9.Location = new System.Drawing.Point(502, 314);
+            this.panel9.Location = new System.Drawing.Point(502, 302);
             this.panel9.Name = "panel9";
             this.panel9.Size = new System.Drawing.Size(353, 135);
             this.panel9.TabIndex = 6;
@@ -298,6 +303,7 @@
             this.classicButton2.Size = new System.Drawing.Size(72, 23);
             this.classicButton2.TabIndex = 3;
             this.classicButton2.Text = "Download";
+            this.classicButton2.Click += new System.EventHandler(this.classicButton2_Click);
             // 
             // classicLabel9
             // 
@@ -324,7 +330,7 @@
             // 
             // classicLabel10
             // 
-            this.classicLabel10.Location = new System.Drawing.Point(3, 49);
+            this.classicLabel10.Location = new System.Drawing.Point(4, 49);
             this.classicLabel10.Name = "classicLabel10";
             this.classicLabel10.Size = new System.Drawing.Size(107, 13);
             this.classicLabel10.TabIndex = 5;
@@ -347,7 +353,7 @@
             // 
             // classicLabel11
             // 
-            this.classicLabel11.Location = new System.Drawing.Point(3, 79);
+            this.classicLabel11.Location = new System.Drawing.Point(4, 79);
             this.classicLabel11.Name = "classicLabel11";
             this.classicLabel11.Size = new System.Drawing.Size(107, 13);
             this.classicLabel11.TabIndex = 7;
@@ -408,6 +414,28 @@
             this.classicLabel14.TabIndex = 7;
             this.classicLabel14.Text = "© 12padams, 1999";
             // 
+            // classicLabel15
+            // 
+            this.classicLabel15.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.classicLabel15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.classicLabel15.ForeColor = System.Drawing.Color.Navy;
+            this.classicLabel15.Location = new System.Drawing.Point(90, 44);
+            this.classicLabel15.Name = "classicLabel15";
+            this.classicLabel15.Size = new System.Drawing.Size(167, 13);
+            this.classicLabel15.TabIndex = 2;
+            this.classicLabel15.Text = "Y2K: A Global Computer Crisis";
+            // 
+            // classicLabel16
+            // 
+            this.classicLabel16.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.classicLabel16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.classicLabel16.ForeColor = System.Drawing.Color.Navy;
+            this.classicLabel16.Location = new System.Drawing.Point(122, 44);
+            this.classicLabel16.Name = "classicLabel16";
+            this.classicLabel16.Size = new System.Drawing.Size(109, 13);
+            this.classicLabel16.TabIndex = 3;
+            this.classicLabel16.Text = "Microsoft Wi n d o w s";
+            // 
             // _12padams1999
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -469,5 +497,7 @@
         private Engine.UI.ClassicLabel classicLabel13;
         private Engine.UI.ClassicButton classicButton6;
         private Engine.UI.ClassicLabel classicLabel14;
+        private Engine.UI.ClassicLabel classicLabel15;
+        private Engine.UI.ClassicLabel classicLabel16;
     }
 }
diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs
index 30e56a0..0733144 100644
--- a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs
+++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs
@@ -7,6 +7,8 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Histacom2.Engine;
+using Histacom2.GlobalPrograms;
 
 namespace Histacom2.OS.Win98.Win98Apps.IE4Sites
 {
@@ -16,5 +18,19 @@ namespace Histacom2.OS.Win98.Win98Apps.IE4Sites
         {
             InitializeComponent();
         }
+
+        private void classicButton2_Click(object sender, EventArgs e)
+        {
+            WinClassicDownloader opendownload = new WinClassicDownloader();
+            WindowManager wm = new WindowManager();
+            wm.Init(opendownload, "Downloader", null, false, true);
+            opendownload.appName.Text = "Downloading: Web Chat 1999";
+            opendownload.amountToDL = 37;
+        }
+
+        private void classicButton1_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }
diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
index 936d89e..a0cbadb 100644
--- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
+++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
@@ -13,6 +13,8 @@ using Histacom2.Engine;
 using Newtonsoft.Json;
 using System.Diagnostics;
 using Histacom2.Engine.Template;
+using Histacom2.OS.Win98.Win98Apps;
+using Histacom2.GlobalPrograms;
 
 namespace Histacom2.OS.Win95.Win95Apps
 {
@@ -304,30 +306,22 @@ 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 WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true);
+                    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);
 
                     break;
-                case "web chat setup":
-                    Win95Installer inst = new Win95Installer("Web Chat 1998");
+                case "web chat 99 setup":
+                    Win95Installer inst = new Win95Installer("Web Chat 1999");
                     inst.InstallCompleted += (sendr, args) => TitleScreen.frm95.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 "ftp client setup":
-                    Win95Installer instFtp = new Win95Installer("FTP Client");
-                    instFtp.InstallCompleted += (sendr, args) => TitleScreen.frm95.FTPClientToolStripMenuItem.Visible = true;
-                    WinClassic appFtp = wm.Init(instFtp, "FTP Client Setup", null, true, true);
-                    Program.AddTaskbarItem(appFtp, appFtp.Tag.ToString(), "FTP Client Setup", null);
-                    appFtp.BringToFront();
-
-                    break;
                 case "time distorter setup":
-                    Win95Installer instTd = new Win95Installer("Time Distorter 0.1");
+                    Win95Installer instTd = new Win95Installer("Time Distorter 0.2");
                     instTd.InstallCompleted += (sendr, args) =>
                     {
                         TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true;