diff --git a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs index b67b2e6688..0073cf9ed6 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.Designer.cs @@ -1096,7 +1096,7 @@ namespace BizHawk.Client.EmuHawk // // FirmwaresMenuItem // - this.FirmwaresMenuItem.Text = "&Firmwares..."; + this.FirmwaresMenuItem.Text = "&Firmware..."; this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); // // MessagesMenuItem @@ -2325,7 +2325,7 @@ namespace BizHawk.Client.EmuHawk // // toolStripMenuItem11 // - this.toolStripMenuItem11.Text = "&Firmwares..."; + this.toolStripMenuItem11.Text = "&Firmware..."; this.toolStripMenuItem11.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); // // toolStripMenuItem12 diff --git a/src/BizHawk.Client.EmuHawk/MainForm.cs b/src/BizHawk.Client.EmuHawk/MainForm.cs index d78c666f68..8f121f29ec 100644 --- a/src/BizHawk.Client.EmuHawk/MainForm.cs +++ b/src/BizHawk.Client.EmuHawk/MainForm.cs @@ -3841,10 +3841,10 @@ namespace BizHawk.Client.EmuHawk if (FirmwareManager.RecentlyServed.Count > 0) { - Console.WriteLine("Active Firmwares:"); + Console.WriteLine("Active firmware:"); foreach (var f in FirmwareManager.RecentlyServed) { - Console.WriteLine($" {f.ID} : {f.Hash}"); + Console.WriteLine($"\t{f.ID} : {f.Hash}"); } } diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs index d77cf825b0..a843ba2c71 100644 --- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs @@ -353,7 +353,7 @@ namespace BizHawk.Client.EmuHawk this.Name = "FirmwaresConfig"; this.ShowIcon = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Firmwares"; + this.Text = "Firmware"; this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FirmwaresConfig_FormClosed); this.Load += new System.EventHandler(this.FirmwaresConfig_Load); this.lvFirmwaresContextMenuStrip.ResumeLayout(false); diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs index 2f57405e42..6569b50338 100644 --- a/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs @@ -179,8 +179,8 @@ namespace BizHawk.Client.EmuHawk private void FirmwaresConfig_Load(object sender, EventArgs e) { - string GetSystemGroupName(string sysID) => SystemGroupNames.TryGetValue(sysID, out var name) ? name : "FIX ME (FirmwaresConfig.cs)"; - + string GetSystemGroupName(string sysID) + => SystemGroupNames.TryGetValue(sysID, out var name) ? name : $"FIX ME ({nameof(FirmwaresConfig)}.{nameof(SystemGroupNames)})"; ListViewGroup AddGroup(string sysID) { lvFirmwares.Groups.Add( @@ -377,7 +377,11 @@ namespace BizHawk.Client.EmuHawk private void TbbOrganize_Click(object sender, EventArgs e) { - if (!this.ModalMessageBox2("This is going to move/rename every automatically-selected firmware file under your configured firmwares directory to match our recommended organizational scheme (which is not super great right now). Proceed?", "Firmwares Organization Confirm", useOKCancel: true)) + if (!this.ModalMessageBox2( + caption: "Organize firmware", + text: "This is going to move/rename every automatically-selected firmware file under your configured Firmware folder to match our recommended organizational scheme (which is not super great right now)." + + "\nProceed?", + useOKCancel: true)) { return; } diff --git a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs index af2f3756b0..18929a279b 100644 --- a/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs +++ b/src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs @@ -146,7 +146,7 @@ namespace BizHawk.Emulation.Cores.Computers.AmstradCPC var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware(new("AmstradCPC", n))).FirstOrDefault(b => b != null && b.Length == length); if (result == null) { - throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}"); + throw new MissingFirmwareException($"At least one of these firmware options is required: {string.Join(", ", names)}"); } return result; diff --git a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs b/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs index 8b58d4e318..7a187cf991 100644 --- a/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs +++ b/src/BizHawk.Emulation.Cores/Computers/Commodore64/C64.cs @@ -252,7 +252,7 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64 var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware(new("C64", n))).FirstOrDefault(b => b != null && b.Length == length); if (result == null) { - throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}"); + throw new MissingFirmwareException($"At least one of these firmware options is required: {string.Join(", ", names)}"); } return result; diff --git a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs index 5ada524537..6f6742a98d 100644 --- a/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs +++ b/src/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.cs @@ -202,7 +202,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum var result = names.Select(n => CoreComm.CoreFileProvider.GetFirmware(new("ZXSpectrum", n))).FirstOrDefault(b => b != null && b.Length == length); if (result == null) { - throw new MissingFirmwareException($"At least one of these firmwares is required: {string.Join(", ", names)}"); + throw new MissingFirmwareException($"At least one of these firmware options is required: {string.Join(", ", names)}"); } return result; diff --git a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs index 8cc473e6c5..e72eda3dd7 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs @@ -35,7 +35,7 @@ namespace BizHawk.Emulation.Cores.PCEngine var (rom, biosInfo) = lp.Comm.CoreFileProvider.GetFirmwareWithGameInfoOrThrow( new("PCECD", "Bios"), - "PCE-CD System Card not found. Please check the BIOS settings in Config->Firmwares."); + "PCE-CD System Card not found. Please check the BIOS settings in Config > Firmware..."); if (biosInfo.Status == RomStatus.BadDump) { diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs index 9355947b80..72eef4580b 100644 --- a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs +++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.cs @@ -262,7 +262,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx if (firmwareID != null) { // this path will be the most common PEBKAC error, so be a bit more vocal about the problem - srcdata = CoreComm.CoreFileProvider.GetFirmware(firmwareID.Value, "GPGX firmwares are usually required."); + srcdata = CoreComm.CoreFileProvider.GetFirmware(firmwareID.Value, "GPGX firmware is usually required."); if (srcdata == null) { _firmwareRequestFailed = true;