Merge pull request #167 from jtsshieh/master

Added Welcome Screen and fixed another theme bug

Histacom2.Engine/SaveSystem.cs

@@ -810,6 +810,7 @@ public class Save
 
         [Order]
         public Theme customTheme { get; set; }
+        public bool FTime98 { get; set; }
     }
 
     public class FileSystemFolderInfo

Histacom2.Engine/Theme.cs

@@ -199,7 +199,7 @@ public Default95PlusTheme()
             selectedBackColor = Color.Navy;
             selectedTextColor = Color.White;
 
-            defaultWallpaper = Properties.Resources.Win95PlusInsideComputerWallpaper;
+            defaultWallpaper = Properties.Resources.Win95PlusDefaultWallpaper;
             themeName = "default95plus";
         }
     }

Histacom2/Histacom2.csproj

@@ -280,11 +280,11 @@
     <Compile Include="OS\Win95\Win95Apps\WinClassicThemePanel.Designer.cs">
       <DependentUpon>WinClassicThemePanel.cs</DependentUpon>
     </Compile>
-    <Compile Include="OS\Win95\Win95Apps\WinClassicWelcome.cs">
+    <Compile Include="OS\Win95\Win95Apps\Win95Welcome.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="OS\Win95\Win95Apps\WinClassicWelcome.Designer.cs">
-      <DependentUpon>WinClassicWelcome.cs</DependentUpon>
+    <Compile Include="OS\Win95\Win95Apps\Win95Welcome.Designer.cs">
+      <DependentUpon>Win95Welcome.cs</DependentUpon>
     </Compile>
     <Compile Include="OS\Win95\Win95Apps\Win95WindowsExplorer.cs">
       <SubType>UserControl</SubType>
@@ -329,6 +329,12 @@
     <Compile Include="OS\Win98\Win98Apps\WebChat1999.Designer.cs">
       <DependentUpon>WebChat1999.cs</DependentUpon>
     </Compile>
+    <Compile Include="OS\Win98\Win98Apps\Win98Welcome.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OS\Win98\Win98Apps\Win98Welcome.Designer.cs">
+      <DependentUpon>Win98Welcome.cs</DependentUpon>
+    </Compile>
     <Compile Include="OS\Win98\Win98Apps\WinClassicIE4.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -533,8 +539,8 @@
     <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicTimeDistorter.resx">
       <DependentUpon>WinClassicTimeDistorter.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicWelcome.resx">
-      <DependentUpon>WinClassicWelcome.cs</DependentUpon>
+    <EmbeddedResource Include="OS\Win95\Win95Apps\Win95Welcome.resx">
+      <DependentUpon>Win95Welcome.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="OS\Win95\Win95Apps\Win95WindowsExplorer.resx">
       <DependentUpon>Win95WindowsExplorer.cs</DependentUpon>
@@ -557,6 +563,9 @@
     <EmbeddedResource Include="OS\Win98\Win98Apps\WebChat1999.resx">
       <DependentUpon>WebChat1999.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="OS\Win98\Win98Apps\Win98Welcome.resx">
+      <DependentUpon>Win98Welcome.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="OS\Win98\Win98Apps\WinClassicIE4.resx">
       <DependentUpon>WinClassicIE4.cs</DependentUpon>
     </EmbeddedResource>

Histacom2/OS/Win95/Win95.cs

@@ -118,7 +118,7 @@ private void Desktop_Load(object sender, EventArgs e)
             {
                 CurrentSave.FTime95 = true;
                 SaveGame();
-                welcome = wm.Init(new WinClassicWelcome(), "Welcome", null, false, false, resize: false);
+                welcome = wm.Init(new Win95Welcome(), "Welcome", null, false, false, resize: false);
                 AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
 
                 nonimportantapps.Add(welcome);

Histacom2/OS/Win95/Win95Apps/Win95Welcome.Designer.cs

@@ -1,6 +1,6 @@
 namespace Histacom2.OS.Win95.Win95Apps
 {
-    partial class WinClassicWelcome
+    partial class Win95Welcome
     {
         /// <summary> 
         /// Required designer variable.

Histacom2/OS/Win95/Win95Apps/Win95Welcome.cs

@@ -10,9 +10,9 @@
 
 namespace Histacom2.OS.Win95.Win95Apps
 {
-    public partial class WinClassicWelcome : UserControl
+    public partial class Win95Welcome : UserControl
     {
-        public WinClassicWelcome()
+        public Win95Welcome()
         {
             InitializeComponent();
         }

Histacom2/OS/Win98/Win98.cs

@@ -23,6 +23,7 @@ public partial class Windows98 : Form
         public List<WinClassic> nonimportantapps = new List<WinClassic>();
         public WebChat1999 webchat;
         public WinClassic ie;
+        public WinClassic welcome;
 
         public TaskBarController tb = new TaskBarController();
 
@@ -114,6 +115,22 @@ private void Desktop_Load(object sender, EventArgs e)
             // Bring to this the front
             this.BringToFront();
 
+            //Check if it is the first time
+            if (CurrentSave.FTime98 == false)
+            {
+                CurrentSave.FTime98 = true;
+                SaveGame();
+                welcome = wm.Init(new Win98Welcome(), "Welcome", null, false, false, resize: false);
+                AddTaskBarItem(welcome, welcome.Tag.ToString(), "Welcome", null);
+
+                nonimportantapps.Add(welcome);
+                nonimportantapps[nonimportantapps.Count - 1].BringToFront();
+                nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
+
+                welcome.BringToFront();
+                welcome.Activate();
+            }
+
             // Update the desktop Icons!
 
             DesktopController.RefreshDesktopIcons(new ListViewItem[] { new System.Windows.Forms.ListViewItem("My Computer", 0),

Histacom2/OS/Win98/Win98Apps/Win98Welcome.Designer.cs

@@ -0,0 +1,68 @@
+namespace Histacom2.OS.Win98.Win98Apps
+{
+    partial class Win98Welcome
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Win98Welcome));
+            this.classicButton1 = new Histacom2.Engine.UI.ClassicButton();
+            this.SuspendLayout();
+            // 
+            // classicButton1
+            // 
+            this.classicButton1.AdaptBackColorWithTheme = true;
+            this.classicButton1.AdaptFontWithTheme = true;
+            this.classicButton1.AdaptForeColorWithTheme = true;
+            this.classicButton1.BackColor = System.Drawing.Color.Silver;
+            this.classicButton1.DialogResult = System.Windows.Forms.DialogResult.None;
+            this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.classicButton1.ForeColor = System.Drawing.Color.Black;
+            this.classicButton1.Location = new System.Drawing.Point(401, 304);
+            this.classicButton1.Name = "classicButton1";
+            this.classicButton1.Size = new System.Drawing.Size(79, 23);
+            this.classicButton1.TabIndex = 0;
+            this.classicButton1.Text = "Close";
+            this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click);
+            // 
+            // Win98Welcome
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
+            this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.Controls.Add(this.classicButton1);
+            this.Name = "Win98Welcome";
+            this.Size = new System.Drawing.Size(483, 327);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Engine.UI.ClassicButton classicButton1;
+    }
+}

Histacom2/OS/Win98/Win98Apps/Win98Welcome.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Histacom2.OS.Win98.Win98Apps
+{
+    public partial class Win98Welcome : UserControl
+    {
+        public Win98Welcome()
+        {
+            InitializeComponent();
+        }
+
+        private void classicButton1_Click(object sender, EventArgs e)
+        {
+            this.ParentForm.Close();
+        }
+    }
+}