Moar stuff

4 files changed, 67 insertions, 213 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
index 0266773..f238b70 100644
--- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs
@@ -30,23 +30,60 @@ namespace TimeHACK.OS.Win95
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows95));
+            this.panel1.SuspendLayout();
+            this.taskbar.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit();
+            this.startmenu.SuspendLayout();
+            this.ossidestartmenu.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.osimage)).BeginInit();
+            this.clockPanel.SuspendLayout();
             this.SuspendLayout();
             // 
+            // clockTimer
+            // 
+            this.clockTimer.Enabled = true;
+            // 
+            // desktopImages
+            // 
+            this.desktopImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("desktopImages.ImageStream")));
+            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");
+            // 
             // Windows95
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Teal;
             this.ClientSize = new System.Drawing.Size(640, 480);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "Windows95";
-            this.Tag = "ignoreFormOnTaskbar";
-            this.Text = "TimeHACKDesktop";
             this.Load += new System.EventHandler(this.Desktop_Load);
+            this.Controls.SetChildIndex(this.desktopicons, 0);
+            this.Controls.SetChildIndex(this.panel1, 0);
+            this.Controls.SetChildIndex(this.startmenu, 0);
+            this.Controls.SetChildIndex(this.taskbar, 0);
+            this.panel1.ResumeLayout(false);
+            this.taskbar.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit();
+            this.startmenu.ResumeLayout(false);
+            this.startmenu.PerformLayout();
+            this.ossidestartmenu.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.osimage)).EndInit();
+            this.clockPanel.ResumeLayout(false);
+            this.clockPanel.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index 53628e4..6a443dd 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -10,6 +10,7 @@ using TimeHACK.Engine.Template.Taskbars;
 using TimeHACK.OS.Win95.Win95Apps;

 using TimeHACK.WinClassicForms;

 using TimeHACK.OS.Win95.Win95Apps.Story;

+using TimeHACK.OS;

 

 namespace TimeHACK.OS.Win95

 {

@@ -49,22 +50,7 @@ namespace TimeHACK.OS.Win95
             startsound = new SoundPlayer(audio);

             startsound.Play();

 

-            

-

-            // Check for and set VM Mode

-            if (this.FormBorderStyle != FormBorderStyle.None)

-            {

-                this.Text = "TimeHACK - VM Mode";

-            }

-

-            // Start the ClockTimer

-            clockTimer.Start();

-

-            // Set the StartMenu seperator

-            startmenuitems.Items.Insert(6, new ToolStripSeparator());

-

             //Program.nonimportantapps.Capacity = 100;

-            this.SendToBack();

 

             // Update the taskbar

             UpdateTaskbar();

@@ -89,50 +75,8 @@ namespace TimeHACK.OS.Win95
 

         #region StartMenu

 

-        // Paint StartMenu

-        private void startmenu_Paint(object sender, PaintEventArgs e)

-        {

-            // Paint the StartMenu

-            ControlPaint.DrawBorder(e.Graphics, startmenu.ClientRectangle,

-                SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset,

-                SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset,

-                SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset,

-                SystemColors.ControlLightLight, 2, ButtonBorderStyle.Outset);

-        }

-

-        // StartButton Click

-        private void startbutton_Click(object sender, EventArgs e)

-        {

-            startmenu.Show();

-            startmenu.BringToFront();

-        }

-

-        // Shutdown button

-        private void ShutdownToolStripMenuItem_Click(object sender, EventArgs e)

-        {

-            Program.ShutdownApplication(Properties.Resources.tada);

-        }

-

         #endregion //Region

 

-        // When add new folder is clicked

-        private void FolderToolStripMenuItem_Click(object sender, EventArgs e)

-        {

-            desktopicons.Items.Add("New Folder");

-        }

-

-        // Give Year Code - NYI

-        private void taskbartime_Click(object sender, EventArgs e)

-        {

-            //TODO: Set Up Save System

-        }

-

-        // Set the Clock

-        private void clockTimer_Tick(object sender, EventArgs e)

-        {

-            taskbartime.Text = DateTime.Now.ToString("h:mm tt");

-        }

-

         // On Desktop MouseDown

         private void desktop_mousedown(object sender, MouseEventArgs e)

         {

@@ -158,15 +102,8 @@ namespace TimeHACK.OS.Win95
 

         private void NotePadToolStripMenuItem_Click(object sender, EventArgs e)

         {

-            WinClassicNotepad wp = new WinClassicNotepad();

-            WinClassic app = wm.startWin95(wp, "Notepad", Properties.Resources.Win95IconNotepad, true, true);

-            AddTaskBarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad);

+            openApp.OpenApp("notepad");

 

-            Program.nonimportantapps.Add(app);

-            Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront();

-            Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);

-

-            app.BringToFront();

             startmenu.Hide();

         }

         private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e)

@@ -203,43 +140,7 @@ namespace TimeHACK.OS.Win95
 

         private void InternetExplorerToolStripMenuItem_Click(object sender, EventArgs e)

         {

-            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", Properties.Resources.Win95IconIE4, true, true);

-            AddTaskBarItem(ie, ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4);

-            ie.BringToFront();

-            ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing);

-            startmenu.Hide();

-        }

-

-        private void desktopicons_Click(object sender, EventArgs e)

-        {

-            Point objDrawingPoint = desktopicons.PointToClient(Cursor.Position);

-            ListViewItem objListViewItem;

-

-            if (objDrawingPoint != null)

-            {

-                objListViewItem = desktopicons.GetItemAt(objDrawingPoint.X, objDrawingPoint.Y);

-                if (objListViewItem != null)

-                {

-                    if (objListViewItem.Text == "Internet Explorer")

-                    {

-                        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", Properties.Resources.Win95IconIE4, true, true);

-                        AddTaskBarItem(ie, ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4);

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

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

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

-                        app.BringToFront();

-                        startmenu.Hide();

-                    }

-                }

-            }

+            openApp.OpenApp("ie4");

         }

 

         private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e)

@@ -259,110 +160,12 @@ namespace TimeHACK.OS.Win95
             app.BringToFront();

             startmenu.Hide();

         }

-        public void NonImportantApp_Closing(object sender, FormClosingEventArgs e)

-        {

-            Program.nonimportantapps.Remove((WinClassic)sender);

-        }

-        private void InternetExplorer4_Closing(object sender, FormClosingEventArgs e)

-        {

-            ie = null;

-        }

-

-        private void WordPadToolStripMenuItem_Click(object sender, EventArgs e)

-        {

-            WinClassicWordPad wp = new WinClassicWordPad();

-            WinClassic app = wm.startWin95(wp, "Wordpad", Properties.Resources.Win95IconWordpad, true, true);

-            AddTaskBarItem(app, app.Tag.ToString(), "Wordpad", Properties.Resources.Win95IconWordpad);

-

-            Program.nonimportantapps.Add(app);

-            Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront();

-            Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);

-

-            app.BringToFront();

-            startmenu.Hide();

-        }

-

-        public void AddTaskBarItem(Form Application, string ApplicationID, string ApplicationName, Image ApplicationIcon)

-        {

-            taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Win95TaskBarItem(), taskbarItems);

-            Application.FormClosed += new FormClosedEventHandler(UpdateTaskbarFromClosedApplication);

-        }

-

-        public void UpdateTaskbarFromClosedApplication(object sender, FormClosedEventArgs e)

-        {

-            UpdateTaskbar();

-        }

-

-        public void UpdateTaskbar()

-        {

-            // Clears out all the items on the taskbar

-            taskbarItems.Controls.Clear();

-

-            // Loops through all the Applications which are open

-

-            foreach (Form form in tb.GetAllOpenApps()) 

-            {

-                // Calls that "AddToTaskbar" thing

-                taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), (Image)form.Icon.ToBitmap(), (UserControl)new Win95TaskBarItem(), taskbarItems);                

-            }

-        }

-

-        private void AddressBookToolStripMenuItem_Click(object sender, EventArgs e)

-        {

-            WinClassicAddressBook ab = new WinClassicAddressBook();

-            WinClassic app = wm.startWin95(ab, "Address Book", Properties.Resources.WinClassicAddressBook, true, true);

-            AddTaskBarItem(app, app.Tag.ToString(), "Address Book", Properties.Resources.WinClassicAddressBook);

-

-            Program.nonimportantapps.Add(app);

-            Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront();

-            Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);

-

-            app.BringToFront();

-            startmenu.Hide();

-        }

-

-        private void WindowsExplorerToolStripMenuItem1_Click(object sender, EventArgs e)

-        {

-            FileDialogBoxManager.IsInOpenDialog = false;

-            FileDialogBoxManager.IsInSaveDialog = false;

-            WinClassicWindowsExplorer we = new WinClassicWindowsExplorer();

-            WinClassic app = wm.startWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true);

-            AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer);

-

-            Program.nonimportantapps.Add(app);

-            Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront();

-            Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);

-

-            app.BringToFront();

-            startmenu.Hide();

-        }

 

         private void storyTest1ToolStripMenuItem_Click(object sender, EventArgs e)

         {

             Hack1.startObjective();

         }

 

-        private void temp_for_std(object sender, EventArgs e)

-        {

-            System.Threading.Thread thread = new System.Threading.Thread(StartSurviveTheDay);

-

-            thread.Start();

-        }

-

-        void StartSurviveTheDay()

-        {

-            Win2K.Win2KApps.SurviveTheDay std = new Win2K.Win2KApps.SurviveTheDay();

-            WinClassic app = wm.startWin95(std, "Survive The Day", null, false, false);

-            AddTaskBarItem(app, app.Tag.ToString(), "Survive The Day", null);

-

-            Program.nonimportantapps.Add(app);

-            Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront();

-            Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);

-

-            app.BringToFront();

-            startmenu.Hide();

-        }

-

         //TODO: Add Outlook Express 4

     }

 }

diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx
index 3b8f414..d9d5bd0 100644
--- a/TimeHACK.Main/OS/Win95/Win95.resx
+++ b/TimeHACK.Main/OS/Win95/Win95.resx
@@ -127,8 +127,8 @@
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq
-        ggAAAk1TRnQBSQFMAgEBDAEAAXABAQFwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADs
+        ggAAAk1TRnQBSQFMAgEBDAEAAXABAQF4AQEBIAEAASABAAT/ASEBEAj/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/
@@ -686,12 +686,9 @@
         AeABAwHwAwAB/gIAAQcEAAHwAgABAwH4AgABAQH+AgABBwQAAfgCAAEHAfgCAAEBAf4CAAEHBAAB/AIA
         AQcB/AIAAQMB/gIAAQcDAAEBAf4CAAEOAfwCAAEDAf4CAAEHAYABAAP/AgABHgH8AgABBwH+AgABBwHA
         AQED/wHAAQABfgH8AgABDwH+AgABBwHgAQMD/wH4AQEB/gH8AgABHwH/AgABBwHwAQcE/wHhAvwCAAE/
-        Af8BgAEAAQcG/wH8AXkB/wIAAv8BwAEAAQ8H/wEDAf8BxAEDAf8L
+        Af8BgAEAAQcG/wH8AXkB/wIAAv8BwAEAAQ8H/wEDAf8BxAEDAf8WAAs=
 </value>
   </data>
-  <metadata name="rightclickbackproperties.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>398, 17</value>
-  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>63</value>
   </metadata>
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
index 38962fe..4c76a77 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs
@@ -9,12 +9,12 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using TimeHACK.Engine;
+using TimeHACK.Engine.Template;
 
 namespace TimeHACK.OS.Win95.Win95Apps.Story
 {
     static class Hack1 : Object
     {
-        static WinClassicTerminal Console = new WinClassicTerminal();
         static WindowManager wm = new WindowManager();
         static Boolean ended = false;
         static Thread soundThread = new Thread(dialup_sound_play);
@@ -25,7 +25,9 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story
         {
             System.Windows.Forms.Timer tmr = new System.Windows.Forms.Timer();
 
-            wm.startWin95(Console, "MS-DOS Prompt", null, true, true);
+            WinClassicTerminal Console = new WinClassicTerminal();
+            WinClassic app = wm.startWin95(Console, "MS-DOS Prompt", null, true, true);
+
             Console.WriteLine("telnet> 104.27.135.159 Connecting...");          
 
             tmr.Interval = 1;
@@ -33,7 +35,11 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story
 
             if (devMode == true)
             {
-                continueObjective();
+                Thread contObjective = new Thread(continueObjective);
+
+                app.Close();
+
+                contObjective.Start();
             }
             else
             {
@@ -44,6 +50,11 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story
 
         public static void continueObjective()
         {
+            WinClassicTerminal Console = new WinClassicTerminal();
+            wm.startWin95(Console, "MS-DOS Prompt", null, true, true);
+
+            Application.DoEvents();
+
             Console.WriteLine("\ntelnet> 104.27.135.159 Connected.");
             Thread.Sleep(2500);
             Console.WriteLine("\ntelnet> 104.27.135.159 set hostname to 'TheHiddenHacker'.");
@@ -65,6 +76,12 @@ namespace TimeHACK.OS.Win95.Win95Apps.Story
             Console.WriteLine("\nTheHiddenHacker> The hostname is 172.68.119.42, and the username is most likely 12padams. I'm not too sure what the password is, however.");
             Thread.Sleep(3500);
             Console.WriteLine("\nTheHiddenHacker> You'll need to figure out where you can get the password. Try looking for any odd text on the website.");
+            Thread.Sleep(1000);
+            Console.WriteLine("\nTheHiddenHacker> I don't have much time to talk - I'd quickly copy down those details into Notepad before this Terminal gets closed.");
+
+            Application.DoEvents();
+
+            Thread.Sleep(36000);
         }
         
         public static void CheckIfSoundFinished(Object sender, EventArgs e)