Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'

1 files changed, 14 insertions, 199 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index a991a00..c1b8601 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -10,15 +10,16 @@ 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

 {

-    public partial class Windows95 : Form

+    public partial class Windows95 : BaseOS

     {

         private SoundPlayer startsound;

+        private SoundPlayer stopsound;

         public WindowManager wm = new WindowManager();

 

-        public List<WinClassic> nonimportantapps = new List<WinClassic>();

         public WinClassic webchat;

         public WinClassic ie;

         public TaskBarController tb = new TaskBarController();

@@ -38,6 +39,9 @@ namespace TimeHACK.OS.Win95
         //  When New Game is clicked in TitleScreen.cs

         private void Desktop_Load(object sender, EventArgs e)

         {

+            // Setup the Form

+            startmenu.Hide();

+

             // Make Font Mandatory

             fontLoad();

 

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

             startsound.Play();

 

-            // Hide the Startmenu

-            startmenu.Hide();

-

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

-

-            //nonimportantapps.Capacity = 100;

-            this.SendToBack();

+            //Program.nonimportantapps.Capacity = 100;

 

             // Update the taskbar

             UpdateTaskbar();

@@ -87,40 +75,8 @@ namespace TimeHACK.OS.Win95
 

         #region StartMenu

 

-        // StartButton Click

-        private void startbutton_Click(object sender, EventArgs e)

-        {

-            startmenu.Show();

-            startmenu.BringToFront();

-            if (taskbar.Visible) taskbar.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)

         {

@@ -146,21 +102,14 @@ 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");

 

-            nonimportantapps.Add(app);

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

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

-

-            app.BringToFront();

             startmenu.Hide();

         }

         private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e)

         {

             TestApp test = new TestApp();

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

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

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

             app.BringToFront();

             startmenu.Hide();

@@ -169,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);

@@ -181,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);

 

@@ -191,48 +140,12 @@ 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)

         {

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

@@ -240,117 +153,19 @@ 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);

 

             app.BringToFront();

             startmenu.Hide();

         }

-        public void NonImportantApp_Closing(object sender, FormClosingEventArgs e)

-        {

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

-

-            nonimportantapps.Add(app);

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

-            nonimportantapps[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);

-

-            nonimportantapps.Add(app);

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

-            nonimportantapps[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);

-

-            nonimportantapps.Add(app);

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

-            nonimportantapps[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);

-

-            nonimportantapps.Add(app);

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

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

-

-            app.BringToFront();

-            startmenu.Hide();

-        }

-

         //TODO: Add Outlook Express 4

     }

 }