aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Tur <[email protected]>2019-04-08 20:09:47 -0400
committerJohn Tur <[email protected]>2019-04-08 20:09:47 -0400
commit86fc6b56d9285975d915646bb3f01b5c4c131caa (patch)
tree6c1443e8e9d4cb28f8e4599e79cdc52641ff4cd7
parent22a2886bed21e86774a8e96f567b1f9acf918a4c (diff)
downloadhistacom2-86fc6b56d9285975d915646bb3f01b5c4c131caa.tar.gz
histacom2-86fc6b56d9285975d915646bb3f01b5c4c131caa.tar.bz2
histacom2-86fc6b56d9285975d915646bb3f01b5c4c131caa.zip
Added designer support
-rw-r--r--Histacom2.Engine/Histacom2.Engine.csproj26
-rw-r--r--Histacom2/Histacom2.csproj40
-rw-r--r--Histacom2/OS/Win95/Windows95TaskbarItem.cs4
-rw-r--r--Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs2
-rw-r--r--Histacom2/TitleScreen.cs2
5 files changed, 56 insertions, 18 deletions
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) {