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/Win95.cs | 40 ++-------------------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index e330ea0..ff60c42 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -235,29 +235,6 @@ namespace Histacom2.OS.Win95 app.BringToFront(); startmenu.Hide(); } - private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e) - { - WinClassicDownloader opendownload = new WinClassicDownloader(); - WinClassic app = wm.Init(opendownload, "Downloader", null, false, true, resize: false); - opendownload.appName.Text = "Downloading: Survive The Day"; - - AddTaskBarItem(app, app.Tag.ToString(), "Downloader", null); - - app.BringToFront(); - startmenu.Hide(); - } - - private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) - { - Win95Installer openinstaller = new Win95Installer("Testing"); - WinClassic app = wm.Init(openinstaller, "Installer", null, false, true, resize: false); - - AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); - - app.BringToFront(); - startmenu.Hide(); - } - private void InternetExplorerToolStripMenuItem_Click(object sender, EventArgs e) { if (ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); return; } @@ -432,20 +409,6 @@ namespace Histacom2.OS.Win95 Hack1.StartObjective(); } - private void temp_for_std(object sender, EventArgs e) - { - Win2K.Win2KApps.SurviveTheDay std = new Win2K.Win2KApps.SurviveTheDay(); - WinClassic app = wm.Init(std, "Survive The Day", null, false, false); - AddTaskBarItem(app, app.Tag.ToString(), "Survive The Day", null); - - nonimportantapps.Add(app); - nonimportantapps[nonimportantapps.Count - 1].BringToFront(); - nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing); - - app.BringToFront(); - startmenu.Hide(); - } - private void MSDOSPromptToolStripMenuItem1_Click (object sender, EventArgs e) { WinClassicTerminal msdos = new WinClassicTerminal(false); @@ -673,7 +636,7 @@ namespace Histacom2.OS.Win95 startmenu.Hide(); } - private void FilesOrFoldersToolStripMenuItem_Click(object sender, EventArgs e) + private void StartRunnerToolStripMenuItem_Click(object sender, EventArgs e) { WinClassic app = wm.Init(new StartRunner95(), "Welcome to Start Runner 95!", null, false, false, false, false); AddTaskBarItem(app, app.Tag.ToString(), "Welcome to Start Runner 95!", null); @@ -684,6 +647,7 @@ namespace Histacom2.OS.Win95 app.BringToFront(); startmenu.Hide(); + } } } -- cgit v1.2.3 From a853570320fd443e3f717f9733af5602bc3580ad Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Sat, 28 Oct 2017 20:21:42 -0400 Subject: Cleanup --- Histacom2/OS/Win95/Win95.Designer.cs | 1 - Histacom2/OS/Win95/Win95.cs | 7 ------- 2 files changed, 8 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs index ea667d9..17034c4 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -799,7 +799,6 @@ namespace Histacom2.OS.Win95 this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem"; this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.PrintersToolStripMenuItem.Text = "Printers"; - this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click); // // TaskbarToolStripMenuItem // diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index ff60c42..d244e7d 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -324,13 +324,6 @@ namespace Histacom2.OS.Win95 } } - private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e) - { - WinClassic app = wm.StartInfobox95("AShifter's Infobox", "This is the very first Histacom2 Infobox. It's really easy to call, too! \nJust use wm.startInfobox95(string title, string text, InfoboxType type, InfoboxButtons btns)!", InfoboxType.Info, InfoboxButtons.OK); - - app.BringToFront(); - startmenu.Hide(); - } private void WebChatToolStripMenuItem_Click(object sender, EventArgs e) { webchat = wm.Init(new WebChat1998(), "Web Chat 1998", null, true, true); -- cgit v1.2.3 From 72d675a5fc9979daae4151c0c3bf0230d547b585 Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Sat, 28 Oct 2017 20:27:55 -0400 Subject: Start Menu hides when ever mouse goes up --- Histacom2/OS/Win95/Win95.Designer.cs | 6 +++--- Histacom2/OS/Win95/Win95.cs | 6 ++++++ Histacom2/OS/Win95/Win95.resx | 5 ++++- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs index 17034c4..53295f8 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -787,7 +787,7 @@ namespace Histacom2.OS.Win95 this.ControlPanelToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95ControlPanelIcon; this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem"; - this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -797,7 +797,7 @@ namespace Histacom2.OS.Win95 this.PrintersToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95PrintersFolder; this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem"; - this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.PrintersToolStripMenuItem.Text = "Printers"; // // TaskbarToolStripMenuItem @@ -806,7 +806,7 @@ namespace Histacom2.OS.Win95 this.TaskbarToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TaskbarToolStripMenuItem.BackgroundImage"))); this.TaskbarToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TaskbarToolStripMenuItem.Name = "TaskbarToolStripMenuItem"; - this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index d244e7d..84c9421 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -554,6 +554,7 @@ namespace Histacom2.OS.Win95 private void desktopicons_MouseUp(object sender, MouseEventArgs e) { heldDownItem = null; + startmenu.Hide(); } private void GuessTheNumberToolStripMenuItem_Click(object sender, EventArgs e) @@ -642,6 +643,11 @@ namespace Histacom2.OS.Win95 startmenu.Hide(); } + + private void desktopicons_Click(object sender, EventArgs e) + { + startmenu.Hide(); + } } } diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx index ab9cdf4..a40158b 100644 --- a/Histacom2/OS/Win95/Win95.resx +++ b/Histacom2/OS/Win95/Win95.resx @@ -120,6 +120,9 @@ 17, 17 + + 17, 17 + @@ -360,7 +363,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO - hAAAAk1TRnQBSQFMAgEBDQEAATwBAwE8AQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + hAAAAk1TRnQBSQFMAgEBDQEAAUQBAwFEAQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA AwABgAMAAQEBAAEgBwABASQAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/ AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH//wChAAOAAf8DwAH/ A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/ -- cgit v1.2.3