From 57817b7534a620841c9a825884a6f5e7ffc2f219 Mon Sep 17 00:00:00 2001 From: lempamo Date: Tue, 24 Oct 2017 19:21:45 -0400 Subject: some hack4 stuff --- Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Histacom2/OS/Win95') diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs index d87dc4e..96e053d 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs @@ -54,6 +54,11 @@ namespace Histacom2.OS.Win95.Win95Apps { actionPanel.Hide(); cmdPrompt.ReadOnly = true; + if (SaveSystem.CurrentSave.CurrentOS == "xpbad") + { + cmdPrompt.BorderStyle = BorderStyle.None; + cmdPrompt.ScrollBars = RichTextBoxScrollBars.Vertical; + } } else { @@ -68,7 +73,8 @@ namespace Histacom2.OS.Win95.Win95Apps public void WriteLine(string Text) { cmdPrompt.AppendText(Text + "\n"); - this.Update(); + cmdPrompt.Update(); + cmdPrompt.ScrollToCaret(); } /// -- cgit v1.2.3 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.Designer.cs | 94 ++++++++++------------ Histacom2/OS/Win95/Win95.cs | 40 +-------- Histacom2/OS/Win95/Win95.resx | 68 +++++++--------- Histacom2/OS/Win95/Win95Apps/WinClassicIE3.cs | 15 +++- .../Win95Apps/WinClassicTimeDistorter.Designer.cs | 11 ++- 5 files changed, 93 insertions(+), 135 deletions(-) (limited to 'Histacom2/OS/Win95') diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs index 8e17941..f393333 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -35,10 +35,10 @@ namespace Histacom2.OS.Win95 this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.taskbar = new System.Windows.Forms.Panel(); + this.startbutton = new System.Windows.Forms.PictureBox(); this.clockPanel = new System.Windows.Forms.Panel(); this.taskbartime = new System.Windows.Forms.Label(); this.taskbarItems = new System.Windows.Forms.Panel(); - this.startbutton = new System.Windows.Forms.PictureBox(); this.startmenu = new System.Windows.Forms.Panel(); this.startmenuitems = new System.Windows.Forms.MenuStrip(); this.ProgramsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); @@ -83,9 +83,6 @@ namespace Histacom2.OS.Win95 this.TimeDistorterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.FTPClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DocumentsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); - this.downloaderTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.installerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SettingsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.ControlPanelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PrintersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -113,8 +110,8 @@ namespace Histacom2.OS.Win95 this.desktopupdate = new System.Windows.Forms.Timer(this.components); this.panel1.SuspendLayout(); this.taskbar.SuspendLayout(); - this.clockPanel.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit(); + this.clockPanel.SuspendLayout(); this.startmenu.SuspendLayout(); this.startmenuitems.SuspendLayout(); this.ossidestartmenu.SuspendLayout(); @@ -154,6 +151,16 @@ namespace Histacom2.OS.Win95 this.taskbar.TabIndex = 2; this.taskbar.Paint += new System.Windows.Forms.PaintEventHandler(this.taskbar_Paint); // + // startbutton + // + this.startbutton.Image = global::Histacom2.Properties.Resources.WinClassicStart; + this.startbutton.Location = new System.Drawing.Point(2, 4); + this.startbutton.Name = "startbutton"; + this.startbutton.Size = new System.Drawing.Size(54, 22); + this.startbutton.TabIndex = 3; + this.startbutton.TabStop = false; + this.startbutton.Click += new System.EventHandler(this.startbutton_Click); + // // clockPanel // this.clockPanel.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicTime; @@ -185,16 +192,6 @@ namespace Histacom2.OS.Win95 this.taskbarItems.Size = new System.Drawing.Size(3648, 22); this.taskbarItems.TabIndex = 5; // - // startbutton - // - this.startbutton.Image = global::Histacom2.Properties.Resources.WinClassicStart; - this.startbutton.Location = new System.Drawing.Point(2, 4); - this.startbutton.Name = "startbutton"; - this.startbutton.Size = new System.Drawing.Size(54, 22); - this.startbutton.TabIndex = 3; - this.startbutton.TabStop = false; - this.startbutton.Click += new System.EventHandler(this.startbutton_Click); - // // startmenu // this.startmenu.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); @@ -239,6 +236,7 @@ namespace Histacom2.OS.Win95 this.ProgramsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.ProgramsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.ProgramsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.ProgramsToolStripMenuItem.DoBackColorAdapt = false; this.ProgramsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AccessoriesToolStripMenuItem, this.StartUpToolStripMenuItem, @@ -257,9 +255,11 @@ namespace Histacom2.OS.Win95 this.ProgramsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicPrograms; this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.ProgramsToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle; this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem"; this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.ProgramsToolStripMenuItem.SubTitle = "Subtitle"; this.ProgramsToolStripMenuItem.Text = "&Programs"; // // AccessoriesToolStripMenuItem @@ -686,6 +686,7 @@ namespace Histacom2.OS.Win95 this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.StartRunnerToolStripMenuItem.Text = "Start Runner"; this.StartRunnerToolStripMenuItem.Visible = false; + this.StartRunnerToolStripMenuItem.Click += new System.EventHandler(this.StartRunnerToolStripMenuItem_Click); // // ErrorBlasterToolStripMenuItem // @@ -750,48 +751,22 @@ namespace Histacom2.OS.Win95 this.DocumentsToolStripMenuItem.AutoSize = false; this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.DocumentsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; - this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.downloaderTestToolStripMenuItem, - this.installerTestToolStripMenuItem, - this.storyTest1ToolStripMenuItem}); + this.DocumentsToolStripMenuItem.DoBackColorAdapt = false; this.DocumentsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicDocuments; this.DocumentsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.DocumentsToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle; this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem"; this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.DocumentsToolStripMenuItem.SubTitle = "Subtitle"; this.DocumentsToolStripMenuItem.Text = "&Documents"; // - // downloaderTestToolStripMenuItem - // - this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.downloaderTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("downloaderTestToolStripMenuItem.BackgroundImage"))); - this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem"; - this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22); - this.downloaderTestToolStripMenuItem.Text = "DownloaderTest"; - this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click); - // - // installerTestToolStripMenuItem - // - this.installerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.installerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("installerTestToolStripMenuItem.BackgroundImage"))); - this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem"; - this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22); - this.installerTestToolStripMenuItem.Text = "InstallerTest"; - this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); - // - // storyTest1ToolStripMenuItem - // - this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; - this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem"; - this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(159, 22); - this.storyTest1ToolStripMenuItem.Text = "StoryTest1"; - this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click); - // // SettingsToolStripMenuItem // this.SettingsToolStripMenuItem.AutoSize = false; this.SettingsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.SettingsToolStripMenuItem.DoBackColorAdapt = false; this.SettingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ControlPanelToolStripMenuItem, this.PrintersToolStripMenuItem, @@ -799,9 +774,11 @@ namespace Histacom2.OS.Win95 this.SettingsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicSettings; this.SettingsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.SettingsToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle; this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"; this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.SettingsToolStripMenuItem.SubTitle = "Subtitle"; this.SettingsToolStripMenuItem.Text = "&Settings"; // // ControlPanelToolStripMenuItem @@ -811,7 +788,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(146, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -821,7 +798,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(146, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.PrintersToolStripMenuItem.Text = "Printers"; this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click); // @@ -831,7 +808,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(146, 22); + this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem @@ -839,6 +816,7 @@ namespace Histacom2.OS.Win95 this.FindToolStripMenuItem.AutoSize = false; this.FindToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.FindToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FindToolStripMenuItem.BackgroundImage"))); + this.FindToolStripMenuItem.DoBackColorAdapt = false; this.FindToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FilesOrFoldersToolStripMenuItem, this.ComputerToolStripMenuItem, @@ -847,10 +825,12 @@ namespace Histacom2.OS.Win95 this.FindToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFind; this.FindToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.FindToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.FindToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle; this.FindToolStripMenuItem.Name = "FindToolStripMenuItem"; this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; this.FindToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.FindToolStripMenuItem.SubTitle = "Subtitle"; this.FindToolStripMenuItem.Text = "&Find"; // // FilesOrFoldersToolStripMenuItem @@ -861,7 +841,6 @@ namespace Histacom2.OS.Win95 this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem"; this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders..."; - this.FilesOrFoldersToolStripMenuItem.Click += new System.EventHandler(this.FilesOrFoldersToolStripMenuItem_Click); // // ComputerToolStripMenuItem // @@ -894,50 +873,62 @@ namespace Histacom2.OS.Win95 // this.HelpToolStripMenuItem.AutoSize = false; this.HelpToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.HelpToolStripMenuItem.DoBackColorAdapt = false; this.HelpToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicHelp; this.HelpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.HelpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.HelpToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle; this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; this.HelpToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.HelpToolStripMenuItem.SubTitle = "Subtitle"; this.HelpToolStripMenuItem.Text = "&Help"; // // RunToolStripMenuItem // this.RunToolStripMenuItem.AutoSize = false; this.RunToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.RunToolStripMenuItem.DoBackColorAdapt = false; this.RunToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicRun; this.RunToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.RunToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.RunToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle; this.RunToolStripMenuItem.Name = "RunToolStripMenuItem"; this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; this.RunToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.RunToolStripMenuItem.SubTitle = "Subtitle"; this.RunToolStripMenuItem.Text = "&Run..."; // // SuspendToolStripMenuItem // this.SuspendToolStripMenuItem.AutoSize = false; this.SuspendToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.SuspendToolStripMenuItem.DoBackColorAdapt = false; this.SuspendToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicSuspend; this.SuspendToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.SuspendToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.SuspendToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle; this.SuspendToolStripMenuItem.Name = "SuspendToolStripMenuItem"; this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.SuspendToolStripMenuItem.SubTitle = "Subtitle"; this.SuspendToolStripMenuItem.Text = "Suspe&nd"; // // ShutdownToolStripMenuItem // this.ShutdownToolStripMenuItem.AutoSize = false; this.ShutdownToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.ShutdownToolStripMenuItem.DoBackColorAdapt = false; this.ShutdownToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicShutdown; this.ShutdownToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ShutdownToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.ShutdownToolStripMenuItem.LayoutStyle = Histacom2.Engine.UI.ClassicStartMenuItemLayout.DistancedTitle; this.ShutdownToolStripMenuItem.Name = "ShutdownToolStripMenuItem"; this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.ShutdownToolStripMenuItem.SubTitle = "Subtitle"; this.ShutdownToolStripMenuItem.Text = "Sh&ut Down..."; this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click); // @@ -1078,9 +1069,9 @@ namespace Histacom2.OS.Win95 this.Load += new System.EventHandler(this.Desktop_Load); this.panel1.ResumeLayout(false); this.taskbar.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); this.clockPanel.ResumeLayout(false); this.clockPanel.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); this.startmenu.ResumeLayout(false); this.startmenuitems.ResumeLayout(false); this.startmenuitems.PerformLayout(); @@ -1162,10 +1153,7 @@ namespace Histacom2.OS.Win95 internal System.Windows.Forms.ToolStripMenuItem TextDocumentToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PropertiesToolStripMenuItem1; internal System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95)); - private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem; private System.Windows.Forms.Panel taskbarItems; - private System.Windows.Forms.ToolStripMenuItem storyTest1ToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem FTPClientToolStripMenuItem; private System.Windows.Forms.Timer desktopupdate; private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem; 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(); + } } } diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx index 3aabd22..ab9cdf4 100644 --- a/Histacom2/OS/Win95/Win95.resx +++ b/Histacom2/OS/Win95/Win95.resx @@ -121,41 +121,6 @@ 17, 17 - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N @@ -328,35 +293,56 @@ 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw @@ -374,7 +360,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO - hAAAAk1TRnQBSQFMAgEBDQEAASwBAwEsAQMBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + hAAAAk1TRnQBSQFMAgEBDQEAATwBAwE8AQMBIAEAASABAAT/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/ 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 55ac99f22af38a16f0f37153ee57efd00ba19dc8 Mon Sep 17 00:00:00 2001 From: jtsshieh Date: Sat, 28 Oct 2017 20:19:31 -0400 Subject: Little typo --- Histacom2/OS/Win95/Win95.Designer.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'Histacom2/OS/Win95') diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs index f393333..ea667d9 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -311,7 +311,6 @@ namespace Histacom2.OS.Win95 this.InternetConnectionWizardToolStripMenuItem.Name = "InternetConnectionWizardToolStripMenuItem"; this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.InternetConnectionWizardToolStripMenuItem.Text = "Internet Connection Wizard"; - this.InternetConnectionWizardToolStripMenuItem.Click += new System.EventHandler(this.temp_for_std); // // NetMeetingToolStripMenuItem // -- 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') 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') 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 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') 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') 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') 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') 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') 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 From 4083f6792dd1414312afbcf8f7924590e037b339 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 29 Oct 2017 18:12:51 -0400 Subject: installed apps in 95 will persist after reboot --- Histacom2.Engine/SaveSystem.cs | 5 +++++ Histacom2/OS/Win95/Win95.cs | 9 +++++++++ Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 11 +++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) (limited to 'Histacom2/OS/Win95') diff --git a/Histacom2.Engine/SaveSystem.cs b/Histacom2.Engine/SaveSystem.cs index 70609a2..6ae32de 100644 --- a/Histacom2.Engine/SaveSystem.cs +++ b/Histacom2.Engine/SaveSystem.cs @@ -810,7 +810,12 @@ namespace Histacom2.Engine [Order] public Theme customTheme { get; set; } + + [Order] public bool FTime98 { get; set; } + + [Order] + public bool[] installed95 { get; set; } = new bool[7]; // 0: WC98, 1: FTP, 2: SR, 3: EB, 4: SKNDWS, 5: TD0.1, 6: GTN } public class FileSystemFolderInfo diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 84c9421..1299617 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -140,6 +140,15 @@ namespace Histacom2.OS.Win95 new ListViewItem("Set Up The Microsoft Network", 4), new ListViewItem("Outlook Express", 6) }, ref desktopicons, Path.Combine(ProfileWindowsDirectory, "Desktop")); desktopicons.AutoArrange = false; + + // Enable installed programs + + if (CurrentSave.installed95[0]) WebChatToolStripMenuItem.Visible = true; + if (CurrentSave.installed95[1]) FTPClientToolStripMenuItem.Visible = true; + if (CurrentSave.installed95[2]) StartRunnerToolStripMenuItem.Visible = true; + if (CurrentSave.installed95[3]) ErrorBlasterToolStripMenuItem.Visible = true; + if (CurrentSave.installed95[5]) TimeDistorterToolStripMenuItem.Visible = true; + if (CurrentSave.installed95[6]) GuessTheNumberToolStripMenuItem.Visible = true; } private void fontLoad() diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index fa1e0ce..4502cd1 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -292,7 +292,7 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "web chat setup": Win95Installer inst = new Win95Installer("Web Chat 1998"); - inst.InstallCompleted += (sendr, args) => TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; + inst.InstallCompleted += (sendr, args) => { TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; CurrentSave.installed95[0] = true; }; WinClassic appInstaller = wm.Init(inst, "Web Chat Setup", null, true, true); Program.AddTaskbarItem(appInstaller, appInstaller.Tag.ToString(), "Web Chat Setup", null); appInstaller.BringToFront(); @@ -306,6 +306,7 @@ namespace Histacom2.OS.Win95.Win95Apps SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "FTP Client", true, "FTP Client", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "FTP Client"), "ftpclint.exe", "ftp client", 19, 58395); TitleScreen.frm95.FTPClientToolStripMenuItem.Visible = true; + CurrentSave.installed95[1] = true; }; WinClassic appFtp = wm.Init(instFtp, "FTP Client Setup", null, true, true); Program.AddTaskbarItem(appFtp, appFtp.Tag.ToString(), "FTP Client Setup", null); @@ -320,6 +321,7 @@ namespace Histacom2.OS.Win95.Win95Apps SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "Time Distorter 0.1", true, "Time Distorter 0.1", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Time Distorter 0.1"), "tdistort.exe", "time distorter", 17, 23895); TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true; + CurrentSave.installed95[5] = true; }; WinClassic appTd = wm.Init(instTd, "Time Distorter Setup", null, true, true); Program.AddTaskbarItem(appTd, appTd.Tag.ToString(), "Time Distorter Setup", null); @@ -338,6 +340,7 @@ namespace Histacom2.OS.Win95.Win95Apps SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "12padams"), "Guess The Number V1", true, "Guess The Number V1", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Guess The Number V1"), "guessnum.exe", "guess number", 18, 17483); TitleScreen.frm95.GuessTheNumberToolStripMenuItem.Visible = true; + CurrentSave.installed95[6] = true; }; WinClassic appGtn = wm.Init(instGtn, "Guess The Number Setup", null, true, true); Program.AddTaskbarItem(appGtn, appGtn.Tag.ToString(), "Guess The Number Setup", null); @@ -355,7 +358,7 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "eb95 setup": Win95Installer ebInstall = new Win95Installer("Error Blaster 95"); - ebInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; + ebInstall.InstallCompleted += (sender, args) => { TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; CurrentSave.installed95[3] = true; }; WinClassic installer = wm.Init(ebInstall, "Error Blaster 95 Setup", null, true, true); Program.AddTaskbarItem(installer, installer.Tag.ToString(), "Error Blaster 95 Setup", null); installer.BringToFront(); @@ -368,9 +371,9 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "sr95 setup": Win95Installer srInstall = new Win95Installer("Start Runner 95"); - srInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; + srInstall.InstallCompleted += (sender, args) => { TitleScreen.frm95.StartRunnerToolStripMenuItem.Visible = true; CurrentSave.installed95[2] = true; }; WinClassic install = wm.Init(srInstall, "Start Runner 95 Setup", null, true, true); - Program.AddTaskbarItem(install, install.Tag.ToString(), "Error Blaster 95 Setup", null); + Program.AddTaskbarItem(install, install.Tag.ToString(), "Start Runner 95 Setup", null); install.BringToFront(); break; default: -- cgit v1.2.3 From 45b4754d9e1c31b60bf90ad04b8b2c44d0833fde Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 29 Oct 2017 19:56:16 -0400 Subject: terminal now shows 98 in 98 --- Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Histacom2/OS/Win95') diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs index 96e053d..6e2371a 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTerminal.cs @@ -62,7 +62,8 @@ namespace Histacom2.OS.Win95.Win95Apps } else { - cmdPrompt.AppendText("\nMicrosoft Windows 95\n Copyright Microsoft Corp 1981-1995.\n\n"); + if (SaveSystem.CurrentSave.CurrentOS == "95") cmdPrompt.AppendText("\nMicrosoft Windows 95\n Copyright Microsoft Corp 1981-1995.\n\n"); + if (SaveSystem.CurrentSave.CurrentOS == "98") cmdPrompt.AppendText("\nMicrosoft Windows 98\n Copyright Microsoft Corp 1981-1998.\n\n"); cmdPrompt.AppendText(prefix); } } -- cgit v1.2.3 From 572da0f8f37a16754aec6f08031862b73826bb00 Mon Sep 17 00:00:00 2001 From: lempamo Date: Mon, 30 Oct 2017 21:31:56 -0400 Subject: webchat is working now --- Histacom2.Engine/Properties/Resources.resx | 14 +++++++------- Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs | 1 + Histacom2/OS/Win95/Win95Apps/WebChat1998.cs | 12 ++++++------ Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 5 ++++- Histacom2/Properties/Resources.resx | 7 +++++++ Histacom2/Properties/Resources1.Designer.cs | 3 ++- 6 files changed, 27 insertions(+), 15 deletions(-) (limited to 'Histacom2/OS/Win95') diff --git a/Histacom2.Engine/Properties/Resources.resx b/Histacom2.Engine/Properties/Resources.resx index e41840c..e00c4f2 100644 --- a/Histacom2.Engine/Properties/Resources.resx +++ b/Histacom2.Engine/Properties/Resources.resx @@ -119,25 +119,25 @@ - ..\resources\winclassic\window\bottomleft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WinClassic\Window\BottomLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\winclassic\window\bottomright.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WinClassic\Window\BottomRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\winclassic\window\bottomside.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WinClassic\Window\BottomSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\winclassic\window\leftside.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WinClassic\Window\LeftSide.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\winclassic\window\leviwindows.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\WinClassic\Window\LeviWindows.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\winclassic\window\leviwindows.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\WinClassic\Window\LeviWindows.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\winclassic\window\nullicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\WinClassic\Window\nullicon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\resources\winclassic\window\rightside.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs index 41f7c35..2c12029 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack1.cs @@ -40,6 +40,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story { WinClassicTerminal Console = new WinClassicTerminal(true); WinClassic app = wm.Init(Console, "MS-DOS Prompt", null, true, true); + TitleScreen.frm95.AddTaskBarItem(app, app.Tag.ToString(), "MS-DOS Prompt", null); Console.WriteLine("telnet> 104.27.135.159 Connecting..."); await Task.Delay(2500); diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs b/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs index c986b23..5956276 100644 --- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs +++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.cs @@ -70,9 +70,9 @@ namespace Histacom2.OS.Win95.Win95Apps { if (!guessing) { - if (history.ScrollBars != ScrollBars.None) history.AppendText(wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username)); - else history.Text = wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username); - switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) + if (history.ScrollBars != ScrollBars.None) history.AppendText(wcmp.ParseMessage(Properties.Resources.webchat1998_convo, chat_index, TitleScreen.username)); + else history.Text = wcmp.ParseMessage(Properties.Resources.webchat1998_convo, chat_index, TitleScreen.username); + switch (wcmp.GetSpecial(Properties.Resources.webchat1998_convo, chat_index)) { case "addsh": listBox1.Items.Add("SkyHigh"); @@ -208,8 +208,8 @@ namespace Histacom2.OS.Win95.Win95Apps if (msgsound) receive.Play(); break; } - if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index) / 2; - else Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index) / 2; + else Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index); } else { @@ -223,7 +223,7 @@ namespace Histacom2.OS.Win95.Win95Apps } guessing = false; receive.Play(); - Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + Chat.Interval = wcmp.GetMessageDelay(Properties.Resources.webchat1998_convo, chat_index); } chat_index++; } diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index 4502cd1..2542eba 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -292,7 +292,7 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "web chat setup": Win95Installer inst = new Win95Installer("Web Chat 1998"); - inst.InstallCompleted += (sendr, args) => { TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; CurrentSave.installed95[0] = true; }; + inst.InstallCompleted += (sendr, args) => { TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; CurrentSave.installed95[0] = true; SaveGame(); }; WinClassic appInstaller = wm.Init(inst, "Web Chat Setup", null, true, true); Program.AddTaskbarItem(appInstaller, appInstaller.Tag.ToString(), "Web Chat Setup", null); appInstaller.BringToFront(); @@ -307,6 +307,7 @@ namespace Histacom2.OS.Win95.Win95Apps CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "FTP Client"), "ftpclint.exe", "ftp client", 19, 58395); TitleScreen.frm95.FTPClientToolStripMenuItem.Visible = true; CurrentSave.installed95[1] = true; + SaveGame(); }; WinClassic appFtp = wm.Init(instFtp, "FTP Client Setup", null, true, true); Program.AddTaskbarItem(appFtp, appFtp.Tag.ToString(), "FTP Client Setup", null); @@ -322,6 +323,7 @@ namespace Histacom2.OS.Win95.Win95Apps CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Time Distorter 0.1"), "tdistort.exe", "time distorter", 17, 23895); TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true; CurrentSave.installed95[5] = true; + SaveGame(); }; WinClassic appTd = wm.Init(instTd, "Time Distorter Setup", null, true, true); Program.AddTaskbarItem(appTd, appTd.Tag.ToString(), "Time Distorter Setup", null); @@ -341,6 +343,7 @@ namespace Histacom2.OS.Win95.Win95Apps CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "12padams", "Guess The Number V1"), "guessnum.exe", "guess number", 18, 17483); TitleScreen.frm95.GuessTheNumberToolStripMenuItem.Visible = true; CurrentSave.installed95[6] = true; + SaveGame(); }; WinClassic appGtn = wm.Init(instGtn, "Guess The Number Setup", null, true, true); Program.AddTaskbarItem(appGtn, appGtn.Tag.ToString(), "Guess The Number Setup", null); diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx index a3ef0f7..26ca4e4 100644 --- a/Histacom2/Properties/Resources.resx +++ b/Histacom2/Properties/Resources.resx @@ -1755,6 +1755,13 @@ "message": "and let me remind you... MS-DOS IS USELESS! NEXT TIME, DONT PIRATE SOFTWARE!", "special": null, "userchat": true + }, + { + "user": "12padams", + "delay": 5000, + "message": "", + "special": ".cmd-end", + "userchat": false } ] } diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs index 9167764..2df811c 100644 --- a/Histacom2/Properties/Resources1.Designer.cs +++ b/Histacom2/Properties/Resources1.Designer.cs @@ -1148,7 +1148,8 @@ namespace Histacom2.Properties { /// "userchat": true /// }, /// { - /// [rest of string was truncated]";. + /// "user": "SkyHigh", + /// [rest of string was truncated]";. /// public static string webchat1998_convo { get { -- cgit v1.2.3 From 49e30d88787458779ec80a7cbc97d55a09bf67c9 Mon Sep 17 00:00:00 2001 From: lempamo Date: Mon, 30 Oct 2017 22:24:16 -0400 Subject: webchat 99 will now open in the start menu --- Histacom2/OS/Win95/Win95.cs | 2 +- Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs | 2 + Histacom2/OS/Win98/Win98.Designer.cs | 3 +- Histacom2/OS/Win98/Win98.cs | 4 +- Histacom2/OS/Win98/Win98.resx | 72 ++++++++++++++--------------- 5 files changed, 43 insertions(+), 40 deletions(-) (limited to 'Histacom2/OS/Win95') diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 1299617..0e2ac3b 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -114,7 +114,7 @@ namespace Histacom2.OS.Win95 this.BringToFront(); //Check if it is the first time - if (CurrentSave.FTime95 == false) + if (!CurrentSave.FTime95) { CurrentSave.FTime95 = true; SaveGame(); diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs index 577b38a..9dcebfc 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs @@ -10,6 +10,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story { public class Hack2 : object { + public static bool Upgraded = false; static WindowManager wm = new WindowManager(); public static async void StartObjective() @@ -273,6 +274,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story SaveSystem.CurrentSave.CurrentOS = "98"; SaveSystem.currentTheme = new Default98Theme(); SaveSystem.CurrentSave.ThemeName = "default98"; + Upgraded = true; TitleScreen.frm95.distort.ParentForm.Close(); foreach (Form frm in Application.OpenForms) if (frm is WinClassic) frm.Close(); Program.title.StartGame(); diff --git a/Histacom2/OS/Win98/Win98.Designer.cs b/Histacom2/OS/Win98/Win98.Designer.cs index 30b31bb..788505b 100644 --- a/Histacom2/OS/Win98/Win98.Designer.cs +++ b/Histacom2/OS/Win98/Win98.Designer.cs @@ -694,6 +694,7 @@ namespace Histacom2.OS.Win98 this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; + this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // // TimeDistorterToolStripMenuItem // @@ -704,7 +705,7 @@ namespace Histacom2.OS.Win98 this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Visible = false; - this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(TimeDistorterToolStripMenuItem_Click); + this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click); // // DocumentsToolStripMenuItem // diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Win98.cs index e10904e..26e203c 100644 --- a/Histacom2/OS/Win98/Win98.cs +++ b/Histacom2/OS/Win98/Win98.cs @@ -76,7 +76,7 @@ namespace Histacom2.OS.Win98 // When New Game is clicked in TitleScreen.cs private void Desktop_Load(object sender, EventArgs e) { - UpgradeFileSystem( "98"); + if (!CurrentSave.FTime95) UpgradeFileSystem( "98"); if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height); //Start Menu Color - Commented until it works reliably @@ -116,7 +116,7 @@ namespace Histacom2.OS.Win98 this.BringToFront(); //Check if it is the first time - if (CurrentSave.FTime98 == false) + if (!CurrentSave.FTime98) { CurrentSave.FTime98 = true; SaveGame(); diff --git a/Histacom2/OS/Win98/Win98.resx b/Histacom2/OS/Win98/Win98.resx index 2a3433f..e82f924 100644 --- a/Histacom2/OS/Win98/Win98.resx +++ b/Histacom2/OS/Win98/Win98.resx @@ -121,6 +121,41 @@ 17, 17 + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME + Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 + NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j + Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m + M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wgAADsIBFShKgAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK + 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -271,41 +306,6 @@ DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ - 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME - Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN - upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 - NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j - Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I - gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m - M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh - EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK - 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC @@ -382,7 +382,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAaABAQGgAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAagBAQGoAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/ -- cgit v1.2.3