From 19ea483b2ba7974ffcfbe06b73c160a5ca418f45 Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 14:36:15 -0400 Subject: starting work on the actual webchat98 app --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs new file mode 100644 index 0000000..ce87665 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TimeHACK.OS.Win95.Win95Apps +{ + public partial class WebChat1998 : UserControl + { + public WebChat1998() + { + InitializeComponent(); + } + } +} -- cgit v1.2.3 From 27419aa0dce06f9af5ee28f64aace365dcb7d816 Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 17:44:01 -0400 Subject: webchat things --- .vs/TimeHACK/v14/.suo | Bin 122368 -> 122368 bytes TimeHACK.Engine/WCMessageParser.cs | 8 ++++- TimeHACK.Engine/WindowManager.cs | 2 +- .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 7 ++++ TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 39 +++++++++++++++++++-- 6 files changed, 53 insertions(+), 4 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 363d666..c679976 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/WCMessageParser.cs b/TimeHACK.Engine/WCMessageParser.cs index ed16afd..44c9002 100644 --- a/TimeHACK.Engine/WCMessageParser.cs +++ b/TimeHACK.Engine/WCMessageParser.cs @@ -13,12 +13,18 @@ namespace TimeHACK.Engine { JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString()); string newmsg = message["message"].ToString().Replace("@user", user); - return message["user"].ToString() + ": " + newmsg; + if (message["userchat"].ToObject()) return message["user"].ToString() + ": " + newmsg; + else return newmsg; } public int GetMessageDelay(string json, int index) { JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString()); return message["delay"].ToObject(); } + public string GetSpecial(string json, int index) + { + JObject message = JObject.Parse(JObject.Parse(json)["messages"][index].ToString()); + return message["special"].ToString(); + } } } diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index 193985a..4a1cf4e 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -9,7 +9,7 @@ namespace TimeHACK.Engine { public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); - public WinClassic startWinClassic(UserControl content, String title, PictureBox icon, Boolean MaxButton, Boolean MinButton) + public WinClassic startWinClassic(UserControl content, string title, PictureBox icon, bool MaxButton, bool MinButton) { // Setup Window WinClassic app = new WinClassic(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index c3a5964..80aab11 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -269,6 +269,7 @@ this.Controls.Add(this.listBox1); this.Name = "WebChat1998"; this.Size = new System.Drawing.Size(724, 462); + this.Load += new System.EventHandler(this.WebChat1998_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.login.ResumeLayout(false); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index ce87665..3f4810e 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -16,5 +16,12 @@ namespace TimeHACK.OS.Win95.Win95Apps { InitializeComponent(); } + private void WebChat1998_Load(object sender, EventArgs e) + { + button5.Hide(); + button4.Hide(); + button3.Hide(); + label5.Hide(); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 61225ed..cb2c52a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -117,9 +117,44 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + 17, 17 - + + + { + "messages": [ + { + "user": "System", + "delay": 5000, + "message": "SkyHigh has joined the chat.", + "special": "addsh", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "damn", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "I thought my friend rain49 was going to be on...", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "hmm... how about we play a game while we wait for my friend to come", + "special": null, + "userchat": true + } + ] +} + If you do not agree to the following rules below DO NOT log into the chat: -- cgit v1.2.3 From 586f0f740898cd7eb7cd59048ba8d59410b2f766 Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 18:31:16 -0400 Subject: fixed tons of things --- .vs/TimeHACK/v14/.suo | Bin 122368 -> 131584 bytes TimeHACK.Engine/Template/Infobox95.Designer.cs | 2 +- TimeHACK.Engine/Template/Infobox95.cs | 2 +- TimeHACK.Engine/Template/WinClassic.Designer.cs | 2 +- TimeHACK.Engine/Template/WinClassic.cs | 2 +- TimeHACK.Engine/TimeHACK.Engine.csproj | 4 + TimeHACK.Engine/WindowManager.cs | 4 +- TimeHACK.Engine/bin/Release/Newtonsoft.Json.dll | Bin 0 -> 654848 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 126464 -> 126976 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 30208 -> 32256 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 8410 -> 8749 bytes .../TimeHACK.Engine.Properties.Resources.resources | Bin 99340 -> 99522 bytes .../TimeHACK.Engine.Template.Infobox95.resources | Bin 0 -> 3780 bytes .../TimeHACK.Engine.Template.WinClassic.resources | Bin 0 -> 4593 bytes .../TimeHACK.Engine.csproj.FileListAbsolute.txt | 10 + .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2104 -> 2068 bytes ...ACK.Engine.csprojResolveAssemblyReference.cache | Bin 2230 -> 12307 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 126464 -> 126976 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 30208 -> 32256 bytes .../TimeHACK.Main.Template.Infobox95.resources | Bin 3780 -> 0 bytes .../TimeHACK.Main.Template.WinClassic.resources | Bin 4593 -> 0 bytes TimeHACK.Main/OS/Win95/Win95.Designer.cs | 818 ++++++++++----------- TimeHACK.Main/OS/Win95/Win95.cs | 10 +- .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 2 +- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 9 + .../OS/Win95/Win95Apps/WinClassicDownloader.cs | 2 +- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs | 2 +- .../OS/Win95/Win95Apps/WinClassicInstaller.cs | 1 + TimeHACK.Main/Properties/Resources.Designer.cs | 10 + TimeHACK.Main/Properties/Resources.resx | 3 + TimeHACK.Main/TimeHACK.Main.csproj | 10 + TimeHACK.Main/TitleScreen.cs | 4 +- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 126464 -> 126976 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 30208 -> 32256 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 3995648 -> 5509120 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 114176 -> 122368 bytes .../bin/Release/TimeHACK.vshost.application | 4 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 125 +--- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 3995648 -> 5509120 bytes .../DesignTimeResolveAssemblyReferences.cache | Bin 0 -> 868 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 0 -> 11720 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 0 -> 9216 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 20 + .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 0 -> 4011 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 0 -> 16573 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 0 -> 1453 bytes .../Release/TimeHACK.OS.Win95.Windows95.resources | Bin 0 -> 162603 bytes .../TimeHACK.Properties.Resources.resources | Bin 2621515 -> 4132851 bytes .../obj/Release/TimeHACK.TitleScreen.resources | Bin 1074962 -> 1074962 bytes .../obj/Release/TimeHACK.Windows95.resources | Bin 162460 -> 0 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 0 -> 5509120 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 0 -> 122368 bytes 56 files changed, 518 insertions(+), 548 deletions(-) create mode 100644 TimeHACK.Engine/bin/Release/Newtonsoft.Json.dll create mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Infobox95.resources create mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.Infobox95.resources delete mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.WinClassic.resources create mode 100644 TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache create mode 100644 TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache create mode 100644 TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.exe create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.pdb (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index c679976..930f2b8 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/Template/Infobox95.Designer.cs b/TimeHACK.Engine/Template/Infobox95.Designer.cs index 360957d..cb69fac 100644 --- a/TimeHACK.Engine/Template/Infobox95.Designer.cs +++ b/TimeHACK.Engine/Template/Infobox95.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK.Main.Template +namespace TimeHACK.Engine.Template { partial class Infobox95 { diff --git a/TimeHACK.Engine/Template/Infobox95.cs b/TimeHACK.Engine/Template/Infobox95.cs index 838bad0..69bbeda 100644 --- a/TimeHACK.Engine/Template/Infobox95.cs +++ b/TimeHACK.Engine/Template/Infobox95.cs @@ -3,7 +3,7 @@ using System.Drawing; using System.Runtime.InteropServices; using System.Windows.Forms; -namespace TimeHACK.Main.Template +namespace TimeHACK.Engine.Template { public partial class Infobox95 : Form { diff --git a/TimeHACK.Engine/Template/WinClassic.Designer.cs b/TimeHACK.Engine/Template/WinClassic.Designer.cs index 44d2707..43cc1e1 100644 --- a/TimeHACK.Engine/Template/WinClassic.Designer.cs +++ b/TimeHACK.Engine/Template/WinClassic.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK.Main.Template +namespace TimeHACK.Engine.Template { partial class WinClassic { diff --git a/TimeHACK.Engine/Template/WinClassic.cs b/TimeHACK.Engine/Template/WinClassic.cs index db85a6a..ea99353 100644 --- a/TimeHACK.Engine/Template/WinClassic.cs +++ b/TimeHACK.Engine/Template/WinClassic.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; -namespace TimeHACK.Main.Template +namespace TimeHACK.Engine.Template { public partial class WinClassic : Form { diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index dfff0ed..b30c6fd 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -30,6 +30,9 @@ 4 + + ..\TimeHACK.Main\bin\Release\Newtonsoft.Json.dll + @@ -55,6 +58,7 @@ WinClassic.cs + True diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index 56abdbc..fb6090f 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -1,9 +1,9 @@ using System; -using TimeHACK.Main.Template; using System.Windows.Forms; using System.Drawing; +using TimeHACK.Engine.Template; -namespace TimeHACK.Main +namespace TimeHACK.Engine { public class WindowManager { diff --git a/TimeHACK.Engine/bin/Release/Newtonsoft.Json.dll b/TimeHACK.Engine/bin/Release/Newtonsoft.Json.dll new file mode 100644 index 0000000..bc3ef13 Binary files /dev/null and b/TimeHACK.Engine/bin/Release/Newtonsoft.Json.dll differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 74df9a1..12776da 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 c4e9182..bcd072f 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/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 5eb069d..8cebb3e 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/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources index 5b2609b..00b9ff1 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.Infobox95.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Infobox95.resources new file mode 100644 index 0000000..411a9ff Binary files /dev/null and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Infobox95.resources differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources new file mode 100644 index 0000000..bb123eb Binary files /dev/null and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.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 07ae83e..c4c0637 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt @@ -7,3 +7,13 @@ D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Main.Template. D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll D:\Documents\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll +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 diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index 1412226..7ba7178 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.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache index b980bb4..9c37d45 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 74df9a1..12776da 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 c4e9182..bcd072f 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.Engine/obj/Release/TimeHACK.Main.Template.Infobox95.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.Infobox95.resources deleted file mode 100644 index 28199df..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.Infobox95.resources and /dev/null differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.WinClassic.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.WinClassic.resources deleted file mode 100644 index 690267a..0000000 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Main.Template.WinClassic.resources and /dev/null differ diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 938782f..0bacc55 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK +namespace TimeHACK.OS.Win95 { partial class Windows95 { @@ -29,46 +29,23 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.ListViewItem listViewItem9 = new System.Windows.Forms.ListViewItem("My Computer", 0); - System.Windows.Forms.ListViewItem listViewItem10 = new System.Windows.Forms.ListViewItem("Network Neighborhood", 5); - System.Windows.Forms.ListViewItem listViewItem11 = new System.Windows.Forms.ListViewItem("Inbox", 3); - System.Windows.Forms.ListViewItem listViewItem12 = new System.Windows.Forms.ListViewItem("Recycle Bin", 7); - System.Windows.Forms.ListViewItem listViewItem13 = new System.Windows.Forms.ListViewItem("Internet Explorer", 2); - System.Windows.Forms.ListViewItem listViewItem14 = new System.Windows.Forms.ListViewItem("Online services", 1); - System.Windows.Forms.ListViewItem listViewItem15 = new System.Windows.Forms.ListViewItem("Set Up The Microsoft Network", 4); - System.Windows.Forms.ListViewItem listViewItem16 = new System.Windows.Forms.ListViewItem("Outlook Express", 6); System.ComponentModel.ComponentResourceManager 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); + System.Windows.Forms.ListViewItem listViewItem4 = new System.Windows.Forms.ListViewItem("Recycle Bin", 7); + System.Windows.Forms.ListViewItem listViewItem5 = new System.Windows.Forms.ListViewItem("Internet Explorer", 2); + System.Windows.Forms.ListViewItem listViewItem6 = new System.Windows.Forms.ListViewItem("Online services", 1); + System.Windows.Forms.ListViewItem listViewItem7 = new System.Windows.Forms.ListViewItem("Set Up The Microsoft Network", 4); + System.Windows.Forms.ListViewItem listViewItem8 = new System.Windows.Forms.ListViewItem("Outlook Express", 6); this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); - this.startmenu = new System.Windows.Forms.Panel(); - this.startmenuitems = new System.Windows.Forms.MenuStrip(); - this.ossidestartmenu = new System.Windows.Forms.Panel(); - this.clockTimer = new System.Windows.Forms.Timer(this.components); - this.desktopImages = new System.Windows.Forms.ImageList(this.components); - this.desktopicons = new System.Windows.Forms.ListView(); - this.rightclickbackproperties = new System.Windows.Forms.ContextMenuStrip(this.components); - this.PropertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ByNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ByTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.BySizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoArrangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ByDateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LineUpIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PasteShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.NewToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.WaveSoundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.WordPadDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.BitmapImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MicrosoftDataLinkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.taskbar = new System.Windows.Forms.Panel(); this.taskbartime = new System.Windows.Forms.Label(); this.clockPanel = new System.Windows.Forms.Panel(); this.startbutton = new System.Windows.Forms.PictureBox(); + this.startmenu = new System.Windows.Forms.Panel(); + this.startmenuitems = new System.Windows.Forms.MenuStrip(); this.ProgramsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AccessoriesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CommunicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -111,8 +88,6 @@ 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.infoboxTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ControlPanelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PrintersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -126,20 +101,44 @@ this.RunToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SuspendToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ossidestartmenu = new System.Windows.Forms.Panel(); this.osimage = new System.Windows.Forms.PictureBox(); + this.clockTimer = new System.Windows.Forms.Timer(this.components); + this.desktopImages = new System.Windows.Forms.ImageList(this.components); + this.desktopicons = new System.Windows.Forms.ListView(); + this.rightclickbackproperties = new System.Windows.Forms.ContextMenuStrip(this.components); + this.PropertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ByNameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ByTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.BySizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AutoArrangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ByDateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.LineUpIconsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PasteShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.NewToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ShortcutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.WaveSoundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.WordPadDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.BitmapImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MicrosoftDataLinkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.installerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1.SuspendLayout(); + this.taskbar.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit(); this.startmenu.SuspendLayout(); this.startmenuitems.SuspendLayout(); this.ossidestartmenu.SuspendLayout(); - this.rightclickbackproperties.SuspendLayout(); - this.taskbar.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.osimage)).BeginInit(); + this.rightclickbackproperties.SuspendLayout(); this.SuspendLayout(); // // panel1 // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.panel1.AutoSize = true; this.panel1.Controls.Add(this.panel2); @@ -155,252 +154,6 @@ this.panel2.Size = new System.Drawing.Size(54, 22); this.panel2.TabIndex = 1; // - // startmenu - // - this.startmenu.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.startmenu.BackColor = System.Drawing.Color.Silver; - this.startmenu.Controls.Add(this.startmenuitems); - this.startmenu.Controls.Add(this.ossidestartmenu); - this.startmenu.Location = new System.Drawing.Point(0, 392); - this.startmenu.Name = "startmenu"; - this.startmenu.Size = new System.Drawing.Size(174, 300); - this.startmenu.TabIndex = 3; - this.startmenu.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenu_Paint); - // - // startmenuitems - // - this.startmenuitems.BackColor = System.Drawing.Color.Silver; - this.startmenuitems.Dock = System.Windows.Forms.DockStyle.None; - this.startmenuitems.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ProgramsToolStripMenuItem, - this.DocumentsToolStripMenuItem, - this.SettingsToolStripMenuItem, - this.FindToolStripMenuItem, - this.HelpToolStripMenuItem, - this.RunToolStripMenuItem, - this.SuspendToolStripMenuItem, - this.ShutdownToolStripMenuItem}); - this.startmenuitems.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow; - this.startmenuitems.Location = new System.Drawing.Point(28, 2); - this.startmenuitems.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0); - this.startmenuitems.Name = "startmenuitems"; - this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); - this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(141, 311); - this.startmenuitems.TabIndex = 0; - this.startmenuitems.Text = "StartMenu"; - // - // ossidestartmenu - // - this.ossidestartmenu.Controls.Add(this.osimage); - this.ossidestartmenu.Location = new System.Drawing.Point(0, 0); - this.ossidestartmenu.Name = "ossidestartmenu"; - this.ossidestartmenu.Size = new System.Drawing.Size(26, 297); - this.ossidestartmenu.TabIndex = 4; - // - // clockTimer - // - this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick); - // - // desktopImages - // - this.desktopImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("desktopImages.ImageStream"))); - this.desktopImages.TransparentColor = System.Drawing.Color.Transparent; - this.desktopImages.Images.SetKeyName(0, "WinClassicComputer.png"); - this.desktopImages.Images.SetKeyName(1, "WinClassicFolder.png"); - this.desktopImages.Images.SetKeyName(2, "WinClassicIE4.png"); - this.desktopImages.Images.SetKeyName(3, "WinClassicInbox.png"); - this.desktopImages.Images.SetKeyName(4, "WinClassicMSN.png"); - this.desktopImages.Images.SetKeyName(5, "WinClassicNetworking.png"); - this.desktopImages.Images.SetKeyName(6, "WinClassicOutlook.png"); - this.desktopImages.Images.SetKeyName(7, "WinClassicRecycle.png"); - this.desktopImages.Images.SetKeyName(8, "WinClassicSetup.png"); - this.desktopImages.Images.SetKeyName(9, "WinClassicSetup.png"); - this.desktopImages.Images.SetKeyName(10, "WinClassicSetup.png"); - this.desktopImages.Images.SetKeyName(11, "WinClassicSetup.png"); - // - // desktopicons - // - this.desktopicons.Alignment = System.Windows.Forms.ListViewAlignment.Left; - this.desktopicons.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.desktopicons.BackColor = System.Drawing.Color.Teal; - this.desktopicons.BackgroundImageTiled = true; - this.desktopicons.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.desktopicons.ForeColor = System.Drawing.Color.White; - this.desktopicons.Items.AddRange(new System.Windows.Forms.ListViewItem[] { - listViewItem9, - listViewItem10, - listViewItem11, - listViewItem12, - listViewItem13, - listViewItem14, - listViewItem15, - listViewItem16}); - this.desktopicons.LargeImageList = this.desktopImages; - this.desktopicons.Location = new System.Drawing.Point(0, 0); - this.desktopicons.Name = "desktopicons"; - this.desktopicons.Size = new System.Drawing.Size(1280, 720); - this.desktopicons.TabIndex = 6; - this.desktopicons.UseCompatibleStateImageBehavior = false; - this.desktopicons.DoubleClick += new System.EventHandler(this.desktopicons_Click); - this.desktopicons.MouseDown += new System.Windows.Forms.MouseEventHandler(this.desktop_mousedown); - // - // rightclickbackproperties - // - this.rightclickbackproperties.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PropertiesToolStripMenuItem, - this.LineUpIconsToolStripMenuItem, - this.PasteToolStripMenuItem, - this.PasteShortcutToolStripMenuItem, - this.NewToolStripMenuItem1, - this.PropertiesToolStripMenuItem1}); - this.rightclickbackproperties.Name = "ContextMenuStrip1"; - this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.rightclickbackproperties.Size = new System.Drawing.Size(151, 136); - // - // PropertiesToolStripMenuItem - // - this.PropertiesToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.PropertiesToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ByNameToolStripMenuItem, - this.ByTypeToolStripMenuItem, - this.BySizeToolStripMenuItem, - this.AutoArrangeToolStripMenuItem, - this.ByDateToolStripMenuItem}); - this.PropertiesToolStripMenuItem.Name = "PropertiesToolStripMenuItem"; - this.PropertiesToolStripMenuItem.Size = new System.Drawing.Size(150, 22); - this.PropertiesToolStripMenuItem.Text = "Arrange Icons"; - // - // ByNameToolStripMenuItem - // - this.ByNameToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ByNameToolStripMenuItem.Name = "ByNameToolStripMenuItem"; - this.ByNameToolStripMenuItem.Size = new System.Drawing.Size(145, 22); - this.ByNameToolStripMenuItem.Text = "by Name"; - // - // ByTypeToolStripMenuItem - // - this.ByTypeToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ByTypeToolStripMenuItem.Name = "ByTypeToolStripMenuItem"; - this.ByTypeToolStripMenuItem.Size = new System.Drawing.Size(145, 22); - this.ByTypeToolStripMenuItem.Text = "by Type"; - // - // BySizeToolStripMenuItem - // - this.BySizeToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.BySizeToolStripMenuItem.Name = "BySizeToolStripMenuItem"; - this.BySizeToolStripMenuItem.Size = new System.Drawing.Size(145, 22); - this.BySizeToolStripMenuItem.Text = "by Size"; - // - // AutoArrangeToolStripMenuItem - // - this.AutoArrangeToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.AutoArrangeToolStripMenuItem.Name = "AutoArrangeToolStripMenuItem"; - this.AutoArrangeToolStripMenuItem.Size = new System.Drawing.Size(145, 22); - this.AutoArrangeToolStripMenuItem.Text = "Auto Arrange"; - // - // ByDateToolStripMenuItem - // - this.ByDateToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ByDateToolStripMenuItem.Name = "ByDateToolStripMenuItem"; - this.ByDateToolStripMenuItem.Size = new System.Drawing.Size(145, 22); - this.ByDateToolStripMenuItem.Text = "by Date"; - // - // LineUpIconsToolStripMenuItem - // - this.LineUpIconsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.LineUpIconsToolStripMenuItem.Name = "LineUpIconsToolStripMenuItem"; - this.LineUpIconsToolStripMenuItem.Size = new System.Drawing.Size(150, 22); - this.LineUpIconsToolStripMenuItem.Text = "Line Up Icons"; - // - // PasteToolStripMenuItem - // - this.PasteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.PasteToolStripMenuItem.Name = "PasteToolStripMenuItem"; - this.PasteToolStripMenuItem.Size = new System.Drawing.Size(150, 22); - this.PasteToolStripMenuItem.Text = "Paste"; - // - // PasteShortcutToolStripMenuItem - // - this.PasteShortcutToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.PasteShortcutToolStripMenuItem.Name = "PasteShortcutToolStripMenuItem"; - this.PasteShortcutToolStripMenuItem.Size = new System.Drawing.Size(150, 22); - this.PasteShortcutToolStripMenuItem.Text = "Paste Shortcut"; - // - // NewToolStripMenuItem1 - // - this.NewToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.NewToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FolderToolStripMenuItem, - this.ShortcutToolStripMenuItem, - this.WaveSoundToolStripMenuItem, - this.TextDocumentToolStripMenuItem, - this.WordPadDocumentToolStripMenuItem, - this.BitmapImageToolStripMenuItem, - this.MicrosoftDataLinkToolStripMenuItem}); - this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; - this.NewToolStripMenuItem1.Size = new System.Drawing.Size(150, 22); - this.NewToolStripMenuItem1.Text = "New"; - // - // FolderToolStripMenuItem - // - this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; - this.FolderToolStripMenuItem.Size = new System.Drawing.Size(182, 22); - this.FolderToolStripMenuItem.Text = "Folder"; - this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); - // - // ShortcutToolStripMenuItem - // - this.ShortcutToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ShortcutToolStripMenuItem.Name = "ShortcutToolStripMenuItem"; - this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(182, 22); - this.ShortcutToolStripMenuItem.Text = "Shortcut"; - // - // WaveSoundToolStripMenuItem - // - this.WaveSoundToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.WaveSoundToolStripMenuItem.Name = "WaveSoundToolStripMenuItem"; - this.WaveSoundToolStripMenuItem.Size = new System.Drawing.Size(182, 22); - this.WaveSoundToolStripMenuItem.Text = "Wave Sound"; - // - // TextDocumentToolStripMenuItem - // - this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; - this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(182, 22); - this.TextDocumentToolStripMenuItem.Text = "Text Document"; - // - // WordPadDocumentToolStripMenuItem - // - this.WordPadDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.WordPadDocumentToolStripMenuItem.Name = "WordPadDocumentToolStripMenuItem"; - this.WordPadDocumentToolStripMenuItem.Size = new System.Drawing.Size(182, 22); - this.WordPadDocumentToolStripMenuItem.Text = "WordPad Document"; - // - // BitmapImageToolStripMenuItem - // - this.BitmapImageToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.BitmapImageToolStripMenuItem.Name = "BitmapImageToolStripMenuItem"; - this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(182, 22); - this.BitmapImageToolStripMenuItem.Text = "Bitmap Image"; - // - // MicrosoftDataLinkToolStripMenuItem - // - this.MicrosoftDataLinkToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.MicrosoftDataLinkToolStripMenuItem.Name = "MicrosoftDataLinkToolStripMenuItem"; - this.MicrosoftDataLinkToolStripMenuItem.Size = new System.Drawing.Size(182, 22); - this.MicrosoftDataLinkToolStripMenuItem.Text = "Microsoft Data Link"; - // - // PropertiesToolStripMenuItem1 - // - this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; - this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(150, 22); - this.PropertiesToolStripMenuItem1.Text = "Properties"; - // // taskbar // this.taskbar.BackColor = System.Drawing.Color.Silver; @@ -419,16 +172,17 @@ this.taskbartime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.taskbartime.AutoSize = true; this.taskbartime.BackColor = System.Drawing.Color.Transparent; + this.taskbartime.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.taskbartime.Location = new System.Drawing.Point(1217, 6); this.taskbartime.Name = "taskbartime"; - this.taskbartime.Size = new System.Drawing.Size(26, 13); + this.taskbartime.Size = new System.Drawing.Size(31, 15); this.taskbartime.TabIndex = 2; this.taskbartime.Text = "time"; this.taskbartime.Click += new System.EventHandler(this.taskbartime_Click); // // clockPanel // - this.clockPanel.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("clockPanel.BackgroundImage"))); + this.clockPanel.BackgroundImage = global::TimeHACK.Properties.Resources.WinClassicTime; this.clockPanel.Dock = System.Windows.Forms.DockStyle.Right; this.clockPanel.Location = new System.Drawing.Point(1215, 0); this.clockPanel.Name = "clockPanel"; @@ -445,10 +199,45 @@ this.startbutton.TabStop = false; this.startbutton.Click += new System.EventHandler(this.startbutton_Click); // + // startmenu + // + this.startmenu.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.startmenu.BackColor = System.Drawing.Color.Silver; + this.startmenu.Controls.Add(this.startmenuitems); + this.startmenu.Controls.Add(this.ossidestartmenu); + this.startmenu.Location = new System.Drawing.Point(0, 397); + this.startmenu.Name = "startmenu"; + this.startmenu.Size = new System.Drawing.Size(174, 300); + this.startmenu.TabIndex = 3; + this.startmenu.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenu_Paint); + // + // startmenuitems + // + this.startmenuitems.BackColor = System.Drawing.Color.Silver; + this.startmenuitems.Dock = System.Windows.Forms.DockStyle.None; + this.startmenuitems.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ProgramsToolStripMenuItem, + this.DocumentsToolStripMenuItem, + this.SettingsToolStripMenuItem, + this.FindToolStripMenuItem, + this.HelpToolStripMenuItem, + this.RunToolStripMenuItem, + this.SuspendToolStripMenuItem, + this.ShutdownToolStripMenuItem}); + this.startmenuitems.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow; + this.startmenuitems.Location = new System.Drawing.Point(28, 2); + this.startmenuitems.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.startmenuitems.Name = "startmenuitems"; + this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); + this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; + this.startmenuitems.Size = new System.Drawing.Size(144, 311); + this.startmenuitems.TabIndex = 0; + this.startmenuitems.Text = "StartMenu"; + // // ProgramsToolStripMenuItem // this.ProgramsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ProgramsToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ProgramsToolStripMenuItem.BackgroundImage"))); + this.ProgramsToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.ProgramsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ProgramsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AccessoriesToolStripMenuItem, @@ -464,19 +253,20 @@ this.SkindowsToolStripMenuItem, this.WebChatToolStripMenuItem, this.TimeDistorterToolStripMenuItem}); - this.ProgramsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ProgramsToolStripMenuItem.Image"))); + this.ProgramsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ProgramsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicPrograms; this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ProgramsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem"; this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(137, 36); this.ProgramsToolStripMenuItem.Text = "Programs"; // // AccessoriesToolStripMenuItem // this.AccessoriesToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.AccessoriesToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("AccessoriesToolStripMenuItem.BackgroundImage"))); + this.AccessoriesToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.AccessoriesToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.AccessoriesToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.CommunicationsToolStripMenuItem, @@ -496,13 +286,13 @@ this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AccessoriesToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem"; - this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.AccessoriesToolStripMenuItem.Text = "Accessories"; // // CommunicationsToolStripMenuItem // this.CommunicationsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.CommunicationsToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("CommunicationsToolStripMenuItem.BackgroundImage"))); + this.CommunicationsToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.CommunicationsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.CommunicationsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.InternetConnectionWizardToolStripMenuItem, @@ -510,33 +300,33 @@ this.CommunicationsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CommunicationsToolStripMenuItem.Image"))); this.CommunicationsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem"; - this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.CommunicationsToolStripMenuItem.Text = "Communications"; // // InternetConnectionWizardToolStripMenuItem // this.InternetConnectionWizardToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.InternetConnectionWizardToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("InternetConnectionWizardToolStripMenuItem.BackgroundImage"))); + this.InternetConnectionWizardToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.InternetConnectionWizardToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.InternetConnectionWizardToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetConnectionWizardToolStripMenuItem.Name = "InternetConnectionWizardToolStripMenuItem"; - this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.InternetConnectionWizardToolStripMenuItem.Text = "Internet Connection Wizard"; // // NetMeetingToolStripMenuItem // this.NetMeetingToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.NetMeetingToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("NetMeetingToolStripMenuItem.BackgroundImage"))); + this.NetMeetingToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.NetMeetingToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.NetMeetingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem"; - this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(219, 22); + this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; // // MultimediaToolStripMenuItem // this.MultimediaToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.MultimediaToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("MultimediaToolStripMenuItem.BackgroundImage"))); + this.MultimediaToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.MultimediaToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.MultimediaToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.CDPlayerToolStripMenuItem, @@ -546,53 +336,53 @@ this.MultimediaToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("MultimediaToolStripMenuItem.Image"))); this.MultimediaToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem"; - this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.MultimediaToolStripMenuItem.Text = "Multimedia"; // // CDPlayerToolStripMenuItem // this.CDPlayerToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.CDPlayerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("CDPlayerToolStripMenuItem.BackgroundImage"))); + this.CDPlayerToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.CDPlayerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.CDPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CDPlayerToolStripMenuItem.Name = "CDPlayerToolStripMenuItem"; - this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(199, 22); this.CDPlayerToolStripMenuItem.Text = "CD Player"; // // SoundRecorderToolStripMenuItem // this.SoundRecorderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.SoundRecorderToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("SoundRecorderToolStripMenuItem.BackgroundImage"))); + this.SoundRecorderToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.SoundRecorderToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SoundRecorderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SoundRecorderToolStripMenuItem.Name = "SoundRecorderToolStripMenuItem"; - this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(199, 22); this.SoundRecorderToolStripMenuItem.Text = "Sound Recorder"; // // VolumeControlToolStripMenuItem // this.VolumeControlToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.VolumeControlToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("VolumeControlToolStripMenuItem.BackgroundImage"))); + this.VolumeControlToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.VolumeControlToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.VolumeControlToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.VolumeControlToolStripMenuItem.Name = "VolumeControlToolStripMenuItem"; - this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(199, 22); this.VolumeControlToolStripMenuItem.Text = "Volume Control"; // // WindowsMediaPlayerToolStripMenuItem // this.WindowsMediaPlayerToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.WindowsMediaPlayerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("WindowsMediaPlayerToolStripMenuItem.BackgroundImage"))); + this.WindowsMediaPlayerToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.WindowsMediaPlayerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.WindowsMediaPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsMediaPlayerToolStripMenuItem.Name = "WindowsMediaPlayerToolStripMenuItem"; - this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); + this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(199, 22); this.WindowsMediaPlayerToolStripMenuItem.Text = "Windows Media Player"; // // SystemToolsToolStripMenuItem // this.SystemToolsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.SystemToolsToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("SystemToolsToolStripMenuItem.BackgroundImage"))); + this.SystemToolsToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.SystemToolsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SystemToolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DiskDefragmenterToolStripMenuItem, @@ -600,128 +390,128 @@ this.SystemToolsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("SystemToolsToolStripMenuItem.Image"))); this.SystemToolsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SystemToolsToolStripMenuItem.Name = "SystemToolsToolStripMenuItem"; - this.SystemToolsToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.SystemToolsToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.SystemToolsToolStripMenuItem.Text = "System Tools"; // // DiskDefragmenterToolStripMenuItem // this.DiskDefragmenterToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.DiskDefragmenterToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("DiskDefragmenterToolStripMenuItem.BackgroundImage"))); + this.DiskDefragmenterToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.DiskDefragmenterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.DiskDefragmenterToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.DiskDefragmenterToolStripMenuItem.Name = "DiskDefragmenterToolStripMenuItem"; - this.DiskDefragmenterToolStripMenuItem.Size = new System.Drawing.Size(172, 22); + this.DiskDefragmenterToolStripMenuItem.Size = new System.Drawing.Size(182, 22); this.DiskDefragmenterToolStripMenuItem.Text = "Disk Defragmenter"; // // ScanDiskToolStripMenuItem // this.ScanDiskToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ScanDiskToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ScanDiskToolStripMenuItem.BackgroundImage"))); + this.ScanDiskToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.ScanDiskToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ScanDiskToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ScanDiskToolStripMenuItem.Name = "ScanDiskToolStripMenuItem"; - this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(172, 22); + this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(182, 22); this.ScanDiskToolStripMenuItem.Text = "ScanDisk"; // // AddressBookToolStripMenuItem // this.AddressBookToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.AddressBookToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("AddressBookToolStripMenuItem.BackgroundImage"))); + this.AddressBookToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.AddressBookToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.AddressBookToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AddressBookToolStripMenuItem.Name = "AddressBookToolStripMenuItem"; - this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.AddressBookToolStripMenuItem.Text = "Address Book"; // // CalculatorToolStripMenuItem // this.CalculatorToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.CalculatorToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.BackgroundImage"))); + this.CalculatorToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.CalculatorToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.CalculatorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.Image"))); this.CalculatorToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CalculatorToolStripMenuItem.Name = "CalculatorToolStripMenuItem"; - this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.CalculatorToolStripMenuItem.Text = "Calculator"; // // HyperTerminalToolStripMenuItem // this.HyperTerminalToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.HyperTerminalToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("HyperTerminalToolStripMenuItem.BackgroundImage"))); + this.HyperTerminalToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.HyperTerminalToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.HyperTerminalToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.HyperTerminalToolStripMenuItem.Name = "HyperTerminalToolStripMenuItem"; - this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal"; // // ImagingToolStripMenuItem // this.ImagingToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ImagingToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ImagingToolStripMenuItem.BackgroundImage"))); + this.ImagingToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.ImagingToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ImagingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ImagingToolStripMenuItem.Name = "ImagingToolStripMenuItem"; - this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.ImagingToolStripMenuItem.Text = "Imaging"; // // NotePadToolStripMenuItem // this.NotePadToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.NotePadToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.BackgroundImage"))); + this.NotePadToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.NotePadToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.NotePadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.Image"))); this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem"; - this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.NotePadToolStripMenuItem.Text = "NotePad"; this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click); // // OnlineRegistrationToolStripMenuItem // this.OnlineRegistrationToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.OnlineRegistrationToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnlineRegistrationToolStripMenuItem.BackgroundImage"))); + this.OnlineRegistrationToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.OnlineRegistrationToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.OnlineRegistrationToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnlineRegistrationToolStripMenuItem.Name = "OnlineRegistrationToolStripMenuItem"; - this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration"; // // PaintToolStripMenuItem // this.PaintToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.PaintToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.BackgroundImage"))); + this.PaintToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.PaintToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.PaintToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.Image"))); this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem"; - this.PaintToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.PaintToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.PaintToolStripMenuItem.Text = "Paint"; // // PhoneDialerToolStripMenuItem // this.PhoneDialerToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.PhoneDialerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PhoneDialerToolStripMenuItem.BackgroundImage"))); + this.PhoneDialerToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.PhoneDialerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.PhoneDialerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PhoneDialerToolStripMenuItem.Name = "PhoneDialerToolStripMenuItem"; - this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer"; // // WordPadToolStripMenuItem // this.WordPadToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.WordPadToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.BackgroundImage"))); + this.WordPadToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.WordPadToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.WordPadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.Image"))); this.WordPadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WordPadToolStripMenuItem.Name = "WordPadToolStripMenuItem"; - this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(179, 26); + this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(185, 26); this.WordPadToolStripMenuItem.Text = "WordPad"; // // StartUpToolStripMenuItem // this.StartUpToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.StartUpToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("StartUpToolStripMenuItem.BackgroundImage"))); + this.StartUpToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.StartUpToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.StartUpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AOLInternetFREETrialToolStripMenuItem, @@ -733,52 +523,52 @@ this.StartUpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.StartUpToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem"; - this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.StartUpToolStripMenuItem.Text = "Online Services"; // // AOLInternetFREETrialToolStripMenuItem // this.AOLInternetFREETrialToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.AOLInternetFREETrialToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("AOLInternetFREETrialToolStripMenuItem.BackgroundImage"))); + this.AOLInternetFREETrialToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.AOLInternetFREETrialToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.AOLInternetFREETrialToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AOLInternetFREETrialToolStripMenuItem.Name = "AOLInternetFREETrialToolStripMenuItem"; - this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.AOLInternetFREETrialToolStripMenuItem.Text = "AOL & Internet FREE Trial!"; // // ATTWorldNetSignupToolStripMenuItem // this.ATTWorldNetSignupToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ATTWorldNetSignupToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ATTWorldNetSignupToolStripMenuItem.BackgroundImage"))); + this.ATTWorldNetSignupToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.ATTWorldNetSignupToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ATTWorldNetSignupToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ATTWorldNetSignupToolStripMenuItem.Name = "ATTWorldNetSignupToolStripMenuItem"; - this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.ATTWorldNetSignupToolStripMenuItem.Text = "AT&T WorldNet Signup"; // // SetupCompuServe30ToolStripMenuItem // this.SetupCompuServe30ToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.SetupCompuServe30ToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("SetupCompuServe30ToolStripMenuItem.BackgroundImage"))); + this.SetupCompuServe30ToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.SetupCompuServe30ToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupCompuServe30ToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SetupCompuServe30ToolStripMenuItem.Name = "SetupCompuServe30ToolStripMenuItem"; - this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.SetupCompuServe30ToolStripMenuItem.Text = "Setup CompuServe 3.0"; // // SetupWOWFromCompuServeToolStripMenuItem // this.SetupWOWFromCompuServeToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("SetupWOWFromCompuServeToolStripMenuItem.BackgroundImage"))); + this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupWOWFromCompuServeToolStripMenuItem.Name = "SetupWOWFromCompuServeToolStripMenuItem"; - this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.SetupWOWFromCompuServeToolStripMenuItem.Text = "Setup WOW! from CompuServe"; // // MSDOSPromptToolStripMenuItem // this.MSDOSPromptToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.MSDOSPromptToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("MSDOSPromptToolStripMenuItem.BackgroundImage"))); + this.MSDOSPromptToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.MSDOSPromptToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.MSDOSPromptToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.EmptyToolStripMenuItem}); @@ -787,124 +577,124 @@ this.MSDOSPromptToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem"; - this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.MSDOSPromptToolStripMenuItem.Text = "StartUp"; // // EmptyToolStripMenuItem // this.EmptyToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.EmptyToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("EmptyToolStripMenuItem.BackgroundImage"))); + this.EmptyToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.EmptyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.EmptyToolStripMenuItem.Name = "EmptyToolStripMenuItem"; - this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(116, 22); + this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(117, 22); this.EmptyToolStripMenuItem.Text = "(Empty)"; // // InternetExplorerToolStripMenuItem // this.InternetExplorerToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.InternetExplorerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("InternetExplorerToolStripMenuItem.BackgroundImage"))); + this.InternetExplorerToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.InternetExplorerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.InternetExplorerToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.InternetExplorerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetExplorerToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.InternetExplorerToolStripMenuItem.Name = "InternetExplorerToolStripMenuItem"; - this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer"; this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click); // // MSDOSPromptToolStripMenuItem1 // this.MSDOSPromptToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.MSDOSPromptToolStripMenuItem1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("MSDOSPromptToolStripMenuItem1.BackgroundImage"))); + this.MSDOSPromptToolStripMenuItem1.BackgroundImage = Properties.Resources.sliversilver; this.MSDOSPromptToolStripMenuItem1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.MSDOSPromptToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem1.ImageTransparentColor = System.Drawing.Color.Silver; this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1"; - this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); + this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(184, 26); this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt"; // // OutlookExpressToolStripMenuItem // this.OutlookExpressToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.OutlookExpressToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OutlookExpressToolStripMenuItem.BackgroundImage"))); + this.OutlookExpressToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.OutlookExpressToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.OutlookExpressToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.OutlookExpressToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OutlookExpressToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.OutlookExpressToolStripMenuItem.Name = "OutlookExpressToolStripMenuItem"; - this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.OutlookExpressToolStripMenuItem.Text = "Outlook Express"; // // WindowsExplorerToolStripMenuItem1 // this.WindowsExplorerToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.WindowsExplorerToolStripMenuItem1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("WindowsExplorerToolStripMenuItem1.BackgroundImage"))); + this.WindowsExplorerToolStripMenuItem1.BackgroundImage = Properties.Resources.sliversilver; this.WindowsExplorerToolStripMenuItem1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.WindowsExplorerToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.WindowsExplorerToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsExplorerToolStripMenuItem1.ImageTransparentColor = System.Drawing.Color.Silver; this.WindowsExplorerToolStripMenuItem1.Name = "WindowsExplorerToolStripMenuItem1"; - this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); + this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(184, 26); this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer"; // // GuessTheNumberToolStripMenuItem // this.GuessTheNumberToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.GuessTheNumberToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("GuessTheNumberToolStripMenuItem.BackgroundImage"))); + this.GuessTheNumberToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.GuessTheNumberToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.GuessTheNumberToolStripMenuItem.Name = "GuessTheNumberToolStripMenuItem"; - this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number"; this.GuessTheNumberToolStripMenuItem.Visible = false; // // StartRunnerToolStripMenuItem // this.StartRunnerToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.StartRunnerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("StartRunnerToolStripMenuItem.BackgroundImage"))); + this.StartRunnerToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.StartRunnerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.StartRunnerToolStripMenuItem.Name = "StartRunnerToolStripMenuItem"; - this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.StartRunnerToolStripMenuItem.Text = "Start Runner"; this.StartRunnerToolStripMenuItem.Visible = false; // // ErrorBlasterToolStripMenuItem // this.ErrorBlasterToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ErrorBlasterToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ErrorBlasterToolStripMenuItem.BackgroundImage"))); + this.ErrorBlasterToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem"; - this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster"; this.ErrorBlasterToolStripMenuItem.Visible = false; // // SkindowsToolStripMenuItem // this.SkindowsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.SkindowsToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("SkindowsToolStripMenuItem.BackgroundImage"))); + this.SkindowsToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.SkindowsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SkindowsToolStripMenuItem.Name = "SkindowsToolStripMenuItem"; - this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.SkindowsToolStripMenuItem.Text = "Skindows 95"; this.SkindowsToolStripMenuItem.Visible = false; // // WebChatToolStripMenuItem // this.WebChatToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.WebChatToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("WebChatToolStripMenuItem.BackgroundImage"))); + this.WebChatToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.WebChatToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.WebChatToolStripMenuItem.Name = "WebChatToolStripMenuItem"; - this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; // // TimeDistorterToolStripMenuItem // this.TimeDistorterToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.TimeDistorterToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TimeDistorterToolStripMenuItem.BackgroundImage"))); + this.TimeDistorterToolStripMenuItem.BackgroundImage = Properties.Resources.sliversilver; this.TimeDistorterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem"; - this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); + this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(184, 26); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Visible = false; // @@ -914,45 +704,31 @@ this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.windowManagerTestToolStripMenuItem, this.downloaderTestToolStripMenuItem, - this.installerTestToolStripMenuItem, - this.infoboxTestToolStripMenuItem}); + this.installerTestToolStripMenuItem}); + this.DocumentsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.DocumentsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DocumentsToolStripMenuItem.Image"))); this.DocumentsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.DocumentsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem"; this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(137, 36); this.DocumentsToolStripMenuItem.Text = "Documents"; // // windowManagerTestToolStripMenuItem // this.windowManagerTestToolStripMenuItem.Name = "windowManagerTestToolStripMenuItem"; - this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(192, 22); this.windowManagerTestToolStripMenuItem.Text = "WindowManagerTest"; this.windowManagerTestToolStripMenuItem.Click += new System.EventHandler(this.windowManagerTestToolStripMenuItem_Click); // // downloaderTestToolStripMenuItem // this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem"; - this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(192, 22); this.downloaderTestToolStripMenuItem.Text = "DownloaderTest"; this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click); // - // installerTestToolStripMenuItem - // - this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem"; - this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.installerTestToolStripMenuItem.Text = "InstallerTest"; - this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); - // - // infoboxTestToolStripMenuItem - // - this.infoboxTestToolStripMenuItem.Name = "infoboxTestToolStripMenuItem"; - this.infoboxTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.infoboxTestToolStripMenuItem.Text = "InfoboxTest"; - this.infoboxTestToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click); - // // SettingsToolStripMenuItem // this.SettingsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; @@ -960,13 +736,14 @@ this.ControlPanelToolStripMenuItem, this.PrintersToolStripMenuItem, this.TaskbarToolStripMenuItem}); + this.SettingsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.SettingsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("SettingsToolStripMenuItem.Image"))); this.SettingsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SettingsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"; this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(137, 36); this.SettingsToolStripMenuItem.Text = "Settings"; // // ControlPanelToolStripMenuItem @@ -974,7 +751,7 @@ this.ControlPanelToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem"; - this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -982,7 +759,7 @@ this.PrintersToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem"; - this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.PrintersToolStripMenuItem.Text = "Printers"; // // TaskbarToolStripMenuItem @@ -990,7 +767,7 @@ this.TaskbarToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.TaskbarToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TaskbarToolStripMenuItem.Name = "TaskbarToolStripMenuItem"; - this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem @@ -1001,14 +778,15 @@ this.ComputerToolStripMenuItem, this.OnTheInternetToolStripMenuItem, this.PeopleToolStripMenuItem}); - this.FindToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("FindToolStripMenuItem.Image"))); + this.FindToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.FindToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicFind; this.FindToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.FindToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FindToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.FindToolStripMenuItem.Name = "FindToolStripMenuItem"; this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.FindToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.FindToolStripMenuItem.Size = new System.Drawing.Size(137, 36); this.FindToolStripMenuItem.Text = "Find"; // // FilesOrFoldersToolStripMenuItem @@ -1016,7 +794,7 @@ this.FilesOrFoldersToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem"; - this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders..."; // // ComputerToolStripMenuItem @@ -1024,7 +802,7 @@ this.ComputerToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem"; - this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.ComputerToolStripMenuItem.Text = "Computer..."; // // OnTheInternetToolStripMenuItem @@ -1032,7 +810,7 @@ this.OnTheInternetToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem"; - this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.OnTheInternetToolStripMenuItem.Text = "On the Internet..."; // // PeopleToolStripMenuItem @@ -1040,64 +818,76 @@ this.PeopleToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem"; - this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.PeopleToolStripMenuItem.Text = "People..."; // // HelpToolStripMenuItem // this.HelpToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.HelpToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("HelpToolStripMenuItem.Image"))); + this.HelpToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.HelpToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicHelp; this.HelpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.HelpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.HelpToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.HelpToolStripMenuItem.Size = new System.Drawing.Size(137, 36); this.HelpToolStripMenuItem.Text = "Help"; // // RunToolStripMenuItem // this.RunToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.RunToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("RunToolStripMenuItem.Image"))); + this.RunToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.RunToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicRun; this.RunToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.RunToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.RunToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.RunToolStripMenuItem.Name = "RunToolStripMenuItem"; this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.RunToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.RunToolStripMenuItem.Size = new System.Drawing.Size(137, 36); this.RunToolStripMenuItem.Text = "Run..."; // // SuspendToolStripMenuItem // this.SuspendToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.SuspendToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.SuspendToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("SuspendToolStripMenuItem.Image"))); this.SuspendToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.SuspendToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SuspendToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.SuspendToolStripMenuItem.Name = "SuspendToolStripMenuItem"; this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(137, 36); this.SuspendToolStripMenuItem.Text = "Suspend"; // // ShutdownToolStripMenuItem // this.ShutdownToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.ShutdownToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ShutdownToolStripMenuItem.Image"))); + this.ShutdownToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ShutdownToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicShutdown; this.ShutdownToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ShutdownToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ShutdownToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.ShutdownToolStripMenuItem.Name = "ShutdownToolStripMenuItem"; this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(137, 36); this.ShutdownToolStripMenuItem.Text = "Shutdown..."; this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click); // + // ossidestartmenu + // + this.ossidestartmenu.Controls.Add(this.osimage); + this.ossidestartmenu.Location = new System.Drawing.Point(0, 0); + this.ossidestartmenu.Name = "ossidestartmenu"; + this.ossidestartmenu.Size = new System.Drawing.Size(26, 297); + this.ossidestartmenu.TabIndex = 4; + // // osimage // this.osimage.Dock = System.Windows.Forms.DockStyle.Fill; - this.osimage.Image = ((System.Drawing.Image)(resources.GetObject("osimage.Image"))); + this.osimage.Image = global::TimeHACK.Properties.Resources.Win95SideBar; this.osimage.Location = new System.Drawing.Point(0, 0); this.osimage.Name = "osimage"; this.osimage.Size = new System.Drawing.Size(26, 297); @@ -1105,6 +895,217 @@ this.osimage.TabIndex = 0; this.osimage.TabStop = false; // + // clockTimer + // + this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick); + // + // desktopImages + // + this.desktopImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("desktopImages.ImageStream"))); + this.desktopImages.TransparentColor = System.Drawing.Color.Transparent; + this.desktopImages.Images.SetKeyName(0, "WinClassicComputer.png"); + this.desktopImages.Images.SetKeyName(1, "WinClassicFolder.png"); + this.desktopImages.Images.SetKeyName(2, "WinClassicIE4.png"); + this.desktopImages.Images.SetKeyName(3, "WinClassicInbox.png"); + this.desktopImages.Images.SetKeyName(4, "WinClassicMSN.png"); + this.desktopImages.Images.SetKeyName(5, "WinClassicNetworking.png"); + this.desktopImages.Images.SetKeyName(6, "WinClassicOutlook.png"); + this.desktopImages.Images.SetKeyName(7, "WinClassicRecycle.png"); + this.desktopImages.Images.SetKeyName(8, "WinClassicSetup.png"); + this.desktopImages.Images.SetKeyName(9, "WinClassicSetup.png"); + this.desktopImages.Images.SetKeyName(10, "WinClassicSetup.png"); + this.desktopImages.Images.SetKeyName(11, "WinClassicSetup.png"); + // + // desktopicons + // + this.desktopicons.Alignment = System.Windows.Forms.ListViewAlignment.Left; + this.desktopicons.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.desktopicons.BackColor = System.Drawing.Color.Teal; + this.desktopicons.BackgroundImageTiled = true; + this.desktopicons.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.desktopicons.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.desktopicons.ForeColor = System.Drawing.Color.White; + this.desktopicons.Items.AddRange(new System.Windows.Forms.ListViewItem[] { + listViewItem1, + listViewItem2, + listViewItem3, + listViewItem4, + listViewItem5, + listViewItem6, + listViewItem7, + listViewItem8}); + this.desktopicons.LargeImageList = this.desktopImages; + this.desktopicons.Location = new System.Drawing.Point(0, 0); + this.desktopicons.Name = "desktopicons"; + this.desktopicons.Size = new System.Drawing.Size(1280, 720); + this.desktopicons.TabIndex = 6; + this.desktopicons.UseCompatibleStateImageBehavior = false; + this.desktopicons.MouseDown += new System.Windows.Forms.MouseEventHandler(this.desktop_mousedown); + this.desktopicons.DoubleClick += new System.EventHandler(this.desktopicons_Click); + // + // rightclickbackproperties + // + this.rightclickbackproperties.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.PropertiesToolStripMenuItem, + this.LineUpIconsToolStripMenuItem, + this.PasteToolStripMenuItem, + this.PasteShortcutToolStripMenuItem, + this.NewToolStripMenuItem1, + this.PropertiesToolStripMenuItem1}); + this.rightclickbackproperties.Name = "ContextMenuStrip1"; + this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.rightclickbackproperties.Size = new System.Drawing.Size(151, 136); + // + // PropertiesToolStripMenuItem + // + this.PropertiesToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.PropertiesToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ByNameToolStripMenuItem, + this.ByTypeToolStripMenuItem, + this.BySizeToolStripMenuItem, + this.AutoArrangeToolStripMenuItem, + this.ByDateToolStripMenuItem}); + this.PropertiesToolStripMenuItem.Name = "PropertiesToolStripMenuItem"; + this.PropertiesToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.PropertiesToolStripMenuItem.Text = "Arrange Icons"; + // + // ByNameToolStripMenuItem + // + this.ByNameToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.ByNameToolStripMenuItem.Name = "ByNameToolStripMenuItem"; + this.ByNameToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.ByNameToolStripMenuItem.Text = "by Name"; + // + // ByTypeToolStripMenuItem + // + this.ByTypeToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.ByTypeToolStripMenuItem.Name = "ByTypeToolStripMenuItem"; + this.ByTypeToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.ByTypeToolStripMenuItem.Text = "by Type"; + // + // BySizeToolStripMenuItem + // + this.BySizeToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.BySizeToolStripMenuItem.Name = "BySizeToolStripMenuItem"; + this.BySizeToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.BySizeToolStripMenuItem.Text = "by Size"; + // + // AutoArrangeToolStripMenuItem + // + this.AutoArrangeToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.AutoArrangeToolStripMenuItem.Name = "AutoArrangeToolStripMenuItem"; + this.AutoArrangeToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.AutoArrangeToolStripMenuItem.Text = "Auto Arrange"; + // + // ByDateToolStripMenuItem + // + this.ByDateToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.ByDateToolStripMenuItem.Name = "ByDateToolStripMenuItem"; + this.ByDateToolStripMenuItem.Size = new System.Drawing.Size(145, 22); + this.ByDateToolStripMenuItem.Text = "by Date"; + // + // LineUpIconsToolStripMenuItem + // + this.LineUpIconsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.LineUpIconsToolStripMenuItem.Name = "LineUpIconsToolStripMenuItem"; + this.LineUpIconsToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.LineUpIconsToolStripMenuItem.Text = "Line Up Icons"; + // + // PasteToolStripMenuItem + // + this.PasteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.PasteToolStripMenuItem.Name = "PasteToolStripMenuItem"; + this.PasteToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.PasteToolStripMenuItem.Text = "Paste"; + // + // PasteShortcutToolStripMenuItem + // + this.PasteShortcutToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.PasteShortcutToolStripMenuItem.Name = "PasteShortcutToolStripMenuItem"; + this.PasteShortcutToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.PasteShortcutToolStripMenuItem.Text = "Paste Shortcut"; + // + // NewToolStripMenuItem1 + // + this.NewToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; + this.NewToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.FolderToolStripMenuItem, + this.ShortcutToolStripMenuItem, + this.WaveSoundToolStripMenuItem, + this.TextDocumentToolStripMenuItem, + this.WordPadDocumentToolStripMenuItem, + this.BitmapImageToolStripMenuItem, + this.MicrosoftDataLinkToolStripMenuItem}); + this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; + this.NewToolStripMenuItem1.Size = new System.Drawing.Size(150, 22); + this.NewToolStripMenuItem1.Text = "New"; + // + // FolderToolStripMenuItem + // + this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; + this.FolderToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.FolderToolStripMenuItem.Text = "Folder"; + this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); + // + // ShortcutToolStripMenuItem + // + this.ShortcutToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.ShortcutToolStripMenuItem.Name = "ShortcutToolStripMenuItem"; + this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.ShortcutToolStripMenuItem.Text = "Shortcut"; + // + // WaveSoundToolStripMenuItem + // + this.WaveSoundToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.WaveSoundToolStripMenuItem.Name = "WaveSoundToolStripMenuItem"; + this.WaveSoundToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.WaveSoundToolStripMenuItem.Text = "Wave Sound"; + // + // TextDocumentToolStripMenuItem + // + this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; + this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.TextDocumentToolStripMenuItem.Text = "Text Document"; + // + // WordPadDocumentToolStripMenuItem + // + this.WordPadDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.WordPadDocumentToolStripMenuItem.Name = "WordPadDocumentToolStripMenuItem"; + this.WordPadDocumentToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.WordPadDocumentToolStripMenuItem.Text = "WordPad Document"; + // + // BitmapImageToolStripMenuItem + // + this.BitmapImageToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.BitmapImageToolStripMenuItem.Name = "BitmapImageToolStripMenuItem"; + this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.BitmapImageToolStripMenuItem.Text = "Bitmap Image"; + // + // MicrosoftDataLinkToolStripMenuItem + // + this.MicrosoftDataLinkToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.MicrosoftDataLinkToolStripMenuItem.Name = "MicrosoftDataLinkToolStripMenuItem"; + this.MicrosoftDataLinkToolStripMenuItem.Size = new System.Drawing.Size(182, 22); + this.MicrosoftDataLinkToolStripMenuItem.Text = "Microsoft Data Link"; + // + // PropertiesToolStripMenuItem1 + // + this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; + this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; + this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(150, 22); + this.PropertiesToolStripMenuItem1.Text = "Properties"; + // + // installerTestToolStripMenuItem + // + this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem"; + this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(192, 22); + this.installerTestToolStripMenuItem.Text = "InstallerTest"; + this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); + // // Windows95 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1121,16 +1122,16 @@ this.Text = "TimeHACKDesktop"; this.Load += new System.EventHandler(this.Desktop_Load); this.panel1.ResumeLayout(false); + this.taskbar.ResumeLayout(false); + this.taskbar.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); this.startmenu.ResumeLayout(false); this.startmenu.PerformLayout(); this.startmenuitems.ResumeLayout(false); this.startmenuitems.PerformLayout(); this.ossidestartmenu.ResumeLayout(false); - this.rightclickbackproperties.ResumeLayout(false); - this.taskbar.ResumeLayout(false); - this.taskbar.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.osimage)).EndInit(); + this.rightclickbackproperties.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -1226,6 +1227,5 @@ private System.Windows.Forms.ToolStripMenuItem windowManagerTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem infoboxTestToolStripMenuItem; } } \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 0c6e3c7..f0e9174 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -3,10 +3,10 @@ using System.Drawing; using System.IO; using System.Media; using System.Windows.Forms; -using TimeHACK.Main; +using TimeHACK.Engine; using TimeHACK.WinClassicForms; -namespace TimeHACK +namespace TimeHACK.OS.Win95 { public partial class Windows95 : Form { @@ -148,7 +148,7 @@ namespace TimeHACK private void InternetExplorerToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicIE4 ie = new WinClassicIE4(); - Main.Template.WinClassic app = wm.startWin95(ie, "Internet Explorer 4", null, true, true); + Engine.Template.WinClassic app = wm.startWin95(ie, "Internet Explorer 4", null, true, true); app.BringToFront(); startmenu.Hide(); } @@ -166,14 +166,14 @@ namespace TimeHACK if (objListViewItem.Text == "Internet Explorer") { WinClassicIE4 ie = new WinClassicIE4(); - Main.Template.WinClassic app = wm.startWin95(ie, "Internet Explorer 4", null, true, true); + Engine.Template.WinClassic app = wm.startWin95(ie, "Internet Explorer 4", null, true, true); app.BringToFront(); startmenu.Hide(); } else if (objListViewItem.Text == "Web Chat Setup") { WinClassicInstaller inst = new WinClassicInstaller(); inst.installname.Text = "Web Chat 1998"; - Main.Template.WinClassic app = wm.startWin95(inst, "Web Chat Setup", null, true, true); + Engine.Template.WinClassic app = wm.startWin95(inst, "Web Chat Setup", null, true, true); app.BringToFront(); startmenu.Hide(); } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index 80aab11..2b8a48d 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -107,7 +107,6 @@ // // button5 // - this.button5.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.button5.Location = new System.Drawing.Point(97, 13); this.button5.Name = "button5"; this.button5.Size = new System.Drawing.Size(75, 23); @@ -197,6 +196,7 @@ this.button1.TabIndex = 4; this.button1.Text = "Login"; this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.Button1_Click); // // txtscreenname // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 3f4810e..8df610f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.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 { @@ -23,5 +24,13 @@ namespace TimeHACK.OS.Win95.Win95Apps button3.Hide(); label5.Hide(); } + private void Button1_Click(object sender, EventArgs e) + { + if (txtscreenname.Text == "") + { + WindowManager wm = new WindowManager(); + wm.startInfobox95("test", "test"); + } + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs index bed5f21..9df4811 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs @@ -1,6 +1,6 @@ using System; using System.Windows.Forms; -using TimeHACK.Main; +using TimeHACK.OS.Win95; namespace TimeHACK.WinClassicForms { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs index 0bae3eb..2b2fc4e 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Drawing; using System.Runtime.InteropServices; using System.Windows.Forms; -using TimeHACK.Main; +using TimeHACK.Engine; namespace TimeHACK.WinClassicForms { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicInstaller.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicInstaller.cs index 1f514a3..a15b1e1 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicInstaller.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicInstaller.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TimeHACK.OS.Win95; namespace TimeHACK.WinClassicForms { diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index bfce5bb..1865b5e 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -160,6 +160,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap sliversilver { + get { + object obj = ResourceManager.GetObject("sliversilver", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index c29593b..f51d183 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -247,4 +247,7 @@ ..\resources\winclassic\256color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\sliversilver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 372a5c2..e044640 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -131,6 +131,12 @@ TestApp.cs + + UserControl + + + WebChat1998.cs + UserControl @@ -168,6 +174,9 @@ TestApp.cs + + WebChat1998.cs + WinClassicDownloader.cs @@ -224,6 +233,7 @@ + diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 85d16b2..8f3a3aa 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -2,7 +2,9 @@ using System; using System.Drawing; using System.Windows.Forms; -using TimeHACK.Main; +using TimeHACK.OS.Win95; +using TimeHACK.Engine; + namespace TimeHACK { public partial class TitleScreen : Form diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 74df9a1..12776da 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 c4e9182..bcd072f 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 2f164ed..3e20261 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 3WfNR+DF2wr5jSbPgvcSiiEuf2pNWoQpjOtpqItXr3k= + Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 5b19f80..0c8fdea 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 00db3b8..106a594 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - v4tQJORC4hD2lioAvq8KDmWvVza7FtGMn+X0fCdT6AE= + +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= - + - qkjWdcRgNqzANBAluXNn8o5w6NFKNyzrUYVv1D0oBA0= + SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index b4cacc7..e0ba070 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 e265f99..3e20261 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -7,14 +7,14 @@ - + - FLFyLhgh/00187VHfEwpMWCgaYVgEkJOBemU56+LWss= + Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index fb36093..106a594 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,26 +56,26 @@ - + - U7Kekeyx6Ql+9uqUNh8/OwQYQaKLz8r3pS1n2eI6994= + +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= - + - egCP83neM3apVMcIH6zkNIiRVob2rALwSMmYPhotJik= + SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= @@ -331,6 +331,15 @@ uw/4Jjmd9N9HqHaI17CYoAEwsYy8+2t/nJ3z5vGDD04= + + + + + + + M5GJAXXqneQ9yY1yfeuyV5j9IYIBp6b0BRj5KAOwv2s= + + @@ -412,112 +421,4 @@ x6TTsUiEHqlRiSdsR7WH5jiWTj1u/cJsO7BItxU4X9Q= - - - - - - - vLKiQmF9fj0io7r6UGuL5e/3WSAHHXMKpKiUziMXHOQ= - - - - - - - - - 4iHqcxBewVjdPPl1AEChcp2PGd7U07uBs0i748VH91o= - - - - - - - - - 9CDLugo2+itYyEtaoyicSqTf3tRCNT7f3H94BCjT+MI= - - - - - - - - - EdvcURgatvq9VwLWLL/Dm9nvR1AZUAZOeIJfJbpzVu8= - - - - - - - - - yrDBF1QPiJUsw5OapnDIEykQ8dj5guyF87IFQaEAs2w= - - - - - - - - - T9l945vYoKcCSIEDDqot2H3OVrkVxqkoQ/E6pZokY8g= - - - - - - - - - fNYpCdwE/1pbT1i/vDl94vOLJFdHLe1VrOt4SXQiavA= - - - - - - - - - YehKOiCd84vrlEqtmKBpwT9e/HFf31/IqbbXDihNtfc= - - - - - - - - - mP7l6tIyYar/QNmZ2dYlK5ziwCzwTCE2TzvrJv4i/UQ= - - - - - - - - - xZ618k4GMln49q2Dax8vRsViqQN9qPxt1VhrnxtyHJ8= - - - - - - - - - LyiYNXHdtH09DFLzaoV8YCHx1QoLx4ZEEjKhVdIUrR0= - - - - - - - - - r1NgHwcJelFqM+/Fla3stkxQ+y1PqE5gxtYktbcDxHI= - - \ No newline at end of file diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 5b19f80..0c8fdea 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/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache new file mode 100644 index 0000000..22cb9e6 Binary files /dev/null and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 0000000..72f322f Binary files /dev/null and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll new file mode 100644 index 0000000..df73e28 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index 8beb7a3..eb0b568 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -17,3 +17,23 @@ D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.application D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe D:\Documents\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.exe.manifest +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.application +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.exe +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.pdb +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.Engine.dll +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.Engine.pdb +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Main.csprojResolveAssemblyReference.cache +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.TestApp.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicDownloader.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicIE4.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Main.csproj.GenerateResource.Cache +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.application +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.exe +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.pdb +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Windows95.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache new file mode 100644 index 0000000..091a82b Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache new file mode 100644 index 0000000..71db36c Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources new file mode 100644 index 0000000..ef6fd62 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources new file mode 100644 index 0000000..2337d1d Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources index 8bf9045..db6c35a 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.TitleScreen.resources b/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources index 43f5d49..4fda140 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources and b/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources b/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources deleted file mode 100644 index 499d613..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Windows95.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 2f164ed..3e20261 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 3WfNR+DF2wr5jSbPgvcSiiEuf2pNWoQpjOtpqItXr3k= + Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe new file mode 100644 index 0000000..0c8fdea Binary files /dev/null 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 00db3b8..106a594 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - v4tQJORC4hD2lioAvq8KDmWvVza7FtGMn+X0fCdT6AE= + +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= - + - qkjWdcRgNqzANBAluXNn8o5w6NFKNyzrUYVv1D0oBA0= + SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb new file mode 100644 index 0000000..e0ba070 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 7841180fc0f60f6eb1fff1503f89ff2cad117e85 Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 20:22:59 -0400 Subject: webchat98 things --- .vs/TimeHACK/v14/.suo | Bin 131584 -> 131072 bytes TimeHACK.Engine/WCMessageParser.cs | 2 +- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95.cs | 8 +++++++ .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 3 ++- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 24 ++++++++++++++++++++- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 16 +++++++++++++- .../OS/Win95/Win95Apps/WinClassicIE4.Designer.cs | 2 +- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs | 2 +- TimeHACK.Main/TitleScreen.cs | 1 + 10 files changed, 53 insertions(+), 6 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 930f2b8..dc49232 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/WCMessageParser.cs b/TimeHACK.Engine/WCMessageParser.cs index 44c9002..ef7efd0 100644 --- a/TimeHACK.Engine/WCMessageParser.cs +++ b/TimeHACK.Engine/WCMessageParser.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace TimeHACK.Engine { - class WCMessageParser + public class WCMessageParser { public string ParseMessage(string json, int index, string user) { diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 0bacc55..2d58db3 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -322,6 +322,7 @@ this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem"; this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; + this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // // MultimediaToolStripMenuItem // diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index f0e9174..260d909 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -4,6 +4,7 @@ using System.IO; using System.Media; using System.Windows.Forms; using TimeHACK.Engine; +using TimeHACK.OS.Win95.Win95Apps; using TimeHACK.WinClassicForms; namespace TimeHACK.OS.Win95 @@ -185,6 +186,13 @@ namespace TimeHACK.OS.Win95 { wm.startInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text)!"); } + private void WebChatToolStripMenuItem_Click(object sender, EventArgs e) + { + WebChat1998 wc = new WebChat1998(); + Engine.Template.WinClassic app = wm.startWin95(wc, "Web Chat 1998", null, true, true); + app.BringToFront(); + startmenu.Hide(); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index 2b8a48d..b849893 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998)); + this.resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998)); this.Chat = new System.Windows.Forms.Timer(this.components); this.listBox1 = new System.Windows.Forms.ListBox(); this.label1 = new System.Windows.Forms.Label(); @@ -302,5 +302,6 @@ private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; private System.Windows.Forms.Button button4; + private System.ComponentModel.ComponentResourceManager resources; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 8df610f..94179d6 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using TimeHACK.Engine; +using System.Threading; namespace TimeHACK.OS.Win95.Win95Apps { @@ -29,7 +30,28 @@ namespace TimeHACK.OS.Win95.Win95Apps if (txtscreenname.Text == "") { WindowManager wm = new WindowManager(); - wm.startInfobox95("test", "test"); + wm.startInfobox95("Invalid Username", "Your username cannot be blank."); + return; + } + TitleScreen.username = txtscreenname.Text; + login.Hide(); + listBox1.Items.Add(TitleScreen.username); + chatLoop(); + } + + private void chatLoop() + { + WCMessageParser wcmp = new WCMessageParser(); + Thread.Sleep(15000); + for (int i = 0; i < 200; i++) + { + history.Text = wcmp.ParseMessage(resources.GetString("convo"), i, TitleScreen.username); + switch (wcmp.GetSpecial(resources.GetString("convo"), i)) + { + default: + break; + } + Thread.Sleep(wcmp.GetMessageDelay(resources.GetString("convo"), i)); } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index cb2c52a..db61d93 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -148,9 +148,23 @@ { "user": "SkyHigh", "delay": 6000, - "message": "hmm... how about we play a game while we wait for my friend to come", + "message": "hmm... how about we play a game while we wait for my friend to come?", "special": null, "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "alright, go ahead and guess what my name is!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 500, + "message": "ill make 2 buttons pop up, you click the one you want to guess", + "special": "nameguess", + "userchat": true } ] } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs index 1445e04..1e9affc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { partial class WinClassicIE4 { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs index 2b2fc4e..912fc8f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs @@ -5,7 +5,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; using TimeHACK.Engine; -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { public partial class WinClassicIE4 : UserControl { diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 8f3a3aa..4cd9043 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -11,6 +11,7 @@ namespace TimeHACK { public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); public static Windows95 frm95; + public static string username; public TitleScreen() { -- cgit v1.2.3 From 6ecb36cc462081895a92ff7fb5b23f3259fc1f1e Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 31 Mar 2017 21:19:13 -0400 Subject: webchat1998 messages are working --- .vs/TimeHACK/v14/.suo | Bin 131072 -> 131072 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 34 +++++++++++++-------- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 2 +- .../Win95Apps/WinClassicDownloader.Designer.cs | 2 +- .../OS/Win95/Win95Apps/WinClassicDownloader.cs | 3 +- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5509120 -> 5510144 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 6 ++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 122368 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 6 ++-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5509120 -> 5510144 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 4 +-- .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4011 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 1453 -> 1818 bytes ....Win95.Win95Apps.WinClassicDownloader.resources | Bin 0 -> 180 bytes ...HACK.OS.Win95.Win95Apps.WinClassicIE4.resources | Bin 0 -> 3209 bytes ....WinClassicForms.WinClassicDownloader.resources | Bin 180 -> 0 bytes ...imeHACK.WinClassicForms.WinClassicIE4.resources | Bin 3209 -> 0 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5509120 -> 5510144 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 6 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 122368 -> 124416 bytes 31 files changed, 40 insertions(+), 30 deletions(-) create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index dc49232..15137ab 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 12776da..af31efa 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 bcd072f..d19e0f7 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/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 12776da..af31efa 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 bcd072f..d19e0f7 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/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index b849893..545a796 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -58,6 +58,7 @@ // Chat // this.Chat.Interval = 15000; + this.Chat.Tick += new System.EventHandler(this.Chat_Tick); // // listBox1 // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 94179d6..fa0837f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -14,6 +14,9 @@ namespace TimeHACK.OS.Win95.Win95Apps { public partial class WebChat1998 : UserControl { + int chat_index = 0; + WCMessageParser wcmp = new WCMessageParser(); + public WebChat1998() { InitializeComponent(); @@ -36,23 +39,30 @@ namespace TimeHACK.OS.Win95.Win95Apps TitleScreen.username = txtscreenname.Text; login.Hide(); listBox1.Items.Add(TitleScreen.username); - chatLoop(); + history.Text = "System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine; + Chat.Start(); } - private void chatLoop() + private void Chat_Tick(object sender, EventArgs e) { - WCMessageParser wcmp = new WCMessageParser(); - Thread.Sleep(15000); - for (int i = 0; i < 200; i++) + history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; + switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) { - history.Text = wcmp.ParseMessage(resources.GetString("convo"), i, TitleScreen.username); - switch (wcmp.GetSpecial(resources.GetString("convo"), i)) - { - default: - break; - } - Thread.Sleep(wcmp.GetMessageDelay(resources.GetString("convo"), i)); + case "addsh": + listBox1.Items.Add("SkyHigh"); + break; + case "nameguess": + typechat.Hide(); + button2.Hide(); + button3.Show(); + button4.Show(); + Chat.Stop(); + break; + default: + break; } + Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + chat_index++; } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index db61d93..6734aab 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -161,7 +161,7 @@ }, { "user": "SkyHigh", - "delay": 500, + "delay": 1000, "message": "ill make 2 buttons pop up, you click the one you want to guess", "special": "nameguess", "userchat": true diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs index cd0b55c..fd182fa 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.Designer.cs @@ -1,4 +1,4 @@ -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { partial class WinClassicDownloader { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs index 9df4811..418444a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicDownloader.cs @@ -1,8 +1,7 @@ using System; using System.Windows.Forms; -using TimeHACK.OS.Win95; -namespace TimeHACK.WinClassicForms +namespace TimeHACK.OS.Win95.Win95Apps { public partial class WinClassicDownloader : UserControl { diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 12776da..af31efa 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 bcd072f..d19e0f7 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 3e20261..406cc0c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= + 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 0c8fdea..991b339 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 106a594..7b1fe16 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= + tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= @@ -75,7 +75,7 @@ - SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= + /l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index e0ba070..f03f771 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 3e20261..406cc0c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= + 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 106a594..7b1fe16 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= + tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= @@ -75,7 +75,7 @@ - SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= + /l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 0c8fdea..991b339 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.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index eb0b568..b6ab8e4 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -25,8 +25,6 @@ C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK. C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\bin\Release\TimeHACK.Engine.pdb C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Main.csprojResolveAssemblyReference.cache C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.TestApp.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicDownloader.resources -C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicIE4.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources @@ -37,3 +35,5 @@ C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK. C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.pdb C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Windows95.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 091a82b..63f6ace 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 71db36c..3be4ddc 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.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index ef6fd62..06dec4b 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources new file mode 100644 index 0000000..9cbc1d1 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources deleted file mode 100644 index 6c05a97..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicDownloader.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources deleted file mode 100644 index 9cbc1d1..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicIE4.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 3e20261..406cc0c 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - Y/rAJqdBIeeVdq8x9pd9jayNokuOTzXppfQCtfe7A8k= + 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 0c8fdea..991b339 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 106a594..7b1fe16 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - +7pai1S3Q/PZ9rTMRZLCxc+p+EzrZ2Tk18Rz8h9s7jY= + tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= @@ -75,7 +75,7 @@ - SNU8shTRP8QXCifGeLuklgIPQZQs0gMJyA6LTOuPX5w= + /l7x7HD8hXvATQQVmOSM663LgsskkmOz8feGgd4LmY8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index e0ba070..f03f771 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From a02ef083865152de3a5d99090e5e15cf30ff3fe7 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 12:18:36 -0400 Subject: a little more conversation --- .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 3 + TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 65 +++++++++++++++++----- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 28 ++++++++++ 3 files changed, 81 insertions(+), 15 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index 545a796..af44554 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -233,6 +233,7 @@ this.button2.TabIndex = 8; this.button2.Text = "Speak"; this.button2.UseVisualStyleBackColor = true; + this.button2.Click += new System.EventHandler(this.Button2_Click); // // button3 // @@ -242,6 +243,7 @@ this.button3.TabIndex = 9; this.button3.Text = "Paul"; this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.Button3_Click); // // button4 // @@ -251,6 +253,7 @@ this.button4.TabIndex = 10; this.button4.Text = "Bill"; this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.Button4_Click); // // WebChat1998 // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index fa0837f..c18ba20 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -16,6 +16,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { int chat_index = 0; WCMessageParser wcmp = new WCMessageParser(); + bool correctname = false; public WebChat1998() { @@ -36,6 +37,7 @@ namespace TimeHACK.OS.Win95.Win95Apps wm.startInfobox95("Invalid Username", "Your username cannot be blank."); return; } + ParentForm.AcceptButton = button2; TitleScreen.username = txtscreenname.Text; login.Hide(); listBox1.Items.Add(TitleScreen.username); @@ -45,24 +47,57 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Chat_Tick(object sender, EventArgs e) { - history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; - switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) + if (chat_index != 6) { - case "addsh": - listBox1.Items.Add("SkyHigh"); - break; - case "nameguess": - typechat.Hide(); - button2.Hide(); - button3.Show(); - button4.Show(); - Chat.Stop(); - break; - default: - break; + history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; + switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) + { + case "addsh": + listBox1.Items.Add("SkyHigh"); + break; + case "nameguess": + typechat.Hide(); + button2.Hide(); + button3.Show(); + button4.Show(); + Chat.Stop(); + break; + case "addrain": + listBox1.Items.Add("rain49"); + break; + default: + break; + } + Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + } + else + { + if (correctname) + { + history.Text += "SkyHigh: yay you got it right!" + Environment.NewLine; + } + else + { + history.Text += "SkyHigh: sorry, my name is actually bill" + Environment.NewLine; + } + Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); } - Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); chat_index++; } + + private void Button2_Click(object sender, EventArgs e) + { + if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + Environment.NewLine; + } + + private void Button3_Click(object sender, EventArgs e) + { + correctname = true; Chat.Start(); + } + + private void Button4_Click(object sender, EventArgs e) + { + correctname = false; Chat.Start(); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 6734aab..7ab7db0 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -165,6 +165,34 @@ "message": "ill make 2 buttons pop up, you click the one you want to guess", "special": "nameguess", "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "actually, if ya dont wanna do that its fine, i guess", + "special": null, + "userchat": true + }, + { + "user": "System", + "delay": 3000, + "message": "rain49 has joined the chat.", + "special": "addrain", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "hey man", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "ive sort of been waiting", + "special": null, + "userchat": true } ] } -- cgit v1.2.3 From 20dcdbf96d65bd92feec3509cd586cc324fb46c7 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 16:28:34 -0400 Subject: webchat extra things --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 21 ++++++++++++++-- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 27 ++++++++++++++++++--- TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5510144 -> 5512192 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 4 +-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 4 +-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5510144 -> 5512192 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4011 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 1818 -> 2729 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5510144 -> 5512192 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 +-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes 15 files changed, 52 insertions(+), 14 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index c18ba20..4c5e8bf 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -37,6 +37,12 @@ namespace TimeHACK.OS.Win95.Win95Apps wm.startInfobox95("Invalid Username", "Your username cannot be blank."); return; } + else if (txtscreenname.Text.Length > 12) + { + WindowManager wm = new WindowManager(); + wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters."); + return; + } ParentForm.AcceptButton = button2; TitleScreen.username = txtscreenname.Text; login.Hide(); @@ -88,16 +94,27 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Button2_Click(object sender, EventArgs e) { if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + Environment.NewLine; + typechat.Text = ""; } private void Button3_Click(object sender, EventArgs e) { - correctname = true; Chat.Start(); + correctname = false; + button2.Show(); + button3.Hide(); + button4.Hide(); + typechat.Show(); + Chat.Start(); } private void Button4_Click(object sender, EventArgs e) { - correctname = false; Chat.Start(); + correctname = true; + button2.Show(); + button3.Hide(); + button4.Hide(); + typechat.Show(); + Chat.Start(); } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 7ab7db0..1ea52b5 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -133,7 +133,7 @@ }, { "user": "SkyHigh", - "delay": 6000, + "delay": 5000, "message": "damn", "special": null, "userchat": true @@ -183,16 +183,37 @@ { "user": "SkyHigh", "delay": 6000, - "message": "hey man", + "message": "hey rain", "special": null, "userchat": true }, { "user": "SkyHigh", - "delay": 6000, + "delay": 4000, "message": "ive sort of been waiting", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 5000, + "message": "sorry man", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 4000, + "message": "it took a while for this to load", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "anyway... let's get to it", + "special": null, + "userchat": true } ] } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 406cc0c..3a27e18 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= + cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 991b339..ccbc1c9 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 7b1fe16..f6a6b80 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= + Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index f03f771..f28cad0 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 406cc0c..3a27e18 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= + cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 7b1fe16..f6a6b80 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= + Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 991b339..ccbc1c9 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.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 63f6ace..237f406 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index 06dec4b..86e74b5 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 406cc0c..3a27e18 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 3m/raPlxZdAx9Kn9FqfxOLquvmjA4clJNq9egJ9VHvk= + cp4mv+tX+6jJBhJbheR3r1fcQrhLwE/0ZofeJX+Q2g8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 991b339..ccbc1c9 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 7b1fe16..f6a6b80 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - tBGKNvlbcSvbxWTgLwlUF3SAjYh2ALVzQLeAEa09O3Y= + Tror80yNARQdUqLmtn1yi8lJbJvktcZSmWBERAPGH+E= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index f03f771..f28cad0 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 125e35fe984021d892b98acff614e61a2851a9b1 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 16:44:05 -0400 Subject: simpler new lines --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 4c5e8bf..79594ed 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -47,7 +47,7 @@ namespace TimeHACK.OS.Win95.Win95Apps TitleScreen.username = txtscreenname.Text; login.Hide(); listBox1.Items.Add(TitleScreen.username); - history.Text = "System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine; + history.Text = "System: " + TitleScreen.username + " has joined the chat.\n"; Chat.Start(); } @@ -55,7 +55,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (chat_index != 6) { - history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; + history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + "\n"; switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) { case "addsh": @@ -80,11 +80,11 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (correctname) { - history.Text += "SkyHigh: yay you got it right!" + Environment.NewLine; + history.Text += "SkyHigh: yay you got it right!\n"; } else { - history.Text += "SkyHigh: sorry, my name is actually bill" + Environment.NewLine; + history.Text += "SkyHigh: sorry, my name is actually bill\n"; } Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); } @@ -93,7 +93,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Button2_Click(object sender, EventArgs e) { - if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + Environment.NewLine; + if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + "\n"; typechat.Text = ""; } -- cgit v1.2.3 From d0b92c3e07c87a63aac29c647bbfd7c78d5f1a50 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 17:59:16 -0400 Subject: more conversation --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 5 ++- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 42 +++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 79594ed..a259fa5 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -17,6 +17,7 @@ namespace TimeHACK.OS.Win95.Win95Apps int chat_index = 0; WCMessageParser wcmp = new WCMessageParser(); bool correctname = false; + bool guessing = false; public WebChat1998() { @@ -53,7 +54,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Chat_Tick(object sender, EventArgs e) { - if (chat_index != 6) + if (!guessing) { history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + "\n"; switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) @@ -67,6 +68,7 @@ namespace TimeHACK.OS.Win95.Win95Apps button3.Show(); button4.Show(); Chat.Stop(); + guessing = true; break; case "addrain": listBox1.Items.Add("rain49"); @@ -86,6 +88,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { history.Text += "SkyHigh: sorry, my name is actually bill\n"; } + guessing = false; Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); } chat_index++; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 1ea52b5..db829e3 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -214,6 +214,48 @@ "message": "anyway... let's get to it", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 5000, + "message": "wait, who's this @user guy?", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "oh, he's someone who just came on. doesnt seem to talk much", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 5000, + "message": "ah ok", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4500, + "message": "i would remove him from this chat but i cant", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "i dont think he should know about, well, ya know..", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3000, + "message": "right, that", + "special": null, + "userchat": true } ] } -- cgit v1.2.3 From 21fe930cb2ad9fccdd304ab8b0b38fbcc79afb3a Mon Sep 17 00:00:00 2001 From: lempamo Date: Sat, 1 Apr 2017 21:52:12 -0400 Subject: added error images for infobox --- .vs/TimeHACK/v14/.suo | Bin 131072 -> 131072 bytes TimeHACK.Engine/Properties/Resources.Designer.cs | 40 +++++++++++++++------ TimeHACK.Engine/Properties/Resources.resx | 10 ++++-- .../Resources/WinClassic/Window/Win95Error.png | Bin 0 -> 429 bytes .../Resources/WinClassic/Window/Win95Info.png | Bin 0 -> 384 bytes .../Resources/WinClassic/Window/Win95Warning.png | Bin 0 -> 432 bytes .../WinClassic/Window/WinClassicWarning.png | Bin 562 -> 0 bytes TimeHACK.Engine/Template/Infobox95.Designer.cs | 2 +- TimeHACK.Engine/WindowManager.cs | 2 +- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 8490 -> 9077 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 5120 -> 5120 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 4 +-- TimeHACK.Main/Properties/Resources.Designer.cs | 30 ++++++++++++++++ TimeHACK.Main/Properties/Resources.resx | 9 +++++ TimeHACK.Main/Resources/WinClassic/Win95Error.png | Bin 0 -> 429 bytes TimeHACK.Main/Resources/WinClassic/Win95Info.png | Bin 0 -> 384 bytes .../Resources/WinClassic/Win95Warning.png | Bin 0 -> 432 bytes TimeHACK.Main/TitleScreen.Designer.cs | 2 +- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 126976 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 32256 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5488128 -> 5488128 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 4 +-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 4 +-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5488128 -> 5488128 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 10997 -> 12021 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 9216 -> 9216 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5488128 -> 5488128 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 +-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 124416 -> 124416 bytes 38 files changed, 91 insertions(+), 26 deletions(-) create mode 100644 TimeHACK.Engine/Resources/WinClassic/Window/Win95Error.png create mode 100644 TimeHACK.Engine/Resources/WinClassic/Window/Win95Info.png create mode 100644 TimeHACK.Engine/Resources/WinClassic/Window/Win95Warning.png delete mode 100644 TimeHACK.Engine/Resources/WinClassic/Window/WinClassicWarning.png create mode 100644 TimeHACK.Main/Resources/WinClassic/Win95Error.png create mode 100644 TimeHACK.Main/Resources/WinClassic/Win95Info.png create mode 100644 TimeHACK.Main/Resources/WinClassic/Win95Warning.png (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index ff1e2ef..bddbad5 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 334f428..b50683f 100644 --- a/TimeHACK.Engine/Properties/Resources.Designer.cs +++ b/TimeHACK.Engine/Properties/Resources.Designer.cs @@ -173,9 +173,9 @@ namespace TimeHACK.Engine.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap WinClassicClose { + internal static System.Drawing.Bitmap Win95Error { get { - object obj = ResourceManager.GetObject("WinClassicClose", resourceCulture); + object obj = ResourceManager.GetObject("Win95Error", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -183,9 +183,9 @@ namespace TimeHACK.Engine.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap WinClassicMax { + internal static System.Drawing.Bitmap Win95Info { get { - object obj = ResourceManager.GetObject("WinClassicMax", resourceCulture); + object obj = ResourceManager.GetObject("Win95Info", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -193,9 +193,9 @@ namespace TimeHACK.Engine.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap WinClassicMin { + internal static System.Drawing.Bitmap Win95Warning { get { - object obj = ResourceManager.GetObject("WinClassicMin", resourceCulture); + object obj = ResourceManager.GetObject("Win95Warning", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -203,9 +203,29 @@ namespace TimeHACK.Engine.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap WinClassicRestore { + internal static System.Drawing.Bitmap WinClassicClose { get { - object obj = ResourceManager.GetObject("WinClassicRestore", resourceCulture); + object obj = ResourceManager.GetObject("WinClassicClose", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap WinClassicMax { + get { + object obj = ResourceManager.GetObject("WinClassicMax", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap WinClassicMin { + get { + object obj = ResourceManager.GetObject("WinClassicMin", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -213,9 +233,9 @@ namespace TimeHACK.Engine.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap WinClassicWarning { + internal static System.Drawing.Bitmap WinClassicRestore { get { - object obj = ResourceManager.GetObject("WinClassicWarning", resourceCulture); + object obj = ResourceManager.GetObject("WinClassicRestore", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/TimeHACK.Engine/Properties/Resources.resx b/TimeHACK.Engine/Properties/Resources.resx index 2763fc4..aa281d1 100644 --- a/TimeHACK.Engine/Properties/Resources.resx +++ b/TimeHACK.Engine/Properties/Resources.resx @@ -163,7 +163,13 @@ ..\resources\winclassic\window\winclassicrestore.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\window\winclassicwarning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Window\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Window\Win95Info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Window\Win95Warning.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/WinClassic/Window/Win95Error.png b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Error.png new file mode 100644 index 0000000..4667e9d Binary files /dev/null and b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Error.png differ diff --git a/TimeHACK.Engine/Resources/WinClassic/Window/Win95Info.png b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Info.png new file mode 100644 index 0000000..5d2018a Binary files /dev/null and b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Info.png differ diff --git a/TimeHACK.Engine/Resources/WinClassic/Window/Win95Warning.png b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Warning.png new file mode 100644 index 0000000..8e01535 Binary files /dev/null and b/TimeHACK.Engine/Resources/WinClassic/Window/Win95Warning.png differ diff --git a/TimeHACK.Engine/Resources/WinClassic/Window/WinClassicWarning.png b/TimeHACK.Engine/Resources/WinClassic/Window/WinClassicWarning.png deleted file mode 100644 index 7e2e59c..0000000 Binary files a/TimeHACK.Engine/Resources/WinClassic/Window/WinClassicWarning.png and /dev/null differ diff --git a/TimeHACK.Engine/Template/Infobox95.Designer.cs b/TimeHACK.Engine/Template/Infobox95.Designer.cs index cb69fac..d15dea3 100644 --- a/TimeHACK.Engine/Template/Infobox95.Designer.cs +++ b/TimeHACK.Engine/Template/Infobox95.Designer.cs @@ -87,7 +87,7 @@ // pictureBox1 // this.pictureBox1.ErrorImage = null; - this.pictureBox1.Image = global::TimeHACK.Engine.Properties.Resources.WinClassicWarning; + this.pictureBox1.Image = global::TimeHACK.Engine.Properties.Resources.Win95Warning; this.pictureBox1.InitialImage = null; this.pictureBox1.Location = new System.Drawing.Point(8, 33); this.pictureBox1.Name = "pictureBox1"; diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index be73ab2..65a0ec5 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -58,7 +58,7 @@ namespace TimeHACK.Engine return app; } - public Infobox95 startInfobox95(String title, String text) + public Infobox95 startInfobox95(String title, String text, Image erroricon) { Infobox95 app = new Infobox95(); app.Title.Text = title; diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index ef04c2a..0a13d8f 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 01a4f90..80b705d 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/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 9381462..d960576 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 dbb0d34..eeaa15b 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.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index ef04c2a..0a13d8f 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 01a4f90..80b705d 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/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index a259fa5..7679c7a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -35,13 +35,13 @@ namespace TimeHACK.OS.Win95.Win95Apps if (txtscreenname.Text == "") { WindowManager wm = new WindowManager(); - wm.startInfobox95("Invalid Username", "Your username cannot be blank."); + wm.startInfobox95("Invalid Username", "Your username cannot be blank.", Properties.Resources.Win95Warning); return; } else if (txtscreenname.Text.Length > 12) { WindowManager wm = new WindowManager(); - wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters."); + wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.", Properties.Resources.Win95Warning); return; } ParentForm.AcceptButton = button2; diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 1865b5e..b68a6f2 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -238,6 +238,26 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95Error { + get { + object obj = ResourceManager.GetObject("Win95Error", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95Info { + get { + object obj = ResourceManager.GetObject("Win95Info", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -266,6 +286,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95Warning { + get { + object obj = ResourceManager.GetObject("Win95Warning", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index f51d183..d7096e2 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -250,4 +250,13 @@ ..\Resources\WinClassic\sliversilver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win95Info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\WinClassic\Win95Warning.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.Main/Resources/WinClassic/Win95Error.png b/TimeHACK.Main/Resources/WinClassic/Win95Error.png new file mode 100644 index 0000000..4667e9d Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/Win95Error.png differ diff --git a/TimeHACK.Main/Resources/WinClassic/Win95Info.png b/TimeHACK.Main/Resources/WinClassic/Win95Info.png new file mode 100644 index 0000000..5d2018a Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/Win95Info.png differ diff --git a/TimeHACK.Main/Resources/WinClassic/Win95Warning.png b/TimeHACK.Main/Resources/WinClassic/Win95Warning.png new file mode 100644 index 0000000..8e01535 Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/Win95Warning.png differ diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs index 1bb9dca..2777027 100644 --- a/TimeHACK.Main/TitleScreen.Designer.cs +++ b/TimeHACK.Main/TitleScreen.Designer.cs @@ -54,7 +54,7 @@ this.gameversion.AutoSize = true; this.gameversion.BackColor = System.Drawing.Color.Transparent; this.gameversion.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.gameversion.Location = new System.Drawing.Point(25, 8); + this.gameversion.Location = new System.Drawing.Point(25, 6); this.gameversion.Name = "gameversion"; this.gameversion.Size = new System.Drawing.Size(78, 13); this.gameversion.TabIndex = 0; diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index ef04c2a..0a13d8f 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 01a4f90..80b705d 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 0caeed9..1fb9850 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - fKnNtCMWzJ5FDruMlus77oKseVqTKPR1CtiMlKkLtx4= + AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index f854f98..215261d 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 515b282..bcb359b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -63,7 +63,7 @@ - ke+yb6S++pb9eQ7keVJBkXsGT2Fo+xzu55VwmJ6SsAg= + DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k= @@ -75,7 +75,7 @@ - Y1QPCUqPsePdcLpE0c4llNeaL2BqfEG6k4jngkXuYoQ= + ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index f56109d..283347b 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 0caeed9..1fb9850 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - fKnNtCMWzJ5FDruMlus77oKseVqTKPR1CtiMlKkLtx4= + AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 515b282..bcb359b 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -63,7 +63,7 @@ - ke+yb6S++pb9eQ7keVJBkXsGT2Fo+xzu55VwmJ6SsAg= + DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k= @@ -75,7 +75,7 @@ - Y1QPCUqPsePdcLpE0c4llNeaL2BqfEG6k4jngkXuYoQ= + ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index f854f98..215261d 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/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 7d3adc3..049462f 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index df73e28..628d63b 100644 Binary files a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 69bd06d..357f866 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.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 0caeed9..1fb9850 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - fKnNtCMWzJ5FDruMlus77oKseVqTKPR1CtiMlKkLtx4= + AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index f854f98..215261d 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 515b282..bcb359b 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -63,7 +63,7 @@ - ke+yb6S++pb9eQ7keVJBkXsGT2Fo+xzu55VwmJ6SsAg= + DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k= @@ -75,7 +75,7 @@ - Y1QPCUqPsePdcLpE0c4llNeaL2BqfEG6k4jngkXuYoQ= + ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index f56109d..283347b 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 568d5a6573ffd13c5adb38ab40e0e608fa3dff8e Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 2 Apr 2017 13:35:32 -0400 Subject: added AIM sounds to webchat --- .vs/TimeHACK/v14/.suo | Bin 137728 -> 129536 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 128512 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 34304 bytes .../TimeHACK.Engine.Properties.Resources.resources | Bin 99522 -> 100585 bytes .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2068 -> 2186 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 126976 -> 128512 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 32256 -> 34304 bytes TimeHACK.Main/OS/Win95/Win95.cs | 20 +++++------ TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 40 ++++++++++++--------- TimeHACK.Main/Properties/Resources.Designer.cs | 36 +++++++++++++++++++ TimeHACK.Main/Properties/Resources.resx | 12 +++++++ .../Resources/WinClassic/AIMbuddyjoin.wav | Bin 0 -> 167760 bytes .../Resources/WinClassic/AIMbuddyleave.wav | Bin 0 -> 86256 bytes .../Resources/WinClassic/AIMmessagereceived.wav | Bin 0 -> 159984 bytes .../Resources/WinClassic/AIMmessagesent.wav | Bin 0 -> 157936 bytes TimeHACK.Main/TimeHACK.Main.csproj | 4 +++ TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 126976 -> 128512 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 32256 -> 34304 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 5488128 -> 6063104 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 8 ++--- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 124416 -> 126464 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 8 ++--- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 5488128 -> 6063104 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 12021 -> 12438 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 9216 -> 9728 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4011 -> 4414 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes .../TimeHACK.Properties.Resources.resources | Bin 4132862 -> 4706819 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 5488128 -> 6063104 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 8 ++--- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 124416 -> 126464 bytes 34 files changed, 100 insertions(+), 42 deletions(-) create mode 100644 TimeHACK.Main/Resources/WinClassic/AIMbuddyjoin.wav create mode 100644 TimeHACK.Main/Resources/WinClassic/AIMbuddyleave.wav create mode 100644 TimeHACK.Main/Resources/WinClassic/AIMmessagereceived.wav create mode 100644 TimeHACK.Main/Resources/WinClassic/AIMmessagesent.wav (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 9459d79..1fe43f0 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 0a13d8f..97fd8a4 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 80b705d..890f0ad 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/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources index 00b9ff1..9fc7e1a 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.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index 7ba7178..f42b4f1 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 0a13d8f..97fd8a4 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 80b705d..890f0ad 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.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 85039ef..afe1644 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -54,16 +54,16 @@ namespace TimeHACK.OS.Win95 private void fontLoad() { - this.taskbartime.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ProgramsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.DocumentsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.SettingsToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FindToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.HelpToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.RunToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.SuspendToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ShutdownToolStripMenuItem.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.desktopicons.Font = new System.Drawing.Font(TitleScreen.pfc.Families[0], 16F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.taskbartime.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.ProgramsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.DocumentsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.SettingsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.FindToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.HelpToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.RunToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.SuspendToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.ShutdownToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.desktopicons.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); } #region StartMenu diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 7679c7a..714df9d 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -9,16 +9,24 @@ using System.Threading.Tasks; using System.Windows.Forms; using TimeHACK.Engine; using System.Threading; +using System.Media; +using System.IO; namespace TimeHACK.OS.Win95.Win95Apps { public partial class WebChat1998 : UserControl { int chat_index = 0; + WindowManager wm = new WindowManager(); WCMessageParser wcmp = new WCMessageParser(); bool correctname = false; bool guessing = false; + SoundPlayer join = new SoundPlayer(Properties.Resources.AIMbuddyjoin); + SoundPlayer leave = new SoundPlayer(Properties.Resources.AIMbuddyleave); + SoundPlayer send = new SoundPlayer(Properties.Resources.AIMmessagesent); + SoundPlayer receive = new SoundPlayer(Properties.Resources.AIMmessagereceived); + public WebChat1998() { InitializeComponent(); @@ -32,23 +40,15 @@ namespace TimeHACK.OS.Win95.Win95Apps } private void Button1_Click(object sender, EventArgs e) { - if (txtscreenname.Text == "") - { - WindowManager wm = new WindowManager(); - wm.startInfobox95("Invalid Username", "Your username cannot be blank.", Properties.Resources.Win95Warning); - return; - } - else if (txtscreenname.Text.Length > 12) - { - WindowManager wm = new WindowManager(); - wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.", Properties.Resources.Win95Warning); - return; - } + if (txtscreenname.Text == "") { wm.startInfobox95("Invalid Username", "Your username cannot be blank.", Properties.Resources.Win95Warning); return; } + if (txtscreenname.Text.Length > 12) { wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.", Properties.Resources.Win95Warning); return; } + if (txtscreenname.Text.Contains(" ")) { wm.startInfobox95("Invalid Username", "Your username cannot contain spaces.", Properties.Resources.Win95Warning); return; } ParentForm.AcceptButton = button2; TitleScreen.username = txtscreenname.Text; login.Hide(); listBox1.Items.Add(TitleScreen.username); - history.Text = "System: " + TitleScreen.username + " has joined the chat.\n"; + history.Text = "System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine; + join.Play(); Chat.Start(); } @@ -56,11 +56,12 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (!guessing) { - history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + "\n"; + history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) { case "addsh": listBox1.Items.Add("SkyHigh"); + join.Play(); break; case "nameguess": typechat.Hide(); @@ -69,11 +70,14 @@ namespace TimeHACK.OS.Win95.Win95Apps button4.Show(); Chat.Stop(); guessing = true; + receive.Play(); break; case "addrain": listBox1.Items.Add("rain49"); + join.Play(); break; default: + receive.Play(); break; } Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); @@ -82,13 +86,14 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (correctname) { - history.Text += "SkyHigh: yay you got it right!\n"; + history.Text += "SkyHigh: yay you got it right!" + Environment.NewLine; } else { - history.Text += "SkyHigh: sorry, my name is actually bill\n"; + history.Text += "SkyHigh: sorry, my name is actually bill" + Environment.NewLine; } guessing = false; + receive.Play(); Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); } chat_index++; @@ -96,8 +101,9 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Button2_Click(object sender, EventArgs e) { - if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + "\n"; + if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + Environment.NewLine; typechat.Text = ""; + send.Play(); } private void Button3_Click(object sender, EventArgs e) diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index b68a6f2..96efd85 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -80,6 +80,42 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream AIMbuddyjoin { + get { + return ResourceManager.GetStream("AIMbuddyjoin", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream AIMbuddyleave { + get { + return ResourceManager.GetStream("AIMbuddyleave", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream AIMmessagereceived { + get { + return ResourceManager.GetStream("AIMmessagereceived", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream AIMmessagesent { + get { + return ResourceManager.GetStream("AIMmessagesent", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index d7096e2..0970029 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -250,6 +250,18 @@ ..\Resources\WinClassic\sliversilver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\AIMbuddyjoin.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\WinClassic\AIMbuddyleave.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\WinClassic\AIMmessagereceived.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\WinClassic\AIMmessagesent.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + ..\Resources\WinClassic\Win95Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/TimeHACK.Main/Resources/WinClassic/AIMbuddyjoin.wav b/TimeHACK.Main/Resources/WinClassic/AIMbuddyjoin.wav new file mode 100644 index 0000000..dda5e1f Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/AIMbuddyjoin.wav differ diff --git a/TimeHACK.Main/Resources/WinClassic/AIMbuddyleave.wav b/TimeHACK.Main/Resources/WinClassic/AIMbuddyleave.wav new file mode 100644 index 0000000..88d6e09 Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/AIMbuddyleave.wav differ diff --git a/TimeHACK.Main/Resources/WinClassic/AIMmessagereceived.wav b/TimeHACK.Main/Resources/WinClassic/AIMmessagereceived.wav new file mode 100644 index 0000000..7bac9bb Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/AIMmessagereceived.wav differ diff --git a/TimeHACK.Main/Resources/WinClassic/AIMmessagesent.wav b/TimeHACK.Main/Resources/WinClassic/AIMmessagesent.wav new file mode 100644 index 0000000..d027e91 Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/AIMmessagesent.wav differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index d7b5a11..ea3b6a5 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -234,6 +234,10 @@ + + + + diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 0a13d8f..97fd8a4 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 80b705d..890f0ad 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 1fb9850..1ac6496 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc= + TOmxfxrtinnOLMjWVtEuPI+MbEQOTMUMBIHGdANvS4w= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 215261d..e932d4b 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 bcb359b..1fc268d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k= + 2lQG5DuYfrjHinXdd6VN7jq0gbfhQ+37R6XchZjlGkA= - + - ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI= + xoZRkVavtqwej84SMc+bgzTWybYfLR7XwCK73qumD+A= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 283347b..bafcdad 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 1fb9850..1ac6496 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc= + TOmxfxrtinnOLMjWVtEuPI+MbEQOTMUMBIHGdANvS4w= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index bcb359b..1fc268d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,26 +56,26 @@ - + - DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k= + 2lQG5DuYfrjHinXdd6VN7jq0gbfhQ+37R6XchZjlGkA= - + - ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI= + xoZRkVavtqwej84SMc+bgzTWybYfLR7XwCK73qumD+A= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 215261d..e932d4b 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/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 049462f..fa0e958 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index 628d63b..637a1b6 100644 Binary files a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 4347c4d..d4a9233 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 357f866..fec33e3 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 171b434..c7b9137 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 1fb9850..1ac6496 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - AwO6OXkOQVExi50oGC9w4YwCEdUdSY0bIMxwJXLF0Mc= + TOmxfxrtinnOLMjWVtEuPI+MbEQOTMUMBIHGdANvS4w= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 215261d..e932d4b 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 bcb359b..1fc268d 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - DgwWsOmPm8mC0KMpcotANuhX4vTkbrvn4vNqUvdnI7k= + 2lQG5DuYfrjHinXdd6VN7jq0gbfhQ+37R6XchZjlGkA= - + - ENN/ttN6dD185HMujPfXV5rh+8IVRlI2I2eboJ/c3GI= + xoZRkVavtqwej84SMc+bgzTWybYfLR7XwCK73qumD+A= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 283347b..bafcdad 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From db3a41715a3d49c275fd924f1d590de2956d972f Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 2 Apr 2017 20:07:39 -0400 Subject: more convo --- .vs/TimeHACK/v14/.suo | Bin 129536 -> 74240 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 0 -> 9073 bytes ...tedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs | 0 ...tedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs | 0 ...tedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs | 0 .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 1 + TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 10 ++++++++++ TimeHACK.Main/Properties/Resources.Designer.cs | 9 +++++++++ TimeHACK.Main/Properties/Resources.resx | 3 +++ TimeHACK.Main/Resources/WinClassic/AIMfile.wav | Bin 0 -> 4480 bytes TimeHACK.Main/TimeHACK.Main.csproj | 1 + TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6063104 -> 6072320 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 126464 -> 126464 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 4 ++-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6063104 -> 6072320 bytes .../DesignTimeResolveAssemblyReferences.cache | Bin 46739 -> 37593 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 12438 -> 12533 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 9728 -> 9728 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4414 -> 4466 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 4277 -> 8933 bytes .../TimeHACK.Properties.Resources.resources | Bin 4706819 -> 4711331 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6063104 -> 6072320 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 4 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 126464 -> 126464 bytes 28 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache create mode 100644 TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs create mode 100644 TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs create mode 100644 TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs create mode 100644 TimeHACK.Main/Resources/WinClassic/AIMfile.wav (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 1fe43f0..3b72b36 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache new file mode 100644 index 0000000..bac2e0d Binary files /dev/null and b/TimeHACK.Engine/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs b/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs new file mode 100644 index 0000000..e69de29 diff --git a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs b/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs new file mode 100644 index 0000000..e69de29 diff --git a/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs b/TimeHACK.Engine/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs new file mode 100644 index 0000000..e69de29 diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs index af44554..9ab490a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -87,6 +87,7 @@ this.history.ReadOnly = true; this.history.Size = new System.Drawing.Size(471, 377); this.history.TabIndex = 2; + this.history.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; // // panel1 // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 714df9d..de03b93 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -26,6 +26,7 @@ namespace TimeHACK.OS.Win95.Win95Apps SoundPlayer leave = new SoundPlayer(Properties.Resources.AIMbuddyleave); SoundPlayer send = new SoundPlayer(Properties.Resources.AIMmessagesent); SoundPlayer receive = new SoundPlayer(Properties.Resources.AIMmessagereceived); + SoundPlayer file = new SoundPlayer(Properties.Resources.AIMfile); public WebChat1998() { @@ -76,6 +77,15 @@ namespace TimeHACK.OS.Win95.Win95Apps listBox1.Items.Add("rain49"); join.Play(); break; + case "addfile": + label5.Show(); + button5.Show(); + file.Play(); + break; + case "addpadams": + listBox1.Items.Add("12padams"); + join.Play(); + break; default: receive.Play(); break; diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 96efd85..99c111c 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -98,6 +98,15 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream AIMfile { + get { + return ResourceManager.GetStream("AIMfile", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index 0970029..a4c1ad4 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -271,4 +271,7 @@ ..\Resources\WinClassic\Win95Warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\AIMfile.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/WinClassic/AIMfile.wav b/TimeHACK.Main/Resources/WinClassic/AIMfile.wav new file mode 100644 index 0000000..6cc1b03 Binary files /dev/null and b/TimeHACK.Main/Resources/WinClassic/AIMfile.wav differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index ea3b6a5..f96308a 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -238,6 +238,7 @@ + diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 1ac6496..448f3b1 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - TOmxfxrtinnOLMjWVtEuPI+MbEQOTMUMBIHGdANvS4w= + yEpghepPJm2OR2eU+1oEJSm3j1Th0B6L8j0AMtQRmno= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index e932d4b..aeb38a4 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 1fc268d..f0eb98d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - 2lQG5DuYfrjHinXdd6VN7jq0gbfhQ+37R6XchZjlGkA= + 6Sf/XpiBIlZvEldzdG+VHPYw/v9Bah4Uj33huneKlIA= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index bafcdad..cc3a8cb 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 1ac6496..448f3b1 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - TOmxfxrtinnOLMjWVtEuPI+MbEQOTMUMBIHGdANvS4w= + yEpghepPJm2OR2eU+1oEJSm3j1Th0B6L8j0AMtQRmno= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 1fc268d..f0eb98d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - 2lQG5DuYfrjHinXdd6VN7jq0gbfhQ+37R6XchZjlGkA= + 6Sf/XpiBIlZvEldzdG+VHPYw/v9Bah4Uj33huneKlIA= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index e932d4b..aeb38a4 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/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index e6e9e54..f6d7c8b 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index fa0e958..0e41898 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index 637a1b6..9f3fa70 100644 Binary files a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index d4a9233..eae23d0 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index 09910d8..422a86f 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources index c7b9137..cb99be0 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 1ac6496..448f3b1 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - TOmxfxrtinnOLMjWVtEuPI+MbEQOTMUMBIHGdANvS4w= + yEpghepPJm2OR2eU+1oEJSm3j1Th0B6L8j0AMtQRmno= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index e932d4b..aeb38a4 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 1fc268d..f0eb98d 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - 2lQG5DuYfrjHinXdd6VN7jq0gbfhQ+37R6XchZjlGkA= + 6Sf/XpiBIlZvEldzdG+VHPYw/v9Bah4Uj33huneKlIA= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index bafcdad..cc3a8cb 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 3afc5f0362cba789e1d4049401566f711dd08065 Mon Sep 17 00:00:00 2001 From: lempamo Date: Sun, 2 Apr 2017 20:17:19 -0400 Subject: fixed textbox not auto scrolling to bottom --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 10 +- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 220 +++++++++++++++++++++- 2 files changed, 220 insertions(+), 10 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index de03b93..85ac07c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -48,7 +48,7 @@ namespace TimeHACK.OS.Win95.Win95Apps TitleScreen.username = txtscreenname.Text; login.Hide(); listBox1.Items.Add(TitleScreen.username); - history.Text = "System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine; + history.AppendText("System: " + TitleScreen.username + " has joined the chat." + Environment.NewLine); join.Play(); Chat.Start(); } @@ -57,7 +57,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (!guessing) { - history.Text += wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine; + history.AppendText(wcmp.ParseMessage(resources.GetString("convo"), chat_index, TitleScreen.username) + Environment.NewLine); switch (wcmp.GetSpecial(resources.GetString("convo"), chat_index)) { case "addsh": @@ -96,11 +96,11 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (correctname) { - history.Text += "SkyHigh: yay you got it right!" + Environment.NewLine; + history.AppendText("SkyHigh: yay you got it right!" + Environment.NewLine); } else { - history.Text += "SkyHigh: sorry, my name is actually bill" + Environment.NewLine; + history.AppendText("SkyHigh: sorry, my name is actually bill" + Environment.NewLine); } guessing = false; receive.Play(); @@ -111,7 +111,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Button2_Click(object sender, EventArgs e) { - if (typechat.Text != "") history.Text += TitleScreen.username + ": " + typechat.Text + Environment.NewLine; + if (typechat.Text != "") history.AppendText(TitleScreen.username + ": " + typechat.Text + Environment.NewLine); typechat.Text = ""; send.Play(); } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index d20d707..30ebbbf 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -182,21 +182,21 @@ }, { "user": "SkyHigh", - "delay": 6000, + "delay": 3000, "message": "hey rain", "special": null, "userchat": true }, { "user": "SkyHigh", - "delay": 4000, + "delay": 3000, "message": "ive sort of been waiting", "special": null, "userchat": true }, { "user": "rain49", - "delay": 5000, + "delay": 4000, "message": "sorry man", "special": null, "userchat": true @@ -224,7 +224,7 @@ }, { "user": "SkyHigh", - "delay": 3000, + "delay": 2500, "message": "oh, he's someone who just came on. doesnt seem to talk much", "special": null, "userchat": true @@ -273,10 +273,220 @@ }, { "user": "rain49", - "delay": 2500, + "delay": 5000, "message": "ok then", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 5500, + "message": "so @user, we are going to break the chat rules here..", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3000, + "message": "so if you dont wanna get banned i recommend you just logout now", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "let's give him some time", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 9000, + "message": "to leave the chat", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3500, + "message": "...", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3000, + "message": "i guess he wants to risk it", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "tell him what we will do", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2000, + "message": "you haven't said that yet", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 6000, + "message": "right, right", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 4000, + "message": "so there's this really cool program on the 12padams website called skindows95", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 5500, + "message": "normally youd have to pay for it", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "Yeah... it's really hard to even get to the buy button - stupid", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 6500, + "message": "But.. i have a copy i can send to you and skyhigh", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2000, + "message": "Yeah... kind of not pirating because he managed to steal a copy from someone else who bought it", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 1500, + "message": "So hey...", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 1500, + "message": "You haven't left", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "Send it now...", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 1500, + "message": "I really want to skin my system", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 2500, + "message": "sending!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "thx man", + "special": null, + "userchat": true + }, + { + "user": "System", + "delay": 3000, + "message": "File \"skin95setup.exe\" has been uploaded.", + "special": "addfile", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "yay!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "im downloading it now", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3500, + "message": "and @user, why dont you go and download it too?", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "i think he already is ;)", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "OH THIS IS SO COOL", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 4000, + "message": "lemme send a screenshot", + "special": null, + "userchat": true + }, + { + "user": "System", + "delay": 2000, + "message": "12padams has joined the chat.", + "special": "addpadams", + "userchat": true + }, + { + "user": "rain49", + "delay": 500, + "message": "CRAP", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 500, + "message": "ah NO WE ARE DED", + "special": null, + "userchat": true } ] } -- cgit v1.2.3 From 036a986ce1f56e6cda0617e6e574a875b847911b Mon Sep 17 00:00:00 2001 From: lempamo Date: Thu, 13 Apr 2017 14:04:41 -0400 Subject: WebChat1998 crash works! --- .vs/TimeHACK/v14/.suo | Bin 93696 -> 96256 bytes TimeHACK.Engine/BSODCreator.cs | 31 ++++++++++++++- TimeHACK.Engine/Template/Win9XBSOD.Designer.cs | 13 ++++-- TimeHACK.Engine/Template/Win9XBSOD.cs | 12 ++++++ TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 131584 -> 164864 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 38400 -> 46592 bytes .../TimeHACK.Engine.Properties.Resources.resources | Bin 100976 -> 130654 bytes .../TimeHACK.Engine.Template.Win9XBSOD.resources | Bin 0 -> 180 bytes .../TimeHACK.Engine.csproj.FileListAbsolute.txt | 1 + .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2311 -> 2456 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 131584 -> 164864 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 38400 -> 46592 bytes TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 15 +++++++ TimeHACK.Main/Program.cs | 3 +- TimeHACK.Main/TitleScreen.cs | 44 ++++++++++++++++++--- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 131584 -> 164864 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 38400 -> 46592 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6092288 -> 6123008 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 8 ++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 134656 -> 136704 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 8 ++-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6092288 -> 6123008 bytes .../bin/Release/windows_command_prompt.ttf | Bin 0 -> 29616 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4611 -> 4667 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes .../TimeHACK.Properties.Resources.resources | Bin 4711950 -> 4741628 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6092288 -> 6123008 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 8 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 134656 -> 136704 bytes 32 files changed, 122 insertions(+), 27 deletions(-) create mode 100644 TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Win9XBSOD.resources create mode 100644 TimeHACK.Main/bin/Release/windows_command_prompt.ttf (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 6fcc929..74e305a 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/BSODCreator.cs b/TimeHACK.Engine/BSODCreator.cs index eb9c9a5..fe19dfd 100644 --- a/TimeHACK.Engine/BSODCreator.cs +++ b/TimeHACK.Engine/BSODCreator.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Windows.Forms; using TimeHACK.Engine.Template; namespace TimeHACK.Engine @@ -11,9 +12,35 @@ namespace TimeHACK.Engine { public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); - public Win9XBSOD throw9XBSOD(bool except, int type) + public enum BSODCauses { - return null; + Testing, + ExitChat98Early + } + + public Win9XBSOD throw9XBSOD(bool except, BSODCauses type) + { + pfc.AddFontFile(AppDomain.CurrentDomain.BaseDirectory + "\\windows_command_prompt.ttf"); + Win9XBSOD bsod = new Win9XBSOD(); + foreach (Control ctrl in bsod.Controls) { + ctrl.Font = new System.Drawing.Font(pfc.Families[0], 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((0))); + } + bsod.TopMost = true; + bsod.FormBorderStyle = FormBorderStyle.None; + bsod.WindowState = FormWindowState.Maximized; + switch (type) + { + case BSODCauses.Testing: + bsod.textBox1.Text = "This is the testing type of BSOD. Hurrah."; + break; + case BSODCauses.ExitChat98Early: + bsod.textBox1.Text = "An unknown but fatal exception has occured has occured in the program \"wchat98.exe\". The current processes will be terminated."; + break; + default: + break; + } + bsod.Show(); + return bsod; } } } diff --git a/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs b/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs index 169c81a..69470f0 100644 --- a/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs +++ b/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs @@ -50,11 +50,13 @@ // // textBox1 // + this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.textBox1.BackColor = System.Drawing.Color.Blue; this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox1.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBox1.ForeColor = System.Drawing.Color.White; this.textBox1.Location = new System.Drawing.Point(120, 294); + this.textBox1.MaximumSize = new System.Drawing.Size(950, 81); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; this.textBox1.ReadOnly = true; @@ -66,6 +68,7 @@ // // textBox2 // + this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.textBox2.BackColor = System.Drawing.Color.Blue; this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox2.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -82,6 +85,7 @@ // // textBox3 // + this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.textBox3.BackColor = System.Drawing.Color.Blue; this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None; this.textBox3.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -108,6 +112,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "Win9XBSOD"; this.Text = "Win9XBSOD"; + this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Win9XBSOD_KeyDown); this.ResumeLayout(false); this.PerformLayout(); @@ -115,9 +120,9 @@ #endregion - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox2; - private System.Windows.Forms.TextBox textBox3; + internal System.Windows.Forms.Label label1; + internal System.Windows.Forms.TextBox textBox1; + internal System.Windows.Forms.TextBox textBox2; + internal System.Windows.Forms.TextBox textBox3; } } \ No newline at end of file diff --git a/TimeHACK.Engine/Template/Win9XBSOD.cs b/TimeHACK.Engine/Template/Win9XBSOD.cs index b98fa6a..662812b 100644 --- a/TimeHACK.Engine/Template/Win9XBSOD.cs +++ b/TimeHACK.Engine/Template/Win9XBSOD.cs @@ -12,9 +12,21 @@ namespace TimeHACK.Engine.Template { public partial class Win9XBSOD : Form { + public bool reset = false; + public Win9XBSOD() { InitializeComponent(); } + + private void Win9XBSOD_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Escape) Environment.Exit(0); + else + { + reset = true; + this.Close(); + } + } } } diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 4a6f36a..6cbffa8 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 71b6806..f410e47 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/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources index e165274..1e84bb7 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.Win9XBSOD.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Win9XBSOD.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.Win9XBSOD.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 1dd6633..ddc5d7f 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt @@ -18,3 +18,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.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 +C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index b2e8f35..00f32e5 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 4a6f36a..6cbffa8 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 71b6806..f410e47 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/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 85ac07c..afca54c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -11,6 +11,7 @@ using TimeHACK.Engine; using System.Threading; using System.Media; using System.IO; +using TimeHACK.Engine.Template; namespace TimeHACK.OS.Win95.Win95Apps { @@ -28,9 +29,14 @@ namespace TimeHACK.OS.Win95.Win95Apps SoundPlayer receive = new SoundPlayer(Properties.Resources.AIMmessagereceived); SoundPlayer file = new SoundPlayer(Properties.Resources.AIMfile); + BSODCreator bc = new BSODCreator(); + Win9XBSOD bsod = null; + public WebChat1998() { InitializeComponent(); + bsod = bc.throw9XBSOD(false, BSODCreator.BSODCauses.ExitChat98Early); + bsod.Hide(); } private void WebChat1998_Load(object sender, EventArgs e) { @@ -63,6 +69,7 @@ namespace TimeHACK.OS.Win95.Win95Apps case "addsh": listBox1.Items.Add("SkyHigh"); join.Play(); + this.ParentForm.FormClosing += WebChatClosing; break; case "nameguess": typechat.Hide(); @@ -85,6 +92,7 @@ namespace TimeHACK.OS.Win95.Win95Apps case "addpadams": listBox1.Items.Add("12padams"); join.Play(); + ((WinClassic)this.ParentForm).closeDisabled = true; break; default: receive.Play(); @@ -109,6 +117,13 @@ namespace TimeHACK.OS.Win95.Win95Apps chat_index++; } + private void WebChatClosing(object sender, FormClosingEventArgs e) + { + bsod.FormClosing += new FormClosingEventHandler(Program.title.BSODRewind); + bsod.Show(); + bsod.BringToFront(); + } + private void Button2_Click(object sender, EventArgs e) { if (typechat.Text != "") history.AppendText(TitleScreen.username + ": " + typechat.Text + Environment.NewLine); diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index 5c3d46d..1c66b45 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -13,6 +13,7 @@ namespace TimeHACK { internal static bool nightly = true; internal static string gameID; + internal static TitleScreen title = null; /// /// The main entry point for the application. @@ -43,7 +44,7 @@ namespace TimeHACK } Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new TitleScreen()); + Application.Run(title = new TitleScreen()); } } } diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 7feb510..a5cdade 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -12,6 +12,7 @@ namespace TimeHACK public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); public static Windows95 frm95; public static string username; + public static string progress = "95"; public TitleScreen() { @@ -111,15 +112,48 @@ namespace TimeHACK else { // Generate desktop with size entered by user - Windows95 frm = new Windows95(); - frm.FormBorderStyle = FormBorderStyle.None; - frm.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); - frm.FormBorderStyle = FormBorderStyle.Fixed3D; - frm.Show(); + frm95 = new Windows95(); + frm95.FormBorderStyle = FormBorderStyle.None; + frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); + frm95.FormBorderStyle = FormBorderStyle.Fixed3D; + frm95.Show(); Hide(); } } + + public void BSODRewind(object sender, EventArgs e) + { + if (progress == "95") + { + frm95.Close(); + frm95 = null; + + // If VM Mode is not enabled + if (vm_mode.Checked != true) + { + // Generate fullscreen desktop + frm95 = new Windows95(); + frm95.TopMost = true; + frm95.FormBorderStyle = FormBorderStyle.None; + frm95.WindowState = FormWindowState.Maximized; + frm95.Show(); + Hide(); + } + // If VM Mode is enabled + else + { + // Generate desktop with size entered by user + frm95 = new Windows95(); + frm95.FormBorderStyle = FormBorderStyle.None; + frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); + frm95.FormBorderStyle = FormBorderStyle.Fixed3D; + frm95.Show(); + Hide(); + } + } + } + private void NewGame_MouseEnter(object sender, EventArgs e) { NewGame.Image = Resources.MSNewGame; diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 4a6f36a..6cbffa8 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 71b6806..f410e47 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 e9c20f5..e6ec21d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - VduLlSoD7d0MBYc1ho+HDfMuZ/uzQE4he8sPzCKxwaU= + 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index b5ec3b6..06a2beb 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 420c0ed..5843c47 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - UkmrYxv85vpTsQ+6g/iPFw+8iMnrvOXqq5OzuLErkFw= + XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= - + - Y2hqc/D9+y2kNC0cEsVNkOzAx4u8XplC/WkJHwrHczE= + RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 1581c9d..4abf160 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 e9c20f5..e6ec21d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - VduLlSoD7d0MBYc1ho+HDfMuZ/uzQE4he8sPzCKxwaU= + 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 420c0ed..5843c47 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,26 +56,26 @@ - + - UkmrYxv85vpTsQ+6g/iPFw+8iMnrvOXqq5OzuLErkFw= + XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= - + - Y2hqc/D9+y2kNC0cEsVNkOzAx4u8XplC/WkJHwrHczE= + RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index b5ec3b6..06a2beb 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/bin/Release/windows_command_prompt.ttf b/TimeHACK.Main/bin/Release/windows_command_prompt.ttf new file mode 100644 index 0000000..b771b3a Binary files /dev/null and b/TimeHACK.Main/bin/Release/windows_command_prompt.ttf differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index b4da58d..8947af0 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 5f74b53..324e2c5 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 d0339c0..19903fa 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 e9c20f5..e6ec21d 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - VduLlSoD7d0MBYc1ho+HDfMuZ/uzQE4he8sPzCKxwaU= + 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index b5ec3b6..06a2beb 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 420c0ed..5843c47 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - UkmrYxv85vpTsQ+6g/iPFw+8iMnrvOXqq5OzuLErkFw= + XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= - + - Y2hqc/D9+y2kNC0cEsVNkOzAx4u8XplC/WkJHwrHczE= + RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 1581c9d..4abf160 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From be95039389999476d338e3f27ab94dad598e568e Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 14 Apr 2017 19:27:36 -0400 Subject: 12padams is removing things! --- .vs/TimeHACK/v14/.suo | Bin 96256 -> 95744 bytes TimeHACK.Engine/BSODCreator.cs | 12 +- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 164864 -> 165376 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 164864 -> 165376 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 32 ++- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx | 232 ++++++++++++++++++++- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 164864 -> 165376 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6123008 -> 6128640 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 136704 -> 136704 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 8 +- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6123008 -> 6128640 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 9300 -> 14314 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6123008 -> 6128640 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 136704 -> 136704 bytes 23 files changed, 283 insertions(+), 23 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 74e305a..903e396 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/BSODCreator.cs b/TimeHACK.Engine/BSODCreator.cs index fe19dfd..59eeb16 100644 --- a/TimeHACK.Engine/BSODCreator.cs +++ b/TimeHACK.Engine/BSODCreator.cs @@ -15,7 +15,8 @@ namespace TimeHACK.Engine public enum BSODCauses { Testing, - ExitChat98Early + WimpEnding, + PiracyEnding, } public Win9XBSOD throw9XBSOD(bool except, BSODCauses type) @@ -33,9 +34,16 @@ namespace TimeHACK.Engine case BSODCauses.Testing: bsod.textBox1.Text = "This is the testing type of BSOD. Hurrah."; break; - case BSODCauses.ExitChat98Early: + case BSODCauses.WimpEnding: bsod.textBox1.Text = "An unknown but fatal exception has occured has occured in the program \"wchat98.exe\". The current processes will be terminated."; break; + case BSODCauses.PiracyEnding: + bsod.textBox1.Text = "Vital elements of Windows were removed, but recovered. However, your data has been lost."; + bsod.BackColor = System.Drawing.Color.Black; + foreach (Control ctrl in bsod.Controls) ctrl.ForeColor = System.Drawing.Color.Silver; + bsod.label1.BackColor = System.Drawing.Color.Silver; + bsod.label1.ForeColor = System.Drawing.Color.Black; + break; default: break; } diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 6cbffa8..f5117fb 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 f410e47..100b587 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/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 6cbffa8..f5117fb 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 f410e47..100b587 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/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index afca54c..1f00286 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -31,12 +31,15 @@ namespace TimeHACK.OS.Win95.Win95Apps BSODCreator bc = new BSODCreator(); Win9XBSOD bsod = null; + Win9XBSOD bsod2 = null; public WebChat1998() { InitializeComponent(); - bsod = bc.throw9XBSOD(false, BSODCreator.BSODCauses.ExitChat98Early); + bsod = bc.throw9XBSOD(false, BSODCreator.BSODCauses.WimpEnding); + bsod2 = bc.throw9XBSOD(false, BSODCreator.BSODCauses.PiracyEnding); bsod.Hide(); + bsod2.Hide(); } private void WebChat1998_Load(object sender, EventArgs e) { @@ -50,6 +53,7 @@ namespace TimeHACK.OS.Win95.Win95Apps if (txtscreenname.Text == "") { wm.startInfobox95("Invalid Username", "Your username cannot be blank.", Properties.Resources.Win95Warning); return; } if (txtscreenname.Text.Length > 12) { wm.startInfobox95("Invalid Username", "Your username needs to be less than 12 characters.", Properties.Resources.Win95Warning); return; } if (txtscreenname.Text.Contains(" ")) { wm.startInfobox95("Invalid Username", "Your username cannot contain spaces.", Properties.Resources.Win95Warning); return; } + if (txtscreenname.Text == "SkyHigh" | txtscreenname.Text == "rain49" | txtscreenname.Text == "12padams") { wm.startInfobox95("Invalid Username", "That username is already taken.", Properties.Resources.Win95Warning); return; } ParentForm.AcceptButton = button2; TitleScreen.username = txtscreenname.Text; login.Hide(); @@ -93,12 +97,36 @@ namespace TimeHACK.OS.Win95.Win95Apps listBox1.Items.Add("12padams"); join.Play(); ((WinClassic)this.ParentForm).closeDisabled = true; + TitleScreen.frm95.startbutton.Enabled = false; + TitleScreen.frm95.startmenu.Hide(); + break; + case "nostart": + TitleScreen.frm95.startbutton.Hide(); + TitleScreen.frm95.startmenu.Hide(); + receive.Play(); + break; + case "removerain": + listBox1.Items.Remove("rain49"); + leave.Play(); + break; + case "iconsded": + TitleScreen.frm95.desktopicons.Enabled = false; + receive.Play(); + break; + case "taskbarded": + TitleScreen.frm95.taskbar.Hide(); + receive.Play(); + break; + case "iconsgone": + TitleScreen.frm95.desktopicons.Hide(); + receive.Play(); break; default: receive.Play(); break; } - Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); + if (TitleScreen.username == "devspeed") Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index) / 2; + else Chat.Interval = wcmp.GetMessageDelay(resources.GetString("convo"), chat_index); } else { diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx index 30ebbbf..6f40ce8 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.resx @@ -455,21 +455,21 @@ }, { "user": "SkyHigh", - "delay": 3000, + "delay": 2000, "message": "OH THIS IS SO COOL", "special": null, "userchat": true }, { "user": "SkyHigh", - "delay": 4000, + "delay": 3000, "message": "lemme send a screenshot", "special": null, "userchat": true }, { "user": "System", - "delay": 2000, + "delay": 1500, "message": "12padams has joined the chat.", "special": "addpadams", "userchat": true @@ -483,10 +483,234 @@ }, { "user": "SkyHigh", - "delay": 500, + "delay": 1000, "message": "ah NO WE ARE DED", "special": null, "userchat": true + }, + { + "user": "rain49", + "delay": 2500, + "message": "quick guys, LOGOUT!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 1000, + "message": "i cant! the close button isnt working!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "caught ya pirating my software!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 1500, + "message": "now that i have you, lets have some fun, shall we?", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 1500, + "message": "guys, shutdown the pc from start!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2000, + "message": "not so fast!", + "special": "nostart", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "where did the start button go?", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 2000, + "message": "12padams disabled it, CRAP!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "feeling scared yet?", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 3500, + "message": "no, cuz i can just unplug my computer!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "i wouldnt do that if i were you..", + "special": null, + "userchat": true + }, + { + "user": "rain49", + "delay": 1000, + "message": "oh yeah? just watch this!", + "special": null, + "userchat": true + }, + { + "user": "System", + "delay": 1500, + "message": "rain49 has left the chat.", + "special": "removerain", + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "all your computers are infected with a virus that makes them unable to boot.", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "and now, theres only two, SkyHigh, and @user.", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "please just let us go!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "you downloaded pirated software, so you both shall be punished!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 5000, + "message": "dont worry @user, ill look online for help!", + "special": "iconsded", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 3000, + "message": "why cant i open anything?", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4500, + "message": "i told you that you are going to be punished.", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3000, + "message": "your computers have a lethal virus that i call \"Win9X.Plague\"", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 6000, + "message": "what does it do?", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3000, + "message": "well, it disables your computers functions one by one, slowly killing it", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3000, + "message": "anyways, time to let it do its work!", + "special": null, + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 2500, + "message": "no please dont, just remove this virus!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 6000, + "message": "remove the virus, you say?", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 3500, + "message": "well the whole of windows 95 is a virus! now where do i begin...", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4500, + "message": "i see a taskbar at the bottom of the screen.", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4000, + "message": "the taskbar was made by microsoft making its debut in windows 95", + "special": "taskbarded", + "userchat": true + }, + { + "user": "SkyHigh", + "delay": 7000, + "message": "hey! give me back my taskbar!", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 4000, + "message": "you wanted me to remove viruses, didnt you? the taskbar was infected since it had no start button", + "special": null, + "userchat": true + }, + { + "user": "12padams", + "delay": 2500, + "message": "and your icons are infected too so you dont need them", + "special": "iconsgone", + "userchat": true } ] } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 6cbffa8..f5117fb 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 f410e47..100b587 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 e6ec21d..c014c7a 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= + 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 06a2beb..39b2aac 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 5843c47..8561823 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= + QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= - + - RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= + 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 4abf160..0661141 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 e6ec21d..c014c7a 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= + 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 5843c47..8561823 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,26 +56,26 @@ - + - XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= + QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= - + - RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= + 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 06a2beb..39b2aac 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 324e2c5..c01182e 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.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index d7b182d..0ae036b 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index e6ec21d..c014c7a 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= + 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 06a2beb..39b2aac 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 5843c47..8561823 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= + QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= - + - RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= + 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 4abf160..0661141 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 26a329838799fb728afcaeb76e39cc566682ff80 Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 19 Apr 2017 09:39:33 -0400 Subject: only 1 instance of ie4 allowed --- .vs/TimeHACK/v14/.suo | Bin 95744 -> 99840 bytes TimeHACK.Engine/Template/WinClassic.Designer.cs | 2 +- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 165376 -> 165376 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 165376 -> 165376 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Main/OS/Win95/Win95.cs | 54 +++++++++++++-------- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 10 ++++ TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 165376 -> 165376 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 46592 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6128640 -> 6129152 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 6 +-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 136704 -> 136704 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 6 +-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6128640 -> 6129152 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6128640 -> 6129152 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 6 +-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 136704 -> 136704 bytes 22 files changed, 58 insertions(+), 32 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs') diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index 903e396..6af1989 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Engine/Template/WinClassic.Designer.cs b/TimeHACK.Engine/Template/WinClassic.Designer.cs index 2115487..6c0026b 100644 --- a/TimeHACK.Engine/Template/WinClassic.Designer.cs +++ b/TimeHACK.Engine/Template/WinClassic.Designer.cs @@ -249,7 +249,7 @@ #endregion internal System.Windows.Forms.Panel program; - internal System.Windows.Forms.Panel programtopbar; + public System.Windows.Forms.Panel programtopbar; internal System.Windows.Forms.Label Title; internal System.Windows.Forms.PictureBox closebutton; internal System.Windows.Forms.Panel toprightcorner; diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index f5117fb..4e9a792 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 100b587..8bf7e12 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/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index f5117fb..4e9a792 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 100b587..8bf7e12 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.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 00adbdb..fd09c2b 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -1,9 +1,11 @@ using System; +using System.Collections.Generic; using System.Drawing; using System.IO; using System.Media; using System.Windows.Forms; using TimeHACK.Engine; +using TimeHACK.Engine.Template; using TimeHACK.OS.Win95.Win95Apps; using TimeHACK.WinClassicForms; @@ -15,6 +17,10 @@ namespace TimeHACK.OS.Win95 private SoundPlayer stopsound; public WindowManager wm = new WindowManager(); + public List nonimportantapps; + public WinClassic webchat; + public WinClassic ie; + public bool webchatInstalled = false; // Init the form @@ -56,14 +62,14 @@ namespace TimeHACK.OS.Win95 { this.taskbartime.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); this.ProgramsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - this.DocumentsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.SettingsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.FindToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.HelpToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.RunToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.SuspendToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.ShutdownToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.desktopicons.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.DocumentsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.SettingsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.FindToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.HelpToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.RunToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.SuspendToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.ShutdownToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + this.desktopicons.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); } #region StartMenu @@ -142,9 +148,9 @@ namespace TimeHACK.OS.Win95 private void NotePadToolStripMenuItem_Click(object sender, EventArgs e) { - Win95Notepad npad = new Win95Notepad(); - Engine.Template.WinClassic app = wm.startWin95(npad, "Notepad", Properties.Resources.Win95IconNotepad, true, true); - app.BringToFront(); + nonimportantapps.Add(wm.startWin95(new Win95Notepad(), "Notepad", Properties.Resources.Win95IconNotepad, true, true)); + nonimportantapps[nonimportantapps.Count - 1].BringToFront(); + nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing); startmenu.Hide(); } private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e) @@ -168,9 +174,10 @@ 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", (Image)resources.GetObject("InternetExplorerToolStripMenuItem.Image"), true, true); - app.BringToFront(); + if (ie != null) { wm.startInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", Properties.Resources.Win95Warning); return; } + ie = wm.startWin95(new WinClassicIE4(), "Internet Explorer 4", (Image)resources.GetObject("InternetExplorerToolStripMenuItem.Image"), true, true); + ie.BringToFront(); + ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing); startmenu.Hide(); } @@ -186,15 +193,16 @@ namespace TimeHACK.OS.Win95 { if (objListViewItem.Text == "Internet Explorer") { - WinClassicIE4 ie = new WinClassicIE4(); - Engine.Template.WinClassic app = wm.startWin95(ie, "Internet Explorer 4", (Image)resources.GetObject("InternetExplorerToolStripMenuItem.Image"), true, true); - app.BringToFront(); + if (ie != null) { wm.startInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", Properties.Resources.Win95Warning); return; } + ie = wm.startWin95(new WinClassicIE4(), "Internet Explorer 4", (Image)resources.GetObject("InternetExplorerToolStripMenuItem.Image"), true, true); + ie.BringToFront(); + ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing); startmenu.Hide(); } else if (objListViewItem.Text == "Web Chat Setup") { WinClassicInstaller inst = new WinClassicInstaller(); inst.installname.Text = "Web Chat 1998"; - Engine.Template.WinClassic app = wm.startWin95(inst, "Web Chat Setup", null, true, true); + WinClassic app = wm.startWin95(inst, "Web Chat Setup", null, true, true); app.BringToFront(); startmenu.Hide(); } @@ -209,10 +217,18 @@ namespace TimeHACK.OS.Win95 private void WebChatToolStripMenuItem_Click(object sender, EventArgs e) { WebChat1998 wc = new WebChat1998(); - Engine.Template.WinClassic app = wm.startWin95(wc, "Web Chat 1998", null, true, true); + WinClassic app = wm.startWin95(wc, "Web Chat 1998", null, true, true); app.BringToFront(); startmenu.Hide(); } + private void NonImportantApp_Closing(object sender, FormClosingEventArgs e) + { + nonimportantapps.Remove((WinClassic)sender); + } + private void InternetExplorer4_Closing(object sender, FormClosingEventArgs e) + { + ie = null; + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 1f00286..9cd4a5a 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -121,6 +121,16 @@ namespace TimeHACK.OS.Win95.Win95Apps TitleScreen.frm95.desktopicons.Hide(); receive.Play(); break; + case "bigtext": + history.Font = new Font("Arial", 12F, FontStyle.Regular, GraphicsUnit.Point, ((0))); + ((WinClassic)this.ParentForm).maximizebutton.Enabled = false; + ((WinClassic)this.ParentForm).WindowState = FormWindowState.Maximized; + receive.Play(); + break; + case "notopbar": + ((WinClassic)this.ParentForm).programtopbar = null; + receive.Play(); + break; default: receive.Play(); break; diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index f5117fb..4e9a792 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 100b587..8bf7e12 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 c014c7a..6a6fd19 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= + m2hQhqqh7hpnGU6ZgJp6yYa3C85PFgRQ1h+UlTw4lFg= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 39b2aac..f1a2a33 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 8561823..206746e 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= + W2v5olpmEdPyhq51XAzWLE5FSOI62ZDjJX87/wjXLrg= @@ -75,7 +75,7 @@ - 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= + QiXM3ckJnXanHNCl8xpurth+KTNa010j7SOgpWCwbU0= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 0661141..dfaaa66 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 c014c7a..6a6fd19 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= + m2hQhqqh7hpnGU6ZgJp6yYa3C85PFgRQ1h+UlTw4lFg= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 8561823..206746e 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= + W2v5olpmEdPyhq51XAzWLE5FSOI62ZDjJX87/wjXLrg= @@ -75,7 +75,7 @@ - 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= + QiXM3ckJnXanHNCl8xpurth+KTNa010j7SOgpWCwbU0= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 39b2aac..f1a2a33 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 c01182e..3cec800 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.application b/TimeHACK.Main/obj/Release/TimeHACK.application index c014c7a..6a6fd19 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 280QjWVlYQjCBDxeMKnZhpfLYyCD8hQ252nxOzrnKz8= + m2hQhqqh7hpnGU6ZgJp6yYa3C85PFgRQ1h+UlTw4lFg= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 39b2aac..f1a2a33 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 8561823..206746e 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - QnQUcSTfQVzISU/NuYJScvj2sxMdP7Iger7YDqQZ8+4= + W2v5olpmEdPyhq51XAzWLE5FSOI62ZDjJX87/wjXLrg= @@ -75,7 +75,7 @@ - 8lvNmgG2aw+p698BkPPiKQFjbo6S/6MYNtB4CWS1dZ8= + QiXM3ckJnXanHNCl8xpurth+KTNa010j7SOgpWCwbU0= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 0661141..dfaaa66 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3