Skip to content

Commit

Permalink
Full list of changes:
Browse files Browse the repository at this point in the history 
* Update VirusTotal action
* Creating new documentation website based on [MkDocs](https://www.mkdocs.org/)
* Add HTML labels, tooltips
* Fix controller keymap form resetting after opening & closing content options
* Fix online WAD option not saving
* Fix Flash not loading on Japanese version
* Flash: Add content domain option, BBC iPlayer support (beta)
* Translation/string updates
* Interface bugfixes and updates
* General system stability improvements to enhance the user's experience.
  • Loading branch information
@CatmanFan
CatmanFan committed Jan 8, 2025
1 parent aae01b7 commit 3e5b968
Show file tree
Hide file tree
Showing 43 changed files with 2,626 additions and 2,322 deletions.
Binary file modified .github/workflows/dotnet.yml
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ legacy/
/packages

/VCManualCreator
/FriishProduce_v2.0
/FriishProduce_v2.0
/docs/site
34 changes: 21 additions & 13 deletions FriishProduce/FriishProduce.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,26 @@
<PropertyGroup>
<StartupObject>FriishProduce.Program</StartupObject>
</PropertyGroup>
<PropertyGroup />
<ItemGroup>
<Reference Include="HtmlRenderer, Version=1.5.0.6, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlRenderer.Core.1.5.0.6\lib\net45\HtmlRenderer.dll</HintPath>
<Reference Include="HtmlRenderer, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlRenderer.Core.1.5.1-beta1\lib\net45\HtmlRenderer.dll</HintPath>
</Reference>
<Reference Include="HtmlRenderer.WinForms, Version=1.5.0.6, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlRenderer.WinForms.1.5.0.6\lib\net45\HtmlRenderer.WinForms.dll</HintPath>
<Reference Include="HtmlRenderer.WinForms, Version=1.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\HtmlRenderer.WinForms.1.5.1-beta1\lib\net45\HtmlRenderer.WinForms.dll</HintPath>
</Reference>
<Reference Include="Iconic.Zlib, Version=1.1.0.0, Culture=neutral, PublicKeyToken=6cdd45170aaef7fc, processorArchitecture=MSIL">
<HintPath>..\packages\Iconic.Zlib.Signed.1.1.0\lib\net45\Iconic.Zlib.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="JacksiroKe.MdiTabCtrl, Version=1.0.0.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MdiTabCtrl.1.0.0.1\lib\net40\JacksiroKe.MdiTabCtrl.dll</HintPath>
</Reference>
<Reference Include="libWiiSharp">
<HintPath>.\libWiiSharp.dll</HintPath>
</Reference>
<Reference Include="MdiTabControl">
<HintPath>.\MdiTabControl.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -270,6 +271,12 @@
<Compile Include="Subforms\Controllers\Controller_SEGA.Designer.cs">
<DependentUpon>Controller_SEGA.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\HTMLForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\HTMLForm.Designer.cs">
<DependentUpon>HTMLForm.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\LanguageEditor.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -448,6 +455,9 @@
<EmbeddedResource Include="Subforms\ContentOptions\Options_VC_SEGA.resx">
<DependentUpon>Options_VC_SEGA.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\HTMLForm.resx">
<DependentUpon>HTMLForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\LanguageEditor.resx">
<DependentUpon>LanguageEditor.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -580,7 +590,6 @@
<None Include="Resources\yes.png" />
<None Include="Resources\no.png" />
<None Include="Resources\logo.png" />
<None Include="Resources\bg.png" />
<None Include="Resources\apps\lzh8_cmp_nonstrict.exe" />
<None Include="Resources\apps\lzh8_cmp.exe" />
<None Include="Resources\icons\cog.png" />
Expand Down Expand Up @@ -614,7 +623,6 @@
<None Include="Resources\icons\flash.png" />
<None Include="Resources\icons\locale.png" />
<None Include="Resources\subforms\screen_smd.png" />
<None Include="Resources\tutorial.rtf" />
<None Include="Resources\vc\NeoGeo_VC1.bin" />
<None Include="Resources\vc\NeoGeo_VC2.bin" />
<None Include="Resources\vc\NeoGeo_VC3.bin" />
Expand All @@ -640,22 +648,22 @@
<ItemGroup>
<PublishFile Include="icon.ico">
<Visible>False</Visible>
<PublishState>Exclude</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Exclude</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>File</FileType>
</PublishFile>
<PublishFile Include="VistaMenu">
<Visible>False</Visible>
<PublishState>Exclude</PublishState>
<IncludeHash>True</IncludeHash>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Exclude</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
</ItemGroup>
Expand Down
36 changes: 20 additions & 16 deletions FriishProduce/MainForm.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 23 additions & 6 deletions FriishProduce/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,9 @@ private void RefreshForm()
toolbarGameScan.Text = game_scan.Text;
toolbarPreferences.Text = preferences.Text = Program.Lang.String("preferences");

SaveProject.Title = save_project_as.Text.Replace("&", "");
SaveWAD.Title = export.Text.Replace("&", "");
BrowseProject.Title = new Regex(@"\(.*\)").Replace(open_project.Text, "").Replace("&", "");
SaveProject.Title = new Regex(@"\(.*\)").Replace(save_project_as.Text, "").Replace("&", "");
SaveWAD.Title = new Regex(@"\(.*\)").Replace(export.Text, "").Replace("&", "");

try { BrowseProject.Filter = SaveProject.Filter = Program.Lang.String("filter.project"); }
catch { MessageBox.Show("Warning!\nThe language strings have not been loaded correctly.\n\nSeveral items may show up as 'undefined'.\n\nOther exceptions related to strings or filters can also occur!", MessageBox.Buttons.Ok, MessageBox.Icons.Warning, false); }
Expand All @@ -144,9 +145,11 @@ private void RefreshForm()
{
Text += " [Running in debug mode]";
// Debug mode-only features are activated here. //
extract_wad_banner.Visible = true;
extract_wad_icon.Visible = true;
}

foreach (MdiTabControl.TabPage tabPage in tabControl.TabPages)
foreach (JacksiroKe.MdiTabCtrl.TabPage tabPage in tabControl.TabPages)
if (tabPage.Form.GetType() == typeof(ProjectForm))
(tabPage.Form as ProjectForm).RefreshForm();
}
Expand Down Expand Up @@ -298,7 +301,7 @@ private void BrowseROMDialog()
if (tabControl.SelectedForm != null)
{
var p = tabControl.SelectedForm as ProjectForm;
p.BrowseROMDialog(import_game_file.Text);
p.BrowseROMDialog(new Regex(@"\(.*\)").Replace(import_game_file.Text, "").Replace("&", ""));
}
}

Expand Down Expand Up @@ -328,7 +331,7 @@ public void CleanTemp()
private void TabContextMenu_Opening(object sender, CancelEventArgs e)
{
var page = (sender as ContextMenuStrip).SourceControl;
var index = tabControl.TabPages.get_IndexOf(page as MdiTabControl.TabPage);
var index = tabControl.TabPages.get_IndexOf(page as JacksiroKe.MdiTabCtrl.TabPage);
if (index != -1) tabControl.TabPages[index].Select();
}

Expand Down Expand Up @@ -487,11 +490,19 @@ private void ExtractWAD_Click(object sender, EventArgs e)
SupportMultiDottedExtensions = true
};

bool isIMET = sender == extract_wad_banner && MessageBox.Show(Program.Lang.Msg(11), MessageBox.Buttons.YesNo) == MessageBox.Result.Yes;
if (isIMET)
{
saveDialog.FileName = "opening.bnr";
saveDialog.Filter = "BNR (*.bnr)|*.bnr|BIN (*.bin)|*.bin" + Program.Lang.String("filter");
saveDialog.DefaultExt = "bnr";
}

if (saveDialog.ShowDialog() == DialogResult.OK)
{
try
{
using var x = libWiiSharp.U8.Load(w.BannerApp.Data[w.BannerApp.GetNodeIndex(sender == extract_wad_icon ? "icon.bin" : "banner.bin")]);
using var x = isIMET ? w.BannerApp : U8.Load(w.BannerApp.Data[w.BannerApp.GetNodeIndex(sender == extract_wad_icon ? "icon.bin" : "banner.bin")]);
File.WriteAllBytes(saveDialog.FileName, x.ToByteArray());

goto Succeeded;
Expand Down Expand Up @@ -636,5 +647,11 @@ private void ExtractWAD_Click(object sender, EventArgs e)
if (w != null) w.Dispose();
}
}

private void MainForm_Paint(object sender, PaintEventArgs e)
{
e.Graphics.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
}
}
}
26 changes: 13 additions & 13 deletions FriishProduce/MainForm.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@
<value>tabControl</value>
</data>
<data name="&gt;&gt;tabControl.Type" xml:space="preserve">
<value>MdiTabControl.TabControl, MdiTabControl, Version=1.1.6522.19795, Culture=neutral, PublicKeyToken=null</value>
<value>JacksiroKe.MdiTabCtrl.TabControl, JacksiroKe.MdiTabCtrl, Version=1.0.0.1, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;tabControl.Parent" xml:space="preserve">
<value>$this</value>
Expand Down Expand Up @@ -3045,12 +3045,24 @@
<data name="&gt;&gt;menuItem8.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;clear_database.Name" xml:space="preserve">
<value>clear_database</value>
</data>
<data name="&gt;&gt;clear_database.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;language_file_editor.Name" xml:space="preserve">
<value>language_file_editor</value>
</data>
<data name="&gt;&gt;language_file_editor.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menuItem11.Name" xml:space="preserve">
<value>menuItem11</value>
</data>
<data name="&gt;&gt;menuItem11.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;preferences.Name" xml:space="preserve">
<value>preferences</value>
</data>
Expand All @@ -3069,18 +3081,6 @@
<data name="&gt;&gt;about.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;clear_database.Name" xml:space="preserve">
<value>clear_database</value>
</data>
<data name="&gt;&gt;clear_database.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menuItem11.Name" xml:space="preserve">
<value>menuItem11</value>
</data>
<data name="&gt;&gt;menuItem11.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>MainForm</value>
</data>
Expand Down
Loading

0 comments on commit 3e5b968

Please sign in to comment.