From b5cc523276755aa0171705bb65beabf9ddd825d7 Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Sat, 28 Oct 2017 20:17:22 -0400 Subject: Fixed up time distorter bug, 95 desktop cleanup and ie3 supporting links wihtout www --- Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs | 15 ++++++++++++++- .../Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs | 11 +++++++++-- 2 files changed, 23 insertions(+), 3 deletions(-) (limited to 'Histacom2/OS/Win95/Win95Apps') diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs index de2e4b0..34828cc 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs @@ -34,6 +34,7 @@ namespace Histacom2.OS.Win95.Win95Apps public static async void GoToPage(string url) { + string newURL = url; UserControl uc = new UserControl(); switch (url) @@ -50,12 +51,24 @@ namespace Histacom2.OS.Win95.Win95Apps case "www.12padams.com": uc = new _12padams1998(); break; + case "12padams.com": + uc = new _12padams1998(); + newURL = "www.12padams.com"; + break; + case "google.com": + uc = new GoogleHome(); + newURL = "www.google.com"; + break; + case "google.stanford.edu": + uc = new GooglePrototype(); + newURL = "www.google.stanford.edu"; + break; default: uc = new IENoPage(); break; } - addressbar.Text = url; + addressbar.Text = newURL; uc.Dock = DockStyle.Fill; await Task.Delay(new Random().Next(500, 1500)); diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs index 33ab4f2..9421bdc 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs @@ -104,10 +104,17 @@ // // btnGo // - this.btnGo.Location = new System.Drawing.Point(162, 133); + this.btnGo.AdaptBackColorWithTheme = true; + this.btnGo.AdaptFontWithTheme = true; + this.btnGo.AdaptForeColorWithTheme = true; + this.btnGo.BackColor = System.Drawing.Color.Silver; + this.btnGo.DialogResult = System.Windows.Forms.DialogResult.None; + this.btnGo.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.btnGo.ForeColor = System.Drawing.Color.Black; + this.btnGo.Location = new System.Drawing.Point(155, 133); this.btnGo.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnGo.Name = "btnGo"; - this.btnGo.Size = new System.Drawing.Size(124, 23); + this.btnGo.Size = new System.Drawing.Size(131, 23); this.btnGo.TabIndex = 7; this.btnGo.Text = "Go To Destination Year"; this.btnGo.Click += new System.EventHandler(this.btnGo_Click); -- cgit v1.2.3 From fc44ad047e81031be219b1894853fe70cc46b85c Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Sat, 28 Oct 2017 20:30:03 -0400 Subject: 12padams's page footer can only be clicked once everytime the window is open --- Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Histacom2/OS/Win95/Win95Apps') diff --git a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs index 9f4bfbd..f55ee45 100644 --- a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs +++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs @@ -15,6 +15,7 @@ namespace Histacom2.OS.Win95.Win95Apps.IE3Sites { public partial class _12padams1998 : UserControl { + bool clicked = false; public _12padams1998() { InitializeComponent(); @@ -47,6 +48,8 @@ namespace Histacom2.OS.Win95.Win95Apps.IE3Sites private void label17_Click(object sender, EventArgs e) { + if (clicked) return; + clicked = true; label16.Text = "1̧͙̙̦̪͙͇̜̥͍̟͍̹̰̝͖̫̩͘͡͡9̸̨͏̖̱̗̣̥͕̲͈̬̦9͠҉̶̢͔̹̖͇̫̩̻̪̬͔̥̟̺̼̺̟̫8̷̴̶̱̩͖̟̠̬̻̼̳̰̺͚͜͞:̧͟͏̰̣̠̹͍͔̼͕̲͇̪̥̗̞͚͇̖ͅ ͏̙͇̮̤̠͇̜͚͈͇͔̠̙͜͡ͅÀ͏̰̮̞̲̠̩̳͙͓͉̭̼̠͕̣͇̜͎ͅd̢̩̝̙̩̭̫͓̮͙͔̘̥͝d̻̻̪̙͖̬͈͟͝e͠҉̨̧҉̯̙̹̝̟̺̰͖̹̞̻̝̖̪͉͍͇̬#҉̵̻̜͇̻̹͈̀͟ ̨̡̘͓͔̜̭̫͖͔̰̦̘̀#̛͓̬̭̦̹̙̭͕̕#̧͢͠͏̖̙͚͉͇̣̜̖ͅ#̜̝͚͓̳̘̭̣̲̟̤̖͇̬̠̯̠̀͠ ̢͚̲̞̯͎͙̪̗̜̹͙͓͉͢ͅ#̡͙̻̫̝̪͙͚̺̝͓̘̬̬͙͔̀̕͠#̴҉͖̲̺̱͖͈̭̭ͅ#̸̸̷̼̫̪̖̻̻͈̭̬͓̘͓̦̟̻̪͇̞̕#̸̢̨̻̗̣̠̥̖̜̜̖̺͍̝̗͓̦̳̫#̛͡҉̭̝̙̟̘̩̬͖͎̘̞̭̖͔̪̼̠͢ͅ#̰̜̭̹̻̖̬̺͘͡#̛̬̣̳͔͔̘̟͜͢͟͡#̷̨̼̺̤̥̞́͢͡ ̢̞̬͙͍̬̪̪̰̰̰̙̮͙͚͕̩̟͇̕͜ͅ#̶͙̣̣̦͈͈̫̕͡#̸̡̥̹̮͇̱̱͍͜͜͢#̵̢̧̦͙̮̮͔͖̞̮͚͞#̧̗̤̱̪̜͓̠͖̞̰͍͢#̧̱̳̻̖̝͇͜͞#̛́҉͍̩̞̬͔̬̪̻̯̩"; Thread.Sleep(100); Refresh(); -- cgit v1.2.3 From 9b1e869f9cddba3ae868071094a41306c38038f9 Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Sat, 28 Oct 2017 20:40:01 -0400 Subject: Let background change to savesystem's currentsave one during time distortion --- Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Histacom2/OS/Win95/Win95Apps') diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs index 77f63b5..ec9cb07 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs @@ -80,7 +80,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story await Task.Delay(2500); Console.WriteLine("Command> Show Start Button"); TitleScreen.frm95.startbutton.Show(); - TitleScreen.frm95.desktopicons.BackgroundImage = null; + TitleScreen.frm95.desktopicons.BackgroundImage = SaveSystem.currentTheme.defaultWallpaper; await Task.Delay(2900); Console.WriteLine("12padams> OKAY, NOW YOU'VE DONE IT!"); await Task.Delay(2500); -- cgit v1.2.3 From 410c6afab4044f3a9d34e1b4e94e7b9999073a31 Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Sat, 28 Oct 2017 20:46:42 -0400 Subject: FTP CLient now requires you to double click on the items --- .../Win95Apps/WinClassicFTPClient.Designer.cs | 13 +++++++-- .../OS/Win95/Win95Apps/WinClassicFTPClient.cs | 33 +++++++++++----------- .../OS/Win95/Win95Apps/WinClassicFTPClient.resx | 2 +- 3 files changed, 29 insertions(+), 19 deletions(-) (limited to 'Histacom2/OS/Win95/Win95Apps') diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index 63e056b..c112e61 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -78,8 +78,12 @@ // // btnLogin // + this.btnLogin.AdaptBackColorWithTheme = true; + this.btnLogin.AdaptFontWithTheme = true; + this.btnLogin.AdaptForeColorWithTheme = true; this.btnLogin.BackColor = System.Drawing.Color.Silver; - this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnLogin.DialogResult = System.Windows.Forms.DialogResult.None; + this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.btnLogin.ForeColor = System.Drawing.Color.Black; this.btnLogin.Location = new System.Drawing.Point(585, 4); this.btnLogin.Name = "btnLogin"; @@ -184,7 +188,12 @@ // // btnCancel // + this.btnCancel.AdaptBackColorWithTheme = true; + this.btnCancel.AdaptFontWithTheme = true; + this.btnCancel.AdaptForeColorWithTheme = true; this.btnCancel.BackColor = System.Drawing.Color.Silver; + this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.None; + this.btnCancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); this.btnCancel.ForeColor = System.Drawing.Color.Black; this.btnCancel.Location = new System.Drawing.Point(3, 2); this.btnCancel.Name = "btnCancel"; @@ -227,7 +236,7 @@ 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); + this.ftpFiles.DoubleClick += new System.EventHandler(this.ftpFiles_DoubleClick); // // fileIcons // diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs index 1a0836b..bc28c3a 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -56,7 +56,23 @@ namespace Histacom2.OS.Win95.Win95Apps } } - private void ftpItems_Click(object sender, EventArgs e) + + private void btnCancel_Click(object sender, EventArgs e) + { + ParentForm.Close(); + } + + private void WinClassicFTPClient_Load(object sender, EventArgs e) + { + + } + + private void topBar_Paint(object sender, PaintEventArgs e) + { + topBar.BackColor = SaveSystem.currentTheme.threeDObjectsColor; + } + + private void ftpFiles_DoubleClick(object sender, EventArgs e) { Point objDrawingPoint = ftpFiles.PointToClient(Cursor.Position); ListViewItem objListViewItem = new ListViewItem(); @@ -117,20 +133,5 @@ namespace Histacom2.OS.Win95.Win95Apps } } } - - private void btnCancel_Click(object sender, EventArgs e) - { - ParentForm.Close(); - } - - private void WinClassicFTPClient_Load(object sender, EventArgs e) - { - - } - - private void topBar_Paint(object sender, PaintEventArgs e) - { - topBar.BackColor = SaveSystem.currentTheme.threeDObjectsColor; - } } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx index 9dd3ac3..e03fcd1 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe - EgAAAk1TRnQBSQFMAgEBAwEAATABAAEwAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBAwEAAUABAAFAAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA -- cgit v1.2.3 From deb3657d65bcb7c1eefa456308955407f65306ea Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 28 Oct 2017 20:57:36 -0400 Subject: Update Hack2.cs --- Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Histacom2/OS/Win95/Win95Apps') diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs index ec9cb07..42112a9 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs @@ -80,7 +80,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story await Task.Delay(2500); Console.WriteLine("Command> Show Start Button"); TitleScreen.frm95.startbutton.Show(); - TitleScreen.frm95.desktopicons.BackgroundImage = SaveSystem.currentTheme.defaultWallpaper; + if (SaveSystem.currentTheme.defaultWallpaper != null) TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height); await Task.Delay(2900); Console.WriteLine("12padams> OKAY, NOW YOU'VE DONE IT!"); await Task.Delay(2500); -- cgit v1.2.3 From 5a87139ba9f8ad29b7c3e8c0d4249e149e1eebd0 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 28 Oct 2017 20:59:26 -0400 Subject: Update Hack2.cs --- Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Histacom2/OS/Win95/Win95Apps') diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs index 42112a9..577b38a 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs @@ -80,7 +80,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story await Task.Delay(2500); Console.WriteLine("Command> Show Start Button"); TitleScreen.frm95.startbutton.Show(); - if (SaveSystem.currentTheme.defaultWallpaper != null) TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height); + if (SaveSystem.currentTheme.defaultWallpaper != null) TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(SaveSystem.currentTheme.defaultWallpaper, TitleScreen.frm95.Width, TitleScreen.frm95.Height); await Task.Delay(2900); Console.WriteLine("12padams> OKAY, NOW YOU'VE DONE IT!"); await Task.Delay(2500); -- cgit v1.2.3