Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@CatmanFan
CatmanFan committed Apr 5, 2024
1 parent 1817195 commit 1b58b24
Show file tree
Hide file tree
Showing 24 changed files with 364 additions and 329 deletions.
6 changes: 4 additions & 2 deletions FriishProduce/FriishProduce.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,7 @@
<Compile Include="_classes\Modifiers\WiiVC\NES.cs" />
<Compile Include="_classes\Modifiers\WiiVC\SEGA.cs" />
<Compile Include="_classes\Modifiers\WiiVC\SNES.cs" />
<Compile Include="_classes\MessageBox.cs" />
<Compile Include="_classes\ProcessHelper.cs" />
<Compile Include="_classes\Program\MessageBox.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="_classes\LibRetroDB.cs" />
Expand Down Expand Up @@ -420,6 +419,9 @@
<ItemGroup>
<Content Include="Database.xml" />
<Content Include="icon.ico" />
<None Include="Resources\icons\folder-horizontal-open.png" />
<None Include="Resources\apps\romc0.exe" />
<None Include="Resources\apps\romc.exe" />
<None Include="Resources\apps\flips.exe" />
<None Include="Resources\apps\xdelta3.exe" />
<None Include="Resources\icons\brick.ico" />
Expand Down
13 changes: 13 additions & 0 deletions FriishProduce/MainForm.Designer.cs
View file

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

1 change: 1 addition & 0 deletions FriishProduce/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ private void RefreshForm()
Text = Program.Lang.ApplicationTitle;

ToolStrip_NewProject.Text = menu_new_project.Text;
ToolStrip_OpenProject.Text = menu_open_project.Text;
ToolStrip_SaveAs.Text = menu_save_project_as.Text;
ToolStrip_ExportWAD.Text = menu_save_as_wad.Text;
ToolStrip_OpenROM.Text = menu_open_gamefile.Text;
Expand Down
175 changes: 113 additions & 62 deletions FriishProduce/MainForm.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,14 +164,45 @@
<data name="MenuStrip.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8pt</value>
</data>
<data name="MenuStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="MenuStrip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>1, 0, 1, 0</value>
</data>
<data name="MenuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1120, 20</value>
</data>
<data name="MenuStrip.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
</data>
<data name="&gt;&gt;MenuStrip.Name" xml:space="preserve">
<value>MenuStrip</value>
</data>
<data name="&gt;&gt;MenuStrip.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MenuStrip.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;MenuStrip.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="menu_file.Size" type="System.Drawing.Size, System.Drawing">
<value>33, 20</value>
</data>
<data name="menu_file.Text" xml:space="preserve">
<value>file</value>
</data>
<data name="menu_new_project.Size" type="System.Drawing.Size, System.Drawing">
<value>154, 22</value>
<value>180, 22</value>
</data>
<data name="menu_new_project.Text" xml:space="preserve">
<value>new_project</value>
</data>
<data name="menu_open_project.Size" type="System.Drawing.Size, System.Drawing">
<value>154, 22</value>
<value>180, 22</value>
</data>
<data name="menu_open_project.Text" xml:space="preserve">
<value>open_project</value>
Expand All @@ -180,7 +211,7 @@
<value>False</value>
</data>
<data name="menu_save_project_as.Size" type="System.Drawing.Size, System.Drawing">
<value>154, 22</value>
<value>180, 22</value>
</data>
<data name="menu_save_project_as.Text" xml:space="preserve">
<value>save_project_as</value>
Expand All @@ -189,34 +220,34 @@
<value>False</value>
</data>
<data name="menu_save_as_wad.Size" type="System.Drawing.Size, System.Drawing">
<value>154, 22</value>
<value>180, 22</value>
</data>
<data name="menu_save_as_wad.Text" xml:space="preserve">
<value>save_as_wad</value>
</data>
<data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
<value>151, 6</value>
<value>177, 6</value>
</data>
<data name="menu_settings.Size" type="System.Drawing.Size, System.Drawing">
<value>154, 22</value>
<value>180, 22</value>
</data>
<data name="menu_settings.Text" xml:space="preserve">
<value>settings</value>
</data>
<data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
<value>151, 6</value>
<value>177, 6</value>
</data>
<data name="menu_exit.Size" type="System.Drawing.Size, System.Drawing">
<value>154, 22</value>
<value>180, 22</value>
</data>
<data name="menu_exit.Text" xml:space="preserve">
<value>exit</value>
</data>
<data name="menu_file.Size" type="System.Drawing.Size, System.Drawing">
<value>33, 20</value>
<data name="menu_project.Size" type="System.Drawing.Size, System.Drawing">
<value>53, 20</value>
</data>
<data name="menu_file.Text" xml:space="preserve">
<value>file</value>
<data name="menu_project.Text" xml:space="preserve">
<value>project</value>
</data>
<data name="menu_open_gamefile.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
Expand Down Expand Up @@ -260,11 +291,11 @@
<data name="menu_close_project.Text" xml:space="preserve">
<value>close_project</value>
</data>
<data name="menu_project.Size" type="System.Drawing.Size, System.Drawing">
<value>53, 20</value>
<data name="menu_help.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 20</value>
</data>
<data name="menu_project.Text" xml:space="preserve">
<value>project</value>
<data name="menu_help.Text" xml:space="preserve">
<value>help</value>
</data>
<data name="menu_tutorial.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
Expand Down Expand Up @@ -296,39 +327,68 @@
<data name="menu_about.Text" xml:space="preserve">
<value>about</value>
</data>
<data name="menu_help.Size" type="System.Drawing.Size, System.Drawing">
<value>39, 20</value>
<data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 6</value>
</data>
<data name="menu_help.Text" xml:space="preserve">
<value>help</value>
<data name="&gt;&gt;welcome_do_not_show.Name" xml:space="preserve">
<value>welcome_do_not_show</value>
</data>
<data name="MenuStrip.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
<data name="&gt;&gt;welcome_do_not_show.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="MenuStrip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>1, 0, 1, 0</value>
<data name="&gt;&gt;welcome_do_not_show.Parent" xml:space="preserve">
<value>MainPanel</value>
</data>
<data name="MenuStrip.Size" type="System.Drawing.Size, System.Drawing">
<value>1120, 20</value>
<data name="&gt;&gt;welcome_do_not_show.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="MenuStrip.TabIndex" type="System.Int32, mscorlib">
<value>5</value>
<data name="&gt;&gt;PointToTutorial.Name" xml:space="preserve">
<value>PointToTutorial</value>
</data>
<data name="&gt;&gt;MenuStrip.Name" xml:space="preserve">
<value>MenuStrip</value>
<data name="&gt;&gt;PointToTutorial.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MenuStrip.Type" xml:space="preserve">
<value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;PointToTutorial.Parent" xml:space="preserve">
<value>MainPanel</value>
</data>
<data name="&gt;&gt;MenuStrip.Parent" xml:space="preserve">
<value>$this</value>
<data name="&gt;&gt;PointToTutorial.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="&gt;&gt;MenuStrip.ZOrder" xml:space="preserve">
<data name="&gt;&gt;welcome.Name" xml:space="preserve">
<value>welcome</value>
</data>
<data name="&gt;&gt;welcome.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;welcome.Parent" xml:space="preserve">
<value>MainPanel</value>
</data>
<data name="&gt;&gt;welcome.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 6</value>
<data name="MainPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="MainPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 45</value>
</data>
<data name="MainPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>1120, 532</value>
</data>
<data name="MainPanel.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="&gt;&gt;MainPanel.Name" xml:space="preserve">
<value>MainPanel</value>
</data>
<data name="&gt;&gt;MainPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MainPanel.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;MainPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="welcome_do_not_show.Font" type="System.Drawing.Font, System.Drawing">
<value>Tahoma, 8.25pt</value>
Expand Down Expand Up @@ -426,30 +486,6 @@
<data name="&gt;&gt;welcome.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="MainPanel.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="MainPanel.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 45</value>
</data>
<data name="MainPanel.Size" type="System.Drawing.Size, System.Drawing">
<value>1120, 532</value>
</data>
<data name="MainPanel.TabIndex" type="System.Int32, mscorlib">
<value>6</value>
</data>
<data name="&gt;&gt;MainPanel.Name" xml:space="preserve">
<value>MainPanel</value>
</data>
<data name="&gt;&gt;MainPanel.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;MainPanel.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;MainPanel.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="ToolStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>622, 17</value>
</metadata>
Expand All @@ -471,6 +507,15 @@
<data name="ToolStrip_NewProject.Text" xml:space="preserve">
<value>new_project</value>
</data>
<data name="ToolStrip_OpenProject.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
<value>Magenta</value>
</data>
<data name="ToolStrip_OpenProject.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 22</value>
</data>
<data name="ToolStrip_OpenProject.Text" xml:space="preserve">
<value>open_project</value>
</data>
<data name="ToolStrip_SaveAs.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
Expand Down Expand Up @@ -3257,6 +3302,12 @@
<data name="&gt;&gt;BrowseProject.Type" xml:space="preserve">
<value>System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;ToolStrip_OpenProject.Name" xml:space="preserve">
<value>ToolStrip_OpenProject</value>
</data>
<data name="&gt;&gt;ToolStrip_OpenProject.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripButton, 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
13 changes: 8 additions & 5 deletions FriishProduce/ProjectForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,12 @@ public void Save()
p.Options = CO?.Options ?? null;
p.LibRetro = LibRetro;
p.WADRegion = TargetRegion.SelectedIndex;
p.BaseNumber = Base.SelectedIndex;
p.Base = (Base.SelectedIndex, 0);
p.LinkSaveDataTitle = LinkSaveData.Checked;
p.ImageOptions = (imageintpl.SelectedIndex, image_fit.Checked);

for (int i = 0; i < BaseRegionList.Items.Count; i++)
if (BaseRegionList.Items[i].GetType() == typeof(ToolStripMenuItem) && (BaseRegionList.Items[i] as ToolStripMenuItem).Checked) p.BaseRegion = i;
if (BaseRegionList.Items[i].GetType() == typeof(ToolStripMenuItem) && (BaseRegionList.Items[i] as ToolStripMenuItem).Checked) p.Base = (Base.SelectedIndex, i);

using (Stream stream = File.Open(Parent.SaveProject.FileName, FileMode.Create))
{
Expand Down Expand Up @@ -366,11 +367,11 @@ private void Form_Shown(object sender, EventArgs e)
Img.LoadToSource(ParentProject.Img);
LoadImage(ParentProject.Img);

Base.SelectedIndex = ParentProject.BaseNumber;
Base.SelectedIndex = ParentProject.Base.Item1;
for (int i = 0; i < BaseRegionList.Items.Count; i++)
if (BaseRegionList.Items[i].GetType() == typeof(ToolStripMenuItem)) (BaseRegionList.Items[i] as ToolStripMenuItem).Checked = false;
(BaseRegionList.Items[ParentProject.BaseRegion] as ToolStripMenuItem).Checked = true;
UpdateBaseForm(ParentProject.BaseRegion);
(BaseRegionList.Items[ParentProject.Base.Item2] as ToolStripMenuItem).Checked = true;
UpdateBaseForm(ParentProject.Base.Item2);

SetROMDataText();

Expand All @@ -382,6 +383,8 @@ private void Form_Shown(object sender, EventArgs e)
TitleID.Text = Creator.TitleID;
TargetRegion.SelectedIndex = ParentProject.WADRegion;
LinkSaveData.Checked = ParentProject.LinkSaveDataTitle;
imageintpl.SelectedIndex = ParentProject.ImageOptions.Item1;
image_fit.Checked = ParentProject.ImageOptions.Item2;

PatchFile = File.Exists(ParentProject.PatchFile) ? ParentProject.PatchFile : null;
Patch.Checked = !string.IsNullOrWhiteSpace(ParentProject.PatchFile);
Expand Down
Loading

0 comments on commit 1b58b24

Please sign in to comment.