new installer prototype

2 files changed, 18 insertions, 6 deletions

diff --git a/Histacom2.Engine/SaveSystem.cs b/Histacom2.Engine/SaveSystem.cs
index b8c619e..79333bd 100644
--- a/Histacom2.Engine/SaveSystem.cs
+++ b/Histacom2.Engine/SaveSystem.cs
@@ -171,13 +171,13 @@ namespace Histacom2.Engine
             SaveDirectoryInfo(ProfileMyComputerDirectory, "Program Files", true, "Program Files", true);
             SaveDirectoryInfo(ProfileProgramsDirectory, "Accessories", false, "Accessories", true);
             SaveDirectoryInfo(ProfileProgramsDirectory, "Internet Explorer", true, "Internet Explorer", true);
-            SaveDirectoryInfo(ProfileProgramsDirectory, "The Microsoft Network", true, "The Microsoft Network", true);
+            if (CurrentSave.CurrentOS == "95") SaveDirectoryInfo(ProfileProgramsDirectory, "The Microsoft Network", true, "The Microsoft Network", true);
             SaveDirectoryInfo(ProfileMyComputerDirectory, "Windows", true, "Windows", true);
 
             CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Accessories"), "wordpad.exe", "wordpad", 16, 183296);
             CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Internet Explorer"), "ie20.exe", "ie", 8, 512);
             CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Internet Explorer"), "lnfinst.exe", "iebrokeninstaller", 8, 512);
-            CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"), "msnver.txt", "5900", 12, 4);
+            if (CurrentSave.CurrentOS == "95") CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"), "msnver.txt", "5900", 12, 4);
             
             CreateWindowsDirectory();
         }
@@ -322,7 +322,7 @@ namespace Histacom2.Engine
 
         public static void UpgradeFileSystem(string newOS)
         {
-            if (newOS == "98" || newOS == "2000" || newOS == "ME")
+            if (newOS == "98")
             {
                 // We are upgrading from the old WinClassic file System to the new WinClassic filesystem!
                 // All the above OSes share basically the same file layout!
@@ -336,10 +336,11 @@ namespace Histacom2.Engine
                 // There is no "The Microsoft Network" folder!
 
                 if (Directory.Exists(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"))) Directory.Delete(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"), true);
+                if (Directory.Exists(Path.Combine(ProfileProgramsDirectory, "12padams"))) Directory.Delete(Path.Combine(ProfileProgramsDirectory, "12padams"), true);
                 FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject<FileSystemFolderInfo>(File.ReadAllText(Path.Combine(ProfileProgramsDirectory, "_data.info")));
                 foreach (THDirInfo dir in fsfi.SubDirs)
                 {
-                    if (dir.Name == "The Microsoft Network")
+                    if (dir.Name == "The Microsoft Network" || dir.Name == "12padams")
                     {
                         fsfi.SubDirs.Remove(dir);
                         break;
diff --git a/Histacom2.Engine/Template/WinClassic.Designer.cs b/Histacom2.Engine/Template/WinClassic.Designer.cs
index bacce99..8463041 100644
--- a/Histacom2.Engine/Template/WinClassic.Designer.cs
+++ b/Histacom2.Engine/Template/WinClassic.Designer.cs
@@ -45,6 +45,7 @@
             this.bottom = new System.Windows.Forms.Panel();
             this.right = new System.Windows.Forms.Panel();
             this.top = new System.Windows.Forms.Panel();
+            this.panel1 = new System.Windows.Forms.Panel();
             this.program.SuspendLayout();
             this.programtopbar.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.programIcon)).BeginInit();
@@ -57,6 +58,7 @@
             // 
             this.program.BackColor = System.Drawing.Color.Silver;
             this.program.Controls.Add(this.programContent);
+            this.program.Controls.Add(this.panel1);
             this.program.Controls.Add(this.programtopbar);
             this.program.Controls.Add(this.toprightcorner);
             this.program.Controls.Add(this.bottomrightcorner);
@@ -75,9 +77,9 @@
             // programContent
             // 
             this.programContent.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.programContent.Location = new System.Drawing.Point(4, 22);
+            this.programContent.Location = new System.Drawing.Point(4, 23);
             this.programContent.Name = "programContent";
-            this.programContent.Size = new System.Drawing.Size(292, 274);
+            this.programContent.Size = new System.Drawing.Size(292, 273);
             this.programContent.TabIndex = 9;
             this.programContent.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.programContent_ControlAdded);
             // 
@@ -265,6 +267,14 @@
             this.top.MouseMove += new System.Windows.Forms.MouseEventHandler(this.top_MouseMove);
             this.top.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp);
             // 
+            // panel1
+            // 
+            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel1.Location = new System.Drawing.Point(4, 22);
+            this.panel1.Name = "panel1";
+            this.panel1.Size = new System.Drawing.Size(292, 1);
+            this.panel1.TabIndex = 0;
+            // 
             // WinClassic
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -307,5 +317,6 @@
         public System.Windows.Forms.PictureBox maximizebutton;
         public System.Windows.Forms.PictureBox minimizebutton;
         public System.Windows.Forms.PictureBox programIcon;
+        private System.Windows.Forms.Panel panel1;
     }
 }
\ No newline at end of file