From 59505ed4dd131afbd18c0b3e660c8c72815ba5a2 Mon Sep 17 00:00:00 2001 From: AShifter Date: Tue, 29 Aug 2017 20:33:11 -0600 Subject: Add WinXP and MultiOS WM WM is currently working, though is in the middle of modification to work with multiple operating systems. Windows XP window template as well as resources have also been added, though window moving code has not been added yet. --- Histacom2/OS/Win95/Win95.cs | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 8d2e466..25bc348 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -117,7 +117,7 @@ namespace Histacom2.OS.Win95 { CurrentSave.FTime95 = true; SaveGame(); - welcome = wm.StartWin95(new WinClassicWelcome(), "Welcome", null, false, false, resize: false); + welcome = wm.Init(new WinClassicWelcome(), "Welcome", null, false, false, resize: false); AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null); nonimportantapps.Add(welcome); @@ -224,7 +224,7 @@ namespace Histacom2.OS.Win95 private void NotePadToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicNotepad wp = new WinClassicNotepad(); - WinClassic app = wm.StartWin95(wp, "Notepad", Properties.Resources.Win95IconNotepad, true, true); + WinClassic app = wm.Init(wp, "Notepad", Properties.Resources.Win95IconNotepad, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad); nonimportantapps.Add(app); @@ -237,7 +237,7 @@ namespace Histacom2.OS.Win95 private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicDownloader opendownload = new WinClassicDownloader(); - WinClassic app = wm.StartWin95(opendownload, "Downloader", null, false, true, resize: false); + 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); @@ -249,7 +249,7 @@ namespace Histacom2.OS.Win95 private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) { Win95Installer openinstaller = new Win95Installer("Testing"); - WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true, resize: false); + WinClassic app = wm.Init(openinstaller, "Installer", null, false, true, resize: false); AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); @@ -260,7 +260,7 @@ namespace Histacom2.OS.Win95 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; } - ie = wm.StartWin95(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); + ie = wm.Init(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); AddTaskBarItem(ie, ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4); ie.BringToFront(); ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing); @@ -280,7 +280,7 @@ namespace Histacom2.OS.Win95 if (objListViewItem.Text == "Internet Explorer") { if (ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); return; } - ie = wm.StartWin95(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); + ie = wm.Init(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); AddTaskBarItem(ie, ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4); ie.BringToFront(); ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing); @@ -288,7 +288,7 @@ namespace Histacom2.OS.Win95 } else if (objListViewItem.Text == "My Computer") // TODO: Implement slightly limited explorer (with no treeview and a new window each time ya go into a dir) { - WinClassic app = wm.StartWin95(new Win95WindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true); + WinClassic app = wm.Init(new Win95WindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer); app.BringToFront(); startmenu.Hide(); @@ -324,7 +324,7 @@ namespace Histacom2.OS.Win95 { we.CurrentDirectory = objListViewItem.Tag.ToString(); - WinClassic app = wm.StartWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true); + WinClassic app = wm.Init(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer); app.BringToFront(); startmenu.Hide(); @@ -350,7 +350,7 @@ namespace Histacom2.OS.Win95 } private void WebChatToolStripMenuItem_Click(object sender, EventArgs e) { - webchat = wm.StartWin95(new WebChat1998(), "Web Chat 1998", null, true, true); + webchat = wm.Init(new WebChat1998(), "Web Chat 1998", null, true, true); AddTaskBarItem(webchat, webchat.Tag.ToString(), "Web Chat 1998", null); @@ -369,7 +369,7 @@ namespace Histacom2.OS.Win95 private void WordPadToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicWordPad wp = new WinClassicWordPad(); - WinClassic app = wm.StartWin95(wp, "Wordpad", Properties.Resources.Win95WordpadIcon2, true, true); + WinClassic app = wm.Init(wp, "Wordpad", Properties.Resources.Win95WordpadIcon2, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Wordpad", Properties.Resources.Win95WordpadIcon2); nonimportantapps.Add(app); @@ -410,7 +410,7 @@ namespace Histacom2.OS.Win95 FileDialogBoxManager.IsInOpenDialog = false; FileDialogBoxManager.IsInSaveDialog = false; Win95WindowsExplorer we = new Win95WindowsExplorer(); - WinClassic app = wm.StartWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true); + WinClassic app = wm.Init(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer); nonimportantapps.Add(app); @@ -429,7 +429,7 @@ namespace Histacom2.OS.Win95 private void temp_for_std(object sender, EventArgs e) { Win2K.Win2KApps.SurviveTheDay std = new Win2K.Win2KApps.SurviveTheDay(); - WinClassic app = wm.StartWin95(std, "Survive The Day", null, false, false); + WinClassic app = wm.Init(std, "Survive The Day", null, false, false); AddTaskBarItem(app, app.Tag.ToString(), "Survive The Day", null); nonimportantapps.Add(app); @@ -443,7 +443,7 @@ namespace Histacom2.OS.Win95 private void MSDOSPromptToolStripMenuItem1_Click (object sender, EventArgs e) { WinClassicTerminal msdos = new WinClassicTerminal(false); - WinClassic app = wm.StartWin95(msdos, "MS-DOS Prompt", Properties.Resources.MSDOSPromptToolStripMenuItem1_Image, true, true, false); + WinClassic app = wm.Init(msdos, "MS-DOS Prompt", Properties.Resources.MSDOSPromptToolStripMenuItem1_Image, true, true, false); AddTaskBarItem(app, app.Tag.ToString(), "MS-DOS Prompt", Properties.Resources.MSDOSPromptToolStripMenuItem1_Image); app.BringToFront(); @@ -453,7 +453,7 @@ namespace Histacom2.OS.Win95 private void PropertiesToolStripMenuItem1_Click(object sender, EventArgs e) { WinClassicThemePanel theme = new WinClassicThemePanel(); - WinClassic app = wm.StartWin95(theme, "Themes", null, false, true, false, resize: false); + WinClassic app = wm.Init(theme, "Themes", null, false, true, false, resize: false); AddTaskBarItem(app, app.Tag.ToString(), "Themes", null); app.BringToFront(); @@ -463,14 +463,14 @@ namespace Histacom2.OS.Win95 private void TimeDistorterToolStripMenuItem_Click(object sender, EventArgs e) { distort = new WinClassicTimeDistorter("1998", "1999", 150, Hack2.StartObjective); - WinClassic app = wm.StartWin95(distort, "Time Distorter", null, false, true); + WinClassic app = wm.Init(distort, "Time Distorter", null, false, true); AddTaskBarItem(app, app.Tag.ToString(), "Time Distorter", null); app.BringToFront(); startmenu.Hide(); } private void FTPClientToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassic app = wm.StartWin95(new WinClassicFTPClient(), "FTP Client", null, true, true); + WinClassic app = wm.Init(new WinClassicFTPClient(), "FTP Client", null, true, true); AddTaskBarItem(app, app.Tag.ToString(), "FTP Client", null); app.BringToFront(); @@ -479,7 +479,7 @@ namespace Histacom2.OS.Win95 private void CalculatorToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassic app = wm.StartWin95(new WinClassicCalculator(), "Calculator", Properties.Resources.WinClassicCalc, false, false, resize: false); + WinClassic app = wm.Init(new WinClassicCalculator(), "Calculator", Properties.Resources.WinClassicCalc, false, false, resize: false); AddTaskBarItem(app, app.Tag.ToString(), "Calculator", Properties.Resources.WinClassicCalc); nonimportantapps.Add(app); @@ -569,7 +569,7 @@ namespace Histacom2.OS.Win95 private void MinsweeperToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassic app = wm.StartWin95(new WinClassicMinesweeper(), "Minesweeper", Properties.Resources.WinClassicMinesweeper, false, false, false, false); + WinClassic app = wm.Init(new WinClassicMinesweeper(), "Minesweeper", Properties.Resources.WinClassicMinesweeper, false, false, false, false); AddTaskBarItem(app, app.Tag.ToString(), "Minesweeper", Properties.Resources.WinClassicMinesweeper); nonimportantapps.Add(app); @@ -596,7 +596,7 @@ namespace Histacom2.OS.Win95 private void GuessTheNumberToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassic app = wm.StartWin95(new GuessTheNumber(), "Guess The Number", Properties.Resources.WinClassicGTNIcon, false, false, false, false); + WinClassic app = wm.Init(new GuessTheNumber(), "Guess The Number", Properties.Resources.WinClassicGTNIcon, false, false, false, false); AddTaskBarItem(app, app.Tag.ToString(), "Guess The Number", Properties.Resources.WinClassicGTNIcon); nonimportantapps.Add(app); -- cgit v1.2.3 From d2c331962d3d102022f41b8c7d449e85767b2d35 Mon Sep 17 00:00:00 2001 From: lempamo Date: Tue, 5 Sep 2017 22:19:07 -0400 Subject: taskbar now affected by theme change --- Histacom2/OS/Win95/Win95.Designer.cs | 134 +++++++++++---------- Histacom2/OS/Win95/Win95.cs | 25 ++++ Histacom2/OS/Win95/Win95.resx | 37 +++--- .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 58 ++------- .../WinClassic/WinClassicDisplayExample.png | Bin 1353 -> 1838 bytes 5 files changed, 122 insertions(+), 132 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 40f40ca..f08b474 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -152,6 +152,7 @@ namespace Histacom2.OS.Win95 this.taskbar.Name = "taskbar"; this.taskbar.Size = new System.Drawing.Size(640, 28); this.taskbar.TabIndex = 2; + this.taskbar.Paint += new System.Windows.Forms.PaintEventHandler(this.taskbar_Paint); // // clockPanel // @@ -162,6 +163,7 @@ namespace Histacom2.OS.Win95 this.clockPanel.Name = "clockPanel"; this.clockPanel.Size = new System.Drawing.Size(65, 28); this.clockPanel.TabIndex = 4; + this.clockPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.clockPanel_Paint); // // taskbartime // @@ -223,7 +225,7 @@ namespace Histacom2.OS.Win95 this.startmenuitems.Name = "startmenuitems"; this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(145, 311); + this.startmenuitems.Size = new System.Drawing.Size(148, 292); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -252,7 +254,7 @@ namespace Histacom2.OS.Win95 this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem"; this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); + this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.ProgramsToolStripMenuItem.Text = "Programs"; // // AccessoriesToolStripMenuItem @@ -277,7 +279,7 @@ namespace Histacom2.OS.Win95 this.AccessoriesToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem"; - this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.AccessoriesToolStripMenuItem.Text = "Accessories"; // // CommunicationsToolStripMenuItem @@ -291,7 +293,7 @@ namespace Histacom2.OS.Win95 this.CommunicationsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.CommunicationsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem"; - this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.CommunicationsToolStripMenuItem.Text = "Communications"; // // InternetConnectionWizardToolStripMenuItem @@ -302,7 +304,7 @@ namespace Histacom2.OS.Win95 this.InternetConnectionWizardToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("InternetConnectionWizardToolStripMenuItem.Image"))); this.InternetConnectionWizardToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetConnectionWizardToolStripMenuItem.Name = "InternetConnectionWizardToolStripMenuItem"; - this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.InternetConnectionWizardToolStripMenuItem.Text = "Internet Connection Wizard"; this.InternetConnectionWizardToolStripMenuItem.Click += new System.EventHandler(this.temp_for_std); // @@ -314,7 +316,7 @@ namespace Histacom2.OS.Win95 this.NetMeetingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NetMeetingToolStripMenuItem.Image"))); this.NetMeetingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem"; - this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // @@ -331,7 +333,7 @@ namespace Histacom2.OS.Win95 this.MultimediaToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.MultimediaToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem"; - this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.MultimediaToolStripMenuItem.Text = "Multimedia"; // // CDPlayerToolStripMenuItem @@ -342,7 +344,7 @@ namespace Histacom2.OS.Win95 this.CDPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CDPlayerToolStripMenuItem.Image"))); this.CDPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CDPlayerToolStripMenuItem.Name = "CDPlayerToolStripMenuItem"; - this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.CDPlayerToolStripMenuItem.Text = "CD Player"; // // SoundRecorderToolStripMenuItem @@ -353,7 +355,7 @@ namespace Histacom2.OS.Win95 this.SoundRecorderToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("SoundRecorderToolStripMenuItem.Image"))); this.SoundRecorderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SoundRecorderToolStripMenuItem.Name = "SoundRecorderToolStripMenuItem"; - this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.SoundRecorderToolStripMenuItem.Text = "Sound Recorder"; // // VolumeControlToolStripMenuItem @@ -364,7 +366,7 @@ namespace Histacom2.OS.Win95 this.VolumeControlToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("VolumeControlToolStripMenuItem.Image"))); this.VolumeControlToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.VolumeControlToolStripMenuItem.Name = "VolumeControlToolStripMenuItem"; - this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.VolumeControlToolStripMenuItem.Text = "Volume Control"; // // WindowsMediaPlayerToolStripMenuItem @@ -375,7 +377,7 @@ namespace Histacom2.OS.Win95 this.WindowsMediaPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WindowsMediaPlayerToolStripMenuItem.Image"))); this.WindowsMediaPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsMediaPlayerToolStripMenuItem.Name = "WindowsMediaPlayerToolStripMenuItem"; - this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.WindowsMediaPlayerToolStripMenuItem.Text = "Windows Media Player"; // // toolStripMenuItem1 @@ -389,7 +391,7 @@ namespace Histacom2.OS.Win95 this.toolStripMenuItem1.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.toolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(181, 28); + this.toolStripMenuItem1.Size = new System.Drawing.Size(188, 28); this.toolStripMenuItem1.Text = "System Tools"; // // toolStripMenuItem2 @@ -400,7 +402,7 @@ namespace Histacom2.OS.Win95 this.toolStripMenuItem2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem2.Image"))); this.toolStripMenuItem2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(172, 22); + this.toolStripMenuItem2.Size = new System.Drawing.Size(181, 22); this.toolStripMenuItem2.Text = "Disk Defragmenter"; // // toolStripMenuItem3 @@ -411,7 +413,7 @@ namespace Histacom2.OS.Win95 this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image"))); this.toolStripMenuItem3.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(172, 22); + this.toolStripMenuItem3.Size = new System.Drawing.Size(181, 22); this.toolStripMenuItem3.Text = "ScanDisk"; // // GamesToolStripMenuItem @@ -424,7 +426,7 @@ namespace Histacom2.OS.Win95 this.GamesToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.GamesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.GamesToolStripMenuItem.Name = "GamesToolStripMenuItem"; - this.GamesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.GamesToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.GamesToolStripMenuItem.Text = "Games"; // // MinsweeperToolStripMenuItem @@ -434,7 +436,7 @@ namespace Histacom2.OS.Win95 this.MinsweeperToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.MinsweeperToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicMinesweeper; this.MinsweeperToolStripMenuItem.Name = "MinsweeperToolStripMenuItem"; - this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(150, 22); this.MinsweeperToolStripMenuItem.Text = "Minesweeper"; this.MinsweeperToolStripMenuItem.Click += new System.EventHandler(this.MinsweeperToolStripMenuItem_Click); // @@ -446,7 +448,7 @@ namespace Histacom2.OS.Win95 this.CalculatorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.Image"))); this.CalculatorToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CalculatorToolStripMenuItem.Name = "CalculatorToolStripMenuItem"; - this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.CalculatorToolStripMenuItem.Text = "Calculator"; this.CalculatorToolStripMenuItem.Click += new System.EventHandler(this.CalculatorToolStripMenuItem_Click); // @@ -458,7 +460,7 @@ namespace Histacom2.OS.Win95 this.HyperTerminalToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall; this.HyperTerminalToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.HyperTerminalToolStripMenuItem.Name = "HyperTerminalToolStripMenuItem"; - this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal"; // // ImagingToolStripMenuItem @@ -469,7 +471,7 @@ namespace Histacom2.OS.Win95 this.ImagingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ImagingToolStripMenuItem.Image"))); this.ImagingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ImagingToolStripMenuItem.Name = "ImagingToolStripMenuItem"; - this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.ImagingToolStripMenuItem.Text = "Imaging"; // // NotePadToolStripMenuItem @@ -480,7 +482,7 @@ namespace Histacom2.OS.Win95 this.NotePadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.Image"))); this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem"; - this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.NotePadToolStripMenuItem.Text = "Notepad"; this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click); // @@ -492,7 +494,7 @@ namespace Histacom2.OS.Win95 this.OnlineRegistrationToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("OnlineRegistrationToolStripMenuItem.Image"))); this.OnlineRegistrationToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnlineRegistrationToolStripMenuItem.Name = "OnlineRegistrationToolStripMenuItem"; - this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration"; // // PaintToolStripMenuItem @@ -503,7 +505,7 @@ namespace Histacom2.OS.Win95 this.PaintToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.Image"))); this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem"; - this.PaintToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.PaintToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.PaintToolStripMenuItem.Text = "Paintbrush"; // // PhoneDialerToolStripMenuItem @@ -514,7 +516,7 @@ namespace Histacom2.OS.Win95 this.PhoneDialerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PhoneDialerToolStripMenuItem.Image"))); this.PhoneDialerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PhoneDialerToolStripMenuItem.Name = "PhoneDialerToolStripMenuItem"; - this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer"; // // WordPadToolStripMenuItem @@ -525,7 +527,7 @@ namespace Histacom2.OS.Win95 this.WordPadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.Image"))); this.WordPadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WordPadToolStripMenuItem.Name = "WordPadToolStripMenuItem"; - this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); this.WordPadToolStripMenuItem.Text = "WordPad"; this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click); // @@ -543,7 +545,7 @@ namespace Histacom2.OS.Win95 this.StartUpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.StartUpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem"; - this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.StartUpToolStripMenuItem.Text = "Online Services"; // // AOLInternetFREETrialToolStripMenuItem @@ -553,7 +555,7 @@ namespace Histacom2.OS.Win95 this.AOLInternetFREETrialToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.AOLInternetFREETrialToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AOLInternetFREETrialToolStripMenuItem.Name = "AOLInternetFREETrialToolStripMenuItem"; - this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.AOLInternetFREETrialToolStripMenuItem.Text = "AOL & Internet FREE Trial!"; // // ATTWorldNetSignupToolStripMenuItem @@ -563,7 +565,7 @@ namespace Histacom2.OS.Win95 this.ATTWorldNetSignupToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ATTWorldNetSignupToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ATTWorldNetSignupToolStripMenuItem.Name = "ATTWorldNetSignupToolStripMenuItem"; - this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.ATTWorldNetSignupToolStripMenuItem.Text = "AT&T WorldNet Signup"; // // SetupCompuServe30ToolStripMenuItem @@ -573,7 +575,7 @@ namespace Histacom2.OS.Win95 this.SetupCompuServe30ToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupCompuServe30ToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SetupCompuServe30ToolStripMenuItem.Name = "SetupCompuServe30ToolStripMenuItem"; - this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.SetupCompuServe30ToolStripMenuItem.Text = "Setup CompuServe 3.0"; // // SetupWOWFromCompuServeToolStripMenuItem @@ -582,7 +584,7 @@ namespace Histacom2.OS.Win95 this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupWOWFromCompuServeToolStripMenuItem.Name = "SetupWOWFromCompuServeToolStripMenuItem"; - this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(248, 22); this.SetupWOWFromCompuServeToolStripMenuItem.Text = "Setup WOW! from CompuServe"; // // MSDOSPromptToolStripMenuItem @@ -596,7 +598,7 @@ namespace Histacom2.OS.Win95 this.MSDOSPromptToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem"; - this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.MSDOSPromptToolStripMenuItem.Text = "StartUp"; // // EmptyToolStripMenuItem @@ -605,7 +607,7 @@ namespace Histacom2.OS.Win95 this.EmptyToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.EmptyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.EmptyToolStripMenuItem.Name = "EmptyToolStripMenuItem"; - this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(116, 22); + this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(118, 22); this.EmptyToolStripMenuItem.Text = "(Empty)"; // // InternetExplorerToolStripMenuItem @@ -617,7 +619,7 @@ namespace Histacom2.OS.Win95 this.InternetExplorerToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.InternetExplorerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetExplorerToolStripMenuItem.Name = "InternetExplorerToolStripMenuItem"; - this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer"; this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click); // @@ -630,7 +632,7 @@ namespace Histacom2.OS.Win95 this.MSDOSPromptToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1"; - this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); + this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt"; this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click); // @@ -643,7 +645,7 @@ namespace Histacom2.OS.Win95 this.OutlookExpressToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.OutlookExpressToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OutlookExpressToolStripMenuItem.Name = "OutlookExpressToolStripMenuItem"; - this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.OutlookExpressToolStripMenuItem.Text = "Outlook Express"; // // WindowsExplorerToolStripMenuItem1 @@ -655,7 +657,7 @@ namespace Histacom2.OS.Win95 this.WindowsExplorerToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.WindowsExplorerToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsExplorerToolStripMenuItem1.Name = "WindowsExplorerToolStripMenuItem1"; - this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); + this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer"; this.WindowsExplorerToolStripMenuItem1.Click += new System.EventHandler(this.WindowsExplorerToolStripMenuItem1_Click); // @@ -666,7 +668,7 @@ namespace Histacom2.OS.Win95 this.GuessTheNumberToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.GuessTheNumberToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicGTNIcon; this.GuessTheNumberToolStripMenuItem.Name = "GuessTheNumberToolStripMenuItem"; - this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number"; this.GuessTheNumberToolStripMenuItem.Visible = false; this.GuessTheNumberToolStripMenuItem.Click += new System.EventHandler(this.GuessTheNumberToolStripMenuItem_Click); @@ -677,7 +679,7 @@ namespace Histacom2.OS.Win95 this.StartRunnerToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.StartRunnerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.StartRunnerToolStripMenuItem.Name = "StartRunnerToolStripMenuItem"; - this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.StartRunnerToolStripMenuItem.Text = "Start Runner"; this.StartRunnerToolStripMenuItem.Visible = false; // @@ -687,7 +689,7 @@ namespace Histacom2.OS.Win95 this.ErrorBlasterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem"; - this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster"; this.ErrorBlasterToolStripMenuItem.Visible = false; // @@ -697,7 +699,7 @@ namespace Histacom2.OS.Win95 this.SkindowsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.SkindowsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SkindowsToolStripMenuItem.Name = "SkindowsToolStripMenuItem"; - this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.SkindowsToolStripMenuItem.Text = "Skindows 95"; this.SkindowsToolStripMenuItem.Visible = false; // @@ -708,7 +710,7 @@ namespace Histacom2.OS.Win95 this.WebChatToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.WebChatToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicWebchat; this.WebChatToolStripMenuItem.Name = "WebChatToolStripMenuItem"; - this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); @@ -720,7 +722,7 @@ namespace Histacom2.OS.Win95 this.TimeDistorterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.TimeDistorterToolStripMenuItem.Image = global::Histacom2.Properties.Resources.TimeDistorter1Icon; this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem"; - this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Visible = false; this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click); @@ -732,7 +734,7 @@ namespace Histacom2.OS.Win95 this.FTPClientToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.FTPClientToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFTPIcon; this.FTPClientToolStripMenuItem.Name = "FTPClientToolStripMenuItem"; - this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(186, 28); this.FTPClientToolStripMenuItem.Text = "FTP Client"; this.FTPClientToolStripMenuItem.Visible = false; this.FTPClientToolStripMenuItem.Click += new System.EventHandler(this.FTPClientToolStripMenuItem_Click); @@ -750,7 +752,7 @@ namespace Histacom2.OS.Win95 this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem"; this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); + this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.DocumentsToolStripMenuItem.Text = "Documents"; // // downloaderTestToolStripMenuItem @@ -758,7 +760,7 @@ namespace Histacom2.OS.Win95 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.Size = new System.Drawing.Size(165, 22); this.downloaderTestToolStripMenuItem.Text = "DownloaderTest"; this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click); // @@ -767,7 +769,7 @@ namespace Histacom2.OS.Win95 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.Size = new System.Drawing.Size(165, 22); this.installerTestToolStripMenuItem.Text = "InstallerTest"; this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); // @@ -775,7 +777,7 @@ namespace Histacom2.OS.Win95 // this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem"; - this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(165, 22); this.storyTest1ToolStripMenuItem.Text = "StoryTest1"; this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click); // @@ -791,7 +793,7 @@ namespace Histacom2.OS.Win95 this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"; this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); + this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.SettingsToolStripMenuItem.Text = "Settings"; // // ControlPanelToolStripMenuItem @@ -801,7 +803,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(151, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -811,7 +813,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(151, 22); this.PrintersToolStripMenuItem.Text = "Printers"; this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click); // @@ -821,7 +823,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(151, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem @@ -839,7 +841,7 @@ namespace Histacom2.OS.Win95 this.FindToolStripMenuItem.Name = "FindToolStripMenuItem"; this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.FindToolStripMenuItem.Size = new System.Drawing.Size(138, 36); + this.FindToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.FindToolStripMenuItem.Text = "Find"; // // FilesOrFoldersToolStripMenuItem @@ -848,7 +850,7 @@ namespace Histacom2.OS.Win95 this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage"))); this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem"; - this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders..."; // // ComputerToolStripMenuItem @@ -857,7 +859,7 @@ namespace Histacom2.OS.Win95 this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage"))); this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem"; - this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.ComputerToolStripMenuItem.Text = "Computer..."; // // OnTheInternetToolStripMenuItem @@ -866,7 +868,7 @@ namespace Histacom2.OS.Win95 this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage"))); this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem"; - this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.OnTheInternetToolStripMenuItem.Text = "On the Internet..."; // // PeopleToolStripMenuItem @@ -875,7 +877,7 @@ namespace Histacom2.OS.Win95 this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage"))); this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem"; - this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(169, 22); this.PeopleToolStripMenuItem.Text = "People..."; // // HelpToolStripMenuItem @@ -887,7 +889,7 @@ namespace Histacom2.OS.Win95 this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(138, 36); + this.HelpToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.HelpToolStripMenuItem.Text = "Help"; // // RunToolStripMenuItem @@ -899,7 +901,7 @@ namespace Histacom2.OS.Win95 this.RunToolStripMenuItem.Name = "RunToolStripMenuItem"; this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.RunToolStripMenuItem.Size = new System.Drawing.Size(138, 36); + this.RunToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.RunToolStripMenuItem.Text = "Run..."; // // SuspendToolStripMenuItem @@ -910,7 +912,7 @@ namespace Histacom2.OS.Win95 this.SuspendToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SuspendToolStripMenuItem.Name = "SuspendToolStripMenuItem"; this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(138, 36); + this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.SuspendToolStripMenuItem.Text = "Suspend"; // // ShutdownToolStripMenuItem @@ -921,7 +923,7 @@ namespace Histacom2.OS.Win95 this.ShutdownToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ShutdownToolStripMenuItem.Name = "ShutdownToolStripMenuItem"; this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(138, 36); + this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(141, 36); this.ShutdownToolStripMenuItem.Text = "Shut Down..."; this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click); // @@ -993,7 +995,7 @@ namespace Histacom2.OS.Win95 this.PropertiesToolStripMenuItem1}); this.rightclickbackproperties.Name = "ContextMenuStrip1"; this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.rightclickbackproperties.Size = new System.Drawing.Size(128, 70); + this.rightclickbackproperties.Size = new System.Drawing.Size(135, 70); // // NewToolStripMenuItem1 // @@ -1002,14 +1004,14 @@ namespace Histacom2.OS.Win95 this.FolderToolStripMenuItem, this.TextDocumentToolStripMenuItem}); this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; - this.NewToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); + this.NewToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); this.NewToolStripMenuItem1.Text = "New"; // // FolderToolStripMenuItem // this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; - this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.FolderToolStripMenuItem.Size = new System.Drawing.Size(161, 22); this.FolderToolStripMenuItem.Text = "Folder"; this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); // @@ -1017,7 +1019,7 @@ namespace Histacom2.OS.Win95 // this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; - this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(161, 22); this.TextDocumentToolStripMenuItem.Text = "Text Document"; this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click); // @@ -1025,7 +1027,7 @@ namespace Histacom2.OS.Win95 // this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(134, 22); this.deleteToolStripMenuItem.Text = "Delete"; this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); // @@ -1033,7 +1035,7 @@ namespace Histacom2.OS.Win95 // this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; - this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); + this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); this.PropertiesToolStripMenuItem1.Text = "Properties"; this.PropertiesToolStripMenuItem1.Click += new System.EventHandler(this.PropertiesToolStripMenuItem1_Click); // @@ -1139,7 +1141,6 @@ namespace Histacom2.OS.Win95 internal System.Windows.Forms.PictureBox osimage; internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem SuspendToolStripMenuItem; - private System.Windows.Forms.Panel clockPanel; private System.Windows.Forms.Timer clockTimer; private System.Windows.Forms.ImageList desktopImages; internal System.Windows.Forms.ListView desktopicons; @@ -1159,5 +1160,6 @@ namespace Histacom2.OS.Win95 internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem1; internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3; + public System.Windows.Forms.Panel clockPanel; } } \ No newline at end of file diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 25bc348..8188b7e 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -606,6 +606,31 @@ namespace Histacom2.OS.Win95 app.BringToFront(); startmenu.Hide(); } + + private void taskbar_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(currentTheme.threeDObjectsColor); + + var _lightBack = Paintbrush.GetLightFromColor(currentTheme.threeDObjectsColor); + + gfx.DrawLine(new Pen(_lightBack), 0, 1, taskbar.Width, 1); + } + + private void clockPanel_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(currentTheme.threeDObjectsColor); + + var _lightBack = Paintbrush.GetLightFromColor(currentTheme.threeDObjectsColor); + var _darkBack = Paintbrush.GetDarkFromColor(currentTheme.threeDObjectsColor); + + gfx.DrawLine(new Pen(_lightBack), 0, 1, clockPanel.Width, 1); + gfx.DrawLine(new Pen(_darkBack), 0, 24, 0, 4); + gfx.DrawLine(new Pen(_darkBack), 61, 4, 0, 4); + gfx.DrawLine(new Pen(_lightBack), 62, 4, 62, 25); + gfx.DrawLine(new Pen(_lightBack), 0, 25, 62, 25); + } } public class MyRenderer : ToolStripProfessionalRenderer { diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx index 419e624..f0d544c 100644 --- a/Histacom2/OS/Win95/Win95.resx +++ b/Histacom2/OS/Win95/Win95.resx @@ -120,6 +120,9 @@ 17, 17 + + 17, 17 + @@ -188,7 +191,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR + vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC @@ -223,7 +226,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR + vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA @@ -261,7 +264,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu QmCC @@ -270,7 +273,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + wQAADsEBuJFr7QAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= @@ -279,7 +282,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + wQAADsEBuJFr7QAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu QmCC @@ -288,7 +291,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + wQAADsEBuJFr7QAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC @@ -296,70 +299,70 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= @@ -374,7 +377,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO - hAAAAk1TRnQBSQFMAgEBDQEAAUQBAgFEAQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + hAAAAk1TRnQBSQFMAgEBDQEAAVQBAgFUAQIBIAEAASABAAT/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/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs index d491eef..f22ee89 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -61,57 +61,16 @@ namespace Histacom2.OS.Win95.Win95Apps private void applyButton_Click(object sender, EventArgs e) { - switch ((string)comboBox1.SelectedItem) - { - case "Default": - SaveSystem.CurrentSave.ThemeName = "default95"; - SaveSystem.currentTheme = new Default95Theme(); - TitleScreen.frm95.BackgroundImage = null; - TitleScreen.frm95.desktopicons.BackgroundImage = null; - break; - case "Dangerous Creatures": - SaveSystem.CurrentSave.ThemeName = "dangeranimals"; - SaveSystem.currentTheme = new DangerousCreaturesTheme(); - TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; - TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height); - break; - case "Inside Your Computer": - SaveSystem.CurrentSave.ThemeName = "insidepc"; - SaveSystem.currentTheme = new InsideComputerTheme(); - TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG; - TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height); - break; - } - foreach (Form f in Application.OpenForms) - { - if (f is WinClassic) - { - if (((WinClassic)f).isActive) - { - ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.activeTitleBarColor; - ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.activeTitleTextColor; - } else - { - ((WinClassic)f).programtopbar.BackColor = SaveSystem.currentTheme.inactiveTitleBarColor; - ((WinClassic)f).Title.ForeColor = SaveSystem.currentTheme.inactiveTitleTextColor; - } - f.Invalidate(); - ((WinClassic)f).programContent.Invalidate(); - ((WinClassic)f).top.Invalidate(); - ((WinClassic)f).toprightcorner.Invalidate(); - ((WinClassic)f).right.Invalidate(); - ((WinClassic)f).bottomrightcorner.Invalidate(); - ((WinClassic)f).bottom.Invalidate(); - ((WinClassic)f).bottomleftcorner.Invalidate(); - ((WinClassic)f).left.Invalidate(); - ((WinClassic)f).topleftcorner.Invalidate(); - foreach (Control c in ((WinClassic)f).progContent.Controls) c.Invalidate(); - ((WinClassic)f).progContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; - } - } + ChangeTheme(); } private void okButton_Click(object sender, EventArgs e) + { + ChangeTheme(); + ParentForm.Close(); + } + + private void ChangeTheme() { switch ((string)comboBox1.SelectedItem) { @@ -162,7 +121,8 @@ namespace Histacom2.OS.Win95.Win95Apps ((WinClassic)f).progContent.BackColor = SaveSystem.currentTheme.threeDObjectsColor; } } - ParentForm.Close(); + TitleScreen.frm95.taskbar.Invalidate(); + TitleScreen.frm95.clockPanel.Invalidate(); } } } diff --git a/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png b/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png index 63e21df..81eb443 100644 Binary files a/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png and b/Histacom2/Resources/WinClassic/WinClassicDisplayExample.png differ -- cgit v1.2.3 From 6d26e57fd4519cea330f51e491bfe54cc347719a Mon Sep 17 00:00:00 2001 From: FloppyDiskDrive Date: Tue, 12 Sep 2017 19:53:35 -0500 Subject: Various fixes (Bug fix/UI Cleanup #3) Made the AboutBox95 UI prettier, and fixed a gamebreaking bug (found by CollinGCoder) --- Histacom2.Engine/Template/AboutBox95.Designer.cs | 28 ++++++++++++------------ Histacom2.Engine/Template/AboutBox95.cs | 5 +++++ Histacom2/OS/Win95/Win95.cs | 4 ++++ 3 files changed, 23 insertions(+), 14 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2.Engine/Template/AboutBox95.Designer.cs b/Histacom2.Engine/Template/AboutBox95.Designer.cs index 359ef3f..4b44f9d 100644 --- a/Histacom2.Engine/Template/AboutBox95.Designer.cs +++ b/Histacom2.Engine/Template/AboutBox95.Designer.cs @@ -30,11 +30,11 @@ { this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); this.textBox2 = new System.Windows.Forms.TextBox(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); this.textBox3 = new System.Windows.Forms.Label(); this.textBox4 = new System.Windows.Forms.Label(); + this.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); this.SuspendLayout(); @@ -59,17 +59,6 @@ this.textBox1.TabIndex = 4; this.textBox1.Text = "@SOFTWARENAME\r\nWindows 95\r\nCopyright © 1981-1995 Microsoft Corp."; // - // button1 - // - this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Silver; - this.button1.Location = new System.Drawing.Point(251, 223); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 0; - this.button1.Text = "OK"; - this.button1.UseVisualStyleBackColor = true; - this.button1.Click += new System.EventHandler(this.button1_Click); - // // textBox2 // this.textBox2.BackColor = System.Drawing.Color.Silver; @@ -109,16 +98,27 @@ this.textBox4.TabIndex = 0; this.textBox4.Text = "System Resources: 97% Free"; // + // classicButton1 + // + this.classicButton1.BackColor = System.Drawing.Color.Silver; + this.classicButton1.ForeColor = System.Drawing.Color.Black; + this.classicButton1.Location = new System.Drawing.Point(251, 220); + this.classicButton1.Name = "classicButton1"; + this.classicButton1.Size = new System.Drawing.Size(75, 23); + this.classicButton1.TabIndex = 6; + this.classicButton1.Text = "OK"; + this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click); + // // AboutBox95 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.classicButton1); this.Controls.Add(this.textBox4); this.Controls.Add(this.textBox3); this.Controls.Add(this.pictureBox2); this.Controls.Add(this.textBox2); - this.Controls.Add(this.button1); this.Controls.Add(this.textBox1); this.Controls.Add(this.pictureBox1); this.Name = "AboutBox95"; @@ -135,10 +135,10 @@ internal System.Windows.Forms.PictureBox pictureBox1; internal System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Button button1; internal System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.PictureBox pictureBox2; private System.Windows.Forms.Label textBox3; private System.Windows.Forms.Label textBox4; + private UI.ClassicButton classicButton1; } } diff --git a/Histacom2.Engine/Template/AboutBox95.cs b/Histacom2.Engine/Template/AboutBox95.cs index 1accc56..aca8df5 100644 --- a/Histacom2.Engine/Template/AboutBox95.cs +++ b/Histacom2.Engine/Template/AboutBox95.cs @@ -15,5 +15,10 @@ namespace Histacom2.Engine.Template { this.ParentForm.Close(); } + + private void classicButton1_Click(object sender, EventArgs e) + { + this.ParentForm.Close(); + } } } diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 8188b7e..08ab9df 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -312,6 +312,10 @@ namespace Histacom2.OS.Win95 { //wm.StartInfobox95("Win32 Application", "That is not a valid Win32 Application.", Properties.Resources.Win95Error); } + else if (objListViewItem.Text == "Online Services") + { + wm.StartInfobox95("Caught it!", "If you were to run this, the game would crash!\nLuckily, it won't crash this time!", InfoboxType.Error, InfoboxButtons.OK); + } else { // It is an actual file on the disk -- cgit v1.2.3 From e4bb33426e4e1a3b5c5ef36866ef2947a7d4356d Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 13 Sep 2017 11:13:17 -0400 Subject: start menu stuffs --- Histacom2.Engine/Histacom2.Engine.csproj | 3 + Histacom2.Engine/Theme.cs | 15 + Histacom2.Engine/UI/ClassicStartMenuItem.cs | 57 +++ Histacom2/OS/Win95/Win95.Designer.cs | 469 ++++++++++---------- Histacom2/OS/Win95/Win95.cs | 30 +- Histacom2/OS/Win95/Win95.resx | 488 ++++++++++----------- Histacom2/OS/Win98/Win98.Designer.cs | 132 +++--- Histacom2/OS/Win98/Win98.resx | 2 +- Histacom2/Resources/WinClassic/Win95SideBar.png | Bin 843 -> 724 bytes .../Resources/WinClassic/WinClassicPrograms.png | Bin 425 -> 426 bytes Histacom2/TitleScreen.cs | 6 +- 11 files changed, 653 insertions(+), 549 deletions(-) create mode 100644 Histacom2.Engine/UI/ClassicStartMenuItem.cs (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index 69a1b02..050ad0c 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -97,6 +97,9 @@ Component + + Component + Component diff --git a/Histacom2.Engine/Theme.cs b/Histacom2.Engine/Theme.cs index 8385062..2d4633f 100644 --- a/Histacom2.Engine/Theme.cs +++ b/Histacom2.Engine/Theme.cs @@ -31,6 +31,9 @@ namespace Histacom2.Engine public Color inactiveTitleBarColor { get; set; } public Color inactiveTitleTextColor { get; set; } + public Color selectedBackColor { get; set; } + public Color selectedTextColor { get; set; } + public Image defaultWallpaper { get; set; } public string themeName { get; set; } @@ -61,6 +64,9 @@ namespace Histacom2.Engine inactiveTitleBarColor = Color.Gray; inactiveTitleTextColor = Color.Silver; + selectedBackColor = Color.Navy; + selectedTextColor = Color.White; + defaultWallpaper = null; themeName = "default95"; } @@ -91,6 +97,9 @@ namespace Histacom2.Engine inactiveTitleBarColor = Color.Gray; inactiveTitleTextColor = Color.Silver; + selectedBackColor = Color.Navy; + selectedTextColor = Color.White; + defaultWallpaper = null; themeName = "default98"; } @@ -121,6 +130,9 @@ namespace Histacom2.Engine inactiveTitleBarColor = Color.FromArgb(72, 72, 72); inactiveTitleTextColor = Color.Gray; + selectedBackColor = Color.Teal; + selectedTextColor = Color.White; + defaultWallpaper = Properties.Resources.Win95PlusDangerousCreaturesWallpaper; themeName = "dangeranimals"; } @@ -147,6 +159,9 @@ namespace Histacom2.Engine inactiveTitleBarColor = Color.FromArgb(96, 168, 128); inactiveTitleTextColor = Color.FromArgb(216, 224, 216); + selectedBackColor = Color.FromArgb(248, 255, 160); + selectedTextColor = Color.Black; + defaultWallpaper = Properties.Resources.Win95PlusInsideComputerWallpaper; themeName = "insidepc"; } diff --git a/Histacom2.Engine/UI/ClassicStartMenuItem.cs b/Histacom2.Engine/UI/ClassicStartMenuItem.cs new file mode 100644 index 0000000..49aecd9 --- /dev/null +++ b/Histacom2.Engine/UI/ClassicStartMenuItem.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Histacom2.Engine.UI +{ + public class ClassicStartMenuItem : ToolStripMenuItem + { + public ClassicStartMenuItem() + { + + } + + protected override void OnPaint(PaintEventArgs e) + { + base.OnPaint(e); + if (SaveSystem.currentTheme != null) e.Graphics.Clear(SaveSystem.currentTheme.threeDObjectsColor); + else e.Graphics.Clear(BackColor); + if (Selected) + { + if (SaveSystem.currentTheme != null) e.Graphics.Clear(SaveSystem.currentTheme.selectedBackColor); + else e.Graphics.Clear(Color.Navy); + } + + e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; + + StringFormat sf = new StringFormat(); + sf.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show; + + e.Graphics.DrawImage(Image, 0 + Padding.Left - Padding.Right, 0); + if (!Selected) { + e.Graphics.DrawString(Text, new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular), Brushes.Black, 38, 11, sf); + + if (DropDownItems.Count > 0) + { + e.Graphics.DrawPolygon(Pens.Black, new Point[] { new Point(121, 11), new Point(124, 14), new Point(121, 17) }); + e.Graphics.FillPolygon(Brushes.Black, new Point[] { new Point(121, 11), new Point(124, 14), new Point(121, 17) }); + } + } else + { + if (SaveSystem.currentTheme != null) + { + e.Graphics.DrawString(Text, new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular), new SolidBrush(SaveSystem.currentTheme.selectedTextColor), 38, 11, sf); + if (DropDownItems.Count > 0) + { + e.Graphics.DrawPolygon(new Pen(SaveSystem.currentTheme.selectedTextColor), new Point[] { new Point(121, 11), new Point(124, 14), new Point(121, 17) }); + e.Graphics.FillPolygon(new SolidBrush(SaveSystem.currentTheme.selectedTextColor), new Point[] { new Point(121, 11), new Point(124, 14), new Point(121, 17) }); + } + } + } + } + } +} diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs index f08b474..6e82ab1 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -41,7 +41,19 @@ namespace Histacom2.OS.Win95 this.startbutton = new System.Windows.Forms.PictureBox(); this.startmenu = new System.Windows.Forms.Panel(); this.startmenuitems = new System.Windows.Forms.MenuStrip(); - this.ProgramsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ossidestartmenu = new System.Windows.Forms.Panel(); + this.osimage = new System.Windows.Forms.PictureBox(); + this.clockTimer = new System.Windows.Forms.Timer(this.components); + this.desktopImages = new System.Windows.Forms.ImageList(this.components); + this.desktopicons = new System.Windows.Forms.ListView(); + this.rightclickbackproperties = new System.Windows.Forms.ContextMenuStrip(this.components); + this.NewToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.desktopupdate = new System.Windows.Forms.Timer(this.components); + this.ProgramsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.AccessoriesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CommunicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.InternetConnectionWizardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -82,35 +94,23 @@ namespace Histacom2.OS.Win95 this.WebChatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TimeDistorterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.FTPClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DocumentsToolStripMenuItem = 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 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(); this.TaskbarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FindToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.FilesOrFoldersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ComputerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.OnTheInternetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PeopleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RunToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SuspendToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ossidestartmenu = new System.Windows.Forms.Panel(); - this.osimage = new System.Windows.Forms.PictureBox(); - this.clockTimer = new System.Windows.Forms.Timer(this.components); - this.desktopImages = new System.Windows.Forms.ImageList(this.components); - this.desktopicons = new System.Windows.Forms.ListView(); - this.rightclickbackproperties = new System.Windows.Forms.ContextMenuStrip(this.components); - this.NewToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.desktopupdate = new System.Windows.Forms.Timer(this.components); + this.HelpToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); + this.RunToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); + this.SuspendToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); + this.ShutdownToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.panel1.SuspendLayout(); this.taskbar.SuspendLayout(); this.clockPanel.SuspendLayout(); @@ -201,15 +201,19 @@ namespace Histacom2.OS.Win95 this.startmenu.BackColor = System.Drawing.Color.Silver; this.startmenu.Controls.Add(this.startmenuitems); this.startmenu.Controls.Add(this.ossidestartmenu); - this.startmenu.Location = new System.Drawing.Point(0, 160); + this.startmenu.Location = new System.Drawing.Point(2, 185); this.startmenu.Name = "startmenu"; - this.startmenu.Size = new System.Drawing.Size(174, 300); + this.startmenu.Size = new System.Drawing.Size(168, 271); this.startmenu.TabIndex = 3; + this.startmenu.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenu_Paint); // // startmenuitems // + this.startmenuitems.AutoSize = false; this.startmenuitems.BackColor = System.Drawing.Color.Silver; + this.startmenuitems.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.startmenuitems.Dock = System.Windows.Forms.DockStyle.None; + this.startmenuitems.GripMargin = new System.Windows.Forms.Padding(0); this.startmenuitems.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ProgramsToolStripMenuItem, this.DocumentsToolStripMenuItem, @@ -220,17 +224,136 @@ namespace Histacom2.OS.Win95 this.SuspendToolStripMenuItem, this.ShutdownToolStripMenuItem}); this.startmenuitems.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow; - this.startmenuitems.Location = new System.Drawing.Point(26, 2); - this.startmenuitems.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.startmenuitems.Location = new System.Drawing.Point(26, 5); this.startmenuitems.Name = "startmenuitems"; - this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); - this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(148, 292); + this.startmenuitems.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.startmenuitems.Size = new System.Drawing.Size(137, 262); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; + this.startmenuitems.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenuitems_Paint); + // + // ossidestartmenu + // + this.ossidestartmenu.Controls.Add(this.osimage); + this.ossidestartmenu.Location = new System.Drawing.Point(3, 3); + this.ossidestartmenu.Name = "ossidestartmenu"; + this.ossidestartmenu.Size = new System.Drawing.Size(21, 265); + this.ossidestartmenu.TabIndex = 4; + // + // osimage + // + this.osimage.Dock = System.Windows.Forms.DockStyle.Fill; + this.osimage.Image = global::Histacom2.Properties.Resources.Win95SideBar; + this.osimage.Location = new System.Drawing.Point(0, 0); + this.osimage.Name = "osimage"; + this.osimage.Size = new System.Drawing.Size(21, 265); + this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.osimage.TabIndex = 0; + this.osimage.TabStop = false; + // + // clockTimer + // + this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick); + // + // desktopImages + // + this.desktopImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("desktopImages.ImageStream"))); + this.desktopImages.TransparentColor = System.Drawing.Color.Transparent; + this.desktopImages.Images.SetKeyName(0, "WinClassicComputer.png"); + this.desktopImages.Images.SetKeyName(1, "WinClassicFolder.png"); + this.desktopImages.Images.SetKeyName(2, "WinClassicIE3.png"); + this.desktopImages.Images.SetKeyName(3, "WinClassicInbox.png"); + this.desktopImages.Images.SetKeyName(4, "WinClassicMSN.png"); + this.desktopImages.Images.SetKeyName(5, "WinClassicNetworking.png"); + this.desktopImages.Images.SetKeyName(6, "WinClassicOutlook.png"); + this.desktopImages.Images.SetKeyName(7, "WinClassicRecycle.png"); + this.desktopImages.Images.SetKeyName(8, "Win95File.png"); + this.desktopImages.Images.SetKeyName(9, "WinClassicFolder.png"); + this.desktopImages.Images.SetKeyName(10, "WinClassicApp.png"); + this.desktopImages.Images.SetKeyName(11, "WinClassicSetup.png"); + this.desktopImages.Images.SetKeyName(12, "WinClassicNotepad.png"); + // + // desktopicons + // + this.desktopicons.Alignment = System.Windows.Forms.ListViewAlignment.Left; + this.desktopicons.BackColor = System.Drawing.Color.Teal; + this.desktopicons.BackgroundImageTiled = true; + this.desktopicons.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.desktopicons.Dock = System.Windows.Forms.DockStyle.Fill; + this.desktopicons.ForeColor = System.Drawing.Color.White; + this.desktopicons.LargeImageList = this.desktopImages; + this.desktopicons.Location = new System.Drawing.Point(0, 0); + this.desktopicons.Name = "desktopicons"; + this.desktopicons.Size = new System.Drawing.Size(640, 480); + this.desktopicons.TabIndex = 6; + this.desktopicons.UseCompatibleStateImageBehavior = false; + this.desktopicons.DoubleClick += new System.EventHandler(this.desktopicons_DoubleClick); + this.desktopicons.MouseDown += new System.Windows.Forms.MouseEventHandler(this.desktop_mousedown); + this.desktopicons.MouseMove += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseMove); + this.desktopicons.MouseUp += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseUp); + // + // rightclickbackproperties + // + this.rightclickbackproperties.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.NewToolStripMenuItem1, + this.deleteToolStripMenuItem, + this.PropertiesToolStripMenuItem1}); + this.rightclickbackproperties.Name = "ContextMenuStrip1"; + this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.rightclickbackproperties.Size = new System.Drawing.Size(128, 70); + // + // NewToolStripMenuItem1 + // + this.NewToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; + this.NewToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.FolderToolStripMenuItem, + this.TextDocumentToolStripMenuItem}); + this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; + this.NewToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); + this.NewToolStripMenuItem1.Text = "New"; + // + // FolderToolStripMenuItem + // + this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; + this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.FolderToolStripMenuItem.Text = "Folder"; + this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); + // + // TextDocumentToolStripMenuItem + // + this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; + this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.TextDocumentToolStripMenuItem.Text = "Text Document"; + this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click); + // + // deleteToolStripMenuItem + // + this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.deleteToolStripMenuItem.Text = "Delete"; + this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); + // + // PropertiesToolStripMenuItem1 + // + this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; + this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; + this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); + this.PropertiesToolStripMenuItem1.Text = "Properties"; + this.PropertiesToolStripMenuItem1.Click += new System.EventHandler(this.PropertiesToolStripMenuItem1_Click); + // + // desktopupdate + // + this.desktopupdate.Enabled = true; + this.desktopupdate.Interval = 10000; + this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick); // // ProgramsToolStripMenuItem // + this.ProgramsToolStripMenuItem.AutoSize = false; this.ProgramsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.ProgramsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.ProgramsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; @@ -253,9 +376,9 @@ namespace Histacom2.OS.Win95 this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem"; - this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.ProgramsToolStripMenuItem.Text = "Programs"; + this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); + this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.ProgramsToolStripMenuItem.Text = "&Programs"; // // AccessoriesToolStripMenuItem // @@ -279,7 +402,7 @@ namespace Histacom2.OS.Win95 this.AccessoriesToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem"; - this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.AccessoriesToolStripMenuItem.Text = "Accessories"; // // CommunicationsToolStripMenuItem @@ -293,7 +416,7 @@ namespace Histacom2.OS.Win95 this.CommunicationsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.CommunicationsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem"; - this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.CommunicationsToolStripMenuItem.Text = "Communications"; // // InternetConnectionWizardToolStripMenuItem @@ -304,7 +427,7 @@ namespace Histacom2.OS.Win95 this.InternetConnectionWizardToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("InternetConnectionWizardToolStripMenuItem.Image"))); this.InternetConnectionWizardToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetConnectionWizardToolStripMenuItem.Name = "InternetConnectionWizardToolStripMenuItem"; - this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + 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); // @@ -316,7 +439,7 @@ namespace Histacom2.OS.Win95 this.NetMeetingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NetMeetingToolStripMenuItem.Image"))); this.NetMeetingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem"; - this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // @@ -333,7 +456,7 @@ namespace Histacom2.OS.Win95 this.MultimediaToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.MultimediaToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem"; - this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.MultimediaToolStripMenuItem.Text = "Multimedia"; // // CDPlayerToolStripMenuItem @@ -344,7 +467,7 @@ namespace Histacom2.OS.Win95 this.CDPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CDPlayerToolStripMenuItem.Image"))); this.CDPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CDPlayerToolStripMenuItem.Name = "CDPlayerToolStripMenuItem"; - this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.CDPlayerToolStripMenuItem.Text = "CD Player"; // // SoundRecorderToolStripMenuItem @@ -355,7 +478,7 @@ namespace Histacom2.OS.Win95 this.SoundRecorderToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("SoundRecorderToolStripMenuItem.Image"))); this.SoundRecorderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SoundRecorderToolStripMenuItem.Name = "SoundRecorderToolStripMenuItem"; - this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.SoundRecorderToolStripMenuItem.Text = "Sound Recorder"; // // VolumeControlToolStripMenuItem @@ -366,7 +489,7 @@ namespace Histacom2.OS.Win95 this.VolumeControlToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("VolumeControlToolStripMenuItem.Image"))); this.VolumeControlToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.VolumeControlToolStripMenuItem.Name = "VolumeControlToolStripMenuItem"; - this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.VolumeControlToolStripMenuItem.Text = "Volume Control"; // // WindowsMediaPlayerToolStripMenuItem @@ -377,7 +500,7 @@ namespace Histacom2.OS.Win95 this.WindowsMediaPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WindowsMediaPlayerToolStripMenuItem.Image"))); this.WindowsMediaPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsMediaPlayerToolStripMenuItem.Name = "WindowsMediaPlayerToolStripMenuItem"; - this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.WindowsMediaPlayerToolStripMenuItem.Text = "Windows Media Player"; // // toolStripMenuItem1 @@ -391,7 +514,7 @@ namespace Histacom2.OS.Win95 this.toolStripMenuItem1.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.toolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(188, 28); + this.toolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.toolStripMenuItem1.Text = "System Tools"; // // toolStripMenuItem2 @@ -402,7 +525,7 @@ namespace Histacom2.OS.Win95 this.toolStripMenuItem2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem2.Image"))); this.toolStripMenuItem2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(181, 22); + this.toolStripMenuItem2.Size = new System.Drawing.Size(172, 22); this.toolStripMenuItem2.Text = "Disk Defragmenter"; // // toolStripMenuItem3 @@ -413,7 +536,7 @@ namespace Histacom2.OS.Win95 this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image"))); this.toolStripMenuItem3.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(181, 22); + this.toolStripMenuItem3.Size = new System.Drawing.Size(172, 22); this.toolStripMenuItem3.Text = "ScanDisk"; // // GamesToolStripMenuItem @@ -426,7 +549,7 @@ namespace Histacom2.OS.Win95 this.GamesToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.GamesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.GamesToolStripMenuItem.Name = "GamesToolStripMenuItem"; - this.GamesToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.GamesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.GamesToolStripMenuItem.Text = "Games"; // // MinsweeperToolStripMenuItem @@ -436,7 +559,7 @@ namespace Histacom2.OS.Win95 this.MinsweeperToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.MinsweeperToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicMinesweeper; this.MinsweeperToolStripMenuItem.Name = "MinsweeperToolStripMenuItem"; - this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.MinsweeperToolStripMenuItem.Text = "Minesweeper"; this.MinsweeperToolStripMenuItem.Click += new System.EventHandler(this.MinsweeperToolStripMenuItem_Click); // @@ -448,7 +571,7 @@ namespace Histacom2.OS.Win95 this.CalculatorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.Image"))); this.CalculatorToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CalculatorToolStripMenuItem.Name = "CalculatorToolStripMenuItem"; - this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.CalculatorToolStripMenuItem.Text = "Calculator"; this.CalculatorToolStripMenuItem.Click += new System.EventHandler(this.CalculatorToolStripMenuItem_Click); // @@ -460,7 +583,7 @@ namespace Histacom2.OS.Win95 this.HyperTerminalToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall; this.HyperTerminalToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.HyperTerminalToolStripMenuItem.Name = "HyperTerminalToolStripMenuItem"; - this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal"; // // ImagingToolStripMenuItem @@ -471,7 +594,7 @@ namespace Histacom2.OS.Win95 this.ImagingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ImagingToolStripMenuItem.Image"))); this.ImagingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ImagingToolStripMenuItem.Name = "ImagingToolStripMenuItem"; - this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.ImagingToolStripMenuItem.Text = "Imaging"; // // NotePadToolStripMenuItem @@ -482,7 +605,7 @@ namespace Histacom2.OS.Win95 this.NotePadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.Image"))); this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem"; - this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.NotePadToolStripMenuItem.Text = "Notepad"; this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click); // @@ -494,7 +617,7 @@ namespace Histacom2.OS.Win95 this.OnlineRegistrationToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("OnlineRegistrationToolStripMenuItem.Image"))); this.OnlineRegistrationToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnlineRegistrationToolStripMenuItem.Name = "OnlineRegistrationToolStripMenuItem"; - this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration"; // // PaintToolStripMenuItem @@ -505,7 +628,7 @@ namespace Histacom2.OS.Win95 this.PaintToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.Image"))); this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem"; - this.PaintToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.PaintToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.PaintToolStripMenuItem.Text = "Paintbrush"; // // PhoneDialerToolStripMenuItem @@ -516,7 +639,7 @@ namespace Histacom2.OS.Win95 this.PhoneDialerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PhoneDialerToolStripMenuItem.Image"))); this.PhoneDialerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PhoneDialerToolStripMenuItem.Name = "PhoneDialerToolStripMenuItem"; - this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer"; // // WordPadToolStripMenuItem @@ -527,7 +650,7 @@ namespace Histacom2.OS.Win95 this.WordPadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.Image"))); this.WordPadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WordPadToolStripMenuItem.Name = "WordPadToolStripMenuItem"; - this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WordPadToolStripMenuItem.Text = "WordPad"; this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click); // @@ -545,7 +668,7 @@ namespace Histacom2.OS.Win95 this.StartUpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.StartUpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem"; - this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.StartUpToolStripMenuItem.Text = "Online Services"; // // AOLInternetFREETrialToolStripMenuItem @@ -555,7 +678,7 @@ namespace Histacom2.OS.Win95 this.AOLInternetFREETrialToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.AOLInternetFREETrialToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AOLInternetFREETrialToolStripMenuItem.Name = "AOLInternetFREETrialToolStripMenuItem"; - this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.AOLInternetFREETrialToolStripMenuItem.Text = "AOL & Internet FREE Trial!"; // // ATTWorldNetSignupToolStripMenuItem @@ -565,7 +688,7 @@ namespace Histacom2.OS.Win95 this.ATTWorldNetSignupToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ATTWorldNetSignupToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ATTWorldNetSignupToolStripMenuItem.Name = "ATTWorldNetSignupToolStripMenuItem"; - this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.ATTWorldNetSignupToolStripMenuItem.Text = "AT&T WorldNet Signup"; // // SetupCompuServe30ToolStripMenuItem @@ -575,7 +698,7 @@ namespace Histacom2.OS.Win95 this.SetupCompuServe30ToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupCompuServe30ToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SetupCompuServe30ToolStripMenuItem.Name = "SetupCompuServe30ToolStripMenuItem"; - this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SetupCompuServe30ToolStripMenuItem.Text = "Setup CompuServe 3.0"; // // SetupWOWFromCompuServeToolStripMenuItem @@ -584,7 +707,7 @@ namespace Histacom2.OS.Win95 this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupWOWFromCompuServeToolStripMenuItem.Name = "SetupWOWFromCompuServeToolStripMenuItem"; - this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SetupWOWFromCompuServeToolStripMenuItem.Text = "Setup WOW! from CompuServe"; // // MSDOSPromptToolStripMenuItem @@ -598,7 +721,7 @@ namespace Histacom2.OS.Win95 this.MSDOSPromptToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem"; - this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.MSDOSPromptToolStripMenuItem.Text = "StartUp"; // // EmptyToolStripMenuItem @@ -607,7 +730,7 @@ namespace Histacom2.OS.Win95 this.EmptyToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.EmptyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.EmptyToolStripMenuItem.Name = "EmptyToolStripMenuItem"; - this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(118, 22); + this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(116, 22); this.EmptyToolStripMenuItem.Text = "(Empty)"; // // InternetExplorerToolStripMenuItem @@ -619,7 +742,7 @@ namespace Histacom2.OS.Win95 this.InternetExplorerToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.InternetExplorerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetExplorerToolStripMenuItem.Name = "InternetExplorerToolStripMenuItem"; - this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer"; this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click); // @@ -632,7 +755,7 @@ namespace Histacom2.OS.Win95 this.MSDOSPromptToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1"; - this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); + this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt"; this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click); // @@ -645,7 +768,7 @@ namespace Histacom2.OS.Win95 this.OutlookExpressToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.OutlookExpressToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OutlookExpressToolStripMenuItem.Name = "OutlookExpressToolStripMenuItem"; - this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.OutlookExpressToolStripMenuItem.Text = "Outlook Express"; // // WindowsExplorerToolStripMenuItem1 @@ -657,7 +780,7 @@ namespace Histacom2.OS.Win95 this.WindowsExplorerToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.WindowsExplorerToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsExplorerToolStripMenuItem1.Name = "WindowsExplorerToolStripMenuItem1"; - this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); + this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer"; this.WindowsExplorerToolStripMenuItem1.Click += new System.EventHandler(this.WindowsExplorerToolStripMenuItem1_Click); // @@ -668,7 +791,7 @@ namespace Histacom2.OS.Win95 this.GuessTheNumberToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.GuessTheNumberToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicGTNIcon; this.GuessTheNumberToolStripMenuItem.Name = "GuessTheNumberToolStripMenuItem"; - this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number"; this.GuessTheNumberToolStripMenuItem.Visible = false; this.GuessTheNumberToolStripMenuItem.Click += new System.EventHandler(this.GuessTheNumberToolStripMenuItem_Click); @@ -679,7 +802,7 @@ namespace Histacom2.OS.Win95 this.StartRunnerToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.StartRunnerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.StartRunnerToolStripMenuItem.Name = "StartRunnerToolStripMenuItem"; - this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.StartRunnerToolStripMenuItem.Text = "Start Runner"; this.StartRunnerToolStripMenuItem.Visible = false; // @@ -689,7 +812,7 @@ namespace Histacom2.OS.Win95 this.ErrorBlasterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem"; - this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster"; this.ErrorBlasterToolStripMenuItem.Visible = false; // @@ -699,7 +822,7 @@ namespace Histacom2.OS.Win95 this.SkindowsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.SkindowsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SkindowsToolStripMenuItem.Name = "SkindowsToolStripMenuItem"; - this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.SkindowsToolStripMenuItem.Text = "Skindows 95"; this.SkindowsToolStripMenuItem.Visible = false; // @@ -710,7 +833,7 @@ namespace Histacom2.OS.Win95 this.WebChatToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.WebChatToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicWebchat; this.WebChatToolStripMenuItem.Name = "WebChatToolStripMenuItem"; - this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + 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); @@ -722,7 +845,7 @@ namespace Histacom2.OS.Win95 this.TimeDistorterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.TimeDistorterToolStripMenuItem.Image = global::Histacom2.Properties.Resources.TimeDistorter1Icon; this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem"; - this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Visible = false; this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click); @@ -734,13 +857,14 @@ namespace Histacom2.OS.Win95 this.FTPClientToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.FTPClientToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFTPIcon; this.FTPClientToolStripMenuItem.Name = "FTPClientToolStripMenuItem"; - this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.FTPClientToolStripMenuItem.Text = "FTP Client"; this.FTPClientToolStripMenuItem.Visible = false; this.FTPClientToolStripMenuItem.Click += new System.EventHandler(this.FTPClientToolStripMenuItem_Click); // // DocumentsToolStripMenuItem // + 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[] { @@ -751,16 +875,16 @@ namespace Histacom2.OS.Win95 this.DocumentsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem"; - this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.DocumentsToolStripMenuItem.Text = "Documents"; + this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); + this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + 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(165, 22); + this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.downloaderTestToolStripMenuItem.Text = "DownloaderTest"; this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click); // @@ -769,7 +893,7 @@ namespace Histacom2.OS.Win95 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(165, 22); + this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.installerTestToolStripMenuItem.Text = "InstallerTest"; this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); // @@ -777,12 +901,13 @@ namespace Histacom2.OS.Win95 // this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem"; - this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + 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.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ControlPanelToolStripMenuItem, @@ -792,9 +917,9 @@ namespace Histacom2.OS.Win95 this.SettingsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"; - this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.SettingsToolStripMenuItem.Text = "Settings"; + this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); + this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.SettingsToolStripMenuItem.Text = "&Settings"; // // ControlPanelToolStripMenuItem // @@ -803,7 +928,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(151, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -813,7 +938,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(151, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.PrintersToolStripMenuItem.Text = "Printers"; this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click); // @@ -823,11 +948,12 @@ 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(151, 22); + this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem // + this.FindToolStripMenuItem.AutoSize = false; this.FindToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.FindToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FindToolStripMenuItem.BackgroundImage"))); this.FindToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -839,10 +965,10 @@ namespace Histacom2.OS.Win95 this.FindToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.FindToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FindToolStripMenuItem.Name = "FindToolStripMenuItem"; - this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); + this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.FindToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.FindToolStripMenuItem.Text = "Find"; + this.FindToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.FindToolStripMenuItem.Text = "&Find"; // // FilesOrFoldersToolStripMenuItem // @@ -850,7 +976,7 @@ namespace Histacom2.OS.Win95 this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage"))); this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem"; - this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders..."; // // ComputerToolStripMenuItem @@ -859,7 +985,7 @@ namespace Histacom2.OS.Win95 this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage"))); this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem"; - this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.ComputerToolStripMenuItem.Text = "Computer..."; // // OnTheInternetToolStripMenuItem @@ -868,7 +994,7 @@ namespace Histacom2.OS.Win95 this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage"))); this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem"; - this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.OnTheInternetToolStripMenuItem.Text = "On the Internet..."; // // PeopleToolStripMenuItem @@ -877,174 +1003,60 @@ namespace Histacom2.OS.Win95 this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage"))); this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem"; - this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.PeopleToolStripMenuItem.Text = "People..."; // // HelpToolStripMenuItem // + this.HelpToolStripMenuItem.AutoSize = false; this.HelpToolStripMenuItem.BackColor = System.Drawing.Color.Silver; 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.Name = "HelpToolStripMenuItem"; - this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); + this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.HelpToolStripMenuItem.Text = "Help"; + this.HelpToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.HelpToolStripMenuItem.Text = "&Help"; // // RunToolStripMenuItem // + this.RunToolStripMenuItem.AutoSize = false; this.RunToolStripMenuItem.BackColor = System.Drawing.Color.Silver; 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.Name = "RunToolStripMenuItem"; - this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); + this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.RunToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.RunToolStripMenuItem.Text = "Run..."; + this.RunToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.RunToolStripMenuItem.Text = "&Run..."; // // SuspendToolStripMenuItem // + this.SuspendToolStripMenuItem.AutoSize = false; this.SuspendToolStripMenuItem.BackColor = System.Drawing.Color.Silver; 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.Name = "SuspendToolStripMenuItem"; - this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.SuspendToolStripMenuItem.Text = "Suspend"; + this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); + this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.SuspendToolStripMenuItem.Text = "Suspe&nd"; // // ShutdownToolStripMenuItem // + this.ShutdownToolStripMenuItem.AutoSize = false; this.ShutdownToolStripMenuItem.BackColor = System.Drawing.Color.Silver; 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.Name = "ShutdownToolStripMenuItem"; - this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.ShutdownToolStripMenuItem.Text = "Shut Down..."; + this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); + this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.ShutdownToolStripMenuItem.Text = "Sh&ut Down..."; this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click); // - // ossidestartmenu - // - this.ossidestartmenu.Controls.Add(this.osimage); - this.ossidestartmenu.Location = new System.Drawing.Point(0, 0); - this.ossidestartmenu.Name = "ossidestartmenu"; - this.ossidestartmenu.Size = new System.Drawing.Size(23, 297); - this.ossidestartmenu.TabIndex = 4; - // - // osimage - // - this.osimage.Dock = System.Windows.Forms.DockStyle.Fill; - this.osimage.Image = global::Histacom2.Properties.Resources.Win95SideBar; - this.osimage.Location = new System.Drawing.Point(0, 0); - this.osimage.Name = "osimage"; - this.osimage.Size = new System.Drawing.Size(23, 297); - this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.osimage.TabIndex = 0; - this.osimage.TabStop = false; - // - // clockTimer - // - this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick); - // - // desktopImages - // - this.desktopImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("desktopImages.ImageStream"))); - this.desktopImages.TransparentColor = System.Drawing.Color.Transparent; - this.desktopImages.Images.SetKeyName(0, "WinClassicComputer.png"); - this.desktopImages.Images.SetKeyName(1, "WinClassicFolder.png"); - this.desktopImages.Images.SetKeyName(2, "WinClassicIE3.png"); - this.desktopImages.Images.SetKeyName(3, "WinClassicInbox.png"); - this.desktopImages.Images.SetKeyName(4, "WinClassicMSN.png"); - this.desktopImages.Images.SetKeyName(5, "WinClassicNetworking.png"); - this.desktopImages.Images.SetKeyName(6, "WinClassicOutlook.png"); - this.desktopImages.Images.SetKeyName(7, "WinClassicRecycle.png"); - this.desktopImages.Images.SetKeyName(8, "Win95File.png"); - this.desktopImages.Images.SetKeyName(9, "WinClassicFolder.png"); - this.desktopImages.Images.SetKeyName(10, "WinClassicApp.png"); - this.desktopImages.Images.SetKeyName(11, "WinClassicSetup.png"); - this.desktopImages.Images.SetKeyName(12, "WinClassicNotepad.png"); - // - // desktopicons - // - this.desktopicons.Alignment = System.Windows.Forms.ListViewAlignment.Left; - this.desktopicons.BackColor = System.Drawing.Color.Teal; - this.desktopicons.BackgroundImageTiled = true; - this.desktopicons.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.desktopicons.Dock = System.Windows.Forms.DockStyle.Fill; - this.desktopicons.ForeColor = System.Drawing.Color.White; - this.desktopicons.LargeImageList = this.desktopImages; - this.desktopicons.Location = new System.Drawing.Point(0, 0); - this.desktopicons.Name = "desktopicons"; - this.desktopicons.Size = new System.Drawing.Size(640, 480); - this.desktopicons.TabIndex = 6; - this.desktopicons.UseCompatibleStateImageBehavior = false; - this.desktopicons.DoubleClick += new System.EventHandler(this.desktopicons_DoubleClick); - this.desktopicons.MouseDown += new System.Windows.Forms.MouseEventHandler(this.desktop_mousedown); - this.desktopicons.MouseMove += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseMove); - this.desktopicons.MouseUp += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseUp); - // - // rightclickbackproperties - // - this.rightclickbackproperties.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.NewToolStripMenuItem1, - this.deleteToolStripMenuItem, - this.PropertiesToolStripMenuItem1}); - this.rightclickbackproperties.Name = "ContextMenuStrip1"; - this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.rightclickbackproperties.Size = new System.Drawing.Size(135, 70); - // - // NewToolStripMenuItem1 - // - this.NewToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.NewToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FolderToolStripMenuItem, - this.TextDocumentToolStripMenuItem}); - this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; - this.NewToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); - this.NewToolStripMenuItem1.Text = "New"; - // - // FolderToolStripMenuItem - // - this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; - this.FolderToolStripMenuItem.Size = new System.Drawing.Size(161, 22); - this.FolderToolStripMenuItem.Text = "Folder"; - this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); - // - // TextDocumentToolStripMenuItem - // - this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; - this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(161, 22); - this.TextDocumentToolStripMenuItem.Text = "Text Document"; - this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click); - // - // deleteToolStripMenuItem - // - this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(134, 22); - this.deleteToolStripMenuItem.Text = "Delete"; - this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); - // - // PropertiesToolStripMenuItem1 - // - this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; - this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); - this.PropertiesToolStripMenuItem1.Text = "Properties"; - this.PropertiesToolStripMenuItem1.Click += new System.EventHandler(this.PropertiesToolStripMenuItem1_Click); - // - // desktopupdate - // - this.desktopupdate.Enabled = true; - this.desktopupdate.Interval = 10000; - this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick); - // // Windows95 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1052,8 +1064,8 @@ namespace Histacom2.OS.Win95 this.BackColor = System.Drawing.Color.Teal; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.ClientSize = new System.Drawing.Size(640, 480); - this.Controls.Add(this.taskbar); this.Controls.Add(this.startmenu); + this.Controls.Add(this.taskbar); this.Controls.Add(this.panel1); this.Controls.Add(this.desktopicons); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; @@ -1068,7 +1080,6 @@ namespace Histacom2.OS.Win95 this.clockPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); this.startmenu.ResumeLayout(false); - this.startmenu.PerformLayout(); this.startmenuitems.ResumeLayout(false); this.startmenuitems.PerformLayout(); this.ossidestartmenu.ResumeLayout(false); @@ -1088,7 +1099,7 @@ namespace Histacom2.OS.Win95 internal System.Windows.Forms.Label taskbartime; internal System.Windows.Forms.Panel startmenu; internal System.Windows.Forms.MenuStrip startmenuitems; - internal System.Windows.Forms.ToolStripMenuItem ProgramsToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem ProgramsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem AccessoriesToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CommunicationsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem InternetConnectionWizardToolStripMenuItem; @@ -1125,22 +1136,22 @@ namespace Histacom2.OS.Win95 internal System.Windows.Forms.ToolStripMenuItem SkindowsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem WebChatToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem TimeDistorterToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem DocumentsToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem SettingsToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem DocumentsToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem SettingsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ControlPanelToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PrintersToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem TaskbarToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem FindToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem FindToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem FilesOrFoldersToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ComputerToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem OnTheInternetToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PeopleToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem RunToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem HelpToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem RunToolStripMenuItem; internal System.Windows.Forms.Panel ossidestartmenu; internal System.Windows.Forms.PictureBox osimage; - internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem SuspendToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem ShutdownToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem SuspendToolStripMenuItem; private System.Windows.Forms.Timer clockTimer; private System.Windows.Forms.ImageList desktopImages; internal System.Windows.Forms.ListView desktopicons; diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 8188b7e..b4fcbd9 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -37,7 +37,7 @@ namespace Histacom2.OS.Win95 public Windows95() { InitializeComponent(); - startmenu.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + //startmenu.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); ProgramsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); AccessoriesToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); CommunicationsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); @@ -144,8 +144,8 @@ namespace Histacom2.OS.Win95 private void fontLoad() { this.taskbartime.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - this.ProgramsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - this.DocumentsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + //this.ProgramsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + //this.DocumentsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); this.SettingsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); this.FindToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); this.HelpToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); @@ -161,8 +161,8 @@ namespace Histacom2.OS.Win95 private void startbutton_Click(object sender, EventArgs e) { startmenu.Show(); - startmenu.BringToFront(); if (taskbar.Visible) taskbar.BringToFront(); + startmenu.BringToFront(); } // Shutdown button @@ -631,6 +631,28 @@ namespace Histacom2.OS.Win95 gfx.DrawLine(new Pen(_lightBack), 62, 4, 62, 25); gfx.DrawLine(new Pen(_lightBack), 0, 25, 62, 25); } + + private void startmenuitems_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(currentTheme.threeDObjectsColor); + } + + private void startmenu_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(currentTheme.threeDObjectsColor); + + var _lightBack = Paintbrush.GetLightFromColor(currentTheme.threeDObjectsColor); + var _darkBack = Paintbrush.GetDarkFromColor(currentTheme.threeDObjectsColor); + + gfx.DrawLine(Pens.Black, 0, startmenu.Height - 1, startmenu.Width - 1, startmenu.Height - 1); + gfx.DrawLine(Pens.Black, startmenu.Width - 1, startmenu.Height - 1, startmenu.Width - 1, 0); + gfx.DrawLine(new Pen(_darkBack), 1, startmenu.Height - 2, startmenu.Width - 2, startmenu.Height - 2); + gfx.DrawLine(new Pen(_darkBack), startmenu.Width - 2, 1, startmenu.Width - 2, startmenu.Height - 2); + gfx.DrawLine(new Pen(_lightBack), 1, startmenu.Height - 3, 1, 1); + gfx.DrawLine(new Pen(_lightBack), startmenu.Width - 3, 1, 1, 1); + } } public class MyRenderer : ToolStripProfessionalRenderer { diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx index f0d544c..2711895 100644 --- a/Histacom2/OS/Win95/Win95.resx +++ b/Histacom2/OS/Win95/Win95.resx @@ -123,249 +123,6 @@ 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N - kgEOwCAIA3m6T/NnG6UwBZ1bk6pTemIy2am1dlX70VlR3Hu/IBE1wr5/BOEQymFZLRvIHMZtGjUjEHOG - mIdS214UkGi92qM5zDnCENfYn+0AQvAxC2/nHsNe+HgLwCbEmW1HmLOOZtYuAB0SJKAsivAPgBXpOgNQ - PPwCyDcF4M0TAIZw84CUgq1TF2xvhP+oACBCAoBW9dg6szWLzeUZs9Y/7mQNVMCjOPywyA3MF+cOKQF9 - RAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAKpJREFUOE/N - UskNgDAMy+gdrZsVO3cL/HhgySKJD/WB/BdjjNXpZ9wFu+R+QwTmnDAtY5UsbErOGuiIIKmBoJYwwEJ7 - QZbEk066qCHbo8R0Qj0OPbA1vrxpCKxSm3dPIYWtwMNED28Fp5Ai7lWwe17DFNKwFRBHmKj2EDCZ4eEF - pxeIdj+AnH33gtIeGO11jAJQw20X+5nAG7SE5GykuTO1V5yGHur3LyFyAZP8TrljsWNAAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcwxstlzQAAALVJREFU - OE+dj4ERwyAMAxmd0diMImMZYaC9q3xOIJaeUP5Q936r1tpz+wgi4ATR3Huxbq1FC4ihHWDDEWM4A9jD - ukJczzBqRl8AD+iVMgB1B7j5BGATpqgJ4XfbeTi8vt8ANnCAn2JvnZuH4RvADKgx5MnHfAHm/bMB0j8A - KnueAEjX+Bs+1RcAiBBITWYUACEjssIQAFAOmzmissoAKF9FARvkFqYAySACxvh7WEXQWP4IlvIBh1rl - tmCAq4kAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcZhHn9oQAAAJ9JREFU - OE+VkAEOxCAIBH26P6s/8zrgeqTS05uEKMouaNnQR/zPdZVeazWDsZ6DuHfv3lqz8JsDJKYrgRiyKZYz - ieFOpxhiscxH6sIojuMLCV669lD8nYAQi1CosxusE7DCoQG44L6SyPL4hBic2ftJnhMQQsVvWHH8SPLs - E3dME/aZwYnRfBIholB3I00xE1amIDLBscmu8Bdm4NuMUj70z1LCUTedOwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcbanecjQAAAItJREFU - OE+VjgEOhCAMBHk6T+Nn2iFuXEEtTLLBbNu5K6LWeuzkOruhXCXWvwWttd9cv74miLrHu1TASyQAHSr0 - /chh4PiBz/iO9W+B/mpUj6hPBbxEEtChQt+PHAbOKBCpgGUl6qlLBbxkFKgn9P3IYeCMApEKWFaEd1uC - t6QC3iyxPgsCDVYTlHICH5QKXtIjRNoAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCgUfVCd0wAAAHpJREFU - OE+djgsOgDAIQzn6bubRlF+zOZV1vqRBGK0IS2vthHK0ZjQBHdcBhcllc9t7UJnsvSSM4tKWM03cAvLM - Ve3YwNBPuqYCJONxVbGvCnABSx2QfwJjK0c03wHYzjq1RICB7WRsf10AeU9dQPAasCu19YAEww2JXJGJ - 13tFDjjJAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAMFJREFUOE+V - kAsShDAIQzk6R/Nm3SSU2g/uaJxMi5Bnq81yt0b38pCbnz03hGDtEaYq0HVdraF9QBiORoAyXIFKyAhO - IG6m8P+TRDDMPV4JkBDWGkSNYe0JcS8AGoArAEPYDcjQAcgheL9CCVkAU1iP3sd9887L8akDkE//OoMo - ByhSkxYAl3x0EgTg6QTk3FZ/B6TRpLSiHoAOpXWVR8D4wgYopMad7KAPgJQGIh3WMbEu/+CFNEhAhKPu - /qQXQbMf8nZYxbrHLzUAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR - EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H - UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY - oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABzSURBVDhPxZBR - DsAgCEM9ukfzZowW9UdFmUtG8mR0UtiSiFwxFSPYkbO8gb31gXahDBOdb9MhsHCoUzsJ4J0WdNRiFaUU - 36BtgIsrXAPEcGHHsAFF+4yT/M8GCP4Pa2z5iw26EEUNMNyc4rAXxw1T8RxJD2E2VfJhfZIbAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAH9JREFUOE+l - jgESgCAIBHk6T/NnxjFCVlBKzJyhc7sTEXH/FzmYqJSLYHdCAc40AMaOqQmGBJMKmOVx7B6UeUGgsMQk - +jV4RQDYAri1dsKTBPMqcBilG/z5BwZbIgkmFNxhl0ww7trdESDo2K7dTJBGOrZrNxLszENQiQvq4X4A - JbFDpxtWNlIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB - DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP - YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy - BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR - EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA - QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI - qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA - AABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAADBSURBVDhPhZAB - GoUgCIM9ukfrZj02mBJhb32U5v6JjpfmuGP0pQ8PAg4h0/6jbKj1xgcDniYEMGTDGpR0CLCJAIPnfV2X - 5lve4hTMXbirjVETQHQQtaX23LFN9mIRXtMCh14BIirctm/yiyGNkB7mHvxXAgTj/Os4jegzmHeVQ3KA - TWlAq7UUQOgUYE3KxCDMXd5drEGnADfz/Qj6d4QC569ZukoKUwfrq3ugewmgnmgP5eCztGaVFK0HnJUB - VdEYP35ybB/eOVN7AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAK5JREFUOE+V - kAESwyAIBH06T/Nnlju8FNFJ7c0w0sBuTVqNWRu15uh3sDzGXleiDJsZlnleiyTwloXgzGLVUTIfcqH3 - zhO/UZrlG20S/RNg9JLodSSUAD045gR/JUj0vsoeM/SEkRAosVBhQTgPgvy1lfVWBazw8KGxsiiDGdbr - gKfAWwJIFp3AuFF8WPAUaOBPwuJJSwuomjNmWcqiF/CBczbRLVjziP4Fay7A1j6MmatnPf0QdQAAAABJ - RU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB - DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX - VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ - aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ - 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME - Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN - upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 - NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j - Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I - gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m - M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh - EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK - 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 - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - 153, 17 @@ -377,7 +134,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO - hAAAAk1TRnQBSQFMAgEBDQEAAVQBAgFUAQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + hAAAAk1TRnQBSQFMAgEBDQEAAfQBAgH0AQIBIAEAASABAAT/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/ @@ -951,6 +708,249 @@ 580, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N + kgEOwCAIA3m6T/NnG6UwBZ1bk6pTemIy2am1dlX70VlR3Hu/IBE1wr5/BOEQymFZLRvIHMZtGjUjEHOG + mIdS214UkGi92qM5zDnCENfYn+0AQvAxC2/nHsNe+HgLwCbEmW1HmLOOZtYuAB0SJKAsivAPgBXpOgNQ + PPwCyDcF4M0TAIZw84CUgq1TF2xvhP+oACBCAoBW9dg6szWLzeUZs9Y/7mQNVMCjOPywyA3MF+cOKQF9 + RAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAKpJREFUOE/N + UskNgDAMy+gdrZsVO3cL/HhgySKJD/WB/BdjjNXpZ9wFu+R+QwTmnDAtY5UsbErOGuiIIKmBoJYwwEJ7 + QZbEk066qCHbo8R0Qj0OPbA1vrxpCKxSm3dPIYWtwMNED28Fp5Ai7lWwe17DFNKwFRBHmKj2EDCZ4eEF + pxeIdj+AnH33gtIeGO11jAJQw20X+5nAG7SE5GykuTO1V5yGHur3LyFyAZP8TrljsWNAAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcwxstlzQAAALVJREFU + OE+dj4ERwyAMAxmd0diMImMZYaC9q3xOIJaeUP5Q936r1tpz+wgi4ATR3Huxbq1FC4ihHWDDEWM4A9jD + ukJczzBqRl8AD+iVMgB1B7j5BGATpqgJ4XfbeTi8vt8ANnCAn2JvnZuH4RvADKgx5MnHfAHm/bMB0j8A + KnueAEjX+Bs+1RcAiBBITWYUACEjssIQAFAOmzmissoAKF9FARvkFqYAySACxvh7WEXQWP4IlvIBh1rl + tmCAq4kAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcZhHn9oQAAAJ9JREFU + OE+VkAEOxCAIBH26P6s/8zrgeqTS05uEKMouaNnQR/zPdZVeazWDsZ6DuHfv3lqz8JsDJKYrgRiyKZYz + ieFOpxhiscxH6sIojuMLCV669lD8nYAQi1CosxusE7DCoQG44L6SyPL4hBic2ftJnhMQQsVvWHH8SPLs + E3dME/aZwYnRfBIholB3I00xE1amIDLBscmu8Bdm4NuMUj70z1LCUTedOwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcbanecjQAAAItJREFU + OE+VjgEOhCAMBHk6T+Nn2iFuXEEtTLLBbNu5K6LWeuzkOruhXCXWvwWttd9cv74miLrHu1TASyQAHSr0 + /chh4PiBz/iO9W+B/mpUj6hPBbxEEtChQt+PHAbOKBCpgGUl6qlLBbxkFKgn9P3IYeCMApEKWFaEd1uC + t6QC3iyxPgsCDVYTlHICH5QKXtIjRNoAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCgUfVCd0wAAAHpJREFU + OE+djgsOgDAIQzn6bubRlF+zOZV1vqRBGK0IS2vthHK0ZjQBHdcBhcllc9t7UJnsvSSM4tKWM03cAvLM + Ve3YwNBPuqYCJONxVbGvCnABSx2QfwJjK0c03wHYzjq1RICB7WRsf10AeU9dQPAasCu19YAEww2JXJGJ + 13tFDjjJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAMFJREFUOE+V + kAsShDAIQzk6R/Nm3SSU2g/uaJxMi5Bnq81yt0b38pCbnz03hGDtEaYq0HVdraF9QBiORoAyXIFKyAhO + IG6m8P+TRDDMPV4JkBDWGkSNYe0JcS8AGoArAEPYDcjQAcgheL9CCVkAU1iP3sd9887L8akDkE//OoMo + ByhSkxYAl3x0EgTg6QTk3FZ/B6TRpLSiHoAOpXWVR8D4wgYopMad7KAPgJQGIh3WMbEu/+CFNEhAhKPu + /qQXQbMf8nZYxbrHLzUAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR + EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H + UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY + oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABzSURBVDhPxZBR + DsAgCEM9ukfzZowW9UdFmUtG8mR0UtiSiFwxFSPYkbO8gb31gXahDBOdb9MhsHCoUzsJ4J0WdNRiFaUU + 36BtgIsrXAPEcGHHsAFF+4yT/M8GCP4Pa2z5iw26EEUNMNyc4rAXxw1T8RxJD2E2VfJhfZIbAAAAAElF + TkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAH9JREFUOE+l + jgESgCAIBHk6T/NnxjFCVlBKzJyhc7sTEXH/FzmYqJSLYHdCAc40AMaOqQmGBJMKmOVx7B6UeUGgsMQk + +jV4RQDYAri1dsKTBPMqcBilG/z5BwZbIgkmFNxhl0ww7trdESDo2K7dTJBGOrZrNxLszENQiQvq4X4A + JbFDpxtWNlIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB + DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP + YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy + BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR + EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA + QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI + qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA + AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAADBSURBVDhPhZAB + GoUgCIM9ukfrZj02mBJhb32U5v6JjpfmuGP0pQ8PAg4h0/6jbKj1xgcDniYEMGTDGpR0CLCJAIPnfV2X + 5lve4hTMXbirjVETQHQQtaX23LFN9mIRXtMCh14BIirctm/yiyGNkB7mHvxXAgTj/Os4jegzmHeVQ3KA + TWlAq7UUQOgUYE3KxCDMXd5drEGnADfz/Qj6d4QC569ZukoKUwfrq3ugewmgnmgP5eCztGaVFK0HnJUB + VdEYP35ybB/eOVN7AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAK5JREFUOE+V + kAESwyAIBH06T/Nnlju8FNFJ7c0w0sBuTVqNWRu15uh3sDzGXleiDJsZlnleiyTwloXgzGLVUTIfcqH3 + zhO/UZrlG20S/RNg9JLodSSUAD045gR/JUj0vsoeM/SEkRAosVBhQTgPgvy1lfVWBazw8KGxsiiDGdbr + gKfAWwJIFp3AuFF8WPAUaOBPwuJJSwuomjNmWcqiF/CBczbRLVjziP4Fay7A1j6MmatnPf0QdQAAAABJ + RU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB + DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX + VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ + aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME + Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 + NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j + Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m + M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK + 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 + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + 92 diff --git a/Histacom2/OS/Win98/Win98.Designer.cs b/Histacom2/OS/Win98/Win98.Designer.cs index 52fb2f2..e2cf49c 100644 --- a/Histacom2/OS/Win98/Win98.Designer.cs +++ b/Histacom2/OS/Win98/Win98.Designer.cs @@ -200,11 +200,12 @@ namespace Histacom2.OS.Win98 this.startmenu.Controls.Add(this.ossidestartmenu); this.startmenu.Location = new System.Drawing.Point(0, 160); this.startmenu.Name = "startmenu"; - this.startmenu.Size = new System.Drawing.Size(174, 295); + this.startmenu.Size = new System.Drawing.Size(161, 295); this.startmenu.TabIndex = 3; // // startmenuitems // + this.startmenuitems.AutoSize = false; this.startmenuitems.BackColor = System.Drawing.Color.Silver; this.startmenuitems.Dock = System.Windows.Forms.DockStyle.None; this.startmenuitems.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -222,7 +223,7 @@ namespace Histacom2.OS.Win98 this.startmenuitems.Name = "startmenuitems"; this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(148, 292); + this.startmenuitems.Size = new System.Drawing.Size(137, 309); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -250,7 +251,7 @@ namespace Histacom2.OS.Win98 this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem"; this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.ProgramsToolStripMenuItem.Text = "Programs"; // // AccessoriesToolStripMenuItem @@ -275,7 +276,7 @@ namespace Histacom2.OS.Win98 this.AccessoriesToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem"; - this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.AccessoriesToolStripMenuItem.Text = "Accessories"; // // CommunicationsToolStripMenuItem @@ -289,7 +290,7 @@ namespace Histacom2.OS.Win98 this.CommunicationsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.CommunicationsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem"; - this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.CommunicationsToolStripMenuItem.Text = "Communications"; // // InternetConnectionWizardToolStripMenuItem @@ -300,7 +301,7 @@ namespace Histacom2.OS.Win98 this.InternetConnectionWizardToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("InternetConnectionWizardToolStripMenuItem.Image"))); this.InternetConnectionWizardToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetConnectionWizardToolStripMenuItem.Name = "InternetConnectionWizardToolStripMenuItem"; - this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + 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); // @@ -312,7 +313,7 @@ namespace Histacom2.OS.Win98 this.NetMeetingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NetMeetingToolStripMenuItem.Image"))); this.NetMeetingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem"; - this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // @@ -329,7 +330,7 @@ namespace Histacom2.OS.Win98 this.MultimediaToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.MultimediaToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem"; - this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.MultimediaToolStripMenuItem.Text = "Multimedia"; // // CDPlayerToolStripMenuItem @@ -340,7 +341,7 @@ namespace Histacom2.OS.Win98 this.CDPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CDPlayerToolStripMenuItem.Image"))); this.CDPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CDPlayerToolStripMenuItem.Name = "CDPlayerToolStripMenuItem"; - this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.CDPlayerToolStripMenuItem.Text = "CD Player"; // // SoundRecorderToolStripMenuItem @@ -351,7 +352,7 @@ namespace Histacom2.OS.Win98 this.SoundRecorderToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("SoundRecorderToolStripMenuItem.Image"))); this.SoundRecorderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SoundRecorderToolStripMenuItem.Name = "SoundRecorderToolStripMenuItem"; - this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.SoundRecorderToolStripMenuItem.Text = "Sound Recorder"; // // VolumeControlToolStripMenuItem @@ -362,7 +363,7 @@ namespace Histacom2.OS.Win98 this.VolumeControlToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("VolumeControlToolStripMenuItem.Image"))); this.VolumeControlToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.VolumeControlToolStripMenuItem.Name = "VolumeControlToolStripMenuItem"; - this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.VolumeControlToolStripMenuItem.Text = "Volume Control"; // // WindowsMediaPlayerToolStripMenuItem @@ -373,7 +374,7 @@ namespace Histacom2.OS.Win98 this.WindowsMediaPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WindowsMediaPlayerToolStripMenuItem.Image"))); this.WindowsMediaPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsMediaPlayerToolStripMenuItem.Name = "WindowsMediaPlayerToolStripMenuItem"; - this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.WindowsMediaPlayerToolStripMenuItem.Text = "Windows Media Player"; // // SystemToolsToolStripMenuItem @@ -387,7 +388,7 @@ namespace Histacom2.OS.Win98 this.SystemToolsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.SystemToolsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SystemToolsToolStripMenuItem.Name = "SystemToolsToolStripMenuItem"; - this.SystemToolsToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.SystemToolsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.SystemToolsToolStripMenuItem.Text = "System Tools"; // // DiskDefragmenterToolStripMenuItem @@ -398,7 +399,7 @@ namespace Histacom2.OS.Win98 this.DiskDefragmenterToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DiskDefragmenterToolStripMenuItem.Image"))); this.DiskDefragmenterToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.DiskDefragmenterToolStripMenuItem.Name = "DiskDefragmenterToolStripMenuItem"; - this.DiskDefragmenterToolStripMenuItem.Size = new System.Drawing.Size(181, 22); + this.DiskDefragmenterToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.DiskDefragmenterToolStripMenuItem.Text = "Disk Defragmenter"; // // ScanDiskToolStripMenuItem @@ -409,7 +410,7 @@ namespace Histacom2.OS.Win98 this.ScanDiskToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ScanDiskToolStripMenuItem.Image"))); this.ScanDiskToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ScanDiskToolStripMenuItem.Name = "ScanDiskToolStripMenuItem"; - this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(181, 22); + this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.ScanDiskToolStripMenuItem.Text = "ScanDisk"; // // AddressBookToolStripMenuItem @@ -420,7 +421,7 @@ namespace Histacom2.OS.Win98 this.AddressBookToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("AddressBookToolStripMenuItem.Image"))); this.AddressBookToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AddressBookToolStripMenuItem.Name = "AddressBookToolStripMenuItem"; - this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.AddressBookToolStripMenuItem.Text = "Address Book"; this.AddressBookToolStripMenuItem.Click += new System.EventHandler(this.AddressBookToolStripMenuItem_Click); // @@ -432,7 +433,7 @@ namespace Histacom2.OS.Win98 this.CalculatorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.Image"))); this.CalculatorToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CalculatorToolStripMenuItem.Name = "CalculatorToolStripMenuItem"; - this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.CalculatorToolStripMenuItem.Text = "Calculator"; // // HyperTerminalToolStripMenuItem @@ -443,7 +444,7 @@ namespace Histacom2.OS.Win98 this.HyperTerminalToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall; this.HyperTerminalToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.HyperTerminalToolStripMenuItem.Name = "HyperTerminalToolStripMenuItem"; - this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal"; // // ImagingToolStripMenuItem @@ -454,7 +455,7 @@ namespace Histacom2.OS.Win98 this.ImagingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ImagingToolStripMenuItem.Image"))); this.ImagingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ImagingToolStripMenuItem.Name = "ImagingToolStripMenuItem"; - this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.ImagingToolStripMenuItem.Text = "Imaging"; // // NotePadToolStripMenuItem @@ -465,7 +466,7 @@ namespace Histacom2.OS.Win98 this.NotePadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.Image"))); this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem"; - this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.NotePadToolStripMenuItem.Text = "Notepad"; this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click); // @@ -477,7 +478,7 @@ namespace Histacom2.OS.Win98 this.OnlineRegistrationToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("OnlineRegistrationToolStripMenuItem.Image"))); this.OnlineRegistrationToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnlineRegistrationToolStripMenuItem.Name = "OnlineRegistrationToolStripMenuItem"; - this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration"; // // PaintToolStripMenuItem @@ -488,7 +489,7 @@ namespace Histacom2.OS.Win98 this.PaintToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.Image"))); this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem"; - this.PaintToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.PaintToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.PaintToolStripMenuItem.Text = "Paintbrush"; // // PhoneDialerToolStripMenuItem @@ -499,7 +500,7 @@ namespace Histacom2.OS.Win98 this.PhoneDialerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PhoneDialerToolStripMenuItem.Image"))); this.PhoneDialerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PhoneDialerToolStripMenuItem.Name = "PhoneDialerToolStripMenuItem"; - this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer"; // // WordPadToolStripMenuItem @@ -510,7 +511,7 @@ namespace Histacom2.OS.Win98 this.WordPadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.Image"))); this.WordPadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WordPadToolStripMenuItem.Name = "WordPadToolStripMenuItem"; - this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WordPadToolStripMenuItem.Text = "WordPad"; this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click); // @@ -528,7 +529,7 @@ namespace Histacom2.OS.Win98 this.StartUpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.StartUpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem"; - this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.StartUpToolStripMenuItem.Text = "Online Services"; // // AOLInternetFREETrialToolStripMenuItem @@ -538,7 +539,7 @@ namespace Histacom2.OS.Win98 this.AOLInternetFREETrialToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.AOLInternetFREETrialToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AOLInternetFREETrialToolStripMenuItem.Name = "AOLInternetFREETrialToolStripMenuItem"; - this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.AOLInternetFREETrialToolStripMenuItem.Text = "AOL & Internet FREE Trial!"; // // ATTWorldNetSignupToolStripMenuItem @@ -548,7 +549,7 @@ namespace Histacom2.OS.Win98 this.ATTWorldNetSignupToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ATTWorldNetSignupToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ATTWorldNetSignupToolStripMenuItem.Name = "ATTWorldNetSignupToolStripMenuItem"; - this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.ATTWorldNetSignupToolStripMenuItem.Text = "AT&T WorldNet Signup"; // // SetupCompuServe30ToolStripMenuItem @@ -558,7 +559,7 @@ namespace Histacom2.OS.Win98 this.SetupCompuServe30ToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupCompuServe30ToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SetupCompuServe30ToolStripMenuItem.Name = "SetupCompuServe30ToolStripMenuItem"; - this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SetupCompuServe30ToolStripMenuItem.Text = "Setup CompuServe 3.0"; // // SetupWOWFromCompuServeToolStripMenuItem @@ -567,7 +568,7 @@ namespace Histacom2.OS.Win98 this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupWOWFromCompuServeToolStripMenuItem.Name = "SetupWOWFromCompuServeToolStripMenuItem"; - this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SetupWOWFromCompuServeToolStripMenuItem.Text = "Setup WOW! from CompuServe"; // // MSDOSPromptToolStripMenuItem @@ -581,7 +582,7 @@ namespace Histacom2.OS.Win98 this.MSDOSPromptToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem"; - this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.MSDOSPromptToolStripMenuItem.Text = "StartUp"; // // EmptyToolStripMenuItem @@ -590,7 +591,7 @@ namespace Histacom2.OS.Win98 this.EmptyToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.EmptyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.EmptyToolStripMenuItem.Name = "EmptyToolStripMenuItem"; - this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(118, 22); + this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(116, 22); this.EmptyToolStripMenuItem.Text = "(Empty)"; // // InternetExplorerToolStripMenuItem @@ -602,7 +603,7 @@ namespace Histacom2.OS.Win98 this.InternetExplorerToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.InternetExplorerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetExplorerToolStripMenuItem.Name = "InternetExplorerToolStripMenuItem"; - this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer"; this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click); // @@ -615,7 +616,7 @@ namespace Histacom2.OS.Win98 this.MSDOSPromptToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1"; - this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); + this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt"; this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click); // @@ -628,7 +629,7 @@ namespace Histacom2.OS.Win98 this.OutlookExpressToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.OutlookExpressToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OutlookExpressToolStripMenuItem.Name = "OutlookExpressToolStripMenuItem"; - this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.OutlookExpressToolStripMenuItem.Text = "Outlook Express"; // // WindowsExplorerToolStripMenuItem1 @@ -640,7 +641,7 @@ namespace Histacom2.OS.Win98 this.WindowsExplorerToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.WindowsExplorerToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsExplorerToolStripMenuItem1.Name = "WindowsExplorerToolStripMenuItem1"; - this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); + this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer"; this.WindowsExplorerToolStripMenuItem1.Click += new System.EventHandler(this.WindowsExplorerToolStripMenuItem1_Click); // @@ -650,7 +651,7 @@ namespace Histacom2.OS.Win98 this.GuessTheNumberToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.GuessTheNumberToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.GuessTheNumberToolStripMenuItem.Name = "GuessTheNumberToolStripMenuItem"; - this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number"; this.GuessTheNumberToolStripMenuItem.Visible = false; // @@ -660,7 +661,7 @@ namespace Histacom2.OS.Win98 this.StartRunnerToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.StartRunnerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.StartRunnerToolStripMenuItem.Name = "StartRunnerToolStripMenuItem"; - this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.StartRunnerToolStripMenuItem.Text = "Start Runner"; this.StartRunnerToolStripMenuItem.Visible = false; // @@ -670,7 +671,7 @@ namespace Histacom2.OS.Win98 this.ErrorBlasterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem"; - this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster"; this.ErrorBlasterToolStripMenuItem.Visible = false; // @@ -680,7 +681,7 @@ namespace Histacom2.OS.Win98 this.SkindowsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.SkindowsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SkindowsToolStripMenuItem.Name = "SkindowsToolStripMenuItem"; - this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.SkindowsToolStripMenuItem.Text = "Skindows 95"; this.SkindowsToolStripMenuItem.Visible = false; // @@ -690,7 +691,7 @@ namespace Histacom2.OS.Win98 this.WebChatToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.WebChatToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.WebChatToolStripMenuItem.Name = "WebChatToolStripMenuItem"; - this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; // @@ -700,7 +701,7 @@ namespace Histacom2.OS.Win98 this.TimeDistorterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.TimeDistorterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem"; - this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Visible = false; // @@ -717,7 +718,7 @@ namespace Histacom2.OS.Win98 this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem"; this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.DocumentsToolStripMenuItem.Text = "Documents"; // // downloaderTestToolStripMenuItem @@ -725,7 +726,7 @@ namespace Histacom2.OS.Win98 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(165, 22); + this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.downloaderTestToolStripMenuItem.Text = "DownloaderTest"; this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click); // @@ -734,7 +735,7 @@ namespace Histacom2.OS.Win98 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(165, 22); + this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.installerTestToolStripMenuItem.Text = "InstallerTest"; this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); // @@ -742,7 +743,7 @@ namespace Histacom2.OS.Win98 // this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem"; - this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.storyTest1ToolStripMenuItem.Text = "StoryTest1"; this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click); // @@ -758,7 +759,7 @@ namespace Histacom2.OS.Win98 this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"; this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.SettingsToolStripMenuItem.Text = "Settings"; // // ControlPanelToolStripMenuItem @@ -767,7 +768,7 @@ namespace Histacom2.OS.Win98 this.ControlPanelToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ControlPanelToolStripMenuItem.BackgroundImage"))); this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem"; - this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -776,7 +777,7 @@ namespace Histacom2.OS.Win98 this.PrintersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PrintersToolStripMenuItem.BackgroundImage"))); this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem"; - this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.PrintersToolStripMenuItem.Text = "Printers"; // // TaskbarToolStripMenuItem @@ -785,7 +786,7 @@ namespace Histacom2.OS.Win98 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(151, 22); + this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem @@ -803,7 +804,7 @@ namespace Histacom2.OS.Win98 this.FindToolStripMenuItem.Name = "FindToolStripMenuItem"; this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.FindToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.FindToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.FindToolStripMenuItem.Text = "Find"; // // FilesOrFoldersToolStripMenuItem @@ -812,7 +813,7 @@ namespace Histacom2.OS.Win98 this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage"))); this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem"; - this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders..."; // // ComputerToolStripMenuItem @@ -821,7 +822,7 @@ namespace Histacom2.OS.Win98 this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage"))); this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem"; - this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.ComputerToolStripMenuItem.Text = "Computer..."; // // OnTheInternetToolStripMenuItem @@ -830,7 +831,7 @@ namespace Histacom2.OS.Win98 this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage"))); this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem"; - this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.OnTheInternetToolStripMenuItem.Text = "On the Internet..."; // // PeopleToolStripMenuItem @@ -839,7 +840,7 @@ namespace Histacom2.OS.Win98 this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage"))); this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem"; - this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.PeopleToolStripMenuItem.Text = "People..."; // // HelpToolStripMenuItem @@ -851,7 +852,7 @@ namespace Histacom2.OS.Win98 this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.HelpToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.HelpToolStripMenuItem.Text = "Help"; // // RunToolStripMenuItem @@ -863,7 +864,7 @@ namespace Histacom2.OS.Win98 this.RunToolStripMenuItem.Name = "RunToolStripMenuItem"; this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.RunToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.RunToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.RunToolStripMenuItem.Text = "Run..."; // // SuspendToolStripMenuItem @@ -874,7 +875,7 @@ namespace Histacom2.OS.Win98 this.SuspendToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SuspendToolStripMenuItem.Name = "SuspendToolStripMenuItem"; this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.SuspendToolStripMenuItem.Text = "Suspend"; // // ShutdownToolStripMenuItem @@ -885,7 +886,7 @@ namespace Histacom2.OS.Win98 this.ShutdownToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ShutdownToolStripMenuItem.Name = "ShutdownToolStripMenuItem"; this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.ShutdownToolStripMenuItem.Text = "Shut Down..."; this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click); // @@ -954,7 +955,7 @@ namespace Histacom2.OS.Win98 this.PropertiesToolStripMenuItem1}); this.rightclickbackproperties.Name = "ContextMenuStrip1"; this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.rightclickbackproperties.Size = new System.Drawing.Size(135, 70); + this.rightclickbackproperties.Size = new System.Drawing.Size(128, 70); // // NewToolStripMenuItem1 // @@ -963,14 +964,14 @@ namespace Histacom2.OS.Win98 this.FolderToolStripMenuItem, this.TextDocumentToolStripMenuItem}); this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; - this.NewToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); + this.NewToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); this.NewToolStripMenuItem1.Text = "New"; // // FolderToolStripMenuItem // this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; - this.FolderToolStripMenuItem.Size = new System.Drawing.Size(161, 22); + this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.FolderToolStripMenuItem.Text = "Folder"; this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); // @@ -978,7 +979,7 @@ namespace Histacom2.OS.Win98 // this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; - this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(161, 22); + this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.TextDocumentToolStripMenuItem.Text = "Text Document"; this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click); // @@ -986,7 +987,7 @@ namespace Histacom2.OS.Win98 // this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.deleteToolStripMenuItem.Text = "Delete"; this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); // @@ -994,7 +995,7 @@ namespace Histacom2.OS.Win98 // this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; - this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); + this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); this.PropertiesToolStripMenuItem1.Text = "Properties"; // // desktopupdate @@ -1009,8 +1010,8 @@ namespace Histacom2.OS.Win98 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Teal; this.ClientSize = new System.Drawing.Size(640, 480); - this.Controls.Add(this.taskbar); this.Controls.Add(this.startmenu); + this.Controls.Add(this.taskbar); this.Controls.Add(this.panel1); this.Controls.Add(this.desktopicons); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; @@ -1025,7 +1026,6 @@ namespace Histacom2.OS.Win98 this.clockPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); this.startmenu.ResumeLayout(false); - this.startmenu.PerformLayout(); this.startmenuitems.ResumeLayout(false); this.startmenuitems.PerformLayout(); this.ossidestartmenu.ResumeLayout(false); diff --git a/Histacom2/OS/Win98/Win98.resx b/Histacom2/OS/Win98/Win98.resx index d94fb94..2a3433f 100644 --- a/Histacom2/OS/Win98/Win98.resx +++ b/Histacom2/OS/Win98/Win98.resx @@ -382,7 +382,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAZgBAQGYAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAaABAQGgAQEBIAEAASABAAT/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/ diff --git a/Histacom2/Resources/WinClassic/Win95SideBar.png b/Histacom2/Resources/WinClassic/Win95SideBar.png index f0ae5ab..a32d783 100644 Binary files a/Histacom2/Resources/WinClassic/Win95SideBar.png and b/Histacom2/Resources/WinClassic/Win95SideBar.png differ diff --git a/Histacom2/Resources/WinClassic/WinClassicPrograms.png b/Histacom2/Resources/WinClassic/WinClassicPrograms.png index 0a8b54a..1dbb3e8 100644 Binary files a/Histacom2/Resources/WinClassic/WinClassicPrograms.png and b/Histacom2/Resources/WinClassic/WinClassicPrograms.png differ diff --git a/Histacom2/TitleScreen.cs b/Histacom2/TitleScreen.cs index e810d5d..37539d9 100644 --- a/Histacom2/TitleScreen.cs +++ b/Histacom2/TitleScreen.cs @@ -105,11 +105,7 @@ namespace Histacom2 private void VM_WidthHeight_KeyPress(object sender, KeyPressEventArgs e) { - if (!char.IsControl(e.KeyChar) && !char.IsDigit(e.KeyChar) && - (e.KeyChar != '.')) - { - e.Handled = true; - } + if (!char.IsControl(e.KeyChar) && !char.IsDigit(e.KeyChar) && (e.KeyChar != '.')) e.Handled = true; // only allow one decimal point if ((e.KeyChar == '.') && ((sender as TextBox).Text.IndexOf('.') > -1)) e.Handled = true; -- cgit v1.2.3 From 868078d5cb4edafda5a01f116391d927ceeedf9d Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 13 Sep 2017 12:55:01 -0400 Subject: colored taskbar things and new buttons in calc --- Histacom2.Engine/UI/ClassicButton.cs | 18 ++ .../WinClassicCalculator.Designer.cs | 219 ++++++++++----------- Histacom2/OS/Win95/Win95.cs | 31 +-- .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 3 - Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs | 1 + Histacom2/OS/Win95/Win95TaskBarItem.cs | 17 ++ 6 files changed, 147 insertions(+), 142 deletions(-) (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index 1a77964..26dbd26 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -28,8 +28,14 @@ namespace Histacom2.Engine.UI } } + public bool AdaptForeColorWithTheme { get; set; } + public bool AdaptFontWithTheme { get; set; } + public ClassicButton() : base() { + AdaptForeColorWithTheme = true; + AdaptFontWithTheme = true; + if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; else BackColor = Color.Silver; _lightBack = ControlPaint.Light(BackColor, 50); @@ -53,6 +59,18 @@ namespace Histacom2.Engine.UI if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; else BackColor = Color.Silver; + if (AdaptForeColorWithTheme) + { + if (SaveSystem.currentTheme != null) ForeColor = SaveSystem.currentTheme.threeDObjectsTextColor; + else ForeColor = Color.Black; + } + + if (AdaptFontWithTheme) + { + if (SaveSystem.currentTheme != null) Font = SaveSystem.currentTheme.buttonFont; + else Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); + } + _lightBack = Paintbrush.GetLightFromColor(BackColor); _darkBack = Paintbrush.GetDarkFromColor(BackColor); diff --git a/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs b/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs index 6f03978..80c3e93 100644 --- a/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs @@ -39,33 +39,33 @@ this.CopyCtrlCToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.EditToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.txtNumbers = new System.Windows.Forms.TextBox(); - this.Button27 = new System.Windows.Forms.Button(); - this.Button26 = new System.Windows.Forms.Button(); - this.Button1 = new System.Windows.Forms.Button(); - this.Button25 = new System.Windows.Forms.Button(); - this.Button2 = new System.Windows.Forms.Button(); - this.Button21 = new System.Windows.Forms.Button(); - this.Button3 = new System.Windows.Forms.Button(); - this.Button22 = new System.Windows.Forms.Button(); - this.Button4 = new System.Windows.Forms.Button(); - this.Button23 = new System.Windows.Forms.Button(); - this.Button11 = new System.Windows.Forms.Button(); - this.Button7 = new System.Windows.Forms.Button(); - this.Button16 = new System.Windows.Forms.Button(); - this.Button24 = new System.Windows.Forms.Button(); - this.Button12 = new System.Windows.Forms.Button(); - this.one = new System.Windows.Forms.Button(); - this.Button15 = new System.Windows.Forms.Button(); - this.Button17 = new System.Windows.Forms.Button(); - this.Button13 = new System.Windows.Forms.Button(); - this.Button5 = new System.Windows.Forms.Button(); - this.Button14 = new System.Windows.Forms.Button(); - this.Button18 = new System.Windows.Forms.Button(); - this.Button8 = new System.Windows.Forms.Button(); - this.Button10 = new System.Windows.Forms.Button(); - this.Button20 = new System.Windows.Forms.Button(); - this.Button19 = new System.Windows.Forms.Button(); - this.Button9 = new System.Windows.Forms.Button(); + this.Button27 = new Histacom2.Engine.UI.ClassicButton(); + this.Button26 = new Histacom2.Engine.UI.ClassicButton(); + this.Button1 = new Histacom2.Engine.UI.ClassicButton(); + this.Button25 = new Histacom2.Engine.UI.ClassicButton(); + this.Button2 = new Histacom2.Engine.UI.ClassicButton(); + this.Button21 = new Histacom2.Engine.UI.ClassicButton(); + this.Button3 = new Histacom2.Engine.UI.ClassicButton(); + this.Button22 = new Histacom2.Engine.UI.ClassicButton(); + this.Button4 = new Histacom2.Engine.UI.ClassicButton(); + this.Button23 = new Histacom2.Engine.UI.ClassicButton(); + this.Button11 = new Histacom2.Engine.UI.ClassicButton(); + this.Button7 = new Histacom2.Engine.UI.ClassicButton(); + this.Button16 = new Histacom2.Engine.UI.ClassicButton(); + this.Button24 = new Histacom2.Engine.UI.ClassicButton(); + this.Button12 = new Histacom2.Engine.UI.ClassicButton(); + this.one = new Histacom2.Engine.UI.ClassicButton(); + this.Button15 = new Histacom2.Engine.UI.ClassicButton(); + this.Button17 = new Histacom2.Engine.UI.ClassicButton(); + this.Button13 = new Histacom2.Engine.UI.ClassicButton(); + this.Button5 = new Histacom2.Engine.UI.ClassicButton(); + this.Button14 = new Histacom2.Engine.UI.ClassicButton(); + this.Button18 = new Histacom2.Engine.UI.ClassicButton(); + this.Button8 = new Histacom2.Engine.UI.ClassicButton(); + this.Button10 = new Histacom2.Engine.UI.ClassicButton(); + this.Button20 = new Histacom2.Engine.UI.ClassicButton(); + this.Button19 = new Histacom2.Engine.UI.ClassicButton(); + this.Button9 = new Histacom2.Engine.UI.ClassicButton(); this.MenuStrip2 = new System.Windows.Forms.MenuStrip(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.MenuStrip2.SuspendLayout(); @@ -159,8 +159,9 @@ // // Button27 // + this.Button27.AdaptFontWithTheme = false; + this.Button27.AdaptForeColorWithTheme = false; this.Button27.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Button27.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button27.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button27.ForeColor = System.Drawing.Color.Firebrick; this.Button27.Location = new System.Drawing.Point(159, 71); @@ -168,13 +169,13 @@ this.Button27.Size = new System.Drawing.Size(49, 28); this.Button27.TabIndex = 84; this.Button27.Text = "CE"; - this.Button27.UseVisualStyleBackColor = true; this.Button27.Click += new System.EventHandler(this.Button27_Click); // // Button26 // + this.Button26.AdaptFontWithTheme = false; + this.Button26.AdaptForeColorWithTheme = false; this.Button26.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Button26.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button26.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button26.ForeColor = System.Drawing.Color.Firebrick; this.Button26.Location = new System.Drawing.Point(210, 71); @@ -182,13 +183,13 @@ this.Button26.Size = new System.Drawing.Size(49, 28); this.Button26.TabIndex = 83; this.Button26.Text = "C"; - this.Button26.UseVisualStyleBackColor = true; this.Button26.Click += new System.EventHandler(this.Button26_Click); // // Button1 // + this.Button1.AdaptFontWithTheme = false; + this.Button1.AdaptForeColorWithTheme = false; this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button1.ForeColor = System.Drawing.Color.Red; this.Button1.Location = new System.Drawing.Point(11, 139); @@ -196,12 +197,12 @@ this.Button1.Size = new System.Drawing.Size(36, 28); this.Button1.TabIndex = 58; this.Button1.Text = "MR"; - this.Button1.UseVisualStyleBackColor = true; // // Button25 // + this.Button25.AdaptFontWithTheme = false; + this.Button25.AdaptForeColorWithTheme = false; this.Button25.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.Button25.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button25.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button25.ForeColor = System.Drawing.Color.Firebrick; this.Button25.Location = new System.Drawing.Point(104, 71); @@ -209,13 +210,13 @@ this.Button25.Size = new System.Drawing.Size(49, 28); this.Button25.TabIndex = 82; this.Button25.Text = "Back"; - this.Button25.UseVisualStyleBackColor = true; this.Button25.Click += new System.EventHandler(this.Button25_Click); // // Button2 // + this.Button2.AdaptFontWithTheme = false; + this.Button2.AdaptForeColorWithTheme = false; this.Button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button2.ForeColor = System.Drawing.Color.Red; this.Button2.Location = new System.Drawing.Point(11, 207); @@ -223,12 +224,12 @@ this.Button2.Size = new System.Drawing.Size(36, 28); this.Button2.TabIndex = 59; this.Button2.Text = "M+"; - this.Button2.UseVisualStyleBackColor = true; // // Button21 // + this.Button21.AdaptFontWithTheme = false; + this.Button21.AdaptForeColorWithTheme = false; this.Button21.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button21.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button21.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button21.ForeColor = System.Drawing.Color.Red; this.Button21.Location = new System.Drawing.Point(223, 207); @@ -236,13 +237,13 @@ this.Button21.Size = new System.Drawing.Size(36, 28); this.Button21.TabIndex = 81; this.Button21.Text = "="; - this.Button21.UseVisualStyleBackColor = true; this.Button21.Click += new System.EventHandler(this.Button21_Click); // // Button3 // + this.Button3.AdaptFontWithTheme = false; + this.Button3.AdaptForeColorWithTheme = false; this.Button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button3.ForeColor = System.Drawing.Color.Red; this.Button3.Location = new System.Drawing.Point(11, 173); @@ -250,12 +251,12 @@ this.Button3.Size = new System.Drawing.Size(36, 28); this.Button3.TabIndex = 60; this.Button3.Text = "MS"; - this.Button3.UseVisualStyleBackColor = true; // // Button22 // + this.Button22.AdaptFontWithTheme = false; + this.Button22.AdaptForeColorWithTheme = false; this.Button22.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button22.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button22.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button22.ForeColor = System.Drawing.Color.MidnightBlue; this.Button22.Location = new System.Drawing.Point(223, 105); @@ -263,14 +264,13 @@ this.Button22.Size = new System.Drawing.Size(36, 28); this.Button22.TabIndex = 80; this.Button22.Text = "sqrt"; - this.Button22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.Button22.UseVisualStyleBackColor = true; this.Button22.Click += new System.EventHandler(this.arithmitic_click); // // Button4 - // + // + this.Button4.AdaptFontWithTheme = false; + this.Button4.AdaptForeColorWithTheme = false; this.Button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.Button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button4.ForeColor = System.Drawing.Color.Red; this.Button4.Location = new System.Drawing.Point(11, 105); @@ -278,12 +278,12 @@ this.Button4.Size = new System.Drawing.Size(36, 28); this.Button4.TabIndex = 61; this.Button4.Text = "MC"; - this.Button4.UseVisualStyleBackColor = true; // // Button23 // + this.Button23.AdaptFontWithTheme = false; + this.Button23.AdaptForeColorWithTheme = false; this.Button23.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button23.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button23.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button23.ForeColor = System.Drawing.Color.MidnightBlue; this.Button23.Location = new System.Drawing.Point(223, 173); @@ -291,13 +291,13 @@ this.Button23.Size = new System.Drawing.Size(36, 28); this.Button23.TabIndex = 79; this.Button23.Text = "1/x"; - this.Button23.UseVisualStyleBackColor = true; this.Button23.Click += new System.EventHandler(this.arithmitic_click); // // Button11 // + this.Button11.AdaptFontWithTheme = false; + this.Button11.AdaptForeColorWithTheme = false; this.Button11.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button11.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button11.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button11.ForeColor = System.Drawing.Color.Blue; this.Button11.Location = new System.Drawing.Point(143, 105); @@ -305,13 +305,13 @@ this.Button11.Size = new System.Drawing.Size(36, 28); this.Button11.TabIndex = 70; this.Button11.Text = "9"; - this.Button11.UseVisualStyleBackColor = true; this.Button11.Click += new System.EventHandler(this.number_click); // // Button7 // + this.Button7.AdaptFontWithTheme = false; + this.Button7.AdaptForeColorWithTheme = false; this.Button7.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button7.ForeColor = System.Drawing.Color.Blue; this.Button7.Location = new System.Drawing.Point(63, 139); @@ -319,13 +319,13 @@ this.Button7.Size = new System.Drawing.Size(36, 28); this.Button7.TabIndex = 62; this.Button7.Text = "4"; - this.Button7.UseVisualStyleBackColor = true; this.Button7.Click += new System.EventHandler(this.number_click); // // Button16 // + this.Button16.AdaptFontWithTheme = false; + this.Button16.AdaptForeColorWithTheme = false; this.Button16.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button16.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button16.ForeColor = System.Drawing.Color.Blue; this.Button16.Location = new System.Drawing.Point(63, 207); @@ -333,13 +333,13 @@ this.Button16.Size = new System.Drawing.Size(36, 28); this.Button16.TabIndex = 71; this.Button16.Text = "0"; - this.Button16.UseVisualStyleBackColor = true; this.Button16.Click += new System.EventHandler(this.number_click); // // Button24 // + this.Button24.AdaptFontWithTheme = false; + this.Button24.AdaptForeColorWithTheme = false; this.Button24.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button24.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button24.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button24.ForeColor = System.Drawing.Color.MidnightBlue; this.Button24.Location = new System.Drawing.Point(223, 139); @@ -347,13 +347,13 @@ this.Button24.Size = new System.Drawing.Size(36, 28); this.Button24.TabIndex = 78; this.Button24.Text = "%"; - this.Button24.UseVisualStyleBackColor = true; this.Button24.Click += new System.EventHandler(this.arithmitic_click); // // Button12 // + this.Button12.AdaptFontWithTheme = false; + this.Button12.AdaptForeColorWithTheme = false; this.Button12.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button12.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button12.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button12.ForeColor = System.Drawing.Color.Blue; this.Button12.Location = new System.Drawing.Point(143, 173); @@ -361,13 +361,13 @@ this.Button12.Size = new System.Drawing.Size(36, 28); this.Button12.TabIndex = 69; this.Button12.Text = "3"; - this.Button12.UseVisualStyleBackColor = true; this.Button12.Click += new System.EventHandler(this.number_click); // // one // + this.one.AdaptFontWithTheme = false; + this.one.AdaptForeColorWithTheme = false; this.one.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.one.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.one.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.one.ForeColor = System.Drawing.Color.Blue; this.one.Location = new System.Drawing.Point(63, 173); @@ -375,13 +375,13 @@ this.one.Size = new System.Drawing.Size(36, 28); this.one.TabIndex = 63; this.one.Text = "1"; - this.one.UseVisualStyleBackColor = true; this.one.Click += new System.EventHandler(this.number_click); // // Button15 // + this.Button15.AdaptFontWithTheme = false; + this.Button15.AdaptForeColorWithTheme = false; this.Button15.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button15.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button15.ForeColor = System.Drawing.Color.Blue; this.Button15.Location = new System.Drawing.Point(103, 207); @@ -389,13 +389,13 @@ this.Button15.Size = new System.Drawing.Size(36, 28); this.Button15.TabIndex = 72; this.Button15.Text = "+/-"; - this.Button15.UseVisualStyleBackColor = true; this.Button15.Click += new System.EventHandler(this.Button15_Click); // // Button17 // + this.Button17.AdaptFontWithTheme = false; + this.Button17.AdaptForeColorWithTheme = false; this.Button17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button17.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button17.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button17.ForeColor = System.Drawing.Color.Red; this.Button17.Location = new System.Drawing.Point(183, 207); @@ -403,13 +403,13 @@ this.Button17.Size = new System.Drawing.Size(36, 28); this.Button17.TabIndex = 77; this.Button17.Text = "+"; - this.Button17.UseVisualStyleBackColor = true; this.Button17.Click += new System.EventHandler(this.arithmitic_click); // // Button13 // + this.Button13.AdaptFontWithTheme = false; + this.Button13.AdaptForeColorWithTheme = false; this.Button13.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button13.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button13.ForeColor = System.Drawing.Color.Blue; this.Button13.Location = new System.Drawing.Point(143, 139); @@ -417,13 +417,13 @@ this.Button13.Size = new System.Drawing.Size(36, 28); this.Button13.TabIndex = 68; this.Button13.Text = "6"; - this.Button13.UseVisualStyleBackColor = true; this.Button13.Click += new System.EventHandler(this.number_click); // // Button5 // + this.Button5.AdaptFontWithTheme = false; + this.Button5.AdaptForeColorWithTheme = false; this.Button5.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button5.ForeColor = System.Drawing.Color.Blue; this.Button5.Location = new System.Drawing.Point(63, 105); @@ -431,13 +431,13 @@ this.Button5.Size = new System.Drawing.Size(36, 28); this.Button5.TabIndex = 64; this.Button5.Text = "7"; - this.Button5.UseVisualStyleBackColor = true; this.Button5.Click += new System.EventHandler(this.number_click); // // Button14 // + this.Button14.AdaptFontWithTheme = false; + this.Button14.AdaptForeColorWithTheme = false; this.Button14.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button14.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button14.ForeColor = System.Drawing.Color.Blue; this.Button14.Location = new System.Drawing.Point(143, 207); @@ -445,13 +445,13 @@ this.Button14.Size = new System.Drawing.Size(36, 28); this.Button14.TabIndex = 73; this.Button14.Text = "."; - this.Button14.UseVisualStyleBackColor = true; this.Button14.Click += new System.EventHandler(this.number_click); // // Button18 // + this.Button18.AdaptFontWithTheme = false; + this.Button18.AdaptForeColorWithTheme = false; this.Button18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button18.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button18.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button18.ForeColor = System.Drawing.Color.Red; this.Button18.Location = new System.Drawing.Point(183, 105); @@ -459,13 +459,13 @@ this.Button18.Size = new System.Drawing.Size(36, 28); this.Button18.TabIndex = 76; this.Button18.Text = "/"; - this.Button18.UseVisualStyleBackColor = true; this.Button18.Click += new System.EventHandler(this.arithmitic_click); // // Button8 // + this.Button8.AdaptFontWithTheme = false; + this.Button8.AdaptForeColorWithTheme = false; this.Button8.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button8.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button8.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button8.ForeColor = System.Drawing.Color.Blue; this.Button8.Location = new System.Drawing.Point(103, 105); @@ -473,13 +473,13 @@ this.Button8.Size = new System.Drawing.Size(36, 28); this.Button8.TabIndex = 67; this.Button8.Text = "8"; - this.Button8.UseVisualStyleBackColor = true; this.Button8.Click += new System.EventHandler(this.number_click); // // Button10 // + this.Button10.AdaptFontWithTheme = false; + this.Button10.AdaptForeColorWithTheme = false; this.Button10.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button10.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button10.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button10.ForeColor = System.Drawing.Color.Blue; this.Button10.Location = new System.Drawing.Point(103, 139); @@ -487,13 +487,13 @@ this.Button10.Size = new System.Drawing.Size(36, 28); this.Button10.TabIndex = 65; this.Button10.Text = "5"; - this.Button10.UseVisualStyleBackColor = true; this.Button10.Click += new System.EventHandler(this.number_click); // // Button20 // + this.Button20.AdaptFontWithTheme = false; + this.Button20.AdaptForeColorWithTheme = false; this.Button20.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button20.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button20.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button20.ForeColor = System.Drawing.Color.Red; this.Button20.Location = new System.Drawing.Point(183, 139); @@ -501,13 +501,13 @@ this.Button20.Size = new System.Drawing.Size(36, 28); this.Button20.TabIndex = 74; this.Button20.Text = "*"; - this.Button20.UseVisualStyleBackColor = true; this.Button20.Click += new System.EventHandler(this.arithmitic_click); // // Button19 // + this.Button19.AdaptFontWithTheme = false; + this.Button19.AdaptForeColorWithTheme = false; this.Button19.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.Button19.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button19.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button19.ForeColor = System.Drawing.Color.Red; this.Button19.Location = new System.Drawing.Point(183, 173); @@ -515,13 +515,13 @@ this.Button19.Size = new System.Drawing.Size(36, 28); this.Button19.TabIndex = 75; this.Button19.Text = "-"; - this.Button19.UseVisualStyleBackColor = true; this.Button19.Click += new System.EventHandler(this.arithmitic_click); // // Button9 // + this.Button9.AdaptFontWithTheme = false; + this.Button9.AdaptForeColorWithTheme = false; this.Button9.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.Button9.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button9.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Button9.ForeColor = System.Drawing.Color.Blue; this.Button9.Location = new System.Drawing.Point(103, 173); @@ -529,7 +529,6 @@ this.Button9.Size = new System.Drawing.Size(36, 28); this.Button9.TabIndex = 66; this.Button9.Text = "2"; - this.Button9.UseVisualStyleBackColor = true; this.Button9.Click += new System.EventHandler(this.number_click); // // MenuStrip2 @@ -613,33 +612,33 @@ internal System.Windows.Forms.ToolStripMenuItem CopyCtrlCToolStripMenuItem1; internal System.Windows.Forms.ToolStripMenuItem EditToolStripMenuItem1; internal System.Windows.Forms.TextBox txtNumbers; - internal System.Windows.Forms.Button Button27; - internal System.Windows.Forms.Button Button26; - internal System.Windows.Forms.Button Button1; - internal System.Windows.Forms.Button Button25; - internal System.Windows.Forms.Button Button2; - internal System.Windows.Forms.Button Button21; - internal System.Windows.Forms.Button Button3; - internal System.Windows.Forms.Button Button22; - internal System.Windows.Forms.Button Button4; - internal System.Windows.Forms.Button Button23; - internal System.Windows.Forms.Button Button11; - internal System.Windows.Forms.Button Button7; - internal System.Windows.Forms.Button Button16; - internal System.Windows.Forms.Button Button24; - internal System.Windows.Forms.Button Button12; - internal System.Windows.Forms.Button one; - internal System.Windows.Forms.Button Button15; - internal System.Windows.Forms.Button Button17; - internal System.Windows.Forms.Button Button13; - internal System.Windows.Forms.Button Button5; - internal System.Windows.Forms.Button Button14; - internal System.Windows.Forms.Button Button18; - internal System.Windows.Forms.Button Button8; - internal System.Windows.Forms.Button Button10; - internal System.Windows.Forms.Button Button20; - internal System.Windows.Forms.Button Button19; - internal System.Windows.Forms.Button Button9; + internal Histacom2.Engine.UI.ClassicButton Button27; + internal Histacom2.Engine.UI.ClassicButton Button26; + internal Histacom2.Engine.UI.ClassicButton Button1; + internal Histacom2.Engine.UI.ClassicButton Button25; + internal Histacom2.Engine.UI.ClassicButton Button2; + internal Histacom2.Engine.UI.ClassicButton Button21; + internal Histacom2.Engine.UI.ClassicButton Button3; + internal Histacom2.Engine.UI.ClassicButton Button22; + internal Histacom2.Engine.UI.ClassicButton Button4; + internal Histacom2.Engine.UI.ClassicButton Button23; + internal Histacom2.Engine.UI.ClassicButton Button11; + internal Histacom2.Engine.UI.ClassicButton Button7; + internal Histacom2.Engine.UI.ClassicButton Button16; + internal Histacom2.Engine.UI.ClassicButton Button24; + internal Histacom2.Engine.UI.ClassicButton Button12; + internal Histacom2.Engine.UI.ClassicButton one; + internal Histacom2.Engine.UI.ClassicButton Button15; + internal Histacom2.Engine.UI.ClassicButton Button17; + internal Histacom2.Engine.UI.ClassicButton Button13; + internal Histacom2.Engine.UI.ClassicButton Button5; + internal Histacom2.Engine.UI.ClassicButton Button14; + internal Histacom2.Engine.UI.ClassicButton Button18; + internal Histacom2.Engine.UI.ClassicButton Button8; + internal Histacom2.Engine.UI.ClassicButton Button10; + internal Histacom2.Engine.UI.ClassicButton Button20; + internal Histacom2.Engine.UI.ClassicButton Button19; + internal Histacom2.Engine.UI.ClassicButton Button9; internal System.Windows.Forms.MenuStrip MenuStrip2; private System.Windows.Forms.PictureBox pictureBox1; } diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 27c8915..eb6b018 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -76,9 +76,6 @@ namespace Histacom2.OS.Win95 private void Desktop_Load(object sender, EventArgs e) { if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height); - //Start Menu Color - Commented until it works reliably - //startmenuitems.Renderer = new MyRenderer(); - //ProgramsToolStripMenuItem.DropDown.Renderer = new MyRenderer(); // Make Font Mandatory fontLoad(); @@ -144,8 +141,8 @@ namespace Histacom2.OS.Win95 private void fontLoad() { this.taskbartime.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - //this.ProgramsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - //this.DocumentsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.ProgramsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.DocumentsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); this.SettingsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); this.FindToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); this.HelpToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); @@ -658,29 +655,5 @@ namespace Histacom2.OS.Win95 gfx.DrawLine(new Pen(_lightBack), startmenu.Width - 3, 1, 1, 1); } } - public class MyRenderer : ToolStripProfessionalRenderer - { - public MyRenderer() : base(new MyColors()) { } - } - - public class MyColors : ProfessionalColorTable - { - public override Color MenuItemSelectedGradientBegin - { - get { return Color.Navy; } - } - public override Color MenuItemSelectedGradientEnd - { - get { return Color.Navy; } - } - public override Color MenuItemPressedGradientBegin - { - get { return Color.Navy; } - } - public override Color MenuItemPressedGradientEnd - { - get { return Color.Navy; } - } - } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs index f22ee89..2529e10 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -77,19 +77,16 @@ namespace Histacom2.OS.Win95.Win95Apps case "Default": SaveSystem.CurrentSave.ThemeName = "default95"; SaveSystem.currentTheme = new Default95Theme(); - TitleScreen.frm95.BackgroundImage = null; TitleScreen.frm95.desktopicons.BackgroundImage = null; break; case "Dangerous Creatures": SaveSystem.CurrentSave.ThemeName = "dangeranimals"; SaveSystem.currentTheme = new DangerousCreaturesTheme(); - TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height); break; case "Inside Your Computer": SaveSystem.CurrentSave.ThemeName = "insidepc"; SaveSystem.currentTheme = new InsideComputerTheme(); - TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG; TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.Width, TitleScreen.frm95.Height); break; } diff --git a/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs b/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs index 844e47b..c6c4952 100644 --- a/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs +++ b/Histacom2/OS/Win95/Win95TaskBarItem.Designer.cs @@ -67,6 +67,7 @@ this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(160, 22); this.panel1.TabIndex = 2; + this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // // Win95TaskBarItem // diff --git a/Histacom2/OS/Win95/Win95TaskBarItem.cs b/Histacom2/OS/Win95/Win95TaskBarItem.cs index b13e25c..f550497 100644 --- a/Histacom2/OS/Win95/Win95TaskBarItem.cs +++ b/Histacom2/OS/Win95/Win95TaskBarItem.cs @@ -39,5 +39,22 @@ namespace Histacom2.Engine.Template.Taskbars { tb.FocusAppFromID(ApplicationID); } + + private void panel1_Paint(object sender, PaintEventArgs e) + { + if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; + else BackColor = Color.Silver; + + var _lightBack = Paintbrush.GetLightFromColor(BackColor); + var _darkBack = Paintbrush.GetDarkFromColor(BackColor); + + var g = e.Graphics; + g.Clear(BackColor); + + g.FillRectangle(Brushes.Black, new Rectangle(0, 0, Width, Height)); + g.FillRectangle(new SolidBrush(_lightBack), new Rectangle(0, 0, Width - 1, Height - 1)); + g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2)); + g.FillRectangle(new SolidBrush(BackColor), new Rectangle(1, 1, Width - 3, Height - 3)); + } } } -- cgit v1.2.3 From 7f5d0c3915d178e4d412a0b1a9b48baf058b2afc Mon Sep 17 00:00:00 2001 From: FloppyDiskDrive Date: Sun, 17 Sep 2017 21:24:14 -0500 Subject: Added Error Blaster 95, see Description for details Error Blaster is updated with a new type: "Memory Leak." After the messageGen timer interval hits 300, the PC BSODs. Start Runner is also in there, however it is not functional due to unknown reasons. --- Histacom2.Engine/BSODCreator.cs | 4 + Histacom2.Engine/Template/Infobox95.cs | 5 + Histacom2/GlobalPrograms/WinClassicDownloader.cs | 6 + Histacom2/Histacom2.csproj | 19 + Histacom2/OS/Win95/Win95.Designer.cs | 269 +++--- Histacom2/OS/Win95/Win95.cs | 30 + Histacom2/OS/Win95/Win95.resx | 491 ++++++----- .../12padamsViruses/ErrorBlaster95.Designer.cs | 112 +++ .../Win95Apps/12padamsViruses/ErrorBlaster95.cs | 75 ++ .../Win95Apps/12padamsViruses/ErrorBlaster95.resx | 136 +++ .../12padamsViruses/StartRunner95.Designer.cs | 106 +++ .../Win95Apps/12padamsViruses/StartRunner95.cs | 65 ++ .../Win95Apps/12padamsViruses/StartRunner95.resx | 132 +++ .../Win95Apps/IE4Sites/12padams1998.Designer.cs | 2 + .../OS/Win95/Win95Apps/IE4Sites/12padams1998.cs | 18 + .../OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 21 + Histacom2/Properties/Resources.resx | 959 +++++++++++---------- Histacom2/Properties/Resources1.Designer.cs | 12 +- Histacom2/Resources/Win95Error.png | Bin 0 -> 429 bytes 19 files changed, 1603 insertions(+), 859 deletions(-) create mode 100644 Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.Designer.cs create mode 100644 Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.cs create mode 100644 Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.resx create mode 100644 Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.Designer.cs create mode 100644 Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.cs create mode 100644 Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.resx create mode 100644 Histacom2/Resources/Win95Error.png (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2.Engine/BSODCreator.cs b/Histacom2.Engine/BSODCreator.cs index fb693a9..0e1ebf1 100644 --- a/Histacom2.Engine/BSODCreator.cs +++ b/Histacom2.Engine/BSODCreator.cs @@ -17,6 +17,7 @@ namespace Histacom2.Engine Testing, WimpEnding, PiracyEnding, + Generic } public Win9XBSOD throw9XBSOD(bool except, BSODCauses type) @@ -43,6 +44,9 @@ namespace Histacom2.Engine foreach (Control ctrl in bsod.Controls) ctrl.ForeColor = System.Drawing.Color.Silver; bsod.label1.BackColor = System.Drawing.Color.Silver; bsod.label1.ForeColor = System.Drawing.Color.Black; + break; + case BSODCauses.Generic: + break; default: break; diff --git a/Histacom2.Engine/Template/Infobox95.cs b/Histacom2.Engine/Template/Infobox95.cs index 9214461..6408177 100644 --- a/Histacom2.Engine/Template/Infobox95.cs +++ b/Histacom2.Engine/Template/Infobox95.cs @@ -22,21 +22,26 @@ namespace Histacom2.Engine.Template pictureBox1.Image = Properties.Resources.Win95Info; SoundPlayer spa = new SoundPlayer(SaveSystem.currentTheme.asteriskSound); spa.Play(); + spa.Stream.Position = 0; + break; case InfoboxType.Question: pictureBox1.Image = Properties.Resources.Win95Question; SoundPlayer spq = new SoundPlayer(SaveSystem.currentTheme.questionSound); spq.Play(); + spq.Stream.Position = 0; break; case InfoboxType.Warning: pictureBox1.Image = Properties.Resources.Win95Warning; SoundPlayer spw = new SoundPlayer(SaveSystem.currentTheme.exclamationSound); spw.Play(); + spw.Stream.Position = 0; break; case InfoboxType.Error: pictureBox1.Image = Properties.Resources.Win95Error; SoundPlayer spe = new SoundPlayer(SaveSystem.currentTheme.critStopSound); spe.Play(); + spe.Stream.Position = 0; break; } diff --git a/Histacom2/GlobalPrograms/WinClassicDownloader.cs b/Histacom2/GlobalPrograms/WinClassicDownloader.cs index b809760..bb83ff6 100644 --- a/Histacom2/GlobalPrograms/WinClassicDownloader.cs +++ b/Histacom2/GlobalPrograms/WinClassicDownloader.cs @@ -49,6 +49,12 @@ namespace Histacom2.OS.Win95.Win95Apps case "Downloading: Guess The Number V1": CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop"), "Guess The Number V1 Setup.exe", "gtnv1 setup", 11, 16483); break; + case "Downloading: Error Blaster 95": + CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop"), "Error Blaster 95 Setup.exe", "eb95 setup", 11, 34846); + break; + case "Downloading: Start Runner 95": + CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop"), "Start Runner Setup.exe", "sr95 setup", 11, 34846); + break; } /* if (appName.Text == "Downloading: Start Runner") { diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index 34f8cd0..a780aa7 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -138,6 +138,18 @@ SurviveTheDay.cs + + UserControl + + + ErrorBlaster95.cs + + + UserControl + + + StartRunner95.cs + UserControl @@ -368,6 +380,12 @@ SurviveTheDay.cs + + ErrorBlaster95.cs + + + StartRunner95.cs + GuessTheNumber.cs @@ -637,6 +655,7 @@ + diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs index 6e82ab1..8f8443c 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -41,18 +41,6 @@ namespace Histacom2.OS.Win95 this.startbutton = new System.Windows.Forms.PictureBox(); this.startmenu = new System.Windows.Forms.Panel(); this.startmenuitems = new System.Windows.Forms.MenuStrip(); - this.ossidestartmenu = new System.Windows.Forms.Panel(); - this.osimage = new System.Windows.Forms.PictureBox(); - this.clockTimer = new System.Windows.Forms.Timer(this.components); - this.desktopImages = new System.Windows.Forms.ImageList(this.components); - this.desktopicons = new System.Windows.Forms.ListView(); - this.rightclickbackproperties = new System.Windows.Forms.ContextMenuStrip(this.components); - this.NewToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.desktopupdate = new System.Windows.Forms.Timer(this.components); this.ProgramsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.AccessoriesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CommunicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -111,6 +99,18 @@ namespace Histacom2.OS.Win95 this.RunToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.SuspendToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.ShutdownToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); + this.ossidestartmenu = new System.Windows.Forms.Panel(); + this.osimage = new System.Windows.Forms.PictureBox(); + this.clockTimer = new System.Windows.Forms.Timer(this.components); + this.desktopImages = new System.Windows.Forms.ImageList(this.components); + this.desktopicons = new System.Windows.Forms.ListView(); + this.rightclickbackproperties = new System.Windows.Forms.ContextMenuStrip(this.components); + this.NewToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.desktopupdate = new System.Windows.Forms.Timer(this.components); this.panel1.SuspendLayout(); this.taskbar.SuspendLayout(); this.clockPanel.SuspendLayout(); @@ -144,9 +144,9 @@ namespace Histacom2.OS.Win95 // this.taskbar.BackColor = System.Drawing.Color.Silver; this.taskbar.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicTaskBar; + this.taskbar.Controls.Add(this.startbutton); this.taskbar.Controls.Add(this.clockPanel); this.taskbar.Controls.Add(this.taskbarItems); - this.taskbar.Controls.Add(this.startbutton); this.taskbar.Dock = System.Windows.Forms.DockStyle.Bottom; this.taskbar.Location = new System.Drawing.Point(0, 452); this.taskbar.Name = "taskbar"; @@ -233,124 +233,6 @@ namespace Histacom2.OS.Win95 this.startmenuitems.Text = "StartMenu"; this.startmenuitems.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenuitems_Paint); // - // ossidestartmenu - // - this.ossidestartmenu.Controls.Add(this.osimage); - this.ossidestartmenu.Location = new System.Drawing.Point(3, 3); - this.ossidestartmenu.Name = "ossidestartmenu"; - this.ossidestartmenu.Size = new System.Drawing.Size(21, 265); - this.ossidestartmenu.TabIndex = 4; - // - // osimage - // - this.osimage.Dock = System.Windows.Forms.DockStyle.Fill; - this.osimage.Image = global::Histacom2.Properties.Resources.Win95SideBar; - this.osimage.Location = new System.Drawing.Point(0, 0); - this.osimage.Name = "osimage"; - this.osimage.Size = new System.Drawing.Size(21, 265); - this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.osimage.TabIndex = 0; - this.osimage.TabStop = false; - // - // clockTimer - // - this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick); - // - // desktopImages - // - this.desktopImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("desktopImages.ImageStream"))); - this.desktopImages.TransparentColor = System.Drawing.Color.Transparent; - this.desktopImages.Images.SetKeyName(0, "WinClassicComputer.png"); - this.desktopImages.Images.SetKeyName(1, "WinClassicFolder.png"); - this.desktopImages.Images.SetKeyName(2, "WinClassicIE3.png"); - this.desktopImages.Images.SetKeyName(3, "WinClassicInbox.png"); - this.desktopImages.Images.SetKeyName(4, "WinClassicMSN.png"); - this.desktopImages.Images.SetKeyName(5, "WinClassicNetworking.png"); - this.desktopImages.Images.SetKeyName(6, "WinClassicOutlook.png"); - this.desktopImages.Images.SetKeyName(7, "WinClassicRecycle.png"); - this.desktopImages.Images.SetKeyName(8, "Win95File.png"); - this.desktopImages.Images.SetKeyName(9, "WinClassicFolder.png"); - this.desktopImages.Images.SetKeyName(10, "WinClassicApp.png"); - this.desktopImages.Images.SetKeyName(11, "WinClassicSetup.png"); - this.desktopImages.Images.SetKeyName(12, "WinClassicNotepad.png"); - // - // desktopicons - // - this.desktopicons.Alignment = System.Windows.Forms.ListViewAlignment.Left; - this.desktopicons.BackColor = System.Drawing.Color.Teal; - this.desktopicons.BackgroundImageTiled = true; - this.desktopicons.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.desktopicons.Dock = System.Windows.Forms.DockStyle.Fill; - this.desktopicons.ForeColor = System.Drawing.Color.White; - this.desktopicons.LargeImageList = this.desktopImages; - this.desktopicons.Location = new System.Drawing.Point(0, 0); - this.desktopicons.Name = "desktopicons"; - this.desktopicons.Size = new System.Drawing.Size(640, 480); - this.desktopicons.TabIndex = 6; - this.desktopicons.UseCompatibleStateImageBehavior = false; - this.desktopicons.DoubleClick += new System.EventHandler(this.desktopicons_DoubleClick); - this.desktopicons.MouseDown += new System.Windows.Forms.MouseEventHandler(this.desktop_mousedown); - this.desktopicons.MouseMove += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseMove); - this.desktopicons.MouseUp += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseUp); - // - // rightclickbackproperties - // - this.rightclickbackproperties.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.NewToolStripMenuItem1, - this.deleteToolStripMenuItem, - this.PropertiesToolStripMenuItem1}); - this.rightclickbackproperties.Name = "ContextMenuStrip1"; - this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.rightclickbackproperties.Size = new System.Drawing.Size(128, 70); - // - // NewToolStripMenuItem1 - // - this.NewToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.NewToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FolderToolStripMenuItem, - this.TextDocumentToolStripMenuItem}); - this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; - this.NewToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); - this.NewToolStripMenuItem1.Text = "New"; - // - // FolderToolStripMenuItem - // - this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; - this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); - this.FolderToolStripMenuItem.Text = "Folder"; - this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); - // - // TextDocumentToolStripMenuItem - // - this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; - this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); - this.TextDocumentToolStripMenuItem.Text = "Text Document"; - this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click); - // - // deleteToolStripMenuItem - // - this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); - this.deleteToolStripMenuItem.Text = "Delete"; - this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); - // - // PropertiesToolStripMenuItem1 - // - this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; - this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); - this.PropertiesToolStripMenuItem1.Text = "Properties"; - this.PropertiesToolStripMenuItem1.Click += new System.EventHandler(this.PropertiesToolStripMenuItem1_Click); - // - // desktopupdate - // - this.desktopupdate.Enabled = true; - this.desktopupdate.Interval = 10000; - this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick); - // // ProgramsToolStripMenuItem // this.ProgramsToolStripMenuItem.AutoSize = false; @@ -811,10 +693,12 @@ namespace Histacom2.OS.Win95 this.ErrorBlasterToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.ErrorBlasterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.ErrorBlasterToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95Error; this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem"; this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); - this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster"; + this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster 95"; this.ErrorBlasterToolStripMenuItem.Visible = false; + this.ErrorBlasterToolStripMenuItem.Click += new System.EventHandler(this.ErrorBlasterToolStripMenuItem_Click); // // SkindowsToolStripMenuItem // @@ -978,6 +862,7 @@ 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 // @@ -1057,6 +942,124 @@ namespace Histacom2.OS.Win95 this.ShutdownToolStripMenuItem.Text = "Sh&ut Down..."; this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click); // + // ossidestartmenu + // + this.ossidestartmenu.Controls.Add(this.osimage); + this.ossidestartmenu.Location = new System.Drawing.Point(3, 3); + this.ossidestartmenu.Name = "ossidestartmenu"; + this.ossidestartmenu.Size = new System.Drawing.Size(21, 265); + this.ossidestartmenu.TabIndex = 4; + // + // osimage + // + this.osimage.Dock = System.Windows.Forms.DockStyle.Fill; + this.osimage.Image = global::Histacom2.Properties.Resources.Win95SideBar; + this.osimage.Location = new System.Drawing.Point(0, 0); + this.osimage.Name = "osimage"; + this.osimage.Size = new System.Drawing.Size(21, 265); + this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.osimage.TabIndex = 0; + this.osimage.TabStop = false; + // + // clockTimer + // + this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick); + // + // desktopImages + // + this.desktopImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("desktopImages.ImageStream"))); + this.desktopImages.TransparentColor = System.Drawing.Color.Transparent; + this.desktopImages.Images.SetKeyName(0, "WinClassicComputer.png"); + this.desktopImages.Images.SetKeyName(1, "WinClassicFolder.png"); + this.desktopImages.Images.SetKeyName(2, "WinClassicIE3.png"); + this.desktopImages.Images.SetKeyName(3, "WinClassicInbox.png"); + this.desktopImages.Images.SetKeyName(4, "WinClassicMSN.png"); + this.desktopImages.Images.SetKeyName(5, "WinClassicNetworking.png"); + this.desktopImages.Images.SetKeyName(6, "WinClassicOutlook.png"); + this.desktopImages.Images.SetKeyName(7, "WinClassicRecycle.png"); + this.desktopImages.Images.SetKeyName(8, "Win95File.png"); + this.desktopImages.Images.SetKeyName(9, "WinClassicFolder.png"); + this.desktopImages.Images.SetKeyName(10, "WinClassicApp.png"); + this.desktopImages.Images.SetKeyName(11, "WinClassicSetup.png"); + this.desktopImages.Images.SetKeyName(12, "WinClassicNotepad.png"); + // + // desktopicons + // + this.desktopicons.Alignment = System.Windows.Forms.ListViewAlignment.Left; + this.desktopicons.BackColor = System.Drawing.Color.Teal; + this.desktopicons.BackgroundImageTiled = true; + this.desktopicons.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.desktopicons.Dock = System.Windows.Forms.DockStyle.Fill; + this.desktopicons.ForeColor = System.Drawing.Color.White; + this.desktopicons.LargeImageList = this.desktopImages; + this.desktopicons.Location = new System.Drawing.Point(0, 0); + this.desktopicons.Name = "desktopicons"; + this.desktopicons.Size = new System.Drawing.Size(640, 480); + this.desktopicons.TabIndex = 6; + this.desktopicons.UseCompatibleStateImageBehavior = false; + this.desktopicons.DoubleClick += new System.EventHandler(this.desktopicons_DoubleClick); + this.desktopicons.MouseDown += new System.Windows.Forms.MouseEventHandler(this.desktop_mousedown); + this.desktopicons.MouseMove += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseMove); + this.desktopicons.MouseUp += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseUp); + // + // rightclickbackproperties + // + this.rightclickbackproperties.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.NewToolStripMenuItem1, + this.deleteToolStripMenuItem, + this.PropertiesToolStripMenuItem1}); + this.rightclickbackproperties.Name = "ContextMenuStrip1"; + this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.rightclickbackproperties.Size = new System.Drawing.Size(128, 70); + // + // NewToolStripMenuItem1 + // + this.NewToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; + this.NewToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.FolderToolStripMenuItem, + this.TextDocumentToolStripMenuItem}); + this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; + this.NewToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); + this.NewToolStripMenuItem1.Text = "New"; + // + // FolderToolStripMenuItem + // + this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; + this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.FolderToolStripMenuItem.Text = "Folder"; + this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); + // + // TextDocumentToolStripMenuItem + // + this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; + this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.TextDocumentToolStripMenuItem.Text = "Text Document"; + this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click); + // + // deleteToolStripMenuItem + // + this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.deleteToolStripMenuItem.Text = "Delete"; + this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); + // + // PropertiesToolStripMenuItem1 + // + this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; + this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; + this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); + this.PropertiesToolStripMenuItem1.Text = "Properties"; + this.PropertiesToolStripMenuItem1.Click += new System.EventHandler(this.PropertiesToolStripMenuItem1_Click); + // + // desktopupdate + // + this.desktopupdate.Enabled = true; + this.desktopupdate.Interval = 10000; + this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick); + // // Windows95 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1095,7 +1098,6 @@ namespace Histacom2.OS.Win95 private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Panel panel2; internal System.Windows.Forms.Panel taskbar; - internal System.Windows.Forms.PictureBox startbutton; internal System.Windows.Forms.Label taskbartime; internal System.Windows.Forms.Panel startmenu; internal System.Windows.Forms.MenuStrip startmenuitems; @@ -1172,5 +1174,6 @@ namespace Histacom2.OS.Win95 internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; internal System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3; public System.Windows.Forms.Panel clockPanel; + public System.Windows.Forms.PictureBox startbutton; } } \ No newline at end of file diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index eb6b018..926aea0 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -10,6 +10,9 @@ using Histacom2.Engine.Template.Taskbars; using Histacom2.OS.Win95.Win95Apps; using Histacom2.OS.Win95.Win95Apps.Story; using static Histacom2.Engine.SaveSystem; +using Histacom2.OS.Win95.Win95Apps._12padamViruses; +using Histacom2.OS.Win95.Win95Apps._12padamsViruses; + namespace Histacom2.OS.Win95 { public partial class Windows95 : Form @@ -313,6 +316,7 @@ namespace Histacom2.OS.Win95 { wm.StartInfobox95("Caught it!", "If you were to run this, the game would crash!\nLuckily, it won't crash this time!", InfoboxType.Error, InfoboxButtons.OK); } + else { // It is an actual file on the disk @@ -654,6 +658,32 @@ namespace Histacom2.OS.Win95 gfx.DrawLine(new Pen(_lightBack), 1, startmenu.Height - 3, 1, 1); gfx.DrawLine(new Pen(_lightBack), startmenu.Width - 3, 1, 1, 1); } + + private void ErrorBlasterToolStripMenuItem_Click(object sender, EventArgs e) + { + WinClassic app = wm.Init(new ErrorBlaster95(), "Welcome to Error Blaster 95!", null, false, false, false, false); + AddTaskBarItem(app, app.Tag.ToString(), "Welcome to Error Blaster 95!", null); + + nonimportantapps.Add(app); + nonimportantapps[nonimportantapps.Count - 1].BringToFront(); + nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing); + + app.BringToFront(); + startmenu.Hide(); + } + + private void FilesOrFoldersToolStripMenuItem_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); + + nonimportantapps.Add(app); + nonimportantapps[nonimportantapps.Count - 1].BringToFront(); + nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing); + + app.BringToFront(); + startmenu.Hide(); + } } } diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx index 2711895..3aabd22 100644 --- a/Histacom2/OS/Win95/Win95.resx +++ b/Histacom2/OS/Win95/Win95.resx @@ -120,9 +120,249 @@ 17, 17 - - 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 + kgEOwCAIA3m6T/NnG6UwBZ1bk6pTemIy2am1dlX70VlR3Hu/IBE1wr5/BOEQymFZLRvIHMZtGjUjEHOG + mIdS214UkGi92qM5zDnCENfYn+0AQvAxC2/nHsNe+HgLwCbEmW1HmLOOZtYuAB0SJKAsivAPgBXpOgNQ + PPwCyDcF4M0TAIZw84CUgq1TF2xvhP+oACBCAoBW9dg6szWLzeUZs9Y/7mQNVMCjOPywyA3MF+cOKQF9 + RAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAKpJREFUOE/N + UskNgDAMy+gdrZsVO3cL/HhgySKJD/WB/BdjjNXpZ9wFu+R+QwTmnDAtY5UsbErOGuiIIKmBoJYwwEJ7 + QZbEk066qCHbo8R0Qj0OPbA1vrxpCKxSm3dPIYWtwMNED28Fp5Ai7lWwe17DFNKwFRBHmKj2EDCZ4eEF + pxeIdj+AnH33gtIeGO11jAJQw20X+5nAG7SE5GykuTO1V5yGHur3LyFyAZP8TrljsWNAAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcwxstlzQAAALVJREFU + OE+dj4ERwyAMAxmd0diMImMZYaC9q3xOIJaeUP5Q936r1tpz+wgi4ATR3Huxbq1FC4ihHWDDEWM4A9jD + ukJczzBqRl8AD+iVMgB1B7j5BGATpqgJ4XfbeTi8vt8ANnCAn2JvnZuH4RvADKgx5MnHfAHm/bMB0j8A + KnueAEjX+Bs+1RcAiBBITWYUACEjssIQAFAOmzmissoAKF9FARvkFqYAySACxvh7WEXQWP4IlvIBh1rl + tmCAq4kAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcZhHn9oQAAAJ9JREFU + OE+VkAEOxCAIBH26P6s/8zrgeqTS05uEKMouaNnQR/zPdZVeazWDsZ6DuHfv3lqz8JsDJKYrgRiyKZYz + ieFOpxhiscxH6sIojuMLCV669lD8nYAQi1CosxusE7DCoQG44L6SyPL4hBic2ftJnhMQQsVvWHH8SPLs + E3dME/aZwYnRfBIholB3I00xE1amIDLBscmu8Bdm4NuMUj70z1LCUTedOwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcbanecjQAAAItJREFU + OE+VjgEOhCAMBHk6T+Nn2iFuXEEtTLLBbNu5K6LWeuzkOruhXCXWvwWttd9cv74miLrHu1TASyQAHSr0 + /chh4PiBz/iO9W+B/mpUj6hPBbxEEtChQt+PHAbOKBCpgGUl6qlLBbxkFKgn9P3IYeCMApEKWFaEd1uC + t6QC3iyxPgsCDVYTlHICH5QKXtIjRNoAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCgUfVCd0wAAAHpJREFU + OE+djgsOgDAIQzn6bubRlF+zOZV1vqRBGK0IS2vthHK0ZjQBHdcBhcllc9t7UJnsvSSM4tKWM03cAvLM + Ve3YwNBPuqYCJONxVbGvCnABSx2QfwJjK0c03wHYzjq1RICB7WRsf10AeU9dQPAasCu19YAEww2JXJGJ + 13tFDjjJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAMFJREFUOE+V + kAsShDAIQzk6R/Nm3SSU2g/uaJxMi5Bnq81yt0b38pCbnz03hGDtEaYq0HVdraF9QBiORoAyXIFKyAhO + IG6m8P+TRDDMPV4JkBDWGkSNYe0JcS8AGoArAEPYDcjQAcgheL9CCVkAU1iP3sd9887L8akDkE//OoMo + ByhSkxYAl3x0EgTg6QTk3FZ/B6TRpLSiHoAOpXWVR8D4wgYopMad7KAPgJQGIh3WMbEu/+CFNEhAhKPu + /qQXQbMf8nZYxbrHLzUAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR + EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H + UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY + oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABzSURBVDhPxZBR + DsAgCEM9ukfzZowW9UdFmUtG8mR0UtiSiFwxFSPYkbO8gb31gXahDBOdb9MhsHCoUzsJ4J0WdNRiFaUU + 36BtgIsrXAPEcGHHsAFF+4yT/M8GCP4Pa2z5iw26EEUNMNyc4rAXxw1T8RxJD2E2VfJhfZIbAAAAAElF + TkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAH9JREFUOE+l + jgESgCAIBHk6T/NnxjFCVlBKzJyhc7sTEXH/FzmYqJSLYHdCAc40AMaOqQmGBJMKmOVx7B6UeUGgsMQk + +jV4RQDYAri1dsKTBPMqcBilG/z5BwZbIgkmFNxhl0ww7trdESDo2K7dTJBGOrZrNxLszENQiQvq4X4A + JbFDpxtWNlIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB + DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP + YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy + BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR + EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA + QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI + qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA + AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAADBSURBVDhPhZAB + GoUgCIM9ukfrZj02mBJhb32U5v6JjpfmuGP0pQ8PAg4h0/6jbKj1xgcDniYEMGTDGpR0CLCJAIPnfV2X + 5lve4hTMXbirjVETQHQQtaX23LFN9mIRXtMCh14BIirctm/yiyGNkB7mHvxXAgTj/Os4jegzmHeVQ3KA + TWlAq7UUQOgUYE3KxCDMXd5drEGnADfz/Qj6d4QC569ZukoKUwfrq3ugewmgnmgP5eCztGaVFK0HnJUB + VdEYP35ybB/eOVN7AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAK5JREFUOE+V + kAESwyAIBH06T/Nnlju8FNFJ7c0w0sBuTVqNWRu15uh3sDzGXleiDJsZlnleiyTwloXgzGLVUTIfcqH3 + zhO/UZrlG20S/RNg9JLodSSUAD045gR/JUj0vsoeM/SEkRAosVBhQTgPgvy1lfVWBazw8KGxsiiDGdbr + gKfAWwJIFp3AuFF8WPAUaOBPwuJJSwuomjNmWcqiF/CBczbRLVjziP4Fay7A1j6MmatnPf0QdQAAAABJ + RU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB + DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX + VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ + aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME + Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 + NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j + Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m + M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK + 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + 153, 17 @@ -134,7 +374,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO - hAAAAk1TRnQBSQFMAgEBDQEAAfQBAgH0AQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + hAAAAk1TRnQBSQFMAgEBDQEAASwBAwEsAQMBIAEAASABAAT/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/ @@ -708,249 +948,6 @@ 580, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N - kgEOwCAIA3m6T/NnG6UwBZ1bk6pTemIy2am1dlX70VlR3Hu/IBE1wr5/BOEQymFZLRvIHMZtGjUjEHOG - mIdS214UkGi92qM5zDnCENfYn+0AQvAxC2/nHsNe+HgLwCbEmW1HmLOOZtYuAB0SJKAsivAPgBXpOgNQ - PPwCyDcF4M0TAIZw84CUgq1TF2xvhP+oACBCAoBW9dg6szWLzeUZs9Y/7mQNVMCjOPywyA3MF+cOKQF9 - RAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAKpJREFUOE/N - UskNgDAMy+gdrZsVO3cL/HhgySKJD/WB/BdjjNXpZ9wFu+R+QwTmnDAtY5UsbErOGuiIIKmBoJYwwEJ7 - QZbEk066qCHbo8R0Qj0OPbA1vrxpCKxSm3dPIYWtwMNED28Fp5Ai7lWwe17DFNKwFRBHmKj2EDCZ4eEF - pxeIdj+AnH33gtIeGO11jAJQw20X+5nAG7SE5GykuTO1V5yGHur3LyFyAZP8TrljsWNAAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcwxstlzQAAALVJREFU - OE+dj4ERwyAMAxmd0diMImMZYaC9q3xOIJaeUP5Q936r1tpz+wgi4ATR3Huxbq1FC4ihHWDDEWM4A9jD - ukJczzBqRl8AD+iVMgB1B7j5BGATpqgJ4XfbeTi8vt8ANnCAn2JvnZuH4RvADKgx5MnHfAHm/bMB0j8A - KnueAEjX+Bs+1RcAiBBITWYUACEjssIQAFAOmzmissoAKF9FARvkFqYAySACxvh7WEXQWP4IlvIBh1rl - tmCAq4kAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcZhHn9oQAAAJ9JREFU - OE+VkAEOxCAIBH26P6s/8zrgeqTS05uEKMouaNnQR/zPdZVeazWDsZ6DuHfv3lqz8JsDJKYrgRiyKZYz - ieFOpxhiscxH6sIojuMLCV669lD8nYAQi1CosxusE7DCoQG44L6SyPL4hBic2ftJnhMQQsVvWHH8SPLs - E3dME/aZwYnRfBIholB3I00xE1amIDLBscmu8Bdm4NuMUj70z1LCUTedOwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcbanecjQAAAItJREFU - OE+VjgEOhCAMBHk6T+Nn2iFuXEEtTLLBbNu5K6LWeuzkOruhXCXWvwWttd9cv74miLrHu1TASyQAHSr0 - /chh4PiBz/iO9W+B/mpUj6hPBbxEEtChQt+PHAbOKBCpgGUl6qlLBbxkFKgn9P3IYeCMApEKWFaEd1uC - t6QC3iyxPgsCDVYTlHICH5QKXtIjRNoAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCgUfVCd0wAAAHpJREFU - OE+djgsOgDAIQzn6bubRlF+zOZV1vqRBGK0IS2vthHK0ZjQBHdcBhcllc9t7UJnsvSSM4tKWM03cAvLM - Ve3YwNBPuqYCJONxVbGvCnABSx2QfwJjK0c03wHYzjq1RICB7WRsf10AeU9dQPAasCu19YAEww2JXJGJ - 13tFDjjJAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAMFJREFUOE+V - kAsShDAIQzk6R/Nm3SSU2g/uaJxMi5Bnq81yt0b38pCbnz03hGDtEaYq0HVdraF9QBiORoAyXIFKyAhO - IG6m8P+TRDDMPV4JkBDWGkSNYe0JcS8AGoArAEPYDcjQAcgheL9CCVkAU1iP3sd9887L8akDkE//OoMo - ByhSkxYAl3x0EgTg6QTk3FZ/B6TRpLSiHoAOpXWVR8D4wgYopMad7KAPgJQGIh3WMbEu/+CFNEhAhKPu - /qQXQbMf8nZYxbrHLzUAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR - EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H - UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY - oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABzSURBVDhPxZBR - DsAgCEM9ukfzZowW9UdFmUtG8mR0UtiSiFwxFSPYkbO8gb31gXahDBOdb9MhsHCoUzsJ4J0WdNRiFaUU - 36BtgIsrXAPEcGHHsAFF+4yT/M8GCP4Pa2z5iw26EEUNMNyc4rAXxw1T8RxJD2E2VfJhfZIbAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAH9JREFUOE+l - jgESgCAIBHk6T/NnxjFCVlBKzJyhc7sTEXH/FzmYqJSLYHdCAc40AMaOqQmGBJMKmOVx7B6UeUGgsMQk - +jV4RQDYAri1dsKTBPMqcBilG/z5BwZbIgkmFNxhl0ww7trdESDo2K7dTJBGOrZrNxLszENQiQvq4X4A - JbFDpxtWNlIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB - DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP - YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy - BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR - EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA - QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI - qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA - AABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAADBSURBVDhPhZAB - GoUgCIM9ukfrZj02mBJhb32U5v6JjpfmuGP0pQ8PAg4h0/6jbKj1xgcDniYEMGTDGpR0CLCJAIPnfV2X - 5lve4hTMXbirjVETQHQQtaX23LFN9mIRXtMCh14BIirctm/yiyGNkB7mHvxXAgTj/Os4jegzmHeVQ3KA - TWlAq7UUQOgUYE3KxCDMXd5drEGnADfz/Qj6d4QC569ZukoKUwfrq3ugewmgnmgP5eCztGaVFK0HnJUB - VdEYP35ybB/eOVN7AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAK5JREFUOE+V - kAESwyAIBH06T/Nnlju8FNFJ7c0w0sBuTVqNWRu15uh3sDzGXleiDJsZlnleiyTwloXgzGLVUTIfcqH3 - zhO/UZrlG20S/RNg9JLodSSUAD045gR/JUj0vsoeM/SEkRAosVBhQTgPgvy1lfVWBazw8KGxsiiDGdbr - gKfAWwJIFp3AuFF8WPAUaOBPwuJJSwuomjNmWcqiF/CBczbRLVjziP4Fay7A1j6MmatnPf0QdQAAAABJ - RU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB - DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX - VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ - aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ - 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME - Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN - upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 - NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j - Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I - gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m - M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh - EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK - 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 - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - 92 diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.Designer.cs b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.Designer.cs new file mode 100644 index 0000000..6035a1a --- /dev/null +++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.Designer.cs @@ -0,0 +1,112 @@ +namespace Histacom2.OS.Win95.Win95Apps._12padamViruses +{ + partial class ErrorBlaster95 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ErrorBlaster95)); + this.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); + this.classicButton3 = new Histacom2.Engine.UI.ClassicButton(); + this.label1 = new System.Windows.Forms.Label(); + this.classicButton2 = new Histacom2.Engine.UI.ClassicButton(); + this.SuspendLayout(); + // + // classicButton1 + // + this.classicButton1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.classicButton1.BackColor = System.Drawing.Color.Silver; + this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton1.ForeColor = System.Drawing.Color.Black; + this.classicButton1.Location = new System.Drawing.Point(16, 219); + this.classicButton1.Name = "classicButton1"; + this.classicButton1.Size = new System.Drawing.Size(73, 38); + this.classicButton1.TabIndex = 18; + this.classicButton1.Text = "Infect"; + this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click); + // + // classicButton3 + // + this.classicButton3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.classicButton3.BackColor = System.Drawing.Color.Silver; + this.classicButton3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton3.ForeColor = System.Drawing.Color.Black; + this.classicButton3.Location = new System.Drawing.Point(353, 219); + this.classicButton3.Name = "classicButton3"; + this.classicButton3.Size = new System.Drawing.Size(75, 38); + this.classicButton3.TabIndex = 20; + this.classicButton3.Text = "Exit"; + this.classicButton3.Click += new System.EventHandler(this.classicButton3_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(11, 2); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(423, 169); + this.label1.TabIndex = 21; + this.label1.Text = resources.GetString("label1.Text"); + // + // classicButton2 + // + this.classicButton2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.classicButton2.BackColor = System.Drawing.Color.Silver; + this.classicButton2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton2.ForeColor = System.Drawing.Color.Black; + this.classicButton2.Location = new System.Drawing.Point(95, 219); + this.classicButton2.Name = "classicButton2"; + this.classicButton2.Size = new System.Drawing.Size(75, 38); + this.classicButton2.TabIndex = 19; + this.classicButton2.Text = "Remove"; + this.classicButton2.Click += new System.EventHandler(this.classicButton2_Click); + // + // ErrorBlaster95 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.label1); + this.Controls.Add(this.classicButton3); + this.Controls.Add(this.classicButton2); + this.Controls.Add(this.classicButton1); + this.Name = "ErrorBlaster95"; + this.Size = new System.Drawing.Size(447, 265); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Engine.UI.ClassicButton classicButton1; + private Engine.UI.ClassicButton classicButton3; + private System.Windows.Forms.Label label1; + private Engine.UI.ClassicButton classicButton2; + } +} diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.cs b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.cs new file mode 100644 index 0000000..3d6f064 --- /dev/null +++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Histacom2.Engine; +using System.Drawing.Text; +using static Histacom2.Engine.SaveSystem; + +namespace Histacom2.OS.Win95.Win95Apps._12padamViruses +{ + public partial class ErrorBlaster95 : UserControl + { + Timer messageGen = new Timer(); + Random messageChooser = new Random(); + WindowManager wm = new WindowManager(); + private static PrivateFontCollection pfc = new PrivateFontCollection(); + public ErrorBlaster95() + { + InitializeComponent(); + messageGen.Interval = 3000; + messageGen.Tick += MessageGen_Tick; + pfc.AddFontFile(DataDirectory + "\\LeviWindows.ttf"); + label1.Font=new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + } + + private void MessageGen_Tick(object sender, EventArgs e) + { + int messageRandomizer = messageChooser.Next(1, 3); + switch (messageRandomizer) + { + case 1: + wm.StartInfobox95("Alert!", "A virus has been detected on your computer! Press OK to disinfect!", Engine.Template.InfoboxType.Error, Engine.Template.InfoboxButtons.OK); + messageGen.Interval -= 300; + break; + + case 2: + wm.StartInfobox95("Microsoft Security Alert", "Microsoft says to install UltraSurpremeAntiVirus1998 to get rid of any viruses!", Engine.Template.InfoboxType.Info, Engine.Template.InfoboxButtons.OK); + messageGen.Interval -= 300; + break; + case 3: + wm.StartInfobox95("Error", "A BSOD.exe virus has been found on your computer!", Engine.Template.InfoboxType.Warning, Engine.Template.InfoboxButtons.OK); + messageGen.Interval -= 300; + break; + } + if (messageGen.Interval == 300) + { + messageGen.Stop(); + + BSODCreator bs = new BSODCreator(); + + bs.throw9XBSOD(true, BSODCreator.BSODCauses.Generic); + } + } + + private void classicButton3_Click(object sender, EventArgs e) + { + ParentForm.Close(); + } + + private void classicButton1_Click(object sender, EventArgs e) + { + messageGen.Start(); + } + + private void classicButton2_Click(object sender, EventArgs e) + { + messageGen.Stop(); + } + } +} diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.resx b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.resx new file mode 100644 index 0000000..71d9882 --- /dev/null +++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/ErrorBlaster95.resx @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Virus Name: Virus.Win9x.ErrorBlaster +Virus Type: Scareware/Memory Leak +Purpose: To force the user into doing a specific type of action to remove the virus. +Effect: Various infoboxes at random times will show up, alerting you about false +infections until the user is forced to buy a rogue antivirus to "remove" the virus. + +Hey there, thanks for downloading this ErrorBlaster sample from my website! +This virus can be very annoying and is very common. +The infoboxes will show up at random, first showing anywhere from one to three seconds +and will decrease every 300 milliseconds. + +Note: Clicking "Remove" will disinfect but will not remove the infoboxes opened. +Warning: A BSOD will occur over elongated periods of use. + + + \ No newline at end of file diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.Designer.cs b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.Designer.cs new file mode 100644 index 0000000..01ac2e2 --- /dev/null +++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.Designer.cs @@ -0,0 +1,106 @@ +namespace Histacom2.OS.Win95.Win95Apps._12padamsViruses +{ + partial class StartRunner95 + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(StartRunner95)); + this.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); + this.classicButton2 = new Histacom2.Engine.UI.ClassicButton(); + this.classicButton3 = new Histacom2.Engine.UI.ClassicButton(); + this.label2 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // classicButton1 + // + this.classicButton1.BackColor = System.Drawing.Color.Silver; + this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton1.ForeColor = System.Drawing.Color.Black; + this.classicButton1.Location = new System.Drawing.Point(16, 168); + this.classicButton1.Name = "classicButton1"; + this.classicButton1.Size = new System.Drawing.Size(75, 23); + this.classicButton1.TabIndex = 11; + this.classicButton1.Text = "Infect"; + this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click); + // + // classicButton2 + // + this.classicButton2.BackColor = System.Drawing.Color.Silver; + this.classicButton2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton2.ForeColor = System.Drawing.Color.Black; + this.classicButton2.Location = new System.Drawing.Point(97, 168); + this.classicButton2.Name = "classicButton2"; + this.classicButton2.Size = new System.Drawing.Size(75, 23); + this.classicButton2.TabIndex = 12; + this.classicButton2.Text = "Remove"; + this.classicButton2.Click += new System.EventHandler(this.classicButton2_Click); + // + // classicButton3 + // + this.classicButton3.BackColor = System.Drawing.Color.Silver; + this.classicButton3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton3.ForeColor = System.Drawing.Color.Black; + this.classicButton3.Location = new System.Drawing.Point(293, 168); + this.classicButton3.Name = "classicButton3"; + this.classicButton3.Size = new System.Drawing.Size(75, 23); + this.classicButton3.TabIndex = 13; + this.classicButton3.Text = "Exit"; + this.classicButton3.Click += new System.EventHandler(this.classicButton3_Click); + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(13, 23); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(355, 117); + this.label2.TabIndex = 10; + this.label2.Text = resources.GetString("label2.Text"); + // + // StartRunner95 + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.classicButton3); + this.Controls.Add(this.classicButton2); + this.Controls.Add(this.classicButton1); + this.Controls.Add(this.label2); + this.Name = "StartRunner95"; + this.Size = new System.Drawing.Size(383, 208); + this.Load += new System.EventHandler(this.StartRunner95_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private Engine.UI.ClassicButton classicButton1; + private Engine.UI.ClassicButton classicButton2; + private Engine.UI.ClassicButton classicButton3; + internal System.Windows.Forms.Label label2; + } +} diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.cs b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.cs new file mode 100644 index 0000000..579f001 --- /dev/null +++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using Histacom2.Engine; +using System.Drawing.Text; +using static Histacom2.Engine.SaveSystem; +using Histacom2.OS.Win95; + +namespace Histacom2.OS.Win95.Win95Apps._12padamsViruses +{ + public partial class StartRunner95 : UserControl + { + Point beginLocation; + int taskbarLength; + int xLocation; + Timer moveStart = new Timer(); + private static PrivateFontCollection pfc = new PrivateFontCollection(); + Windows95 w = new Windows95(); + public StartRunner95() + { + InitializeComponent(); + pfc.AddFontFile(DataDirectory + "\\LeviWindows.ttf"); + label2.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + beginLocation = w.startbutton.Location; + moveStart.Interval = 300; + moveStart.Tick += MoveStart_Tick; + + } + + private void MoveStart_Tick(object sender, EventArgs e) + { + int taskbarWidth = w.taskbar.Size.Width; + Random random = new Random(); + xLocation = random.Next(1, taskbarWidth); + w.startbutton.Location = new Point(xLocation, w.startbutton.Location.Y); + } + + private void classicButton1_Click(object sender, EventArgs e) + { + moveStart.Start(); + } + + private void StartRunner95_Load(object sender, EventArgs e) + { + + } + + private void classicButton2_Click(object sender, EventArgs e) + { + moveStart.Stop(); + w.startbutton.Location = beginLocation; + } + + private void classicButton3_Click(object sender, EventArgs e) + { + ParentForm.Close(); + } + } +} diff --git a/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.resx b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.resx new file mode 100644 index 0000000..f8ee0b3 --- /dev/null +++ b/Histacom2/OS/Win95/Win95Apps/12padamsViruses/StartRunner95.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Virus Name: Start Runner +Virus Type: Joke Program +Purpose: A fun prank to pull on April Fools' Day! +Effect: The start button will move side to side along the taskbar. + +Hey there! Thanks for installing this joke program from my website! +This is a fairly common joke program often found in email chains. +How this works is simple; it simply moves your startbutton from side-to-side. +To remove, simply press the remove button on this window. + + + \ No newline at end of file diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.Designer.cs b/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.Designer.cs index 29a63e4..e1bc705 100644 --- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.Designer.cs @@ -275,6 +275,7 @@ this.button7.TabIndex = 12; this.button7.Text = "Download"; this.button7.UseVisualStyleBackColor = false; + this.button7.Click += new System.EventHandler(this.button7_Click); // // label13 // @@ -297,6 +298,7 @@ this.button6.TabIndex = 10; this.button6.Text = "Download"; this.button6.UseVisualStyleBackColor = false; + this.button6.Click += new System.EventHandler(this.button6_Click); // // label12 // diff --git a/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.cs b/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.cs index bedfe56..13c22c6 100644 --- a/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.cs +++ b/Histacom2/OS/Win95/Win95Apps/IE4Sites/12padams1998.cs @@ -145,5 +145,23 @@ namespace Histacom2.OS.Win95.Win95Apps.IE4Sites opendownload.appName.Text = "Downloading: Guess The Number V1"; opendownload.amountToDL = 16; } + + private void button7_Click(object sender, EventArgs e) + { + WinClassicDownloader opendownload = new WinClassicDownloader(); + WindowManager wm = new WindowManager(); + wm.Init(opendownload, "Downloader", null, false, true); + opendownload.appName.Text = "Downloading: Error Blaster 95"; + opendownload.amountToDL = 32; + } + + private void button6_Click(object sender, EventArgs e) + { + WinClassicDownloader opendownload = new WinClassicDownloader(); + WindowManager wm = new WindowManager(); + wm.Init(opendownload, "Downloader", null, false, true); + opendownload.appName.Text = "Downloading: Start Runner 95"; + opendownload.amountToDL = 32; + } } } diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index 9c7e2a3..519e14d 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -13,6 +13,7 @@ using Histacom2.Engine; using Newtonsoft.Json; using Histacom2.Engine.Template; using System.Diagnostics; +using Histacom2.OS.Win95.Win95Apps._12padamViruses; namespace Histacom2.OS.Win95.Win95Apps { @@ -350,6 +351,26 @@ namespace Histacom2.OS.Win95.Win95Apps Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront(); Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(Program.NonImportantApp_Closing); + break; + case "eb95 setup": + Win95Installer ebInstall = new Win95Installer("Error Blaster 95"); + ebInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = 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(); + break; + case "error blaster": + WinClassic eb = wm.Init(new ErrorBlaster95(), "Welcome to Error Blaster 95!", null, true, true); + Program.AddTaskbarItem(eb, eb.Tag.ToString(), "Welcome to Error Blaster 95!", null); + Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront(); + Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(Program.NonImportantApp_Closing); + break; + case "sr95 setup": + Win95Installer srInstall = new Win95Installer("Start Runner 95"); + srInstall.InstallCompleted += (sender, args) => TitleScreen.frm95.ErrorBlasterToolStripMenuItem.Visible = true; + WinClassic install = wm.Init(srInstall, "Start Runner 95 Setup", null, true, true); + Program.AddTaskbarItem(install, install.Tag.ToString(), "Error Blaster 95 Setup", null); + install.BringToFront(); break; default: wm.StartInfobox95(path.Replace(ProfileMyComputerDirectory, "C:"), $"{path.Replace(ProfileMyComputerDirectory, "C:")} is not a valid Win32 application.", InfoboxType.Error, InfoboxButtons.OK); diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx index 6c51cf6..adf568b 100644 --- a/Histacom2/Properties/Resources.resx +++ b/Histacom2/Properties/Resources.resx @@ -121,204 +121,328 @@ ..\Resources\WinClassic\WinClassicDisplayExample.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\titlescreen\Histacom2_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicAddressBookNewIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassicAbout95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\winclassicmsn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\modem_dial.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\IE4\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win95NetworkIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\GuessTheNumber\GTN95_Lower.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\WinClassic\AIMmessagesent.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\resources\winclassic\win95start.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\termMark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassicmsn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Win95ComputerIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minsweeper smile.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicInstallPic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\WinClassicAddressBookDeleteIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MinesweepNumBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\truecolor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\termSettings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win95Info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Win95File.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wmsui32_1001.ico_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Win95WordpadIcon2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\termNothing.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Win98Computer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\tada.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\wordpad_printpreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\AIMbuddyleave.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\WinClassic\Win95HardDiskIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win98Start.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\IE3\IE3_StopHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassictime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\win95_welcome.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win95ComputerIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\termCopy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\WinClassicUndo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\std_gobeep.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\resources\winclassic\winclassicsetup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\modem_dial.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\resources\winclassic\winclassicsettings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Win95PrintersFolder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\WinClassicHWCV.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\winclassicfolder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\termMax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\termNothing.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassicnetworking.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Win95IconNotepad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Win98SideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicRegedit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\XCross_highlighted.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\winclassicsuspend.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassicclock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\winclassicdocuments.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\AIMfile.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\resources\lemon's lcd.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\resources\ie4\google.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\GuessTheNumber\GTN95_RestartClicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE3\IE3_Forward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\std_beep.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 ..\Resources\WinClassic\Win95Warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ie4_favorites.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ie4_history.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\resources\winclassic\winclassicshutdown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ie4_hsplitter2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IE3\IE3_SwirlyThings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\IE4\start_googlink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IE4\ie4about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\256color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicApp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win95PrintersFolder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ICTheme_BG.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ie4_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\termMax.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\16color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\GuessTheNumber\GTN95_CheckClicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAFJJREFUOE9j - oBpoaGj4j46hUoQBSPGBAwf+///PgEITZQguzciGYMNQ7RADSAVQAyCGIAzA7gJsNFYDiNUMokddQAsX - kIPhBkABTIBUPOCAgQEAB3nmEC2x2cUAAAAASUVORK5CYII= - + + ..\Resources\wordpad_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ie4_vsplitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\GuessTheNumber\GTN95_Correct.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win95HardDiskIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\icon128x.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\WinClassicCalc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\winclassicfind.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassicrun.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\winclassicsettings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ie4_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\LauncherSideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\termCopy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ie4_home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minsweeper flag.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ie4_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\AIMmessagereceived.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\resources\winclassic\winclassicie4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassiccomputer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicGTN.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win95RecycleIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\winclassichelp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\shell32_21.ico_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\GuessTheNumber\GTN95_Restart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win95IconNotepad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IE3\IE3_ForwardHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassicsuspend.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ie4_stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassicprograms.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\minesweepSquare0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassictaskbar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicFTP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\WinClassicWordpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Win98WebBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win95DesktopIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\LeviWindows.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\WinClassic\WinClassicOpenFolderSmall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\AchievementMines.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\XCross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\MSDOSPromptToolStripMenuItem1.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win98Stop.WAV;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\minesweepSquareMine.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassicie4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Win95Help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minsweeper sad.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\minesweepSquareQuestion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - { - "start": { - "time": "4:00 AM", - "txt": "You are laying in bed surrounded by darkness. You look to your right and see in big red numbers 4:00 AM displayed on your alarm clock.", - "over": false, - "overtxt": "", - "btn1txt": "Get Out Of Bed", - "btn1tag": "inthedark", - "btn2txt": "Sleep Until 8:00 AM", + + ..\Resources\IE4\start_googlink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win95ControlPanelIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_hsplitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\minesweepSquare1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\TimeDistorter1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\WinClassicFTPIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win98Start.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\WinClassic\WinClassicMinesweeper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\winclassiccomputer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\tada.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\minsweeper smile.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\minsweeper sad.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\AIMfile.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\resources\winclassic\winclassicprogramitem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\256color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\XCross_highlighted.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\winclassicrun.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\minesweepSquareWrong.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win95Info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Win98SideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_favorites.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassicRtfFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE3\IE3_BackHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ButtonPattern.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SeizureWarning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\sliversilver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\minesweepSquare7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\termPaste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\winclassicrecycle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win95RecycleIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\minesweepSquare.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\winclassicnetworking.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\WinClassicCalcBig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\minesweepSquare4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\distort1.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\wordpad_italic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\WinClassicEndingsIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\termFont.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + { + "start": { + "time": "4:00 AM", + "txt": "You are laying in bed surrounded by darkness. You look to your right and see in big red numbers 4:00 AM displayed on your alarm clock.", + "over": false, + "overtxt": "", + "btn1txt": "Get Out Of Bed", + "btn1tag": "inthedark", + "btn2txt": "Sleep Until 8:00 AM", "btn2tag": "snooze", "btn3txt": "Turn On The Alarm Clock Radio", "btn3tag": "theradio", @@ -441,386 +565,148 @@ } } - - ..\Resources\WinClassic\WinClassicEndingsLocked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\titlescreen\taskbarbutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\LauncherSideBar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\AIMbuddyjoin.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\ie4_hsplitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinAboutSeparator95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ie4_stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\winclassic\winclassicrecycle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\winclassic\winclassicprogramitem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\LeviWindows.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\WinClassic\sliversilver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\IE4\ie4about.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Win2000WebBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassicGENERALApplicationToolBoxBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\termFont.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Win98WebBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ie4_back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\termSettings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\winclassic\tada.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\Win95Help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\std_gobeep.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\IE4\start_padamslink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\winclassic\winclassicstart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ie4_search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\winclassic\winclassictaskbaritem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicEndings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\winclassicprograms.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\std_beep.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\HistacomIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB - DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX - VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ - aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== - + + ..\Resources\wordpad_paste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassicdocuments.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\ie4\google.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ie4_history.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicAddressBookDeleteIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\windows_command_prompt.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\win95_splitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\IE4\nopage.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\DCTheme_BG.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\icon128x.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\winclassic\winclassicinbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ie4_hsplitter1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\termMark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\titlescreen\taskbarclock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB - DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP - YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy - BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC - - - - ..\Resources\ie4_print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\IE4\start.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\winclassic\winclassicfolder.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ - 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME - Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu - QmCC - - - - ..\Resources\win95_welcome.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\Win95ControlPanelIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ie4_forward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ICTheme_BG.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\minesweepSquare6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\win95sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\wordpad_print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ie4_home.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\minesweepSquareExploded.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\win95_welcometip.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\winclassicfind.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicPaste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\winclassic\winclassicoutlook.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\Win98Computer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicAddressBookPropertiesIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\termPaste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicInstallPic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\winclassic\winclassichelp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicAddressBookNewIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ie4_mail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\SeizureWarning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\Win95File.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicApp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicMinesweeper.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\MSDOSPromptToolStripMenuItem1.Image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicEndingsIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicCalcBig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicNotepadBig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\WinClassic\WinClassicRegedit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\MinesweepNumBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\AchievementMines.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\distort1.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\EndingDestruction.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\EndingPiracy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\resources\lemon's lcd.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\minesweepSquare.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\GuessTheNumber\GTN95_Check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minesweepSquare0.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\win95_splitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minesweepSquare1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\winclassicclock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\minesweepSquare2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minesweepSquare3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\minesweepSquare4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\minesweepSquare5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAFJJREFUOE9j + oBpoaGj4j46hUoQBSPGBAwf+///PgEITZQguzciGYMNQ7RADSAVQAyCGIAzA7gJsNFYDiNUMokddQAsX + kIPhBkABTIBUPOCAgQEAB3nmEC2x2cUAAAAASUVORK5CYII= + - - ..\Resources\minesweepSquare6.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassicAbout95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minesweepSquare7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\EndingPiracy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\minesweepSquare8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\minesweepSquareExploded.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\minesweepSquareMine.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\minesweepSquareQuestion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\minesweepSquareWrong.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\minsweeper gasp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\minsweeper win.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassicNotepad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\Win95WordpadIcon2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinAboutSeparator95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wordpad_bold.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\GuessTheNumber\GTN95_Higher.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wordpad_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\tada.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\wordpad_cut.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\AIMmessagereceived.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\wordpad_find.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IE3\IE3_Back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wordpad_italic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB + DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP + YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy + BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC + ..\Resources\wordpad_new.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wordpad_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Win2000WebBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wordpad_paste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicUndo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wordpad_print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicWebchat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wordpad_printpreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicOpenFolderSmall.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\wordpad_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\wordpad_underline.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\IE3\IE3_Back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\IE3\IE3_Forward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\IE3\IE3_Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\IE3\IE3_SwirlyThings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ButtonPattern.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\wmsui32_1001.ico_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GuessTheNumber\GTN95_Check.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\minesweepSquare3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GuessTheNumber\GTN95_CheckClicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\truecolor.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GuessTheNumber\GTN95_Higher.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicPaste.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GuessTheNumber\GTN95_Restart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ie4_mail.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GuessTheNumber\GTN95_RestartClicked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\titlescreen\taskbarbutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\IE3\IE3_BackHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB + DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX + VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ + aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== + - - ..\Resources\IE3\IE3_ForwardHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ie4_back.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\IE3\IE3_Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\IE3\IE3_Stop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\IE3\IE3_RefreshHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\winclassic\winclassicoutlook.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\IE3\IE3_StopHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicEndings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a { @@ -1885,46 +1771,163 @@ ] } + + ..\Resources\ie4_hsplitter1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE3\IE3_RefreshHover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\WinClassicHWCV.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassicGENERALApplicationToolBoxBackground.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\winclassicsetup.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\titlescreen\taskbarclock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\wordpad_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win95DesktopIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ie4_print.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\TitleScreen\CopyrightNotice.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GuessTheNumber\GTN95_Correct.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\wordpad_cut.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\wordpad_find.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\WinClassicCalc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\WinClassicWordpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vQAADr0BR/uQrQAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME + Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu + QmCC + + + + ..\Resources\DCTheme_BG.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\win95sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\winclassictaskbar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\winclassictaskbaritem.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\winclassicstart.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\WinClassicAddressBookPropertiesIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\start_padamslink.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\WinClassicEndingsLocked.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\AIMbuddyleave.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\wordpad_underline.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\minsweeper gasp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\minesweepSquare5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\GuessTheNumber\GTN95_Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\GuessTheNumber\GTN95_Lower.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\titlescreen\Histacom2_logo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\HistacomIcon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ie4_hsplitter2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\TimeDistorter1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\minsweeper flag.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE4\nopage.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\AIMbuddyjoin.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\minsweeper win.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\IE3\IE3_Refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\WinClassic\TimeDistorter1Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\WinClassicFTP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ie4_vsplitter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\WinClassicFTPIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicNotepadBig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\WinClassicGTN.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\EndingDestruction.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\XCross.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win98Stop.WAV;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\resources\winclassic\16color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\wordpad_bold.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\WinClassic\WinClassicGTNIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassic\WinClassicWebchat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Win95NetworkIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassicNotepad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\shell32_21.ico_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\WinClassicRtfFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ie4_forward.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\winclassicinbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\winclassictime.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\resources\winclassic\win95start.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs index 3ef5f6c..675f5bb 100644 --- a/Histacom2/Properties/Resources1.Designer.cs +++ b/Histacom2/Properties/Resources1.Designer.cs @@ -19,7 +19,7 @@ namespace Histacom2.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -1136,6 +1136,16 @@ namespace Histacom2.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap Win95Error1 { + get { + object obj = ResourceManager.GetObject("Win95Error1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Histacom2/Resources/Win95Error.png b/Histacom2/Resources/Win95Error.png new file mode 100644 index 0000000..4667e9d Binary files /dev/null and b/Histacom2/Resources/Win95Error.png differ -- cgit v1.2.3 From bd74f334cf0a2fcb4f98b1d33fa909bce766d02b Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 22 Sep 2017 21:18:09 -0400 Subject: new installer prototype --- Histacom2.Engine/SaveSystem.cs | 9 +- Histacom2.Engine/Template/WinClassic.Designer.cs | 15 ++- .../InstallerPanes/WelcomePane.Designer.cs | 107 ++++++++++++++++++ .../GlobalPrograms/InstallerPanes/WelcomePane.cs | 26 +++++ .../GlobalPrograms/InstallerPanes/WelcomePane.resx | 120 +++++++++++++++++++++ .../WinClassicCalculator.Designer.cs | 2 +- Histacom2/GlobalPrograms/WinClassicCalculator.cs | 2 +- .../WinClassicDownloader.Designer.cs | 2 +- Histacom2/GlobalPrograms/WinClassicDownloader.cs | 15 +-- .../GlobalPrograms/WinClassicInstaller.Designer.cs | 110 +++++++++++++++++++ Histacom2/GlobalPrograms/WinClassicInstaller.cs | 30 ++++++ Histacom2/GlobalPrograms/WinClassicInstaller.resx | 120 +++++++++++++++++++++ .../GlobalPrograms/WinClassicNotepad.Designer.cs | 2 +- Histacom2/GlobalPrograms/WinClassicNotepad.cs | 2 +- Histacom2/Histacom2.csproj | 19 ++++ Histacom2/OS/Win95/Win95.cs | 1 + .../OS/Win95/Win95Apps/IE3Sites/12padams1998.cs | 1 + .../OS/Win95/Win95Apps/Win95Installer.Designer.cs | 68 ++++++------ .../OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 1 + .../OS/Win95/Win95Apps/WinClassicFTPClient.cs | 1 + Histacom2/OS/Win98/Win98.cs | 3 +- .../Win98Apps/IE4Sites/12padams1999.Designer.cs | 44 ++++++-- .../OS/Win98/Win98Apps/IE4Sites/12padams1999.cs | 16 +++ .../Win98/Win98Apps/WinClassicWindowsExplorer.cs | 18 ++-- Histacom2/Properties/Resources.resx | 3 + Histacom2/Properties/Resources1.Designer.cs | 10 ++ .../WinClassic/WinClassicInstallSidebar.png | Bin 0 -> 3976 bytes 27 files changed, 672 insertions(+), 75 deletions(-) create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.Designer.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.resx create mode 100644 Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs create mode 100644 Histacom2/GlobalPrograms/WinClassicInstaller.cs create mode 100644 Histacom2/GlobalPrograms/WinClassicInstaller.resx create mode 100644 Histacom2/Resources/WinClassic/WinClassicInstallSidebar.png (limited to 'Histacom2/OS/Win95/Win95.cs') diff --git a/Histacom2.Engine/SaveSystem.cs b/Histacom2.Engine/SaveSystem.cs index b8c619e..79333bd 100644 --- a/Histacom2.Engine/SaveSystem.cs +++ b/Histacom2.Engine/SaveSystem.cs @@ -171,13 +171,13 @@ namespace Histacom2.Engine SaveDirectoryInfo(ProfileMyComputerDirectory, "Program Files", true, "Program Files", true); SaveDirectoryInfo(ProfileProgramsDirectory, "Accessories", false, "Accessories", true); SaveDirectoryInfo(ProfileProgramsDirectory, "Internet Explorer", true, "Internet Explorer", true); - SaveDirectoryInfo(ProfileProgramsDirectory, "The Microsoft Network", true, "The Microsoft Network", true); + if (CurrentSave.CurrentOS == "95") SaveDirectoryInfo(ProfileProgramsDirectory, "The Microsoft Network", true, "The Microsoft Network", true); SaveDirectoryInfo(ProfileMyComputerDirectory, "Windows", true, "Windows", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Accessories"), "wordpad.exe", "wordpad", 16, 183296); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Internet Explorer"), "ie20.exe", "ie", 8, 512); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Internet Explorer"), "lnfinst.exe", "iebrokeninstaller", 8, 512); - CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"), "msnver.txt", "5900", 12, 4); + if (CurrentSave.CurrentOS == "95") CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"), "msnver.txt", "5900", 12, 4); CreateWindowsDirectory(); } @@ -322,7 +322,7 @@ namespace Histacom2.Engine public static void UpgradeFileSystem(string newOS) { - if (newOS == "98" || newOS == "2000" || newOS == "ME") + if (newOS == "98") { // We are upgrading from the old WinClassic file System to the new WinClassic filesystem! // All the above OSes share basically the same file layout! @@ -336,10 +336,11 @@ namespace Histacom2.Engine // There is no "The Microsoft Network" folder! if (Directory.Exists(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"))) Directory.Delete(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"), true); + if (Directory.Exists(Path.Combine(ProfileProgramsDirectory, "12padams"))) Directory.Delete(Path.Combine(ProfileProgramsDirectory, "12padams"), true); FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine(ProfileProgramsDirectory, "_data.info"))); foreach (THDirInfo dir in fsfi.SubDirs) { - if (dir.Name == "The Microsoft Network") + if (dir.Name == "The Microsoft Network" || dir.Name == "12padams") { fsfi.SubDirs.Remove(dir); break; diff --git a/Histacom2.Engine/Template/WinClassic.Designer.cs b/Histacom2.Engine/Template/WinClassic.Designer.cs index bacce99..8463041 100644 --- a/Histacom2.Engine/Template/WinClassic.Designer.cs +++ b/Histacom2.Engine/Template/WinClassic.Designer.cs @@ -45,6 +45,7 @@ this.bottom = new System.Windows.Forms.Panel(); this.right = new System.Windows.Forms.Panel(); this.top = new System.Windows.Forms.Panel(); + this.panel1 = new System.Windows.Forms.Panel(); this.program.SuspendLayout(); this.programtopbar.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.programIcon)).BeginInit(); @@ -57,6 +58,7 @@ // this.program.BackColor = System.Drawing.Color.Silver; this.program.Controls.Add(this.programContent); + this.program.Controls.Add(this.panel1); this.program.Controls.Add(this.programtopbar); this.program.Controls.Add(this.toprightcorner); this.program.Controls.Add(this.bottomrightcorner); @@ -75,9 +77,9 @@ // programContent // this.programContent.Dock = System.Windows.Forms.DockStyle.Fill; - this.programContent.Location = new System.Drawing.Point(4, 22); + this.programContent.Location = new System.Drawing.Point(4, 23); this.programContent.Name = "programContent"; - this.programContent.Size = new System.Drawing.Size(292, 274); + this.programContent.Size = new System.Drawing.Size(292, 273); this.programContent.TabIndex = 9; this.programContent.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.programContent_ControlAdded); // @@ -265,6 +267,14 @@ this.top.MouseMove += new System.Windows.Forms.MouseEventHandler(this.top_MouseMove); this.top.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp); // + // panel1 + // + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(4, 22); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(292, 1); + this.panel1.TabIndex = 0; + // // WinClassic // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -307,5 +317,6 @@ public System.Windows.Forms.PictureBox maximizebutton; public System.Windows.Forms.PictureBox minimizebutton; public System.Windows.Forms.PictureBox programIcon; + private System.Windows.Forms.Panel panel1; } } \ No newline at end of file diff --git a/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.Designer.cs b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.Designer.cs new file mode 100644 index 0000000..2249215 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.Designer.cs @@ -0,0 +1,107 @@ +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + partial class WelcomePane + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel4 = new Histacom2.Engine.UI.ClassicLabel(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicInstallSidebar; + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(164, 314); + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // classicLabel1 + // + this.classicLabel1.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel1.Location = new System.Drawing.Point(177, 19); + this.classicLabel1.Name = "classicLabel1"; + this.classicLabel1.Size = new System.Drawing.Size(311, 40); + this.classicLabel1.TabIndex = 1; + this.classicLabel1.Text = "Welcome to the Program Setup Wizard"; + // + // classicLabel2 + // + this.classicLabel2.Location = new System.Drawing.Point(177, 72); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(311, 13); + this.classicLabel2.TabIndex = 2; + this.classicLabel2.Text = "This will install Program on your computer."; + // + // classicLabel3 + // + this.classicLabel3.Location = new System.Drawing.Point(177, 98); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(311, 26); + this.classicLabel3.TabIndex = 3; + this.classicLabel3.Text = "It is recommended that you close all other applications before continuing."; + // + // classicLabel4 + // + this.classicLabel4.Location = new System.Drawing.Point(177, 137); + this.classicLabel4.Name = "classicLabel4"; + this.classicLabel4.Size = new System.Drawing.Size(311, 13); + this.classicLabel4.TabIndex = 4; + this.classicLabel4.Text = "Click Next to continue, or Cancel to exit Setup."; + // + // WelcomePane + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.White; + this.Controls.Add(this.classicLabel4); + this.Controls.Add(this.classicLabel3); + this.Controls.Add(this.classicLabel2); + this.Controls.Add(this.classicLabel1); + this.Controls.Add(this.pictureBox1); + this.Name = "WelcomePane"; + this.Size = new System.Drawing.Size(495, 314); + this.Load += new System.EventHandler(this.WelcomePane_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + private Engine.UI.ClassicLabel classicLabel1; + private Engine.UI.ClassicLabel classicLabel2; + private Engine.UI.ClassicLabel classicLabel3; + private Engine.UI.ClassicLabel classicLabel4; + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.cs b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.cs new file mode 100644 index 0000000..48ac001 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + public partial class WelcomePane : UserControl + { + public WelcomePane() + { + InitializeComponent(); + } + + private void WelcomePane_Load(object sender, EventArgs e) + { + classicLabel1.Text = $"Welcome to the {((WinClassicInstaller)Parent.Parent).progName} Setup Wizard"; + classicLabel2.Text = $"This will install {((WinClassicInstaller)Parent.Parent).progName} on your computer."; + } + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.resx b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs b/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs index f612876..90a9c00 100644 --- a/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs @@ -1,4 +1,4 @@ -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { partial class WinClassicCalculator { diff --git a/Histacom2/GlobalPrograms/WinClassicCalculator.cs b/Histacom2/GlobalPrograms/WinClassicCalculator.cs index 2fecae8..50fd2d8 100644 --- a/Histacom2/GlobalPrograms/WinClassicCalculator.cs +++ b/Histacom2/GlobalPrograms/WinClassicCalculator.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Histacom2.Engine; -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { public partial class WinClassicCalculator : UserControl { diff --git a/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs b/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs index 78fb92b..fda53dc 100644 --- a/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs @@ -1,4 +1,4 @@ -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { partial class WinClassicDownloader { diff --git a/Histacom2/GlobalPrograms/WinClassicDownloader.cs b/Histacom2/GlobalPrograms/WinClassicDownloader.cs index bb83ff6..eaf253a 100644 --- a/Histacom2/GlobalPrograms/WinClassicDownloader.cs +++ b/Histacom2/GlobalPrograms/WinClassicDownloader.cs @@ -3,7 +3,7 @@ using System.IO; using System.Windows.Forms; using static Histacom2.Engine.SaveSystem; -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { public partial class WinClassicDownloader : UserControl { @@ -55,16 +55,11 @@ namespace Histacom2.OS.Win95.Win95Apps case "Downloading: Start Runner 95": CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop"), "Start Runner Setup.exe", "sr95 setup", 11, 34846); break; + case "Downloading: Web Chat 1999": + CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop"), "Web Chat Setup.exe", "web chat 99 setup", 11, 37048); + break; } - /* if (appName.Text == "Downloading: Start Runner") - { - CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop", "Start Runner Setup.exe"), "StartRunner"); - } - if (appName.Text == "Downloading: Error Blaster") - { - CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop", "Error Blaster Setup.exe"), "ErrorBlaster"); - } - if (appName.Text == "Downloading: Skindows 95") + /* if (appName.Text == "Downloading: Skindows 95") { CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop", "Skindows 95 Setup.exe"), "Skindows95Setup"); } */ diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs new file mode 100644 index 0000000..c8bea62 --- /dev/null +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs @@ -0,0 +1,110 @@ +namespace Histacom2.GlobalPrograms +{ + partial class WinClassicInstaller + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); + this.classicButton2 = new Histacom2.Engine.UI.ClassicButton(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(495, 314); + this.panel1.TabIndex = 0; + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.ie4_hsplitter; + this.pictureBox1.Location = new System.Drawing.Point(0, 314); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(495, 2); + this.pictureBox1.TabIndex = 1; + this.pictureBox1.TabStop = false; + // + // classicButton1 + // + this.classicButton1.AdaptBackColorWithTheme = true; + this.classicButton1.AdaptFontWithTheme = true; + this.classicButton1.AdaptForeColorWithTheme = true; + this.classicButton1.BackColor = System.Drawing.Color.Silver; + this.classicButton1.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton1.ForeColor = System.Drawing.Color.Black; + this.classicButton1.Location = new System.Drawing.Point(408, 326); + this.classicButton1.Name = "classicButton1"; + this.classicButton1.Size = new System.Drawing.Size(75, 23); + this.classicButton1.TabIndex = 2; + this.classicButton1.Text = "Cancel"; + // + // classicButton2 + // + this.classicButton2.AdaptBackColorWithTheme = true; + this.classicButton2.AdaptFontWithTheme = true; + this.classicButton2.AdaptForeColorWithTheme = true; + this.classicButton2.BackColor = System.Drawing.Color.Silver; + this.classicButton2.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton2.ForeColor = System.Drawing.Color.Black; + this.classicButton2.Location = new System.Drawing.Point(323, 326); + this.classicButton2.Name = "classicButton2"; + this.classicButton2.Size = new System.Drawing.Size(75, 23); + this.classicButton2.TabIndex = 3; + this.classicButton2.Text = "&Next >"; + // + // WinClassicInstaller + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.classicButton2); + this.Controls.Add(this.classicButton1); + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.panel1); + this.MaximumSize = new System.Drawing.Size(495, 358); + this.MinimumSize = new System.Drawing.Size(495, 358); + this.Name = "WinClassicInstaller"; + this.Size = new System.Drawing.Size(495, 358); + this.Load += new System.EventHandler(this.WinClassicInstaller_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.PictureBox pictureBox1; + private Engine.UI.ClassicButton classicButton1; + private Engine.UI.ClassicButton classicButton2; + } +} diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.cs new file mode 100644 index 0000000..8f262fb --- /dev/null +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Histacom2.GlobalPrograms +{ + public partial class WinClassicInstaller : UserControl + { + public string progName; + public int state = 0; + + public WinClassicInstaller(string prog) + { + InitializeComponent(); + progName = prog; + } + + private void WinClassicInstaller_Load(object sender, EventArgs e) + { + var welkom = new InstallerPanes.WelcomePane(); + welkom.Parent = panel1; + } + } +} diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.resx b/Histacom2/GlobalPrograms/WinClassicInstaller.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Histacom2/GlobalPrograms/WinClassicNotepad.Designer.cs b/Histacom2/GlobalPrograms/WinClassicNotepad.Designer.cs index 99c1a2c..87ec209 100644 --- a/Histacom2/GlobalPrograms/WinClassicNotepad.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicNotepad.Designer.cs @@ -1,6 +1,6 @@ using System; -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { partial class WinClassicNotepad { diff --git a/Histacom2/GlobalPrograms/WinClassicNotepad.cs b/Histacom2/GlobalPrograms/WinClassicNotepad.cs index e1a4019..1a58d8e 100644 --- a/Histacom2/GlobalPrograms/WinClassicNotepad.cs +++ b/Histacom2/GlobalPrograms/WinClassicNotepad.cs @@ -11,7 +11,7 @@ using Histacom2.Engine; using static Histacom2.Engine.FileDialogBoxManager; using System.IO; -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { public partial class WinClassicNotepad : UserControl { diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index 0064576..fc87093 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -132,6 +132,18 @@ AchievementBox.cs + + UserControl + + + WelcomePane.cs + + + UserControl + + + WinClassicInstaller.cs + UserControl @@ -401,6 +413,12 @@ AchievementBox.cs + + WelcomePane.cs + + + WinClassicInstaller.cs + SurviveTheDay.cs @@ -765,6 +783,7 @@ + diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 926aea0..38129ab 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -12,6 +12,7 @@ using Histacom2.OS.Win95.Win95Apps.Story; using static Histacom2.Engine.SaveSystem; using Histacom2.OS.Win95.Win95Apps._12padamViruses; using Histacom2.OS.Win95.Win95Apps._12padamsViruses; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win95 { diff --git a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs index a6c67df..9f4bfbd 100644 --- a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs +++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Histacom2.Engine; using System.Threading; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win95.Win95Apps.IE3Sites { diff --git a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs index 20a51c7..5592445 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs @@ -41,14 +41,14 @@ this.checkBox1 = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); this.panel3 = new System.Windows.Forms.Panel(); this.label6 = new System.Windows.Forms.Label(); + this.progressBar1 = new Histacom2.Engine.UI.ProgressBar(); this.panel4 = new System.Windows.Forms.Panel(); this.label7 = new System.Windows.Forms.Label(); - this.progressBar1 = new Histacom2.Engine.UI.ProgressBar(); ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panel1.SuspendLayout(); @@ -184,14 +184,14 @@ this.panel2.TabIndex = 11; this.panel2.Visible = false; // - // label3 + // label5 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(-3, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(268, 13); - this.label3.TabIndex = 0; - this.label3.Text = "Setup will install GenericName in the following directory:"; + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(-3, 28); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(178, 13); + this.label5.TabIndex = 2; + this.label5.Text = "To install in this directory, click Next."; // // label4 // @@ -202,14 +202,14 @@ this.label4.TabIndex = 1; this.label4.Text = "C:\\Program Files\\12padams\\GenericName\\"; // - // label5 + // label3 // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(-3, 28); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(178, 13); - this.label5.TabIndex = 2; - this.label5.Text = "To install in this directory, click Next."; + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(-3, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(268, 13); + this.label3.TabIndex = 0; + this.label3.Text = "Setup will install GenericName in the following directory:"; // // panel3 // @@ -230,6 +230,23 @@ this.label6.TabIndex = 1; this.label6.Text = "Installing..."; // + // progressBar1 + // + this.progressBar1.BlockSpacing = 5; + this.progressBar1.BlockWidth = 20; + this.progressBar1.Location = new System.Drawing.Point(3, 115); + this.progressBar1.MarqueeWidth = 125; + this.progressBar1.Maximum = 100D; + this.progressBar1.Minimum = 0D; + this.progressBar1.Name = "progressBar1"; + this.progressBar1.ProgressColor = System.Drawing.Color.Navy; + this.progressBar1.ShowText = false; + this.progressBar1.Size = new System.Drawing.Size(312, 28); + this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks; + this.progressBar1.TabIndex = 0; + this.progressBar1.Text = "progressBar1"; + this.progressBar1.Value = 0D; + // // panel4 // this.panel4.Controls.Add(this.label7); @@ -248,23 +265,6 @@ this.label7.TabIndex = 0; this.label7.Text = "GenericName Setup has been completed."; // - // progressBar1 - // - this.progressBar1.BlockSpacing = 5; - this.progressBar1.BlockWidth = 20; - this.progressBar1.Location = new System.Drawing.Point(3, 115); - this.progressBar1.MarqueeWidth = 125; - this.progressBar1.Maximum = 100D; - this.progressBar1.Minimum = 0D; - this.progressBar1.Name = "progressBar1"; - this.progressBar1.ProgressColor = System.Drawing.Color.Navy; - this.progressBar1.ShowText = false; - this.progressBar1.Size = new System.Drawing.Size(312, 28); - this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks; - this.progressBar1.TabIndex = 0; - this.progressBar1.Text = "progressBar1"; - this.progressBar1.Value = 0D; - // // Win95Installer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index 519e14d..fa1e0ce 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -14,6 +14,7 @@ using Newtonsoft.Json; using Histacom2.Engine.Template; using System.Diagnostics; using Histacom2.OS.Win95.Win95Apps._12padamViruses; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win95.Win95Apps { diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs index 4dd74fb..1a0836b 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using Histacom2.Engine; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win95.Win95Apps { diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Win98.cs index f4a9c07..32b7aca 100644 --- a/Histacom2/OS/Win98/Win98.cs +++ b/Histacom2/OS/Win98/Win98.cs @@ -11,6 +11,7 @@ using Histacom2.OS.Win95.Win95Apps; using Histacom2.OS.Win95.Win95Apps.Story; using static Histacom2.Engine.SaveSystem; using Histacom2.OS.Win98.Win98Apps; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win98 { @@ -232,7 +233,7 @@ namespace Histacom2.OS.Win98 private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) { - Win95Installer openinstaller = new Win95Installer("Testing"); + WinClassicInstaller openinstaller = new WinClassicInstaller("Testing"); WinClassic app = wm.Init(openinstaller, "Installer", null, false, true); AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs index aa8aae4..5a252ef 100644 --- a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs @@ -58,6 +58,8 @@ this.classicLabel13 = new Histacom2.Engine.UI.ClassicLabel(); this.classicButton6 = new Histacom2.Engine.UI.ClassicButton(); this.classicLabel14 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel15 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel16 = new Histacom2.Engine.UI.ClassicLabel(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); @@ -99,7 +101,7 @@ this.panel1.Controls.Add(this.classicLabel8); this.panel1.Controls.Add(this.classicButton1); this.panel1.Controls.Add(this.panel2); - this.panel1.Location = new System.Drawing.Point(104, 90); + this.panel1.Location = new System.Drawing.Point(104, 78); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(225, 209); this.panel1.TabIndex = 2; @@ -126,6 +128,7 @@ this.classicButton1.Size = new System.Drawing.Size(72, 23); this.classicButton1.TabIndex = 1; this.classicButton1.Text = "Download"; + this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click); // // panel2 // @@ -158,7 +161,7 @@ this.panel3.Controls.Add(this.classicLabel13); this.panel3.Controls.Add(this.classicButton6); this.panel3.Controls.Add(this.panel4); - this.panel3.Location = new System.Drawing.Point(630, 90); + this.panel3.Location = new System.Drawing.Point(630, 78); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(225, 209); this.panel3.TabIndex = 3; @@ -194,7 +197,7 @@ this.panel5.Controls.Add(this.classicLabel10); this.panel5.Controls.Add(this.classicButton3); this.panel5.Controls.Add(this.panel6); - this.panel5.Location = new System.Drawing.Point(369, 90); + this.panel5.Location = new System.Drawing.Point(369, 78); this.panel5.Name = "panel5"; this.panel5.Size = new System.Drawing.Size(225, 209); this.panel5.TabIndex = 4; @@ -225,8 +228,9 @@ this.panel7.Anchor = System.Windows.Forms.AnchorStyles.Top; this.panel7.BackColor = System.Drawing.Color.Lime; this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel7.Controls.Add(this.classicLabel15); this.panel7.Controls.Add(this.panel8); - this.panel7.Location = new System.Drawing.Point(104, 314); + this.panel7.Location = new System.Drawing.Point(104, 302); this.panel7.Name = "panel7"; this.panel7.Size = new System.Drawing.Size(353, 135); this.panel7.TabIndex = 5; @@ -257,8 +261,9 @@ this.panel9.Anchor = System.Windows.Forms.AnchorStyles.Top; this.panel9.BackColor = System.Drawing.Color.Lime; this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel9.Controls.Add(this.classicLabel16); this.panel9.Controls.Add(this.panel10); - this.panel9.Location = new System.Drawing.Point(502, 314); + this.panel9.Location = new System.Drawing.Point(502, 302); this.panel9.Name = "panel9"; this.panel9.Size = new System.Drawing.Size(353, 135); this.panel9.TabIndex = 6; @@ -298,6 +303,7 @@ this.classicButton2.Size = new System.Drawing.Size(72, 23); this.classicButton2.TabIndex = 3; this.classicButton2.Text = "Download"; + this.classicButton2.Click += new System.EventHandler(this.classicButton2_Click); // // classicLabel9 // @@ -324,7 +330,7 @@ // // classicLabel10 // - this.classicLabel10.Location = new System.Drawing.Point(3, 49); + this.classicLabel10.Location = new System.Drawing.Point(4, 49); this.classicLabel10.Name = "classicLabel10"; this.classicLabel10.Size = new System.Drawing.Size(107, 13); this.classicLabel10.TabIndex = 5; @@ -347,7 +353,7 @@ // // classicLabel11 // - this.classicLabel11.Location = new System.Drawing.Point(3, 79); + this.classicLabel11.Location = new System.Drawing.Point(4, 79); this.classicLabel11.Name = "classicLabel11"; this.classicLabel11.Size = new System.Drawing.Size(107, 13); this.classicLabel11.TabIndex = 7; @@ -408,6 +414,28 @@ this.classicLabel14.TabIndex = 7; this.classicLabel14.Text = "© 12padams, 1999"; // + // classicLabel15 + // + this.classicLabel15.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.classicLabel15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel15.ForeColor = System.Drawing.Color.Navy; + this.classicLabel15.Location = new System.Drawing.Point(90, 44); + this.classicLabel15.Name = "classicLabel15"; + this.classicLabel15.Size = new System.Drawing.Size(167, 13); + this.classicLabel15.TabIndex = 2; + this.classicLabel15.Text = "Y2K: A Global Computer Crisis"; + // + // classicLabel16 + // + this.classicLabel16.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.classicLabel16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel16.ForeColor = System.Drawing.Color.Navy; + this.classicLabel16.Location = new System.Drawing.Point(122, 44); + this.classicLabel16.Name = "classicLabel16"; + this.classicLabel16.Size = new System.Drawing.Size(109, 13); + this.classicLabel16.TabIndex = 3; + this.classicLabel16.Text = "Microsoft Wi n d o w s"; + // // _12padams1999 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -469,5 +497,7 @@ private Engine.UI.ClassicLabel classicLabel13; private Engine.UI.ClassicButton classicButton6; private Engine.UI.ClassicLabel classicLabel14; + private Engine.UI.ClassicLabel classicLabel15; + private Engine.UI.ClassicLabel classicLabel16; } } diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs index 30e56a0..0733144 100644 --- a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Histacom2.Engine; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win98.Win98Apps.IE4Sites { @@ -16,5 +18,19 @@ namespace Histacom2.OS.Win98.Win98Apps.IE4Sites { InitializeComponent(); } + + private void classicButton2_Click(object sender, EventArgs e) + { + WinClassicDownloader opendownload = new WinClassicDownloader(); + WindowManager wm = new WindowManager(); + wm.Init(opendownload, "Downloader", null, false, true); + opendownload.appName.Text = "Downloading: Web Chat 1999"; + opendownload.amountToDL = 37; + } + + private void classicButton1_Click(object sender, EventArgs e) + { + + } } } diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index 936d89e..a0cbadb 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -13,6 +13,8 @@ using Histacom2.Engine; using Newtonsoft.Json; using System.Diagnostics; using Histacom2.Engine.Template; +using Histacom2.OS.Win98.Win98Apps; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win95.Win95Apps { @@ -304,30 +306,22 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "ie": if (TitleScreen.frm95.ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); return; } - TitleScreen.frm95.ie = wm.Init(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); + TitleScreen.frm95.ie = wm.Init(new WinClassicIE4(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); Program.AddTaskbarItem(TitleScreen.frm95.ie, TitleScreen.frm95.ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4); TitleScreen.frm95.ie.BringToFront(); TitleScreen.frm95.ie.FormClosing += new FormClosingEventHandler(TitleScreen.frm95.InternetExplorer4_Closing); break; - case "web chat setup": - Win95Installer inst = new Win95Installer("Web Chat 1998"); + case "web chat 99 setup": + Win95Installer inst = new Win95Installer("Web Chat 1999"); inst.InstallCompleted += (sendr, args) => TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; WinClassic appInstaller = wm.Init(inst, "Web Chat Setup", null, true, true); Program.AddTaskbarItem(appInstaller, appInstaller.Tag.ToString(), "Web Chat Setup", null); appInstaller.BringToFront(); - break; - case "ftp client setup": - Win95Installer instFtp = new Win95Installer("FTP Client"); - instFtp.InstallCompleted += (sendr, args) => TitleScreen.frm95.FTPClientToolStripMenuItem.Visible = true; - WinClassic appFtp = wm.Init(instFtp, "FTP Client Setup", null, true, true); - Program.AddTaskbarItem(appFtp, appFtp.Tag.ToString(), "FTP Client Setup", null); - appFtp.BringToFront(); - break; case "time distorter setup": - Win95Installer instTd = new Win95Installer("Time Distorter 0.1"); + Win95Installer instTd = new Win95Installer("Time Distorter 0.2"); instTd.InstallCompleted += (sendr, args) => { TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true; diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx index 465f30a..366c7a9 100644 --- a/Histacom2/Properties/Resources.resx +++ b/Histacom2/Properties/Resources.resx @@ -1954,4 +1954,7 @@ ..\Resources\IE4\IE4Home_WinTechLogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicInstallSidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs index d8580ec..465250d 100644 --- a/Histacom2/Properties/Resources1.Designer.cs +++ b/Histacom2/Properties/Resources1.Designer.cs @@ -1713,6 +1713,16 @@ namespace Histacom2.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap WinClassicInstallSidebar { + get { + object obj = ResourceManager.GetObject("WinClassicInstallSidebar", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Histacom2/Resources/WinClassic/WinClassicInstallSidebar.png b/Histacom2/Resources/WinClassic/WinClassicInstallSidebar.png new file mode 100644 index 0000000..e482268 Binary files /dev/null and b/Histacom2/Resources/WinClassic/WinClassicInstallSidebar.png differ -- cgit v1.2.3