ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Firmware Manager - Change wording to "Close and reload ROM" instead of "Close and load ROM", add tool tip displaying ROM path.

This commit is contained in:
scrimpeh 2015-07-15 08:31:03 +02:00
parent 9845160cc5
commit 7b25254b72
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/MainForm.Events.cs
View File

@ -883,8 +883,8 @@ namespace BizHawk.Client.EmuHawk
if (e is RomLoader.RomErrorArgs) if (e is RomLoader.RomErrorArgs)
{ {
var args = e as RomLoader.RomErrorArgs; var args = e as RomLoader.RomErrorArgs;
var firmwaredialog = new FirmwaresConfig(true).ShowDialog(); var result = new FirmwaresConfig(true, args.RomPath).ShowDialog();
args.Retry = firmwaredialog == DialogResult.Retry; args.Retry = result == DialogResult.Retry;
} }
else else
{ {

4
BizHawk.Client.EmuHawk/config/FirmwaresConfig.Designer.cs generated
View File

@ -282,8 +282,8 @@
this.tbbCloseReload.Image = ((System.Drawing.Image)(resources.GetObject("tbbCloseReload.Image"))); this.tbbCloseReload.Image = ((System.Drawing.Image)(resources.GetObject("tbbCloseReload.Image")));
this.tbbCloseReload.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbbCloseReload.ImageTransparentColor = System.Drawing.Color.Magenta;
this.tbbCloseReload.Name = "tbbCloseReload"; this.tbbCloseReload.Name = "tbbCloseReload";
this.tbbCloseReload.Size = new System.Drawing.Size(119, 22); this.tbbCloseReload.Size = new System.Drawing.Size(129, 22);
this.tbbCloseReload.Text = "Close and load ROM"; this.tbbCloseReload.Text = "Close and reload ROM";
this.tbbCloseReload.ToolTipText = "Close and reload ROM"; this.tbbCloseReload.ToolTipText = "Close and reload ROM";
this.tbbCloseReload.Visible = false; this.tbbCloseReload.Visible = false;
this.tbbCloseReload.Click += new System.EventHandler(this.tbbCloseReload_Click); this.tbbCloseReload.Click += new System.EventHandler(this.tbbCloseReload_Click);

15
BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -57,8 +57,6 @@ namespace BizHawk.Client.EmuHawk
private const int idMissing = 1; private const int idMissing = 1;
private const int idOk = 2; private const int idOk = 2;
RomLoader.RomErrorArgs RomErrorArgs;
Font fixedFont, boldFont, boldFixedFont; Font fixedFont, boldFont, boldFixedFont;
class ListViewSorter : IComparer class ListViewSorter : IComparer
@ -82,7 +80,7 @@ namespace BizHawk.Client.EmuHawk
string currSelectorDir; string currSelectorDir;
ListViewSorter listviewSorter; ListViewSorter listviewSorter;
public FirmwaresConfig(bool retryLoadRom = false) public FirmwaresConfig(bool retryLoadRom = false, string reloadRomPath = null)
{ {
InitializeComponent(); InitializeComponent();
@ -96,6 +94,17 @@ namespace BizHawk.Client.EmuHawk
toolStripSeparator1.Visible = true; toolStripSeparator1.Visible = true;
tbbCloseReload.Visible = true; tbbCloseReload.Visible = true;
tbbCloseReload.Enabled = true; tbbCloseReload.Enabled = true;
if (string.IsNullOrWhiteSpace(reloadRomPath))
{
tbbCloseReload.ToolTipText = "Close Firmware Manager and reload ROM";
}
else
{
tbbCloseReload.ToolTipText = "Close Firmware Manager and reload " + reloadRomPath;
}
} }
} }