From 22a2886bed21e86774a8e96f567b1f9acf918a4c Mon Sep 17 00:00:00 2001
From: John Tur <reflectronic@outlook.com>
Date: Mon, 8 Apr 2019 18:22:18 -0400
Subject: Port to .NET Core

---
 Histacom2/OS/Win95/Windows95TaskbarItem.cs | 60 ++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Histacom2/OS/Win95/Windows95TaskbarItem.cs

(limited to 'Histacom2/OS/Win95/Windows95TaskbarItem.cs')

diff --git a/Histacom2/OS/Win95/Windows95TaskbarItem.cs b/Histacom2/OS/Win95/Windows95TaskbarItem.cs
new file mode 100644
index 0000000..f5e277d
--- /dev/null
+++ b/Histacom2/OS/Win95/Windows95TaskbarItem.cs
@@ -0,0 +1,60 @@
+using Histacom2.Engine;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Histacom2.OS.Win95
+{
+    public partial class Windows95TaskbarItem : UserControl
+    {
+
+        TaskBarController tb = new TaskBarController();
+        public string ApplicationID;
+
+        public Windows95TaskbarItem()
+        {
+            InitializeComponent();
+            progName.Font = new Font(TitleScreen.pfc.Families[0], 16f, FontStyle.Regular, GraphicsUnit.Point, ((0)));
+            this.BackColor = Color.Silver;
+        }
+
+        private void Win95TaskBarItem_Load(object sender, EventArgs e)
+        {
+            progName.Text = (string)this.Tag;
+            if (BackgroundImage == null)
+            {
+                progName.Location = new Point(4, 2);
+                progPic.Hide();
+            }
+            else progPic.Image = this.BackgroundImage;
+            ApplicationID = (TaskBarController.AvalibleApplicationID - 1).ToString();
+            this.BackgroundImage = null;
+        }
+
+        private void Win95TaskBarItem_Click(object sender, EventArgs e)
+        {
+            tb.FocusAppFromID(ApplicationID);
+        }
+
+        private void panel1_Paint(object sender, PaintEventArgs e)
+        {
+            if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor;
+            else BackColor = Color.Silver;
+
+            var _lightBack = Paintbrush.GetLightFromColor(BackColor);
+            var _darkBack = Paintbrush.GetDarkFromColor(BackColor);
+
+            var g = e.Graphics;
+            g.Clear(BackColor);
+
+            g.FillRectangle(Brushes.Black, new Rectangle(0, 0, Width, Height));
+            g.FillRectangle(new SolidBrush(_lightBack), new Rectangle(0, 0, Width - 1, Height - 1));
+            g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2));
+            g.FillRectangle(new SolidBrush(BackColor), new Rectangle(1, 1, Width - 3, Height - 3));
+        }
+    }
+}
-- 
cgit v1.2.3


From 86fc6b56d9285975d915646bb3f01b5c4c131caa Mon Sep 17 00:00:00 2001
From: John Tur <reflectronic@outlook.com>
Date: Mon, 8 Apr 2019 20:09:47 -0400
Subject: Added designer support

---
 Histacom2.Engine/Histacom2.Engine.csproj           | 26 ++++++++------
 Histacom2/Histacom2.csproj                         | 40 +++++++++++++++++++++-
 Histacom2/OS/Win95/Windows95TaskbarItem.cs         |  4 ---
 .../Win98Apps/WinClassicTimeDistorter2.Designer.cs |  2 +-
 Histacom2/TitleScreen.cs                           |  2 +-
 5 files changed, 56 insertions(+), 18 deletions(-)

(limited to 'Histacom2/OS/Win95/Windows95TaskbarItem.cs')

diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj
index a3e9d22..19ddfd9 100644
--- a/Histacom2.Engine/Histacom2.Engine.csproj
+++ b/Histacom2.Engine/Histacom2.Engine.csproj
@@ -1,8 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
+    <Version>2.0.3.0</Version>
+    <AssemblyTitle>Histacom2.Engine</AssemblyTitle>
+    <Copyright>(C) Michael Webb and contributors, 2017-2019</Copyright>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,18 +13,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="Properties\Resources.Designer.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
+    <Compile Update="Template\AboutBox*.cs;
+                     Template\DropDownItem.cs;
+                     Template\Infobox95.cs;
+                     UI\ClassicTextbox.cs;
+                     UI\ClassicDropDown.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+
+    <Compile Update="Template\*Overlay.cs;
+                     Template\Win*.cs">
+      <SubType>Form</SubType>
     </Compile>
-  </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj
index c7dc951..3744483 100644
--- a/Histacom2/Histacom2.csproj
+++ b/Histacom2/Histacom2.csproj
@@ -2,8 +2,11 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
+    <Version>2.0.3.0</Version>
+    <AssemblyTitle>Histacom2.Engine</AssemblyTitle>
+    <Copyright>(C) Michael Webb and contributors, 2017-2019</Copyright>
   </PropertyGroup>
 
   <ItemGroup>
@@ -15,4 +18,39 @@
       <HintPath>..\PinkieControls.dll</HintPath>
     </Reference>
   </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="TitleScreen.cs;
+                     SeizureWarning.cs;
+                     AchievementScreen.cs;
+                     AchievementBox.cs;
+                     SaveDialogs\LoadGameDialog.cs;
+                     SaveDialogs\NewGameDialog.cs;
+                     SaveDialogs\SaveFileTroubleShooter.cs;
+                     OS\Win95\Windows95.cs;
+                     OS\Win98\Windows98.cs;
+                     OS\WinME\WinME.cs;
+                     OS\WinXPBad\VirusLabel.cs;
+                     OS\WinXPBad\WinXPBad.cs">
+      <SubType>Form</SubType>
+    </Compile>
+      
+
+    <Compile Update="OS\Win2K\Win2KApps\SurviveTheDay.cs;
+                     OS\Win95\Windows95TaskbarItem.cs;
+                     OS\Win95\Win95Apps\*.cs;
+                     OS\Win95\Win95Apps\12padamsViruses\*.cs;
+                     OS\Win95\Win95Apps\IE3Sites\*.cs;
+                     OS\Win95\Win95Apps\Minesweeper\CustomMinefield.cs;
+                     OS\Win95\Win95Apps\Minesweeper\WinClassicMinesweeper.cs;
+                     OS\Win95\Win95Apps\Minesweeper\MineBestTimes.cs;
+                     OS\Win98\Win98Apps\AddressBook\*.cs;
+                     OS\Win98\Win98Apps\IE4Sites\*.cs;
+                     OS\Win98\Win98Apps\*.cs;
+                     OS\WinXPBad\WinClassic*.cs;
+                     GlobalPrograms\*.cs;
+                     GlobalPrograms\InstallerPanes\*.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Histacom2/OS/Win95/Windows95TaskbarItem.cs b/Histacom2/OS/Win95/Windows95TaskbarItem.cs
index f5e277d..2ba341f 100644
--- a/Histacom2/OS/Win95/Windows95TaskbarItem.cs
+++ b/Histacom2/OS/Win95/Windows95TaskbarItem.cs
@@ -1,10 +1,6 @@
 using Histacom2.Engine;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Text;
 using System.Windows.Forms;
 
 namespace Histacom2.OS.Win95
diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs
index 9db9785..413024e 100644
--- a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs
+++ b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs
@@ -123,4 +123,4 @@
         private System.Windows.Forms.Timer timer1;
         public Engine.UI.ClassicLabel classicLabel2;
     }
-}
+}
\ No newline at end of file
diff --git a/Histacom2/TitleScreen.cs b/Histacom2/TitleScreen.cs
index 3829d1f..dd1d0a3 100644
--- a/Histacom2/TitleScreen.cs
+++ b/Histacom2/TitleScreen.cs
@@ -209,7 +209,7 @@ namespace Histacom2
         #endregion
 
         private void gameversion_MouseHover(object sender, EventArgs e) {
-            gameversion.Text = "There are no easter eggs here!";
+            gameversion.Text = $"Running on {Assembly.GetEntryAssembly().GetCustomAttribute<System.Runtime.Versioning.TargetFrameworkAttribute>().FrameworkName}";
         }
 
         private void gameversion_MouseLeave(object sender, EventArgs e) {
-- 
cgit v1.2.3