diff --git a/src/BizHawk.Client.EmuHawk/Properties/Resources.cs b/src/BizHawk.Client.EmuHawk/Properties/Resources.cs index 3f838107b15..8ac1e957141 100644 --- a/src/BizHawk.Client.EmuHawk/Properties/Resources.cs +++ b/src/BizHawk.Client.EmuHawk/Properties/Resources.cs @@ -88,6 +88,12 @@ internal static class Resources internal static readonly Bitmap Erase = ReadEmbeddedBitmap("Erase"); internal static readonly Bitmap ESE = ReadEmbeddedBitmap("ESE"); internal static readonly Bitmap ExclamationRed = ReadEmbeddedBitmap("ExclamationRed"); + internal static readonly Bitmap FFaccept = ReadEmbeddedBitmap("Farm-Fresh_accept"); + internal static readonly Bitmap FFcancel = ReadEmbeddedBitmap("Farm-Fresh_cancel"); + internal static readonly Bitmap FFdelete = ReadEmbeddedBitmap("Farm-Fresh_delete"); + internal static readonly Bitmap FFexclamation = ReadEmbeddedBitmap("Farm-Fresh_exclamation"); + internal static readonly Bitmap FFhelp = ReadEmbeddedBitmap("Farm-Fresh_help"); + internal static readonly Bitmap FFstar = ReadEmbeddedBitmap("Farm-Fresh_star"); internal static readonly Bitmap FastForward = ReadEmbeddedBitmap("FastForward"); internal static readonly Bitmap Find = ReadEmbeddedBitmap("FindHS"); internal static readonly Bitmap Forward = ReadEmbeddedBitmap("Forward"); diff --git a/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs b/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs index 4c091231726..179d4fc04cf 100644 --- a/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs @@ -36,17 +36,17 @@ public partial class FirmwareConfig : Form, IDialogParent [FirmwareOptionStatus.Unknown] = STATUS_DESC_UNUSED, [FirmwareOptionStatus.Unacceptable] = "NO: This doesn't work on the core", [FirmwareOptionStatus.Acceptable] = "OK: This works on the core", - [FirmwareOptionStatus.Ideal] = "PERFECT: Ideal for TASing and anything.", + [FirmwareOptionStatus.Ideal] = "PERFECT: Ideal for TASing and anything", }; internal static readonly IReadOnlyDictionary StatusIcons = new Dictionary { - [FirmwareOptionStatus.Unset] = Properties.Resources.ExclamationRed, - [FirmwareOptionStatus.Bad] = Properties.Resources.ThumbsDown, // in this main view, bad dumps use this thumbs down (to differentiate from unset); in a record's info view, they use unset's red '!' (to differentiate from unacceptable) - [FirmwareOptionStatus.Unknown] = Properties.Resources.RetroQuestion, - [FirmwareOptionStatus.Unacceptable] = Properties.Resources.ThumbsDown, - [FirmwareOptionStatus.Acceptable] = Properties.Resources.GreenCheck, - [FirmwareOptionStatus.Ideal] = Properties.Resources.Freeze, + [FirmwareOptionStatus.Unset] = Properties.Resources.FFhelp, + [FirmwareOptionStatus.Bad] = Properties.Resources.FFdelete, + [FirmwareOptionStatus.Unknown] = Properties.Resources.FFexclamation, + [FirmwareOptionStatus.Unacceptable] = Properties.Resources.FFcancel, + [FirmwareOptionStatus.Acceptable] = Properties.Resources.FFaccept, + [FirmwareOptionStatus.Ideal] = Properties.Resources.FFstar, }; private readonly IDictionary _firmwareUserSpecifications; @@ -328,10 +328,19 @@ private void DoScan() else { var fo = FirmwareDatabase.FirmwareOptions.FirstOrNull(fo => fo.Hash == hash); - lvi.ImageIndex = (int) (fo?.Status ?? FirmwareOptionStatus.Unset); // null here means it's an option for a different record, so use the red '!' like unset - lvi.ToolTipText = fo?.IsAcceptableOrIdeal == true - ? "Good! This file has been bound to some kind of a decent choice" - : "Bad! This file has been bound to a choice which is known to be bad (details in right-click > Info)"; + lvi.ImageIndex = (int) (fo?.Status ?? FirmwareOptionStatus.Unset); + if (fo?.Status == FirmwareOptionStatus.Ideal) + { + lvi.ToolTipText = "Perfect! This file has been bound to an ideal choice"; + } + else if (fo?.Status == FirmwareOptionStatus.Acceptable) + { + lvi.ToolTipText = "Good! This file has been bound to some kind of a decent choice"; + } + else + { + lvi.ToolTipText = "Bad! This file has been bound to a choice which is known to be bad (details in right-click -> Info)"; + } lvi.SubItems[4].Text = ri.KnownFirmwareFile.Value.Description; } @@ -545,7 +554,7 @@ private void TsmiInfo_Click(object sender, EventArgs e) olvi.SubItems.Add(new ListViewItem.ListViewSubItem()); olvi.SubItems.Add(new ListViewItem.ListViewSubItem()); var ff = FirmwareDatabase.FirmwareFilesByOption[o]; - olvi.ImageIndex = (int) (o.Status is FirmwareOptionStatus.Bad ? FirmwareOptionStatus.Unset : o.Status); // if bad, use unset's red '!' to differentiate from unacceptable + olvi.ImageIndex = (int) o.Status; olvi.ToolTipText = StatusDescs[o.Status]; olvi.SubItems[0].Text = ff.Size.ToString(); olvi.SubItems[0].Font = Font; // why doesn't this work? diff --git a/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_accept.png b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_accept.png new file mode 100644 index 00000000000..18d5af55c37 Binary files /dev/null and b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_accept.png differ diff --git a/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_cancel.png b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_cancel.png new file mode 100644 index 00000000000..18d46dbe053 Binary files /dev/null and b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_cancel.png differ diff --git a/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_delete.png b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_delete.png new file mode 100644 index 00000000000..7678caa6f4a Binary files /dev/null and b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_delete.png differ diff --git a/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_exclamation.png b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_exclamation.png new file mode 100644 index 00000000000..ead040efd92 Binary files /dev/null and b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_exclamation.png differ diff --git a/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_help.png b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_help.png new file mode 100644 index 00000000000..37768c8ad8c Binary files /dev/null and b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_help.png differ diff --git a/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_readme.txt b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_readme.txt new file mode 100644 index 00000000000..12a18082a13 --- /dev/null +++ b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_readme.txt @@ -0,0 +1,8 @@ +Free FatCow-Farm Fresh Icons +http://www.fatcow.com/free-icons + +These icons are licensed under a Creative Commons Attribution 3.0 License +http://creativecommons.org/licenses/by/3.0/us/ + +Size and colors adjusted by feos +https://github.com/TASEmulators/BizHawk \ No newline at end of file diff --git a/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_star.png b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_star.png new file mode 100644 index 00000000000..f86a8b3926f Binary files /dev/null and b/src/BizHawk.Client.EmuHawk/images/Farm-Fresh_star.png differ