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

Use CoreInventory to determine systems hidden in PathConfig

This commit is contained in:
YoshiRulz 2021-11-15 20:56:21 +10:00
parent 1785d51c1d
commit d58c5d7e8a
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/BizHawk.Client.Common/config/PathEntry.cs
View File

@ -1,5 +1,4 @@
using System.Linq; using Newtonsoft.Json;
using Newtonsoft.Json;
namespace BizHawk.Client.Common namespace BizHawk.Client.Common
{ {
@ -25,8 +24,6 @@ namespace BizHawk.Client.Common
} }
internal bool IsSystem(string systemID) internal bool IsSystem(string systemID)
{ => PathEntryCollection.InGroup(systemID, System);
return systemID == System || System.Split('_').Contains(systemID);
}
} }
} }

3
src/BizHawk.Client.Common/config/PathEntryCollection.cs
View File

@ -70,6 +70,9 @@ namespace BizHawk.Client.Common
return newDispName; return newDispName;
} }
public static bool InGroup(string sysID, string group)
=> sysID == group || group.Split('_').Contains(sysID);
public List<PathEntry> Paths { get; } public List<PathEntry> Paths { get; }
[JsonConstructor] [JsonConstructor]

33
src/BizHawk.Client.EmuHawk/config/PathConfig.cs
View File

@ -7,6 +7,7 @@ using System.Windows.Forms;
using BizHawk.Client.Common; using BizHawk.Client.Common;
using BizHawk.Common; using BizHawk.Common;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Cores;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
@ -18,24 +19,6 @@ namespace BizHawk.Client.EmuHawk
private readonly string _sysID; private readonly string _sysID;
// All path text boxes should do some kind of error checking
// Config path under base, config will default to %exe%
private void LockDownCores()
{
if (VersionInfo.DeveloperBuild)
{
return;
}
string[] coresToHide = { VSystemID.Raw.AmstradCPC, VSystemID.Raw.ChannelF, VSystemID.Raw.GGL, VSystemID.Raw.MSX, VSystemID.Raw.PS2 };
foreach (var core in coresToHide)
{
var tabPage = PathTabControl.TabPages().First(tp => tp.Name == core);
PathTabControl.TabPages.Remove(tabPage);
}
}
private static AutoCompleteStringCollection AutoCompleteOptions => new AutoCompleteStringCollection private static AutoCompleteStringCollection AutoCompleteOptions => new AutoCompleteStringCollection
{ {
"%recent%", "%recent%",
@ -153,6 +136,7 @@ namespace BizHawk.Client.EmuHawk
.Select(sys => (SysGroup: sys, DisplayName: PathEntryCollection.GetDisplayNameFor(sys))) .Select(sys => (SysGroup: sys, DisplayName: PathEntryCollection.GetDisplayNameFor(sys)))
.OrderBy(tuple => tuple.DisplayName) .OrderBy(tuple => tuple.DisplayName)
.ToList(); .ToList();
// add the Global tab first... // add the Global tab first...
tpGlobal.Name = PathEntryCollection.GLOBAL; // required for SaveSettings tpGlobal.Name = PathEntryCollection.GLOBAL; // required for SaveSettings
systems.RemoveAll(tuple => tuple.SysGroup == PathEntryCollection.GLOBAL); systems.RemoveAll(tuple => tuple.SysGroup == PathEntryCollection.GLOBAL);
@ -165,7 +149,17 @@ namespace BizHawk.Client.EmuHawk
tpGlobal.Controls[tpGlobal.Controls.Count - 2].Location -= hack1; // Button tpGlobal.Controls[tpGlobal.Controls.Count - 2].Location -= hack1; // Button
textBoxWidth -= hack; textBoxWidth -= hack;
widgetOffset -= hack; widgetOffset -= hack;
// ...then continue with the others
// ...then continue with the others (after removing unreleased systems in Release builds)
if (!VersionInfo.DeveloperBuild)
{
var releasedCoreSysIDs = CoreInventory.Instance.AllCores.SelectMany(kvp => kvp.Value.Select(coreInfo => (SysID: kvp.Key, CoreInfo: coreInfo)))
.Where(tuple => tuple.CoreInfo.CoreAttr.Released)
.Select(tuple => tuple.SysID)
.Distinct().ToList();
releasedCoreSysIDs.Add(VSystemID.Raw.Libretro); // core not actually marked as released, but we still want to show it
systems.RemoveAll(tuple => !releasedCoreSysIDs.Any(sysID => PathEntryCollection.InGroup(sysID, tuple.SysGroup)));
}
foreach (var (sys, dispName) in systems) AddTabPageForSystem(sys, dispName); foreach (var (sys, dispName) in systems) AddTabPageForSystem(sys, dispName);
if (IsTabPendingFocus(PathEntryCollection.GLOBAL)) if (IsTabPendingFocus(PathEntryCollection.GLOBAL))
@ -242,7 +236,6 @@ namespace BizHawk.Client.EmuHawk
private void NewPathConfig_Load(object sender, EventArgs e) private void NewPathConfig_Load(object sender, EventArgs e)
{ {
LoadSettings(); LoadSettings();
LockDownCores();
} }
private void RecentForRoms_CheckedChanged(object sender, EventArgs e) private void RecentForRoms_CheckedChanged(object sender, EventArgs e)