Added lots of features to WinClassicTerminal.cs

-Added CMD redirection
-Added menubar that was missing
-And more (look at the source :P)

9 files changed, 29 insertions, 23 deletions

diff --git a/TimeHACK.Main/OS/BaseOS.Designer.cs b/TimeHACK.Main/OS/BaseOS.Designer.cs
index f8f9efa..cf9bd34 100644
--- a/TimeHACK.Main/OS/BaseOS.Designer.cs
+++ b/TimeHACK.Main/OS/BaseOS.Designer.cs
@@ -244,7 +244,7 @@ namespace TimeHACK.OS.Win95
             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(145, 292);
+            this.startmenuitems.Size = new System.Drawing.Size(145, 311);
             this.startmenuitems.TabIndex = 0;
             this.startmenuitems.Text = "StartMenu";
             // 
@@ -644,6 +644,7 @@ namespace TimeHACK.OS.Win95
             this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1";
             this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(181, 28);
             this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt";
+            this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click);
             // 
             // OutlookExpressToolStripMenuItem
             // 
diff --git a/TimeHACK.Main/OS/BaseOS.cs b/TimeHACK.Main/OS/BaseOS.cs
index a449d81..77fca89 100644
--- a/TimeHACK.Main/OS/BaseOS.cs
+++ b/TimeHACK.Main/OS/BaseOS.cs
@@ -149,7 +149,7 @@ namespace TimeHACK.OS.Win95
         private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
             TestApp test = new TestApp();
-            WinClassic app = wm.startWin95(test, "TestApp", null, true, true);
+            WinClassic app = wm.StartWin95(test, "TestApp", null, true, true);
             AddTaskBarItem(app, app.Tag.ToString(), "TestApp", null);
             app.BringToFront();
             startmenu.Hide();
@@ -158,7 +158,7 @@ namespace TimeHACK.OS.Win95
         private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WinClassicDownloader opendownload = new WinClassicDownloader();
-            WinClassic app = wm.startWin95(opendownload, "Downloader", null, false, true);
+            WinClassic app = wm.StartWin95(opendownload, "Downloader", null, false, true);
             opendownload.appName.Text = "Downloading: Survive The Day";
 
             AddTaskBarItem(app, app.Tag.ToString(), "Downloader", null);
@@ -170,7 +170,7 @@ namespace TimeHACK.OS.Win95
         private void installerTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WinClassicInstaller openinstaller = new WinClassicInstaller();
-            WinClassic app = wm.startWin95(openinstaller, "Installer", null, false, true);
+            WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true);
 
             AddTaskBarItem(app, app.Tag.ToString(), "Installer", null);
 
@@ -211,7 +211,7 @@ namespace TimeHACK.OS.Win95
 
         private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            WinClassic app = 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, Image erroricon)!", Properties.Resources.Win95Info);
+            WinClassic app = 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, Image erroricon)!", Properties.Resources.Win95Info);
 
             app.BringToFront();
             startmenu.Hide();
@@ -219,7 +219,7 @@ namespace TimeHACK.OS.Win95
         private void WebChatToolStripMenuItem_Click(object sender, EventArgs e)
         {
             WebChat1998 wc = new WebChat1998();
-            WinClassic app = wm.startWin95(wc, "Web Chat 1998", null, true, true);
+            WinClassic app = wm.StartWin95(wc, "Web Chat 1998", null, true, true);
 
             AddTaskBarItem(app, app.Tag.ToString(), "Web Chat 1998", null);
 
@@ -290,6 +290,11 @@ namespace TimeHACK.OS.Win95
             startmenu.Hide();
         }
 
+        private void MSDOSPromptToolStripMenuItem1_Click(object sender, EventArgs e)
+        {
+            openApp.OpenApp("msdos");
+        }
+
         //TODO: Add Outlook Express 4
     }
 }
diff --git a/TimeHACK.Main/OS/BaseOS.resx b/TimeHACK.Main/OS/BaseOS.resx
index 8e963f9..5623a5d 100644
--- a/TimeHACK.Main/OS/BaseOS.resx
+++ b/TimeHACK.Main/OS/BaseOS.resx
@@ -407,7 +407,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
-        ggAAAk1TRnQBSQFMAgEBDAEAAXABAQFwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        ggAAAk1TRnQBSQFMAgEBDAEAAXgBAQF4AQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
         AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A
         /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index 6a443dd..c1b8601 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -109,7 +109,7 @@ namespace TimeHACK.OS.Win95
         private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e)

         {

             TestApp test = new TestApp();

-            WinClassic app = wm.startWin95(test, "TestApp", null, true, true);

+            WinClassic app = wm.StartWin95(test, "TestApp", null, true, true);

             AddTaskBarItem(app, app.Tag.ToString(), "TestApp", null);

             app.BringToFront();

             startmenu.Hide();

@@ -118,7 +118,7 @@ namespace TimeHACK.OS.Win95
         private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e)

         {

             WinClassicDownloader opendownload = new WinClassicDownloader();

-            WinClassic app = wm.startWin95(opendownload, "Downloader", null, false, true);

+            WinClassic app = wm.StartWin95(opendownload, "Downloader", null, false, true);

             opendownload.appName.Text = "Downloading: Survive The Day";

 

             AddTaskBarItem(app, app.Tag.ToString(), "Downloader", null);

@@ -130,7 +130,7 @@ namespace TimeHACK.OS.Win95
         private void installerTestToolStripMenuItem_Click(object sender, EventArgs e)

         {

             WinClassicInstaller openinstaller = new WinClassicInstaller();

-            WinClassic app = wm.startWin95(openinstaller, "Installer", null, false, true);

+            WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true);

 

             AddTaskBarItem(app, app.Tag.ToString(), "Installer", null);

 

@@ -145,7 +145,7 @@ namespace TimeHACK.OS.Win95
 

         private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e)

         {

-            WinClassic app = 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, Image erroricon)!", Properties.Resources.Win95Info);

+            WinClassic app = 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, Image erroricon)!", Properties.Resources.Win95Info);

 

             app.BringToFront();

             startmenu.Hide();

@@ -153,7 +153,7 @@ namespace TimeHACK.OS.Win95
         private void WebChatToolStripMenuItem_Click(object sender, EventArgs e)

         {

             WebChat1998 wc = new WebChat1998();

-            WinClassic app = wm.startWin95(wc, "Web Chat 1998", null, true, true);

+            WinClassic app = wm.StartWin95(wc, "Web Chat 1998", null, true, true);

 

             AddTaskBarItem(app, app.Tag.ToString(), "Web Chat 1998", null);

 

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
index 4c76a77..a743636 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -26,7 +26,7 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story
             System.Windows.Forms.Timer tmr = new System.Windows.Forms.Timer();
 
             WinClassicTerminal Console = new WinClassicTerminal();
-            WinClassic app = wm.startWin95(Console, "MS-DOS Prompt", null, true, true);
+            WinClassic app = wm.StartWin95(Console, "MS-DOS Prompt", null, true, true);
 
             Console.WriteLine("telnet> 104.27.135.159 Connecting...");          
 
@@ -51,7 +51,7 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story
         public static void continueObjective()
         {
             WinClassicTerminal Console = new WinClassicTerminal();
-            wm.startWin95(Console, "MS-DOS Prompt", null, true, true);
+            wm.StartWin95(Console, "MS-DOS Prompt", null, true, true);
 
             Application.DoEvents();
 
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs
index f3d8dde..8fcc79c 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.Designer.cs
@@ -202,7 +202,7 @@
             this.button1.Text = "Login";
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.Button1_Click);
-            this.button1.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2);
+            this.button1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             // 
             // txtscreenname
             // 
@@ -241,7 +241,7 @@
             this.button2.Text = "Speak";
             this.button2.UseVisualStyleBackColor = true;
             this.button2.Click += new System.EventHandler(this.Button2_Click);
-            this.button2.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2);
+            this.button2.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             // 
             // button3
             // 
@@ -254,7 +254,7 @@
             this.button3.Text = "Paul";
             this.button3.UseVisualStyleBackColor = true;
             this.button3.Click += new System.EventHandler(this.Button3_Click);
-            this.button3.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2);
+            this.button3.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             // 
             // button4
             // 
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
index 5c18285..8af7099 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs
@@ -52,10 +52,10 @@ namespace TimeHACK.OS.Win95.Win95Apps
         }

         private void Button1_Click(object sender, EventArgs e)

         {

-            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; }

+            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();

diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
index e3423a8..57bff66 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs
@@ -123,7 +123,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         {
             WinClassicDownloader opendownload = new WinClassicDownloader();
             WindowManager wm = new WindowManager();
-            wm.startWin95(opendownload, "Downloader", null, false, true);
+            wm.StartWin95(opendownload, "Downloader", null, false, true);
             opendownload.appName.Text = "Downloading: Web Chat";
         } 
 
diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs
index d1f66dd..681617f 100644
--- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs
+++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs
@@ -177,7 +177,7 @@
             this.startmenu.Name = "startmenu";
             this.startmenu.Size = new System.Drawing.Size(174, 300);
             this.startmenu.TabIndex = 4;
-            this.startmenu.Paint += (sender, args) => Engine.Paintbrush.paintClassicBorders(sender, args, 2);
+            this.startmenu.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2);
             // 
             // startmenuitems
             //