Merge pull request #1 from TimeHACKDevs/master

Merge

1 files changed, 69 insertions, 3 deletions

diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj
index 9dafca4..a8ccbff 100644
--- a/TimeHACK.Main/TimeHACK.Main.csproj
+++ b/TimeHACK.Main/TimeHACK.Main.csproj
@@ -101,6 +101,9 @@
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <NoWin32Manifest>true</NoWin32Manifest>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -119,12 +122,36 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="SaveDialogs\LoadGameDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SaveDialogs\LoadGameDialog.Designer.cs">
+      <DependentUpon>LoadGameDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SaveDialogs\LoadGameProfileItem.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SaveDialogs\LoadGameProfileItem.Designer.cs">
+      <DependentUpon>LoadGameProfileItem.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SaveDialogs\NewGameDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="SaveDialogs\NewGameDialog.Designer.cs">
+      <DependentUpon>NewGameDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="OS\Win95\Win95.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="OS\Win95\Win95.Designer.cs">
       <DependentUpon>Win95.cs</DependentUpon>
     </Compile>
+    <Compile Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewContact.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewContact.Designer.cs">
+      <DependentUpon>FRMWinClassicAddressBookNewContact.cs</DependentUpon>
+    </Compile>
     <Compile Include="OS\Win95\Win95Apps\TestApp.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -137,10 +164,16 @@
     <Compile Include="OS\Win95\Win95Apps\WebChat1998.Designer.cs">
       <DependentUpon>WebChat1998.cs</DependentUpon>
     </Compile>
-    <Compile Include="OS\Win95\Win95Apps\WinClassicAddressBook.cs">
+    <Compile Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewFolder.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="OS\Win95\Win95Apps\WinClassicAddressBook.Designer.cs">
+    <Compile Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewFolder.Designer.cs">
+      <DependentUpon>FRMWinClassicAddressBookNewFolder.cs</DependentUpon>
+    </Compile>
+    <Compile Include="OS\Win95\Win95Apps\AddressBook\WinClassicAddressBook.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="OS\Win95\Win95Apps\AddressBook\WinClassicAddressBook.Designer.cs">
       <DependentUpon>WinClassicAddressBook.cs</DependentUpon>
     </Compile>
     <Compile Include="OS\Win95\Win95Apps\WinClassicDownloader.cs">
@@ -191,6 +224,12 @@
     <Compile Include="OS\Win95\Win95TaskBarItem.Designer.cs">
       <DependentUpon>Win95TaskBarItem.cs</DependentUpon>
     </Compile>
+    <Compile Include="OS\Win98\Win98.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="OS\Win98\Win98.Designer.cs">
+      <DependentUpon>Win98.cs</DependentUpon>
+    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -204,16 +243,34 @@
     <Compile Include="TitleScreen.Designer.cs">
       <DependentUpon>TitleScreen.cs</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="SaveDialogs\LoadGameDialog.resx">
+      <DependentUpon>LoadGameDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SaveDialogs\LoadGameProfileItem.resx">
+      <DependentUpon>LoadGameProfileItem.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="SaveDialogs\NewGameDialog.resx">
+      <DependentUpon>NewGameDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <Compile Include="UI\IProgressBar.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <EmbeddedResource Include="OS\Win95\Win95.resx">
       <DependentUpon>Win95.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewContact.resx">
+      <DependentUpon>FRMWinClassicAddressBookNewContact.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="OS\Win95\Win95Apps\TestApp.resx">
       <DependentUpon>TestApp.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="OS\Win95\Win95Apps\WebChat1998.resx">
       <DependentUpon>WebChat1998.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicAddressBook.resx">
+    <EmbeddedResource Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewFolder.resx">
+      <DependentUpon>FRMWinClassicAddressBookNewFolder.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="OS\Win95\Win95Apps\AddressBook\WinClassicAddressBook.resx">
       <DependentUpon>WinClassicAddressBook.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="OS\Win95\Win95Apps\WinClassicDownloader.resx">
@@ -237,6 +294,9 @@
     <EmbeddedResource Include="OS\Win95\Win95TaskBarItem.resx">
       <DependentUpon>Win95TaskBarItem.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="OS\Win98\Win98.resx">
+      <DependentUpon>Win98.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>
@@ -305,6 +365,9 @@
     <Content Include="Resources\WinClassic\Win95SideBar.png" />
     <Content Include="Resources\WinClassic\Win95Start.wav" />
     <None Include="Resources\WinClassic\Win95Warning.png" />
+    <None Include="Resources\WinClassic\WinClassicAddressBookNewIcon.png" />
+    <None Include="Resources\WinClassic\WinClassicAddressBookPropertiesIcon.png" />
+    <None Include="Resources\WinClassic\WinClassicAddressBookDeleteIcon.png" />
     <Content Include="Resources\WinClassic\WinClassicClock.png" />
     <Content Include="Resources\WinClassic\WinClassicComputer.png" />
     <None Include="Resources\WinClassic\WinClassicCopy.png" />
@@ -312,6 +375,7 @@
     <Content Include="Resources\WinClassic\WinClassicDocuments.png" />
     <Content Include="Resources\WinClassic\WinClassicFind.png" />
     <Content Include="Resources\WinClassic\WinClassicFolder.png" />
+    <None Include="Resources\WinClassic\WinClassicGENERALApplicationToolbarBackground.png" />
     <Content Include="Resources\WinClassic\WinClassicHelp.png" />
     <None Include="Resources\WinClassic\WinClassicHWCV.png" />
     <Content Include="Resources\WinClassic\WinClassicIE4.png" />
@@ -332,6 +396,7 @@
     <Content Include="Resources\WinClassic\WinClassicStart.png" />
     <Content Include="Resources\WinClassic\WinClassicSuspend.png" />
     <Content Include="Resources\WinClassic\WinClassicTaskBar.png" />
+    <Content Include="Resources\WinClassic\WinClassicTaskbarItem.png" />
     <Content Include="Resources\WinClassic\WinClassicTime.png" />
   </ItemGroup>
   <ItemGroup>
@@ -340,6 +405,7 @@
       <Name>TimeHACK.Engine</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.