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

Misc mainform cleanups

This commit is contained in:
adelikat 2017-05-22 11:14:38 -05:00
parent 3a98460fbd
commit 0796c14046
6 changed files with 709 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BizHawk.Client.EmuHawk/GlobalWin.cs
View File

@ -1,6 +1,6 @@
using BizHawk.Client.Common;
using BizHawk.Bizware.BizwareGL;
using BizHawk.Bizware.BizwareGL;
// ReSharper disable StyleCop.SA1401
namespace BizHawk.Client.EmuHawk
{
public static class GlobalWin
@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk
public static Bizware.BizwareGL.Drivers.OpenTK.IGL_TK IGL_GL;
public static Sound Sound;
public static OSDManager OSD = new OSDManager();
public static readonly OSDManager OSD = new OSDManager();
public static DisplayManager DisplayManager;
public static GLManager GLManager;

43
BizHawk.Client.EmuHawk/MainForm.Designer.cs generated
View File

@ -1222,7 +1222,7 @@
this.EmulationSubMenu.Name = "EmulationSubMenu";
this.EmulationSubMenu.Size = new System.Drawing.Size(73, 19);
this.EmulationSubMenu.Text = "&Emulation";
this.EmulationSubMenu.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened);
this.EmulationSubMenu.DropDownOpened += new System.EventHandler(this.EmulationMenuItem_DropDownOpened);
//
// PauseMenuItem
//
@ -1354,7 +1354,7 @@
this.DisplayFPSMenuItem.Name = "DisplayFPSMenuItem";
this.DisplayFPSMenuItem.Size = new System.Drawing.Size(198, 22);
this.DisplayFPSMenuItem.Text = "Display FPS";
this.DisplayFPSMenuItem.Click += new System.EventHandler(this.DisplayFPSMenuItem_Click);
this.DisplayFPSMenuItem.Click += new System.EventHandler(this.DisplayFpsMenuItem_Click);
//
// DisplayFrameCounterMenuItem
//
@ -1856,14 +1856,14 @@
this.Coresnes9xMenuItem.Name = "Coresnes9xMenuItem";
this.Coresnes9xMenuItem.Size = new System.Drawing.Size(177, 22);
this.Coresnes9xMenuItem.Text = "Snes9x";
this.Coresnes9xMenuItem.Click += new System.EventHandler(this.Coresnes9xMenuItem_Click);
this.Coresnes9xMenuItem.Click += new System.EventHandler(this.CoreSnes9xMenuItem_Click);
//
// gBAWithMGBAToolStripMenuItem
//
this.gBAWithMGBAToolStripMenuItem.Name = "gBAWithMGBAToolStripMenuItem";
this.gBAWithMGBAToolStripMenuItem.Size = new System.Drawing.Size(239, 22);
this.gBAWithMGBAToolStripMenuItem.Text = "GBA with mGBA";
this.gBAWithMGBAToolStripMenuItem.Click += new System.EventHandler(this.gBAWithMGBAToolStripMenuItem_Click);
this.gBAWithMGBAToolStripMenuItem.Click += new System.EventHandler(this.GbaWithmGBAMenuItem_Click);
//
// toolStripMenuItem16
//
@ -2179,14 +2179,14 @@
this.quickNESToolStripMenuItem.Name = "quickNESToolStripMenuItem";
this.quickNESToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.quickNESToolStripMenuItem.Text = "&QuickNes";
this.quickNESToolStripMenuItem.Click += new System.EventHandler(this.quickNESToolStripMenuItem_Click);
this.quickNESToolStripMenuItem.Click += new System.EventHandler(this.QuickNesToolStripMenuItem_Click);
//
// nesHawkToolStripMenuItem
//
this.nesHawkToolStripMenuItem.Name = "nesHawkToolStripMenuItem";
this.nesHawkToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.nesHawkToolStripMenuItem.Text = "&NesHawk";
this.nesHawkToolStripMenuItem.Click += new System.EventHandler(this.nesHawkToolStripMenuItem_Click);
this.nesHawkToolStripMenuItem.Click += new System.EventHandler(this.NesHawkToolStripMenuItem_Click);
//
// toolStripSeparator34
//
@ -2198,7 +2198,7 @@
this.NESPPUViewerMenuItem.Name = "NESPPUViewerMenuItem";
this.NESPPUViewerMenuItem.Size = new System.Drawing.Size(233, 22);
this.NESPPUViewerMenuItem.Text = "&PPU Viewer";
this.NESPPUViewerMenuItem.Click += new System.EventHandler(this.NESPPUViewerMenuItem_Click);
this.NESPPUViewerMenuItem.Click += new System.EventHandler(this.NesPPUViewerMenuItem_Click);
//
// NESNametableViewerMenuItem
//
@ -2219,7 +2219,7 @@
this.musicRipperToolStripMenuItem.Name = "musicRipperToolStripMenuItem";
this.musicRipperToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
this.musicRipperToolStripMenuItem.Text = "Music Ripper";
this.musicRipperToolStripMenuItem.Click += new System.EventHandler(this.musicRipperToolStripMenuItem_Click);
this.musicRipperToolStripMenuItem.Click += new System.EventHandler(this.MusicRipperMenuItem_Click);
//
// toolStripSeparator17
//
@ -2255,7 +2255,7 @@
this.VSSettingsMenuItem.Name = "VSSettingsMenuItem";
this.VSSettingsMenuItem.Size = new System.Drawing.Size(233, 22);
this.VSSettingsMenuItem.Text = "VS Settings...";
this.VSSettingsMenuItem.Click += new System.EventHandler(this.VSSettingsMenuItem_Click);
this.VSSettingsMenuItem.Click += new System.EventHandler(this.VsSettingsMenuItem_Click);
//
// MovieSettingsMenuItem
//
@ -2300,28 +2300,28 @@
this.VSInsertCoinP1MenuItem.Name = "VSInsertCoinP1MenuItem";
this.VSInsertCoinP1MenuItem.Size = new System.Drawing.Size(149, 22);
this.VSInsertCoinP1MenuItem.Text = "Insert Coin P1";
this.VSInsertCoinP1MenuItem.Click += new System.EventHandler(this.VSInsertCoinP1MenuItem_Click);
this.VSInsertCoinP1MenuItem.Click += new System.EventHandler(this.VsInsertCoinP1MenuItem_Click);
//
// VSInsertCoinP2MenuItem
//
this.VSInsertCoinP2MenuItem.Name = "VSInsertCoinP2MenuItem";
this.VSInsertCoinP2MenuItem.Size = new System.Drawing.Size(149, 22);
this.VSInsertCoinP2MenuItem.Text = "Insert Coin P2";
this.VSInsertCoinP2MenuItem.Click += new System.EventHandler(this.VSInsertCoinP2MenuItem_Click);
this.VSInsertCoinP2MenuItem.Click += new System.EventHandler(this.VsInsertCoinP2MenuItem_Click);
//
// VSServiceSwitchMenuItem
//
this.VSServiceSwitchMenuItem.Name = "VSServiceSwitchMenuItem";
this.VSServiceSwitchMenuItem.Size = new System.Drawing.Size(149, 22);
this.VSServiceSwitchMenuItem.Text = "Service Switch";
this.VSServiceSwitchMenuItem.Click += new System.EventHandler(this.VSServiceSwitchMenuItem_Click);
this.VSServiceSwitchMenuItem.Click += new System.EventHandler(this.VsServiceSwitchMenuItem_Click);
//
// barcodeReaderToolStripMenuItem
//
this.barcodeReaderToolStripMenuItem.Name = "barcodeReaderToolStripMenuItem";
this.barcodeReaderToolStripMenuItem.Size = new System.Drawing.Size(233, 22);
this.barcodeReaderToolStripMenuItem.Text = "Barcode Reader";
this.barcodeReaderToolStripMenuItem.Click += new System.EventHandler(this.barcodeReaderToolStripMenuItem_Click);
this.barcodeReaderToolStripMenuItem.Click += new System.EventHandler(this.BarcodeReaderMenuItem_Click);
//
// PCESubMenu
//
@ -2355,7 +2355,7 @@
this.PCEGraphicsSettingsMenuItem.Name = "PCEGraphicsSettingsMenuItem";
this.PCEGraphicsSettingsMenuItem.Size = new System.Drawing.Size(258, 22);
this.PCEGraphicsSettingsMenuItem.Text = "Graphics Settings";
this.PCEGraphicsSettingsMenuItem.Click += new System.EventHandler(this.PCEGraphicsSettingsMenuItem_Click);
this.PCEGraphicsSettingsMenuItem.Click += new System.EventHandler(this.PceGraphicsSettingsMenuItem_Click);
//
// toolStripSeparator32
//
@ -2367,7 +2367,7 @@
this.PCEBGViewerMenuItem.Name = "PCEBGViewerMenuItem";
this.PCEBGViewerMenuItem.Size = new System.Drawing.Size(258, 22);
this.PCEBGViewerMenuItem.Text = "&BG Viewer";
this.PCEBGViewerMenuItem.Click += new System.EventHandler(this.PCEBGViewerMenuItem_Click);
this.PCEBGViewerMenuItem.Click += new System.EventHandler(this.PceBgViewerMenuItem_Click);
//
// PCEtileViewerToolStripMenuItem
//
@ -2381,7 +2381,7 @@
this.PceSoundDebuggerToolStripMenuItem.Name = "PceSoundDebuggerToolStripMenuItem";
this.PceSoundDebuggerToolStripMenuItem.Size = new System.Drawing.Size(258, 22);
this.PceSoundDebuggerToolStripMenuItem.Text = "&Sound Debugger";
this.PceSoundDebuggerToolStripMenuItem.Click += new System.EventHandler(this.PceSoundDebuggerToolStripMenuItem_Click);
this.PceSoundDebuggerToolStripMenuItem.Click += new System.EventHandler(this.PceSoundDebuggerMenuItem_Click);
//
// toolStripSeparator25
//
@ -2505,14 +2505,14 @@
this.SMSenableBIOSToolStripMenuItem.Name = "SMSenableBIOSToolStripMenuItem";
this.SMSenableBIOSToolStripMenuItem.Size = new System.Drawing.Size(241, 22);
this.SMSenableBIOSToolStripMenuItem.Text = "Enable BIOS";
this.SMSenableBIOSToolStripMenuItem.Click += new System.EventHandler(this.SMS_BIOS_Click);
this.SMSenableBIOSToolStripMenuItem.Click += new System.EventHandler(this.SmsBiosMenuItem_Click);
//
// SMSEnableFMChipMenuItem
//
this.SMSEnableFMChipMenuItem.Name = "SMSEnableFMChipMenuItem";
this.SMSEnableFMChipMenuItem.Size = new System.Drawing.Size(241, 22);
this.SMSEnableFMChipMenuItem.Text = "&Enable FM Chip";
this.SMSEnableFMChipMenuItem.Click += new System.EventHandler(this.SMSEnableFMChipMenuItem_Click);
this.SMSEnableFMChipMenuItem.Click += new System.EventHandler(this.SmsEnableFmChipMenuItem_Click);
//
// SMSOverclockMenuItem
//
@ -2645,7 +2645,6 @@
this.AtariSubMenu.Name = "AtariSubMenu";
this.AtariSubMenu.Size = new System.Drawing.Size(44, 19);
this.AtariSubMenu.Text = "&Atari";
this.AtariSubMenu.DropDownOpened += new System.EventHandler(this.AtariSubMenu_DropDownOpened);
//
// AtariSettingsToolStripMenuItem
//
@ -3039,7 +3038,7 @@
this.DGBsettingsToolStripMenuItem.Name = "DGBsettingsToolStripMenuItem";
this.DGBsettingsToolStripMenuItem.Size = new System.Drawing.Size(125, 22);
this.DGBsettingsToolStripMenuItem.Text = "Settings...";
this.DGBsettingsToolStripMenuItem.Click += new System.EventHandler(this.DGBsettingsToolStripMenuItem_Click);
this.DGBsettingsToolStripMenuItem.Click += new System.EventHandler(this.DgbSettingsMenuItem_Click);
//
// GenesisSubMenu
//
@ -3122,7 +3121,7 @@
this.settingsToolStripMenuItem1.Name = "settingsToolStripMenuItem1";
this.settingsToolStripMenuItem1.Size = new System.Drawing.Size(152, 22);
this.settingsToolStripMenuItem1.Text = "&Settings...";
this.settingsToolStripMenuItem1.Click += new System.EventHandler(this.settingsToolStripMenuItem1_Click_1);
this.settingsToolStripMenuItem1.Click += new System.EventHandler(this.AppleIISettingsMenuItem_Click);
//
// C64SubMenu
//
@ -3835,7 +3834,7 @@
this.ClearSRAMContextMenuItem.Name = "ClearSRAMContextMenuItem";
this.ClearSRAMContextMenuItem.Size = new System.Drawing.Size(216, 22);
this.ClearSRAMContextMenuItem.Text = "Close and Clear SRAM";
this.ClearSRAMContextMenuItem.Click += new System.EventHandler(this.ClearSRAMContextMenuItem_Click);
this.ClearSRAMContextMenuItem.Click += new System.EventHandler(this.ClearSramContextMenuItem_Click);
//
// ShowMenuContextMenuSeparator
//

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

@ -27,7 +27,7 @@ using BizHawk.Emulation.Cores.Computers.Commodore64;
namespace BizHawk.Client.EmuHawk
{
partial class MainForm
public partial class MainForm
{
#region File Menu
@ -51,7 +51,7 @@ namespace BizHawk.Client.EmuHawk
SaveRAMSubMenu.Enabled = hasSaveRam;
if (SaveRAMSubMenu.Font.Bold != needBold)
{
var font = new System.Drawing.Font(SaveRAMSubMenu.Font, needBold ? FontStyle.Bold : FontStyle.Regular);
var font = new Font(SaveRAMSubMenu.Font, needBold ? FontStyle.Bold : FontStyle.Regular);
SaveRAMSubMenu.Font = font;
}
@ -72,62 +72,52 @@ namespace BizHawk.Client.EmuHawk
SaveState0MenuItem.Font = new Font(
SaveState0MenuItem.Font.FontFamily,
SaveState0MenuItem.Font.Size,
_stateSlots.HasSlot(0) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular
);
_stateSlots.HasSlot(0) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SaveState1MenuItem.Font = new Font(
SaveState1MenuItem.Font.FontFamily,
SaveState1MenuItem.Font.Size,
_stateSlots.HasSlot(1) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular
);
_stateSlots.HasSlot(1) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SaveState2MenuItem.Font = new Font(
SaveState2MenuItem.Font.FontFamily,
SaveState2MenuItem.Font.Size,
_stateSlots.HasSlot(2) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular
);
_stateSlots.HasSlot(2) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SaveState3MenuItem.Font = new Font(
SaveState3MenuItem.Font.FontFamily,
SaveState3MenuItem.Font.Size,
_stateSlots.HasSlot(3) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular
);
_stateSlots.HasSlot(3) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SaveState4MenuItem.Font = new Font(
SaveState4MenuItem.Font.FontFamily,
SaveState4MenuItem.Font.Size,
_stateSlots.HasSlot(4) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular
);
_stateSlots.HasSlot(4) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SaveState5MenuItem.Font = new Font(
SaveState5MenuItem.Font.FontFamily,
SaveState5MenuItem.Font.Size,
_stateSlots.HasSlot(5) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular
);
_stateSlots.HasSlot(5) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SaveState6MenuItem.Font = new Font(
SaveState6MenuItem.Font.FontFamily,
SaveState6MenuItem.Font.Size,
_stateSlots.HasSlot(6) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular
);
_stateSlots.HasSlot(6) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SaveState7MenuItem.Font = new Font(
SaveState7MenuItem.Font.FontFamily,
SaveState7MenuItem.Font.Size,
_stateSlots.HasSlot(7) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular
);
_stateSlots.HasSlot(7) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SaveState8MenuItem.Font = new Font(
SaveState8MenuItem.Font.FontFamily,
SaveState8MenuItem.Font.Size,
_stateSlots.HasSlot(8) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular
);
_stateSlots.HasSlot(8) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SaveState9MenuItem.Font = new Font(
SaveState9MenuItem.Font.FontFamily,
SaveState9MenuItem.Font.Size,
_stateSlots.HasSlot(9) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular
);
_stateSlots.HasSlot(9) ? (FontStyle.Italic | FontStyle.Bold) : FontStyle.Regular);
SaveState1MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 1"].Bindings;
SaveState2MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 2"].Bindings;
@ -320,12 +310,16 @@ namespace BizHawk.Client.EmuHawk
{
var oac = new OpenAdvancedChooser(this);
if (oac.ShowHawkDialog() == DialogResult.Cancel)
{
return;
}
if (oac.Result == OpenAdvancedChooser.Command.RetroLaunchNoGame)
{
var argsNoGame = new LoadRomArgs();
argsNoGame.OpenAdvanced = new OpenAdvanced_LibretroNoGame(Global.Config.LibretroCore);
var argsNoGame = new LoadRomArgs
{
OpenAdvanced = new OpenAdvanced_LibretroNoGame(Global.Config.LibretroCore)
};
LoadRom("", argsNoGame);
return;
}
@ -340,12 +334,16 @@ namespace BizHawk.Client.EmuHawk
filter = oac.SuggestedExtensionFilter;
}
else if (oac.Result == OpenAdvancedChooser.Command.ClassicLaunchGame)
{
args.OpenAdvanced = new OpenAdvanced_OpenRom();
else throw new InvalidOperationException("Automatic Alpha Sanitizer");
}
else
{
throw new InvalidOperationException("Automatic Alpha Sanitizer");
}
//-----------------
//CLONE OF CODE FROM OpenRom (mostly)
/*************************/
/* CLONE OF CODE FROM OpenRom (mostly) */
var ofd = new OpenFileDialog
{
InitialDirectory = PathManager.GetRomsPath(Emulator.SystemId),
@ -364,9 +362,7 @@ namespace BizHawk.Client.EmuHawk
var file = new FileInfo(ofd.FileName);
Global.Config.LastRomPath = file.DirectoryName;
_lastOpenRomFilter = ofd.FilterIndex;
//-----------------
/*************************/
LoadRom(file.FullName, args);
}
@ -464,8 +460,9 @@ namespace BizHawk.Client.EmuHawk
{
if (!Emulator.Attributes().Released)
{
var result = MessageBox.Show
(this, "Thanks for using Bizhawk! The emulation core you have selected " +
var result = MessageBox.Show(
this,
"Thanks for using Bizhawk! The emulation core you have selected " +
"is currently BETA-status. We appreciate your help in testing Bizhawk. " +
"You can record a movie on this core if you'd like to, but expect to " +
"encounter bugs and sync problems. Continue?", "BizHawk", MessageBoxButtons.YesNo);
@ -592,7 +589,10 @@ namespace BizHawk.Client.EmuHawk
private void StopMovieWithoutSavingMenuItem_Click(object sender, EventArgs e)
{
if (Global.Config.EnableBackupMovies)
{
Global.MovieSession.Movie.SaveBackup();
}
StopMovie(saveChanges: false);
}
@ -712,7 +712,7 @@ namespace BizHawk.Client.EmuHawk
#region Emulation Menu
private void emulationToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
private void EmulationMenuItem_DropDownOpened(object sender, EventArgs e)
{
PauseMenuItem.Checked = _didMenuPause ? _wasPaused : EmulatorPaused;
@ -822,9 +822,9 @@ namespace BizHawk.Client.EmuHawk
ToggleFullscreen();
}
private void DisplayFPSMenuItem_Click(object sender, EventArgs e)
private void DisplayFpsMenuItem_Click(object sender, EventArgs e)
{
ToggleFPS();
ToggleFps();
}
private void DisplayFrameCounterMenuItem_Click(object sender, EventArgs e)
@ -903,7 +903,11 @@ namespace BizHawk.Client.EmuHawk
Frameskip8MenuItem.Checked = Global.Config.FrameSkip == 8;
Frameskip9MenuItem.Checked = Global.Config.FrameSkip == 9;
MinimizeSkippingMenuItem.Enabled = !NeverSkipMenuItem.Checked;
if (!MinimizeSkippingMenuItem.Enabled) MinimizeSkippingMenuItem.Checked = true;
if (!MinimizeSkippingMenuItem.Enabled)
{
MinimizeSkippingMenuItem.Checked = true;
}
AudioThrottleMenuItem.Enabled = Global.Config.SoundEnabled;
AudioThrottleMenuItem.Checked = Global.Config.SoundThrottle;
VsyncEnabledMenuItem.Checked = Global.Config.VSync;
@ -1037,8 +1041,9 @@ namespace BizHawk.Client.EmuHawk
if (new ProfileConfig().ShowDialog() == DialogResult.OK)
{
GlobalWin.OSD.AddMessage("Profile settings saved");
//We hide the FirstBoot items since the user setup a Profile
//Is it a bad thing to do this constantly?
// We hide the FirstBoot items since the user setup a Profile
// Is it a bad thing to do this constantly?
Global.Config.FirstBoot = false;
ProfileFirstBootLabel.Visible = false;
}
@ -1059,6 +1064,7 @@ namespace BizHawk.Client.EmuHawk
{
RewireSound();
}
old = Global.Config.VSyncThrottle;
Global.Config.VSyncThrottle = false;
if (old)
@ -1203,11 +1209,8 @@ namespace BizHawk.Client.EmuHawk
Coresnes9xMenuItem.Checked = Global.Config.SNES_InSnes9x;
Coresnes9xMenuItem.Visible = VersionInfo.DeveloperBuild;
LibsnesCore.SnesSyncSettings sss = (LibsnesCore.SnesSyncSettings)Global.Config.GetCoreSyncSettings<LibsnesCore>();
if (sss == null)
{
sss = new LibsnesCore.SnesSyncSettings();
}
LibsnesCore.SnesSyncSettings sss = (LibsnesCore.SnesSyncSettings)Global.Config.GetCoreSyncSettings<LibsnesCore>()
?? new LibsnesCore.SnesSyncSettings();
CorebsnesPerformanceMenuItem.Checked = sss.Profile == "Performance";
CorebsnesCompatibilityMenuItem.Checked = sss.Profile == "Compatibility";
@ -1215,11 +1218,8 @@ namespace BizHawk.Client.EmuHawk
private void CorebsnesPerformanceMenuItem_Click(object sender, EventArgs e)
{
LibsnesCore.SnesSyncSettings sss = (LibsnesCore.SnesSyncSettings)Global.Config.GetCoreSyncSettings<LibsnesCore>();
if (sss == null)
{
sss = new LibsnesCore.SnesSyncSettings();
}
LibsnesCore.SnesSyncSettings sss = (LibsnesCore.SnesSyncSettings)Global.Config.GetCoreSyncSettings<LibsnesCore>()
?? new LibsnesCore.SnesSyncSettings();
string orig = sss.Profile;
@ -1234,11 +1234,8 @@ namespace BizHawk.Client.EmuHawk
private void CorebsnesCompatibilityMenuItem_Click(object sender, EventArgs e)
{
LibsnesCore.SnesSyncSettings sss = (LibsnesCore.SnesSyncSettings)Global.Config.GetCoreSyncSettings<LibsnesCore>();
if (sss == null)
{
sss = new LibsnesCore.SnesSyncSettings();
}
LibsnesCore.SnesSyncSettings sss = (LibsnesCore.SnesSyncSettings)Global.Config.GetCoreSyncSettings<LibsnesCore>()
?? new LibsnesCore.SnesSyncSettings();
string orig = sss.Profile;
@ -1251,7 +1248,7 @@ namespace BizHawk.Client.EmuHawk
}
}
private void Coresnes9xMenuItem_Click(object sender, EventArgs e)
private void CoreSnes9xMenuItem_Click(object sender, EventArgs e)
{
Global.Config.SNES_InSnes9x ^= true;
@ -1368,9 +1365,9 @@ namespace BizHawk.Client.EmuHawk
{
externalToolToolStripMenuItem.DropDownItems.Clear();
foreach(ToolStripMenuItem item in ExternalToolManager.ToolStripMenu)
foreach (ToolStripMenuItem item in ExternalToolManager.ToolStripMenu)
{
if(item.Enabled)
if (item.Enabled)
{
item.Click += delegate
{
@ -1381,6 +1378,7 @@ namespace BizHawk.Client.EmuHawk
{
item.Image = Properties.Resources.ExclamationRed;
}
externalToolToolStripMenuItem.DropDownItems.Add(item);
}
@ -1496,13 +1494,13 @@ namespace BizHawk.Client.EmuHawk
#region NES
private void quickNESToolStripMenuItem_Click(object sender, EventArgs e)
private void QuickNesToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NES_InQuickNES = true;
FlagNeedsReboot();
}
private void nesHawkToolStripMenuItem_Click(object sender, EventArgs e)
private void NesHawkToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.NES_InQuickNES = false;
FlagNeedsReboot();
@ -1515,7 +1513,7 @@ namespace BizHawk.Client.EmuHawk
VSControlsMenuItem.Enabled =
VSSettingsMenuItem.Enabled =
((Emulator is NES) && (Emulator as NES).IsVS);
Emulator is NES && ((NES)Emulator).IsVS;
NESSoundChannelsMenuItem.Enabled = GlobalWin.Tools.IsAvailable<NESSoundConfig>();
MovieSettingsMenuItem.Enabled = Emulator is NES && !Global.MovieSession.Movie.IsActive;
@ -1548,7 +1546,7 @@ namespace BizHawk.Client.EmuHawk
}
}
private void NESPPUViewerMenuItem_Click(object sender, EventArgs e)
private void NesPPUViewerMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<NesPPU>();
}
@ -1558,7 +1556,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<NESNameTableViewer>();
}
private void musicRipperToolStripMenuItem_Click(object sender, EventArgs e)
private void MusicRipperMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<NESMusicRipper>();
}
@ -1571,9 +1569,13 @@ namespace BizHawk.Client.EmuHawk
private void NESGraphicSettingsMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is NES)
{
new NESGraphicsConfig().ShowDialog(this);
}
else if (Emulator is QuickNES)
{
new QuickNesConfig().ShowDialog(this);
}
}
private void NESSoundChannelsMenuItem_Click(object sender, EventArgs e)
@ -1581,9 +1583,9 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<NESSoundConfig>();
}
private void VSSettingsMenuItem_Click(object sender, EventArgs e)
private void VsSettingsMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is NES && (Emulator as NES).IsVS)
if (Emulator is NES && ((NES)Emulator).IsVS)
{
new NESVSSettings().ShowHawkDialog();
}
@ -1598,9 +1600,9 @@ namespace BizHawk.Client.EmuHawk
}
}
private void VSInsertCoinP1MenuItem_Click(object sender, EventArgs e)
private void VsInsertCoinP1MenuItem_Click(object sender, EventArgs e)
{
if (Emulator is NES && (Emulator as NES).IsVS)
if (Emulator is NES && ((NES)Emulator).IsVS)
{
if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{
@ -1610,9 +1612,9 @@ namespace BizHawk.Client.EmuHawk
}
}
private void VSInsertCoinP2MenuItem_Click(object sender, EventArgs e)
private void VsInsertCoinP2MenuItem_Click(object sender, EventArgs e)
{
if (Emulator is NES && (Emulator as NES).IsVS)
if (Emulator is NES && ((NES)Emulator).IsVS)
{
if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{
@ -1622,9 +1624,9 @@ namespace BizHawk.Client.EmuHawk
}
}
private void VSServiceSwitchMenuItem_Click(object sender, EventArgs e)
private void VsServiceSwitchMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is NES && (Emulator as NES).IsVS)
if (Emulator is NES && ((NES)Emulator).IsVS)
{
if (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished)
{
@ -1637,9 +1639,13 @@ namespace BizHawk.Client.EmuHawk
private void NesControllerSettingsMenuItem_Click(object sender, EventArgs e)
{
if (Emulator is NES)
{
new NesControllerSettings().ShowDialog();
}
else if (Emulator is QuickNES)
{
GenericCoreConfig.DoDialog(this, "QuickNES Controller Settings", true, false);
}
}
private void MovieSettingsMenuItem_Click(object sender, EventArgs e)
@ -1650,7 +1656,7 @@ namespace BizHawk.Client.EmuHawk
}
}
private void barcodeReaderToolStripMenuItem_Click(object sender, EventArgs e)
private void BarcodeReaderMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<BarcodeEntry>();
}
@ -1678,12 +1684,12 @@ namespace BizHawk.Client.EmuHawk
}
}
private void PCEGraphicsSettingsMenuItem_Click(object sender, EventArgs e)
private void PceGraphicsSettingsMenuItem_Click(object sender, EventArgs e)
{
new PCEGraphicsConfig().ShowDialog();
}
private void PCEBGViewerMenuItem_Click(object sender, EventArgs e)
private void PceBgViewerMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<PceBgViewer>();
}
@ -1693,7 +1699,7 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.Load<PCETileViewer>();
}
private void PceSoundDebuggerToolStripMenuItem_Click(object sender, EventArgs e)
private void PceSoundDebuggerMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.Tools.Load<PCESoundDebugger>();
}
@ -1807,14 +1813,14 @@ namespace BizHawk.Client.EmuHawk
PutCoreSyncSettings(ss);
}
private void SMS_BIOS_Click(object sender, EventArgs e)
private void SmsBiosMenuItem_Click(object sender, EventArgs e)
{
var ss = ((SMS)Emulator).GetSyncSettings();
ss.UseBIOS ^= true;
PutCoreSyncSettings(ss);
}
private void SMSEnableFMChipMenuItem_Click(object sender, EventArgs e)
private void SmsEnableFmChipMenuItem_Click(object sender, EventArgs e)
{
var ss = ((SMS)Emulator).GetSyncSettings();
ss.EnableFM ^= true;
@ -1921,7 +1927,7 @@ namespace BizHawk.Client.EmuHawk
}
catch (IOException ex)
{
var Message = String.Format("Invalid file format. Reason: {0} \nForce transfer? This may cause the calculator to crash.", ex.Message);
var Message = $"Invalid file format. Reason: {ex.Message} \nForce transfer? This may cause the calculator to crash.";
if (MessageBox.Show(Message, "Upload Failed", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question) == DialogResult.Yes)
{
@ -1947,11 +1953,6 @@ namespace BizHawk.Client.EmuHawk
#region Atari
private void AtariSubMenu_DropDownOpened(object sender, EventArgs e)
{
}
private void AtariSettingsToolStripMenuItem_Click(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "Atari 2600 Settings");
@ -1996,9 +1997,13 @@ namespace BizHawk.Client.EmuHawk
{
var gb = Emulator as Gameboy;
if (gb.IsCGBMode())
{
CGBColorChooserForm.DoCGBColorChooserFormDialog(this);
}
else
{
ColorChooserForm.DoColorChooserFormDialog(this);
}
}
private void LoadGBInSGBMenuItem_Click(object sender, EventArgs e)
@ -2043,7 +2048,7 @@ namespace BizHawk.Client.EmuHawk
GBAVBANextMenuItem.Checked = Global.Config.GBA_UsemGBA == false;
}
private void gBAWithMGBAToolStripMenuItem_Click(object sender, EventArgs e)
private void GbaWithmGBAMenuItem_Click(object sender, EventArgs e)
{
Global.Config.GBA_UsemGBA ^= true;
FlagNeedsReboot();
@ -2146,12 +2151,12 @@ namespace BizHawk.Client.EmuHawk
private void SnesObj1MenuItem_Click(object sender, EventArgs e)
{
this.SNES_ToggleObj1();
SNES_ToggleObj1();
}
private void SnesObj2MenuItem_Click(object sender, EventArgs e)
{
this.SNES_ToggleObj2();
SNES_ToggleObj2();
}
private void SnesObj3MenuItem_Click(object sender, EventArgs e)
@ -2228,9 +2233,6 @@ namespace BizHawk.Client.EmuHawk
var s = ((N64)Emulator).GetSettings();
MupenStyleLagMenuItem.Checked = s.UseMupenStyleLag;
//var ss = (N64SyncSettings)Emulator.GetSyncSettings();
//N64ExpansionSlotMenuItem.Checked = !ss.DisableExpansionSlot;
N64ExpansionSlotMenuItem.Checked = (Emulator as N64).UsingExpansionSlot;
N64ExpansionSlotMenuItem.Enabled = !(Emulator as N64).IsOverridingUserExpansionSlotSetting;
}
@ -2296,19 +2298,13 @@ namespace BizHawk.Client.EmuHawk
private void SaturnPreferencesMenuItem_Click(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "Saturn Settings");
/* -- delete me, out of date
using (var dlg = new SaturnPrefs())
{
dlg.ShowDialog(this);
}
* */
}
#endregion
#region DGB
private void DGBsettingsToolStripMenuItem_Click(object sender, EventArgs e)
private void DgbSettingsMenuItem_Click(object sender, EventArgs e)
{
config.GB.DGBPrefs.DoDGBPrefsDialog(this);
}
@ -2345,7 +2341,7 @@ namespace BizHawk.Client.EmuHawk
#region Apple II
private void settingsToolStripMenuItem1_Click_1(object sender, EventArgs e)
private void AppleIISettingsMenuItem_Click(object sender, EventArgs e)
{
GenericCoreConfig.DoDialog(this, "Apple II Settings");
}
@ -2354,7 +2350,7 @@ namespace BizHawk.Client.EmuHawk
{
if (Emulator is AppleII)
{
AppleDisksSubMenu.Enabled = (Emulator as AppleII).DiskCount > 1;
AppleDisksSubMenu.Enabled = ((AppleII)Emulator).DiskCount > 1;
}
}
@ -2487,8 +2483,16 @@ namespace BizHawk.Client.EmuHawk
OpenRomContextMenuItem.Visible = Emulator.IsNull() || _inFullscreen;
bool showMenuVisible = _inFullscreen;
if (!MainMenuStrip.Visible) showMenuVisible = true; //need to always be able to restore this as an emergency measure
if (_chromeless) showMenuVisible = true; //I decided this was always possible in chromeless mode, we'll see what they think
if (!MainMenuStrip.Visible)
{
showMenuVisible = true; // need to always be able to restore this as an emergency measure
}
if (_chromeless)
{
showMenuVisible = true; // I decided this was always possible in chromeless mode, we'll see what they think
}
ShowMenuContextMenuItem.Visible =
ShowMenuContextMenuSeparator.Visible =
showMenuVisible;
@ -2550,8 +2554,7 @@ namespace BizHawk.Client.EmuHawk
PathManager.SaveStatePrefix(Global.Game) +
".QuickSave" +
Global.Config.SaveSlot +
".State.bak"
);
".State.bak");
if (file.Exists)
{
@ -2592,9 +2595,15 @@ namespace BizHawk.Client.EmuHawk
SavestateTextContextMenuItem.Checked = false;
switch (Global.Config.SaveStateType)
{
case Config.SaveStateTypeE.Binary: SavestateBinaryContextMenuItem.Checked = true; break;
case Config.SaveStateTypeE.Text: SavestateTextContextMenuItem.Checked = true; break;
case Config.SaveStateTypeE.Default: SavestateTypeDefaultContextMenuItem.Checked = true; break;
case Config.SaveStateTypeE.Binary:
SavestateBinaryContextMenuItem.Checked = true;
break;
case Config.SaveStateTypeE.Text:
SavestateTextContextMenuItem.Checked = true;
break;
case Config.SaveStateTypeE.Default:
SavestateTypeDefaultContextMenuItem.Checked = true;
break;
}
}
@ -2647,18 +2656,18 @@ namespace BizHawk.Client.EmuHawk
private void AddSubtitleContextMenuItem_Click(object sender, EventArgs e)
{
//TODO: rethink this?
// TODO: rethink this?
var subForm = new SubtitleMaker();
subForm.DisableFrame();
int index = -1;
var sub = new Subtitle();
for (int x = 0; x < Global.MovieSession.Movie.Subtitles.Count; x++)
for (int i = 0; i < Global.MovieSession.Movie.Subtitles.Count; i++)
{
sub = Global.MovieSession.Movie.Subtitles[x];
sub = Global.MovieSession.Movie.Subtitles[i];
if (Emulator.Frame == sub.Frame)
{
index = x;
index = i;
break;
}
}
@ -2697,13 +2706,12 @@ namespace BizHawk.Client.EmuHawk
PathManager.SaveStatePrefix(Global.Game) +
".QuickSave" +
Global.Config.SaveSlot +
".State"
);
".State");
GlobalWin.OSD.AddMessage("Save slot " + Global.Config.SaveSlot + " restored.");
}
private void ClearSRAMContextMenuItem_Click(object sender, EventArgs e)
private void ClearSramContextMenuItem_Click(object sender, EventArgs e)
{
CloseRom(clearSram: true);
}
@ -2721,7 +2729,7 @@ namespace BizHawk.Client.EmuHawk
private void DumpStatusButton_Click(object sender, EventArgs e)
{
string details = Emulator.CoreComm.RomStatusDetails;
if (!String.IsNullOrEmpty(details))
if (!string.IsNullOrEmpty(details))
{
GlobalWin.Sound.StopSound();
LogWindow.ShowReport("Dump Status Report", details, this);
@ -2771,6 +2779,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.Input_Hotkey_OverrideOptions = 0;
break;
}
UpdateKeyPriorityIcon();
}
@ -2784,8 +2793,8 @@ namespace BizHawk.Client.EmuHawk
private void ProfileFirstBootLabel_Click(object sender, EventArgs e)
{
//We do not check if the user is actually setting a profile here.
//This is intentional.
// We do not check if the user is actually setting a profile here.
// This is intentional.
var profileForm = new ProfileConfig();
profileForm.ShowDialog();
Global.Config.FirstBoot = false;
@ -2802,7 +2811,12 @@ namespace BizHawk.Client.EmuHawk
if (result == DialogResult.Yes)
{
System.Threading.ThreadPool.QueueUserWorkItem((s) => { using (System.Diagnostics.Process.Start(VersionInfo.HomePage)) { } });
System.Threading.ThreadPool.QueueUserWorkItem(s =>
{
using (System.Diagnostics.Process.Start(VersionInfo.HomePage))
{
}
});
}
else if (result == DialogResult.No)
{
@ -2835,6 +2849,7 @@ namespace BizHawk.Client.EmuHawk
{
_wasPaused = true;
}
PauseEmulator();
}
}
@ -2842,7 +2857,9 @@ namespace BizHawk.Client.EmuHawk
private void timerMouseIdle_Tick(object sender, EventArgs e)
{
if (_inFullscreen && Global.Config.DispChrome_Fullscreen_AutohideMouse)
{
AutohideCursor(true);
}
}
private void MainForm_Enter(object sender, EventArgs e)
@ -2866,8 +2883,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.ShowContextMenu && e.Button == MouseButtons.Right)
{
MainFormContextMenu.Show(
PointToScreen(new Point(e.X, e.Y + MainformMenu.Height))
);
PointToScreen(new Point(e.X, e.Y + MainformMenu.Height)));
}
}
@ -2919,7 +2935,7 @@ namespace BizHawk.Client.EmuHawk
{
try
{
FormDragDrop_internal(sender, e);
FormDragDrop_Internal(sender, e);
}
catch (Exception ex)
{
@ -2927,7 +2943,7 @@ namespace BizHawk.Client.EmuHawk
}
}
private void FormDragDrop_internal(object sender, DragEventArgs e)
private void FormDragDrop_Internal(object sender, DragEventArgs e)
{
_FormDragDrop_internal(sender, e);
/*

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

@ -43,9 +43,11 @@ namespace BizHawk.Client.EmuHawk
case "Screen Raw to Clipboard":
// Ctrl+C clash. any tool that has such acc must check this.
// maybe check if mainform has focus instead?
if (GlobalWin.Tools.IsLoaded<TAStudio>())
if (GlobalWin.Tools.Get<TAStudio>().ContainsFocus)
break;
if (GlobalWin.Tools.IsLoaded<TAStudio>() && GlobalWin.Tools.Get<TAStudio>().ContainsFocus)
{
break;
}
TakeScreenshotToClipboard();
break;
case "Screen Client to Clipboard":
@ -67,7 +69,7 @@ namespace BizHawk.Client.EmuHawk
FlushSaveRAM();
break;
case "Display FPS":
ToggleFPS();
ToggleFps();
break;
case "Frame Counter":
ToggleFrameCounter();
@ -77,6 +79,7 @@ namespace BizHawk.Client.EmuHawk
{
ToggleLagCounter();
}
break;
case "Input Display":
ToggleInputDisplay();
@ -341,9 +344,11 @@ namespace BizHawk.Client.EmuHawk
{
type = " (on)";
}
Global.CheatList.ToList().ForEach(x => x.Toggle());
GlobalWin.OSD.AddMessage("Cheats toggled" + type);
}
break;
case "TAStudio":
GlobalWin.Tools.Load<TAStudio>();
@ -358,45 +363,93 @@ namespace BizHawk.Client.EmuHawk
// RAM Search
case "Do Search":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.DoSearch();
else return false;
}
else
{
return false;
}
break;
case "New Search":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.NewSearch();
else return false;
}
else
{
return false;
}
break;
case "Previous Compare To":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.NextCompareTo(reverse: true);
else return false;
}
else
{
return false;
}
break;
case "Next Compare To":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.NextCompareTo();
else return false;
}
else
{
return false;
}
break;
case "Previous Operator":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.NextOperator(reverse: true);
else return false;
}
else
{
return false;
}
break;
case "Next Operator":
if (GlobalWin.Tools.IsLoaded<RamSearch>())
{
GlobalWin.Tools.RamSearch.NextOperator();
else return false;
}
else
{
return false;
}
break;
//TAStudio
// TAStudio
case "Add Branch":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AddBranchExternal();
else return false;
}
else
{
return false;
}
break;
case "Delete Branch":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.RemoveBranchExtrenal();
else return false;
}
else
{
return false;
}
break;
case "Show Cursor":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
@ -404,72 +457,154 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.TAStudio.SetVisibleIndex();
GlobalWin.Tools.TAStudio.RefreshDialog();
}
else return false;
else
{
return false;
}
break;
case "Toggle Follow Cursor":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.TasPlaybackBox.FollowCursor ^= true;
else return false;
}
else
{
return false;
}
break;
case "Toggle Auto-Restore":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.TasPlaybackBox.AutoRestore ^= true;
else return false;
}
else
{
return false;
}
break;
case "Toggle Turbo Seek":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.TasPlaybackBox.TurboSeek ^= true;
else return false;
}
else
{
return false;
}
break;
case "Clear Frames":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.ClearFramesExternal();
else return false;
}
else
{
return false;
}
break;
case "Insert Frame":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.InsertFrameExternal();
else return false;
}
else
{
return false;
}
break;
case "Delete Frames":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.DeleteFramesExternal();
else return false;
}
else
{
return false;
}
break;
case "Clone Frames":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.CloneFramesExternal();
else return false;
}
else
{
return false;
}
break;
case "Analog Increment":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogIncrementByOne();
else return false;
}
else
{
return false;
}
break;
case "Analog Decrement":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogDecrementByOne();
else return false;
}
else
{
return false;
}
break;
case "Analog Incr. by 10":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogIncrementByTen();
else return false;
}
else
{
return false;
}
break;
case "Analog Decr. by 10":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogDecrementByTen();
else return false;
}
else
{
return false;
}
break;
case "Analog Maximum":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogMax();
else return false;
}
else
{
return false;
}
break;
case "Analog Minimum":
if (GlobalWin.Tools.IsLoaded<TAStudio>())
{
GlobalWin.Tools.TAStudio.AnalogMin();
else return false;
}
else
{
return false;
}
break;
// SNES
@ -506,10 +641,10 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.VirtualPad.BumpAnalogValue(null, Global.Config.Analog_LargeChange);
break;
case "Y Down Small":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(null, -(Global.Config.Analog_SmallChange));
GlobalWin.Tools.VirtualPad.BumpAnalogValue(null, -Global.Config.Analog_SmallChange);
break;
case "Y Down Large":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(null, -(Global.Config.Analog_LargeChange));
GlobalWin.Tools.VirtualPad.BumpAnalogValue(null, -Global.Config.Analog_LargeChange);
break;
case "X Up Small":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(Global.Config.Analog_SmallChange, null);
@ -518,10 +653,10 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.Tools.VirtualPad.BumpAnalogValue(Global.Config.Analog_LargeChange, null);
break;
case "X Down Small":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(-(Global.Config.Analog_SmallChange), null);
GlobalWin.Tools.VirtualPad.BumpAnalogValue(-Global.Config.Analog_SmallChange, null);
break;
case "X Down Large":
GlobalWin.Tools.VirtualPad.BumpAnalogValue(-(Global.Config.Analog_LargeChange), null);
GlobalWin.Tools.VirtualPad.BumpAnalogValue(-Global.Config.Analog_LargeChange, null);
break;
}

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

File diff suppressed because it is too large Load Diff

1
BizHawk.sln.DotSettings
View File

@ -76,6 +76,7 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PC/@EntryIndexedValue">PC</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PCE/@EntryIndexedValue">PCE</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PCECD/@EntryIndexedValue">PCECD</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PPU/@EntryIndexedValue">PPU</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PSP/@EntryIndexedValue">PSP</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PSX/@EntryIndexedValue">PSX</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RAM/@EntryIndexedValue">RAM</s:String>