Made code neater and fixed Address Book bugs!

1 files changed, 30 insertions, 169 deletions

diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
index 8f946ab..4efdd6f 100644
--- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
+++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs
@@ -397,228 +397,89 @@ namespace Histacom2.OS.Win95.Win95Apps
             }
         }
 
-        string ReturnType(string extension) {
-            string returnVal = "File";
-            fileType = 0;
+        int ReturnType(string extension) {
             switch (extension) {
                 case ".txt":
-                    fileType = 1;
-                    returnVal = "Text Document \n createtext";
-                    break;
-                case ".dat":
-                    fileType = 1;
-                    returnVal = "Text Document \n createtext";
-                    break;
-                case ".rtf":
-                    fileType = 2;
-                    returnVal = "Rich Text Document \n createtext";
-                    break;
                 case ".cfg":
-                    fileType = 1;
-                    returnVal = "Config file \n createtext";
-                    break;
                 case ".log":
-                    fileType = 1;
-                    returnVal = "log text file \n createtext";
-                    break;
                 case ".ini":
-                    fileType = 1;
-                    returnVal = "initialization \n createtext";
-                    break;
                 case ".properties":
-                    fileType = 1;
-                    returnVal = "Config file \n createtext";
-                    break;
                 case ".json":
-                    fileType = 1;
-                    returnVal = "Config file \n createtext";
-                    break;
+                case ".dat":
+                    return 1;
+
+                case ".rtf":
+                    return 2;      
+                    
                 case ".doc":
-                    fileType = 3;
-                    returnVal = "Word Document \n word";
-                    break;
+                    return 3;
                 case ".docm":
-                    fileType = 3;
-                    returnVal = "Macro-Enabled Word Document \n word";
-                    break;
+                    return 3;
                 case ".xls":
-                    fileType = 4;
-                    returnVal = "Excel Spreadsheets \n excel";
-                    break;
+                    return 4;
                 case ".ppt":
-                    fileType = 5;
-                    returnVal = "Powerpoint Presentation \n powerpoint";
-                    break;
+                    return 5;
                 case ".pub":
-                    fileType = 7;
-                    returnVal = "Publisher Document \n powerpoint";
-                    break;
+                    return 7;
                 case ".xps":
-                    fileType = 8;
-                    returnVal = "XPS Document \n xpsview";
-                    break;
+                    return 8;
                 case ".htm":
-                    fileType = 9;
-                    returnVal = "HTML web page \n html";
-                    break;
+                    return 9;
                 case ".html":
-                    fileType = 9;
-                    returnVal = "HTML web page \n html";
-                    break;
+                    return 9;
                 case ".wps":
-                    fileType = 10;
-                    returnVal = "Works document \n works";
-                    break;
+                    return 10; 
                 case ".wmf":
-                    fileType = 11;
-                    returnVal = "Windows Metafile (A picture) \n createart";
-                    break;
                 case ".emf":
-                    fileType = 11;
-                    returnVal = "Enhanced Metafile (A picture) \n createart";
-                    break;
                 case ".png":
-                    fileType = 11;
-                    returnVal = "Picture file (Portable Network Graphics) \n createart";
-                    break;
                 case ".jpg":
-                    fileType = 11;
-                    returnVal = "Picture file \n createart";
-                    break;
                 case ".jpeg":
-                    fileType = 11;
-                    returnVal = "Picture file \n createart";
-                    break;
                 case ".gif":
-                    fileType = 12;
-                    returnVal = "Picture file \n gifman";
-                    break;
                 case ".tif":
-                    fileType = 11;
-                    returnVal = "Picture file \n createart";
-                    break;
                 case ".bmp":
-                    fileType = 11;
-                    returnVal = "Picture file \n createart";
-                    break;
                 case ".zip":
-                    fileType = 11;
-                    returnVal = "Compressed ZIP file \n winrar";
-                    break;
+                    return 11;
+
                 case ".exe":
-                    fileType = 12;
-                    returnVal = "Program \n exe";
-                    break;
-                case ".avi":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
+                    return 12;
+                case ".avi":              
                 case ".m4v":
-                    fileType = 15;
-                    returnVal = "Video (MPEG-4) \n video";
-                    break;
                 case ".mp4":
-                    fileType = 15;
-                    returnVal = "Video (MPEG-4) \n video";
-                    break;
                 case ".wmv":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".m2v":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".m3u":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".mts":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".dv":
-                    fileType = 15;
-                    returnVal = "Video (Digital Video) \n video";
-                    break;
                 case ".flv":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".m1v":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".m2ts":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".mkv":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".mov":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".mpeg4":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".mpeg":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".mpg":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".3gp":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
                 case ".m4p":
-                    fileType = 15;
-                    returnVal = "Video \n video";
-                    break;
+                    return 15;
+
                 case ".mp2":
-                    fileType = 21;
-                    returnVal = "Audio \n video";
-                    break;
                 case ".mp3":
-                    fileType = 21;
-                    returnVal = "Audio \n video";
-                    break;
                 case ".wav":
-                    fileType = 21;
-                    returnVal = "Audio \n video";
-                    break;
+                    return 21;
                 case ".nls":
-                    fileType = 16;
-                    returnVal = "Font file \n font";
-                    break;
+                    return 16;
                 case ".dll":
-                    fileType = 17;
-                    returnVal = "System File \n sys";
-                    break;
+                    return 17;
                 case ".bat":
-                    fileType = 18;
-                    returnVal = "MS-DOS Batch File \n winterm";
-                    break;
+                    return 18;
                 case ".url":
-                    fileType = 19;
-                    returnVal = "Shortcut \n short";
-                    break;
+                    return 19;
                 case ".sh":
-                    fileType = 20;
-                    returnVal = "BASH file \n winterm";
-                    break;
+                    return 20;
                 case ".win":
-                    fileType = 17;
-                    returnVal = "System file \n sys";
-                    break;
+                    return 17;
             }
-            return returnVal;
+            return 0;
         }
 
     //Private Sub windows_explorer_Closed(sender As Object, e As EventArgs) Handles Me.Closed