From 10ce1971bbedde780fe77cf05f30e4030e318f6c Mon Sep 17 00:00:00 2001 From: CatmanFan Date: Mon, 11 Mar 2024 05:57:08 +0100 Subject: [PATCH] Minor fixes --- FriishProduce/FriishProduce.csproj | 1 + FriishProduce/InjectorForm.cs | 11 +++++++---- FriishProduce/MainForm.cs | 8 +++++++- FriishProduce/Properties/Resources.Designer.cs | 10 ++++++++++ FriishProduce/Properties/Resources.resx | 3 +++ FriishProduce/Resources/icons/msx.png | Bin 0 -> 511 bytes 6 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 FriishProduce/Resources/icons/msx.png diff --git a/FriishProduce/FriishProduce.csproj b/FriishProduce/FriishProduce.csproj index a035b4fc..bc068409 100644 --- a/FriishProduce/FriishProduce.csproj +++ b/FriishProduce/FriishProduce.csproj @@ -318,6 +318,7 @@ + diff --git a/FriishProduce/InjectorForm.cs b/FriishProduce/InjectorForm.cs index 9a544d2b..1d9a51ba 100644 --- a/FriishProduce/InjectorForm.cs +++ b/FriishProduce/InjectorForm.cs @@ -137,7 +137,7 @@ public void RefreshForm() } InjectorsList.SelectedIndex = 0; - InjectorsList.Enabled = InjectorsList.Items.Count > 1; + label3.Enabled = InjectorsList.Enabled = InjectorsList.Items.Count > 1; if (Properties.Settings.Default.ImageFitAspectRatio) radioButton2.Checked = true; else radioButton1.Checked = true; } @@ -575,7 +575,7 @@ public void LoadROM(string ROMpath, bool UseLibRetro = true) break; } - ROM.Path = ROMpath; + if (ROM != null) ROM.Path = ROMpath; ROMLoaded = true; PatchFile = null; @@ -874,6 +874,8 @@ private void AddBases() } if (Base.Items.Count > 0) { Base.SelectedIndex = 0; } + + Base.Enabled = Base.Items.Count > 1; } @@ -1294,8 +1296,9 @@ private void InjectorsList_SelectedIndexChanged(object sender, EventArgs e) else COPanel_Forwarder.Show(); - var selected = COPanel_Forwarder.Visible ? COPanel_Forwarder : COPanel_VC; - groupBox4.Size = new Size(groupBox4.Width, selected.Location.Y + selected.Height + 7); + var selected = COPanel_Forwarder.Visible ? COPanel_Forwarder : COPanel_VC.Visible ? COPanel_VC : null; + int height = selected == null ? InjectorsList.Location.Y + InjectorsList.Height + 10 : selected.Location.Y + selected.Height + 10; + groupBox4.Size = new Size(groupBox4.Width, height); if (groupBox4.Enabled) CheckExport(); } } diff --git a/FriishProduce/MainForm.cs b/FriishProduce/MainForm.cs index 9569ab18..77c6feea 100644 --- a/FriishProduce/MainForm.cs +++ b/FriishProduce/MainForm.cs @@ -56,7 +56,9 @@ private void AutoSetStrip() // new ToolStripSeparator(), new ToolStripMenuItem(null, new Icon(Properties.Resources.snk_neo_geo_aes, 16, 16).ToBitmap(), AddProject, Console.NeoGeo.ToString()), new ToolStripSeparator(), - new ToolStripMenuItem(null, new Icon(SystemIcons.Shield, 16, 16).ToBitmap(), AddProject, Console.MSX.ToString()) + new ToolStripMenuItem(null, Properties.Resources.msx, AddProject, Console.MSX.ToString()), + // new ToolStripSeparator(), + // new ToolStripMenuItem(null, Properties.Resources.flash, AddProject, Console.Flash.ToString()) //}) }; @@ -275,6 +277,10 @@ private void BrowseROMDialog(Console c, InjectorForm currentForm) case Console.NeoGeo: BrowseROM.Filter = Language.Get("Filter.ZIP"); break; + + case Console.Flash: + BrowseROM.Filter = Language.Get("Filter.SWF"); + break; } if (BrowseROM.ShowDialog() == DialogResult.OK) diff --git a/FriishProduce/Properties/Resources.Designer.cs b/FriishProduce/Properties/Resources.Designer.cs index 57edcb3c..ff4fd92c 100644 --- a/FriishProduce/Properties/Resources.Designer.cs +++ b/FriishProduce/Properties/Resources.Designer.cs @@ -458,6 +458,16 @@ public static System.Drawing.Bitmap mr_saturn { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap msx { + get { + object obj = ResourceManager.GetObject("msx", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// diff --git a/FriishProduce/Properties/Resources.resx b/FriishProduce/Properties/Resources.resx index e5a94097..c852bdc6 100644 --- a/FriishProduce/Properties/Resources.resx +++ b/FriishProduce/Properties/Resources.resx @@ -298,4 +298,7 @@ ..\Resources\forwarder\forwarder_v14.dol;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\icons\msx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/FriishProduce/Resources/icons/msx.png b/FriishProduce/Resources/icons/msx.png new file mode 100644 index 0000000000000000000000000000000000000000..0f3efbdf06f86093b1e10c9e579df77eae8d039b GIT binary patch literal 511 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0hCEZK~y+T?UKJs z0%07+zxRVwG+Yvsa42;YwMDF4Y;tgGbPk(rcM2yFhrme`j0hYea4_&65ELUJoV7~= zy@IPeJ@41s`<~SwkV8uk9PfL_^FHr~=X(@F2v!mOwf$j@SW`%V6#MEds)kGrB;#>qbDo z-?mk&S4uRx$KWEN)oN?`eAY~gBO=JdA*VYW8&oiOFl{z(tb*`{;_)NV2q3LveB8BB zHegC)5=$Z6z78zQ8Xi0eG6DRsKqm74E3X^?@CnqW&Uc>w?b002ovPDHLkV1j=W B*&YA@ literal 0 HcmV?d00001