better infoboxes

3 files changed, 18 insertions, 18 deletions

diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs
index a01d91b..b1f7957 100644
--- a/TimeHACK.Main/OS/Win98/Win98.cs
+++ b/TimeHACK.Main/OS/Win98/Win98.cs
@@ -158,7 +158,7 @@ namespace TimeHACK.OS.Win98
         // Give Year Code - NYI
         private void taskbartime_Click(object sender, EventArgs e)
         {
-            //TODO: Set Up Save System
+            
         }
 
         // Set the Clock
@@ -241,7 +241,7 @@ namespace TimeHACK.OS.Win98
 
         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; }
+            if (ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); 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();
@@ -261,7 +261,7 @@ namespace TimeHACK.OS.Win98
                 {
                     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; }
+                        if (ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); 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();
@@ -287,15 +287,15 @@ namespace TimeHACK.OS.Win98
                     }
                     else if (objListViewItem.Text == "Set Up The Microsoft Network")
                     {
-                        wm.StartInfobox95("Microsoft Network", "The Microsoft Network is already set up!", Properties.Resources.Win95Info);
+                        wm.StartInfobox95("Microsoft Network", "The Microsoft Network is already set up!", InfoboxType.Info, InfoboxButtons.OK);
                     }
                     else if (objListViewItem.Text == "Outlook Express")
                     {
-                        wm.StartInfobox95("Win32 Application", "That is not a valid Win32 Application.", Properties.Resources.Win95Error);
+                        //wm.StartInfobox95("Win32 Application", "That is not a valid Win32 Application.", Properties.Resources.Win95Error);
                     }
                     else if (objListViewItem.Text == "Inbox")
                     {
-                        wm.StartInfobox95("Win32 Application", "That is not a valid Win32 Application.", Properties.Resources.Win95Error);
+                        //wm.StartInfobox95("Win32 Application", "That is not a valid Win32 Application.", Properties.Resources.Win95Error);
                     }
                     else
                     {
@@ -328,7 +328,7 @@ namespace TimeHACK.OS.Win98
 
         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, InfoboxType type, InfoboxButtons btns)!", InfoboxType.Info, InfoboxButtons.OK);
 
             app.BringToFront();
             startmenu.Hide();
@@ -560,13 +560,13 @@ namespace TimeHACK.OS.Win98
                             }
                             else
                             {
-                                wm.StartInfobox95("Windows Explorer", "This object cannot be deleted.", Properties.Resources.Win95Error);
+                                wm.StartInfobox95("Windows Explorer", "This object cannot be deleted.", InfoboxType.Error, InfoboxButtons.OK);
                             }
                         }
                     }
                     else
                     {
-                        wm.StartInfobox95("Windows Explorer", "This object cannot be deleted.", Properties.Resources.Win95Error);
+                        wm.StartInfobox95("Windows Explorer", "This object cannot be deleted.", InfoboxType.Error, InfoboxButtons.OK);
                     }
                 }
             }
diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs
index 95ee509..18cfcf9 100644
--- a/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs
+++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs
@@ -133,7 +133,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                 }
                 else
                 {
-                    wm.StartInfobox95("Address Book - New Folder", "You must enter a folder name!", Properties.Resources.Win95Error);
+                    wm.StartInfobox95("Address Book - New Folder", "You must enter a folder name!", InfoboxType.Error, InfoboxButtons.OK);
                 }
             }
         }
diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
index 5f1f131..f21a851 100644
--- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
+++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs
@@ -195,7 +195,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                     }
                 }
             } catch (Exception ex) {
-                wm.StartInfobox95("Exploring - C:", "Error with the file explorer \n" + ex.Message, Properties.Resources.Win95Info);
+                //wm.StartInfobox95("Exploring - C:", "Error with the file explorer \n" + ex.Message, Properties.Resources.Win95Info); add illegal operation dialog here later
                 ((Form)this.TopLevelControl).Close();
             }
         }
@@ -287,7 +287,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
 
                     break;
                 case "iebrokeninstaller":
-                    wm.StartInfobox95("Internet Explorer Installation", "Installation Failed: The INF file was not found", Properties.Resources.Win95Error);
+                    wm.StartInfobox95("Internet Explorer Installer", "Installation Failed: The INF file was not found", InfoboxType.Error, InfoboxButtons.OK);
 
                     break;
                 case "addressbook":
@@ -674,7 +674,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
         private void FolderToolStripMenuItem_Click(object sender, EventArgs e)
         {
             if (File.Exists(CurrentDirectory + "\\New Folder")) {
-                wm.StartInfobox95("Windows Explorer", "This directory already exists", Properties.Resources.Win95Info);
+                wm.StartInfobox95("Windows Explorer", "This directory already exists", InfoboxType.Info, InfoboxButtons.OK);
             } else {
                 Directory.CreateDirectory(Path.Combine(CurrentDirectory, "New Folder"));
                 SaveDirectoryInfo(CurrentDirectory, "New Folder", false, "New Folder", true);
@@ -703,7 +703,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
                 {
                     if (txtSave.Text == "")
                     {
-                        wm.StartInfobox95("Windows Explorer", "Please enter a filename", Properties.Resources.Win95Info);
+                        wm.StartInfobox95("Windows Explorer", "Please enter a filename", InfoboxType.Info, InfoboxButtons.OK);
                     }
                     else
                     {
@@ -732,7 +732,7 @@ namespace TimeHACK.OS.Win95.Win95Apps
             {
                 if (!FileOrDirectoryExists(mainView.FocusedItem.ImageKey))
                 {
-                    wm.StartInfobox95("Windows Explorer", "This directory doesn't exist", Properties.Resources.Win95Info);
+                    wm.StartInfobox95("Windows Explorer", "This directory doesn't exist", InfoboxType.Info, InfoboxButtons.OK);
                 }
                 else
                 {
@@ -785,19 +785,19 @@ namespace TimeHACK.OS.Win95.Win95Apps
                 setText = e.Label;
                 if (setText == "")
                 {
-                    wm.StartInfobox95("Windows Explorer", "Please enter a new directory name", Properties.Resources.Win95Info);
+                    wm.StartInfobox95("Windows Explorer", "Please enter a new directory name", InfoboxType.Info, InfoboxButtons.OK);
                 }
                 else
                 {
                     if (Directory.Exists(setText))
                     {
-                        wm.StartInfobox95("Windows Explorer", "That directory already exists.", Properties.Resources.Win95Info);
+                        wm.StartInfobox95("Windows Explorer", "That directory already exists.", InfoboxType.Info, InfoboxButtons.OK);
                     }
                     else
                     {
                         if (File.Exists(setText))
                         {
-                            wm.StartInfobox95("Windows Explorer", "That file already exists.", Properties.Resources.Win95Info);
+                            wm.StartInfobox95("Windows Explorer", "That file already exists.", InfoboxType.Info, InfoboxButtons.OK);
                         }
                         else
                         {