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

consistent variable naming in config.cs

This commit is contained in:
adelikat 2020-01-25 10:57:31 -06:00
parent 24e6cc14f0
commit ef13754f79
30 changed files with 251 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.ApiHawk/Classes/ClientApi.cs
View File

@ -618,7 +618,7 @@ namespace BizHawk.Client.ApiHawk
public static void SetScreenshotOSD(bool value)
{
Global.Config.Screenshot_CaptureOSD = value;
Global.Config.ScreenshotCaptureOsd = value;
}
public static int ScreenWidth()

2
BizHawk.Client.Common/PathManager.cs
View File

@ -203,7 +203,7 @@ namespace BizHawk.Client.Common
public static string GetRomsPath(string sysId)
{
if (Global.Config.UseRecentForROMs)
if (Global.Config.UseRecentForRoms)
{
return Environment.SpecialFolder.Recent.ToString();
}

28
BizHawk.Client.Common/RomLoader.cs
View File

@ -641,7 +641,7 @@ namespace BizHawk.Client.Common
var left = Database.GetGameInfo(leftBytes, "left.gb");
var right = Database.GetGameInfo(rightBytes, "right.gb");
if (Global.Config.GB_UseGBHawk)
if (Global.Config.GbUseGbHawk)
{
nextEmulator = new GBHawkLink(
nextComm,
@ -996,8 +996,8 @@ namespace BizHawk.Client.Common
break;
case "SNES":
bool useSnes9x = Global.Config.SNES_InSnes9x;
if (Global.Config.CoreForcingViaGameDB && !string.IsNullOrEmpty(game.ForcedCore))
bool useSnes9x = Global.Config.SnesInSnes9x;
if (Global.Config.CoreForcingViaGameDb && !string.IsNullOrEmpty(game.ForcedCore))
{
if (game.ForcedCore.ToLower() == "snes9x")
{
@ -1028,13 +1028,13 @@ namespace BizHawk.Client.Common
{
// apply main spur-of-the-moment switcheroo as lowest priority
string preference = "neshawk";
if (Global.Config.NES_InQuickNES)
if (Global.Config.NesInQuickNes)
{
preference = "quicknes";
}
// if user has saw fit to override in gamedb, apply that
if (Global.Config.CoreForcingViaGameDB && !string.IsNullOrEmpty(game.ForcedCore))
if (Global.Config.CoreForcingViaGameDb && !string.IsNullOrEmpty(game.ForcedCore))
{
preference = game.ForcedCore;
}
@ -1065,9 +1065,9 @@ namespace BizHawk.Client.Common
break;
case "GB":
if (!Global.Config.GB_AsSGB)
if (!Global.Config.GbAsSgb)
{
if (Global.Config.GB_UseGBHawk)
if (Global.Config.GbUseGbHawk)
{
core = CoreInventory.Instance["GB", "GBHawk"];
}
@ -1078,7 +1078,7 @@ namespace BizHawk.Client.Common
}
else
{
if (Global.Config.SGB_UseBsnes)
if (Global.Config.SgbUseBsnes)
{
game.System = "SNES";
game.AddOption("SGB");
@ -1092,9 +1092,9 @@ namespace BizHawk.Client.Common
}
break;
case "GBC":
if (!Global.Config.GB_AsSGB)
if (!Global.Config.GbAsSgb)
{
if (Global.Config.GB_UseGBHawk)
if (Global.Config.GbUseGbHawk)
{
core = CoreInventory.Instance["GBC", "GBHawk"];
}
@ -1105,7 +1105,7 @@ namespace BizHawk.Client.Common
}
else
{
if (Global.Config.SGB_UseBsnes)
if (Global.Config.SgbUseBsnes)
{
game.System = "SNES";
game.AddOption("SGB");
@ -1143,7 +1143,7 @@ namespace BizHawk.Client.Common
nextEmulator = cpc;
break;
case "GBA":
if (Global.Config.GBA_UsemGBA)
if (Global.Config.GbaUsemGba)
{
core = CoreInventory.Instance["GBA", "mGBA"];
}
@ -1163,7 +1163,7 @@ namespace BizHawk.Client.Common
rom.GameInfo.Name = gameName;
break;
case "GEN":
if (Global.Config.CoreForcingViaGameDB && game.ForcedCore?.ToLower() == "pico")
if (Global.Config.CoreForcingViaGameDb && game.ForcedCore?.ToLower() == "pico")
{
core = CoreInventory.Instance["GEN", "PicoDrive"];
}
@ -1234,7 +1234,7 @@ namespace BizHawk.Client.Common
{
// failed to load SGB bios or game does not support SGB mode.
// To avoid catch-22, disable SGB mode
Global.Config.GB_AsSGB = false;
Global.Config.GbAsSgb = false;
DoMessageCallback("Failed to load a GB rom in SGB mode. Disabling SGB Mode.");
return LoadRom(path, nextComm, false, recursiveCount + 1);
}

90
BizHawk.Client.Common/config/Config.cs
View File

@ -3,17 +3,13 @@ using System.Collections.Generic;
using BizHawk.Common;
// ReSharper disable FieldCanBeMadeReadOnly.Global
// ReSharper disable InconsistentNaming
// ReSharper disable StyleCop.SA1310
// ReSharper disable StyleCop.SA1401
namespace BizHawk.Client.Common
{
public class Config
{
public static string ControlDefaultPath => PathManager.MakeProgramRelativePath("defctrl.json");
public void ConfigCheckAllControlDefaults()
public Config()
{
if (AllTrollers.Count == 0 && AllTrollersAutoFire.Count == 0 && AllTrollersAnalog.Count == 0)
{
@ -24,11 +20,6 @@ namespace BizHawk.Client.Common
}
}
public Config()
{
ConfigCheckAllControlDefaults();
}
public void ResolveDefaults()
{
PathEntries.ResolveWithDefaults();
@ -47,7 +38,7 @@ namespace BizHawk.Client.Common
};
// Path Settings ************************************/
public bool UseRecentForROMs = false;
public bool UseRecentForRoms = false;
public string LastRomPath = ".";
public PathEntryCollection PathEntries = new PathEntryCollection();
@ -55,7 +46,7 @@ namespace BizHawk.Client.Common
public Dictionary<string, string> FirmwareUserSpecifications = new Dictionary<string, string>(); // key: sysid+firmwareId; value: absolute path
// General Client Settings
public int Input_Hotkey_OverrideOptions = 0;
public int InputHotkeyOverrideOptions = 0;
public bool StackOSDMessages = true;
public ZoomFactors TargetZoomFactors = new ZoomFactors();
@ -76,12 +67,12 @@ namespace BizHawk.Client.Common
public bool AcceptBackgroundInputControllerOnly = false;
public bool HandleAlternateKeyboardLayouts = false;
public bool SingleInstanceMode = false;
public bool AllowUD_LR = false;
public bool ForbidUD_LR = false;
public bool AllowUdlr = false;
public bool ForbidUdlr = false;
public bool ShowContextMenu = true;
public bool EnableBackupMovies = true;
public bool MoviesOnDisk = false;
public bool MoviesInAWE = false;
public bool MoviesInAwe = false;
public bool HotkeyConfigAutoTab = true;
public bool InputConfigAutoTab = true;
public bool BackupSavestates = true;
@ -95,14 +86,14 @@ namespace BizHawk.Client.Common
public bool AutoLoadLastSaveSlot = false;
public bool SkipLagFrame = false;
public bool SuppressAskSave = false;
public bool AVI_CaptureOSD = false;
public bool Screenshot_CaptureOSD = false;
public bool AviCaptureOsd = false;
public bool ScreenshotCaptureOsd = false;
public bool FirstBoot = true;
public bool Update_AutoCheckEnabled = false;
public DateTime? Update_LastCheckTimeUTC = null;
public string Update_LatestVersion = "";
public string Update_IgnoreVersion = "";
public bool SkipOutdatedOSCheck = false;
public bool UpdateAutoCheckEnabled = false;
public DateTime? UpdateLastCheckTimeUtc = null;
public string UpdateLatestVersion = "";
public string UpdateIgnoreVersion = "";
public bool SkipOutdatedOsCheck = false;
/// <summary>
/// Makes a .bak file before any saveram-writing operation (could be extended to make timestamped backups)
@ -162,7 +153,7 @@ namespace BizHawk.Client.Common
public bool DispAlternateVsync = false;
// Display options
public bool DisplayFPS = false;
public bool DisplayFps = false;
public bool DisplayFrameCounter = false;
public bool DisplayLagCounter = false;
public bool DisplayInput = false;
@ -204,14 +195,14 @@ namespace BizHawk.Client.Common
/// <remarks>warning: we don't even want to deal with changing this at runtime. but we want it changed here for config purposes. so don't check this variable. check in GlobalWin or something like that.</remarks>
public EDispMethod DispMethod = DetectDirectX() ? EDispMethod.SlimDX9 : EDispMethod.OpenGL;
public int DispChrome_FrameWindowed = 2;
public bool DispChrome_StatusBarWindowed = true;
public bool DispChrome_CaptionWindowed = true;
public bool DispChrome_MenuWindowed = true;
public bool DispChrome_StatusBarFullscreen = false;
public bool DispChrome_MenuFullscreen = false;
public bool DispChrome_Fullscreen_AutohideMouse = true;
public bool DispChrome_AllowDoubleClickFullscreen = true;
public int DispChromeFrameWindowed = 2;
public bool DispChromeStatusBarWindowed = true;
public bool DispChromeCaptionWindowed = true;
public bool DispChromeMenuWindowed = true;
public bool DispChromeStatusBarFullscreen = false;
public bool DispChromeMenuFullscreen = false;
public bool DispChromeFullscreenAutohideMouse = true;
public bool DispChromeAllowDoubleClickFullscreen = true;
public EDispManagerAR DispManagerAR = EDispManagerAR.System;
@ -220,8 +211,8 @@ namespace BizHawk.Client.Common
public int DispCustomUserARHeight = -1;
// these are more like the actual AR ratio (i.e. 4:3) (fixme on major release)
public float DispCustomUserARX = -1;
public float DispCustomUserARY = -1;
public float DispCustomUserArx = -1;
public float DispCustomUserAry = -1;
//these default to 0 because by default we crop nothing
public int DispCropLeft = 0;
@ -256,11 +247,11 @@ namespace BizHawk.Client.Common
// Video dumping settings
public string VideoWriter = "";
public int JMDCompression = 3;
public int JMDThreads = 3;
public int JmdCompression = 3;
public int JmdThreads = 3;
public string FFmpegFormat = "";
public string FFmpegCustomCommand = "-c:a foo -c:v bar -f baz";
public string AVICodecToken = "";
public string AviCodecToken = "";
public int GifWriterFrameskip = 3;
public int GifWriterDelay = -1;
public bool VideoWriterAudioSync = true;
@ -293,17 +284,17 @@ namespace BizHawk.Client.Common
public bool MoviePlaybackPokeMode = false;
// Play Movie Dialog
public bool PlayMovie_IncludeSubdir = false;
public bool PlayMovie_MatchHash = true;
public bool PlayMovieIncludeSubDir = false;
public bool PlayMovieMatchHash = true;
// TI83
public bool TI83autoloadKeyPad = true;
public bool Ti83AutoloadKeyPad = true;
public BindingCollection HotkeyBindings = new BindingCollection();
// Analog Hotkey values
public int Analog_LargeChange = 10;
public int Analog_SmallChange = 1;
public int AnalogLargeChange = 10;
public int AnalogSmallChange = 1;
// [ControllerType][ButtonName] => Physical Bind
public Dictionary<string, Dictionary<string, string>> AllTrollers = new Dictionary<string, Dictionary<string, string>>();
@ -313,17 +304,20 @@ namespace BizHawk.Client.Common
// Core Pick
// as this setting spans multiple cores and doesn't actually affect the behavior of any core,
// it hasn't been absorbed into the new system
public bool GB_AsSGB = false;
public bool GbAsSgb = false;
public bool UseSubNESHawk = false;
public bool NES_InQuickNES = true;
public bool SNES_InSnes9x = true;
public bool GBA_UsemGBA = true;
public bool SGB_UseBsnes = false;
public bool GB_UseGBHawk = false;
public bool CoreForcingViaGameDB = true;
public bool NesInQuickNes = true;
public bool SnesInSnes9x = true;
public bool GbaUsemGba = true;
public bool SgbUseBsnes = false;
public bool GbUseGbHawk = false;
public bool CoreForcingViaGameDb = true;
public string LibretroCore;
// ReSharper disable once UnusedMember.Global
public string LastWrittenFrom = VersionInfo.Mainversion;
// ReSharper disable once UnusedMember.Global
public string LastWrittenFromDetailed = VersionInfo.GetEmuVersion();
}
}

10
BizHawk.Client.Common/inputAdapters/UDLRController.cs
View File

@ -15,7 +15,7 @@ namespace BizHawk.Client.Common
public bool IsPressed(string button)
{
if (Global.Config.AllowUD_LR)
if (Global.Config.AllowUdlr)
{
return Source.IsPressed(button);
}
@ -40,7 +40,7 @@ namespace BizHawk.Client.Common
return false;
}
if (Global.Config.ForbidUD_LR)
if (Global.Config.ForbidUdlr)
{
return false;
}
@ -69,7 +69,7 @@ namespace BizHawk.Client.Common
return false;
}
if (Global.Config.ForbidUD_LR)
if (Global.Config.ForbidUdlr)
{
return false;
}
@ -98,7 +98,7 @@ namespace BizHawk.Client.Common
return false;
}
if (Global.Config.ForbidUD_LR)
if (Global.Config.ForbidUdlr)
{
return false;
}
@ -127,7 +127,7 @@ namespace BizHawk.Client.Common
return false;
}
if (Global.Config.ForbidUD_LR)
if (Global.Config.ForbidUdlr)
{
return false;
}

24
BizHawk.Client.Common/movie/MovieSession.cs
View File

@ -472,13 +472,13 @@ namespace BizHawk.Client.Common
// If either is specified use that, else use whatever is currently set
if (movie.Core == quicknesName)
{
PreviousNES_InQuickNES = Global.Config.NES_InQuickNES;
Global.Config.NES_InQuickNES = true;
PreviousNES_InQuickNES = Global.Config.NesInQuickNes;
Global.Config.NesInQuickNes = true;
}
else if (movie.Core == neshawkName)
{
PreviousNES_InQuickNES = Global.Config.NES_InQuickNES;
Global.Config.NES_InQuickNES = false;
PreviousNES_InQuickNES = Global.Config.NesInQuickNes;
Global.Config.NesInQuickNes = false;
}
}
else if (!record && emulator.SystemId == "SNES") // ditto with snes9x vs bsnes
@ -488,13 +488,13 @@ namespace BizHawk.Client.Common
if (movie.Core == snes9xName)
{
PreviousSNES_InSnes9x = Global.Config.SNES_InSnes9x;
Global.Config.SNES_InSnes9x = true;
PreviousSNES_InSnes9x = Global.Config.SnesInSnes9x;
Global.Config.SnesInSnes9x = true;
}
else if (movie.Core == bsnesName)
{
PreviousSNES_InSnes9x = Global.Config.SNES_InSnes9x;
Global.Config.SNES_InSnes9x = false;
PreviousSNES_InSnes9x = Global.Config.SnesInSnes9x;
Global.Config.SnesInSnes9x = false;
}
}
else if (!record && emulator.SystemId == "GBA") // ditto with GBA, we should probably architect this at some point, this isn't sustainable
@ -504,13 +504,13 @@ namespace BizHawk.Client.Common
if (movie.Core == mGBAName)
{
PreviousGBA_UsemGBA = Global.Config.GBA_UsemGBA;
Global.Config.GBA_UsemGBA = true;
PreviousGBA_UsemGBA = Global.Config.GbaUsemGba;
Global.Config.GbaUsemGba = true;
}
else if (movie.Core == vbaNextName)
{
PreviousGBA_UsemGBA = Global.Config.GBA_UsemGBA;
Global.Config.GBA_UsemGBA = false;
PreviousGBA_UsemGBA = Global.Config.GbaUsemGba;
Global.Config.GbaUsemGba = false;
}
}

4
BizHawk.Client.Common/movie/import/LsmvImport.cs
View File

@ -115,7 +115,7 @@ namespace BizHawk.Client.Common.movie.import
case "sgb_ntsc":
case "sgb_pal":
platform = "SNES";
Global.Config.GB_AsSGB = true;
Global.Config.GbAsSgb = true;
break;
}
@ -283,7 +283,7 @@ namespace BizHawk.Client.Common.movie.import
Result.Movie.HeaderEntries[HeaderKeys.PLATFORM] = platform;
Result.Movie.SyncSettingsJson = ConfigService.SaveWithType(ss);
Global.Config.SNES_InSnes9x = false; // This could be annoying to a user if they don't notice we set this preference, but the alternative is for the movie import to fail to load the movie
Global.Config.SnesInSnes9x = false; // This could be annoying to a user if they don't notice we set this preference, but the alternative is for the movie import to fail to load the movie
}
private IController EmptyLmsvFrame()

2
BizHawk.Client.Common/movie/import/SmvImport.cs
View File

@ -322,7 +322,7 @@ namespace BizHawk.Client.Common.movie.import
Result.Movie.AppendFrame(controllers);
Result.Movie.SyncSettingsJson = ConfigService.SaveWithType(ss);
Global.Config.SNES_InSnes9x = false;
Global.Config.SnesInSnes9x = false;
}
}
}

4
BizHawk.Client.Common/movie/import/VbmImport.cs
View File

@ -270,13 +270,13 @@ namespace BizHawk.Client.Common.movie.import
if (isGBA)
{
Global.Config.GBA_UsemGBA = true;
Global.Config.GbaUsemGba = true;
var ss = new MGBAHawk.SyncSettings { SkipBios = true };
Result.Movie.SyncSettingsJson = ConfigService.SaveWithType(ss);
}
else
{
Global.Config.GB_UseGBHawk = true;
Global.Config.GbUseGbHawk = true;
Result.Movie.SyncSettingsJson = ConfigService.SaveWithType(new GBHawk.GBSyncSettings());
}

6
BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
View File

@ -736,7 +736,7 @@ namespace BizHawk.Client.EmuHawk
if (result)
{
// save to config and return it
Global.Config.AVICodecToken = ret.Serialize();
Global.Config.AviCodecToken = ret.Serialize();
return ret;
}
@ -970,10 +970,10 @@ namespace BizHawk.Client.EmuHawk
/// <exception cref="Exception">no default codec token in config</exception>
public void SetDefaultVideoCodecToken()
{
CodecToken ct = CodecToken.DeSerialize(Global.Config.AVICodecToken);
CodecToken ct = CodecToken.DeSerialize(Global.Config.AviCodecToken);
if (ct == null)
{
throw new Exception($"No default {nameof(Global.Config.AVICodecToken)} in config!");
throw new Exception($"No default {nameof(Global.Config.AviCodecToken)} in config!");
}
_currVideoCodecToken = ct;

12
BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs
View File

@ -510,15 +510,15 @@ namespace BizHawk.Client.EmuHawk
CodecToken ret = new CodecToken();
// load from config and sanitize
int t = Math.Min(Math.Max(Global.Config.JMDThreads, 1), 6);
int t = Math.Min(Math.Max(Global.Config.JmdThreads, 1), 6);
int c = Math.Min(Math.Max(Global.Config.JMDCompression, Deflater.NO_COMPRESSION), Deflater.BEST_COMPRESSION);
int c = Math.Min(Math.Max(Global.Config.JmdCompression, Deflater.NO_COMPRESSION), Deflater.BEST_COMPRESSION);
if (!JmdForm.DoCompressionDlg(ref t, ref c, 1, 6, Deflater.NO_COMPRESSION, Deflater.BEST_COMPRESSION, hwnd))
return null;
Global.Config.JMDThreads = ret.NumThreads = t;
Global.Config.JMDCompression = ret.CompressionLevel = c;
Global.Config.JmdThreads = ret.NumThreads = t;
Global.Config.JmdCompression = ret.CompressionLevel = c;
return ret;
}
@ -760,9 +760,9 @@ namespace BizHawk.Client.EmuHawk
CodecToken ct = new CodecToken();
// load from config and sanitize
int t = Math.Min(Math.Max(Global.Config.JMDThreads, 1), 6);
int t = Math.Min(Math.Max(Global.Config.JmdThreads, 1), 6);
int c = Math.Min(Math.Max(Global.Config.JMDCompression, Deflater.NO_COMPRESSION), Deflater.BEST_COMPRESSION);
int c = Math.Min(Math.Max(Global.Config.JmdCompression, Deflater.NO_COMPRESSION), Deflater.BEST_COMPRESSION);
ct.CompressionLevel = c;
ct.NumThreads = t;

2
BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
View File

@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk
_captureWidth = emulator.CoreComm.NominalWidth;
_captureHeight = emulator.CoreComm.NominalHeight;
if (config.AVI_CaptureOSD)
if (config.AviCaptureOsd)
{
using var bb = mainForm.CaptureOSD();
_captureWidth = bb.Width;

4
BizHawk.Client.EmuHawk/DisplayManager/DisplayManager.cs
View File

@ -532,7 +532,7 @@ namespace BizHawk.Client.EmuHawk
if (arCustomRatio)
{
FixRatio(Global.Config.DispCustomUserARX, Global.Config.DispCustomUserARY, videoProvider.BufferWidth, videoProvider.BufferHeight, out virtualWidth, out virtualHeight);
FixRatio(Global.Config.DispCustomUserArx, Global.Config.DispCustomUserAry, videoProvider.BufferWidth, videoProvider.BufferHeight, out virtualWidth, out virtualHeight);
}
var padding = CalculateCompleteContentPadding(true, false);
@ -716,7 +716,7 @@ namespace BizHawk.Client.EmuHawk
}
if (Global.Config.DispManagerAR == EDispManagerAR.CustomRatio)
{
FixRatio(Global.Config.DispCustomUserARX, Global.Config.DispCustomUserARY, videoProvider.BufferWidth, videoProvider.BufferHeight, out vw, out vh);
FixRatio(Global.Config.DispCustomUserArx, Global.Config.DispCustomUserAry, videoProvider.BufferWidth, videoProvider.BufferHeight, out vw, out vh);
}
}

2
BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
View File

@ -322,7 +322,7 @@ namespace BizHawk.Client.EmuHawk
DrawOsdMessage(g, Global.MovieSession.MultiTrack.Status, FixedMessagesColor, point.X, point.Y);
}
if (Global.Config.DisplayFPS && Fps != null)
if (Global.Config.DisplayFps && Fps != null)
{
var point = GetCoordinates(g, Global.Config.Fps, Fps);
DrawOsdMessage(g, Fps, FixedMessagesColor, point.X, point.Y);

4
BizHawk.Client.EmuHawk/EmuHawkUtil.cs
View File

@ -43,11 +43,11 @@ namespace BizHawk.Client.EmuHawk
if (emulator is Cores.Nintendo.SNES9X.Snes9x)
{
return PromptToSwitchCore("Snes9x", "bsnes", () => Global.Config.SNES_InSnes9x = false);
return PromptToSwitchCore("Snes9x", "bsnes", () => Global.Config.SnesInSnes9x = false);
}
if (emulator is Cores.Consoles.Nintendo.QuickNES.QuickNES)
{
return PromptToSwitchCore("QuickNes", "NesHawk", () => Global.Config.NES_InQuickNES = false);
return PromptToSwitchCore("QuickNes", "NesHawk", () => Global.Config.NesInQuickNes = false);
}
return true;

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

@ -280,7 +280,7 @@ namespace BizHawk.Client.EmuHawk
{
ConfigAndRecordAVMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Record A/V"].Bindings;
StopAVIMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Stop A/V"].Bindings;
CaptureOSDMenuItem.Checked = Config.AVI_CaptureOSD;
CaptureOSDMenuItem.Checked = Config.AviCaptureOsd;
RecordAVMenuItem.Enabled = !OSTailoredCode.IsUnixHost && !string.IsNullOrEmpty(Config.VideoWriter) && _currAviWriter == null;
SynclessRecordingMenuItem.Enabled = !OSTailoredCode.IsUnixHost;
@ -299,7 +299,7 @@ namespace BizHawk.Client.EmuHawk
private void ScreenshotSubMenu_DropDownOpening(object sender, EventArgs e)
{
ScreenshotCaptureOSDMenuItem1.Checked = Config.Screenshot_CaptureOSD;
ScreenshotCaptureOSDMenuItem1.Checked = Config.ScreenshotCaptureOsd;
ScreenshotMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Screenshot"].Bindings;
ScreenshotClipboardMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["ScreenshotToClipboard"].Bindings;
ScreenshotClientClipboardMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Screen Client to Clipboard"].Bindings;
@ -615,7 +615,7 @@ namespace BizHawk.Client.EmuHawk
private void CaptureOSDMenuItem_Click(object sender, EventArgs e)
{
Config.AVI_CaptureOSD ^= true;
Config.AviCaptureOsd ^= true;
}
private void ScreenshotMenuItem_Click(object sender, EventArgs e)
@ -652,7 +652,7 @@ namespace BizHawk.Client.EmuHawk
private void ScreenshotCaptureOSDMenuItem_Click(object sender, EventArgs e)
{
Config.Screenshot_CaptureOSD ^= true;
Config.ScreenshotCaptureOsd ^= true;
}
private void ExitMenuItem_Click(object sender, EventArgs e)
@ -731,7 +731,7 @@ namespace BizHawk.Client.EmuHawk
private void ViewSubMenu_DropDownOpened(object sender, EventArgs e)
{
DisplayFPSMenuItem.Checked = Config.DisplayFPS;
DisplayFPSMenuItem.Checked = Config.DisplayFps;
DisplayFrameCounterMenuItem.Checked = Config.DisplayFrameCounter;
DisplayLagCounterMenuItem.Checked = Config.DisplayLagCounter;
DisplayInputMenuItem.Checked = Config.DisplayInput;
@ -744,7 +744,7 @@ namespace BizHawk.Client.EmuHawk
DisplayInputMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Input Display"].Bindings;
SwitchToFullscreenMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Full Screen"].Bindings;
DisplayStatusBarMenuItem.Checked = Config.DispChrome_StatusBarWindowed;
DisplayStatusBarMenuItem.Checked = Config.DispChromeStatusBarWindowed;
DisplayLogWindowMenuItem.Checked = Tools.IsLoaded<LogWindow>();
DisplayLagCounterMenuItem.Enabled = Emulator.CanPollInput();
@ -832,7 +832,7 @@ namespace BizHawk.Client.EmuHawk
private void DisplayStatusBarMenuItem_Click(object sender, EventArgs e)
{
Config.DispChrome_StatusBarWindowed ^= true;
Config.DispChromeStatusBarWindowed ^= true;
SetStatusBar();
}
@ -907,7 +907,7 @@ namespace BizHawk.Client.EmuHawk
private void KeyPriorityMenuItem_DropDownOpened(object sender, EventArgs e)
{
switch (Config.Input_Hotkey_OverrideOptions)
switch (Config.InputHotkeyOverrideOptions)
{
default:
case 0:
@ -930,8 +930,8 @@ namespace BizHawk.Client.EmuHawk
private void CoreMenuItem_DropDownOpened(object sender, EventArgs e)
{
quickNESMenuItem.Checked = Config.NES_InQuickNES;
nesHawkMenuItem.Checked = !Config.NES_InQuickNES;
quickNESMenuItem.Checked = Config.NesInQuickNes;
nesHawkMenuItem.Checked = !Config.NesInQuickNes;
}
private void ControllersMenuItem_Click(object sender, EventArgs e)
@ -1169,38 +1169,38 @@ namespace BizHawk.Client.EmuHawk
private void BothHkAndControllerMenuItem_Click(object sender, EventArgs e)
{
Config.Input_Hotkey_OverrideOptions = 0;
Config.InputHotkeyOverrideOptions = 0;
UpdateKeyPriorityIcon();
}
private void InputOverHkMenuItem_Click(object sender, EventArgs e)
{
Config.Input_Hotkey_OverrideOptions = 1;
Config.InputHotkeyOverrideOptions = 1;
UpdateKeyPriorityIcon();
}
private void HkOverInputMenuItem_Click(object sender, EventArgs e)
{
Config.Input_Hotkey_OverrideOptions = 2;
Config.InputHotkeyOverrideOptions = 2;
UpdateKeyPriorityIcon();
}
private void CoresSubMenu_DropDownOpened(object sender, EventArgs e)
{
GBInSGBMenuItem.Checked = Config.GB_AsSGB;
AllowGameDbCoreOverridesMenuItem.Checked = Config.CoreForcingViaGameDB;
GBInSGBMenuItem.Checked = Config.GbAsSgb;
AllowGameDbCoreOverridesMenuItem.Checked = Config.CoreForcingViaGameDb;
}
private void NesCoreSubMenu_DropDownOpened(object sender, EventArgs e)
{
QuicknesCoreMenuItem.Checked = Config.NES_InQuickNES;
NesCoreMenuItem.Checked = !Config.NES_InQuickNES && !Config.UseSubNESHawk;
QuicknesCoreMenuItem.Checked = Config.NesInQuickNes;
NesCoreMenuItem.Checked = !Config.NesInQuickNes && !Config.UseSubNESHawk;
SubNesHawkMenuItem.Checked = Config.UseSubNESHawk;
}
private void QuickNesCorePick_Click(object sender, EventArgs e)
{
Config.NES_InQuickNES = true;
Config.NesInQuickNes = true;
Config.UseSubNESHawk = false;
if (Emulator.SystemId == "NES")
@ -1211,7 +1211,7 @@ namespace BizHawk.Client.EmuHawk
private void NesCorePick_Click(object sender, EventArgs e)
{
Config.NES_InQuickNES = false;
Config.NesInQuickNes = false;
Config.UseSubNESHawk = false;
if (Emulator.SystemId == "NES")
@ -1223,7 +1223,7 @@ namespace BizHawk.Client.EmuHawk
private void SubNesCorePick_Click(object sender, EventArgs e)
{
Config.UseSubNESHawk = true;
Config.NES_InQuickNES = false;
Config.NesInQuickNes = false;
if (!Emulator.IsNull())
{
@ -1233,13 +1233,13 @@ namespace BizHawk.Client.EmuHawk
private void CoreSNESSubMenu_DropDownOpened(object sender, EventArgs e)
{
Coresnes9xMenuItem.Checked = Config.SNES_InSnes9x;
CorebsnesMenuItem.Checked = !Config.SNES_InSnes9x;
Coresnes9xMenuItem.Checked = Config.SnesInSnes9x;
CorebsnesMenuItem.Checked = !Config.SnesInSnes9x;
}
private void CoreSnesToggle_Click(object sender, EventArgs e)
{
Config.SNES_InSnes9x ^= true;
Config.SnesInSnes9x ^= true;
if (Emulator.SystemId == "SNES")
{
@ -1249,13 +1249,13 @@ namespace BizHawk.Client.EmuHawk
private void GbaCoreSubMenu_DropDownOpened(object sender, EventArgs e)
{
VbaNextCoreMenuItem.Checked = !Config.GBA_UsemGBA;
MgbaCoreMenuItem.Checked = Config.GBA_UsemGBA;
VbaNextCoreMenuItem.Checked = !Config.GbaUsemGba;
MgbaCoreMenuItem.Checked = Config.GbaUsemGba;
}
private void GbaCorePick_Click(object sender, EventArgs e)
{
Config.GBA_UsemGBA ^= true;
Config.GbaUsemGba ^= true;
if (Emulator.SystemId == "GBA")
{
FlagNeedsReboot();
@ -1264,19 +1264,19 @@ namespace BizHawk.Client.EmuHawk
private void SGBCoreSubmenu_DropDownOpened(object sender, EventArgs e)
{
SgbBsnesMenuItem.Checked = Config.SGB_UseBsnes;
SgbSameBoyMenuItem.Checked = !Config.SGB_UseBsnes;
SgbBsnesMenuItem.Checked = Config.SgbUseBsnes;
SgbSameBoyMenuItem.Checked = !Config.SgbUseBsnes;
}
private void GBCoreSubmenu_DropDownOpened(object sender, EventArgs e)
{
GBGambatteMenuItem.Checked = !Config.GB_UseGBHawk;
GBGBHawkMenuItem.Checked = Config.GB_UseGBHawk;
GBGambatteMenuItem.Checked = !Config.GbUseGbHawk;
GBGBHawkMenuItem.Checked = Config.GbUseGbHawk;
}
private void SgbCorePick_Click(object sender, EventArgs e)
{
Config.SGB_UseBsnes ^= true;
Config.SgbUseBsnes ^= true;
// TODO: only flag if one of these cores
if (!Emulator.IsNull())
{
@ -1286,7 +1286,7 @@ namespace BizHawk.Client.EmuHawk
private void GBCorePick_Click(object sender, EventArgs e)
{
Config.GB_UseGBHawk ^= true;
Config.GbUseGbHawk ^= true;
// TODO: only flag if one of these cores
if (!Emulator.IsNull())
{
@ -1296,7 +1296,7 @@ namespace BizHawk.Client.EmuHawk
private void GbInSgbMenuItem_Click(object sender, EventArgs e)
{
Config.GB_AsSGB ^= true;
Config.GbAsSgb ^= true;
if (!Emulator.IsNull())
{
@ -1306,7 +1306,7 @@ namespace BizHawk.Client.EmuHawk
private void AllowGameDBCoreOverridesMenuItem_Click(object sender, EventArgs e)
{
Config.CoreForcingViaGameDB ^= true;
Config.CoreForcingViaGameDb ^= true;
}
private void N64VideoPluginSettingsMenuItem_Click(object sender, EventArgs e)
@ -1532,13 +1532,13 @@ namespace BizHawk.Client.EmuHawk
private void QuickNesMenuItem_Click(object sender, EventArgs e)
{
Config.NES_InQuickNES = true;
Config.NesInQuickNes = true;
FlagNeedsReboot();
}
private void NesHawkMenuItem_Click(object sender, EventArgs e)
{
Config.NES_InQuickNES = false;
Config.NesInQuickNes = false;
FlagNeedsReboot();
}
@ -2094,7 +2094,7 @@ namespace BizHawk.Client.EmuHawk
private void Ti83SubMenu_DropDownOpened(object sender, EventArgs e)
{
AutoloadKeypadMenuItem.Checked = Config.TI83autoloadKeyPad;
AutoloadKeypadMenuItem.Checked = Config.Ti83AutoloadKeyPad;
}
private void Ti83KeypadMenuItem_Click(object sender, EventArgs e)
@ -2104,7 +2104,7 @@ namespace BizHawk.Client.EmuHawk
private void AutoloadKeypadMenuItem_Click(object sender, EventArgs e)
{
Config.TI83autoloadKeyPad ^= true;
Config.Ti83AutoloadKeyPad ^= true;
}
private void Ti83LoadTIFileMenuItem_Click(object sender, EventArgs e)
@ -2194,7 +2194,7 @@ namespace BizHawk.Client.EmuHawk
private void GbSubMenu_DropDownOpened(object sender, EventArgs e)
{
LoadGBInSGBMenuItem.Checked = Config.GB_AsSGB;
LoadGBInSGBMenuItem.Checked = Config.GbAsSgb;
GBGPUViewerMenuItem.Enabled = !OSTailoredCode.IsUnixHost;
}
@ -2246,13 +2246,13 @@ namespace BizHawk.Client.EmuHawk
private void UsemGBAMenuItem_Click(object sender, EventArgs e)
{
Config.GBA_UsemGBA = true;
Config.GbaUsemGba = true;
FlagNeedsReboot();
}
private void UseVbaNextMenuItem_Click(object sender, EventArgs e)
{
Config.GBA_UsemGBA = false;
Config.GbaUsemGba = false;
FlagNeedsReboot();
}
@ -2263,8 +2263,8 @@ namespace BizHawk.Client.EmuHawk
private void GBACoreSelectionSubMenu_DropDownOpened(object sender, EventArgs e)
{
GBAmGBAMenuItem.Checked = Config.GBA_UsemGBA;
GBAVBANextMenuItem.Checked = !Config.GBA_UsemGBA;
GBAmGBAMenuItem.Checked = Config.GbaUsemGba;
GBAVBANextMenuItem.Checked = !Config.GbaUsemGba;
}
#endregion
@ -2319,7 +2319,7 @@ namespace BizHawk.Client.EmuHawk
if (((LibsnesCore)Emulator).IsSGB)
{
SnesGBInSGBMenuItem.Visible = true;
SnesGBInSGBMenuItem.Checked = Config.GB_AsSGB;
SnesGBInSGBMenuItem.Checked = Config.GbAsSgb;
}
else
{
@ -2346,7 +2346,7 @@ namespace BizHawk.Client.EmuHawk
private void SnesGbInSgbMenuItem_Click(object sender, EventArgs e)
{
Config.GB_AsSGB ^= true;
Config.GbAsSgb ^= true;
FlagNeedsReboot();
}
@ -3309,17 +3309,17 @@ namespace BizHawk.Client.EmuHawk
private void KeyPriorityStatusLabel_Click(object sender, EventArgs e)
{
switch (Config.Input_Hotkey_OverrideOptions)
switch (Config.InputHotkeyOverrideOptions)
{
default:
case 0:
Config.Input_Hotkey_OverrideOptions = 1;
Config.InputHotkeyOverrideOptions = 1;
break;
case 1:
Config.Input_Hotkey_OverrideOptions = 2;
Config.InputHotkeyOverrideOptions = 2;
break;
case 2:
Config.Input_Hotkey_OverrideOptions = 0;
Config.InputHotkeyOverrideOptions = 0;
break;
}
@ -3358,7 +3358,7 @@ namespace BizHawk.Client.EmuHawk
{
Sound.StopSound();
DialogResult result = MessageBox.Show(this,
$"Version {Config.Update_LatestVersion} is now available. Would you like to open the BizHawk homepage?\r\n\r\nClick \"No\" to hide the update notification for this version.",
$"Version {Config.UpdateLatestVersion} is now available. Would you like to open the BizHawk homepage?\r\n\r\nClick \"No\" to hide the update notification for this version.",
"New Version Available", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question);
Sound.StartSound();
@ -3410,7 +3410,7 @@ namespace BizHawk.Client.EmuHawk
private void TimerMouseIdle_Tick(object sender, EventArgs e)
{
if (_inFullscreen && Config.DispChrome_Fullscreen_AutohideMouse)
if (_inFullscreen && Config.DispChromeFullscreenAutohideMouse)
{
AutohideCursor(true);
}
@ -3448,7 +3448,7 @@ namespace BizHawk.Client.EmuHawk
private void MainForm_Shown(object sender, EventArgs e)
{
if (Emulator is TI83 && Config.TI83autoloadKeyPad)
if (Emulator is TI83 && Config.Ti83AutoloadKeyPad)
{
Tools.Load<TI83KeyPad>();
}

16
BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
View File

@ -729,28 +729,28 @@ namespace BizHawk.Client.EmuHawk
// Analog
case "Y Up Small":
Tools.VirtualPad.BumpAnalogValue(null, Config.Analog_SmallChange);
Tools.VirtualPad.BumpAnalogValue(null, Config.AnalogSmallChange);
break;
case "Y Up Large":
Tools.VirtualPad.BumpAnalogValue(null, Config.Analog_LargeChange);
Tools.VirtualPad.BumpAnalogValue(null, Config.AnalogLargeChange);
break;
case "Y Down Small":
Tools.VirtualPad.BumpAnalogValue(null, -Config.Analog_SmallChange);
Tools.VirtualPad.BumpAnalogValue(null, -Config.AnalogSmallChange);
break;
case "Y Down Large":
Tools.VirtualPad.BumpAnalogValue(null, -Config.Analog_LargeChange);
Tools.VirtualPad.BumpAnalogValue(null, -Config.AnalogLargeChange);
break;
case "X Up Small":
Tools.VirtualPad.BumpAnalogValue(Config.Analog_SmallChange, null);
Tools.VirtualPad.BumpAnalogValue(Config.AnalogSmallChange, null);
break;
case "X Up Large":
Tools.VirtualPad.BumpAnalogValue(Config.Analog_LargeChange, null);
Tools.VirtualPad.BumpAnalogValue(Config.AnalogLargeChange, null);
break;
case "X Down Small":
Tools.VirtualPad.BumpAnalogValue(-Config.Analog_SmallChange, null);
Tools.VirtualPad.BumpAnalogValue(-Config.AnalogSmallChange, null);
break;
case "X Down Large":
Tools.VirtualPad.BumpAnalogValue(-Config.Analog_LargeChange, null);
Tools.VirtualPad.BumpAnalogValue(-Config.AnalogLargeChange, null);
break;
}

6
BizHawk.Client.EmuHawk/MainForm.Movie.cs
View File

@ -34,19 +34,19 @@ namespace BizHawk.Client.EmuHawk
if (MovieSession.PreviousNES_InQuickNES.HasValue)
{
Config.NES_InQuickNES = MovieSession.PreviousNES_InQuickNES.Value;
Config.NesInQuickNes = MovieSession.PreviousNES_InQuickNES.Value;
MovieSession.PreviousNES_InQuickNES = null;
}
if (MovieSession.PreviousSNES_InSnes9x.HasValue)
{
Config.SNES_InSnes9x = MovieSession.PreviousSNES_InSnes9x.Value;
Config.SnesInSnes9x = MovieSession.PreviousSNES_InSnes9x.Value;
MovieSession.PreviousSNES_InSnes9x = null;
}
if (MovieSession.PreviousGBA_UsemGBA.HasValue)
{
Config.GBA_UsemGBA = MovieSession.PreviousGBA_UsemGBA.Value;
Config.GbaUsemGba = MovieSession.PreviousGBA_UsemGBA.Value;
MovieSession.PreviousGBA_UsemGBA = null;
}

48
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -502,7 +502,7 @@ namespace BizHawk.Client.EmuHawk
// I would like to trigger a repaint here, but this isn't done yet
};
if (!OSTailoredCode.IsUnixHost && !Config.SkipOutdatedOSCheck)
if (!OSTailoredCode.IsUnixHost && !Config.SkipOutdatedOsCheck)
{
static string GetRegValue(string key)
{
@ -917,7 +917,7 @@ namespace BizHawk.Client.EmuHawk
// maybe because it doesn't make sense to me to bind hotkeys and controller inputs to the same keystrokes
bool handled;
switch (Config.Input_Hotkey_OverrideOptions)
switch (Config.InputHotkeyOverrideOptions)
{
default:
case 0: // Both allowed
@ -1031,7 +1031,7 @@ namespace BizHawk.Client.EmuHawk
public void TakeScreenshotToClipboard()
{
using (var bb = Config.Screenshot_CaptureOSD ? CaptureOSD() : MakeScreenshotImage())
using (var bb = Config.ScreenshotCaptureOsd ? CaptureOSD() : MakeScreenshotImage())
{
using var img = bb.ToSysdrawingBitmap();
Clipboard.SetImage(img);
@ -1042,7 +1042,7 @@ namespace BizHawk.Client.EmuHawk
private void TakeScreenshotClientToClipboard()
{
using (var bb = DisplayManager.RenderOffscreen(_currentVideoProvider, Config.Screenshot_CaptureOSD))
using (var bb = DisplayManager.RenderOffscreen(_currentVideoProvider, Config.ScreenshotCaptureOsd))
{
using var img = bb.ToSysdrawingBitmap();
Clipboard.SetImage(img);
@ -1081,7 +1081,7 @@ namespace BizHawk.Client.EmuHawk
fi.Directory.Create();
}
using (var bb = Config.Screenshot_CaptureOSD ? CaptureOSD() : MakeScreenshotImage())
using (var bb = Config.ScreenshotCaptureOsd ? CaptureOSD() : MakeScreenshotImage())
{
using var img = bb.ToSysdrawingBitmap();
img.Save(fi.FullName, ImageFormat.Png);
@ -1142,23 +1142,23 @@ namespace BizHawk.Client.EmuHawk
{
// TODO - maybe apply a hack tracked during fullscreen here to override it
FormBorderStyle = FormBorderStyle.None;
MainMenuStrip.Visible = Config.DispChrome_MenuFullscreen && !_argParser._chromeless;
MainStatusBar.Visible = Config.DispChrome_StatusBarFullscreen && !_argParser._chromeless;
MainMenuStrip.Visible = Config.DispChromeMenuFullscreen && !_argParser._chromeless;
MainStatusBar.Visible = Config.DispChromeStatusBarFullscreen && !_argParser._chromeless;
}
else
{
MainStatusBar.Visible = Config.DispChrome_StatusBarWindowed && !_argParser._chromeless;
MainMenuStrip.Visible = Config.DispChrome_MenuWindowed && !_argParser._chromeless;
MaximizeBox = MinimizeBox = Config.DispChrome_CaptionWindowed && !_argParser._chromeless;
if (Config.DispChrome_FrameWindowed == 0 || _argParser._chromeless)
MainStatusBar.Visible = Config.DispChromeStatusBarWindowed && !_argParser._chromeless;
MainMenuStrip.Visible = Config.DispChromeMenuWindowed && !_argParser._chromeless;
MaximizeBox = MinimizeBox = Config.DispChromeCaptionWindowed && !_argParser._chromeless;
if (Config.DispChromeFrameWindowed == 0 || _argParser._chromeless)
{
FormBorderStyle = FormBorderStyle.None;
}
else if (Config.DispChrome_FrameWindowed == 1)
else if (Config.DispChromeFrameWindowed == 1)
{
FormBorderStyle = FormBorderStyle.SizableToolWindow;
}
else if (Config.DispChrome_FrameWindowed == 2)
else if (Config.DispChromeFrameWindowed == 2)
{
FormBorderStyle = FormBorderStyle.Sizable;
}
@ -1526,7 +1526,7 @@ namespace BizHawk.Client.EmuHawk
{
if (!_inFullscreen)
{
MainStatusBar.Visible = Config.DispChrome_StatusBarWindowed;
MainStatusBar.Visible = Config.DispChromeStatusBarWindowed;
PerformLayout();
FrameBufferResized();
}
@ -1571,7 +1571,7 @@ namespace BizHawk.Client.EmuHawk
}
}
if (!Config.DispChrome_CaptionWindowed || _argParser._chromeless)
if (!Config.DispChromeCaptionWindowed || _argParser._chromeless)
{
str = "";
}
@ -2428,7 +2428,7 @@ namespace BizHawk.Client.EmuHawk
private void ToggleFps()
{
Config.DisplayFPS ^= true;
Config.DisplayFps ^= true;
}
private void ToggleFrameCounter()
@ -2723,7 +2723,7 @@ namespace BizHawk.Client.EmuHawk
private void UpdateKeyPriorityIcon()
{
switch (Config.Input_Hotkey_OverrideOptions)
switch (Config.InputHotkeyOverrideOptions)
{
default:
case 0:
@ -2846,14 +2846,14 @@ namespace BizHawk.Client.EmuHawk
private void ToggleKeyPriority()
{
Config.Input_Hotkey_OverrideOptions++;
if (Config.Input_Hotkey_OverrideOptions > 2)
Config.InputHotkeyOverrideOptions++;
if (Config.InputHotkeyOverrideOptions > 2)
{
Config.Input_Hotkey_OverrideOptions = 0;
Config.InputHotkeyOverrideOptions = 0;
}
UpdateKeyPriorityIcon();
switch (Config.Input_Hotkey_OverrideOptions)
switch (Config.InputHotkeyOverrideOptions)
{
case 0:
AddOnScreenMessage("Key priority set to Both Hotkey and Input");
@ -3280,7 +3280,7 @@ namespace BizHawk.Client.EmuHawk
{
// THIS IS REALLY SLOPPY!
// PLEASE REDO ME TO NOT CARE WHICH AVWRITER IS USED!
if (usingAvi && !string.IsNullOrEmpty(Config.AVICodecToken))
if (usingAvi && !string.IsNullOrEmpty(Config.AviCodecToken))
{
aw.SetDefaultVideoCodecToken();
}
@ -3448,7 +3448,7 @@ namespace BizHawk.Client.EmuHawk
Bitmap bmpIn = null;
try
{
bbIn = Config.AVI_CaptureOSD
bbIn = Config.AviCaptureOsd
? CaptureOSD()
: new BitmapBuffer(_currentVideoProvider.BufferWidth, _currentVideoProvider.BufferHeight, _currentVideoProvider.GetVideoBuffer());
@ -3482,7 +3482,7 @@ namespace BizHawk.Client.EmuHawk
}
else
{
if (Config.AVI_CaptureOSD)
if (Config.AviCaptureOsd)
{
output = new BitmapBufferVideoProvider(CaptureOSD());
disposableOutput = (IDisposable)output;

2
BizHawk.Client.EmuHawk/PresentationPanel.cs
View File

@ -53,7 +53,7 @@ namespace BizHawk.Client.EmuHawk
{
// allow suppression of the toggle.. but if shift is pressed, always do the toggle
bool allowSuppress = Control.ModifierKeys != Keys.Shift;
if (_config.DispChrome_AllowDoubleClickFullscreen || !allowSuppress)
if (_config.DispChromeAllowDoubleClickFullscreen || !allowSuppress)
{
_mainForm.ToggleFullscreen(allowSuppress);
}

2
BizHawk.Client.EmuHawk/Program.cs
View File

@ -121,7 +121,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.ResolveDefaults();
StringLogUtil.DefaultToDisk = Global.Config.MoviesOnDisk;
StringLogUtil.DefaultToAWE = Global.Config.MoviesInAWE;
StringLogUtil.DefaultToAWE = Global.Config.MoviesInAwe;
// super hacky! this needs to be done first. still not worth the trouble to make this system fully proper
if (Array.Exists(args, arg => arg.StartsWith("--gdi", StringComparison.InvariantCultureIgnoreCase)))

16
BizHawk.Client.EmuHawk/UpdateChecker.cs
View File

@ -16,26 +16,26 @@ namespace BizHawk.Client.EmuHawk
private static bool AutoCheckEnabled
{
get => Global.Config.Update_AutoCheckEnabled;
set => Global.Config.Update_AutoCheckEnabled = value;
get => Global.Config.UpdateAutoCheckEnabled;
set => Global.Config.UpdateAutoCheckEnabled = value;
}
private static DateTime? LastCheckTimeUTC
{
get => Global.Config.Update_LastCheckTimeUTC;
set => Global.Config.Update_LastCheckTimeUTC = value;
get => Global.Config.UpdateLastCheckTimeUtc;
set => Global.Config.UpdateLastCheckTimeUtc = value;
}
private static string LatestVersion
{
get => Global.Config.Update_LatestVersion;
set => Global.Config.Update_LatestVersion = value;
get => Global.Config.UpdateLatestVersion;
set => Global.Config.UpdateLatestVersion = value;
}
private static string IgnoreVersion
{
get => Global.Config.Update_IgnoreVersion;
set => Global.Config.Update_IgnoreVersion = value;
get => Global.Config.UpdateIgnoreVersion;
set => Global.Config.UpdateIgnoreVersion = value;
}
public static void BeginCheck(bool skipCheck = false)

10
BizHawk.Client.EmuHawk/config/ControllerConfig.cs
View File

@ -213,9 +213,9 @@ namespace BizHawk.Client.EmuHawk
SuspendLayout();
LoadPanels(_config);
rbUDLRAllow.Checked = _config.AllowUD_LR;
rbUDLRForbid.Checked = _config.ForbidUD_LR;
rbUDLRPriority.Checked = !_config.AllowUD_LR && !_config.ForbidUD_LR;
rbUDLRAllow.Checked = _config.AllowUdlr;
rbUDLRForbid.Checked = _config.ForbidUdlr;
rbUDLRPriority.Checked = !_config.AllowUdlr && !_config.ForbidUdlr;
checkBoxAutoTab.Checked = _config.InputConfigAutoTab;
SetControllerPicture(_emulator.ControllerDefinition.Name);
@ -353,8 +353,8 @@ namespace BizHawk.Client.EmuHawk
private void ButtonOk_Click(object sender, EventArgs e)
{
_config.AllowUD_LR = rbUDLRAllow.Checked;
_config.ForbidUD_LR = rbUDLRForbid.Checked;
_config.AllowUdlr = rbUDLRAllow.Checked;
_config.ForbidUdlr = rbUDLRForbid.Checked;
_config.InputConfigAutoTab = checkBoxAutoTab.Checked;
Save();

48
BizHawk.Client.EmuHawk/config/DisplayConfig.cs
View File

@ -47,16 +47,16 @@ namespace BizHawk.Client.EmuHawk
rbGDIPlus.Checked = _config.DispMethod == EDispMethod.GdiPlus;
rbD3D9.Checked = _config.DispMethod == EDispMethod.SlimDX9;
cbStatusBarWindowed.Checked = _config.DispChrome_StatusBarWindowed;
cbCaptionWindowed.Checked = _config.DispChrome_CaptionWindowed;
cbMenuWindowed.Checked = _config.DispChrome_MenuWindowed;
cbStatusBarFullscreen.Checked = _config.DispChrome_StatusBarFullscreen;
cbMenuFullscreen.Checked = _config.DispChrome_MenuFullscreen;
trackbarFrameSizeWindowed.Value = _config.DispChrome_FrameWindowed;
cbFSAutohideMouse.Checked = _config.DispChrome_Fullscreen_AutohideMouse;
cbStatusBarWindowed.Checked = _config.DispChromeStatusBarWindowed;
cbCaptionWindowed.Checked = _config.DispChromeCaptionWindowed;
cbMenuWindowed.Checked = _config.DispChromeMenuWindowed;
cbStatusBarFullscreen.Checked = _config.DispChromeStatusBarFullscreen;
cbMenuFullscreen.Checked = _config.DispChromeMenuFullscreen;
trackbarFrameSizeWindowed.Value = _config.DispChromeFrameWindowed;
cbFSAutohideMouse.Checked = _config.DispChromeFullscreenAutohideMouse;
SyncTrackBar();
cbAllowDoubleclickFullscreen.Checked = _config.DispChrome_AllowDoubleClickFullscreen;
cbAllowDoubleclickFullscreen.Checked = _config.DispChromeAllowDoubleClickFullscreen;
nudPrescale.Value = _config.DispPrescale;
@ -73,10 +73,10 @@ namespace BizHawk.Client.EmuHawk
txtCustomARWidth.Text = _config.DispCustomUserARWidth.ToString();
if (_config.DispCustomUserARHeight != -1)
txtCustomARHeight.Text = _config.DispCustomUserARHeight.ToString();
if (_config.DispCustomUserARX != -1)
txtCustomARX.Text = _config.DispCustomUserARX.ToString();
if (_config.DispCustomUserARY != -1)
txtCustomARY.Text = _config.DispCustomUserARY.ToString();
if (_config.DispCustomUserArx != -1)
txtCustomARX.Text = _config.DispCustomUserArx.ToString();
if (_config.DispCustomUserAry != -1)
txtCustomARY.Text = _config.DispCustomUserAry.ToString();
txtCropLeft.Text = _config.DispCropLeft.ToString();
txtCropTop.Text = _config.DispCropTop.ToString();
@ -124,14 +124,14 @@ namespace BizHawk.Client.EmuHawk
_config.DispAlternateVsync = cbAlternateVsync.Checked;
_config.DispChrome_StatusBarWindowed = cbStatusBarWindowed.Checked;
_config.DispChrome_CaptionWindowed = cbCaptionWindowed.Checked;
_config.DispChrome_MenuWindowed = cbMenuWindowed.Checked;
_config.DispChrome_StatusBarFullscreen = cbStatusBarFullscreen.Checked;
_config.DispChrome_MenuFullscreen = cbMenuFullscreen.Checked;
_config.DispChrome_FrameWindowed = trackbarFrameSizeWindowed.Value;
_config.DispChrome_Fullscreen_AutohideMouse = cbFSAutohideMouse.Checked;
_config.DispChrome_AllowDoubleClickFullscreen = cbAllowDoubleclickFullscreen.Checked;
_config.DispChromeStatusBarWindowed = cbStatusBarWindowed.Checked;
_config.DispChromeCaptionWindowed = cbCaptionWindowed.Checked;
_config.DispChromeMenuWindowed = cbMenuWindowed.Checked;
_config.DispChromeStatusBarFullscreen = cbStatusBarFullscreen.Checked;
_config.DispChromeMenuFullscreen = cbMenuFullscreen.Checked;
_config.DispChromeFrameWindowed = trackbarFrameSizeWindowed.Value;
_config.DispChromeFullscreenAutohideMouse = cbFSAutohideMouse.Checked;
_config.DispChromeAllowDoubleClickFullscreen = cbAllowDoubleclickFullscreen.Checked;
if (rbDisplayFull.Checked) _config.DispSpeedupFeatures = 2;
if (rbDisplayMinimal.Checked) _config.DispSpeedupFeatures = 1;
@ -153,11 +153,11 @@ namespace BizHawk.Client.EmuHawk
int.TryParse(txtCustomARHeight.Text, out _config.DispCustomUserARHeight);
else _config.DispCustomUserARHeight = -1;
if (txtCustomARX.Text != "")
float.TryParse(txtCustomARX.Text, out _config.DispCustomUserARX);
else _config.DispCustomUserARX = -1;
float.TryParse(txtCustomARX.Text, out _config.DispCustomUserArx);
else _config.DispCustomUserArx = -1;
if (txtCustomARY.Text != "")
float.TryParse(txtCustomARY.Text, out _config.DispCustomUserARY);
else _config.DispCustomUserARY = -1;
float.TryParse(txtCustomARY.Text, out _config.DispCustomUserAry);
else _config.DispCustomUserAry = -1;
var oldDisplayMethod = _config.DispMethod;
if(rbOpenGL.Checked)

4
BizHawk.Client.EmuHawk/config/EmuHawkOptions.cs
View File

@ -65,7 +65,7 @@ namespace BizHawk.Client.EmuHawk
FrameAdvSkipLagCheckbox.Checked = _config.SkipLagFrame;
LuaDuringTurboCheckbox.Checked = _config.RunLuaDuringTurbo;
cbMoviesOnDisk.Checked = _config.MoviesOnDisk;
cbMoviesInAWE.Checked = _config.MoviesInAWE;
cbMoviesInAWE.Checked = _config.MoviesInAwe;
switch (_config.LuaEngine)
{
@ -102,7 +102,7 @@ namespace BizHawk.Client.EmuHawk
_config.SkipLagFrame = FrameAdvSkipLagCheckbox.Checked;
_config.RunLuaDuringTurbo = LuaDuringTurboCheckbox.Checked;
_config.MoviesOnDisk = cbMoviesOnDisk.Checked;
_config.MoviesInAWE = cbMoviesInAWE.Checked;
_config.MoviesInAwe = cbMoviesInAWE.Checked;
var prevLuaEngine = _config.LuaEngine;
if (LuaInterfaceRadio.Checked) _config.LuaEngine = ELuaEngine.LuaPlusLuaInterface;

4
BizHawk.Client.EmuHawk/config/PathConfig.cs
View File

@ -49,7 +49,7 @@ namespace BizHawk.Client.EmuHawk
private void LoadSettings()
{
RecentForROMs.Checked = _config.UseRecentForROMs;
RecentForROMs.Checked = _config.UseRecentForRoms;
DoTabs(_config.PathEntries.ToList());
SetDefaultFocusedTab();
@ -246,7 +246,7 @@ namespace BizHawk.Client.EmuHawk
private void SaveSettings()
{
_config.UseRecentForROMs = RecentForROMs.Checked;
_config.UseRecentForRoms = RecentForROMs.Checked;
foreach (var t in AllPathBoxes)
{

34
BizHawk.Client.EmuHawk/config/ProfileConfig.cs
View File

@ -55,7 +55,7 @@ namespace BizHawk.Client.EmuHawk
break;
}
AutoCheckForUpdates.Checked = _config.Update_AutoCheckEnabled;
AutoCheckForUpdates.Checked = _config.UpdateAutoCheckEnabled;
}
private void OkBtn_Click(object sender, EventArgs e)
@ -83,7 +83,7 @@ namespace BizHawk.Client.EmuHawk
DisplayProfileSettingBoxes(false);
_config.NoLowResLargeScreenshotWithStates = false;
_config.SaveScreenshotWithStates = false;
_config.AllowUD_LR = false;
_config.AllowUdlr = false;
_config.BackupSavestates = false;
_config.SaveStateCompressionLevelNormal = 0;
@ -100,7 +100,7 @@ namespace BizHawk.Client.EmuHawk
PutSyncSettings<N64>(n64Settings);
// SNES
_config.SNES_InSnes9x = true;
_config.SnesInSnes9x = true;
// Genesis
var genesisSettings = GetSyncSettings<GPGX, GPGX.GPGXSyncSettings>();
@ -125,14 +125,14 @@ namespace BizHawk.Client.EmuHawk
PutSyncSettings<Atari2600>(a2600Settings);
// NES
_config.NES_InQuickNES = true;
_config.NesInQuickNes = true;
}
else if (_config.SelectedProfile == ClientProfile.Longplay)
{
DisplayProfileSettingBoxes(false);
_config.NoLowResLargeScreenshotWithStates = false;
_config.SaveScreenshotWithStates = false;
_config.AllowUD_LR = false;
_config.AllowUdlr = false;
_config.BackupSavestates = false;
_config.SkipLagFrame = false;
_config.SaveStateCompressionLevelNormal = 5;
@ -148,7 +148,7 @@ namespace BizHawk.Client.EmuHawk
PutSyncSettings<N64>(n64Settings);
// SNES
_config.SNES_InSnes9x = false;
_config.SnesInSnes9x = false;
// Genesis
var genesisSettings = GetSyncSettings<GPGX, GPGX.GPGXSyncSettings>();
@ -173,7 +173,7 @@ namespace BizHawk.Client.EmuHawk
PutSyncSettings<Atari2600>(a2600Settings);
// NES
_config.NES_InQuickNES = true;
_config.NesInQuickNes = true;
}
else if (_config.SelectedProfile == ClientProfile.Tas)
{
@ -182,7 +182,7 @@ namespace BizHawk.Client.EmuHawk
// General
_config.NoLowResLargeScreenshotWithStates = false;
_config.SaveScreenshotWithStates = true;
_config.AllowUD_LR = true;
_config.AllowUdlr = true;
_config.BackupSavestates = true;
_config.SkipLagFrame = false;
_config.SaveStateCompressionLevelNormal = 5;
@ -199,7 +199,7 @@ namespace BizHawk.Client.EmuHawk
PutSyncSettings<N64>(n64Settings);
// SNES
_config.SNES_InSnes9x = false;
_config.SnesInSnes9x = false;
// Genesis
var genesisSettings = GetSyncSettings<GPGX, GPGX.GPGXSyncSettings>();
@ -224,7 +224,7 @@ namespace BizHawk.Client.EmuHawk
PutSyncSettings<Atari2600>(a2600Settings);
// NES
_config.NES_InQuickNES = true;
_config.NesInQuickNes = true;
}
else if (_config.SelectedProfile == ClientProfile.N64Tas)
{
@ -233,7 +233,7 @@ namespace BizHawk.Client.EmuHawk
// General
_config.NoLowResLargeScreenshotWithStates = false;
_config.SaveScreenshotWithStates = true;
_config.AllowUD_LR = true;
_config.AllowUdlr = true;
_config.BackupSavestates = false;
_config.SkipLagFrame = true;
_config.SaveStateCompressionLevelNormal = 0;
@ -251,7 +251,7 @@ namespace BizHawk.Client.EmuHawk
PutSyncSettings<N64>(n64Settings);
// SNES
_config.SNES_InSnes9x = false;
_config.SnesInSnes9x = false;
// Genesis
var genesisSettings = GetSyncSettings<GPGX, GPGX.GPGXSyncSettings>();
@ -276,7 +276,7 @@ namespace BizHawk.Client.EmuHawk
PutSyncSettings<Atari2600>(a2600Settings);
// NES
_config.NES_InQuickNES = true;
_config.NesInQuickNes = true;
}
else if (_config.SelectedProfile == ClientProfile.Custom)
{
@ -284,11 +284,11 @@ namespace BizHawk.Client.EmuHawk
////DisplayProfileSettingBoxes(true);
}
bool oldUpdateAutoCheckEnabled = _config.Update_AutoCheckEnabled;
_config.Update_AutoCheckEnabled = AutoCheckForUpdates.Checked;
if (_config.Update_AutoCheckEnabled != oldUpdateAutoCheckEnabled)
bool oldUpdateAutoCheckEnabled = _config.UpdateAutoCheckEnabled;
_config.UpdateAutoCheckEnabled = AutoCheckForUpdates.Checked;
if (_config.UpdateAutoCheckEnabled != oldUpdateAutoCheckEnabled)
{
if (!_config.Update_AutoCheckEnabled)
if (!_config.UpdateAutoCheckEnabled)
{
UpdateChecker.ResetHistory();
}

12
BizHawk.Client.EmuHawk/movie/PlayMovie.cs
View File

@ -54,8 +54,8 @@ namespace BizHawk.Client.EmuHawk
private void PlayMovie_Load(object sender, EventArgs e)
{
IncludeSubDirectories.Checked = _config.PlayMovie_IncludeSubdir;
MatchHashCheckBox.Checked = _config.PlayMovie_MatchHash;
IncludeSubDirectories.Checked = _config.PlayMovieIncludeSubDir;
MatchHashCheckBox.Checked = _config.PlayMovieMatchHash;
ScanFiles();
PreHighlightMovie();
TurboCheckbox.Checked = _config.TurboSeek;
@ -136,7 +136,7 @@ namespace BizHawk.Client.EmuHawk
// Don't do this from browse
if (movie.Hash == _game.Hash
|| _config.PlayMovie_MatchHash == false || force)
|| _config.PlayMovieMatchHash == false || force)
{
return movie;
}
@ -254,7 +254,7 @@ namespace BizHawk.Client.EmuHawk
string dp = dpTodo.Dequeue();
// enqueue subdirectories if appropriate
if (_config.PlayMovie_IncludeSubdir)
if (_config.PlayMovieIncludeSubDir)
{
foreach (var subDir in Directory.GetDirectories(dp))
{
@ -602,14 +602,14 @@ namespace BizHawk.Client.EmuHawk
private void IncludeSubDirectories_CheckedChanged(object sender, EventArgs e)
{
_config.PlayMovie_IncludeSubdir = IncludeSubDirectories.Checked;
_config.PlayMovieIncludeSubDir = IncludeSubDirectories.Checked;
ScanFiles();
PreHighlightMovie();
}
private void MatchHashCheckBox_CheckedChanged(object sender, EventArgs e)
{
_config.PlayMovie_MatchHash = MatchHashCheckBox.Checked;
_config.PlayMovieMatchHash = MatchHashCheckBox.Checked;
ScanFiles();
PreHighlightMovie();
}

2
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Client.cs
View File

@ -314,7 +314,7 @@ namespace BizHawk.Client.EmuHawk
[LuaMethod("setscreenshotosd", "Sets the screenshot Capture OSD property of the client")]
public static void SetScreenshotOSD(bool value)
{
Global.Config.Screenshot_CaptureOSD = value;
Global.Config.ScreenshotCaptureOsd = value;
}
[LuaMethodExample("local incliscr = client.screenwidth( );")]

2
BizHawk.sln.DotSettings
View File

@ -433,6 +433,8 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=Waterbox/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Winform/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=winforms/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Wndx/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Wndy/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=WRAM/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=WSWAN/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=XBOX/@EntryIndexedValue">True</s:Boolean>