diff options
42 files changed, 355 insertions, 21 deletions
diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo Binary files differindex 42d9670..3f21ec5 100644 --- a/.vs/TimeHACK/v14/.suo +++ b/.vs/TimeHACK/v14/.suo 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 @@ -203,6 +203,16 @@ namespace TimeHACK.Engine.Properties { /// <summary> /// Looks up a localized resource of type System.Drawing.Bitmap. /// </summary> + internal static System.Drawing.Bitmap WinAboutSeparator95 { + get { + object obj = ResourceManager.GetObject("WinAboutSeparator95", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// <summary> + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// </summary> internal static System.Drawing.Bitmap WinClassicClose { get { object obj = ResourceManager.GetObject("WinClassicClose", resourceCulture); 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 @@ <data name="Win95Warning" type="System.Resources.ResXFileRef, System.Windows.Forms"> <value>..\Resources\WinClassic\Window\Win95Warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> </data> + <data name="WinAboutSeparator95" type="System.Resources.ResXFileRef, System.Windows.Forms"> + <value>..\Resources\WinAboutSeparator95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> + </data> </root>
\ No newline at end of file diff --git a/TimeHACK.Engine/Resources/WinAboutSeparator95.png b/TimeHACK.Engine/Resources/WinAboutSeparator95.png Binary files differnew file mode 100644 index 0000000..524cad8 --- /dev/null +++ b/TimeHACK.Engine/Resources/WinAboutSeparator95.png 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 + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + 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 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> + <!-- + Microsoft ResX Schema + + Version 2.0 + + The primary goals of this format is to allow a simple XML format + that is mostly human readable. The generation and parsing of the + various data types are done through the TypeConverter classes + associated with the data types. + + Example: + + ... ado.net/XML headers & schema ... + <resheader name="resmimetype">text/microsoft-resx</resheader> + <resheader name="version">2.0</resheader> + <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader> + <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader> + <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data> + <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data> + <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64"> + <value>[base64 mime encoded serialized .NET Framework object]</value> + </data> + <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value> + <comment>This is a comment</comment> + </data> + + There are any number of "resheader" rows that contain simple + name/value pairs. + + Each data row contains a name, and value. The row also contains a + type or mimetype. Type corresponds to a .NET class that support + text/value conversion through the TypeConverter architecture. + Classes that don't support this are serialized and stored with the + mimetype set. + + The mimetype is used for serialized objects, and tells the + ResXResourceReader how to depersist the object. This is currently not + extensible. For a given mimetype the value must be set accordingly: + + Note - application/x-microsoft.net.object.binary.base64 is the format + that the ResXResourceWriter will generate, however the reader can + read any of the formats listed below. + + mimetype: application/x-microsoft.net.object.binary.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.soap.base64 + value : The object must be serialized with + : System.Runtime.Serialization.Formatters.Soap.SoapFormatter + : and then encoded with base64 encoding. + + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>
\ 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 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="Template\AboutBox95.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="Template\AboutBox95.Designer.cs"> + <DependentUpon>AboutBox95.cs</DependentUpon> + </Compile> <Compile Include="Template\Infobox95.cs"> <SubType>Form</SubType> </Compile> @@ -71,6 +77,9 @@ <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>Resources.Designer.cs</LastGenOutput> </EmbeddedResource> + <EmbeddedResource Include="Template\AboutBox95.resx"> + <DependentUpon>AboutBox95.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Template\Infobox95.resx"> <DependentUpon>Infobox95.cs</DependentUpon> </EmbeddedResource> @@ -80,6 +89,7 @@ </ItemGroup> <ItemGroup> <Content Include="Resources\Icon128x.ico" /> + <None Include="Resources\WinAboutSeparator95.png" /> <Content Include="Resources\WinClassic\Window\BottomLeft.png" /> <Content Include="Resources\WinClassic\Window\BottomRight.png" /> <Content Include="Resources\WinClassic\Window\BottomSide.png" /> 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 Binary files differindex f83065b..7c31e94 100644 --- a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb Binary files differindex 1f05a8c..97907dd 100644 --- a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache Binary files differindex 928595b..22cb9e6 100644 --- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache +++ b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferences.cache diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache Binary files differindex d960576..38115e1 100644 --- a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache +++ b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache diff --git a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll Binary files differindex eeaa15b..7f8be7c 100644 --- a/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll +++ b/TimeHACK.Engine/obj/Release/TempPE/Properties.Resources.Designer.cs.dll diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources Binary files differindex 9fc7e1a..e165274 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources Binary files differnew file mode 100644 index 0000000..6c05a97 --- /dev/null +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.AboutBox95.resources 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 Binary files differindex 2677bc2..b2e8f35 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll Binary files differindex f83065b..7c31e94 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb Binary files differindex 1f05a8c..97907dd 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb 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 Binary files differnew file mode 100644 index 0000000..524cad8 --- /dev/null +++ b/TimeHACK.Main/Resources/WinClassic/WinAboutSeparator95.png diff --git a/TimeHACK.Main/Resources/WinClassic/WinClassicNotepad.png b/TimeHACK.Main/Resources/WinClassic/WinClassicNotepad.png Binary files differindex 46a2c59..26e63bf 100644 --- a/TimeHACK.Main/Resources/WinClassic/WinClassicNotepad.png +++ b/TimeHACK.Main/Resources/WinClassic/WinClassicNotepad.png diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll Binary files differindex f83065b..7c31e94 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll +++ b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb Binary files differindex 1f05a8c..97907dd 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb +++ b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb 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 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>NhY7hlNRWbXA14CStzVBJpui0xlz8o8WhqXbzAmb+4g=</dsig:DigestValue> + <dsig:DigestValue>TOhLeLW68bNHosx5MJMNQdVWIf2PUFEjMZ38dvaCqTw=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe Binary files differindex 55e2272..09baef0 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe 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 @@ </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="6091776"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="6092288"> <assemblyIdentity name="TimeHACK" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <hash> <dsig:Transforms> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>EyRihcO7ERxrb5zK9R4TrMzFZO0ANMQwVU2IUzdFQ88=</dsig:DigestValue> + <dsig:DigestValue>VnbVJG+9+xQ4L8FqWXRdGyghEfsaCjWPhltXzTroAxY=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.Engine.dll" size="128512"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.Engine.dll" size="131584"> <assemblyIdentity name="TimeHACK.Engine" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <hash> <dsig:Transforms> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>EwtIXko8yURDgZAqhw+gu7HyFhq672T3kd6QV7jECt8=</dsig:DigestValue> + <dsig:DigestValue>DgulC6PIjsb5Ut2SA6A7QFq/UCPgKUqOn6tzlYWABME=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb Binary files differindex 82e542e..d32afe7 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.pdb +++ b/TimeHACK.Main/bin/Release/TimeHACK.pdb 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 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>NhY7hlNRWbXA14CStzVBJpui0xlz8o8WhqXbzAmb+4g=</dsig:DigestValue> + <dsig:DigestValue>TOhLeLW68bNHosx5MJMNQdVWIf2PUFEjMZ38dvaCqTw=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> 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 @@ </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="6091776"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="6092288"> <assemblyIdentity name="TimeHACK" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <hash> <dsig:Transforms> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>EyRihcO7ERxrb5zK9R4TrMzFZO0ANMQwVU2IUzdFQ88=</dsig:DigestValue> + <dsig:DigestValue>VnbVJG+9+xQ4L8FqWXRdGyghEfsaCjWPhltXzTroAxY=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.Engine.dll" size="128512"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.Engine.dll" size="131584"> <assemblyIdentity name="TimeHACK.Engine" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <hash> <dsig:Transforms> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>EwtIXko8yURDgZAqhw+gu7HyFhq672T3kd6QV7jECt8=</dsig:DigestValue> + <dsig:DigestValue>DgulC6PIjsb5Ut2SA6A7QFq/UCPgKUqOn6tzlYWABME=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe Binary files differindex 55e2272..09baef0 100644 --- a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe +++ b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache Binary files differindex 9992b12..7c68e81 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources Binary files differindex c38a4cf..d0339c0 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources +++ b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources 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 @@ <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>NhY7hlNRWbXA14CStzVBJpui0xlz8o8WhqXbzAmb+4g=</dsig:DigestValue> + <dsig:DigestValue>TOhLeLW68bNHosx5MJMNQdVWIf2PUFEjMZ38dvaCqTw=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe Binary files differindex 55e2272..09baef0 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe 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 @@ </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="6091776"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.exe" size="6092288"> <assemblyIdentity name="TimeHACK" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <hash> <dsig:Transforms> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>EyRihcO7ERxrb5zK9R4TrMzFZO0ANMQwVU2IUzdFQ88=</dsig:DigestValue> + <dsig:DigestValue>VnbVJG+9+xQ4L8FqWXRdGyghEfsaCjWPhltXzTroAxY=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> <dependency> - <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.Engine.dll" size="128512"> + <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="TimeHACK.Engine.dll" size="131584"> <assemblyIdentity name="TimeHACK.Engine" version="1.0.0.0" language="neutral" processorArchitecture="msil" /> <hash> <dsig:Transforms> <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" /> </dsig:Transforms> <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /> - <dsig:DigestValue>EwtIXko8yURDgZAqhw+gu7HyFhq672T3kd6QV7jECt8=</dsig:DigestValue> + <dsig:DigestValue>DgulC6PIjsb5Ut2SA6A7QFq/UCPgKUqOn6tzlYWABME=</dsig:DigestValue> </hash> </dependentAssembly> </dependency> diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb Binary files differindex 82e542e..d32afe7 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.pdb +++ b/TimeHACK.Main/obj/Release/TimeHACK.pdb |
