Start IE4 Overhaul and FTP Client

IE4 finally getting overhauled (soon) and starting FTP client for story

6 files changed, 564 insertions, 84 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
new file mode 100644
index 0000000..45203e1
--- /dev/null
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs
@@ -0,0 +1,276 @@
+namespace TimeHACK.OS.Win95.Win95Apps
+{
+    partial class WinClassicFTPClient
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem(new string[] {
+            "/software/"}, -1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null);
+            System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem(new string[] {
+            "index.html"}, -1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null);
+            System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem(new string[] {
+            "???.html"}, -1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null);
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicFTPClient));
+            this.topBar = new System.Windows.Forms.Panel();
+            this.button1 = new System.Windows.Forms.Button();
+            this.infoLabel = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.textBox4 = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.passBox = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.usernameBox = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.hostnameBox = new System.Windows.Forms.TextBox();
+            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.button2 = new System.Windows.Forms.Button();
+            this.welcomeLabel = new System.Windows.Forms.Label();
+            this.ftpFiles = new System.Windows.Forms.ListView();
+            this.fileIcons = new System.Windows.Forms.ImageList(this.components);
+            this.topBar.SuspendLayout();
+            this.panel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // topBar
+            // 
+            this.topBar.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.topBar.Controls.Add(this.button1);
+            this.topBar.Controls.Add(this.infoLabel);
+            this.topBar.Controls.Add(this.label4);
+            this.topBar.Controls.Add(this.textBox4);
+            this.topBar.Controls.Add(this.label3);
+            this.topBar.Controls.Add(this.passBox);
+            this.topBar.Controls.Add(this.label2);
+            this.topBar.Controls.Add(this.usernameBox);
+            this.topBar.Controls.Add(this.label1);
+            this.topBar.Controls.Add(this.hostnameBox);
+            this.topBar.Dock = System.Windows.Forms.DockStyle.Top;
+            this.topBar.Location = new System.Drawing.Point(0, 0);
+            this.topBar.Name = "topBar";
+            this.topBar.Size = new System.Drawing.Size(762, 30);
+            this.topBar.TabIndex = 0;
+            // 
+            // button1
+            // 
+            this.button1.Location = new System.Drawing.Point(585, 2);
+            this.button1.Name = "button1";
+            this.button1.Size = new System.Drawing.Size(44, 23);
+            this.button1.TabIndex = 5;
+            this.button1.Text = "Login";
+            this.button1.UseVisualStyleBackColor = true;
+            this.button1.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // infoLabel
+            // 
+            this.infoLabel.AutoSize = true;
+            this.infoLabel.ForeColor = System.Drawing.Color.Red;
+            this.infoLabel.Location = new System.Drawing.Point(635, 7);
+            this.infoLabel.Name = "infoLabel";
+            this.infoLabel.Size = new System.Drawing.Size(35, 13);
+            this.infoLabel.TabIndex = 8;
+            this.infoLabel.Text = "label5";
+            this.infoLabel.Visible = false;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(503, 7);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(29, 13);
+            this.label4.TabIndex = 6;
+            this.label4.Text = "&Port:";
+            // 
+            // textBox4
+            // 
+            this.textBox4.Enabled = false;
+            this.textBox4.Location = new System.Drawing.Point(538, 4);
+            this.textBox4.Name = "textBox4";
+            this.textBox4.Size = new System.Drawing.Size(41, 20);
+            this.textBox4.TabIndex = 7;
+            this.textBox4.Text = "21";
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.label3.Location = new System.Drawing.Point(335, 7);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(56, 13);
+            this.label3.TabIndex = 4;
+            this.label3.Text = "Pass&word:";
+            // 
+            // passBox
+            // 
+            this.passBox.Location = new System.Drawing.Point(397, 4);
+            this.passBox.Name = "passBox";
+            this.passBox.PasswordChar = '*';
+            this.passBox.Size = new System.Drawing.Size(100, 20);
+            this.passBox.TabIndex = 5;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(156, 7);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(58, 13);
+            this.label2.TabIndex = 2;
+            this.label2.Text = "&Username:";
+            // 
+            // usernameBox
+            // 
+            this.usernameBox.Location = new System.Drawing.Point(214, 4);
+            this.usernameBox.Name = "usernameBox";
+            this.usernameBox.Size = new System.Drawing.Size(100, 20);
+            this.usernameBox.TabIndex = 3;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(8, 7);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(32, 13);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "&Host:";
+            // 
+            // hostnameBox
+            // 
+            this.hostnameBox.Location = new System.Drawing.Point(41, 4);
+            this.hostnameBox.Name = "hostnameBox";
+            this.hostnameBox.Size = new System.Drawing.Size(100, 20);
+            this.hostnameBox.TabIndex = 1;
+            // 
+            // contextMenuStrip1
+            // 
+            this.contextMenuStrip1.Name = "contextMenuStrip1";
+            this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4);
+            // 
+            // panel1
+            // 
+            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            this.panel1.Controls.Add(this.button2);
+            this.panel1.Controls.Add(this.welcomeLabel);
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel1.Location = new System.Drawing.Point(0, 469);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(762, 30);
+            this.panel1.TabIndex = 9;
+            // 
+            // button2
+            // 
+            this.button2.Location = new System.Drawing.Point(3, 2);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(75, 23);
+            this.button2.TabIndex = 0;
+            this.button2.Text = "button2";
+            this.button2.UseVisualStyleBackColor = true;
+            // 
+            // welcomeLabel
+            // 
+            this.welcomeLabel.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.welcomeLabel.Location = new System.Drawing.Point(577, 7);
+            this.welcomeLabel.Name = "welcomeLabel";
+            this.welcomeLabel.Size = new System.Drawing.Size(178, 13);
+            this.welcomeLabel.TabIndex = 0;
+            this.welcomeLabel.Text = "Please login to a remote FTP server.";
+            this.welcomeLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // ftpFiles
+            // 
+            this.ftpFiles.Alignment = System.Windows.Forms.ListViewAlignment.Left;
+            this.ftpFiles.AutoArrange = false;
+            this.ftpFiles.BackColor = System.Drawing.Color.White;
+            this.ftpFiles.BackgroundImageTiled = true;
+            this.ftpFiles.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            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,
+            listViewItem3});
+            this.ftpFiles.Location = new System.Drawing.Point(0, 30);
+            this.ftpFiles.Name = "ftpFiles";
+            this.ftpFiles.Size = new System.Drawing.Size(762, 439);
+            this.ftpFiles.SmallImageList = this.fileIcons;
+            this.ftpFiles.StateImageList = this.fileIcons;
+            this.ftpFiles.TabIndex = 7;
+            this.ftpFiles.TileSize = new System.Drawing.Size(32, 32);
+            this.ftpFiles.UseCompatibleStateImageBehavior = false;
+            this.ftpFiles.View = System.Windows.Forms.View.List;
+            this.ftpFiles.Visible = false;
+            this.ftpFiles.Click += new System.EventHandler(this.ftpItems_Click);
+            // 
+            // fileIcons
+            // 
+            this.fileIcons.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("fileIcons.ImageStream")));
+            this.fileIcons.TransparentColor = System.Drawing.Color.Transparent;
+            this.fileIcons.Images.SetKeyName(0, "WinClassicFolder.png");
+            this.fileIcons.Images.SetKeyName(1, "WinClassicNotepad.png");
+            // 
+            // WinClassicFTPClient
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.ftpFiles);
+            this.Controls.Add(this.panel1);
+            this.Controls.Add(this.topBar);
+            this.Name = "WinClassicFTPClient";
+            this.Size = new System.Drawing.Size(762, 499);
+            this.topBar.ResumeLayout(false);
+            this.topBar.PerformLayout();
+            this.panel1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel topBar;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.TextBox textBox4;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox passBox;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox usernameBox;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
+        public System.Windows.Forms.TextBox hostnameBox;
+        private System.Windows.Forms.Label infoLabel;
+        private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Button button2;
+        private System.Windows.Forms.Label welcomeLabel;
+        internal System.Windows.Forms.ListView ftpFiles;
+        private System.Windows.Forms.ImageList fileIcons;
+    }
+}
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs
new file mode 100644
index 0000000..ab7e61f
--- /dev/null
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs
@@ -0,0 +1,66 @@
+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 TimeHACK.OS.Win95.Win95Apps
+{
+    public partial class WinClassicFTPClient : UserControl
+    {
+        public WinClassicFTPClient()
+        {
+            InitializeComponent();
+        }
+
+
+        private void button1_Click(object sender, EventArgs e)
+        {
+            if (hostnameBox.Text == "172.68.119.42")
+            {
+                infoLabel.Hide();
+                if (usernameBox.Text == "12padams")
+                {
+                    infoLabel.Hide();
+                    if (passBox.Text == "projectDeath98")
+                    {
+                        infoLabel.Hide();
+                        infoLabel.ForeColor = Color.Green;
+                        infoLabel.Text = "[200] OK";
+                        welcomeLabel.Hide();
+                        infoLabel.Show();
+                    }
+                    else
+                    {
+                        infoLabel.Text = "[430] Incorrect Password";
+                        infoLabel.Show();
+                    }
+                }
+                else
+                {
+                    infoLabel.Text = "[430] Incorrect Username";
+                    infoLabel.Show();
+                }
+            }
+            else
+            {
+                infoLabel.Text = "[404] Not Found";
+                infoLabel.Show();
+            }
+        }
+
+        private void ftpItems_Click(object sender, EventArgs e)
+        {
+            Point objDrawingPoint = ftpFiles.PointToClient(Cursor.Position);
+            ListViewItem objListViewItem = new ListViewItem();
+            if (objListViewItem.Text == "/software/")
+            {
+
+            }
+        }
+    }
+}
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx
new file mode 100644
index 0000000..7b49ca1
--- /dev/null
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="fileIcons.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>172, 17</value>
+  </metadata>
+  <data name="fileIcons.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO
+        DwAAAk1TRnQBSQFMAgEBAgEAAQgBAAEIAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
+        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
+        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
+        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
+        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
+        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
+        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
+        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
+        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
+        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
+        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
+        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
+        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
+        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
+        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
+        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
+        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
+        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
+        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
+        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
+        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
+        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
+        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
+        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
+        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/6QAAewVBwEAAQdnAAHs
+        Fv8BBwEAAQdmAAHsFv8BBwEAAQdEAAHsHgMDAAHsAv8GAA7/AQcBAAEHRAAB7AH/AfsBBwH7AQcB+wEH
+        AfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcBAwMAAewW/wEHAQABB0QA
+        AewB/wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7
+        AQMDAAHsAv8GAA7/AQcBAAEHRAAB7AH/AfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEH
+        AfsBBwH7AQcB+wEHAfsBBwH7AQcBAwMAAewW/wEHAQABB0QAAewB/wEHAfsBBwH7AQcB+wEHAfsBBwH7
+        AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQMDAAHsFv8BBwEAAQdEAAHsAf8B+wEH
+        AfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwEDAwAB7AL/
+        EgAC/wEHAQABB0QAAewB/wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7
+        AQcB+wEHAfsBBwH7AQMDAAHsFv8BBwEAAQdEAAHsAf8B+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEH
+        AfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwEDAwAB7AL/EgAC/wEHAQABB0QAAewB/wEHAfsBBwH7
+        AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQMDAAHsFv8BBwEA
+        AQdEAAHsAf8B+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEH
+        AfsBBwEDAwAB7AL/EgAC/wEHAQABB0QAAewB/wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7
+        AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQMDAAHsFv8BBwEAAQdEAAHsAf8B+wEHAfsBBwH7AQcB+wEH
+        AfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwEDAwAB7AL/EgAC/wEHAQABB0QA
+        AewB/wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7
+        AQMDAAHsFv8BBwEAAQdEAAHsAf8B+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEH
+        AfsBBwH7AQcB+wEHAfsBBwEDAwAB7Bb/AQcBAAEHRAAB7AH/AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7
+        AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBAwMAAewC/wYADv8BBwEAAQdEAAHsAf8B+wEH
+        AfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwEDAwAB7Bb/
+        AQcBAAEHRAAB7AH/AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7
+        AQcB+wEHAfsBAwMAAewW/wEHAQABB0QAAewB/wH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEH
+        AfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAQMDAAHsFv8BBwEAAQdEAAHsAf8BBwH7AQcB+wEHAfsBBwH7
+        AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEDAwAB7AL/BgAO/wEHAQABB0QA
+        AewB/wH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwH7AQcB+wEH
+        AQMDAAHsFv8BBwEAAQdEAAHsHf8EAAHsAv8GAAf/AQAB/wMAAv8BBwEAAQdEAAHsDwcO7AQAAewW/wEH
+        AQABB0UAAewB/wH7AQcB+wEHAfsBBwH7AQcB+wEHAfsBBwHsEgAB7Bb/AQcBAAEHRgAB7AH/AfsBBwH7
+        AQcB+wEHAfsBBwH7AQcB7BMAAewW/wEHAQABB0cAAewJ/wHsFAAB7AH/AQAC/wEAAv8BAAL/AQAC/wEA
+        Av8BAAL/AQAC/wHsAQABB0gACewVAAHsAf8BAAL/AQAC/wEAAv8BAAL/AQAC/wEAAv8BAAL/AewBAAEH
+        ZwAB7AH/AuwB/wLsAf8C7AH/AuwB/wLsAf8C7AH/AuwB/wHsxQABQgFNAT4HAAE+AwABKAMAAYADAAEg
+        AwABAQEAAQEGAAECFgAD/wEABP8B8AIAAR8IAAT/AeACAAEPCAAE/wHAAgABBwgAAYACAAEBAcACAAEH
+        DAABwAIAAQcMAAHAAgABBwwAAcACAAEHDAABwAIAAQcMAAHAAgABBwwAAcACAAEHDAABwAIAAQcMAAHA
+        AgABBwwAAcACAAEHDAABwAIAAQcMAAHAAgABBwwAAcACAAEHDAABwAIAAQcMAAHAAgABBwwAAcACAAEH
+        DAABwAIAAQcMAAHAAgABBwwAAcACAAEHDAABwAIAAQcMAAHAAgABBwwAAcACAAEHCwABAQHAAgABBwgA
+        AYABAAL/AcACAAEHCAABwAEBAv8BwAIAAQcIAAHgAQMC/wHAAgABBwgAAfABBwL/AcACAAEHCAAE/wHg
+        AgABDwgABP8B8gFJASQBvwgACw==
+</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs
index 89e6193..664047d 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs
@@ -96,13 +96,6 @@
             this.Panel11 = new System.Windows.Forms.Panel();
             this.PictureBox4 = new System.Windows.Forms.PictureBox();
             this.PictureBox3 = new System.Windows.Forms.PictureBox();
-            this.welcomeinternetscreen = new System.Windows.Forms.Panel();
-            this.Label58 = new System.Windows.Forms.Label();
-            this.LinkLabel16 = new System.Windows.Forms.LinkLabel();
-            this.LinkLabel15 = new System.Windows.Forms.LinkLabel();
-            this.Label3 = new System.Windows.Forms.Label();
-            this.TextBox1 = new System.Windows.Forms.TextBox();
-            this.Label2 = new System.Windows.Forms.Label();
             this.hotmailpadams = new System.Windows.Forms.Panel();
             this.email1 = new System.Windows.Forms.Panel();
             this.LinkLabel18 = new System.Windows.Forms.LinkLabel();
@@ -332,7 +325,6 @@
             this.Panel11.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox3)).BeginInit();
-            this.welcomeinternetscreen.SuspendLayout();
             this.hotmailpadams.SuspendLayout();
             this.email1.SuspendLayout();
             this.email3.SuspendLayout();
@@ -365,7 +357,6 @@
             // 
             this.program.BackColor = System.Drawing.Color.Silver;
             this.program.Controls.Add(this.browsingarea);
-            this.program.Controls.Add(this.webBrowser1);
             this.program.Controls.Add(this.Panel14);
             this.program.Controls.Add(this.Panel1);
             this.program.Controls.Add(this.PictureBox1);
@@ -382,7 +373,6 @@
             this.browsingarea.Controls.Add(this.padamsmain);
             this.browsingarea.Controls.Add(this.padamsbackgrounds);
             this.browsingarea.Controls.Add(this.hotmailmain);
-            this.browsingarea.Controls.Add(this.welcomeinternetscreen);
             this.browsingarea.Controls.Add(this.hotmailpadams);
             this.browsingarea.Controls.Add(this.googlealpha);
             this.browsingarea.Controls.Add(this.padamshidden);
@@ -453,7 +443,6 @@
             this.Label20.Size = new System.Drawing.Size(174, 15);
             this.Label20.TabIndex = 7;
             this.Label20.Text = "Copyright 1998 12padams";
-            this.Label20.Click += new System.EventHandler(this.Label20_Click);
             // 
             // Panel10
             // 
@@ -1094,6 +1083,8 @@
             this.PictureBox3.TabIndex = 0;
             this.PictureBox3.TabStop = false;
             // 
+<<<<<<< HEAD
+=======
             // welcomeinternetscreen
             // 
             this.welcomeinternetscreen.AutoScroll = true;
@@ -1179,6 +1170,7 @@
             this.Label2.Text = "Welcome To Internet Explorer 4";
             this.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+>>>>>>> origin/master
             // hotmailpadams
             // 
             this.hotmailpadams.AutoScroll = true;
@@ -1764,7 +1756,6 @@
             this.Button12.TabIndex = 2;
             this.Button12.Text = "Google Search";
             this.Button12.UseVisualStyleBackColor = false;
-            this.Button12.Click += new System.EventHandler(this.Button12_Click);
             // 
             // TextBox4
             // 
@@ -2122,7 +2113,6 @@
             this.GoogleSearchButton.TabIndex = 3;
             this.GoogleSearchButton.Text = "Google Search";
             this.GoogleSearchButton.UseVisualStyleBackColor = false;
-            this.GoogleSearchButton.Click += new System.EventHandler(this.Button9_Click);
             // 
             // ComboBox1
             // 
@@ -2583,7 +2573,6 @@
             this.ToolStripMenuItem21.Name = "ToolStripMenuItem21";
             this.ToolStripMenuItem21.Size = new System.Drawing.Size(221, 22);
             this.ToolStripMenuItem21.Text = "Close";
-            this.ToolStripMenuItem21.Click += new System.EventHandler(this.ToolStripMenuItem21_Click);
             // 
             // ToolStripMenuItem22
             // 
@@ -3219,8 +3208,6 @@
             this.Panel11.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.PictureBox3)).EndInit();
-            this.welcomeinternetscreen.ResumeLayout(false);
-            this.welcomeinternetscreen.PerformLayout();
             this.hotmailpadams.ResumeLayout(false);
             this.email1.ResumeLayout(false);
             this.email1.PerformLayout();
@@ -3310,13 +3297,6 @@
         internal System.Windows.Forms.Panel Panel11;
         internal System.Windows.Forms.PictureBox PictureBox4;
         internal System.Windows.Forms.PictureBox PictureBox3;
-        internal System.Windows.Forms.Panel welcomeinternetscreen;
-        internal System.Windows.Forms.Label Label58;
-        internal System.Windows.Forms.LinkLabel LinkLabel16;
-        internal System.Windows.Forms.LinkLabel LinkLabel15;
-        internal System.Windows.Forms.Label Label3;
-        internal System.Windows.Forms.TextBox TextBox1;
-        internal System.Windows.Forms.Label Label2;
         internal System.Windows.Forms.Panel hotmailpadams;
         internal System.Windows.Forms.Panel email1;
         internal System.Windows.Forms.LinkLabel LinkLabel18;
@@ -3550,7 +3530,6 @@
         internal System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem93;
         internal System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem94;
         internal System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem95;
-        internal System.Windows.Forms.WebBrowser webBrowser1;
         internal System.ComponentModel.ComponentResourceManager resources;
     }
 }
\ No newline at end of file
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
index e6253c9..c0e1bc4 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
@@ -5,6 +5,7 @@ using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using TimeHACK.Engine;
 using TimeHACK.Engine.Template;
+using TimeHACK.Resources.IE4;
 
 namespace TimeHACK.OS.Win95.Win95Apps
 {
@@ -13,27 +14,36 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public List<string> browsinghistory = new List<string>();
         public int historylocation = 0;
 
-        public HtmlDocument currentsite;
-        private Timer loadplz = new Timer();
+        IE4Welcome welcomeinternetscreen = new IE4Welcome();
 
         public WinClassicIE4()
         {
             InitializeComponent();
-            loadplz.Tick += new EventHandler(loadplz_Tick);
-            loadplz.Interval = 10;
         }
 
         private void WinClassicIE4_Load(object sender, EventArgs e)
         {
+<<<<<<< HEAD
+            browsinghistory.Capacity = 99;
+            BringToFront();
+            hidePrograms();
+            welcomeinternetscreen.Dock = DockStyle.Fill;
+            welcomeinternetscreen.Show();
+            browsinghistory.Add("www.microsoft.com/internetexplorer4/welcome");
+            for (int i = 0; i < 99; i++) browsinghistory.Add(null);
+            foreach (ToolStripMenuItem item in MenuStrip3.Items) item.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0)));
+            foreach (Control ctrl in Panel1.Controls) ctrl.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0)));
+=======
             
+>>>>>>> origin/master
         }
 
         private void hidePrograms()
         {
             googlemain.Hide();
-            welcomeinternetscreen.Hide();
             googleprototype.Hide();
             googlealpha.Hide();
+            welcomeinternetscreen.Hide();
             padamsmain.Hide();
             hotmailmain.Hide();
             padamsbackgrounds.Hide();
@@ -45,60 +55,15 @@ namespace TimeHACK.OS.Win95.Win95Apps
             email3.Hide();
             hotmailpadams.Hide();
         }
-
-        private void google_LinkClicked(object sender, HtmlElementEventArgs e)
-        {
-            goToSite("www.google.com", false);
-        }
-
-        private void padams_LinkClicked(object sender, HtmlElementEventArgs e)
-        {
-            goToSite("www.12padams.com", false);
-        }
-
-        private void googleprototypelink_LinkClicked(object sender, HtmlElementEventArgs e)
-        {
-            goToSite("www.google.stanford.edu", false);
-        }
-
-        private void googlebetalink_LinkClicked(object sender, HtmlElementEventArgs e)
-        {
-            goToSite("www.alpha.google.com", false);
-        }
-
-        private void Label20_Click(object sender, EventArgs e)
-        {
-            hidePrograms();
-            padamshidden.Dock = DockStyle.Fill;
-            padamshidden.Show();
-        }
-
-        private void Button12_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void Button9_Click(object sender, EventArgs e)
-        {
-            goToSite("www.???.com", false);
-        }
-
-        private void ToolStripMenuItem21_Click(object sender, EventArgs e)
-        {
-            ((Form)this.TopLevelControl).Close();
-        }
-
         private void goToSite(string url, bool back)
         {
             switch (url)
             {
                 case "www.google.com":
                     hidePrograms();
-                    webBrowser1.DocumentText = resources.GetString("google_HTML");
                     break;
                 case "www.google.stanford.edu":
                     hidePrograms();
-                    webBrowser1.DocumentText = resources.GetString("prototype_HTML");
                     break;
                 case "www.alpha.google.com":
                     hidePrograms();
@@ -107,11 +72,11 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     break;
                 case "www.12padams.com":
                     hidePrograms();
-                    webBrowser1.DocumentText = resources.GetString("padams_HTML");
                     break;
                 case "www.microsoft.com/internetexplorer4/welcome":
                     hidePrograms();
-                    webBrowser1.DocumentText = resources.GetString("ie4start_HTML");
+                    welcomeinternetscreen.Dock = DockStyle.Fill;
+                    welcomeinternetscreen.Show();
                     break;
                 case "www.???.com":
                     hidePrograms();
@@ -145,7 +110,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
             }
 
             addressbar.Text = url;
-            currentsite = webBrowser1.Document;
         }
 
         private void BackButton_Click(object sender, EventArgs e)
@@ -179,6 +143,9 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             goToSite(addressbar.Text, false);
         }
+<<<<<<< HEAD
+
+=======
         
         private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
         {
@@ -211,6 +178,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
             }
         }
         
+>>>>>>> origin/master
         //TODO: Add more websites
         //TODO: Relabel Buttons And Things
     }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx
index 2021fda..c89e385 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx
@@ -117,13 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TextBox1.Text" xml:space="preserve">
-    <value>Welcome To Internet Explorer 4. 
-Internet Explorer 4 makes browsing the web and exploring websites a pleasant experience.
-Just type an address in the location bar above and then press go.
-Instantly you will be taken to the webpage of your choosing.
-Where do you want to go today?</value>
-  </data>
   <data name="TextBox12.Text" xml:space="preserve">
     <value>1998: Added Time Distortion software to 12padams website.
 Software was hidden and only accessable after downloading hwcv.exe and applying it onto the 12padams website