Skip to content

Commit

Permalink
Consolidation of GameData section + some bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@CatmanFan
CatmanFan committed Jun 18, 2024
1 parent 495afa7 commit 1c4c99c
Show file tree
Hide file tree
Showing 11 changed files with 463 additions and 474 deletions.
1 change: 0 additions & 1 deletion FriishProduce/FriishProduce.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,6 @@
<Compile Include="_classes\Program\MessageBox.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="_classes\Databases\GameData.cs" />
<Compile Include="_classes\Program\Paths.cs" />
<Compile Include="_classes\Files\ROM\_base.cs" />
<Compile Include="_classes\Helpers\ImageHelper.cs" />
Expand Down
51 changes: 26 additions & 25 deletions FriishProduce/MainForm.Designer.cs
View file

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

2 changes: 1 addition & 1 deletion FriishProduce/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ private void OpenProject_Click(object sender, EventArgs e)
addTab(project.Platform, project);
}

catch
catch (Exception ex)
{
MessageBox.Show("Not a valid project file!", MessageBox.Buttons.Ok, MessageBox.Icons.Error);
}
Expand Down
81 changes: 39 additions & 42 deletions FriishProduce/MainForm.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,13 +162,13 @@
<value>False</value>
</data>
<data name="menu_new_project.Size" type="System.Drawing.Size, System.Drawing">
<value>155, 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>155, 22</value>
<value>180, 22</value>
</data>
<data name="menu_open_project.Text" xml:space="preserve">
<value>open_project</value>
Expand All @@ -177,34 +177,22 @@
<value>False</value>
</data>
<data name="menu_save_project_as.Size" type="System.Drawing.Size, System.Drawing">
<value>155, 22</value>
<value>180, 22</value>
</data>
<data name="menu_save_project_as.Text" xml:space="preserve">
<value>save_project_as</value>
</data>
<data name="menu_save_as_wad.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="menu_save_as_wad.Size" type="System.Drawing.Size, System.Drawing">
<value>155, 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>152, 6</value>
</data>
<data name="menu_settings.Size" type="System.Drawing.Size, System.Drawing">
<value>155, 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>152, 6</value>
<value>177, 6</value>
</data>
<data name="menu_exit.Size" type="System.Drawing.Size, System.Drawing">
<value>155, 22</value>
<value>180, 22</value>
</data>
<data name="menu_exit.Text" xml:space="preserve">
<value>exit</value>
Expand Down Expand Up @@ -248,6 +236,18 @@
<data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 6</value>
</data>
<data name="menu_save_as_wad.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="menu_save_as_wad.Size" type="System.Drawing.Size, System.Drawing">
<value>209, 22</value>
</data>
<data name="menu_save_as_wad.Text" xml:space="preserve">
<value>save_as_wad</value>
</data>
<data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 6</value>
</data>
<data name="menu_close_project.Enabled" type="System.Boolean, mscorlib">
<value>False</value>
</data>
Expand Down Expand Up @@ -300,9 +300,6 @@
<data name="&gt;&gt;MenuStrip.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
<value>6, 6</value>
</data>
<data name="Logo.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
Expand Down Expand Up @@ -492,6 +489,9 @@
<metadata name="BrowseProject.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>229, 17</value>
</metadata>
<data name="toolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
<value>206, 6</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
Expand Down Expand Up @@ -2903,9 +2903,6 @@
AAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAhAAAAIQBAAD8HwAA//8AAP//AAA=
</value>
</data>
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
<value>16, 110</value>
</data>
Expand Down Expand Up @@ -2957,18 +2954,6 @@
<data name="&gt;&gt;menu_save_project_as.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menu_save_as_wad.Name" xml:space="preserve">
<value>menu_save_as_wad</value>
</data>
<data name="&gt;&gt;menu_save_as_wad.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;toolStripMenuItem1.Name" xml:space="preserve">
<value>toolStripMenuItem1</value>
</data>
<data name="&gt;&gt;toolStripMenuItem1.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menu_settings.Name" xml:space="preserve">
<value>menu_settings</value>
</data>
Expand Down Expand Up @@ -3023,6 +3008,18 @@
<data name="&gt;&gt;toolStripSeparator2.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menu_save_as_wad.Name" xml:space="preserve">
<value>menu_save_as_wad</value>
</data>
<data name="&gt;&gt;menu_save_as_wad.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;toolStripSeparator3.Name" xml:space="preserve">
<value>toolStripSeparator3</value>
</data>
<data name="&gt;&gt;toolStripSeparator3.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;menu_close_project.Name" xml:space="preserve">
<value>menu_close_project</value>
</data>
Expand All @@ -3041,12 +3038,6 @@
<data name="&gt;&gt;menu_about_app.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;toolStripSeparator3.Name" xml:space="preserve">
<value>toolStripSeparator3</value>
</data>
<data name="&gt;&gt;toolStripSeparator3.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;toolbarNewProject.Name" xml:space="preserve">
<value>toolbarNewProject</value>
</data>
Expand Down Expand Up @@ -3131,6 +3122,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;toolStripSeparator5.Name" xml:space="preserve">
<value>toolStripSeparator5</value>
</data>
<data name="&gt;&gt;toolStripSeparator5.Type" xml:space="preserve">
<value>System.Windows.Forms.ToolStripSeparator, 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 1c4c99c

Please sign in to comment.