ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix non-string resource in DiscoHawk

This commit is contained in:
YoshiRulz 2020-12-29 01:26:56 +10:00
parent c0cf40b68e
commit a0c7e9c7fb
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
4 changed files with 3 additions and 2370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
View File

@ -64,6 +64,7 @@
<ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" /> <ProjectReference Include="$(ProjectDir)../BizHawk.Emulation.DiscSystem/BizHawk.Emulation.DiscSystem.csproj" />
<Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" /> <Compile Include="$(ProjectDir)../BizHawk.Common/OSTailoredCode.cs" />
<Content Include="discohawk.ico" /> <Content Include="discohawk.ico" />
<EmbeddedResource Include="discohawk.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Update="About.cs" SubType="Form" /> <Compile Update="About.cs" SubType="Form" />
@ -74,10 +75,6 @@
<EmbeddedResource Update="ComparisonResults.resx" DependentUpon="ComparisonResults.cs" /> <EmbeddedResource Update="ComparisonResults.resx" DependentUpon="ComparisonResults.cs" />
<Compile Update="MainDiscoForm.cs" SubType="Form" /> <Compile Update="MainDiscoForm.cs" SubType="Form" />
<Compile Update="MainDiscoForm.Designer.cs" DependentUpon="MainDiscoForm.cs" /> <Compile Update="MainDiscoForm.Designer.cs" DependentUpon="MainDiscoForm.cs" />
<EmbeddedResource Remove="MainDiscoForm.resx" />
<!-- TODO uses non-string
<EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" /> <EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" />
-->
</ItemGroup> </ItemGroup>
</Project> </Project>

1
src/BizHawk.Client.DiscoHawk/MainDiscoForm.Designer.cs generated
View File

@ -253,7 +253,6 @@
this.Controls.Add(this.lblMagicDragArea); this.Controls.Add(this.lblMagicDragArea);
this.Controls.Add(this.ExitButton); this.Controls.Add(this.ExitButton);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
// this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); //TODO non-string in .resx
this.MaximizeBox = false; this.MaximizeBox = false;
this.MinimizeBox = false; this.MinimizeBox = false;
this.Name = "MainDiscoForm"; this.Name = "MainDiscoForm";

2
src/BizHawk.Client.DiscoHawk/MainDiscoForm.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using System.IO; using System.IO;
using BizHawk.Common.StringExtensions; using BizHawk.Common.StringExtensions;
@ -17,6 +18,7 @@ namespace BizHawk.Client.DiscoHawk
public MainDiscoForm() public MainDiscoForm()
{ {
InitializeComponent(); InitializeComponent();
Icon = new Icon(typeof(MainDiscoForm).Assembly.GetManifestResourceStream("BizHawk.Client.DiscoHawk.discohawk.ico") ?? throw new NullReferenceException());
} }
private void MainDiscoForm_Load(object sender, EventArgs e) private void MainDiscoForm_Load(object sender, EventArgs e)

2365
src/BizHawk.Client.DiscoHawk/MainDiscoForm.resx
View File

File diff suppressed because it is too large Load Diff