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

3 files changed, 189 insertions, 7 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs
index d19c533..29369e2 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs
@@ -40,9 +40,21 @@
             this.textBox1 = new System.Windows.Forms.TextBox();
             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.panel3 = new System.Windows.Forms.Panel();
+            this.label6 = new System.Windows.Forms.Label();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.label7 = new System.Windows.Forms.Label();
+            this.progressBar1 = new TimeHACK.UI.ProgressBar();
             ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panel1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.panel3.SuspendLayout();
+            this.panel4.SuspendLayout();
             this.SuspendLayout();
             // 
             // installPic
@@ -92,6 +104,7 @@
             this.cancelbutton1.TabIndex = 4;
             this.cancelbutton1.Text = "Cancel";
             this.cancelbutton1.UseVisualStyleBackColor = true;
+            this.cancelbutton1.Click += new System.EventHandler(this.cancelbutton1_Click);
             // 
             // nextbutton1
             // 
@@ -108,12 +121,13 @@
             // 
             this.backbutton1.Enabled = false;
             this.backbutton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.backbutton1.Location = new System.Drawing.Point(235, 301);
+            this.backbutton1.Location = new System.Drawing.Point(237, 301);
             this.backbutton1.Name = "backbutton1";
             this.backbutton1.Size = new System.Drawing.Size(75, 23);
             this.backbutton1.TabIndex = 6;
             this.backbutton1.Text = "Back";
             this.backbutton1.UseVisualStyleBackColor = true;
+            this.backbutton1.Click += new System.EventHandler(this.backbutton1_Click);
             // 
             // label2
             // 
@@ -159,11 +173,106 @@
             this.panel1.TabIndex = 10;
             this.panel1.Visible = false;
             // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.label5);
+            this.panel2.Controls.Add(this.label4);
+            this.panel2.Controls.Add(this.label3);
+            this.panel2.Location = new System.Drawing.Point(150, 16);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(318, 260);
+            this.panel2.TabIndex = 11;
+            this.panel2.Visible = false;
+            // 
+            // label3
+            // 
+            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:";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(23, 67);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(214, 13);
+            this.label4.TabIndex = 1;
+            this.label4.Text = "C:\\Program Files\\12padams\\GenericName\\";
+            // 
+            // label5
+            // 
+            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.";
+            // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.label6);
+            this.panel3.Controls.Add(this.progressBar1);
+            this.panel3.Location = new System.Drawing.Point(150, 16);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(318, 260);
+            this.panel3.TabIndex = 12;
+            this.panel3.Visible = false;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(4, 12);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(57, 13);
+            this.label6.TabIndex = 1;
+            this.label6.Text = "Installing...";
+            // 
+            // panel4
+            // 
+            this.panel4.Controls.Add(this.label7);
+            this.panel4.Location = new System.Drawing.Point(150, 16);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(318, 260);
+            this.panel4.TabIndex = 13;
+            this.panel4.Visible = false;
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(7, 12);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(205, 13);
+            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);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Silver;
+            this.Controls.Add(this.panel4);
+            this.Controls.Add(this.panel3);
+            this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.backbutton1);
             this.Controls.Add(this.nextbutton1);
@@ -179,6 +288,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            this.panel3.ResumeLayout(false);
+            this.panel3.PerformLayout();
+            this.panel4.ResumeLayout(false);
+            this.panel4.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -197,5 +312,14 @@
         private System.Windows.Forms.TextBox textBox1;
         private System.Windows.Forms.CheckBox checkBox1;
         private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Panel panel3;
+        private UI.ProgressBar progressBar1;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.Label label7;
     }
 }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs
index 8377d54..e3924ee 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs
@@ -13,12 +13,16 @@ namespace TimeHACK.OS.Win95.Win95Apps
     public partial class Win95Installer : UserControl
     {
         public int installStage = 0;
+        private Timer installbar = new Timer();
 
         public Win95Installer()
         {
             InitializeComponent();
             label1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
             label2.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0)));
+            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)));
             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);
@@ -28,6 +32,27 @@ namespace TimeHACK.OS.Win95.Win95Apps
         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);
+            installbar.Tick += Installbar_Tick;
+        }
+
+        private void Installbar_Tick(object sender, EventArgs e)
+        {
+            if (progressBar1.Value < 100)
+            {
+                progressBar1.Value = progressBar1.Value + 1;
+            }
+            else
+            {
+                panel3.Hide();
+                panel4.Show();
+                backbutton1.Hide();
+                nextbutton1.Hide();
+                cancelbutton1.Enabled = true;
+                cancelbutton1.Text = "Finish";
+                installbar.Stop();
+            }
         }
 
         private void nextbutton1_Click(object sender, EventArgs e)
@@ -38,9 +63,22 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     label1.Hide();
                     panel1.Show();
                     backbutton1.Enabled = true;
-                    nextbutton1.Enabled = false;
+                    if (!checkBox1.Checked) nextbutton1.Enabled = false;
                     installStage = 1;
                     break;
+                case 1:
+                    panel1.Hide();
+                    panel2.Show();
+                    installStage = 2;
+                    break;
+                case 2:
+                    panel2.Hide();
+                    panel3.Show();
+                    backbutton1.Enabled = false;
+                    nextbutton1.Enabled = false;
+                    cancelbutton1.Enabled = false;
+                    installbar.Start();
+                    break;
             }
         }
 
@@ -49,5 +87,30 @@ namespace TimeHACK.OS.Win95.Win95Apps
             if (checkBox1.Checked) nextbutton1.Enabled = true;
             else nextbutton1.Enabled = false;
         }
+
+        private void backbutton1_Click(object sender, EventArgs e)
+        {
+            switch (installStage)
+            {
+                case 1:
+                    panel1.Hide();
+                    label1.Show();
+                    backbutton1.Enabled = false;
+                    nextbutton1.Enabled = true;
+                    installStage = 0;
+                    break;
+                case 2:
+                    panel2.Hide();
+                    panel1.Show();
+                    if (!checkBox1.Checked) nextbutton1.Enabled = false;
+                    installStage = 1;
+                    break;
+            }
+        }
+
+        private void cancelbutton1_Click(object sender, EventArgs e)
+        {
+            ParentForm.Close();
+        }
     }
 }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
index 2e83e62..e7280ea 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
@@ -209,11 +209,6 @@
             this.ftpFiles.Cursor = System.Windows.Forms.Cursors.Default;
             this.ftpFiles.Dock = System.Windows.Forms.DockStyle.Fill;
             this.ftpFiles.ForeColor = System.Drawing.Color.White;
-            listViewItem1.StateImageIndex = 0;
-            listViewItem2.Checked = true;
-            listViewItem2.StateImageIndex = 1;
-            listViewItem3.Checked = true;
-            listViewItem3.StateImageIndex = 1;
             this.ftpFiles.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
             listViewItem1,
             listViewItem2,