diff options
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95.Designer.cs | 12 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95.cs | 10 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/TestApp.Designer.cs | 61 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/TestApp.cs | 13 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/TestApp.resx | 120 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.resx | 1 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win98/Win98.Designer.cs | 12 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win98/Win98.cs | 10 | ||||
| -rw-r--r-- | TimeHACK.Main/TimeHACK.Main.csproj | 9 |
9 files changed, 1 insertions, 247 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 46485ee..2639442 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -89,7 +89,6 @@ namespace TimeHACK.OS.Win95 this.WebChatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TimeDistorterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DocumentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.windowManagerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.downloaderTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.installerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -743,7 +742,6 @@ namespace TimeHACK.OS.Win95 this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.DocumentsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.windowManagerTestToolStripMenuItem, this.downloaderTestToolStripMenuItem, this.installerTestToolStripMenuItem, this.storyTest1ToolStripMenuItem}); @@ -755,15 +753,6 @@ namespace TimeHACK.OS.Win95 this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.DocumentsToolStripMenuItem.Text = "Documents"; // - // windowManagerTestToolStripMenuItem - // - this.windowManagerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.windowManagerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("windowManagerTestToolStripMenuItem.BackgroundImage"))); - this.windowManagerTestToolStripMenuItem.Name = "windowManagerTestToolStripMenuItem"; - this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.windowManagerTestToolStripMenuItem.Text = "WindowManagerTest"; - this.windowManagerTestToolStripMenuItem.Click += new System.EventHandler(this.windowManagerTestToolStripMenuItem_Click); - // // downloaderTestToolStripMenuItem // this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; @@ -1275,7 +1264,6 @@ namespace TimeHACK.OS.Win95 internal System.Windows.Forms.ToolStripMenuItem MicrosoftDataLinkToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PropertiesToolStripMenuItem1; internal System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95)); - private System.Windows.Forms.ToolStripMenuItem windowManagerTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem; private System.Windows.Forms.Panel taskbarItems; diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index dc0368e..6090c0f 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -8,7 +8,6 @@ using TimeHACK.Engine; using TimeHACK.Engine.Template; using TimeHACK.Engine.Template.Taskbars; using TimeHACK.OS.Win95.Win95Apps; -using TimeHACK.WinClassicForms; using TimeHACK.OS.Win95.Win95Apps.Story; using static TimeHACK.Engine.SaveSystem; namespace TimeHACK.OS.Win95 @@ -213,15 +212,6 @@ namespace TimeHACK.OS.Win95 app.BringToFront(); startmenu.Hide(); } - private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e) - { - TestApp test = new TestApp(); - WinClassic app = wm.StartWin95(test, "TestApp", null, true, true); - AddTaskBarItem(app, app.Tag.ToString(), "TestApp", null); - app.BringToFront(); - startmenu.Hide(); - } - private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicDownloader opendownload = new WinClassicDownloader(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/TestApp.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/TestApp.Designer.cs deleted file mode 100644 index 2e9742b..0000000 --- a/TimeHACK.Main/OS/Win95/Win95Apps/TestApp.Designer.cs +++ /dev/null @@ -1,61 +0,0 @@ -namespace TimeHACK.WinClassicForms -{ - partial class TestApp - { - /// <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.label1 = new System.Windows.Forms.Label(); - this.SuspendLayout(); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(24, 91); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(237, 65); - this.label1.TabIndex = 0; - this.label1.Text = "If you are reading this, you are reading a window\r\nwith borders that are being re" + - "ndered by the\r\nWindowManager. All you need is 3 lines of code.\r\n\r\nTHIS IS AWESOM" + - "E!"; - // - // TestApp - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.label1); - this.Name = "TestApp"; - this.Size = new System.Drawing.Size(292, 274); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.Label label1; - } -} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/TestApp.cs b/TimeHACK.Main/OS/Win95/Win95Apps/TestApp.cs deleted file mode 100644 index 0c2e6a8..0000000 --- a/TimeHACK.Main/OS/Win95/Win95Apps/TestApp.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Windows.Forms; - -namespace TimeHACK.WinClassicForms -{ - public partial class TestApp : UserControl - { - public TestApp() - { - InitializeComponent(); - } - } -} - diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/TestApp.resx b/TimeHACK.Main/OS/Win95/Win95Apps/TestApp.resx deleted file mode 100644 index 1af7de1..0000000 --- a/TimeHACK.Main/OS/Win95/Win95Apps/TestApp.resx +++ /dev/null @@ -1,120 +0,0 @@ -<?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.Main/OS/Win95/Win95Apps/WinClassicTerminal.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.resx index 1af7de1..9dc3679 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.resx @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> + <root> <!-- Microsoft ResX Schema diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs index d07670b..3762187 100644 --- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs @@ -89,7 +89,6 @@ namespace TimeHACK.OS.Win98 this.WebChatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TimeDistorterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DocumentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.windowManagerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.downloaderTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.installerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -730,7 +729,6 @@ namespace TimeHACK.OS.Win98 this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.DocumentsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.windowManagerTestToolStripMenuItem, this.downloaderTestToolStripMenuItem, this.installerTestToolStripMenuItem, this.storyTest1ToolStripMenuItem}); @@ -742,15 +740,6 @@ namespace TimeHACK.OS.Win98 this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.DocumentsToolStripMenuItem.Text = "Documents"; // - // windowManagerTestToolStripMenuItem - // - this.windowManagerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.windowManagerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("windowManagerTestToolStripMenuItem.BackgroundImage"))); - this.windowManagerTestToolStripMenuItem.Name = "windowManagerTestToolStripMenuItem"; - this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.windowManagerTestToolStripMenuItem.Text = "WindowManagerTest"; - this.windowManagerTestToolStripMenuItem.Click += new System.EventHandler(this.windowManagerTestToolStripMenuItem_Click); - // // downloaderTestToolStripMenuItem // this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; @@ -1261,7 +1250,6 @@ namespace TimeHACK.OS.Win98 internal System.Windows.Forms.ToolStripMenuItem MicrosoftDataLinkToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PropertiesToolStripMenuItem1; internal System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95)); - private System.Windows.Forms.ToolStripMenuItem windowManagerTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem; private System.Windows.Forms.Panel taskbarItems; diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index 175719a..fa3fbfa 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -8,7 +8,6 @@ using TimeHACK.Engine; using TimeHACK.Engine.Template; using TimeHACK.Engine.Template.Taskbars; using TimeHACK.OS.Win95.Win95Apps; -using TimeHACK.WinClassicForms; using TimeHACK.OS.Win95.Win95Apps.Story; namespace TimeHACK.OS.Win98 @@ -195,15 +194,6 @@ namespace TimeHACK.OS.Win98 app.BringToFront(); startmenu.Hide(); } - private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e) - { - TestApp test = new TestApp(); - WinClassic app = wm.StartWin95(test, "TestApp", null, true, true); - AddTaskBarItem(app, app.Tag.ToString(), "TestApp", null); - app.BringToFront(); - startmenu.Hide(); - } - private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicDownloader opendownload = new WinClassicDownloader(); diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 1590896..605b079 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -221,12 +221,6 @@ <Compile Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewContact.Designer.cs"> <DependentUpon>FRMWinClassicAddressBookNewContact.cs</DependentUpon> </Compile> - <Compile Include="OS\Win95\Win95Apps\TestApp.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Include="OS\Win95\Win95Apps\TestApp.Designer.cs"> - <DependentUpon>TestApp.cs</DependentUpon> - </Compile> <Compile Include="OS\Win95\Win95Apps\WebChat1998.cs"> <SubType>UserControl</SubType> </Compile> @@ -354,9 +348,6 @@ <EmbeddedResource Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewContact.resx"> <DependentUpon>FRMWinClassicAddressBookNewContact.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="OS\Win95\Win95Apps\TestApp.resx"> - <DependentUpon>TestApp.cs</DependentUpon> - </EmbeddedResource> <EmbeddedResource Include="OS\Win95\Win95Apps\WebChat1998.resx"> <DependentUpon>WebChat1998.cs</DependentUpon> </EmbeddedResource> |