Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

6 files changed, 66 insertions, 18 deletions

diff --git a/TimeHACK.Main/GlobalPrograms/WinClassicDownloader.cs b/TimeHACK.Main/GlobalPrograms/WinClassicDownloader.cs
index 418444a..c5d00a2 100644
--- a/TimeHACK.Main/GlobalPrograms/WinClassicDownloader.cs
+++ b/TimeHACK.Main/GlobalPrograms/WinClassicDownloader.cs
@@ -67,6 +67,10 @@ namespace TimeHACK.OS.Win95.Win95Apps
                 {
                     Windows95.desktopicons.Items.Add("Time Distorter Setup", imageIndex: 13);
                 }
+                if (appName.Text == "Downloading: FTP Client")
+                {
+                    TitleScreen.frm95.desktopicons.Items.Add("FTP Client Setup", imageIndex: 11);
+                }
                 ((Form)this.TopLevelControl).Close();
                 dlTimer.Stop();
             }
diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
index 998ece1..46485ee 100644
--- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
@@ -130,6 +130,7 @@ namespace TimeHACK.OS.Win95
             this.BitmapImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.MicrosoftDataLinkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.FTPClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.panel1.SuspendLayout();
             this.taskbar.SuspendLayout();
             this.clockPanel.SuspendLayout();
@@ -265,7 +266,8 @@ namespace TimeHACK.OS.Win95
             this.ErrorBlasterToolStripMenuItem,
             this.SkindowsToolStripMenuItem,
             this.WebChatToolStripMenuItem,
-            this.TimeDistorterToolStripMenuItem});
+            this.TimeDistorterToolStripMenuItem,
+            this.FTPClientToolStripMenuItem});
             this.ProgramsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicPrograms;
             this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
@@ -725,6 +727,17 @@ namespace TimeHACK.OS.Win95
             this.TimeDistorterToolStripMenuItem.Text = "Time Distorter";
             this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click);
             // 
+            // FTPClientToolStripMenuItem
+            // 
+            this.FTPClientToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
+            this.FTPClientToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
+            this.FTPClientToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
+            this.FTPClientToolStripMenuItem.Name = "FTPClientToolStripMenuItem";
+            this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(181, 28);
+            this.FTPClientToolStripMenuItem.Text = "FTP Client";
+            this.FTPClientToolStripMenuItem.Visible = false;
+            this.FTPClientToolStripMenuItem.Click += new System.EventHandler(this.FTPClientToolStripMenuItem_Click);
+            // 
             // DocumentsToolStripMenuItem
             // 
             this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver;
@@ -1267,5 +1280,6 @@ namespace TimeHACK.OS.Win95
         private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem;
         private System.Windows.Forms.Panel taskbarItems;
         private System.Windows.Forms.ToolStripMenuItem storyTest1ToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem FTPClientToolStripMenuItem;
     }
 }
\ No newline at end of file
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index c326c64..32d619f 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -238,7 +238,7 @@ namespace TimeHACK.OS.Win95
 
         private void installerTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Win95Installer openinstaller = new Win95Installer();
+            Win95Installer openinstaller = new Win95Installer("Testing");
             WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true);
 
             AddTaskBarItem(app, app.Tag.ToString(), "Installer", null);
@@ -278,13 +278,22 @@ namespace TimeHACK.OS.Win95
                     }
                     else if (objListViewItem.Text == "Web Chat Setup")
                     {
-                        Win95Installer inst = new Win95Installer();
-                        inst.installname.Text = "Web Chat 1998";
+                        Win95Installer inst = new Win95Installer("Web Chat 1998");
+                        inst.InstallCompleted += (sendr, args) => WebChatToolStripMenuItem.Visible = true;
                         WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true);
                         AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null);
                         app.BringToFront();
                         startmenu.Hide();
                     }
+                    else if (objListViewItem.Text == "FTP Client Setup")
+                    {
+                        Win95Installer inst = new Win95Installer("FTP Client");
+                        inst.InstallCompleted += (sendr, args) => WebChatToolStripMenuItem.Visible = true;
+                        WinClassic app = wm.StartWin95(inst, "FTP Client Setup", null, true, true);
+                        AddTaskBarItem(app, app.Tag.ToString(), "FTP Client Setup", null);
+                        app.BringToFront();
+                        startmenu.Hide();
+                    }
                 }
             }
         }
@@ -438,6 +447,14 @@ namespace TimeHACK.OS.Win95
             app.BringToFront();
             startmenu.Hide();
         }
+        private void FTPClientToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            WinClassic app = wm.StartWin95(new WinClassicFTPClient(), "FTP Client", null, true, true);
+
+            AddTaskBarItem(app, app.Tag.ToString(), "FTP Client", null);
+            app.BringToFront();
+            startmenu.Hide();
+        }
     }
     public class MyRenderer : ToolStripProfessionalRenderer
     {
diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx
index e4cbaa8..8285d12 100644
--- a/TimeHACK.Main/OS/Win95/Win95.resx
+++ b/TimeHACK.Main/OS/Win95/Win95.resx
@@ -389,7 +389,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
-        ggAAAk1TRnQBSQFMAgEBDAEAAYABAQGAAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        ggAAAk1TRnQBSQFMAgEBDAEAAYgBAQGIAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs
index e3924ee..c6e125f 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs
@@ -13,9 +13,17 @@ namespace TimeHACK.OS.Win95.Win95Apps
     public partial class Win95Installer : UserControl
     {
         public int installStage = 0;
+        private string prog;
         private Timer installbar = new Timer();
 
-        public Win95Installer()
+        public event EventHandler InstallCompleted;
+
+        protected void OnInstallCompleted(EventArgs e)
+        {
+            if (InstallCompleted != null) InstallCompleted(this, e);
+        }
+
+        public Win95Installer(string progName)
         {
             InitializeComponent();
             label1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
@@ -23,17 +31,21 @@ namespace TimeHACK.OS.Win95.Win95Apps
             label3.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
             label4.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
             label5.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+            label6.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+            label7.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
             checkBox1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
             cancelbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             nextbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             backbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
+            prog = progName;
         }
 
         private void Win95Installer_Load(object sender, EventArgs e)
         {
-            label1.Text.Replace("GenericName", installname.Text);
-            label3.Text.Replace("GenericName", installname.Text);
-            label4.Text.Replace("GenericName", installname.Text);
+            label1.Text = label1.Text.Replace("GenericName", prog);
+            label3.Text = label3.Text.Replace("GenericName", prog);
+            label4.Text = label4.Text.Replace("GenericName", prog);
+            label7.Text = label7.Text.Replace("GenericName", prog);
             installbar.Tick += Installbar_Tick;
         }
 
@@ -45,6 +57,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
             }
             else
             {
+                OnInstallCompleted(EventArgs.Empty);
                 panel3.Hide();
                 panel4.Show();
                 backbutton1.Hide();
diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs
index 198108d..175719a 100644
--- a/TimeHACK.Main/OS/Win98/Win98.cs
+++ b/TimeHACK.Main/OS/Win98/Win98.cs
@@ -218,12 +218,12 @@ namespace TimeHACK.OS.Win98
 
         private void installerTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            Win95Installer openinstaller = new Win95Installer();
-            WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true);
+            //Win95Installer openinstaller = new Win95Installer();
+            //WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true);
 
-            AddTaskBarItem(app, app.Tag.ToString(), "Installer", null);
+            //AddTaskBarItem(app, app.Tag.ToString(), "Installer", null);
 
-            app.BringToFront();
+            //app.BringToFront();
             startmenu.Hide();
         }
 
@@ -258,11 +258,11 @@ namespace TimeHACK.OS.Win98
                     }
                     else if (objListViewItem.Text == "Web Chat Setup")
                     {
-                        Win95Installer inst = new Win95Installer();
-                        inst.installname.Text = "Web Chat 1998";
-                        WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true);
-                        AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null);
-                        app.BringToFront();
+                        //Win95Installer inst = new Win95Installer();
+                        //inst.installname.Text = "Web Chat 1998";
+                        //WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true);
+                        //AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null);
+                        //app.BringToFront();
                         startmenu.Hide();
                     }
                 }