Merge branch 'master' into master

3 files changed, 43 insertions, 20 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
index 3ec62b6..3fedcd1 100644
--- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
@@ -142,9 +142,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panel1.AutoSize = true;
             this.panel1.Controls.Add(this.panel2);
-            this.panel1.Location = new System.Drawing.Point(0, 691);
+            this.panel1.Location = new System.Drawing.Point(0, 451);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1280, 29);
+            this.panel1.Size = new System.Drawing.Size(640, 29);
             this.panel1.TabIndex = 0;
             // 
             // panel2
@@ -162,9 +162,9 @@
             this.taskbar.Controls.Add(this.clockPanel);
             this.taskbar.Controls.Add(this.startbutton);
             this.taskbar.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.taskbar.Location = new System.Drawing.Point(0, 692);
+            this.taskbar.Location = new System.Drawing.Point(0, 452);
             this.taskbar.Name = "taskbar";
-            this.taskbar.Size = new System.Drawing.Size(1280, 28);
+            this.taskbar.Size = new System.Drawing.Size(640, 28);
             this.taskbar.TabIndex = 2;
             // 
             // taskbartime
@@ -172,7 +172,7 @@
             this.taskbartime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.taskbartime.AutoSize = true;
             this.taskbartime.BackColor = System.Drawing.Color.Transparent;
-            this.taskbartime.Location = new System.Drawing.Point(1217, 6);
+            this.taskbartime.Location = new System.Drawing.Point(577, 6);
             this.taskbartime.Name = "taskbartime";
             this.taskbartime.Size = new System.Drawing.Size(26, 13);
             this.taskbartime.TabIndex = 2;
@@ -183,7 +183,7 @@
             // 
             this.clockPanel.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicTime;
             this.clockPanel.Dock = System.Windows.Forms.DockStyle.Right;
-            this.clockPanel.Location = new System.Drawing.Point(1215, 0);
+            this.clockPanel.Location = new System.Drawing.Point(575, 0);
             this.clockPanel.Name = "clockPanel";
             this.clockPanel.Size = new System.Drawing.Size(65, 28);
             this.clockPanel.TabIndex = 4;
@@ -204,7 +204,7 @@
             this.startmenu.BackColor = System.Drawing.Color.Silver;
             this.startmenu.Controls.Add(this.startmenuitems);
             this.startmenu.Controls.Add(this.ossidestartmenu);
-            this.startmenu.Location = new System.Drawing.Point(0, 397);
+            this.startmenu.Location = new System.Drawing.Point(0, 157);
             this.startmenu.Name = "startmenu";
             this.startmenu.Size = new System.Drawing.Size(174, 300);
             this.startmenu.TabIndex = 3;
@@ -229,7 +229,7 @@
             this.startmenuitems.Name = "startmenuitems";
             this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0);
             this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
-            this.startmenuitems.Size = new System.Drawing.Size(141, 311);
+            this.startmenuitems.Size = new System.Drawing.Size(141, 292);
             this.startmenuitems.TabIndex = 0;
             this.startmenuitems.Text = "StartMenu";
             // 
@@ -955,7 +955,7 @@
             this.desktopicons.LargeImageList = this.desktopImages;
             this.desktopicons.Location = new System.Drawing.Point(0, 0);
             this.desktopicons.Name = "desktopicons";
-            this.desktopicons.Size = new System.Drawing.Size(1280, 720);
+            this.desktopicons.Size = new System.Drawing.Size(640, 480);
             this.desktopicons.TabIndex = 6;
             this.desktopicons.UseCompatibleStateImageBehavior = false;
             this.desktopicons.DoubleClick += new System.EventHandler(this.desktopicons_Click);
@@ -1120,7 +1120,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Teal;
-            this.ClientSize = new System.Drawing.Size(1280, 720);
+            this.ClientSize = new System.Drawing.Size(640, 480);
             this.Controls.Add(this.taskbar);
             this.Controls.Add(this.startmenu);
             this.Controls.Add(this.panel1);
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
index 2313ded..2b587d2 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
@@ -14,11 +14,15 @@ namespace TimeHACK.OS.Win95.Win95Apps
         public int historylocation = 0;
 
         public HtmlDocument currentsite;
+        private Timer loadplz = new Timer();
 
         public WinClassicIE4()
         {
             InitializeComponent();
+            loadplz.Tick += new EventHandler(loadplz_Tick);
+            loadplz.Interval = 10;
         }
+
         private void WinClassicIE4_Load(object sender, EventArgs e)
         {
             browsinghistory.Capacity = 99;
@@ -188,15 +192,27 @@ namespace TimeHACK.OS.Win95.Win95Apps
         
         private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
         {
-            switch (addressbar.Text)
+            loadplz.Start();
+        }
+
+        private void loadplz_Tick(object sender, EventArgs e)
+        {
+            try
             {
-                case "www.microsoft.com/internetexplorer4/welcome":
-                    webBrowser1.Document.GetElementById("padams").Click += new HtmlElementEventHandler(padams_LinkClicked);
-                    break;
-                case "www.12padams.com":
-                    webBrowser1.Document.GetElementById("wc_b").Click += new HtmlElementEventHandler(WCDownloadButton_Click);
-                    webBrowser1.Document.GetElementById("distort").Style += "visibility:hidden;";
-                    break;
+                switch (currentsite.Title)
+                {
+                    case "IE4START":
+                        webBrowser1.Document.GetElementById("padams").Click += new HtmlElementEventHandler(padams_LinkClicked);
+                        break;
+                    case "12PADAMS":
+                        webBrowser1.Document.GetElementById("wc_b").Click += new HtmlElementEventHandler(WCDownloadButton_Click);
+                        webBrowser1.Document.GetElementById("distort").Style += "visibility:hidden;";
+                        break;
+                }
+                loadplz.Stop();
+            } catch
+            {
+
             }
         }
 
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx
index 6848c3f..dd84e1b 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx
@@ -202,6 +202,7 @@ So Please enjoy Using this amzing software and show the world what your made of.
   <data name="ie4start_HTML" xml:space="preserve">
     <value>&lt;html&gt;
 	&lt;head&gt;
+		&lt;title&gt;IE4START&lt;/title&gt;
 		&lt;style&gt;
 			body {
 				font-family: "Microsoft Sans Serif";
@@ -223,6 +224,11 @@ So Please enjoy Using this amzing software and show the world what your made of.
 			p.end {
 				font-size: 9.75pt;
 			}
+			a {
+				color: blue;
+				text-decoration: underline;
+				cursor: hand;
+			}
 		&lt;/style&gt;
 	&lt;/head&gt;
 	&lt;body&gt;
@@ -233,8 +239,8 @@ Just type an address in the location bar above and then press go.&lt;br&gt;
 Instantly you will be taken to the webpage of your choosing.&lt;br&gt;
 Where do you want to go today?&lt;/p&gt;
 		&lt;h2&gt;Here are some sites you may want to visit.&lt;/h2&gt;
-		&lt;a id="google" href="google"&gt;www.google.com&lt;/a&gt;&lt;br&gt;
-		&lt;a id="padams" href="12padams"&gt;www.12padams.com&lt;/a&gt;
+		&lt;a id="google"&gt;www.google.com&lt;/a&gt;&lt;br&gt;
+		&lt;a id="padams"&gt;www.12padams.com&lt;/a&gt;
 		&lt;p class="end"&gt;Where do you want to go today?&lt;/p&gt;
 	&lt;/body&gt;
 &lt;/html&gt;</value>
@@ -245,6 +251,7 @@ Where do you want to go today?&lt;/p&gt;
   <data name="padams_HTML" xml:space="preserve">
     <value>&lt;html&gt;
 	&lt;head&gt;
+		&lt;title&gt;12PADAMS&lt;/title&gt;
 		&lt;style&gt;
 			body {
 				font-family: "Microsoft Sans Serif";