From 486d33b73a8beec3c1080cf5c501ceeafcddc4fa Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 9 Apr 2017 19:38:33 -0400 Subject: about boxes! --- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 3 ++- TimeHACK.Main/OS/Win95/Win95.cs | 4 ++-- .../OS/Win95/Win95Apps/Win95Notepad.Designer.cs | 3 ++- TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs | 7 +++++++ .../Resources/WinClassic/WinAboutSeparator95.png | Bin 0 -> 177 bytes .../Resources/WinClassic/WinClassicNotepad.png | Bin 372 -> 168 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 128512 -> 131584 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 34304 -> 38400 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6091776 -> 6092288 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 8 ++++---- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 132608 -> 134656 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 8 ++++---- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6091776 -> 6092288 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes .../TimeHACK.Properties.Resources.resources | Bin 4712094 -> 4711950 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6091776 -> 6092288 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 8 ++++---- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 132608 -> 134656 bytes 21 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 TimeHACK.Main/Resources/WinClassic/WinAboutSeparator95.png (limited to 'TimeHACK.Main') diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index e54bd3a..36f249a 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95)); + this.resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95)); System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("My Computer", 0); System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("Network Neighborhood", 5); System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem("Inbox", 3); @@ -1232,6 +1232,7 @@ internal System.Windows.Forms.ToolStripMenuItem BitmapImageToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem MicrosoftDataLinkToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PropertiesToolStripMenuItem1; + internal System.ComponentModel.ComponentResourceManager resources; private System.Windows.Forms.ToolStripMenuItem windowManagerTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem; diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 3a0883a..00adbdb 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -169,7 +169,7 @@ namespace TimeHACK.OS.Win95 private void InternetExplorerToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicIE4 ie = new WinClassicIE4(); - Engine.Template.WinClassic app = wm.startWin95(ie, "Internet Explorer 4", null, true, true); + Engine.Template.WinClassic app = wm.startWin95(ie, "Internet Explorer 4", (Image)resources.GetObject("InternetExplorerToolStripMenuItem.Image"), true, true); app.BringToFront(); startmenu.Hide(); } @@ -187,7 +187,7 @@ namespace TimeHACK.OS.Win95 if (objListViewItem.Text == "Internet Explorer") { WinClassicIE4 ie = new WinClassicIE4(); - Engine.Template.WinClassic app = wm.startWin95(ie, "Internet Explorer 4", null, true, true); + Engine.Template.WinClassic app = wm.startWin95(ie, "Internet Explorer 4", (Image)resources.GetObject("InternetExplorerToolStripMenuItem.Image"), true, true); app.BringToFront(); startmenu.Hide(); } else if (objListViewItem.Text == "Web Chat Setup") diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.Designer.cs index 255feaa..240670c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.Designer.cs @@ -304,12 +304,13 @@ this.aboutNotepadToolStripMenuItem.Name = "aboutNotepadToolStripMenuItem"; this.aboutNotepadToolStripMenuItem.Size = new System.Drawing.Size(167, 22); this.aboutNotepadToolStripMenuItem.Text = "About Notepad"; + this.aboutNotepadToolStripMenuItem.Click += new System.EventHandler(this.aboutNotepadToolStripMenuItem_Click); // // textBox1 // this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.textBox1.Font = new System.Drawing.Font("Consolas", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBox1.Location = new System.Drawing.Point(0, 27); this.textBox1.MaxLength = 131072; this.textBox1.Multiline = true; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs index 5835c6d..6542f4c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TimeHACK.Engine; namespace TimeHACK.OS.Win95.Win95Apps { @@ -29,5 +30,11 @@ namespace TimeHACK.OS.Win95.Win95Apps { this.ParentForm.Close(); } + + private void aboutNotepadToolStripMenuItem_Click(object sender, EventArgs e) + { + WindowManager wm = new WindowManager(); + wm.startAboutBox95("Notepad", "Microsoft Notepad", Properties.Resources.WinClassicNotepad); + } } } diff --git a/TimeHACK.Main/Resources/WinClassic/WinAboutSeparator95.png b/TimeHACK.Main/Resources/WinClassic/WinAboutSeparator95.png new file mode 100644 index 0000000..524cad8 Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/WinAboutSeparator95.png differ diff --git a/TimeHACK.Main/Resources/WinClassic/WinClassicNotepad.png b/TimeHACK.Main/Resources/WinClassic/WinClassicNotepad.png index 46a2c59..26e63bf 100644 Binary files a/TimeHACK.Main/Resources/WinClassic/WinClassicNotepad.png and b/TimeHACK.Main/Resources/WinClassic/WinClassicNotepad.png differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index f83065b..7c31e94 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb index 1f05a8c..97907dd 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 782b58d..e9ec383 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - NhY7hlNRWbXA14CStzVBJpui0xlz8o8WhqXbzAmb+4g= + TOhLeLW68bNHosx5MJMNQdVWIf2PUFEjMZ38dvaCqTw= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 55e2272..09baef0 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.exe and b/TimeHACK.Main/bin/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index 5007641..ab4669c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - EyRihcO7ERxrb5zK9R4TrMzFZO0ANMQwVU2IUzdFQ88= + VnbVJG+9+xQ4L8FqWXRdGyghEfsaCjWPhltXzTroAxY= - + - EwtIXko8yURDgZAqhw+gu7HyFhq672T3kd6QV7jECt8= + DgulC6PIjsb5Ut2SA6A7QFq/UCPgKUqOn6tzlYWABME= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 82e542e..d32afe7 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index 782b58d..e9ec383 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - NhY7hlNRWbXA14CStzVBJpui0xlz8o8WhqXbzAmb+4g= + TOhLeLW68bNHosx5MJMNQdVWIf2PUFEjMZ38dvaCqTw= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 5007641..ab4669c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,26 +56,26 @@ - + - EyRihcO7ERxrb5zK9R4TrMzFZO0ANMQwVU2IUzdFQ88= + VnbVJG+9+xQ4L8FqWXRdGyghEfsaCjWPhltXzTroAxY= - + - EwtIXko8yURDgZAqhw+gu7HyFhq672T3kd6QV7jECt8= + DgulC6PIjsb5Ut2SA6A7QFq/UCPgKUqOn6tzlYWABME= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 55e2272..09baef0 100644 Binary files a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe and b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 9992b12..7c68e81 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources index c38a4cf..d0339c0 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources and b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 782b58d..e9ec383 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - NhY7hlNRWbXA14CStzVBJpui0xlz8o8WhqXbzAmb+4g= + TOhLeLW68bNHosx5MJMNQdVWIf2PUFEjMZ38dvaCqTw= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 55e2272..09baef0 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index 5007641..ab4669c 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - EyRihcO7ERxrb5zK9R4TrMzFZO0ANMQwVU2IUzdFQ88= + VnbVJG+9+xQ4L8FqWXRdGyghEfsaCjWPhltXzTroAxY= - + - EwtIXko8yURDgZAqhw+gu7HyFhq672T3kd6QV7jECt8= + DgulC6PIjsb5Ut2SA6A7QFq/UCPgKUqOn6tzlYWABME= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 82e542e..d32afe7 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3