Skip to content

Commit

Permalink
Even moar updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@CatmanFan
CatmanFan committed Apr 22, 2024
1 parent d8cd49d commit 8fa9fc6
Show file tree
Hide file tree
Showing 42 changed files with 716 additions and 536 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ legacy/
/FriishProduce/LanguageEditor.cs
/FriishProduce/LanguageEditor.Designer.cs
/FriishProduce/LanguageEditor.resx
/FriishProduce/Emanuals
447 changes: 224 additions & 223 deletions FriishProduce/App.config
View file

Large diffs are not rendered by default.

117 changes: 82 additions & 35 deletions FriishProduce/FriishProduce.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,12 @@
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.5.0, Culture=neutral, PublicKeyToken=8985beaab7ea3f04, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft-WindowsAPICodePack-Core.1.1.5\lib\net472\Microsoft.WindowsAPICodePack.dll</HintPath>
</Reference>
<Reference Include="Octokit, Version=9.1.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
<HintPath>..\packages\Octokit.9.1.2\lib\netstandard2.0\Octokit.dll</HintPath>
<Reference Include="Octokit, Version=11.0.1.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
<HintPath>..\packages\Octokit.11.0.1\lib\netstandard2.0\Octokit.dll</HintPath>
</Reference>
<Reference Include="Ookii.Dialogs.WinForms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=66aa232afad40158, processorArchitecture=MSIL">
<HintPath>..\packages\Ookii.Dialogs.WinForms.4.0.0\lib\net462\Ookii.Dialogs.WinForms.dll</HintPath>
</Reference>
<Reference Include="PBKDF2.NET, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\PBKDF2.NET.2.0.0\lib\net45\PBKDF2.NET.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
Expand Down Expand Up @@ -213,24 +210,24 @@
<Compile Include="Tutorial.Designer.cs">
<DependentUpon>Tutorial.cs</DependentUpon>
</Compile>
<Compile Include="_classes\Archives\CCF.cs" />
<Compile Include="_classes\Files\CCF.cs" />
<Compile Include="_classes\BannerPreview.cs" />
<Compile Include="_classes\Program\Database.cs" />
<Compile Include="_classes\Program\Language.cs" />
<Compile Include="_classes\Modifiers\Flash.cs" />
<Compile Include="_classes\Modifiers\Forwarder.cs" />
<Compile Include="_classes\Modifiers\WiiVC\PCE.cs" />
<Compile Include="_classes\Projects\ProjectType.cs" />
<Compile Include="_classes\ROM\Disc.cs" />
<Compile Include="_classes\ROM\Flash.cs" />
<Compile Include="_classes\Modifiers\WiiVC\MSX.cs" />
<Compile Include="_classes\ROM\MSX.cs" />
<Compile Include="_classes\ROM\N64.cs" />
<Compile Include="_classes\ROM\NEO.cs" />
<Compile Include="_classes\ROM\NES.cs" />
<Compile Include="_classes\ROM\PCE.cs" />
<Compile Include="_classes\ROM\SEGA.cs" />
<Compile Include="_classes\ROM\SNES.cs" />
<Compile Include="_classes\Creators\Flash.cs" />
<Compile Include="_classes\Creators\Forwarder.cs" />
<Compile Include="_classes\Creators\WiiVC\PCE.cs" />
<Compile Include="_classes\Program\Project.cs" />
<Compile Include="_classes\Files\ROM\Disc.cs" />
<Compile Include="_classes\Files\ROM\Flash.cs" />
<Compile Include="_classes\Creators\WiiVC\MSX.cs" />
<Compile Include="_classes\Files\ROM\MSX.cs" />
<Compile Include="_classes\Files\ROM\N64.cs" />
<Compile Include="_classes\Files\ROM\NEO.cs" />
<Compile Include="_classes\Files\ROM\NES.cs" />
<Compile Include="_classes\Files\ROM\PCE.cs" />
<Compile Include="_classes\Files\ROM\SEGA.cs" />
<Compile Include="_classes\Files\ROM\SNES.cs" />
<Compile Include="_classes\Program\Updater.cs" />
<EmbeddedResource Include="MainForm.resx">
<DependentUpon>MainForm.cs</DependentUpon>
Expand Down Expand Up @@ -304,19 +301,19 @@
</Compile>
<Compile Include="_classes\Utilities.cs" />
<Compile Include="_classes\Consoles.cs" />
<Compile Include="_classes\Modifiers\Creator.cs" />
<Compile Include="_classes\Modifiers\WiiVC.cs" />
<Compile Include="_classes\Modifiers\WiiVC\N64.cs" />
<Compile Include="_classes\Modifiers\WiiVC\NEO.cs" />
<Compile Include="_classes\Modifiers\WiiVC\NES.cs" />
<Compile Include="_classes\Modifiers\WiiVC\SEGA.cs" />
<Compile Include="_classes\Modifiers\WiiVC\SNES.cs" />
<Compile Include="_classes\Creators\Creator.cs" />
<Compile Include="_classes\Creators\WiiVC.cs" />
<Compile Include="_classes\Creators\WiiVC\N64.cs" />
<Compile Include="_classes\Creators\WiiVC\NEO.cs" />
<Compile Include="_classes\Creators\WiiVC\NES.cs" />
<Compile Include="_classes\Creators\WiiVC\SEGA.cs" />
<Compile Include="_classes\Creators\WiiVC\SNES.cs" />
<Compile Include="_classes\Program\MessageBox.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="_classes\LibRetroDB.cs" />
<Compile Include="_classes\Paths.cs" />
<Compile Include="_classes\ROM.cs" />
<Compile Include="_classes\Program\Paths.cs" />
<Compile Include="_classes\Files\ROM.cs" />
<Compile Include="_classes\ImageHelper.cs" />
<Compile Include="_classes\BannerHelper.cs" />
<EmbeddedResource Include="Properties\Resources.resx">
Expand Down Expand Up @@ -422,6 +419,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="icon.ico" />
<None Include="Resources\apps\gbalzss.exe" />
<None Include="Resources\icons\folder-horizontal-open.png" />
<None Include="Resources\apps\romc0.exe" />
<None Include="Resources\apps\romc.exe" />
Expand Down Expand Up @@ -532,19 +530,68 @@
</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>cd "$(TargetDir)strings\"
for %25%25f in (*.json) do (call :delete %25%25f)
<PostBuildEvent>set location=resources\libraries

cd "$(TargetDir)strings\"


for %25%25f in (*.json) do (call :delete %25%25f)



cd "$(ProjectDir)Strings\"
for %25%25f in (*.json) do (call :copy %25%25f)


for %25%25f in (*.json) do (call :copy %25%25f)


cd "$(TargetDir)"

md %25location%25


for %25%25f in (*.dll) do (call :move %25%25f)



for %25%25f in (*.xml) do (call :move %25%25f)



for %25%25f in (*.pdb) do (call :move %25%25f)

goto :eof





:copy
if NOT %25~n1 == en (copy /b/v/y %251 "$(TargetDir)strings\%25~n1%25~x1" 1&gt;nul)


if NOT %25~n1 == en (copy /b/v/y %251 "$(TargetDir)strings\%25~n1%25~x1" 1&gt;nul)


exit /b





:delete


del /q/f "$(TargetDir)strings\%25~n1%25~x1"


exit /b

:delete
del /q/f "$(TargetDir)strings\%25~n1%25~x1"




:move
move /y %251 "%25location%25\%25~n1%25~x1" 1&gt;nul
exit /b

:eof</PostBuildEvent>
Expand Down
2 changes: 1 addition & 1 deletion FriishProduce/MainForm.Designer.cs
View file

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

5 changes: 3 additions & 2 deletions FriishProduce/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ public MainForm()
MainPanel.Width + (ToolStrip.Dock == DockStyle.Right || ToolStrip.Dock == DockStyle.Left ? ToolStrip.Width - 8 : 16),
MainPanel.Location.Y + MainPanel.Height + 38
);
welcome.Font = new Font(Font.FontFamily, 9.5f, FontStyle.Regular);
CenterToScreen();

// Automatically set defined initial directory for save file dialog
Expand Down Expand Up @@ -267,7 +268,7 @@ private void AddProject(object sender, EventArgs e)
}
}

private ProjectForm AddTab(Console console, ProjectType x = null)
private ProjectForm AddTab(Console console, Project x = null)
{
ProjectForm Tab = x == null ? new ProjectForm(console) : new ProjectForm(x);
Tab.Parent = this;
Expand Down Expand Up @@ -415,7 +416,7 @@ private void OpenProject_Click(object sender, EventArgs e)
using (Stream stream = File.Open(BrowseProject.FileName, FileMode.Open))
{
var binaryFormatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
var project = (ProjectType)binaryFormatter.Deserialize(stream);
var project = (Project)binaryFormatter.Deserialize(stream);
AddTab(project.Console, project);
}
}
Expand Down
18 changes: 9 additions & 9 deletions FriishProduce/MainForm.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
<value>1, 0, 1, 0</value>
</data>
<data name="MenuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>984, 20</value>
<value>934, 20</value>
</data>
<data name="MenuStrip.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
Expand All @@ -331,7 +331,7 @@
<value>NoControl</value>
</data>
<data name="welcome_do_not_show.Location" type="System.Drawing.Point, System.Drawing">
<value>321, 243</value>
<value>296, 243</value>
</data>
<data name="welcome_do_not_show.Size" type="System.Drawing.Size, System.Drawing">
<value>342, 27</value>
Expand Down Expand Up @@ -364,7 +364,7 @@
<value>Arial, 15pt, style=Bold</value>
</data>
<data name="PointToTutorial.Location" type="System.Drawing.Point, System.Drawing">
<value>934, 0</value>
<value>884, 0</value>
</data>
<data name="PointToTutorial.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>0, 0, 24, 0</value>
Expand Down Expand Up @@ -400,7 +400,7 @@
<value>NoControl</value>
</data>
<data name="welcome.Location" type="System.Drawing.Point, System.Drawing">
<value>217, 147</value>
<value>192, 147</value>
</data>
<data name="welcome.Size" type="System.Drawing.Size, System.Drawing">
<value>550, 90</value>
Expand Down Expand Up @@ -433,7 +433,7 @@
<value>0, 45</value>
</data>
<data name="MainPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>984, 417</value>
<value>934, 417</value>
</data>
<data name="MainPanel.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
Expand Down Expand Up @@ -496,7 +496,7 @@
<value>Magenta</value>
</data>
<data name="ToolStrip_ExportWAD.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
<value>93, 22</value>
</data>
<data name="ToolStrip_ExportWAD.Text" xml:space="preserve">
<value>save_as_wad</value>
Expand All @@ -523,7 +523,7 @@
<value>Magenta</value>
</data>
<data name="ToolStrip_OpenImage.Size" type="System.Drawing.Size, System.Drawing">
<value>85, 22</value>
<value>23, 22</value>
</data>
<data name="ToolStrip_OpenImage.Text" xml:space="preserve">
<value>open_image</value>
Expand Down Expand Up @@ -574,7 +574,7 @@
<value>0, 0, 0, 0</value>
</data>
<data name="ToolStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>984, 25</value>
<value>934, 25</value>
</data>
<data name="ToolStrip.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
Expand Down Expand Up @@ -607,7 +607,7 @@
<value>True</value>
</metadata>
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
<value>984, 462</value>
<value>934, 462</value>
</data>
<data name="$this.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8.25pt</value>
Expand Down
Loading

0 comments on commit 8fa9fc6

Please sign in to comment.