From 486d33b73a8beec3c1080cf5c501ceeafcddc4fa Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 9 Apr 2017 19:38:33 -0400 Subject: about boxes! --- .vs/TimeHACK/v14/.suo | Bin 90624 -> 90624 bytes TimeHACK.Engine/Properties/Resources.Designer.cs | 10 ++ TimeHACK.Engine/Properties/Resources.resx | 3 + TimeHACK.Engine/Resources/WinAboutSeparator95.png | Bin 0 -> 177 bytes TimeHACK.Engine/Template/AboutBox95.Designer.cs | 139 +++++++++++++++++++++ TimeHACK.Engine/Template/AboutBox95.cs | 27 ++++ TimeHACK.Engine/Template/AboutBox95.resx | 120 ++++++++++++++++++ TimeHACK.Engine/Template/WinClassic.Designer.cs | 2 +- TimeHACK.Engine/TimeHACK.Engine.csproj | 10 ++ TimeHACK.Engine/WindowManager.cs | 17 ++- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 128512 -> 131584 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 34304 -> 38400 bytes .../DesignTimeResolveAssemblyReferences.cache | Bin 868 -> 868 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 9077 -> 9177 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 5120 -> 5632 bytes .../TimeHACK.Engine.Properties.Resources.resources | Bin 100585 -> 100976 bytes .../TimeHACK.Engine.Template.AboutBox95.resources | Bin 0 -> 180 bytes .../TimeHACK.Engine.csproj.FileListAbsolute.txt | 1 + .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2186 -> 2311 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 128512 -> 131584 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 34304 -> 38400 bytes 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 42 files changed, 355 insertions(+), 21 deletions(-) create mode 100644 TimeHACK.Engine/Resources/WinAboutSeparator95.png create mode 100644 TimeHACK.Engine/Template/AboutBox95.Designer.cs create mode 100644 TimeHACK.Engine/Template/AboutBox95.cs create mode 100644 TimeHACK.Engine/Template/AboutBox95.resx create mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources create mode 100644 TimeHACK.Main/Resources/WinClassic/WinAboutSeparator95.png diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 42d9670..3f21ec5 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/Properties/Resources.Designer.cs b/TimeHACK.Engine/Properties/Resources.Designer.cs index b50683f..769996a 100644 --- a/TimeHACK.Engine/Properties/Resources.Designer.cs +++ b/TimeHACK.Engine/Properties/Resources.Designer.cs @@ -200,6 +200,16 @@ namespace TimeHACK.Engine.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap WinAboutSeparator95 { + get { + object obj = ResourceManager.GetObject("WinAboutSeparator95", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Engine/Properties/Resources.resx b/TimeHACK.Engine/Properties/Resources.resx index aa281d1..fd22a0c 100644 --- a/TimeHACK.Engine/Properties/Resources.resx +++ b/TimeHACK.Engine/Properties/Resources.resx @@ -172,4 +172,7 @@ ..\Resources\WinClassic\Window\Win95Warning.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 + \ No newline at end of file diff --git a/TimeHACK.Engine/Resources/WinAboutSeparator95.png b/TimeHACK.Engine/Resources/WinAboutSeparator95.png new file mode 100644 index 0000000..524cad8 Binary files /dev/null and b/TimeHACK.Engine/Resources/WinAboutSeparator95.png differ diff --git a/TimeHACK.Engine/Template/AboutBox95.Designer.cs b/TimeHACK.Engine/Template/AboutBox95.Designer.cs new file mode 100644 index 0000000..eeb2948 --- /dev/null +++ b/TimeHACK.Engine/Template/AboutBox95.Designer.cs @@ -0,0 +1,139 @@ +namespace TimeHACK.Engine.Template +{ + partial class AboutBox95 + { + /// + /// 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.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(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(7, 7); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(64, 64); + this.pictureBox1.TabStop = false; + // + // textBox1 + // + this.textBox1.BackColor = System.Drawing.Color.Silver; + this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.textBox1.Location = new System.Drawing.Point(78, 16); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(193, 42); + 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; + this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.textBox2.Location = new System.Drawing.Point(78, 106); + this.textBox2.Multiline = true; + this.textBox2.Name = "textBox2"; + this.textBox2.ReadOnly = true; + this.textBox2.Size = new System.Drawing.Size(185, 42); + this.textBox2.Text = "This product is licensed to:\r\n@ACTUALUSER\r\n@COMPANYNAME"; + // + // pictureBox2 + // + this.pictureBox2.Image = global::TimeHACK.Engine.Properties.Resources.WinAboutSeparator95; + this.pictureBox2.Location = new System.Drawing.Point(76, 154); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(250, 2); + this.pictureBox2.TabStop = false; + // + // textBox3 + // + this.textBox3.BackColor = System.Drawing.Color.Silver; + this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.textBox3.Location = new System.Drawing.Point(76, 162); + this.textBox3.Name = "textBox3"; + this.textBox3.Size = new System.Drawing.Size(250, 16); + this.textBox3.Text = "Physical Memory Available to Windows: 64,992 KB"; + // + // textBox4 + // + this.textBox4.BackColor = System.Drawing.Color.Silver; + this.textBox4.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.textBox4.Location = new System.Drawing.Point(76, 184); + this.textBox4.Name = "textBox4"; + this.textBox4.Size = new System.Drawing.Size(250, 16); + this.textBox4.Text = "System Resources: 97% Free"; + // + // 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.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"; + this.Size = new System.Drawing.Size(335, 255); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + 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; + } +} diff --git a/TimeHACK.Engine/Template/AboutBox95.cs b/TimeHACK.Engine/Template/AboutBox95.cs new file mode 100644 index 0000000..397eb4c --- /dev/null +++ b/TimeHACK.Engine/Template/AboutBox95.cs @@ -0,0 +1,27 @@ +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 System.Security.Principal; + +namespace TimeHACK.Engine.Template +{ + public partial class AboutBox95 : UserControl + { + public AboutBox95() + { + InitializeComponent(); + this.textBox2.Text = "This product is licensed to:\r\n" + Environment.UserName + "\r\n"; + } + + private void button1_Click(object sender, EventArgs e) + { + this.ParentForm.Close(); + } + } +} diff --git a/TimeHACK.Engine/Template/AboutBox95.resx b/TimeHACK.Engine/Template/AboutBox95.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TimeHACK.Engine/Template/AboutBox95.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/TimeHACK.Engine/Template/WinClassic.Designer.cs b/TimeHACK.Engine/Template/WinClassic.Designer.cs index 08b902d..2115487 100644 --- a/TimeHACK.Engine/Template/WinClassic.Designer.cs +++ b/TimeHACK.Engine/Template/WinClassic.Designer.cs @@ -132,7 +132,7 @@ this.Title.AutoSize = true; this.Title.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Title.ForeColor = System.Drawing.Color.White; - this.Title.Location = new System.Drawing.Point(23, 1); + this.Title.Location = new System.Drawing.Point(18, 1); this.Title.Name = "Title"; this.Title.Size = new System.Drawing.Size(99, 13); this.Title.TabIndex = 3; diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index 4887032..47c839d 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -45,6 +45,12 @@ + + UserControl + + + AboutBox95.cs + Form @@ -71,6 +77,9 @@ ResXFileCodeGenerator Resources.Designer.cs + + AboutBox95.cs + Infobox95.cs @@ -80,6 +89,7 @@ + diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index 4c1eefe..611d09e 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -29,7 +29,12 @@ namespace TimeHACK.Engine content.Dock = DockStyle.Fill; // Check if icon is null - if (icon == null) app.programIcon.Image = Engine.Properties.Resources.nullIcon; + if (icon == null) + { + app.programIcon.Hide(); + app.programIcon.Image = Engine.Properties.Resources.nullIcon; + app.Title.Location = new Point(2, 1); + } else app.programIcon.Image = icon; // Check if Max button is enabled and set proper X for Min button @@ -63,5 +68,15 @@ namespace TimeHACK.Engine app.Show(); return app; } + + public WinClassic startAboutBox95(String aboutwhat, String fulltitle, Image appicon) + { + AboutBox95 uc = new AboutBox95(); + uc.pictureBox1.Image = appicon; + uc.textBox1.Text = fulltitle + "\r\nWindows 95\r\nCopyright © 1981-1995 Microsoft Corp."; + uc.Font = new Font(pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0))); + + return startWin95(uc, "About " + aboutwhat, null, false, false); + } } } diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index f83065b..7c31e94 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb index 1f05a8c..97907dd 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache index 928595b..22cb9e6 100644 Binary files a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index d960576..38115e1 100644 Binary files a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index eeaa15b..7f8be7c 100644 Binary files a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources index 9fc7e1a..e165274 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt index c4c0637..1dd6633 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt @@ -17,3 +17,4 @@ C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHAC C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index 2677bc2..b2e8f35 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index f83065b..7c31e94 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb index 1f05a8c..97907dd 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb differ 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