aboutsummaryrefslogtreecommitdiff
path: root/TimeHACK.Main/OS
diff options
context:
space:
mode:
Diffstat (limited to 'TimeHACK.Main/OS')
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WinClassicHWCV.cs1
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs100
-rw-r--r--TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs48
3 files changed, 1 insertions, 148 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicHWCV.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicHWCV.cs
index 8a159e9..6f9bb07 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicHWCV.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicHWCV.cs
@@ -24,7 +24,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
Label3.Show();
Label3.Text = "Hidden Content Found: Time Distorter";
TitleScreen.frm95.hiddenpadamsFound = true;
- if (TitleScreen.frm95.ie != null && ((WinClassicIE4)TitleScreen.frm95.ie.programContent.Controls[0]).currentsite.Title == "12PADAMS") ((WinClassicIE4)TitleScreen.frm95.ie.programContent.Controls[0]).webBrowser1.Refresh();
}
else
{
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs
index 664047d..9e0cd81 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs
@@ -189,7 +189,6 @@
this.TextBox2 = new System.Windows.Forms.TextBox();
this.Label7 = new System.Windows.Forms.Label();
this.pboxgoogleprototypelogo = new System.Windows.Forms.PictureBox();
- this.webBrowser1 = new System.Windows.Forms.WebBrowser();
this.Panel14 = new System.Windows.Forms.Panel();
this.GoButton = new System.Windows.Forms.Button();
this.addressbar = new System.Windows.Forms.ComboBox();
@@ -1082,95 +1081,7 @@
this.PictureBox3.Size = new System.Drawing.Size(160, 136);
this.PictureBox3.TabIndex = 0;
this.PictureBox3.TabStop = false;
- //
-<<<<<<< HEAD
-=======
- // welcomeinternetscreen
- //
- this.welcomeinternetscreen.AutoScroll = true;
- this.welcomeinternetscreen.BackColor = System.Drawing.Color.White;
- this.welcomeinternetscreen.Controls.Add(this.Label58);
- this.welcomeinternetscreen.Controls.Add(this.LinkLabel16);
- this.welcomeinternetscreen.Controls.Add(this.LinkLabel15);
- this.welcomeinternetscreen.Controls.Add(this.Label3);
- this.welcomeinternetscreen.Controls.Add(this.TextBox1);
- this.welcomeinternetscreen.Controls.Add(this.Label2);
- this.welcomeinternetscreen.Location = new System.Drawing.Point(8, 3);
- this.welcomeinternetscreen.Name = "welcomeinternetscreen";
- this.welcomeinternetscreen.Size = new System.Drawing.Size(38, 38);
- this.welcomeinternetscreen.TabIndex = 0;
- //
- // Label58
- //
- this.Label58.Anchor = System.Windows.Forms.AnchorStyles.Top;
- this.Label58.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label58.Location = new System.Drawing.Point(0, 45);
- this.Label58.Name = "Label58";
- this.Label58.Size = new System.Drawing.Size(200, 16);
- this.Label58.TabIndex = 7;
- this.Label58.Text = "Where do you want to go today?";
- this.Label58.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // LinkLabel16
- //
- this.LinkLabel16.Anchor = System.Windows.Forms.AnchorStyles.Top;
- this.LinkLabel16.Location = new System.Drawing.Point(0, 317);
- this.LinkLabel16.Name = "LinkLabel16";
- this.LinkLabel16.Size = new System.Drawing.Size(200, 13);
- this.LinkLabel16.TabIndex = 6;
- this.LinkLabel16.TabStop = true;
- this.LinkLabel16.Text = "www.12padams.com";
- this.LinkLabel16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // LinkLabel15
- //
- this.LinkLabel15.Anchor = System.Windows.Forms.AnchorStyles.Top;
- this.LinkLabel15.Location = new System.Drawing.Point(0, 298);
- this.LinkLabel15.Name = "LinkLabel15";
- this.LinkLabel15.Size = new System.Drawing.Size(200, 13);
- this.LinkLabel15.TabIndex = 5;
- this.LinkLabel15.TabStop = true;
- this.LinkLabel15.Text = "www.google.com";
- this.LinkLabel15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // Label3
- //
- this.Label3.Anchor = System.Windows.Forms.AnchorStyles.Top;
- this.Label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label3.Location = new System.Drawing.Point(0, 258);
- this.Label3.Name = "Label3";
- this.Label3.Size = new System.Drawing.Size(200, 20);
- this.Label3.TabIndex = 2;
- this.Label3.Text = "Here are some sites you may wish to visit.";
- this.Label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
- // TextBox1
- //
- this.TextBox1.Anchor = System.Windows.Forms.AnchorStyles.Top;
- this.TextBox1.BackColor = System.Drawing.Color.White;
- this.TextBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.TextBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.TextBox1.Location = new System.Drawing.Point(0, 98);
- this.TextBox1.Multiline = true;
- this.TextBox1.Name = "TextBox1";
- this.TextBox1.ReadOnly = true;
- this.TextBox1.Size = new System.Drawing.Size(200, 130);
- this.TextBox1.TabIndex = 1;
- this.TextBox1.Text = resources.GetString("TextBox1.Text");
- this.TextBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
- //
- // Label2
- //
- this.Label2.Anchor = System.Windows.Forms.AnchorStyles.Top;
- this.Label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.Label2.Location = new System.Drawing.Point(0, 19);
- this.Label2.Name = "Label2";
- this.Label2.Size = new System.Drawing.Size(200, 24);
- this.Label2.TabIndex = 0;
- this.Label2.Text = "Welcome To Internet Explorer 4";
- this.Label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
- //
->>>>>>> origin/master
+ //
// hotmailpadams
//
this.hotmailpadams.AutoScroll = true;
@@ -2153,15 +2064,6 @@
this.pboxgoogleprototypelogo.TabIndex = 0;
this.pboxgoogleprototypelogo.TabStop = false;
//
- // webBrowser1
- //
- this.webBrowser1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.webBrowser1.Location = new System.Drawing.Point(0, 111);
- this.webBrowser1.Name = "webBrowser1";
- this.webBrowser1.Size = new System.Drawing.Size(959, 483);
- this.webBrowser1.TabIndex = 11;
- this.webBrowser1.DocumentCompleted += new System.Windows.Forms.WebBrowserDocumentCompletedEventHandler(this.webBrowser1_DocumentCompleted);
- //
// Panel14
//
this.Panel14.Controls.Add(this.GoButton);
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
index c0e1bc4..0fac91a 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
@@ -5,8 +5,6 @@ using System.Runtime.InteropServices;
using System.Windows.Forms;
using TimeHACK.Engine;
using TimeHACK.Engine.Template;
-using TimeHACK.Resources.IE4;
-
namespace TimeHACK.OS.Win95.Win95Apps
{
public partial class WinClassicIE4 : UserControl
@@ -14,8 +12,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
public List<string> browsinghistory = new List<string>();
public int historylocation = 0;
- IE4Welcome welcomeinternetscreen = new IE4Welcome();
-
public WinClassicIE4()
{
InitializeComponent();
@@ -23,19 +19,13 @@ namespace TimeHACK.OS.Win95.Win95Apps
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()
@@ -43,7 +33,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
googlemain.Hide();
googleprototype.Hide();
googlealpha.Hide();
- welcomeinternetscreen.Hide();
padamsmain.Hide();
hotmailmain.Hide();
padamsbackgrounds.Hide();
@@ -75,8 +64,6 @@ namespace TimeHACK.OS.Win95.Win95Apps
break;
case "www.microsoft.com/internetexplorer4/welcome":
hidePrograms();
- welcomeinternetscreen.Dock = DockStyle.Fill;
- welcomeinternetscreen.Show();
break;
case "www.???.com":
hidePrograms();
@@ -143,42 +130,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
{
goToSite(addressbar.Text, false);
}
-<<<<<<< HEAD
-
-=======
-
- private void webBrowser1_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
- {
- loadplz.Start();
- }
-
- private void loadplz_Tick(object sender, EventArgs e)
- {
- try
- {
- switch (currentsite.Title)
- {
- case "IE4START":
- webBrowser1.Document.GetElementById("google").Click += new HtmlElementEventHandler(google_LinkClicked);
- webBrowser1.Document.GetElementById("padams").Click += new HtmlElementEventHandler(padams_LinkClicked);
- break;
- case "12PADAMS":
- webBrowser1.Document.GetElementById("wc_b").Click += new HtmlElementEventHandler(WCDownloadButton_Click);
- if (!TitleScreen.frm95.hiddenpadamsFound) webBrowser1.Document.GetElementById("distort").Style += "visibility:hidden;";
- break;
- case "GOOGLE":
- webBrowser1.Document.GetElementById("prototype").Click += new HtmlElementEventHandler(googleprototypelink_LinkClicked);
- webBrowser1.Document.GetElementById("alpha").Click += new HtmlElementEventHandler(googlebetalink_LinkClicked);
- break;
- }
- loadplz.Stop();
- } catch
- {
-
- }
- }
->>>>>>> origin/master
//TODO: Add more websites
//TODO: Relabel Buttons And Things
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-06 08:13:44 +0000