Merge branch 'stable' into export-games

1 files changed, 48 insertions, 249 deletions

diff --git a/hakchi_gui.csproj b/hakchi_gui.csproj
index 7093b454..47903884 100644
--- a/hakchi_gui.csproj
+++ b/hakchi_gui.csproj
@@ -107,12 +107,12 @@
     <Reference Include="System.Xml.Linq" />

     <Reference Include="System.Data.DataSetExtensions" />

     <Reference Include="System.Data" />

-    <Reference Include="System.Deployment" />

     <Reference Include="System.Drawing" />

     <Reference Include="System.Windows.Forms" />

     <Reference Include="System.Xml" />

   </ItemGroup>

   <ItemGroup>

+    <Compile Include="ApplicationDeploymentWrapper.cs" />

     <Compile Include="AboutBox.cs">

       <SubType>Form</SubType>

     </Compile>

@@ -143,26 +143,6 @@
     <Compile Include="GameGenie\GameGenieFormatException.cs" />

     <Compile Include="GameGenie\GameGenieNotFoundException.cs" />

     <Compile Include="GameGenie\GameGeniePatcherSnes.cs" />

-    <Compile Include="Properties\Resources.hu-HU.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.hu-HU.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.ja-JP.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.ja-JP.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.pt-BR.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.pt-BR.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.ro-RO.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.ro-RO.resx</DependentUpon>

-    </Compile>

     <Compile Include="SelectConsoleDialog.cs">

       <SubType>Form</SubType>

     </Compile>

@@ -352,116 +332,6 @@
     <Compile Include="LibWinUsb\WinUsb\WinUsbDevice.cs" />

     <Compile Include="LibWinUsb\WinUsb\WinUsbRegistry.cs" />

     <Compile Include="MessageBoxManager.cs" />

-    <Compile Include="Properties\Resources.bg-BG.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.bg-BG.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.ca-ES.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.ca-ES.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.da-DK.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.da-DK.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.de-DE.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.de-DE.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.el-GR.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.el-GR.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.en-GB.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.en-GB.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.es-AR.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.es-AR.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.es-ES.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.es-ES.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.fi-FI.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.fi-FI.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.fr-FR.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.fr-FR.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.id-ID.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.id-ID.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.it-IT.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.it-IT.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.nl.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.nl.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.pl-PL.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.pl-PL.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.pt-PT.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.pt-PT.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.ru-RU.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.ru-RU.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.sk-SK.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.sk-SK.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.sv-SE.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.sv-SE.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.uk-UA.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.uk-UA.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.zh-CHS.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.zh-CHS.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.zh-CHT.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.zh-CHT.resx</DependentUpon>

-    </Compile>

-    <Compile Include="Properties\Resources.zh-TW.Designer.cs">

-      <AutoGen>True</AutoGen>

-      <DesignTime>True</DesignTime>

-      <DependentUpon>Resources.zh-TW.resx</DependentUpon>

-    </Compile>

     <Compile Include="Properties\Resources.Designer.cs">

       <AutoGen>True</AutoGen>

       <DesignTime>True</DesignTime>

@@ -695,22 +565,10 @@
     <EmbeddedResource Include="MainForm.ro-RO.resx">

       <DependentUpon>MainForm.cs</DependentUpon>

     </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.hu-HU.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.hu-HU.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.ja-JP.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.ja-JP.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.pt-BR.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.pt-BR.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.ro-RO.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.ro-RO.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

+    <EmbeddedResource Include="Properties\Resources.hu-HU.resx" />

+    <EmbeddedResource Include="Properties\Resources.ja-JP.resx" />

+    <EmbeddedResource Include="Properties\Resources.pt-BR.resx" />

+    <EmbeddedResource Include="Properties\Resources.ro-RO.resx" />

     <EmbeddedResource Include="SaveStateManager.ja-JP.resx">

       <DependentUpon>SaveStateManager.cs</DependentUpon>

     </EmbeddedResource>

@@ -810,7 +668,7 @@
     <EmbeddedResource Include="FoldersManagerForm.da-DK.resx">

       <DependentUpon>FoldersManagerForm.cs</DependentUpon>

     </EmbeddedResource>

-    <EmbeddedResource Include="FoldersManagerForm.de-De.resx">

+    <EmbeddedResource Include="FoldersManagerForm.de-DE.resx">

       <DependentUpon>FoldersManagerForm.cs</DependentUpon>

     </EmbeddedResource>

     <EmbeddedResource Include="FoldersManagerForm.el-GR.resx">

@@ -1142,99 +1000,33 @@
     <EmbeddedResource Include="MainForm.zh-TW.resx">

       <DependentUpon>MainForm.cs</DependentUpon>

     </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.bg-BG.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.bg-BG.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.ca-ES.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.ca-ES.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.da-DK.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.da-DK.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.de-DE.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.de-DE.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.el-GR.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.el-GR.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.en-GB.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.en-GB.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.es-AR.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.es-AR.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.es-ES.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.es-ES.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.fi-FI.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.fi-FI.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.fr-FR.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.fr-FR.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.id-ID.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.id-ID.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.it-IT.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.it-IT.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.nl.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.nl.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.pl-PL.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.pl-PL.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.pt-PT.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.pt-PT.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

+    <EmbeddedResource Include="Properties\Resources.bg-BG.resx" />

+    <EmbeddedResource Include="Properties\Resources.ca-ES.resx" />

+    <EmbeddedResource Include="Properties\Resources.da-DK.resx" />

+    <EmbeddedResource Include="Properties\Resources.de-DE.resx" />

+    <EmbeddedResource Include="Properties\Resources.el-GR.resx" />

+    <EmbeddedResource Include="Properties\Resources.en-GB.resx" />

+    <EmbeddedResource Include="Properties\Resources.es-AR.resx" />

+    <EmbeddedResource Include="Properties\Resources.es-ES.resx" />

+    <EmbeddedResource Include="Properties\Resources.fi-FI.resx" />

+    <EmbeddedResource Include="Properties\Resources.fr-FR.resx" />

+    <EmbeddedResource Include="Properties\Resources.id-ID.resx" />

+    <EmbeddedResource Include="Properties\Resources.it-IT.resx" />

+    <EmbeddedResource Include="Properties\Resources.nl.resx" />

+    <EmbeddedResource Include="Properties\Resources.pl-PL.resx" />

+    <EmbeddedResource Include="Properties\Resources.pt-PT.resx" />

     <EmbeddedResource Include="Properties\Resources.resx">

       <SubType>Designer</SubType>

       <LastGenOutput>Resources.Designer.cs</LastGenOutput>

       <Generator>ResXFileCodeGenerator</Generator>

     </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.ru-RU.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.ru-RU.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.sk-SK.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.sk-SK.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.sv-SE.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.sv-SE.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.uk-UA.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.uk-UA.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.zh-CHS.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.zh-CHS.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.zh-CHT.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.zh-CHT.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

-    <EmbeddedResource Include="Properties\Resources.zh-TW.resx">

-      <Generator>ResXFileCodeGenerator</Generator>

-      <LastGenOutput>Resources.zh-TW.Designer.cs</LastGenOutput>

-    </EmbeddedResource>

+    <EmbeddedResource Include="Properties\Resources.ru-RU.resx" />

+    <EmbeddedResource Include="Properties\Resources.sk-SK.resx" />

+    <EmbeddedResource Include="Properties\Resources.sv-SE.resx" />

+    <EmbeddedResource Include="Properties\Resources.uk-UA.resx" />

+    <EmbeddedResource Include="Properties\Resources.zh-CHS.resx" />

+    <EmbeddedResource Include="Properties\Resources.zh-CHT.resx" />

+    <EmbeddedResource Include="Properties\Resources.zh-TW.resx" />

     <EmbeddedResource Include="SaveStateManager.bg-BG.resx">

       <DependentUpon>SaveStateManager.cs</DependentUpon>

     </EmbeddedResource>

@@ -1916,7 +1708,7 @@
     <EmbeddedResource Include="images\flags\tw.png" />

     <EmbeddedResource Include="images\flags\ua.png" />

     <EmbeddedResource Include="images\flags\dk.png" />

-    <EmbeddedResource Include="images\gamepad_SNES.png" />

+    <EmbeddedResource Include="images\gamepad_snes.png" />

     <Content Include="LICENSE">

       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

     </Content>

@@ -2555,6 +2347,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

     </Content>

     <Content Include="DesktopEntries\CLV-P-VADZJ.desktop">

+    <Content Include="mods\mod_hakchi\bin\usleep">

       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

     </Content>

     <None Include="Properties\app.manifest" />

@@ -2966,32 +2759,32 @@
   <ItemGroup>

     <PublishFile Include="data\GameGenieDB.xml">

       <Visible>False</Visible>

+      <PublishState>Include</PublishState>

+      <IncludeHash>True</IncludeHash>

       <Group>

       </Group>

       <TargetPath>

       </TargetPath>

-      <PublishState>Include</PublishState>

-      <IncludeHash>True</IncludeHash>

       <FileType>File</FileType>

     </PublishFile>

     <PublishFile Include="data\nescarts.xml">

       <Visible>False</Visible>

+      <PublishState>Include</PublishState>

+      <IncludeHash>True</IncludeHash>

       <Group>

       </Group>

       <TargetPath>

       </TargetPath>

-      <PublishState>Include</PublishState>

-      <IncludeHash>True</IncludeHash>

       <FileType>File</FileType>

     </PublishFile>

     <PublishFile Include="data\snescarts.xml">

       <Visible>False</Visible>

+      <PublishState>Include</PublishState>

+      <IncludeHash>True</IncludeHash>

       <Group>

       </Group>

       <TargetPath>

       </TargetPath>

-      <PublishState>Include</PublishState>

-      <IncludeHash>True</IncludeHash>

       <FileType>File</FileType>

     </PublishFile>

   </ItemGroup>

@@ -3004,12 +2797,8 @@
     </PreBuildEvent>

   </PropertyGroup>

   <PropertyGroup>

-    <PostBuildEvent>if exist languages rd /S /Q languages

-md languages

-for /D %25%25i in (*.*) do if exist %25%25i\hakchi.resources.dll move /Y %25%25i languages\%25%25i

-

-rem del *.application

-rem del *.manifest</PostBuildEvent>

+    <PostBuildEvent>

+    </PostBuildEvent>

   </PropertyGroup>

   <!-- 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.

@@ -3018,4 +2807,14 @@ rem del *.manifest</PostBuildEvent>
   <Target Name="AfterBuild">

   </Target>

   -->

+  <PropertyGroup>

+    <BuildDependsOn>$(BuildDependsOn);MoveLanguageResourceFiles;</BuildDependsOn>

+  </PropertyGroup>

+  <Target Name="MoveLanguageResourceFiles">

+    <ItemGroup>

+      <LanguageResourceFiles Include="$(OutDir)**\hakchi.resources.dll;" Exclude="$(OutDir)languages\**\*.*" />

+    </ItemGroup>

+    <Copy SourceFiles="@(LanguageResourceFiles)" DestinationFolder="$(OutDir)languages\%(RecursiveDir)" SkipUnchangedFiles="true" />

+    <RemoveDir Directories="$(OutDir)%(LanguageResourceFiles.RecursiveDir);" />

+  </Target>

 </Project>
\ No newline at end of file