Minor fixes

CatmanFan · Mar 11, 2024 · 10ce197 · 10ce197
1 parent 99343ac
commit 10ce197
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 5 deletions.
diff --git a/FriishProduce/FriishProduce.csproj b/FriishProduce/FriishProduce.csproj
@@ -318,6 +318,7 @@
   <ItemGroup>
     <Content Include="Database.xml" />
     <Content Include="icon.ico" />
+    <None Include="Resources\icons\msx.png" />
     <None Include="Resources\icons\globe-model.png" />
     <EmbeddedResource Include="Strings\en.xml" />
     <None Include="Resources\icons\mr-saturn.png" />

diff --git 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
@@ -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
diff --git a/FriishProduce/Properties/Resources.resx b/FriishProduce/Properties/Resources.resx
@@ -298,4 +298,7 @@
   <data name="ForwarderV14" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\forwarder\forwarder_v14.dol;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="msx" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icons\msx.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/FriishProduce/Resources/icons/msx.png b/FriishProduce/Resources/icons/msx.png