From 179dbd41245a9dd368d34a58d3d5358373ad629a Mon Sep 17 00:00:00 2001 From: zeromus Date: Sun, 27 Oct 2013 07:45:59 +0000 Subject: [PATCH] revert back to r5156 --- .../BizHawk.Client.Common.csproj | 14 - BizHawk.Client.Common/Global.cs | 5 - BizHawk.Common/BizHawk.Common.csproj | 55 - BizHawk.Common/Properties/AssemblyInfo.cs | 36 - BizHawk.Emulation/BizHawk.Emulation.csproj | 7 +- BizHawk.MultiClient/AVOut/FFmpegWriter.cs | 2 - .../BinarySaveStates.cs | 2 +- .../BizHawk.MultiClient.csproj | 15 +- BizHawk.MultiClient/GlobalWinF.cs | 5 + .../Input}/ControllerBinding.cs | 4 +- BizHawk.MultiClient/MainForm.Designer.cs | 2717 ++++++++--------- BizHawk.MultiClient/MainForm.MenuItems.cs | 2423 ++++++++------- BizHawk.MultiClient/MainForm.cs | 97 +- BizHawk.MultiClient/MainForm.resx | 2 +- .../MruStack.cs | 2 +- BizHawk.MultiClient/RenderPanel.cs | 2 +- .../SavestateManager.cs | 19 +- BizHawk.MultiClient/Sound.cs | 2 +- .../XmlGame.cs | 9 +- .../config}/PathManager.cs | 8 +- BizHawk.MultiClient/tools/NES/MovieConvert.cs | 40 + BizHawk.MultiClient/tools/ToolHelpers.cs | 49 - BizHawk.MultiClient/tools/Watch/RamSearch.cs | 161 +- .../tools/Watch}/RamSearchEngine.cs | 22 +- BizHawk.MultiClient/tools/Watch/RamWatch.cs | 30 +- .../tools/Watch/WatchHistory.cs | 21 +- .../tools/Watch}/WatchList.cs | 81 +- BizHawk.sln | 14 - 28 files changed, 2874 insertions(+), 2970 deletions(-) delete mode 100644 BizHawk.Common/BizHawk.Common.csproj delete mode 100644 BizHawk.Common/Properties/AssemblyInfo.cs rename {BizHawk.Client.Common => BizHawk.MultiClient}/BinarySaveStates.cs (94%) rename {BizHawk.Client.Common => BizHawk.MultiClient/Input}/ControllerBinding.cs (95%) rename {BizHawk.Common => BizHawk.MultiClient}/MruStack.cs (89%) rename {BizHawk.Client.Common => BizHawk.MultiClient}/SavestateManager.cs (79%) rename {BizHawk.Client.Common => BizHawk.MultiClient}/XmlGame.cs (89%) rename {BizHawk.Client.Common => BizHawk.MultiClient/config}/PathManager.cs (93%) create mode 100644 BizHawk.MultiClient/tools/NES/MovieConvert.cs rename {BizHawk.Client.Common/tools => BizHawk.MultiClient/tools/Watch}/RamSearchEngine.cs (94%) rename BizHawk.Common/UndoHistory.cs => BizHawk.MultiClient/tools/Watch/WatchHistory.cs (61%) rename {BizHawk.Client.Common/tools => BizHawk.MultiClient/tools/Watch}/WatchList.cs (81%) diff --git a/BizHawk.Client.Common/BizHawk.Client.Common.csproj b/BizHawk.Client.Common/BizHawk.Client.Common.csproj index e6a8feecc2..84d52d8fda 100644 --- a/BizHawk.Client.Common/BizHawk.Client.Common.csproj +++ b/BizHawk.Client.Common/BizHawk.Client.Common.csproj @@ -33,9 +33,6 @@ true - - ..\ICSharpCode.SharpZipLib.dll - ..\Newtonsoft.Json.dll @@ -85,11 +82,9 @@ - - @@ -105,24 +100,15 @@ - - - - - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} BizHawk.Emulation diff --git a/BizHawk.Client.Common/Global.cs b/BizHawk.Client.Common/Global.cs index a24c9a26c9..91de5f80a6 100644 --- a/BizHawk.Client.Common/Global.cs +++ b/BizHawk.Client.Common/Global.cs @@ -14,10 +14,5 @@ /// public static MultitrackRewiringControllerAdapter MultitrackRewiringControllerAdapter = new MultitrackRewiringControllerAdapter(); public static MovieSession MovieSession = new MovieSession(); - - /// - /// whether throttling is force-disabled by use of fast forward - /// - public static bool ForceNoThrottle; } } diff --git a/BizHawk.Common/BizHawk.Common.csproj b/BizHawk.Common/BizHawk.Common.csproj deleted file mode 100644 index e0f74a6bca..0000000000 --- a/BizHawk.Common/BizHawk.Common.csproj +++ /dev/null @@ -1,55 +0,0 @@ - - - - Debug - AnyCPU - 8.0.30703 - 2.0 - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - Library - Properties - BizHawk.Common - BizHawk.Common - v4.0 - 512 - - - true - full - false - bin\Release\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/BizHawk.Common/Properties/AssemblyInfo.cs b/BizHawk.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index 706c13aeb7..0000000000 --- a/BizHawk.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("BizHawk.Common")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Measurement Incorporated")] -[assembly: AssemblyProduct("BizHawk.Common")] -[assembly: AssemblyCopyright("Copyright © Measurement Incorporated 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f8e9ad29-89d8-478b-a699-ed3369703b6a")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj index 7d5ded55be..aa88aed485 100644 --- a/BizHawk.Emulation/BizHawk.Emulation.csproj +++ b/BizHawk.Emulation/BizHawk.Emulation.csproj @@ -583,12 +583,7 @@ - - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - - + diff --git a/BizHawk.MultiClient/AVOut/FFmpegWriter.cs b/BizHawk.MultiClient/AVOut/FFmpegWriter.cs index 07dcf31290..b4931131f3 100644 --- a/BizHawk.MultiClient/AVOut/FFmpegWriter.cs +++ b/BizHawk.MultiClient/AVOut/FFmpegWriter.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.Text; using System.Diagnostics; -using BizHawk.Client.Common; - namespace BizHawk.MultiClient { /// diff --git a/BizHawk.Client.Common/BinarySaveStates.cs b/BizHawk.MultiClient/BinarySaveStates.cs similarity index 94% rename from BizHawk.Client.Common/BinarySaveStates.cs rename to BizHawk.MultiClient/BinarySaveStates.cs index dea072e45b..e27931bd2b 100644 --- a/BizHawk.Client.Common/BinarySaveStates.cs +++ b/BizHawk.MultiClient/BinarySaveStates.cs @@ -5,7 +5,7 @@ using System.Text; using ICSharpCode.SharpZipLib.Zip; using System.IO; -namespace BizHawk.Client.Common +namespace BizHawk.MultiClient { public class BinaryStateFileNames { diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 5647d7a041..aa7275b8e6 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -84,6 +84,7 @@ + 3.5 @@ -152,6 +153,7 @@ VideoWriterChooserForm.cs + Form @@ -230,6 +232,7 @@ PathInfo.cs + Form @@ -280,6 +283,7 @@ + @@ -340,6 +344,7 @@ SubtitleMaker.cs + Form @@ -499,6 +504,7 @@ N64VideoPluginconfig.cs + Component @@ -721,6 +727,7 @@ RamSearch.cs + Form @@ -733,9 +740,12 @@ WatchEditor.cs + + Component + FFmpegWriterForm.cs @@ -971,6 +981,7 @@ True + Form @@ -999,10 +1010,6 @@ {24A0AA3C-B25F-4197-B23D-476D6462DBA0} BizHawk.Client.Common - - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3} - BizHawk.Common - {197D4314-8A9F-49BA-977D-54ACEFAEB6BA} BizHawk.Emulation diff --git a/BizHawk.MultiClient/GlobalWinF.cs b/BizHawk.MultiClient/GlobalWinF.cs index a0a03530d0..ce1b5ef693 100644 --- a/BizHawk.MultiClient/GlobalWinF.cs +++ b/BizHawk.MultiClient/GlobalWinF.cs @@ -22,6 +22,11 @@ namespace BizHawk.MultiClient public static Controller NullControls; public static AutofireController AutofireNullControls; + /// + /// whether throttling is force-disabled by use of fast forward + /// + public static bool ForceNoThrottle; + //the movie will be spliced inbetween these if it is present public static CopyControllerAdapter MovieInputSourceAdapter = new CopyControllerAdapter(); public static CopyControllerAdapter MovieOutputHardpoint = new CopyControllerAdapter(); diff --git a/BizHawk.Client.Common/ControllerBinding.cs b/BizHawk.MultiClient/Input/ControllerBinding.cs similarity index 95% rename from BizHawk.Client.Common/ControllerBinding.cs rename to BizHawk.MultiClient/Input/ControllerBinding.cs index 8d4b24d5f5..80a11ea5be 100644 --- a/BizHawk.Client.Common/ControllerBinding.cs +++ b/BizHawk.MultiClient/Input/ControllerBinding.cs @@ -2,7 +2,9 @@ using System.Collections.Generic; using System.Linq; -namespace BizHawk.Client.Common +using BizHawk.Client.Common; + +namespace BizHawk.MultiClient { public class Controller : IController { diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 1aa3bfffff..90d31941d3 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -19,198 +19,198 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - this.MainformMenu = new MenuStripEx(); - this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.OpenRomMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RecentRomSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1 = new MenuStripEx(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recentROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.CloseRomMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.closeROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.SaveStateSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveState1MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveState2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveState3MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveState4MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveState5MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveState6MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveState7MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveState8MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveState9MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveState0MenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestate1toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestate2toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestate3toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestate4toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestate5toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestate6toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestate7toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestate8toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestate9toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestate0toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.SaveNamedStateMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadStateSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadState1MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadState2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadState3MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadState4MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadState5MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadState6MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadState7MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadState8MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadState9MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadState0MenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveNamedStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadstate1toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadstate2toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadstate3toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadstate4toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadstate5toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadstate6toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadstate7toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadstate8toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadstate9toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadstate0toolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.LoadNamedStateMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadNamedStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator(); - this.AutoloadLastSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveSlotSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectSlot0MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectSlot1MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectSlot2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectSlot3MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectSlot4MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectSlot5MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectSlot6MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectSlot7MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectSlot8MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectSlot9MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PreviousSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.NextSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autoLoadLastSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot10ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot6ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot7ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot8ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot9ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.previousSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.nextSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.SaveToCurrentSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadCurrentSlotMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.MovieSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.ReadonlyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.movieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.readonlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); - this.RecentMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); - this.RecordMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PlayMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.StopMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PlayFromBeginningMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ImportMoviesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.StopMovieWithoutSavingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recordMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.playMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.stopMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.playFromBeginningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.stopMovieWithoutSavingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); - this.BindSavestatesToMoviesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AutomaticallyBackupMoviesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FullMovieLoadstatesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AVSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.RecordAVMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.StopAVIMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bindSavestatesToMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.automaticallyBackupMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fullMovieLoadstatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AVIWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recordAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.stopAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator(); - this.CaptureOSDMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ScreenshotSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.ScreenshotMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ScreenshotAsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ScreenshotClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.captureOSDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.screenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.screenshotF12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.screenshotAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.screenshotClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator(); - this.ScreenshotCaptureOSDMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.captureOSDToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EmulationSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.PauseMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RebootCoreMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.emulationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rebootCoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.SoftResetMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HardResetMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ViewSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.DisplayFilterSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hardResetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.windowFilterMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DisplayFilterNoneMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.x2SAIMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SuperX2SAIMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SuperEagleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.WindowSizeSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.windowSizeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.x1MenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.x2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.x3MenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.x4MenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.x5MenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mzMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SwitchToFullscreenMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.switchToFullscreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.DisplayFPSMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DisplayFrameCounterMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DisplayLagCounterMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DisplayInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DisplayRerecordCountMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DisplaySubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displayFPSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displayFrameCounterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displayLagCounterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displayInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displayRerecordCountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displaySubtitlesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); - this.DisplayStatusBarMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DisplayLogWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.ControllersMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HotkeysMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MessagesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PathsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SoundMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AutofireMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RewindOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FirmwaresMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displayStatusBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displayLogWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.controllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.messagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pathsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.soundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autofireToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rewindOptionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.firmwaresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.ConfigEnableSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.EnableContextMenuMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.BackupSavestatesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoSavestatesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveScreenshotInSavestatesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FrameAdvanceSkipLagMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.BackupSaveramMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.GuiSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.PauseWhenMenuActivatedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.StartPausedMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.enableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.enableContextMenuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backupSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autoSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveScreenshotWithSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.frameAdvanceSkipLagFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backupSaveramToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gUIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pauseWhenMenuActivatedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.startPausedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator(); - this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ForceGDIMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.UseBilinearMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SuppressGuiLayerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShowMenuInFullScreenMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RunInBackgroundMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.BackgroundInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SingleInstanceModeMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DontAskToSaveChangesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.forceGDIPPresentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.blurryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.miSuppressGuiLayer = new System.Windows.Forms.ToolStripMenuItem(); + this.showMenuInFullScreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.runInBackgroundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.acceptBackgroundInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.singleInstanceModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.neverBeAskedToSaveChangesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator(); - this.LogWindowAsConsoleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SpeedSkipSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.ClickThrottleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AudioThrottleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.VsyncThrottleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.logWindowAsConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.frameSkipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.miLimitFramerate = new System.Windows.Forms.ToolStripMenuItem(); + this.audioThrottleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.miDisplayVsync = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator27 = new System.Windows.Forms.ToolStripSeparator(); - this.VsyncEnabledMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.vSyncEnabledToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); - this.MinimizeSkippingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.NeverSkipMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Frameskip1MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Frameskip2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Frameskip3MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Frameskip4MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Frameskip5MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Frameskip6MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Frameskip7MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Frameskip8MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Frameskip9MenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.miAutoMinimizeSkipping = new System.Windows.Forms.ToolStripMenuItem(); + this.miFrameskip0 = new System.Windows.Forms.ToolStripMenuItem(); + this.miFrameskip1 = new System.Windows.Forms.ToolStripMenuItem(); + this.miFrameskip2 = new System.Windows.Forms.ToolStripMenuItem(); + this.miFrameskip3 = new System.Windows.Forms.ToolStripMenuItem(); + this.miFrameskip4 = new System.Windows.Forms.ToolStripMenuItem(); + this.miFrameskip5 = new System.Windows.Forms.ToolStripMenuItem(); + this.miFrameskip6 = new System.Windows.Forms.ToolStripMenuItem(); + this.miFrameskip7 = new System.Windows.Forms.ToolStripMenuItem(); + this.miFrameskip8 = new System.Windows.Forms.ToolStripMenuItem(); + this.miFrameskip9 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); - this.Speed50MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Speed75MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Speed100MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Speed150MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.Speed200MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.KeyPrioritySubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.BothHkAndControllerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InputOverHkMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HkOverInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SavestateTypeSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.SavestateTypeDefaultMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SavestateBinaryMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SavestateTextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.miSpeed50 = new System.Windows.Forms.ToolStripMenuItem(); + this.miSpeed75 = new System.Windows.Forms.ToolStripMenuItem(); + this.miSpeed100 = new System.Windows.Forms.ToolStripMenuItem(); + this.miSpeed150 = new System.Windows.Forms.ToolStripMenuItem(); + this.miSpeed200 = new System.Windows.Forms.ToolStripMenuItem(); + this.keyPriorityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bothHotkeysAndControllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.inputOverridesHotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hotkeysOverrideInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestateTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.defaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.binaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.textToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); - this.SaveConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadConfigMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ToolBoxMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolBoxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); - this.RamWatchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RamSearchMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HexEditorMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TraceLoggerMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TAStudioMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.VirtualPadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rAMWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rAMSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hexEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.traceLoggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tAStudioToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.virtualPadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); - this.LuaConsoleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CheatsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator29 = new System.Windows.Forms.ToolStripSeparator(); - this.CreateDualGbXmlMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.createDualGBXMLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.NESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.debuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pPUViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -338,10 +338,6 @@ this.soundToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.autofireToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.rewindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.firmwaresToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator30 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem(); this.cmiScreenshot = new System.Windows.Forms.ToolStripMenuItem(); this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); @@ -349,19 +345,23 @@ this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator(); this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.MainformMenu.SuspendLayout(); + this.firmwaresToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator30 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1.SuspendLayout(); this.StatusSlot0.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.SuspendLayout(); // - // MainformMenu + // menuStrip1 // - this.MainformMenu.ClickThrough = true; - this.MainformMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FileSubMenu, - this.EmulationSubMenu, - this.ViewSubMenu, - this.ConfigSubMenu, + this.menuStrip1.ClickThrough = true; + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem, + this.emulationToolStripMenuItem, + this.viewToolStripMenuItem, + this.configToolStripMenuItem, this.toolsToolStripMenuItem, this.NESToolStripMenuItem, this.pCEToolStripMenuItem, @@ -375,737 +375,736 @@ this.n64ToolStripMenuItem, this.saturnToolStripMenuItem, this.helpToolStripMenuItem}); - this.MainformMenu.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; - this.MainformMenu.Location = new System.Drawing.Point(0, 0); - this.MainformMenu.Name = "MainformMenu"; - this.MainformMenu.Size = new System.Drawing.Size(470, 42); - this.MainformMenu.TabIndex = 0; - this.MainformMenu.Text = "menuStrip1"; - this.MainformMenu.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); - this.MainformMenu.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate); - this.MainformMenu.Leave += new System.EventHandler(this.menuStrip1_Leave); + this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(470, 42); + this.menuStrip1.TabIndex = 0; + this.menuStrip1.Text = "menuStrip1"; + this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); + this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate); + this.menuStrip1.Leave += new System.EventHandler(this.menuStrip1_Leave); // - // FileSubMenu + // fileToolStripMenuItem // - this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.OpenRomMenuItem, - this.RecentRomSubMenu, - this.CloseRomMenuItem, + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.openROMToolStripMenuItem, + this.recentROMToolStripMenuItem, + this.closeROMToolStripMenuItem, this.toolStripMenuItem1, - this.SaveStateSubMenu, - this.LoadStateSubMenu, - this.SaveSlotSubMenu, + this.saveStateToolStripMenuItem, + this.loadStateToolStripMenuItem, + this.saveSlotToolStripMenuItem, this.toolStripMenuItem2, - this.MovieSubMenu, - this.AVSubMenu, - this.ScreenshotSubMenu, + this.movieToolStripMenuItem, + this.AVIWAVToolStripMenuItem, + this.screenshotToolStripMenuItem, this.toolStripSeparator4, - this.ExitMenuItem}); - this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(37, 19); - this.FileSubMenu.Text = "&File"; - this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); + this.exitToolStripMenuItem}); + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 19); + this.fileToolStripMenuItem.Text = "&File"; + this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); // - // OpenRomMenuItem + // openROMToolStripMenuItem // - this.OpenRomMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; - this.OpenRomMenuItem.Name = "OpenRomMenuItem"; - this.OpenRomMenuItem.Size = new System.Drawing.Size(140, 22); - this.OpenRomMenuItem.Text = "Open ROM"; - this.OpenRomMenuItem.Click += new System.EventHandler(this.OpenRomMenuItem_Click); + this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.openROMToolStripMenuItem.Text = "Open ROM"; + this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); // - // RecentRomSubMenu + // recentROMToolStripMenuItem // - this.RecentRomSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.recentROMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator3}); - this.RecentRomSubMenu.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; - this.RecentRomSubMenu.Name = "RecentRomSubMenu"; - this.RecentRomSubMenu.Size = new System.Drawing.Size(140, 22); - this.RecentRomSubMenu.Text = "Recent ROM"; - this.RecentRomSubMenu.DropDownOpened += new System.EventHandler(this.RecentRomMenuItem_DropDownOpened); + this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; + this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.recentROMToolStripMenuItem.Text = "Recent ROM"; + this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6); // - // CloseRomMenuItem + // closeROMToolStripMenuItem // - this.CloseRomMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; - this.CloseRomMenuItem.Name = "CloseRomMenuItem"; - this.CloseRomMenuItem.Size = new System.Drawing.Size(140, 22); - this.CloseRomMenuItem.Text = "&Close ROM"; - this.CloseRomMenuItem.Click += new System.EventHandler(this.CloseRomMenuItem_Click); + this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; + this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; + this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.closeROMToolStripMenuItem.Text = "&Close ROM"; + this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Size = new System.Drawing.Size(137, 6); // - // SaveStateSubMenu + // saveStateToolStripMenuItem // - this.SaveStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SaveState1MenuItem, - this.SaveState2MenuItem, - this.SaveState3MenuItem, - this.SaveState4MenuItem, - this.SaveState5MenuItem, - this.SaveState6MenuItem, - this.SaveState7MenuItem, - this.SaveState8MenuItem, - this.SaveState9MenuItem, - this.SaveState0MenuItem, + this.saveStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.savestate1toolStripMenuItem, + this.savestate2toolStripMenuItem, + this.savestate3toolStripMenuItem, + this.savestate4toolStripMenuItem, + this.savestate5toolStripMenuItem, + this.savestate6toolStripMenuItem, + this.savestate7toolStripMenuItem, + this.savestate8toolStripMenuItem, + this.savestate9toolStripMenuItem, + this.savestate0toolStripMenuItem, this.toolStripSeparator6, - this.SaveNamedStateMenuItem}); - this.SaveStateSubMenu.Name = "SaveStateSubMenu"; - this.SaveStateSubMenu.Size = new System.Drawing.Size(140, 22); - this.SaveStateSubMenu.Text = "Save State"; - this.SaveStateSubMenu.DropDownOpened += new System.EventHandler(this.SaveStateSubMenu_DropDownOpened); + this.saveNamedStateToolStripMenuItem}); + this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; + this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.saveStateToolStripMenuItem.Text = "Save State"; + this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); // - // SaveState1MenuItem + // savestate1toolStripMenuItem // - this.SaveState1MenuItem.Name = "SaveState1MenuItem"; - this.SaveState1MenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveState1MenuItem.Text = "1"; - this.SaveState1MenuItem.Click += new System.EventHandler(this.Savestate1MenuItem_Click); + this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; + this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate1toolStripMenuItem.Text = "1"; + this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); // - // SaveState2MenuItem + // savestate2toolStripMenuItem // - this.SaveState2MenuItem.Name = "SaveState2MenuItem"; - this.SaveState2MenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveState2MenuItem.Text = "2"; - this.SaveState2MenuItem.Click += new System.EventHandler(this.Savestate2MenuItem_Click); + this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; + this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate2toolStripMenuItem.Text = "2"; + this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); // - // SaveState3MenuItem + // savestate3toolStripMenuItem // - this.SaveState3MenuItem.Name = "SaveState3MenuItem"; - this.SaveState3MenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveState3MenuItem.Text = "3"; - this.SaveState3MenuItem.Click += new System.EventHandler(this.Savestate3MenuItem_Click); + this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; + this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate3toolStripMenuItem.Text = "3"; + this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); // - // SaveState4MenuItem + // savestate4toolStripMenuItem // - this.SaveState4MenuItem.Name = "SaveState4MenuItem"; - this.SaveState4MenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveState4MenuItem.Text = "4"; - this.SaveState4MenuItem.Click += new System.EventHandler(this.Savestate4MenuItem_Click); + this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; + this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate4toolStripMenuItem.Text = "4"; + this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); // - // SaveState5MenuItem + // savestate5toolStripMenuItem // - this.SaveState5MenuItem.Name = "SaveState5MenuItem"; - this.SaveState5MenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveState5MenuItem.Text = "5"; - this.SaveState5MenuItem.Click += new System.EventHandler(this.Savestate5MenuItem_Click); + this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; + this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate5toolStripMenuItem.Text = "5"; + this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); // - // SaveState6MenuItem + // savestate6toolStripMenuItem // - this.SaveState6MenuItem.Name = "SaveState6MenuItem"; - this.SaveState6MenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveState6MenuItem.Text = "6"; - this.SaveState6MenuItem.Click += new System.EventHandler(this.Savestate6MenuItem_Click); + this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; + this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate6toolStripMenuItem.Text = "6"; + this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); // - // SaveState7MenuItem + // savestate7toolStripMenuItem // - this.SaveState7MenuItem.Name = "SaveState7MenuItem"; - this.SaveState7MenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveState7MenuItem.Text = "7"; - this.SaveState7MenuItem.Click += new System.EventHandler(this.Savestate7MenuItem_Click); + this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; + this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate7toolStripMenuItem.Text = "7"; + this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); // - // SaveState8MenuItem + // savestate8toolStripMenuItem // - this.SaveState8MenuItem.Name = "SaveState8MenuItem"; - this.SaveState8MenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveState8MenuItem.Text = "8"; - this.SaveState8MenuItem.Click += new System.EventHandler(this.Savestate8MenuItem_Click); + this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; + this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate8toolStripMenuItem.Text = "8"; + this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); // - // SaveState9MenuItem + // savestate9toolStripMenuItem // - this.SaveState9MenuItem.Name = "SaveState9MenuItem"; - this.SaveState9MenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveState9MenuItem.Text = "9"; - this.SaveState9MenuItem.Click += new System.EventHandler(this.Savestate9MenuItem_Click); + this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; + this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate9toolStripMenuItem.Text = "9"; + this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); // - // SaveState0MenuItem + // savestate0toolStripMenuItem // - this.SaveState0MenuItem.Name = "SaveState0MenuItem"; - this.SaveState0MenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveState0MenuItem.Text = "0"; - this.SaveState0MenuItem.Click += new System.EventHandler(this.Savestate0MenuItem_Click); + this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; + this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate0toolStripMenuItem.Text = "0"; + this.savestate0toolStripMenuItem.Click += new System.EventHandler(this.savestate0toolStripMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6); // - // SaveNamedStateMenuItem + // saveNamedStateToolStripMenuItem // - this.SaveNamedStateMenuItem.Name = "SaveNamedStateMenuItem"; - this.SaveNamedStateMenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveNamedStateMenuItem.Text = "Save Named State..."; - this.SaveNamedStateMenuItem.Click += new System.EventHandler(this.SaveNamedStateMenuItem_Click); + this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; + this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.saveNamedStateToolStripMenuItem.Text = "Save Named State..."; + this.saveNamedStateToolStripMenuItem.Click += new System.EventHandler(this.saveNamedStateToolStripMenuItem_Click); // - // LoadStateSubMenu + // loadStateToolStripMenuItem // - this.LoadStateSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.LoadState1MenuItem, - this.LoadState2MenuItem, - this.LoadState3MenuItem, - this.LoadState4MenuItem, - this.LoadState5MenuItem, - this.LoadState6MenuItem, - this.LoadState7MenuItem, - this.LoadState8MenuItem, - this.LoadState9MenuItem, - this.LoadState0MenuItem, + this.loadStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.loadstate1toolStripMenuItem, + this.loadstate2toolStripMenuItem, + this.loadstate3toolStripMenuItem, + this.loadstate4toolStripMenuItem, + this.loadstate5toolStripMenuItem, + this.loadstate6toolStripMenuItem, + this.loadstate7toolStripMenuItem, + this.loadstate8toolStripMenuItem, + this.loadstate9toolStripMenuItem, + this.loadstate0toolStripMenuItem, this.toolStripSeparator7, - this.LoadNamedStateMenuItem, + this.loadNamedStateToolStripMenuItem, this.toolStripSeparator21, - this.AutoloadLastSlotMenuItem}); - this.LoadStateSubMenu.Name = "LoadStateSubMenu"; - this.LoadStateSubMenu.Size = new System.Drawing.Size(140, 22); - this.LoadStateSubMenu.Text = "Load State"; - this.LoadStateSubMenu.DropDownOpened += new System.EventHandler(this.LoadStateSubMenu_DropDownOpened); + this.autoLoadLastSlotToolStripMenuItem}); + this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; + this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.loadStateToolStripMenuItem.Text = "Load State"; + this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); // - // LoadState1MenuItem + // loadstate1toolStripMenuItem // - this.LoadState1MenuItem.Name = "LoadState1MenuItem"; - this.LoadState1MenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadState1MenuItem.Text = "1"; - this.LoadState1MenuItem.Click += new System.EventHandler(this.Loadstate1MenuItem_Click); + this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; + this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate1toolStripMenuItem.Text = "1"; + this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); // - // LoadState2MenuItem + // loadstate2toolStripMenuItem // - this.LoadState2MenuItem.Name = "LoadState2MenuItem"; - this.LoadState2MenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadState2MenuItem.Text = "2"; - this.LoadState2MenuItem.Click += new System.EventHandler(this.Loadstate2MenuItem_Click); + this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; + this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate2toolStripMenuItem.Text = "2"; + this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); // - // LoadState3MenuItem + // loadstate3toolStripMenuItem // - this.LoadState3MenuItem.Name = "LoadState3MenuItem"; - this.LoadState3MenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadState3MenuItem.Text = "3"; - this.LoadState3MenuItem.Click += new System.EventHandler(this.Loadstate3MenuItem_Click); + this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; + this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate3toolStripMenuItem.Text = "3"; + this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); // - // LoadState4MenuItem + // loadstate4toolStripMenuItem // - this.LoadState4MenuItem.Name = "LoadState4MenuItem"; - this.LoadState4MenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadState4MenuItem.Text = "4"; - this.LoadState4MenuItem.Click += new System.EventHandler(this.Loadstate4MenuItem_Click); + this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; + this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate4toolStripMenuItem.Text = "4"; + this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); // - // LoadState5MenuItem + // loadstate5toolStripMenuItem // - this.LoadState5MenuItem.Name = "LoadState5MenuItem"; - this.LoadState5MenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadState5MenuItem.Text = "5"; - this.LoadState5MenuItem.Click += new System.EventHandler(this.Loadstate5MenuItem_Click); + this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; + this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate5toolStripMenuItem.Text = "5"; + this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); // - // LoadState6MenuItem + // loadstate6toolStripMenuItem // - this.LoadState6MenuItem.Name = "LoadState6MenuItem"; - this.LoadState6MenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadState6MenuItem.Text = "6"; - this.LoadState6MenuItem.Click += new System.EventHandler(this.Loadstate6MenuItem_Click); + this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; + this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate6toolStripMenuItem.Text = "6"; + this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); // - // LoadState7MenuItem + // loadstate7toolStripMenuItem // - this.LoadState7MenuItem.Name = "LoadState7MenuItem"; - this.LoadState7MenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadState7MenuItem.Text = "7"; - this.LoadState7MenuItem.Click += new System.EventHandler(this.Loadstate7MenuItem_Click); + this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; + this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate7toolStripMenuItem.Text = "7"; + this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); // - // LoadState8MenuItem + // loadstate8toolStripMenuItem // - this.LoadState8MenuItem.Name = "LoadState8MenuItem"; - this.LoadState8MenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadState8MenuItem.Text = "8"; - this.LoadState8MenuItem.Click += new System.EventHandler(this.Loadstate8MenuItem_Click); + this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; + this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate8toolStripMenuItem.Text = "8"; + this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); // - // LoadState9MenuItem + // loadstate9toolStripMenuItem // - this.LoadState9MenuItem.Name = "LoadState9MenuItem"; - this.LoadState9MenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadState9MenuItem.Text = "9"; - this.LoadState9MenuItem.Click += new System.EventHandler(this.Loadstate9MenuItem_Click); + this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; + this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate9toolStripMenuItem.Text = "9"; + this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); // - // LoadState0MenuItem + // loadstate0toolStripMenuItem // - this.LoadState0MenuItem.Name = "LoadState0MenuItem"; - this.LoadState0MenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadState0MenuItem.Text = "0"; - this.LoadState0MenuItem.Click += new System.EventHandler(this.Loadstate0MenuItem_Click); + this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; + this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate0toolStripMenuItem.Text = "0"; + this.loadstate0toolStripMenuItem.Click += new System.EventHandler(this.loadstate0toolStripMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); // - // LoadNamedStateMenuItem + // loadNamedStateToolStripMenuItem // - this.LoadNamedStateMenuItem.Name = "LoadNamedStateMenuItem"; - this.LoadNamedStateMenuItem.Size = new System.Drawing.Size(180, 22); - this.LoadNamedStateMenuItem.Text = "Load Named State..."; - this.LoadNamedStateMenuItem.Click += new System.EventHandler(this.LoadNamedStateMenuItem_Click); + this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; + this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadNamedStateToolStripMenuItem.Text = "Load Named State..."; + this.loadNamedStateToolStripMenuItem.Click += new System.EventHandler(this.loadNamedStateToolStripMenuItem_Click); // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6); // - // AutoloadLastSlotMenuItem + // autoLoadLastSlotToolStripMenuItem // - this.AutoloadLastSlotMenuItem.Name = "AutoloadLastSlotMenuItem"; - this.AutoloadLastSlotMenuItem.Size = new System.Drawing.Size(180, 22); - this.AutoloadLastSlotMenuItem.Text = "AutoLoad last Slot"; - this.AutoloadLastSlotMenuItem.Click += new System.EventHandler(this.AutoloadLastSlotMenuItem_Click); + this.autoLoadLastSlotToolStripMenuItem.Name = "autoLoadLastSlotToolStripMenuItem"; + this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.autoLoadLastSlotToolStripMenuItem.Text = "AutoLoad last Slot"; + this.autoLoadLastSlotToolStripMenuItem.Click += new System.EventHandler(this.autoLoadLastSlotToolStripMenuItem_Click); // - // SaveSlotSubMenu + // saveSlotToolStripMenuItem // - this.SaveSlotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SelectSlot0MenuItem, - this.SelectSlot1MenuItem, - this.SelectSlot2MenuItem, - this.SelectSlot3MenuItem, - this.SelectSlot4MenuItem, - this.SelectSlot5MenuItem, - this.SelectSlot6MenuItem, - this.SelectSlot7MenuItem, - this.SelectSlot8MenuItem, - this.SelectSlot9MenuItem, - this.PreviousSlotMenuItem, - this.NextSlotMenuItem, + this.saveSlotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.selectSlot10ToolStripMenuItem, + this.selectSlot1ToolStripMenuItem, + this.selectSlot2ToolStripMenuItem, + this.selectSlot3ToolStripMenuItem, + this.selectSlot4ToolStripMenuItem, + this.selectSlot5ToolStripMenuItem, + this.selectSlot6ToolStripMenuItem, + this.selectSlot7ToolStripMenuItem, + this.selectSlot8ToolStripMenuItem, + this.selectSlot9ToolStripMenuItem, + this.previousSlotToolStripMenuItem, + this.nextSlotToolStripMenuItem, this.toolStripSeparator5, - this.SaveToCurrentSlotMenuItem, - this.LoadCurrentSlotMenuItem}); - this.SaveSlotSubMenu.Name = "SaveSlotSubMenu"; - this.SaveSlotSubMenu.Size = new System.Drawing.Size(140, 22); - this.SaveSlotSubMenu.Text = "SaveSlot"; - this.SaveSlotSubMenu.DropDownOpened += new System.EventHandler(this.SaveSlotSubMenu_DropDownOpened); + this.saveToCurrentSlotToolStripMenuItem, + this.loadCurrentSlotToolStripMenuItem}); + this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; + this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.saveSlotToolStripMenuItem.Text = "SaveSlot"; + this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); // - // SelectSlot0MenuItem + // selectSlot10ToolStripMenuItem // - this.SelectSlot0MenuItem.Name = "SelectSlot0MenuItem"; - this.SelectSlot0MenuItem.Size = new System.Drawing.Size(178, 22); - this.SelectSlot0MenuItem.Text = "Select Slot 0"; - this.SelectSlot0MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); + this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem"; + this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0"; + this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click); // - // SelectSlot1MenuItem + // selectSlot1ToolStripMenuItem // - this.SelectSlot1MenuItem.Name = "SelectSlot1MenuItem"; - this.SelectSlot1MenuItem.Size = new System.Drawing.Size(178, 22); - this.SelectSlot1MenuItem.Text = "Select Slot 1"; - this.SelectSlot1MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); + this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem"; + this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1"; + this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click); // - // SelectSlot2MenuItem + // selectSlot2ToolStripMenuItem // - this.SelectSlot2MenuItem.Name = "SelectSlot2MenuItem"; - this.SelectSlot2MenuItem.Size = new System.Drawing.Size(178, 22); - this.SelectSlot2MenuItem.Text = "Select Slot 2"; - this.SelectSlot2MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); + this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem"; + this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2"; + this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click); // - // SelectSlot3MenuItem + // selectSlot3ToolStripMenuItem // - this.SelectSlot3MenuItem.Name = "SelectSlot3MenuItem"; - this.SelectSlot3MenuItem.Size = new System.Drawing.Size(178, 22); - this.SelectSlot3MenuItem.Text = "Select Slot 3"; - this.SelectSlot3MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); + this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem"; + this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3"; + this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click); // - // SelectSlot4MenuItem + // selectSlot4ToolStripMenuItem // - this.SelectSlot4MenuItem.Name = "SelectSlot4MenuItem"; - this.SelectSlot4MenuItem.Size = new System.Drawing.Size(178, 22); - this.SelectSlot4MenuItem.Text = "Select Slot 4"; - this.SelectSlot4MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); + this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem"; + this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4"; + this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click); // - // SelectSlot5MenuItem + // selectSlot5ToolStripMenuItem // - this.SelectSlot5MenuItem.Name = "SelectSlot5MenuItem"; - this.SelectSlot5MenuItem.Size = new System.Drawing.Size(178, 22); - this.SelectSlot5MenuItem.Text = "Select Slot 5"; - this.SelectSlot5MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); + this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem"; + this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5"; + this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click); // - // SelectSlot6MenuItem + // selectSlot6ToolStripMenuItem // - this.SelectSlot6MenuItem.Name = "SelectSlot6MenuItem"; - this.SelectSlot6MenuItem.Size = new System.Drawing.Size(178, 22); - this.SelectSlot6MenuItem.Text = "Select Slot 6"; - this.SelectSlot6MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); + this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem"; + this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6"; + this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click); // - // SelectSlot7MenuItem + // selectSlot7ToolStripMenuItem // - this.SelectSlot7MenuItem.Name = "SelectSlot7MenuItem"; - this.SelectSlot7MenuItem.Size = new System.Drawing.Size(178, 22); - this.SelectSlot7MenuItem.Text = "Select Slot 7"; - this.SelectSlot7MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); + this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem"; + this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7"; + this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click); // - // SelectSlot8MenuItem + // selectSlot8ToolStripMenuItem // - this.SelectSlot8MenuItem.Name = "SelectSlot8MenuItem"; - this.SelectSlot8MenuItem.Size = new System.Drawing.Size(178, 22); - this.SelectSlot8MenuItem.Text = "Select Slot 8"; - this.SelectSlot8MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); + this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem"; + this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8"; + this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click); // - // SelectSlot9MenuItem + // selectSlot9ToolStripMenuItem // - this.SelectSlot9MenuItem.Name = "SelectSlot9MenuItem"; - this.SelectSlot9MenuItem.Size = new System.Drawing.Size(178, 22); - this.SelectSlot9MenuItem.Text = "Select Slot 9"; - this.SelectSlot9MenuItem.Click += new System.EventHandler(this.SelectSlotMenuItems_Click); + this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem"; + this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9"; + this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click); // - // PreviousSlotMenuItem + // previousSlotToolStripMenuItem // - this.PreviousSlotMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft; - this.PreviousSlotMenuItem.Name = "PreviousSlotMenuItem"; - this.PreviousSlotMenuItem.Size = new System.Drawing.Size(178, 22); - this.PreviousSlotMenuItem.Text = "Previous Slot"; - this.PreviousSlotMenuItem.Click += new System.EventHandler(this.PreviousSlotMenuItem_Click); + this.previousSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft; + this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem"; + this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.previousSlotToolStripMenuItem.Text = "Previous Slot"; + this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click); // - // NextSlotMenuItem + // nextSlotToolStripMenuItem // - this.NextSlotMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight; - this.NextSlotMenuItem.Name = "NextSlotMenuItem"; - this.NextSlotMenuItem.Size = new System.Drawing.Size(178, 22); - this.NextSlotMenuItem.Text = "Next Slot"; - this.NextSlotMenuItem.Click += new System.EventHandler(this.NextSlotMenuItem_Click); + this.nextSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight; + this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem"; + this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.nextSlotToolStripMenuItem.Text = "Next Slot"; + this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6); // - // SaveToCurrentSlotMenuItem + // saveToCurrentSlotToolStripMenuItem // - this.SaveToCurrentSlotMenuItem.Name = "SaveToCurrentSlotMenuItem"; - this.SaveToCurrentSlotMenuItem.Size = new System.Drawing.Size(178, 22); - this.SaveToCurrentSlotMenuItem.Text = "Save to Current Slot"; - this.SaveToCurrentSlotMenuItem.Click += new System.EventHandler(this.SaveToCurrentSlotMenuItem_Click); + this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem"; + this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot"; + this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click); // - // LoadCurrentSlotMenuItem + // loadCurrentSlotToolStripMenuItem // - this.LoadCurrentSlotMenuItem.Name = "LoadCurrentSlotMenuItem"; - this.LoadCurrentSlotMenuItem.Size = new System.Drawing.Size(178, 22); - this.LoadCurrentSlotMenuItem.Text = "Load Current Slot"; - this.LoadCurrentSlotMenuItem.Click += new System.EventHandler(this.LoadCurrentSlotMenuItem_Click); + this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem"; + this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.loadCurrentSlotToolStripMenuItem.Text = "Load Current Slot"; + this.loadCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.loadCurrentSlotToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6); // - // MovieSubMenu + // movieToolStripMenuItem // - this.MovieSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ReadonlyMenuItem, + this.movieToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.readonlyToolStripMenuItem, this.toolStripSeparator15, - this.RecentMenuItem, - this.RecordMovieMenuItem, - this.PlayMovieMenuItem, - this.StopMovieMenuItem, - this.PlayFromBeginningMenuItem, - this.ImportMoviesMenuItem, - this.SaveMovieMenuItem, - this.StopMovieWithoutSavingMenuItem, + this.recentToolStripMenuItem, + this.recordMovieToolStripMenuItem, + this.playMovieToolStripMenuItem, + this.stopMovieToolStripMenuItem, + this.playFromBeginningToolStripMenuItem, + this.importMovieToolStripMenuItem, + this.saveMovieToolStripMenuItem, + this.stopMovieWithoutSavingToolStripMenuItem, this.toolStripSeparator14, - this.BindSavestatesToMoviesMenuItem, - this.AutomaticallyBackupMoviesMenuItem, - this.FullMovieLoadstatesMenuItem}); - this.MovieSubMenu.Name = "MovieSubMenu"; - this.MovieSubMenu.Size = new System.Drawing.Size(140, 22); - this.MovieSubMenu.Text = "Movie"; - this.MovieSubMenu.DropDownOpened += new System.EventHandler(this.MovieSubMenu_DropDownOpened); + this.bindSavestatesToMoviesToolStripMenuItem, + this.automaticallyBackupMoviesToolStripMenuItem, + this.fullMovieLoadstatesToolStripMenuItem}); + this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; + this.movieToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.movieToolStripMenuItem.Text = "Movie"; + this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened); // - // ReadonlyMenuItem + // readonlyToolStripMenuItem // - this.ReadonlyMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly; - this.ReadonlyMenuItem.Name = "ReadonlyMenuItem"; - this.ReadonlyMenuItem.Size = new System.Drawing.Size(231, 22); - this.ReadonlyMenuItem.Text = "Read-only"; - this.ReadonlyMenuItem.Click += new System.EventHandler(this.ReadonlyMenuItem_Click); + this.readonlyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly; + this.readonlyToolStripMenuItem.Name = "readonlyToolStripMenuItem"; + this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.readonlyToolStripMenuItem.Text = "Read-only"; + this.readonlyToolStripMenuItem.Click += new System.EventHandler(this.readonlyToolStripMenuItem_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6); // - // RecentMenuItem + // recentToolStripMenuItem // - this.RecentMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator16}); - this.RecentMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; - this.RecentMenuItem.Name = "RecentMenuItem"; - this.RecentMenuItem.Size = new System.Drawing.Size(231, 22); - this.RecentMenuItem.Text = "Recent"; - this.RecentMenuItem.DropDownOpened += new System.EventHandler(this.RecentMovieSubMenu_DropDownOpened); + this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; + this.recentToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.recentToolStripMenuItem.Text = "Recent"; + this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); // // toolStripSeparator16 // this.toolStripSeparator16.Name = "toolStripSeparator16"; this.toolStripSeparator16.Size = new System.Drawing.Size(57, 6); // - // RecordMovieMenuItem + // recordMovieToolStripMenuItem // - this.RecordMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; - this.RecordMovieMenuItem.Name = "RecordMovieMenuItem"; - this.RecordMovieMenuItem.Size = new System.Drawing.Size(231, 22); - this.RecordMovieMenuItem.Text = "&Record Movie..."; - this.RecordMovieMenuItem.Click += new System.EventHandler(this.RecordMovieMenuItem_Click); + this.recordMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; + this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem"; + this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.recordMovieToolStripMenuItem.Text = "&Record Movie..."; + this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click); // - // PlayMovieMenuItem + // playMovieToolStripMenuItem // - this.PlayMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play; - this.PlayMovieMenuItem.Name = "PlayMovieMenuItem"; - this.PlayMovieMenuItem.Size = new System.Drawing.Size(231, 22); - this.PlayMovieMenuItem.Text = "&Play Movie..."; - this.PlayMovieMenuItem.Click += new System.EventHandler(this.PlayMovieMenuItem_Click); + this.playMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play; + this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem"; + this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.playMovieToolStripMenuItem.Text = "&Play Movie..."; + this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click); // - // StopMovieMenuItem + // stopMovieToolStripMenuItem // - this.StopMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; - this.StopMovieMenuItem.Name = "StopMovieMenuItem"; - this.StopMovieMenuItem.Size = new System.Drawing.Size(231, 22); - this.StopMovieMenuItem.Text = "Stop Movie"; - this.StopMovieMenuItem.Click += new System.EventHandler(this.StopMovieMenuItem_Click); + this.stopMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem"; + this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.stopMovieToolStripMenuItem.Text = "Stop Movie"; + this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click); // - // PlayFromBeginningMenuItem + // playFromBeginningToolStripMenuItem // - this.PlayFromBeginningMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; - this.PlayFromBeginningMenuItem.Name = "PlayFromBeginningMenuItem"; - this.PlayFromBeginningMenuItem.Size = new System.Drawing.Size(231, 22); - this.PlayFromBeginningMenuItem.Text = "Play from Beginning"; - this.PlayFromBeginningMenuItem.Click += new System.EventHandler(this.PlayFromBeginningMenuItem_Click); + this.playFromBeginningToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; + this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem"; + this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning"; + this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click); // - // ImportMoviesMenuItem + // importMovieToolStripMenuItem // - this.ImportMoviesMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import; - this.ImportMoviesMenuItem.Name = "ImportMoviesMenuItem"; - this.ImportMoviesMenuItem.Size = new System.Drawing.Size(231, 22); - this.ImportMoviesMenuItem.Text = "Import Movies..."; - this.ImportMoviesMenuItem.Click += new System.EventHandler(this.ImportMovieMenuItem_Click); + this.importMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import; + this.importMovieToolStripMenuItem.Name = "importMovieToolStripMenuItem"; + this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.importMovieToolStripMenuItem.Text = "Import Movies..."; + this.importMovieToolStripMenuItem.Click += new System.EventHandler(this.importMovieToolStripMenuItem_Click); // - // SaveMovieMenuItem + // saveMovieToolStripMenuItem // - this.SaveMovieMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; - this.SaveMovieMenuItem.Name = "SaveMovieMenuItem"; - this.SaveMovieMenuItem.Size = new System.Drawing.Size(231, 22); - this.SaveMovieMenuItem.Text = "&Save Movie"; - this.SaveMovieMenuItem.Click += new System.EventHandler(this.SaveMovieMenuItem_Click); + this.saveMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.saveMovieToolStripMenuItem.Name = "saveMovieToolStripMenuItem"; + this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.saveMovieToolStripMenuItem.Text = "&Save Movie"; + this.saveMovieToolStripMenuItem.Click += new System.EventHandler(this.saveMovieToolStripMenuItem_Click); // - // StopMovieWithoutSavingMenuItem + // stopMovieWithoutSavingToolStripMenuItem // - this.StopMovieWithoutSavingMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; - this.StopMovieWithoutSavingMenuItem.Name = "StopMovieWithoutSavingMenuItem"; - this.StopMovieWithoutSavingMenuItem.Size = new System.Drawing.Size(231, 22); - this.StopMovieWithoutSavingMenuItem.Text = "Stop Movie without Saving"; - this.StopMovieWithoutSavingMenuItem.Click += new System.EventHandler(this.stopMovieWithoutSaveMenuItem_Click); + this.stopMovieWithoutSavingToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.stopMovieWithoutSavingToolStripMenuItem.Name = "stopMovieWithoutSavingToolStripMenuItem"; + this.stopMovieWithoutSavingToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.stopMovieWithoutSavingToolStripMenuItem.Text = "Stop Movie without Saving"; + this.stopMovieWithoutSavingToolStripMenuItem.Click += new System.EventHandler(this.stopMovieWithoutSavingToolStripMenuItem_Click); // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6); // - // BindSavestatesToMoviesMenuItem + // bindSavestatesToMoviesToolStripMenuItem // - this.BindSavestatesToMoviesMenuItem.Name = "BindSavestatesToMoviesMenuItem"; - this.BindSavestatesToMoviesMenuItem.Size = new System.Drawing.Size(231, 22); - this.BindSavestatesToMoviesMenuItem.Text = "Bind Savestates to Movies"; - this.BindSavestatesToMoviesMenuItem.Click += new System.EventHandler(this.BindSavestatesToMoviesMenuItem_Click); + this.bindSavestatesToMoviesToolStripMenuItem.Name = "bindSavestatesToMoviesToolStripMenuItem"; + this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.bindSavestatesToMoviesToolStripMenuItem.Text = "Bind Savestates to Movies"; + this.bindSavestatesToMoviesToolStripMenuItem.Click += new System.EventHandler(this.bindSavestatesToMoviesToolStripMenuItem_Click); // - // AutomaticallyBackupMoviesMenuItem + // automaticallyBackupMoviesToolStripMenuItem // - this.AutomaticallyBackupMoviesMenuItem.Name = "AutomaticallyBackupMoviesMenuItem"; - this.AutomaticallyBackupMoviesMenuItem.Size = new System.Drawing.Size(231, 22); - this.AutomaticallyBackupMoviesMenuItem.Text = "Automatically Backup Movies"; - this.AutomaticallyBackupMoviesMenuItem.Click += new System.EventHandler(this.AutomaticMovieBackupMenuItem_Click); + this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem"; + this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies"; + this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click); // - // FullMovieLoadstatesMenuItem + // fullMovieLoadstatesToolStripMenuItem // - this.FullMovieLoadstatesMenuItem.Name = "FullMovieLoadstatesMenuItem"; - this.FullMovieLoadstatesMenuItem.Size = new System.Drawing.Size(231, 22); - this.FullMovieLoadstatesMenuItem.Text = "Full Movie Loadstates"; - this.FullMovieLoadstatesMenuItem.Click += new System.EventHandler(this.FullMovieLoadstatesMenuItem_Click); + this.fullMovieLoadstatesToolStripMenuItem.Name = "fullMovieLoadstatesToolStripMenuItem"; + this.fullMovieLoadstatesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.fullMovieLoadstatesToolStripMenuItem.Text = "Full Movie Loadstates"; + this.fullMovieLoadstatesToolStripMenuItem.Click += new System.EventHandler(this.fullMovieLoadstatesToolStripMenuItem_Click); // - // AVSubMenu + // AVIWAVToolStripMenuItem // - this.AVSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.RecordAVMenuItem, - this.StopAVIMenuItem, + this.AVIWAVToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.recordAVIToolStripMenuItem, + this.stopAVIToolStripMenuItem, this.toolStripSeparator19, - this.CaptureOSDMenuItem}); - this.AVSubMenu.Name = "AVSubMenu"; - this.AVSubMenu.Size = new System.Drawing.Size(140, 22); - this.AVSubMenu.Text = "AVI/WAV"; - this.AVSubMenu.DropDownOpened += new System.EventHandler(this.AVSubMenu_DropDownOpened); + this.captureOSDToolStripMenuItem}); + this.AVIWAVToolStripMenuItem.Name = "AVIWAVToolStripMenuItem"; + this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.AVIWAVToolStripMenuItem.Text = "AVI/WAV"; + this.AVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened); // - // RecordAVMenuItem + // recordAVIToolStripMenuItem // - this.RecordAVMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI; - this.RecordAVMenuItem.Name = "RecordAVMenuItem"; - this.RecordAVMenuItem.Size = new System.Drawing.Size(163, 22); - this.RecordAVMenuItem.Text = "Record AVI/WAV"; - this.RecordAVMenuItem.Click += new System.EventHandler(this.RecordAVMenuItem_Click); + this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI; + this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem"; + this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.recordAVIToolStripMenuItem.Text = "Record AVI/WAV"; + this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click); // - // StopAVIMenuItem + // stopAVIToolStripMenuItem // - this.StopAVIMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; - this.StopAVIMenuItem.Name = "StopAVIMenuItem"; - this.StopAVIMenuItem.Size = new System.Drawing.Size(163, 22); - this.StopAVIMenuItem.Text = "Stop AVI/WAV"; - this.StopAVIMenuItem.Click += new System.EventHandler(this.StopAVMenuItem_Click); + this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem"; + this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.stopAVIToolStripMenuItem.Text = "Stop AVI/WAV"; + this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click); // // toolStripSeparator19 // this.toolStripSeparator19.Name = "toolStripSeparator19"; this.toolStripSeparator19.Size = new System.Drawing.Size(160, 6); // - // CaptureOSDMenuItem + // captureOSDToolStripMenuItem // - this.CaptureOSDMenuItem.Name = "CaptureOSDMenuItem"; - this.CaptureOSDMenuItem.Size = new System.Drawing.Size(163, 22); - this.CaptureOSDMenuItem.Text = "Capture OSD"; - this.CaptureOSDMenuItem.Click += new System.EventHandler(this.CaptureOSDMenuItem_Click); + this.captureOSDToolStripMenuItem.Name = "captureOSDToolStripMenuItem"; + this.captureOSDToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.captureOSDToolStripMenuItem.Text = "Capture OSD"; + this.captureOSDToolStripMenuItem.Click += new System.EventHandler(this.captureOSDToolStripMenuItem_Click); // - // ScreenshotSubMenu + // screenshotToolStripMenuItem // - this.ScreenshotSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ScreenshotMenuItem, - this.ScreenshotAsMenuItem, - this.ScreenshotClipboardMenuItem, + this.screenshotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.screenshotF12ToolStripMenuItem, + this.screenshotAsToolStripMenuItem, + this.screenshotClipboardToolStripMenuItem, this.toolStripSeparator20, - this.ScreenshotCaptureOSDMenuItem1}); - this.ScreenshotSubMenu.Name = "ScreenshotSubMenu"; - this.ScreenshotSubMenu.Size = new System.Drawing.Size(140, 22); - this.ScreenshotSubMenu.Text = "Screenshot"; - this.ScreenshotSubMenu.DropDownOpening += new System.EventHandler(this.ScreenshotSubMenu_DropDownOpening); + this.captureOSDToolStripMenuItem1}); + this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem"; + this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.screenshotToolStripMenuItem.Text = "Screenshot"; + this.screenshotToolStripMenuItem.DropDownOpening += new System.EventHandler(this.screenshotToolStripMenuItem_DropDownOpening); // - // ScreenshotMenuItem + // screenshotF12ToolStripMenuItem // - this.ScreenshotMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; - this.ScreenshotMenuItem.Name = "ScreenshotMenuItem"; - this.ScreenshotMenuItem.Size = new System.Drawing.Size(245, 22); - this.ScreenshotMenuItem.Text = "Screenshot"; - this.ScreenshotMenuItem.Click += new System.EventHandler(this.ScreenshotMenuItem_Click); + this.screenshotF12ToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; + this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; + this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; + this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); // - // ScreenshotAsMenuItem + // screenshotAsToolStripMenuItem // - this.ScreenshotAsMenuItem.Name = "ScreenshotAsMenuItem"; - this.ScreenshotAsMenuItem.Size = new System.Drawing.Size(245, 22); - this.ScreenshotAsMenuItem.Text = "Screenshot As..."; - this.ScreenshotAsMenuItem.Click += new System.EventHandler(this.ScreenshotAsMenuItem_Click); + this.screenshotAsToolStripMenuItem.Name = "screenshotAsToolStripMenuItem"; + this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotAsToolStripMenuItem.Text = "Screenshot As..."; + this.screenshotAsToolStripMenuItem.Click += new System.EventHandler(this.screenshotAsToolStripMenuItem_Click); // - // ScreenshotClipboardMenuItem + // screenshotClipboardToolStripMenuItem // - this.ScreenshotClipboardMenuItem.Name = "ScreenshotClipboardMenuItem"; - this.ScreenshotClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.ScreenshotClipboardMenuItem.Size = new System.Drawing.Size(245, 22); - this.ScreenshotClipboardMenuItem.Text = "Screenshot -> Clipboard"; - this.ScreenshotClipboardMenuItem.Click += new System.EventHandler(this.ScreenshotClipboardMenuItem_Click); + this.screenshotClipboardToolStripMenuItem.Name = "screenshotClipboardToolStripMenuItem"; + this.screenshotClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); + this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotClipboardToolStripMenuItem.Text = "Screenshot -> Clipboard"; + this.screenshotClipboardToolStripMenuItem.Click += new System.EventHandler(this.screenshotClipboardToolStripMenuItem_Click); // // toolStripSeparator20 // this.toolStripSeparator20.Name = "toolStripSeparator20"; this.toolStripSeparator20.Size = new System.Drawing.Size(242, 6); // - // ScreenshotCaptureOSDMenuItem1 + // captureOSDToolStripMenuItem1 // - this.ScreenshotCaptureOSDMenuItem1.Name = "ScreenshotCaptureOSDMenuItem1"; - this.ScreenshotCaptureOSDMenuItem1.Size = new System.Drawing.Size(245, 22); - this.ScreenshotCaptureOSDMenuItem1.Text = "Capture OSD"; - this.ScreenshotCaptureOSDMenuItem1.Click += new System.EventHandler(this.ScreenshotCaptureOSDMenuItem_Click); + this.captureOSDToolStripMenuItem1.Name = "captureOSDToolStripMenuItem1"; + this.captureOSDToolStripMenuItem1.Size = new System.Drawing.Size(245, 22); + this.captureOSDToolStripMenuItem1.Text = "Capture OSD"; + this.captureOSDToolStripMenuItem1.Click += new System.EventHandler(this.captureOSDToolStripMenuItem1_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Size = new System.Drawing.Size(137, 6); // - // ExitMenuItem + // exitToolStripMenuItem // - this.ExitMenuItem.Name = "ExitMenuItem"; - this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Size = new System.Drawing.Size(140, 22); - this.ExitMenuItem.Text = "Exit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.exitToolStripMenuItem.Text = "Exit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // - // EmulationSubMenu + // emulationToolStripMenuItem // - this.EmulationSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PauseMenuItem, - this.RebootCoreMenuItem, + this.emulationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.pauseToolStripMenuItem, + this.rebootCoreToolStripMenuItem, this.toolStripSeparator1, - this.SoftResetMenuItem, - this.HardResetMenuItem}); - 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.resetToolStripMenuItem, + this.hardResetToolStripMenuItem}); + this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem"; + this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 19); + this.emulationToolStripMenuItem.Text = "&Emulation"; + this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); // - // PauseMenuItem + // pauseToolStripMenuItem // - this.PauseMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; - this.PauseMenuItem.Name = "PauseMenuItem"; - this.PauseMenuItem.Size = new System.Drawing.Size(140, 22); - this.PauseMenuItem.Text = "&Pause"; - this.PauseMenuItem.Click += new System.EventHandler(this.PauseMenuItem_Click); + this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; + this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; + this.pauseToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.pauseToolStripMenuItem.Text = "&Pause"; + this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); // - // RebootCoreMenuItem + // rebootCoreToolStripMenuItem // - this.RebootCoreMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; - this.RebootCoreMenuItem.Name = "RebootCoreMenuItem"; - this.RebootCoreMenuItem.Size = new System.Drawing.Size(140, 22); - this.RebootCoreMenuItem.Text = "&Reboot Core"; - this.RebootCoreMenuItem.Click += new System.EventHandler(this.PowerMenuItem_Click); + this.rebootCoreToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; + this.rebootCoreToolStripMenuItem.Name = "rebootCoreToolStripMenuItem"; + this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.rebootCoreToolStripMenuItem.Text = "&Reboot Core"; + this.rebootCoreToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(137, 6); // - // SoftResetMenuItem + // resetToolStripMenuItem // - this.SoftResetMenuItem.Name = "SoftResetMenuItem"; - this.SoftResetMenuItem.Size = new System.Drawing.Size(140, 22); - this.SoftResetMenuItem.Text = "&Soft Reset"; - this.SoftResetMenuItem.Click += new System.EventHandler(this.SoftResetMenuItem_Click); + this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; + this.resetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.resetToolStripMenuItem.Text = "&Soft Reset"; + this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // - // HardResetMenuItem + // hardResetToolStripMenuItem // - this.HardResetMenuItem.Name = "HardResetMenuItem"; - this.HardResetMenuItem.Size = new System.Drawing.Size(140, 22); - this.HardResetMenuItem.Text = "&Hard Reset"; - this.HardResetMenuItem.Click += new System.EventHandler(this.HardResetMenuItem_Click); + this.hardResetToolStripMenuItem.Name = "hardResetToolStripMenuItem"; + this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.hardResetToolStripMenuItem.Text = "&Hard Reset"; + this.hardResetToolStripMenuItem.Click += new System.EventHandler(this.hardResetToolStripMenuItem_Click); // - // ViewSubMenu + // viewToolStripMenuItem // - this.ViewSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.DisplayFilterSubMenu, - this.WindowSizeSubMenu, - this.SwitchToFullscreenMenuItem, + this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.windowFilterMenuItem, + this.windowSizeMenuItem, + this.switchToFullscreenToolStripMenuItem, this.toolStripSeparator2, - this.DisplayFPSMenuItem, - this.DisplayFrameCounterMenuItem, - this.DisplayLagCounterMenuItem, - this.DisplayInputMenuItem, - this.DisplayRerecordCountMenuItem, - this.DisplaySubtitlesMenuItem, + this.displayFPSToolStripMenuItem, + this.displayFrameCounterToolStripMenuItem, + this.displayLagCounterToolStripMenuItem, + this.displayInputToolStripMenuItem, + this.displayRerecordCountToolStripMenuItem, + this.displaySubtitlesToolStripMenuItem, this.toolStripMenuItem4, - this.DisplayStatusBarMenuItem, - this.DisplayLogWindowMenuItem}); - this.ViewSubMenu.Name = "ViewSubMenu"; - this.ViewSubMenu.Size = new System.Drawing.Size(44, 19); - this.ViewSubMenu.Text = "&View"; - this.ViewSubMenu.DropDownOpened += new System.EventHandler(this.ViewSubMenu_DropDownOpened); + this.displayStatusBarToolStripMenuItem, + this.displayLogWindowToolStripMenuItem}); + this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; + this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.viewToolStripMenuItem.Text = "&View"; + this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened); // - // DisplayFilterSubMenu + // windowFilterMenuItem // - this.DisplayFilterSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.windowFilterMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DisplayFilterNoneMenuItem, this.x2SAIMenuItem, this.SuperX2SAIMenuItem, this.SuperEagleMenuItem}); - this.DisplayFilterSubMenu.Name = "DisplayFilterSubMenu"; - this.DisplayFilterSubMenu.Size = new System.Drawing.Size(198, 22); - this.DisplayFilterSubMenu.Text = "Display Filter"; - this.DisplayFilterSubMenu.DropDownOpened += new System.EventHandler(this.DisplayFilterSubMenu_DropDownOpened); + this.windowFilterMenuItem.Name = "windowFilterMenuItem"; + this.windowFilterMenuItem.Size = new System.Drawing.Size(198, 22); + this.windowFilterMenuItem.Text = "Display Filter"; // // DisplayFilterNoneMenuItem // @@ -1135,786 +1134,786 @@ this.SuperEagleMenuItem.Text = "Super Eagle"; this.SuperEagleMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); // - // WindowSizeSubMenu + // windowSizeMenuItem // - this.WindowSizeSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.windowSizeMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.x1MenuItem, this.x2MenuItem, this.x3MenuItem, this.x4MenuItem, this.x5MenuItem, this.mzMenuItem}); - this.WindowSizeSubMenu.Name = "WindowSizeSubMenu"; - this.WindowSizeSubMenu.Size = new System.Drawing.Size(198, 22); - this.WindowSizeSubMenu.Text = "&Window Size"; - this.WindowSizeSubMenu.DropDownOpened += new System.EventHandler(this.WindowSizeSubMenu_DropDownOpened); + this.windowSizeMenuItem.Name = "windowSizeMenuItem"; + this.windowSizeMenuItem.Size = new System.Drawing.Size(198, 22); + this.windowSizeMenuItem.Text = "&Window Size"; // // x1MenuItem // this.x1MenuItem.Name = "x1MenuItem"; this.x1MenuItem.Size = new System.Drawing.Size(96, 22); this.x1MenuItem.Text = "&1x"; - this.x1MenuItem.Click += new System.EventHandler(this.WindowSize_Click); + this.x1MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x2MenuItem // this.x2MenuItem.Name = "x2MenuItem"; this.x2MenuItem.Size = new System.Drawing.Size(96, 22); this.x2MenuItem.Text = "&2x"; - this.x2MenuItem.Click += new System.EventHandler(this.WindowSize_Click); + this.x2MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x3MenuItem // this.x3MenuItem.Name = "x3MenuItem"; this.x3MenuItem.Size = new System.Drawing.Size(96, 22); this.x3MenuItem.Text = "&3x"; - this.x3MenuItem.Click += new System.EventHandler(this.WindowSize_Click); + this.x3MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x4MenuItem // this.x4MenuItem.Name = "x4MenuItem"; this.x4MenuItem.Size = new System.Drawing.Size(96, 22); this.x4MenuItem.Text = "&4x"; - this.x4MenuItem.Click += new System.EventHandler(this.WindowSize_Click); + this.x4MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // x5MenuItem // this.x5MenuItem.Name = "x5MenuItem"; this.x5MenuItem.Size = new System.Drawing.Size(96, 22); this.x5MenuItem.Text = "&5x"; - this.x5MenuItem.Click += new System.EventHandler(this.WindowSize_Click); + this.x5MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // // mzMenuItem // this.mzMenuItem.Name = "mzMenuItem"; this.mzMenuItem.Size = new System.Drawing.Size(96, 22); this.mzMenuItem.Text = "&Max"; - this.mzMenuItem.Click += new System.EventHandler(this.WindowSize_Click); + this.mzMenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); // - // SwitchToFullscreenMenuItem + // switchToFullscreenToolStripMenuItem // - this.SwitchToFullscreenMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen; - this.SwitchToFullscreenMenuItem.Name = "SwitchToFullscreenMenuItem"; - this.SwitchToFullscreenMenuItem.Size = new System.Drawing.Size(198, 22); - this.SwitchToFullscreenMenuItem.Text = "Switch to Fullscreen"; - this.SwitchToFullscreenMenuItem.Click += new System.EventHandler(this.SwitchToFullscreenMenuItem_Click); + this.switchToFullscreenToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen; + this.switchToFullscreenToolStripMenuItem.Name = "switchToFullscreenToolStripMenuItem"; + this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.switchToFullscreenToolStripMenuItem.Text = "Switch to Fullscreen"; + this.switchToFullscreenToolStripMenuItem.Click += new System.EventHandler(this.switchToFullscreenToolStripMenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Size = new System.Drawing.Size(195, 6); // - // DisplayFPSMenuItem + // displayFPSToolStripMenuItem // - 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.displayFPSToolStripMenuItem.Name = "displayFPSToolStripMenuItem"; + this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayFPSToolStripMenuItem.Text = "Display FPS"; + this.displayFPSToolStripMenuItem.Click += new System.EventHandler(this.displayFPSToolStripMenuItem_Click); // - // DisplayFrameCounterMenuItem + // displayFrameCounterToolStripMenuItem // - this.DisplayFrameCounterMenuItem.Name = "DisplayFrameCounterMenuItem"; - this.DisplayFrameCounterMenuItem.Size = new System.Drawing.Size(198, 22); - this.DisplayFrameCounterMenuItem.Text = "Display FrameCounter"; - this.DisplayFrameCounterMenuItem.Click += new System.EventHandler(this.DisplayFrameCounterMenuItem_Click); + this.displayFrameCounterToolStripMenuItem.Name = "displayFrameCounterToolStripMenuItem"; + this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayFrameCounterToolStripMenuItem.Text = "Display FrameCounter"; + this.displayFrameCounterToolStripMenuItem.Click += new System.EventHandler(this.displayFrameCounterToolStripMenuItem_Click); // - // DisplayLagCounterMenuItem + // displayLagCounterToolStripMenuItem // - this.DisplayLagCounterMenuItem.Name = "DisplayLagCounterMenuItem"; - this.DisplayLagCounterMenuItem.Size = new System.Drawing.Size(198, 22); - this.DisplayLagCounterMenuItem.Text = "Display Lag Counter"; - this.DisplayLagCounterMenuItem.Click += new System.EventHandler(this.DisplayLagCounterMenuItem_Click); + this.displayLagCounterToolStripMenuItem.Name = "displayLagCounterToolStripMenuItem"; + this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter"; + this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click); // - // DisplayInputMenuItem + // displayInputToolStripMenuItem // - this.DisplayInputMenuItem.Name = "DisplayInputMenuItem"; - this.DisplayInputMenuItem.Size = new System.Drawing.Size(198, 22); - this.DisplayInputMenuItem.Text = "Display Input"; - this.DisplayInputMenuItem.Click += new System.EventHandler(this.DisplayInputMenuItem_Click); + this.displayInputToolStripMenuItem.Name = "displayInputToolStripMenuItem"; + this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayInputToolStripMenuItem.Text = "Display Input"; + this.displayInputToolStripMenuItem.Click += new System.EventHandler(this.displayInputToolStripMenuItem_Click); // - // DisplayRerecordCountMenuItem + // displayRerecordCountToolStripMenuItem // - this.DisplayRerecordCountMenuItem.Name = "DisplayRerecordCountMenuItem"; - this.DisplayRerecordCountMenuItem.Size = new System.Drawing.Size(198, 22); - this.DisplayRerecordCountMenuItem.Text = "Display Rerecord Count"; - this.DisplayRerecordCountMenuItem.Click += new System.EventHandler(this.DisplayRerecordsMenuItem_Click); + this.displayRerecordCountToolStripMenuItem.Name = "displayRerecordCountToolStripMenuItem"; + this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayRerecordCountToolStripMenuItem.Text = "Display Rerecord Count"; + this.displayRerecordCountToolStripMenuItem.Click += new System.EventHandler(this.displayRerecordCountToolStripMenuItem_Click); // - // DisplaySubtitlesMenuItem + // displaySubtitlesToolStripMenuItem // - this.DisplaySubtitlesMenuItem.Name = "DisplaySubtitlesMenuItem"; - this.DisplaySubtitlesMenuItem.Size = new System.Drawing.Size(198, 22); - this.DisplaySubtitlesMenuItem.Text = "Display Subtitles"; - this.DisplaySubtitlesMenuItem.Click += new System.EventHandler(this.DisplaySubtitlesMenuItem_Click); + this.displaySubtitlesToolStripMenuItem.Name = "displaySubtitlesToolStripMenuItem"; + this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displaySubtitlesToolStripMenuItem.Text = "Display Subtitles"; + this.displaySubtitlesToolStripMenuItem.Click += new System.EventHandler(this.displaySubtitlesToolStripMenuItem_Click); // // toolStripMenuItem4 // this.toolStripMenuItem4.Name = "toolStripMenuItem4"; this.toolStripMenuItem4.Size = new System.Drawing.Size(195, 6); // - // DisplayStatusBarMenuItem + // displayStatusBarToolStripMenuItem // - this.DisplayStatusBarMenuItem.Name = "DisplayStatusBarMenuItem"; - this.DisplayStatusBarMenuItem.Size = new System.Drawing.Size(198, 22); - this.DisplayStatusBarMenuItem.Text = "Display Status Bar"; - this.DisplayStatusBarMenuItem.Click += new System.EventHandler(this.DisplayStatusBarMenuItem_Click); + this.displayStatusBarToolStripMenuItem.Name = "displayStatusBarToolStripMenuItem"; + this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayStatusBarToolStripMenuItem.Text = "Display Status Bar"; + this.displayStatusBarToolStripMenuItem.Click += new System.EventHandler(this.displayStatusBarToolStripMenuItem_Click); // - // DisplayLogWindowMenuItem + // displayLogWindowToolStripMenuItem // - this.DisplayLogWindowMenuItem.Name = "DisplayLogWindowMenuItem"; - this.DisplayLogWindowMenuItem.Size = new System.Drawing.Size(198, 22); - this.DisplayLogWindowMenuItem.Text = "Display Log Window"; - this.DisplayLogWindowMenuItem.Click += new System.EventHandler(this.DisplayLogWindowMenuItem_Click); + this.displayLogWindowToolStripMenuItem.Name = "displayLogWindowToolStripMenuItem"; + this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayLogWindowToolStripMenuItem.Text = "Display Log Window"; + this.displayLogWindowToolStripMenuItem.Click += new System.EventHandler(this.displayLogWindowToolStripMenuItem_Click); // - // ConfigSubMenu + // configToolStripMenuItem // - this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ControllersMenuItem, - this.HotkeysMenuItem, - this.MessagesMenuItem, - this.PathsMenuItem, - this.SoundMenuItem, - this.AutofireMenuItem, - this.RewindOptionsMenuItem, - this.FirmwaresMenuItem, + this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.controllersToolStripMenuItem, + this.hotkeysToolStripMenuItem, + this.messagesToolStripMenuItem, + this.pathsToolStripMenuItem, + this.soundToolStripMenuItem, + this.autofireToolStripMenuItem, + this.rewindOptionsToolStripMenuItem, + this.firmwaresToolStripMenuItem, this.toolStripSeparator9, - this.ConfigEnableSubMenu, - this.GuiSubMenu, - this.SpeedSkipSubMenu, - this.KeyPrioritySubMenu, - this.SavestateTypeSubMenu, + this.enableToolStripMenuItem, + this.gUIToolStripMenuItem, + this.frameSkipToolStripMenuItem, + this.keyPriorityToolStripMenuItem, + this.savestateTypeToolStripMenuItem, this.toolStripSeparator10, - this.SaveConfigMenuItem, - this.LoadConfigMenuItem}); - this.ConfigSubMenu.Name = "ConfigSubMenu"; - this.ConfigSubMenu.Size = new System.Drawing.Size(55, 19); - this.ConfigSubMenu.Text = "&Config"; - this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened); + this.saveConfigToolStripMenuItem, + this.loadConfigToolStripMenuItem}); + this.configToolStripMenuItem.Name = "configToolStripMenuItem"; + this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 19); + this.configToolStripMenuItem.Text = "&Config"; + this.configToolStripMenuItem.DropDownOpened += new System.EventHandler(this.configToolStripMenuItem_DropDownOpened); // - // ControllersMenuItem + // controllersToolStripMenuItem // - this.ControllersMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; - this.ControllersMenuItem.Name = "ControllersMenuItem"; - this.ControllersMenuItem.Size = new System.Drawing.Size(152, 22); - this.ControllersMenuItem.Text = "&Controllers..."; - this.ControllersMenuItem.Click += new System.EventHandler(this.ControllersMenuItem_Click); + this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; + this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; + this.controllersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.controllersToolStripMenuItem.Text = "&Controllers..."; + this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); // - // HotkeysMenuItem + // hotkeysToolStripMenuItem // - this.HotkeysMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; - this.HotkeysMenuItem.Name = "HotkeysMenuItem"; - this.HotkeysMenuItem.Size = new System.Drawing.Size(152, 22); - this.HotkeysMenuItem.Text = "&Hotkeys..."; - this.HotkeysMenuItem.Click += new System.EventHandler(this.HotkeysMenuItem_Click); + this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; + this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; + this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.hotkeysToolStripMenuItem.Text = "&Hotkeys..."; + this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); // - // MessagesMenuItem + // messagesToolStripMenuItem // - this.MessagesMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; - this.MessagesMenuItem.Name = "MessagesMenuItem"; - this.MessagesMenuItem.Size = new System.Drawing.Size(152, 22); - this.MessagesMenuItem.Text = "&Messages..."; - this.MessagesMenuItem.Click += new System.EventHandler(this.MessagesMenuItem_Click); + this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; + this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem"; + this.messagesToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.messagesToolStripMenuItem.Text = "&Messages..."; + this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click); // - // PathsMenuItem + // pathsToolStripMenuItem // - this.PathsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; - this.PathsMenuItem.Name = "PathsMenuItem"; - this.PathsMenuItem.Size = new System.Drawing.Size(152, 22); - this.PathsMenuItem.Text = "Paths..."; - this.PathsMenuItem.Click += new System.EventHandler(this.PathsMenuItem_Click); + this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; + this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem"; + this.pathsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.pathsToolStripMenuItem.Text = "Paths..."; + this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click); // - // SoundMenuItem + // soundToolStripMenuItem // - this.SoundMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; - this.SoundMenuItem.Name = "SoundMenuItem"; - this.SoundMenuItem.Size = new System.Drawing.Size(152, 22); - this.SoundMenuItem.Text = "&Sound..."; - this.SoundMenuItem.Click += new System.EventHandler(this.SoundMenuItem_Click); + this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; + this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; + this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.soundToolStripMenuItem.Text = "&Sound..."; + this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); // - // AutofireMenuItem + // autofireToolStripMenuItem // - this.AutofireMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; - this.AutofireMenuItem.Name = "AutofireMenuItem"; - this.AutofireMenuItem.Size = new System.Drawing.Size(152, 22); - this.AutofireMenuItem.Text = "&Autofire..."; - this.AutofireMenuItem.Click += new System.EventHandler(this.AutofireMenuItem_Click); + this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; + this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem"; + this.autofireToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.autofireToolStripMenuItem.Text = "&Autofire..."; + this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click); // - // RewindOptionsMenuItem + // rewindOptionsToolStripMenuItem // - this.RewindOptionsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; - this.RewindOptionsMenuItem.Name = "RewindOptionsMenuItem"; - this.RewindOptionsMenuItem.Size = new System.Drawing.Size(152, 22); - this.RewindOptionsMenuItem.Text = "&Rewind..."; - this.RewindOptionsMenuItem.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click); + this.rewindOptionsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; + this.rewindOptionsToolStripMenuItem.Name = "rewindOptionsToolStripMenuItem"; + this.rewindOptionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rewindOptionsToolStripMenuItem.Text = "&Rewind..."; + this.rewindOptionsToolStripMenuItem.Click += new System.EventHandler(this.rewindOptionsToolStripMenuItem_Click); // - // FirmwaresMenuItem + // firmwaresToolStripMenuItem // - this.FirmwaresMenuItem.Name = "FirmwaresMenuItem"; - this.FirmwaresMenuItem.Size = new System.Drawing.Size(152, 22); - this.FirmwaresMenuItem.Text = "&Firmwares"; - this.FirmwaresMenuItem.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); + this.firmwaresToolStripMenuItem.Name = "firmwaresToolStripMenuItem"; + this.firmwaresToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.firmwaresToolStripMenuItem.Text = "&Firmwares"; + this.firmwaresToolStripMenuItem.Click += new System.EventHandler(this.firmwaresToolStripMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6); // - // ConfigEnableSubMenu + // enableToolStripMenuItem // - this.ConfigEnableSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.EnableContextMenuMenuItem, - this.BackupSavestatesMenuItem, - this.AutoSavestatesMenuItem, - this.SaveScreenshotInSavestatesMenuItem, - this.FrameAdvanceSkipLagMenuItem, - this.BackupSaveramMenuItem}); - this.ConfigEnableSubMenu.Name = "ConfigEnableSubMenu"; - this.ConfigEnableSubMenu.Size = new System.Drawing.Size(152, 22); - this.ConfigEnableSubMenu.Text = "&Enable"; - this.ConfigEnableSubMenu.DropDownOpened += new System.EventHandler(this.EnableMenuItem_DropDownOpened); + this.enableToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.enableContextMenuToolStripMenuItem, + this.backupSavestatesToolStripMenuItem, + this.autoSavestatesToolStripMenuItem, + this.saveScreenshotWithSavestatesToolStripMenuItem, + this.frameAdvanceSkipLagFramesToolStripMenuItem, + this.backupSaveramToolStripMenuItem}); + this.enableToolStripMenuItem.Name = "enableToolStripMenuItem"; + this.enableToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.enableToolStripMenuItem.Text = "&Enable"; + this.enableToolStripMenuItem.DropDownOpened += new System.EventHandler(this.enableToolStripMenuItem_DropDownOpened); // - // EnableContextMenuMenuItem + // enableContextMenuToolStripMenuItem // - this.EnableContextMenuMenuItem.Name = "EnableContextMenuMenuItem"; - this.EnableContextMenuMenuItem.Size = new System.Drawing.Size(229, 22); - this.EnableContextMenuMenuItem.Text = "Enable Context Menu"; - this.EnableContextMenuMenuItem.Click += new System.EventHandler(this.EnableContextMenuMenuItem_Click); + this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem"; + this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu"; + this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click); // - // BackupSavestatesMenuItem + // backupSavestatesToolStripMenuItem // - this.BackupSavestatesMenuItem.Name = "BackupSavestatesMenuItem"; - this.BackupSavestatesMenuItem.Size = new System.Drawing.Size(229, 22); - this.BackupSavestatesMenuItem.Text = "Backup Savestates"; - this.BackupSavestatesMenuItem.Click += new System.EventHandler(this.BackupSavestatesMenuItem_Click); + this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem"; + this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates"; + this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click); // - // AutoSavestatesMenuItem + // autoSavestatesToolStripMenuItem // - this.AutoSavestatesMenuItem.Name = "AutoSavestatesMenuItem"; - this.AutoSavestatesMenuItem.Size = new System.Drawing.Size(229, 22); - this.AutoSavestatesMenuItem.Text = "Auto Savestates"; - this.AutoSavestatesMenuItem.Click += new System.EventHandler(this.AutoSavestatesMenuItem_Click); + this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem"; + this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates"; + this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click); // - // SaveScreenshotInSavestatesMenuItem + // saveScreenshotWithSavestatesToolStripMenuItem // - this.SaveScreenshotInSavestatesMenuItem.Name = "SaveScreenshotInSavestatesMenuItem"; - this.SaveScreenshotInSavestatesMenuItem.Size = new System.Drawing.Size(229, 22); - this.SaveScreenshotInSavestatesMenuItem.Text = "Save Screenshot in Savestates"; - this.SaveScreenshotInSavestatesMenuItem.Click += new System.EventHandler(this.ScreenshotWithSavestatesMenuItem_Click); + this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem"; + this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates"; + this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click); // - // FrameAdvanceSkipLagMenuItem + // frameAdvanceSkipLagFramesToolStripMenuItem // - this.FrameAdvanceSkipLagMenuItem.Name = "FrameAdvanceSkipLagMenuItem"; - this.FrameAdvanceSkipLagMenuItem.Size = new System.Drawing.Size(229, 22); - this.FrameAdvanceSkipLagMenuItem.Text = "Frame Advance - Skip Lag"; - this.FrameAdvanceSkipLagMenuItem.Click += new System.EventHandler(this.frameAdvanceSkipLagFramesToolStripMenuItem_Click); + this.frameAdvanceSkipLagFramesToolStripMenuItem.Name = "frameAdvanceSkipLagFramesToolStripMenuItem"; + this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.frameAdvanceSkipLagFramesToolStripMenuItem.Text = "Frame Advance - Skip Lag Frames"; + this.frameAdvanceSkipLagFramesToolStripMenuItem.Click += new System.EventHandler(this.frameAdvanceSkipLagFramesToolStripMenuItem_Click); // - // BackupSaveramMenuItem + // backupSaveramToolStripMenuItem // - this.BackupSaveramMenuItem.Name = "BackupSaveramMenuItem"; - this.BackupSaveramMenuItem.Size = new System.Drawing.Size(229, 22); - this.BackupSaveramMenuItem.Text = "Backup Saveram"; - this.BackupSaveramMenuItem.Click += new System.EventHandler(this.BackupSaveramMenuItem_Click); + this.backupSaveramToolStripMenuItem.Name = "backupSaveramToolStripMenuItem"; + this.backupSaveramToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.backupSaveramToolStripMenuItem.Text = "Backup Saveram"; + this.backupSaveramToolStripMenuItem.Click += new System.EventHandler(this.backupSaveramToolStripMenuItem_Click); // - // GuiSubMenu + // gUIToolStripMenuItem // - this.GuiSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.PauseWhenMenuActivatedMenuItem, - this.StartPausedMenuItem, + this.gUIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.pauseWhenMenuActivatedToolStripMenuItem, + this.startPausedToolStripMenuItem, this.toolStripSeparator22, - this.SaveWindowPositionMenuItem, - this.ForceGDIMenuItem, - this.UseBilinearMenuItem, - this.SuppressGuiLayerMenuItem, - this.ShowMenuInFullScreenMenuItem, - this.RunInBackgroundMenuItem, - this.BackgroundInputMenuItem, - this.SingleInstanceModeMenuItem, - this.DontAskToSaveChangesMenuItem, + this.saveWindowPositionToolStripMenuItem, + this.forceGDIPPresentationToolStripMenuItem, + this.blurryToolStripMenuItem, + this.miSuppressGuiLayer, + this.showMenuInFullScreenToolStripMenuItem, + this.runInBackgroundToolStripMenuItem, + this.acceptBackgroundInputToolStripMenuItem, + this.singleInstanceModeToolStripMenuItem, + this.neverBeAskedToSaveChangesToolStripMenuItem, this.toolStripSeparator23, - this.LogWindowAsConsoleMenuItem}); - this.GuiSubMenu.Name = "GuiSubMenu"; - this.GuiSubMenu.Size = new System.Drawing.Size(152, 22); - this.GuiSubMenu.Text = "GUI"; - this.GuiSubMenu.DropDownOpened += new System.EventHandler(this.GuiSubMenu_DropDownOpened); + this.logWindowAsConsoleToolStripMenuItem}); + this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; + this.gUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.gUIToolStripMenuItem.Text = "GUI"; + this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); // - // PauseWhenMenuActivatedMenuItem + // pauseWhenMenuActivatedToolStripMenuItem // - this.PauseWhenMenuActivatedMenuItem.Name = "PauseWhenMenuActivatedMenuItem"; - this.PauseWhenMenuActivatedMenuItem.Size = new System.Drawing.Size(241, 22); - this.PauseWhenMenuActivatedMenuItem.Text = "Pause when menu activated"; - this.PauseWhenMenuActivatedMenuItem.Click += new System.EventHandler(this.PauseWhenMenuActivatedMenuItem_Click); + this.pauseWhenMenuActivatedToolStripMenuItem.Name = "pauseWhenMenuActivatedToolStripMenuItem"; + this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated"; + this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click); // - // StartPausedMenuItem + // startPausedToolStripMenuItem // - this.StartPausedMenuItem.Name = "StartPausedMenuItem"; - this.StartPausedMenuItem.Size = new System.Drawing.Size(241, 22); - this.StartPausedMenuItem.Text = "Start paused"; - this.StartPausedMenuItem.Click += new System.EventHandler(this.StartPausedMenuItem_Click); + this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem"; + this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.startPausedToolStripMenuItem.Text = "Start paused"; + this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click); // // toolStripSeparator22 // this.toolStripSeparator22.Name = "toolStripSeparator22"; this.toolStripSeparator22.Size = new System.Drawing.Size(238, 6); // - // SaveWindowPositionMenuItem + // saveWindowPositionToolStripMenuItem // - this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(241, 22); - this.SaveWindowPositionMenuItem.Text = "Save window position"; - this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); + this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.saveWindowPositionToolStripMenuItem.Text = "Save window position"; + this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); // - // ForceGDIMenuItem + // forceGDIPPresentationToolStripMenuItem // - this.ForceGDIMenuItem.Name = "ForceGDIMenuItem"; - this.ForceGDIMenuItem.Size = new System.Drawing.Size(241, 22); - this.ForceGDIMenuItem.Text = "Use GDI+ Display Method"; - this.ForceGDIMenuItem.Click += new System.EventHandler(this.UseGDIMenuItem_Click); + this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem"; + this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.forceGDIPPresentationToolStripMenuItem.Text = "Use GDI+ Display Method"; + this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click); // - // UseBilinearMenuItem + // blurryToolStripMenuItem // - this.UseBilinearMenuItem.Name = "UseBilinearMenuItem"; - this.UseBilinearMenuItem.Size = new System.Drawing.Size(241, 22); - this.UseBilinearMenuItem.Text = "Use Bilinear Filtering"; - this.UseBilinearMenuItem.Click += new System.EventHandler(this.UseBilinearMenuItem_Click); + this.blurryToolStripMenuItem.Name = "blurryToolStripMenuItem"; + this.blurryToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.blurryToolStripMenuItem.Text = "Use Bilinear Filtering"; + this.blurryToolStripMenuItem.Click += new System.EventHandler(this.blurryToolStripMenuItem_Click); // - // SuppressGuiLayerMenuItem + // miSuppressGuiLayer // - this.SuppressGuiLayerMenuItem.Name = "SuppressGuiLayerMenuItem"; - this.SuppressGuiLayerMenuItem.Size = new System.Drawing.Size(241, 22); - this.SuppressGuiLayerMenuItem.Text = "Suppress GUI Layer"; - this.SuppressGuiLayerMenuItem.Click += new System.EventHandler(this.SuppressGuiLayerMenuItem_Click); + this.miSuppressGuiLayer.Name = "miSuppressGuiLayer"; + this.miSuppressGuiLayer.Size = new System.Drawing.Size(241, 22); + this.miSuppressGuiLayer.Text = "Suppress GUI Layer"; + this.miSuppressGuiLayer.Click += new System.EventHandler(this.miSuppressGuiLayer_Click); // - // ShowMenuInFullScreenMenuItem + // showMenuInFullScreenToolStripMenuItem // - this.ShowMenuInFullScreenMenuItem.Name = "ShowMenuInFullScreenMenuItem"; - this.ShowMenuInFullScreenMenuItem.Size = new System.Drawing.Size(241, 22); - this.ShowMenuInFullScreenMenuItem.Text = "Show Menu in Full Screen"; - this.ShowMenuInFullScreenMenuItem.Click += new System.EventHandler(this.ShowMenuInFullScreenMenuItem_Click); + this.showMenuInFullScreenToolStripMenuItem.Name = "showMenuInFullScreenToolStripMenuItem"; + this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.showMenuInFullScreenToolStripMenuItem.Text = "Show Menu in Full Screen"; + this.showMenuInFullScreenToolStripMenuItem.Click += new System.EventHandler(this.showMenuInFullScreenToolStripMenuItem_Click); // - // RunInBackgroundMenuItem + // runInBackgroundToolStripMenuItem // - this.RunInBackgroundMenuItem.Name = "RunInBackgroundMenuItem"; - this.RunInBackgroundMenuItem.Size = new System.Drawing.Size(241, 22); - this.RunInBackgroundMenuItem.Text = "Run in Background"; - this.RunInBackgroundMenuItem.Click += new System.EventHandler(this.RunInBackgroundMenuItem_Click); + this.runInBackgroundToolStripMenuItem.Name = "runInBackgroundToolStripMenuItem"; + this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.runInBackgroundToolStripMenuItem.Text = "Run in Background"; + this.runInBackgroundToolStripMenuItem.Click += new System.EventHandler(this.runInBackgroundToolStripMenuItem_Click); // - // BackgroundInputMenuItem + // acceptBackgroundInputToolStripMenuItem // - this.BackgroundInputMenuItem.Name = "BackgroundInputMenuItem"; - this.BackgroundInputMenuItem.Size = new System.Drawing.Size(241, 22); - this.BackgroundInputMenuItem.Text = "Accept Background Input"; - this.BackgroundInputMenuItem.Click += new System.EventHandler(this.BackgroundInputMenuItem_Click); + this.acceptBackgroundInputToolStripMenuItem.Name = "acceptBackgroundInputToolStripMenuItem"; + this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input"; + this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click); // - // SingleInstanceModeMenuItem + // singleInstanceModeToolStripMenuItem // - this.SingleInstanceModeMenuItem.Name = "SingleInstanceModeMenuItem"; - this.SingleInstanceModeMenuItem.Size = new System.Drawing.Size(241, 22); - this.SingleInstanceModeMenuItem.Text = "Single Instance Mode"; - this.SingleInstanceModeMenuItem.Click += new System.EventHandler(this.SingleInstanceModeMenuItem_Click); + this.singleInstanceModeToolStripMenuItem.Name = "singleInstanceModeToolStripMenuItem"; + this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.singleInstanceModeToolStripMenuItem.Text = "Single Instance Mode"; + this.singleInstanceModeToolStripMenuItem.Click += new System.EventHandler(this.singleInstanceModeToolStripMenuItem_Click); // - // DontAskToSaveChangesMenuItem + // neverBeAskedToSaveChangesToolStripMenuItem // - this.DontAskToSaveChangesMenuItem.Name = "DontAskToSaveChangesMenuItem"; - this.DontAskToSaveChangesMenuItem.Size = new System.Drawing.Size(241, 22); - this.DontAskToSaveChangesMenuItem.Text = "Never be asked to save changes"; - this.DontAskToSaveChangesMenuItem.Click += new System.EventHandler(this.DontAskToSaveChangesMenuItem_Click); + this.neverBeAskedToSaveChangesToolStripMenuItem.Name = "neverBeAskedToSaveChangesToolStripMenuItem"; + this.neverBeAskedToSaveChangesToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.neverBeAskedToSaveChangesToolStripMenuItem.Text = "Never be asked to save changes"; + this.neverBeAskedToSaveChangesToolStripMenuItem.Click += new System.EventHandler(this.neverBeAskedToSaveChangesToolStripMenuItem_Click); // // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; this.toolStripSeparator23.Size = new System.Drawing.Size(238, 6); // - // LogWindowAsConsoleMenuItem + // logWindowAsConsoleToolStripMenuItem // - this.LogWindowAsConsoleMenuItem.Name = "LogWindowAsConsoleMenuItem"; - this.LogWindowAsConsoleMenuItem.Size = new System.Drawing.Size(241, 22); - this.LogWindowAsConsoleMenuItem.Text = "Log Window as Console"; - this.LogWindowAsConsoleMenuItem.Click += new System.EventHandler(this.LogWindowAsConsoleMenuItem_Click); + this.logWindowAsConsoleToolStripMenuItem.Name = "logWindowAsConsoleToolStripMenuItem"; + this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.logWindowAsConsoleToolStripMenuItem.Text = "Log Window as Console"; + this.logWindowAsConsoleToolStripMenuItem.Click += new System.EventHandler(this.logWindowAsConsoleToolStripMenuItem_Click); // - // SpeedSkipSubMenu + // frameSkipToolStripMenuItem // - this.SpeedSkipSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ClickThrottleMenuItem, - this.AudioThrottleMenuItem, - this.VsyncThrottleMenuItem, + this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.miLimitFramerate, + this.audioThrottleToolStripMenuItem, + this.miDisplayVsync, this.toolStripSeparator27, - this.VsyncEnabledMenuItem, + this.vSyncEnabledToolStripMenuItem, this.toolStripMenuItem3, - this.MinimizeSkippingMenuItem, - this.NeverSkipMenuItem, - this.Frameskip1MenuItem, - this.Frameskip2MenuItem, - this.Frameskip3MenuItem, - this.Frameskip4MenuItem, - this.Frameskip5MenuItem, - this.Frameskip6MenuItem, - this.Frameskip7MenuItem, - this.Frameskip8MenuItem, - this.Frameskip9MenuItem, + this.miAutoMinimizeSkipping, + this.miFrameskip0, + this.miFrameskip1, + this.miFrameskip2, + this.miFrameskip3, + this.miFrameskip4, + this.miFrameskip5, + this.miFrameskip6, + this.miFrameskip7, + this.miFrameskip8, + this.miFrameskip9, this.toolStripMenuItem5, - this.Speed50MenuItem, - this.Speed75MenuItem, - this.Speed100MenuItem, - this.Speed150MenuItem, - this.Speed200MenuItem}); - this.SpeedSkipSubMenu.Name = "SpeedSkipSubMenu"; - this.SpeedSkipSubMenu.Size = new System.Drawing.Size(152, 22); - this.SpeedSkipSubMenu.Text = "Speed/Skip"; - this.SpeedSkipSubMenu.DropDownOpened += new System.EventHandler(this.FrameSkipMenuItem_DropDownOpened); + this.miSpeed50, + this.miSpeed75, + this.miSpeed100, + this.miSpeed150, + this.miSpeed200}); + this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; + this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; + this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); // - // ClickThrottleMenuItem + // miLimitFramerate // - this.ClickThrottleMenuItem.Name = "ClickThrottleMenuItem"; - this.ClickThrottleMenuItem.Size = new System.Drawing.Size(202, 22); - this.ClickThrottleMenuItem.Text = "Clock Throttle"; - this.ClickThrottleMenuItem.Click += new System.EventHandler(this.ClickThrottleMenuItem_Click); + this.miLimitFramerate.Name = "miLimitFramerate"; + this.miLimitFramerate.Size = new System.Drawing.Size(202, 22); + this.miLimitFramerate.Text = "Clock Throttle"; + this.miLimitFramerate.DropDownOpened += new System.EventHandler(this.miLimitFramerate_DropDownOpened); + this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click); // - // AudioThrottleMenuItem + // audioThrottleToolStripMenuItem // - this.AudioThrottleMenuItem.Name = "AudioThrottleMenuItem"; - this.AudioThrottleMenuItem.Size = new System.Drawing.Size(202, 22); - this.AudioThrottleMenuItem.Text = "Audio Throttle"; - this.AudioThrottleMenuItem.Click += new System.EventHandler(this.AudioThrottleMenuItem_Click); + this.audioThrottleToolStripMenuItem.Name = "audioThrottleToolStripMenuItem"; + this.audioThrottleToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.audioThrottleToolStripMenuItem.Text = "Audio Throttle"; + this.audioThrottleToolStripMenuItem.Click += new System.EventHandler(this.audioThrottleToolStripMenuItem_Click); // - // VsyncThrottleMenuItem + // miDisplayVsync // - this.VsyncThrottleMenuItem.Name = "VsyncThrottleMenuItem"; - this.VsyncThrottleMenuItem.Size = new System.Drawing.Size(202, 22); - this.VsyncThrottleMenuItem.Text = "VSync Throttle"; - this.VsyncThrottleMenuItem.Click += new System.EventHandler(this.VsyncThrottleMenuItem_Click); + this.miDisplayVsync.Name = "miDisplayVsync"; + this.miDisplayVsync.Size = new System.Drawing.Size(202, 22); + this.miDisplayVsync.Text = "VSync Throttle"; + this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click); // // toolStripSeparator27 // this.toolStripSeparator27.Name = "toolStripSeparator27"; this.toolStripSeparator27.Size = new System.Drawing.Size(199, 6); // - // VsyncEnabledMenuItem + // vSyncEnabledToolStripMenuItem // - this.VsyncEnabledMenuItem.Name = "VsyncEnabledMenuItem"; - this.VsyncEnabledMenuItem.Size = new System.Drawing.Size(202, 22); - this.VsyncEnabledMenuItem.Text = "VSync Enabled"; - this.VsyncEnabledMenuItem.Click += new System.EventHandler(this.VsyncEnabledMenuItem_Click); + this.vSyncEnabledToolStripMenuItem.Name = "vSyncEnabledToolStripMenuItem"; + this.vSyncEnabledToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.vSyncEnabledToolStripMenuItem.Text = "VSync Enabled"; + this.vSyncEnabledToolStripMenuItem.Click += new System.EventHandler(this.vSyncEnabledToolStripMenuItem_Click); // // toolStripMenuItem3 // this.toolStripMenuItem3.Name = "toolStripMenuItem3"; this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6); // - // MinimizeSkippingMenuItem + // miAutoMinimizeSkipping // - this.MinimizeSkippingMenuItem.Name = "MinimizeSkippingMenuItem"; - this.MinimizeSkippingMenuItem.Size = new System.Drawing.Size(202, 22); - this.MinimizeSkippingMenuItem.Text = "Auto-minimize skipping"; - this.MinimizeSkippingMenuItem.Click += new System.EventHandler(this.MinimizeSkippingMenuItem_Click); + this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping"; + this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(202, 22); + this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping"; + this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click); // - // NeverSkipMenuItem + // miFrameskip0 // - this.NeverSkipMenuItem.Name = "NeverSkipMenuItem"; - this.NeverSkipMenuItem.Size = new System.Drawing.Size(202, 22); - this.NeverSkipMenuItem.Text = "0 (never skip)"; - this.NeverSkipMenuItem.Click += new System.EventHandler(this.NeverSkipMenuItem_Click); + this.miFrameskip0.Name = "miFrameskip0"; + this.miFrameskip0.Size = new System.Drawing.Size(202, 22); + this.miFrameskip0.Text = "0 (never skip)"; + this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click); // - // Frameskip1MenuItem + // miFrameskip1 // - this.Frameskip1MenuItem.Name = "Frameskip1MenuItem"; - this.Frameskip1MenuItem.Size = new System.Drawing.Size(202, 22); - this.Frameskip1MenuItem.Text = "1"; - this.Frameskip1MenuItem.Click += new System.EventHandler(this.Frameskip1MenuItem_Click); + this.miFrameskip1.Name = "miFrameskip1"; + this.miFrameskip1.Size = new System.Drawing.Size(202, 22); + this.miFrameskip1.Text = "1"; + this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click); // - // Frameskip2MenuItem + // miFrameskip2 // - this.Frameskip2MenuItem.Name = "Frameskip2MenuItem"; - this.Frameskip2MenuItem.Size = new System.Drawing.Size(202, 22); - this.Frameskip2MenuItem.Text = "2"; - this.Frameskip2MenuItem.Click += new System.EventHandler(this.Frameskip2MenuItem_Click); + this.miFrameskip2.Name = "miFrameskip2"; + this.miFrameskip2.Size = new System.Drawing.Size(202, 22); + this.miFrameskip2.Text = "2"; + this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click); // - // Frameskip3MenuItem + // miFrameskip3 // - this.Frameskip3MenuItem.Name = "Frameskip3MenuItem"; - this.Frameskip3MenuItem.Size = new System.Drawing.Size(202, 22); - this.Frameskip3MenuItem.Text = "3"; - this.Frameskip3MenuItem.Click += new System.EventHandler(this.Frameskip3MenuItem_Click); + this.miFrameskip3.Name = "miFrameskip3"; + this.miFrameskip3.Size = new System.Drawing.Size(202, 22); + this.miFrameskip3.Text = "3"; + this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click); // - // Frameskip4MenuItem + // miFrameskip4 // - this.Frameskip4MenuItem.Name = "Frameskip4MenuItem"; - this.Frameskip4MenuItem.Size = new System.Drawing.Size(202, 22); - this.Frameskip4MenuItem.Text = "4"; - this.Frameskip4MenuItem.Click += new System.EventHandler(this.Frameskip4MenuItem_Click); + this.miFrameskip4.Name = "miFrameskip4"; + this.miFrameskip4.Size = new System.Drawing.Size(202, 22); + this.miFrameskip4.Text = "4"; + this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click); // - // Frameskip5MenuItem + // miFrameskip5 // - this.Frameskip5MenuItem.Name = "Frameskip5MenuItem"; - this.Frameskip5MenuItem.Size = new System.Drawing.Size(202, 22); - this.Frameskip5MenuItem.Text = "5"; - this.Frameskip5MenuItem.Click += new System.EventHandler(this.Frameskip5MenuItem_Click); + this.miFrameskip5.Name = "miFrameskip5"; + this.miFrameskip5.Size = new System.Drawing.Size(202, 22); + this.miFrameskip5.Text = "5"; + this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click); // - // Frameskip6MenuItem + // miFrameskip6 // - this.Frameskip6MenuItem.Name = "Frameskip6MenuItem"; - this.Frameskip6MenuItem.Size = new System.Drawing.Size(202, 22); - this.Frameskip6MenuItem.Text = "6"; - this.Frameskip6MenuItem.Click += new System.EventHandler(this.Frameskip6MenuItem_Click); + this.miFrameskip6.Name = "miFrameskip6"; + this.miFrameskip6.Size = new System.Drawing.Size(202, 22); + this.miFrameskip6.Text = "6"; + this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click); // - // Frameskip7MenuItem + // miFrameskip7 // - this.Frameskip7MenuItem.Name = "Frameskip7MenuItem"; - this.Frameskip7MenuItem.Size = new System.Drawing.Size(202, 22); - this.Frameskip7MenuItem.Text = "7"; - this.Frameskip7MenuItem.Click += new System.EventHandler(this.Frameskip7MenuItem_Click); + this.miFrameskip7.Name = "miFrameskip7"; + this.miFrameskip7.Size = new System.Drawing.Size(202, 22); + this.miFrameskip7.Text = "7"; + this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click); // - // Frameskip8MenuItem + // miFrameskip8 // - this.Frameskip8MenuItem.Name = "Frameskip8MenuItem"; - this.Frameskip8MenuItem.Size = new System.Drawing.Size(202, 22); - this.Frameskip8MenuItem.Text = "8"; - this.Frameskip8MenuItem.Click += new System.EventHandler(this.Frameskip8MenuItem_Click); + this.miFrameskip8.Name = "miFrameskip8"; + this.miFrameskip8.Size = new System.Drawing.Size(202, 22); + this.miFrameskip8.Text = "8"; + this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click); // - // Frameskip9MenuItem + // miFrameskip9 // - this.Frameskip9MenuItem.Name = "Frameskip9MenuItem"; - this.Frameskip9MenuItem.Size = new System.Drawing.Size(202, 22); - this.Frameskip9MenuItem.Text = "9"; - this.Frameskip9MenuItem.Click += new System.EventHandler(this.Frameskip9MenuItem_Click); + this.miFrameskip9.Name = "miFrameskip9"; + this.miFrameskip9.Size = new System.Drawing.Size(202, 22); + this.miFrameskip9.Text = "9"; + this.miFrameskip9.Click += new System.EventHandler(this.miFrameskip9_Click); // // toolStripMenuItem5 // this.toolStripMenuItem5.Name = "toolStripMenuItem5"; this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); // - // Speed50MenuItem + // miSpeed50 // - this.Speed50MenuItem.Name = "Speed50MenuItem"; - this.Speed50MenuItem.Size = new System.Drawing.Size(202, 22); - this.Speed50MenuItem.Text = "Speed 50%"; - this.Speed50MenuItem.Click += new System.EventHandler(this.Speed50MenuItem_Click); + this.miSpeed50.Name = "miSpeed50"; + this.miSpeed50.Size = new System.Drawing.Size(202, 22); + this.miSpeed50.Text = "Speed 50%"; + this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click); // - // Speed75MenuItem + // miSpeed75 // - this.Speed75MenuItem.Name = "Speed75MenuItem"; - this.Speed75MenuItem.Size = new System.Drawing.Size(202, 22); - this.Speed75MenuItem.Text = "Speed 75%"; - this.Speed75MenuItem.Click += new System.EventHandler(this.Speed75MenuItem_Click); + this.miSpeed75.Name = "miSpeed75"; + this.miSpeed75.Size = new System.Drawing.Size(202, 22); + this.miSpeed75.Text = "Speed 75%"; + this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click); // - // Speed100MenuItem + // miSpeed100 // - this.Speed100MenuItem.Name = "Speed100MenuItem"; - this.Speed100MenuItem.Size = new System.Drawing.Size(202, 22); - this.Speed100MenuItem.Text = "Speed 100%"; - this.Speed100MenuItem.Click += new System.EventHandler(this.Speed100MenuItem_Click); + this.miSpeed100.Name = "miSpeed100"; + this.miSpeed100.Size = new System.Drawing.Size(202, 22); + this.miSpeed100.Text = "Speed 100%"; + this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click); // - // Speed150MenuItem + // miSpeed150 // - this.Speed150MenuItem.Name = "Speed150MenuItem"; - this.Speed150MenuItem.Size = new System.Drawing.Size(202, 22); - this.Speed150MenuItem.Text = "Speed 150%"; - this.Speed150MenuItem.Click += new System.EventHandler(this.Speed150MenuItem_Click); + this.miSpeed150.Name = "miSpeed150"; + this.miSpeed150.Size = new System.Drawing.Size(202, 22); + this.miSpeed150.Text = "Speed 150%"; + this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click); // - // Speed200MenuItem + // miSpeed200 // - this.Speed200MenuItem.Name = "Speed200MenuItem"; - this.Speed200MenuItem.Size = new System.Drawing.Size(202, 22); - this.Speed200MenuItem.Text = "Speed 200%"; - this.Speed200MenuItem.Click += new System.EventHandler(this.Speed200MenuItem_Click); + this.miSpeed200.Name = "miSpeed200"; + this.miSpeed200.Size = new System.Drawing.Size(202, 22); + this.miSpeed200.Text = "Speed 200%"; + this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click); // - // KeyPrioritySubMenu + // keyPriorityToolStripMenuItem // - this.KeyPrioritySubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.BothHkAndControllerMenuItem, - this.InputOverHkMenuItem, - this.HkOverInputMenuItem}); - this.KeyPrioritySubMenu.Name = "KeyPrioritySubMenu"; - this.KeyPrioritySubMenu.Size = new System.Drawing.Size(152, 22); - this.KeyPrioritySubMenu.Text = "Key Priority"; - this.KeyPrioritySubMenu.DropDownOpened += new System.EventHandler(this.KeyPriorityMenuItem_DropDownOpened); + this.keyPriorityToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.bothHotkeysAndControllersToolStripMenuItem, + this.inputOverridesHotkeysToolStripMenuItem, + this.hotkeysOverrideInputToolStripMenuItem}); + this.keyPriorityToolStripMenuItem.Name = "keyPriorityToolStripMenuItem"; + this.keyPriorityToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.keyPriorityToolStripMenuItem.Text = "Key Priority"; + this.keyPriorityToolStripMenuItem.DropDownOpened += new System.EventHandler(this.keyPriorityToolStripMenuItem_DropDownOpened); // - // BothHkAndControllerMenuItem + // bothHotkeysAndControllersToolStripMenuItem // - this.BothHkAndControllerMenuItem.Name = "BothHkAndControllerMenuItem"; - this.BothHkAndControllerMenuItem.Size = new System.Drawing.Size(229, 22); - this.BothHkAndControllerMenuItem.Text = "Both Hotkeys and Controllers"; - this.BothHkAndControllerMenuItem.Click += new System.EventHandler(this.BothHkAndControllerMenuItem_Click); + this.bothHotkeysAndControllersToolStripMenuItem.Name = "bothHotkeysAndControllersToolStripMenuItem"; + this.bothHotkeysAndControllersToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.bothHotkeysAndControllersToolStripMenuItem.Text = "Both Hotkeys and Controllers"; + this.bothHotkeysAndControllersToolStripMenuItem.Click += new System.EventHandler(this.bothHotkeysAndControllersToolStripMenuItem_Click); // - // InputOverHkMenuItem + // inputOverridesHotkeysToolStripMenuItem // - this.InputOverHkMenuItem.Name = "InputOverHkMenuItem"; - this.InputOverHkMenuItem.Size = new System.Drawing.Size(229, 22); - this.InputOverHkMenuItem.Text = "Input overrides Hotkeys"; - this.InputOverHkMenuItem.Click += new System.EventHandler(this.InputOverHkMenuItem_Click); + this.inputOverridesHotkeysToolStripMenuItem.Name = "inputOverridesHotkeysToolStripMenuItem"; + this.inputOverridesHotkeysToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.inputOverridesHotkeysToolStripMenuItem.Text = "Input overrides Hotkeys"; + this.inputOverridesHotkeysToolStripMenuItem.Click += new System.EventHandler(this.inputOverridesHotkeysToolStripMenuItem_Click); // - // HkOverInputMenuItem + // hotkeysOverrideInputToolStripMenuItem // - this.HkOverInputMenuItem.Name = "HkOverInputMenuItem"; - this.HkOverInputMenuItem.Size = new System.Drawing.Size(229, 22); - this.HkOverInputMenuItem.Text = "Hotkeys override Input"; - this.HkOverInputMenuItem.Click += new System.EventHandler(this.HkOverInputMenuItem_Click); + this.hotkeysOverrideInputToolStripMenuItem.Name = "hotkeysOverrideInputToolStripMenuItem"; + this.hotkeysOverrideInputToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.hotkeysOverrideInputToolStripMenuItem.Text = "Hotkeys override Input"; + this.hotkeysOverrideInputToolStripMenuItem.Click += new System.EventHandler(this.hotkeysOverrideInputToolStripMenuItem_Click); // - // SavestateTypeSubMenu + // savestateTypeToolStripMenuItem // - this.SavestateTypeSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.SavestateTypeDefaultMenuItem, - this.SavestateBinaryMenuItem, - this.SavestateTextMenuItem}); - this.SavestateTypeSubMenu.Name = "SavestateTypeSubMenu"; - this.SavestateTypeSubMenu.Size = new System.Drawing.Size(152, 22); - this.SavestateTypeSubMenu.Text = "Savestate Type"; - this.SavestateTypeSubMenu.DropDownOpened += new System.EventHandler(this.SavestateTypeMenuItem_DropDownOpened); + this.savestateTypeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.defaultToolStripMenuItem, + this.binaryToolStripMenuItem, + this.textToolStripMenuItem}); + this.savestateTypeToolStripMenuItem.Name = "savestateTypeToolStripMenuItem"; + this.savestateTypeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.savestateTypeToolStripMenuItem.Text = "Savestate Type"; + this.savestateTypeToolStripMenuItem.DropDownOpened += new System.EventHandler(this.savestateTypeToolStripMenuItem_DropDownOpened); // - // SavestateTypeDefaultMenuItem + // defaultToolStripMenuItem // - this.SavestateTypeDefaultMenuItem.Name = "SavestateTypeDefaultMenuItem"; - this.SavestateTypeDefaultMenuItem.Size = new System.Drawing.Size(112, 22); - this.SavestateTypeDefaultMenuItem.Text = "Default"; - this.SavestateTypeDefaultMenuItem.Click += new System.EventHandler(this.SavestateTypeDefaultMenuItem_Click); + this.defaultToolStripMenuItem.Name = "defaultToolStripMenuItem"; + this.defaultToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.defaultToolStripMenuItem.Text = "Default"; + this.defaultToolStripMenuItem.Click += new System.EventHandler(this.defaultToolStripMenuItem_Click); // - // SavestateBinaryMenuItem + // binaryToolStripMenuItem // - this.SavestateBinaryMenuItem.Name = "SavestateBinaryMenuItem"; - this.SavestateBinaryMenuItem.Size = new System.Drawing.Size(112, 22); - this.SavestateBinaryMenuItem.Text = "Binary"; - this.SavestateBinaryMenuItem.Click += new System.EventHandler(this.SavestateBinaryMenuItem_Click); + this.binaryToolStripMenuItem.Name = "binaryToolStripMenuItem"; + this.binaryToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.binaryToolStripMenuItem.Text = "Binary"; + this.binaryToolStripMenuItem.Click += new System.EventHandler(this.binaryToolStripMenuItem_Click); // - // SavestateTextMenuItem + // textToolStripMenuItem // - this.SavestateTextMenuItem.Name = "SavestateTextMenuItem"; - this.SavestateTextMenuItem.Size = new System.Drawing.Size(112, 22); - this.SavestateTextMenuItem.Text = "Text"; - this.SavestateTextMenuItem.Click += new System.EventHandler(this.SavestateTextMenuItem_Click); + this.textToolStripMenuItem.Name = "textToolStripMenuItem"; + this.textToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.textToolStripMenuItem.Text = "Text"; + this.textToolStripMenuItem.Click += new System.EventHandler(this.textToolStripMenuItem_Click); // // toolStripSeparator10 // this.toolStripSeparator10.Name = "toolStripSeparator10"; this.toolStripSeparator10.Size = new System.Drawing.Size(149, 6); // - // SaveConfigMenuItem + // saveConfigToolStripMenuItem // - this.SaveConfigMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save; - this.SaveConfigMenuItem.Name = "SaveConfigMenuItem"; - this.SaveConfigMenuItem.Size = new System.Drawing.Size(152, 22); - this.SaveConfigMenuItem.Text = "Save Config"; - this.SaveConfigMenuItem.Click += new System.EventHandler(this.SaveConfigMenuItem_Click); + this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save; + this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; + this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveConfigToolStripMenuItem.Text = "Save Config"; + this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); // - // LoadConfigMenuItem + // loadConfigToolStripMenuItem // - this.LoadConfigMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; - this.LoadConfigMenuItem.Name = "LoadConfigMenuItem"; - this.LoadConfigMenuItem.Size = new System.Drawing.Size(152, 22); - this.LoadConfigMenuItem.Text = "Load Config"; - this.LoadConfigMenuItem.Click += new System.EventHandler(this.LoadConfigMenuItem_Click); + this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; + this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; + this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.loadConfigToolStripMenuItem.Text = "Load Config"; + this.loadConfigToolStripMenuItem.Click += new System.EventHandler(this.loadConfigToolStripMenuItem_Click); // // toolsToolStripMenuItem // this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ToolBoxMenuItem, + this.toolBoxToolStripMenuItem, this.toolStripSeparator12, - this.RamWatchMenuItem, - this.RamSearchMenuItem, - this.HexEditorMenuItem, - this.TraceLoggerMenuItem, - this.TAStudioMenuItem, - this.VirtualPadMenuItem, + this.rAMWatchToolStripMenuItem, + this.rAMSearchToolStripMenuItem, + this.hexEditorToolStripMenuItem, + this.traceLoggerToolStripMenuItem, + this.tAStudioToolStripMenuItem, + this.virtualPadToolStripMenuItem, this.toolStripSeparator11, - this.CheatsMenuItem, - this.LuaConsoleMenuItem, + this.luaConsoleToolStripMenuItem, + this.cheatsToolStripMenuItem, this.toolStripSeparator29, - this.CreateDualGbXmlMenuItem}); + this.createDualGBXMLToolStripMenuItem}); this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); this.toolsToolStripMenuItem.Text = "&Tools"; this.toolsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpened); // - // ToolBoxMenuItem + // toolBoxToolStripMenuItem // - this.ToolBoxMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; - this.ToolBoxMenuItem.Name = "ToolBoxMenuItem"; - this.ToolBoxMenuItem.Size = new System.Drawing.Size(189, 22); - this.ToolBoxMenuItem.Text = "&Tool Box"; - this.ToolBoxMenuItem.Click += new System.EventHandler(this.ToolBoxMenuItem_Click); + this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; + this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.toolBoxToolStripMenuItem.Text = "&Tool Box"; + this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); // // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Size = new System.Drawing.Size(186, 6); // - // RamWatchMenuItem + // rAMWatchToolStripMenuItem // - this.RamWatchMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.watch; - this.RamWatchMenuItem.Name = "RamWatchMenuItem"; - this.RamWatchMenuItem.Size = new System.Drawing.Size(189, 22); - this.RamWatchMenuItem.Text = "RAM &Watch"; - this.RamWatchMenuItem.Click += new System.EventHandler(this.RamWatchMenuItem_Click); + this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.watch; + this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; + this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); // - // RamSearchMenuItem + // rAMSearchToolStripMenuItem // - this.RamSearchMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; - this.RamSearchMenuItem.Name = "RamSearchMenuItem"; - this.RamSearchMenuItem.Size = new System.Drawing.Size(189, 22); - this.RamSearchMenuItem.Text = "RAM &Search"; - this.RamSearchMenuItem.Click += new System.EventHandler(this.RamSearchMenuItem_Click); + this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; + this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; + this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); // - // HexEditorMenuItem + // hexEditorToolStripMenuItem // - this.HexEditorMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; - this.HexEditorMenuItem.Name = "HexEditorMenuItem"; - this.HexEditorMenuItem.Size = new System.Drawing.Size(189, 22); - this.HexEditorMenuItem.Text = "&Hex Editor"; - this.HexEditorMenuItem.Click += new System.EventHandler(this.HexEditorMenuItem_Click); + this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; + this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); // - // TraceLoggerMenuItem + // traceLoggerToolStripMenuItem // - this.TraceLoggerMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; - this.TraceLoggerMenuItem.Name = "TraceLoggerMenuItem"; - this.TraceLoggerMenuItem.Size = new System.Drawing.Size(189, 22); - this.TraceLoggerMenuItem.Text = "Trace &Logger"; - this.TraceLoggerMenuItem.Click += new System.EventHandler(this.TraceLoggerMenuItem_Click); + this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; + this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; + this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; + this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); // - // TAStudioMenuItem + // tAStudioToolStripMenuItem // - this.TAStudioMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; - this.TAStudioMenuItem.Name = "TAStudioMenuItem"; - this.TAStudioMenuItem.Size = new System.Drawing.Size(189, 22); - this.TAStudioMenuItem.Text = "&TAStudio"; - this.TAStudioMenuItem.Click += new System.EventHandler(this.TAStudioMenuItem_Click); + this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; + this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; + this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.tAStudioToolStripMenuItem.Text = "&TAStudio"; + this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); // - // VirtualPadMenuItem + // virtualPadToolStripMenuItem // - this.VirtualPadMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; - this.VirtualPadMenuItem.Name = "VirtualPadMenuItem"; - this.VirtualPadMenuItem.Size = new System.Drawing.Size(189, 22); - this.VirtualPadMenuItem.Text = "Virtual Pad"; - this.VirtualPadMenuItem.Click += new System.EventHandler(this.VirtualPadMenuItem_Click); + this.virtualPadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; + this.virtualPadToolStripMenuItem.Name = "virtualPadToolStripMenuItem"; + this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.virtualPadToolStripMenuItem.Text = "Virtual Pad"; + this.virtualPadToolStripMenuItem.Click += new System.EventHandler(this.virtualPadToolStripMenuItem_Click); // // toolStripSeparator11 // this.toolStripSeparator11.Name = "toolStripSeparator11"; this.toolStripSeparator11.Size = new System.Drawing.Size(186, 6); // - // LuaConsoleMenuItem + // luaConsoleToolStripMenuItem // - this.LuaConsoleMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; - this.LuaConsoleMenuItem.Name = "LuaConsoleMenuItem"; - this.LuaConsoleMenuItem.Size = new System.Drawing.Size(189, 22); - this.LuaConsoleMenuItem.Text = "Lua Console"; - this.LuaConsoleMenuItem.Click += new System.EventHandler(this.LuaConsoleMenuItem_Click); + this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; + this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.luaConsoleToolStripMenuItem.Text = "Lua Console"; + this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); // - // CheatsMenuItem + // cheatsToolStripMenuItem // - this.CheatsMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; - this.CheatsMenuItem.Name = "CheatsMenuItem"; - this.CheatsMenuItem.Size = new System.Drawing.Size(189, 22); - this.CheatsMenuItem.Text = "Cheats"; - this.CheatsMenuItem.Click += new System.EventHandler(this.CheatsMenuItem_Click); + this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.cheatsToolStripMenuItem.Text = "Cheats"; + this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); // // toolStripSeparator29 // this.toolStripSeparator29.Name = "toolStripSeparator29"; this.toolStripSeparator29.Size = new System.Drawing.Size(186, 6); // - // CreateDualGbXmlMenuItem + // createDualGBXMLToolStripMenuItem // - this.CreateDualGbXmlMenuItem.Name = "CreateDualGbXmlMenuItem"; - this.CreateDualGbXmlMenuItem.Size = new System.Drawing.Size(189, 22); - this.CreateDualGbXmlMenuItem.Text = "Create Dual GB XML..."; - this.CreateDualGbXmlMenuItem.Click += new System.EventHandler(this.CreateDualGbXmlMenuItem_Click); + this.createDualGBXMLToolStripMenuItem.Name = "createDualGBXMLToolStripMenuItem"; + this.createDualGBXMLToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.createDualGBXMLToolStripMenuItem.Text = "Create Dual GB XML..."; + this.createDualGBXMLToolStripMenuItem.Click += new System.EventHandler(this.createDualGBXMLToolStripMenuItem_Click); // // NESToolStripMenuItem // @@ -2910,23 +2909,23 @@ // this.controllersToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; this.controllersToolStripMenuItem1.Name = "controllersToolStripMenuItem1"; - this.controllersToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.controllersToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); this.controllersToolStripMenuItem1.Text = "&Controllers..."; - this.controllersToolStripMenuItem1.Click += new System.EventHandler(this.ControllersMenuItem_Click); + this.controllersToolStripMenuItem1.Click += new System.EventHandler(this.controllersToolStripMenuItem1_Click); // // hotkeysToolStripMenuItem1 // this.hotkeysToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; this.hotkeysToolStripMenuItem1.Name = "hotkeysToolStripMenuItem1"; - this.hotkeysToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.hotkeysToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); this.hotkeysToolStripMenuItem1.Text = "&Hotkeys..."; - this.hotkeysToolStripMenuItem1.Click += new System.EventHandler(this.HotkeysMenuItem_Click); + this.hotkeysToolStripMenuItem1.Click += new System.EventHandler(this.hotkeysToolStripMenuItem1_Click); // // messagesToolStripMenuItem1 // this.messagesToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; this.messagesToolStripMenuItem1.Name = "messagesToolStripMenuItem1"; - this.messagesToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.messagesToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); this.messagesToolStripMenuItem1.Text = "&Messages..."; this.messagesToolStripMenuItem1.Click += new System.EventHandler(this.messagesToolStripMenuItem1_Click); // @@ -2934,7 +2933,7 @@ // this.pathsToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; this.pathsToolStripMenuItem1.Name = "pathsToolStripMenuItem1"; - this.pathsToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.pathsToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); this.pathsToolStripMenuItem1.Text = "Paths..."; this.pathsToolStripMenuItem1.Click += new System.EventHandler(this.pathsToolStripMenuItem1_Click); // @@ -2942,15 +2941,15 @@ // this.soundToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; this.soundToolStripMenuItem1.Name = "soundToolStripMenuItem1"; - this.soundToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.soundToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); this.soundToolStripMenuItem1.Text = "&Sound..."; - this.soundToolStripMenuItem1.Click += new System.EventHandler(this.SoundMenuItem_Click); + this.soundToolStripMenuItem1.Click += new System.EventHandler(this.soundToolStripMenuItem1_Click); // // autofireToolStripMenuItem1 // this.autofireToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; this.autofireToolStripMenuItem1.Name = "autofireToolStripMenuItem1"; - this.autofireToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.autofireToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); this.autofireToolStripMenuItem1.Text = "&Autofire..."; this.autofireToolStripMenuItem1.Click += new System.EventHandler(this.autofireToolStripMenuItem1_Click); // @@ -2958,37 +2957,9 @@ // this.rewindToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; this.rewindToolStripMenuItem.Name = "rewindToolStripMenuItem"; - this.rewindToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.rewindToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.rewindToolStripMenuItem.Text = "&Rewind"; - this.rewindToolStripMenuItem.Click += new System.EventHandler(this.RewindOptionsMenuItem_Click); - // - // firmwaresToolStripMenuItem1 - // - this.firmwaresToolStripMenuItem1.Name = "firmwaresToolStripMenuItem1"; - this.firmwaresToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); - this.firmwaresToolStripMenuItem1.Text = "&Firmwares"; - this.firmwaresToolStripMenuItem1.Click += new System.EventHandler(this.FirmwaresMenuItem_Click); - // - // toolStripSeparator30 - // - this.toolStripSeparator30.Name = "toolStripSeparator30"; - this.toolStripSeparator30.Size = new System.Drawing.Size(138, 6); - // - // toolStripMenuItem6 - // - this.toolStripMenuItem6.Image = global::BizHawk.MultiClient.Properties.Resources.Save; - this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(141, 22); - this.toolStripMenuItem6.Text = "Save Config"; - this.toolStripMenuItem6.Click += new System.EventHandler(this.SaveConfigMenuItem_Click); - // - // toolStripMenuItem7 - // - this.toolStripMenuItem7.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; - this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(141, 22); - this.toolStripMenuItem7.Text = "Load Config"; - this.toolStripMenuItem7.Click += new System.EventHandler(this.LoadConfigMenuItem_Click); + this.rewindToolStripMenuItem.Click += new System.EventHandler(this.rewindOptionsToolStripMenuItem_Click); // // cmiScreenshot // @@ -3037,15 +3008,43 @@ this.cmiShowMenu.Text = "Show Menu"; this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); // + // firmwaresToolStripMenuItem1 + // + this.firmwaresToolStripMenuItem1.Name = "firmwaresToolStripMenuItem1"; + this.firmwaresToolStripMenuItem1.Size = new System.Drawing.Size(152, 22); + this.firmwaresToolStripMenuItem1.Text = "&Firmwares"; + this.firmwaresToolStripMenuItem1.Click += new System.EventHandler(this.firmwaresToolStripMenuItem_Click); + // + // toolStripSeparator30 + // + this.toolStripSeparator30.Name = "toolStripSeparator30"; + this.toolStripSeparator30.Size = new System.Drawing.Size(149, 6); + // + // toolStripMenuItem6 + // + this.toolStripMenuItem6.Image = global::BizHawk.MultiClient.Properties.Resources.Save; + this.toolStripMenuItem6.Name = "toolStripMenuItem6"; + this.toolStripMenuItem6.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem6.Text = "Save Config"; + this.toolStripMenuItem6.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); + // + // toolStripMenuItem7 + // + this.toolStripMenuItem7.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; + this.toolStripMenuItem7.Name = "toolStripMenuItem7"; + this.toolStripMenuItem7.Size = new System.Drawing.Size(152, 22); + this.toolStripMenuItem7.Text = "Load Config"; + this.toolStripMenuItem7.Click += new System.EventHandler(this.loadConfigToolStripMenuItem_Click); + // // MainForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(470, 408); this.Controls.Add(this.StatusSlot0); - this.Controls.Add(this.MainformMenu); + this.Controls.Add(this.menuStrip1); this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.MainMenuStrip = this.MainformMenu; + this.MainMenuStrip = this.menuStrip1; this.Name = "MainForm"; this.Text = "BizHawk"; this.Activated += new System.EventHandler(this.MainForm_Activated); @@ -3055,8 +3054,8 @@ this.Enter += new System.EventHandler(this.MainForm_Enter); this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseClick); this.Resize += new System.EventHandler(this.MainForm_Resize); - this.MainformMenu.ResumeLayout(false); - this.MainformMenu.PerformLayout(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); this.StatusSlot0.ResumeLayout(false); this.StatusSlot0.PerformLayout(); this.contextMenuStrip1.ResumeLayout(false); @@ -3067,155 +3066,155 @@ #endregion - private System.Windows.Forms.ToolStripMenuItem FileSubMenu; - private System.Windows.Forms.ToolStripMenuItem OpenRomMenuItem; + private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem openROMToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem ExitMenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveStateSubMenu; - private System.Windows.Forms.ToolStripMenuItem SaveState1MenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveState2MenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveState3MenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveState4MenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveState5MenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveState6MenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveState7MenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveState8MenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveState9MenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveState0MenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadStateSubMenu; + private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveStateToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate1toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate2toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate3toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate4toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate5toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate6toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate7toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate8toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate9toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestate0toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadStateToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; - private System.Windows.Forms.ToolStripMenuItem LoadState1MenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadState2MenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadState3MenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadState4MenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadState5MenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadState6MenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadState7MenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadState8MenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadState9MenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadState0MenuItem; - private System.Windows.Forms.ToolStripMenuItem EmulationSubMenu; - private System.Windows.Forms.ToolStripMenuItem ViewSubMenu; - private System.Windows.Forms.ToolStripMenuItem ConfigSubMenu; + private System.Windows.Forms.ToolStripMenuItem loadstate1toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate2toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate3toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate4toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate5toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate6toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate7toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate8toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate9toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadstate0toolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem emulationToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem configToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem toolsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem PauseMenuItem; + private System.Windows.Forms.ToolStripMenuItem pauseToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private System.Windows.Forms.ToolStripMenuItem RebootCoreMenuItem; - private System.Windows.Forms.ToolStripMenuItem SoftResetMenuItem; + private System.Windows.Forms.ToolStripMenuItem rebootCoreToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem resetToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem ControllersMenuItem; - private System.Windows.Forms.ToolStripMenuItem HotkeysMenuItem; - private System.Windows.Forms.ToolStripMenuItem RamWatchMenuItem; - private System.Windows.Forms.ToolStripMenuItem RamSearchMenuItem; - private System.Windows.Forms.ToolStripMenuItem HexEditorMenuItem; - private System.Windows.Forms.ToolStripMenuItem WindowSizeSubMenu; + private System.Windows.Forms.ToolStripMenuItem controllersToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem hotkeysToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem rAMWatchToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem rAMSearchToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem hexEditorToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem windowSizeMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private System.Windows.Forms.ToolStripMenuItem DisplayFPSMenuItem; - private System.Windows.Forms.ToolStripMenuItem DisplayFrameCounterMenuItem; - private System.Windows.Forms.ToolStripMenuItem DisplayInputMenuItem; - private System.Windows.Forms.ToolStripMenuItem DisplayLagCounterMenuItem; - private System.Windows.Forms.ToolStripMenuItem LuaConsoleMenuItem; - private System.Windows.Forms.ToolStripMenuItem RecentRomSubMenu; + private System.Windows.Forms.ToolStripMenuItem displayFPSToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayFrameCounterToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayInputToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayLagCounterToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem luaConsoleToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem recentROMToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.ToolStripMenuItem SaveSlotSubMenu; - private System.Windows.Forms.ToolStripMenuItem SelectSlot1MenuItem; - private System.Windows.Forms.ToolStripMenuItem SelectSlot2MenuItem; - private System.Windows.Forms.ToolStripMenuItem SelectSlot3MenuItem; - private System.Windows.Forms.ToolStripMenuItem SelectSlot4MenuItem; - private System.Windows.Forms.ToolStripMenuItem SelectSlot5MenuItem; - private System.Windows.Forms.ToolStripMenuItem SelectSlot6MenuItem; - private System.Windows.Forms.ToolStripMenuItem SelectSlot7MenuItem; - private System.Windows.Forms.ToolStripMenuItem SelectSlot8MenuItem; - private System.Windows.Forms.ToolStripMenuItem SelectSlot9MenuItem; - private System.Windows.Forms.ToolStripMenuItem SelectSlot0MenuItem; - private System.Windows.Forms.ToolStripMenuItem PreviousSlotMenuItem; - private System.Windows.Forms.ToolStripMenuItem NextSlotMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveSlotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot1ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot2ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot3ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot4ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot5ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot6ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot7ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot8ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot9ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem selectSlot10ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem previousSlotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem nextSlotToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator5; - private System.Windows.Forms.ToolStripMenuItem SaveToCurrentSlotMenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadCurrentSlotMenuItem; - private System.Windows.Forms.ToolStripMenuItem CloseRomMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveToCurrentSlotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadCurrentSlotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem closeROMToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; - private System.Windows.Forms.ToolStripMenuItem SaveNamedStateMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveNamedStateToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator7; - private System.Windows.Forms.ToolStripMenuItem LoadNamedStateMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadNamedStateToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem x1MenuItem; private System.Windows.Forms.ToolStripMenuItem x2MenuItem; private System.Windows.Forms.ToolStripMenuItem x3MenuItem; private System.Windows.Forms.ToolStripMenuItem x4MenuItem; private System.Windows.Forms.ToolStripMenuItem x5MenuItem; private System.Windows.Forms.ToolStripMenuItem mzMenuItem; - private System.Windows.Forms.ToolStripMenuItem MovieSubMenu; - private System.Windows.Forms.ToolStripMenuItem RecentMenuItem; - private System.Windows.Forms.ToolStripMenuItem RecordMovieMenuItem; - private System.Windows.Forms.ToolStripMenuItem PlayMovieMenuItem; - private System.Windows.Forms.ToolStripMenuItem StopMovieMenuItem; - private System.Windows.Forms.ToolStripMenuItem PlayFromBeginningMenuItem; + private System.Windows.Forms.ToolStripMenuItem movieToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem recordMovieToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem playMovieToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem stopMovieToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem playFromBeginningToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator9; - private System.Windows.Forms.ToolStripMenuItem GuiSubMenu; - private System.Windows.Forms.ToolStripMenuItem PauseWhenMenuActivatedMenuItem; - private System.Windows.Forms.ToolStripMenuItem SoundMenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveWindowPositionMenuItem; - private System.Windows.Forms.ToolStripMenuItem StartPausedMenuItem; - private System.Windows.Forms.ToolStripMenuItem SpeedSkipSubMenu; - private System.Windows.Forms.ToolStripMenuItem VsyncThrottleMenuItem; + private System.Windows.Forms.ToolStripMenuItem gUIToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem pauseWhenMenuActivatedToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem soundToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem startPausedToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem frameSkipToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem miDisplayVsync; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; - private System.Windows.Forms.ToolStripMenuItem MinimizeSkippingMenuItem; - private System.Windows.Forms.ToolStripMenuItem NeverSkipMenuItem; - private System.Windows.Forms.ToolStripMenuItem Frameskip1MenuItem; - private System.Windows.Forms.ToolStripMenuItem Frameskip2MenuItem; - private System.Windows.Forms.ToolStripMenuItem Frameskip3MenuItem; - private System.Windows.Forms.ToolStripMenuItem Frameskip4MenuItem; - private System.Windows.Forms.ToolStripMenuItem Frameskip5MenuItem; - private System.Windows.Forms.ToolStripMenuItem Frameskip6MenuItem; - private System.Windows.Forms.ToolStripMenuItem Frameskip7MenuItem; - private System.Windows.Forms.ToolStripMenuItem Frameskip8MenuItem; - private System.Windows.Forms.ToolStripMenuItem Frameskip9MenuItem; + private System.Windows.Forms.ToolStripMenuItem miAutoMinimizeSkipping; + private System.Windows.Forms.ToolStripMenuItem miFrameskip0; + private System.Windows.Forms.ToolStripMenuItem miFrameskip1; + private System.Windows.Forms.ToolStripMenuItem miFrameskip2; + private System.Windows.Forms.ToolStripMenuItem miFrameskip3; + private System.Windows.Forms.ToolStripMenuItem miFrameskip4; + private System.Windows.Forms.ToolStripMenuItem miFrameskip5; + private System.Windows.Forms.ToolStripMenuItem miFrameskip6; + private System.Windows.Forms.ToolStripMenuItem miFrameskip7; + private System.Windows.Forms.ToolStripMenuItem miFrameskip8; + private System.Windows.Forms.ToolStripMenuItem miFrameskip9; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem5; - private System.Windows.Forms.ToolStripMenuItem Speed50MenuItem; - private System.Windows.Forms.ToolStripMenuItem Speed75MenuItem; - private System.Windows.Forms.ToolStripMenuItem Speed100MenuItem; - private System.Windows.Forms.ToolStripMenuItem Speed150MenuItem; - private System.Windows.Forms.ToolStripMenuItem Speed200MenuItem; - private System.Windows.Forms.ToolStripMenuItem ClickThrottleMenuItem; + private System.Windows.Forms.ToolStripMenuItem miSpeed50; + private System.Windows.Forms.ToolStripMenuItem miSpeed75; + private System.Windows.Forms.ToolStripMenuItem miSpeed100; + private System.Windows.Forms.ToolStripMenuItem miSpeed150; + private System.Windows.Forms.ToolStripMenuItem miSpeed200; + private System.Windows.Forms.ToolStripMenuItem miLimitFramerate; private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; - private System.Windows.Forms.ToolStripMenuItem SaveConfigMenuItem; - private System.Windows.Forms.ToolStripMenuItem LoadConfigMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveConfigToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadConfigToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem NESToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem pPUViewerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem gameGenieCodesToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; - private System.Windows.Forms.ToolStripMenuItem CheatsMenuItem; - private System.Windows.Forms.ToolStripMenuItem ForceGDIMenuItem; + private System.Windows.Forms.ToolStripMenuItem cheatsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem forceGDIPPresentationToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem debuggerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem nametableViewerToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem ToolBoxMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolBoxToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator12; - private System.Windows.Forms.ToolStripMenuItem SwitchToFullscreenMenuItem; + private System.Windows.Forms.ToolStripMenuItem switchToFullscreenToolStripMenuItem; private System.Windows.Forms.StatusStrip StatusSlot0; private System.Windows.Forms.ToolStripStatusLabel EmuStatus; - private System.Windows.Forms.ToolStripMenuItem MessagesMenuItem; + private System.Windows.Forms.ToolStripMenuItem messagesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem tI83ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem autoloadVirtualKeyboardToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem keypadToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator13; - private System.Windows.Forms.ToolStripMenuItem PathsMenuItem; + private System.Windows.Forms.ToolStripMenuItem pathsToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator14; - private System.Windows.Forms.ToolStripMenuItem ReadonlyMenuItem; + private System.Windows.Forms.ToolStripMenuItem readonlyToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator15; private System.Windows.Forms.ToolStripSeparator toolStripSeparator16; - private System.Windows.Forms.ToolStripMenuItem DisplayRerecordCountMenuItem; - private System.Windows.Forms.ToolStripMenuItem ScreenshotSubMenu; - private System.Windows.Forms.ToolStripMenuItem ScreenshotMenuItem; - private System.Windows.Forms.ToolStripMenuItem ScreenshotAsMenuItem; - private System.Windows.Forms.ToolStripMenuItem RunInBackgroundMenuItem; - private System.Windows.Forms.ToolStripMenuItem BindSavestatesToMoviesMenuItem; - private System.Windows.Forms.ToolStripMenuItem BackgroundInputMenuItem; - private System.Windows.Forms.ToolStripMenuItem TAStudioMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayRerecordCountToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem screenshotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem screenshotF12ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem screenshotAsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem runInBackgroundToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem bindSavestatesToMoviesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem acceptBackgroundInputToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem tAStudioToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4; - private System.Windows.Forms.ToolStripMenuItem DisplayStatusBarMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayStatusBarToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator17; private System.Windows.Forms.ToolStripMenuItem graphicsSettingsToolStripMenuItem; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; @@ -3232,13 +3231,13 @@ private System.Windows.Forms.ToolStripMenuItem cmiScreenshotClipboard; private System.Windows.Forms.ToolStripMenuItem cmiCloseRom; private System.Windows.Forms.ToolStripMenuItem cmiMakeMovieBackup; - private System.Windows.Forms.ToolStripMenuItem AutomaticallyBackupMoviesMenuItem; + private System.Windows.Forms.ToolStripMenuItem automaticallyBackupMoviesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem cmiStopMovie; private System.Windows.Forms.ToolStripDropDownButton PauseStrip; private System.Windows.Forms.ToolStripDropDownButton PlayRecordStatus; private System.Windows.Forms.ToolStripDropDownButton DumpStatus; private System.Windows.Forms.ToolStripMenuItem cmiViewSubtitles; - private MenuStripEx MainformMenu; + private MenuStripEx menuStrip1; private System.Windows.Forms.ToolStripMenuItem gBToolStripMenuItem; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; private System.Windows.Forms.ToolStripStatusLabel StatusSlot1; @@ -3252,25 +3251,25 @@ private System.Windows.Forms.ToolStripStatusLabel StatusSlot9; private System.Windows.Forms.ToolStripStatusLabel StatusSlot10; private System.Windows.Forms.ToolStripMenuItem cmiViewComments; - private System.Windows.Forms.ToolStripMenuItem DisplayLogWindowMenuItem; - private System.Windows.Forms.ToolStripMenuItem DisplaySubtitlesMenuItem; - private System.Windows.Forms.ToolStripMenuItem AVSubMenu; - private System.Windows.Forms.ToolStripMenuItem RecordAVMenuItem; - private System.Windows.Forms.ToolStripMenuItem StopAVIMenuItem; + private System.Windows.Forms.ToolStripMenuItem displayLogWindowToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem displaySubtitlesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem AVIWAVToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem recordAVIToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem stopAVIToolStripMenuItem; private System.Windows.Forms.ToolStripStatusLabel AVIStatusLabel; private System.Windows.Forms.ToolStripMenuItem cmiRestartMovie; private System.Windows.Forms.ToolStripStatusLabel CheatStatus; - private System.Windows.Forms.ToolStripMenuItem AutofireMenuItem; - private System.Windows.Forms.ToolStripMenuItem AutoloadLastSlotMenuItem; + private System.Windows.Forms.ToolStripMenuItem autofireToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem autoLoadLastSlotToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator21; private System.Windows.Forms.ToolStripSeparator toolStripSeparator22; private System.Windows.Forms.ToolStripSeparator toolStripSeparator23; - private System.Windows.Forms.ToolStripMenuItem LogWindowAsConsoleMenuItem; - private System.Windows.Forms.ToolStripMenuItem ShowMenuInFullScreenMenuItem; + private System.Windows.Forms.ToolStripMenuItem logWindowAsConsoleToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem showMenuInFullScreenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem cmiShowMenu; - private System.Windows.Forms.ToolStripMenuItem ImportMoviesMenuItem; + private System.Windows.Forms.ToolStripMenuItem importMovieToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem forumsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem ScreenshotClipboardMenuItem; + private System.Windows.Forms.ToolStripMenuItem screenshotClipboardToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem pCEToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator25; private System.Windows.Forms.ToolStripMenuItem pceGraphicsSettingsToolStripMenuItem; @@ -3289,16 +3288,16 @@ private System.Windows.Forms.ToolStripMenuItem bWToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem p0DifficultyToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem rightDifficultyToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem ConfigEnableSubMenu; - private System.Windows.Forms.ToolStripMenuItem EnableContextMenuMenuItem; - private System.Windows.Forms.ToolStripMenuItem BackupSavestatesMenuItem; - private System.Windows.Forms.ToolStripMenuItem AutoSavestatesMenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveScreenshotInSavestatesMenuItem; - private System.Windows.Forms.ToolStripMenuItem SingleInstanceModeMenuItem; - private System.Windows.Forms.ToolStripMenuItem SuppressGuiLayerMenuItem; - private System.Windows.Forms.ToolStripMenuItem DontAskToSaveChangesMenuItem; + private System.Windows.Forms.ToolStripMenuItem enableToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem enableContextMenuToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem backupSavestatesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem autoSavestatesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveScreenshotWithSavestatesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem singleInstanceModeToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem miSuppressGuiLayer; + private System.Windows.Forms.ToolStripMenuItem neverBeAskedToSaveChangesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem soundChannelsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem DisplayFilterSubMenu; + private System.Windows.Forms.ToolStripMenuItem windowFilterMenuItem; private System.Windows.Forms.ToolStripMenuItem x2SAIMenuItem; private System.Windows.Forms.ToolStripMenuItem SuperEagleMenuItem; private System.Windows.Forms.ToolStripMenuItem SuperX2SAIMenuItem; @@ -3316,29 +3315,29 @@ private System.Windows.Forms.ToolStripMenuItem oBJ2ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem oBJ3ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem changeDMGPalettesToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem FrameAdvanceSkipLagMenuItem; + private System.Windows.Forms.ToolStripMenuItem frameAdvanceSkipLagFramesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem forceDMGModeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem gBAInCGBModeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem multicartCompatibilityToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; - private System.Windows.Forms.ToolStripMenuItem HardResetMenuItem; + private System.Windows.Forms.ToolStripMenuItem hardResetToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator19; - private System.Windows.Forms.ToolStripMenuItem CaptureOSDMenuItem; + private System.Windows.Forms.ToolStripMenuItem captureOSDToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator20; - private System.Windows.Forms.ToolStripMenuItem ScreenshotCaptureOSDMenuItem1; + private System.Windows.Forms.ToolStripMenuItem captureOSDToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem loadGBInSGBToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem loadGBInSGBToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem BackupSaveramMenuItem; + private System.Windows.Forms.ToolStripMenuItem backupSaveramToolStripMenuItem; private System.Windows.Forms.ToolStripStatusLabel RebootStatusBarIcon; - private System.Windows.Forms.ToolStripMenuItem TraceLoggerMenuItem; - private System.Windows.Forms.ToolStripMenuItem UseBilinearMenuItem; + private System.Windows.Forms.ToolStripMenuItem traceLoggerToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem blurryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem showClippedRegionsToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator24; private System.Windows.Forms.ToolStripMenuItem highlightActiveDisplayRegionToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem nESSpeicalToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem SaveMovieMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveMovieToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveMovieToolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem VirtualPadMenuItem; + private System.Windows.Forms.ToolStripMenuItem virtualPadToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator26; private System.Windows.Forms.ToolStripMenuItem showBGToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem showPlayer1ToolStripMenuItem; @@ -3348,35 +3347,35 @@ private System.Windows.Forms.ToolStripMenuItem showBallToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem showPlayfieldToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem gPUViewerToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem AudioThrottleMenuItem; + private System.Windows.Forms.ToolStripMenuItem audioThrottleToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator27; - private System.Windows.Forms.ToolStripMenuItem VsyncEnabledMenuItem; + private System.Windows.Forms.ToolStripMenuItem vSyncEnabledToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator28; private System.Windows.Forms.ToolStripMenuItem colecoToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem skipBIOSIntroToolStripMenuItem; private System.Windows.Forms.ToolStripStatusLabel StatusBarLedLight; private System.Windows.Forms.ToolStripMenuItem gBAToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem gPUViewToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem KeyPrioritySubMenu; - private System.Windows.Forms.ToolStripMenuItem BothHkAndControllerMenuItem; - private System.Windows.Forms.ToolStripMenuItem InputOverHkMenuItem; - private System.Windows.Forms.ToolStripMenuItem HkOverInputMenuItem; + private System.Windows.Forms.ToolStripMenuItem keyPriorityToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem bothHotkeysAndControllersToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem inputOverridesHotkeysToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem hotkeysOverrideInputToolStripMenuItem; private System.Windows.Forms.ToolStripStatusLabel KeyPriorityStatusBarLabel; private System.Windows.Forms.ToolStripMenuItem miSnesOptions; - private System.Windows.Forms.ToolStripMenuItem FullMovieLoadstatesMenuItem; + private System.Windows.Forms.ToolStripMenuItem fullMovieLoadstatesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem ContextMenuStopMovieNoSaving; - private System.Windows.Forms.ToolStripMenuItem StopMovieWithoutSavingMenuItem; + private System.Windows.Forms.ToolStripMenuItem stopMovieWithoutSavingToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SNESgameGenieCodesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem GBgameGenieCodesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem GGgameGenieEncoderDecoderToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator29; - private System.Windows.Forms.ToolStripMenuItem CreateDualGbXmlMenuItem; + private System.Windows.Forms.ToolStripMenuItem createDualGBXMLToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem n64ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem N64PluginSettingsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem SavestateTypeSubMenu; - private System.Windows.Forms.ToolStripMenuItem SavestateTypeDefaultMenuItem; - private System.Windows.Forms.ToolStripMenuItem SavestateBinaryMenuItem; - private System.Windows.Forms.ToolStripMenuItem SavestateTextMenuItem; + private System.Windows.Forms.ToolStripMenuItem savestateTypeToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem defaultToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem binaryToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem textToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saturnToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem preferencesToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem configToolStripMenuItem1; @@ -3386,9 +3385,9 @@ private System.Windows.Forms.ToolStripMenuItem pathsToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem soundToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem autofireToolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem RewindOptionsMenuItem; + private System.Windows.Forms.ToolStripMenuItem rewindOptionsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem rewindToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem FirmwaresMenuItem; + private System.Windows.Forms.ToolStripMenuItem firmwaresToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadTIFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem ClearSRAMContextMenuItem; private System.Windows.Forms.ToolStripSeparator ClearSRAMContextSeparator; diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 7b2cda7e97..5bf2f5e6f5 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -13,1198 +13,21 @@ namespace BizHawk.MultiClient { partial class MainForm { - #region File Menu - - private void FileSubMenu_DropDownOpened(object sender, EventArgs e) - { - OpenRomMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Open ROM"].Bindings; - CloseRomMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Close ROM"].Bindings; - - MovieSubMenu.Enabled = - AVSubMenu.Enabled = - ScreenshotSubMenu.Enabled = - CloseRomMenuItem.Enabled = - !IsNullEmulator(); - } - - private void RecentRomMenuItem_DropDownOpened(object sender, EventArgs e) - { - RecentRomSubMenu.DropDownItems.Clear(); - RecentRomSubMenu.DropDownItems.AddRange( - ToolHelpers.GenerateRecentMenu(Global.Config.RecentRoms, LoadRomFromRecent) - ); - RecentRomSubMenu.DropDownItems.Add( - ToolHelpers.GenerateAutoLoadItem(Global.Config.RecentRoms) - ); - } - - private void SaveStateSubMenu_DropDownOpened(object sender, EventArgs e) - { - SaveState0MenuItem.Font = new Font( - SaveState0MenuItem.Font.FontFamily, - SaveState0MenuItem.Font.Size, - 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 - ); - - SaveState2MenuItem.Font = new Font( - SaveState2MenuItem.Font.FontFamily, - SaveState2MenuItem.Font.Size, - 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 - ); - - SaveState4MenuItem.Font = new Font( - SaveState4MenuItem.Font.FontFamily, - SaveState4MenuItem.Font.Size, - 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 - ); - - SaveState6MenuItem.Font = new Font( - SaveState6MenuItem.Font.FontFamily, - SaveState6MenuItem.Font.Size, - 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 - ); - - SaveState8MenuItem.Font = new Font( - SaveState8MenuItem.Font.FontFamily, - SaveState8MenuItem.Font.Size, - 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 - ); - - SaveState1MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 1"].Bindings; - SaveState2MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 2"].Bindings; - SaveState3MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 3"].Bindings; - SaveState4MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 4"].Bindings; - SaveState5MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 5"].Bindings; - SaveState6MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 6"].Bindings; - SaveState7MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 7"].Bindings; - SaveState8MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 8"].Bindings; - SaveState9MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 9"].Bindings; - SaveState0MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 0"].Bindings; - SaveNamedStateMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save Named State"].Bindings; - - SaveNamedStateMenuItem.Enabled = - SaveState1MenuItem.Enabled = - SaveState2MenuItem.Enabled = - SaveState3MenuItem.Enabled = - SaveState4MenuItem.Enabled = - SaveState5MenuItem.Enabled = - SaveState6MenuItem.Enabled = - SaveState7MenuItem.Enabled = - SaveState8MenuItem.Enabled = - SaveState9MenuItem.Enabled = - SaveState0MenuItem.Enabled = - !IsNullEmulator(); - } - - private void LoadStateSubMenu_DropDownOpened(object sender, EventArgs e) - { - LoadState1MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 1"].Bindings; - LoadState2MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 2"].Bindings; - LoadState3MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 3"].Bindings; - LoadState4MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 4"].Bindings; - LoadState5MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 5"].Bindings; - LoadState6MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 6"].Bindings; - LoadState7MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 7"].Bindings; - LoadState8MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 8"].Bindings; - LoadState9MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 9"].Bindings; - LoadState0MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 0"].Bindings; - LoadNamedStateMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load Named State"].Bindings; - - AutoloadLastSlotMenuItem.Checked = Global.Config.AutoLoadLastSaveSlot; - - LoadNamedStateMenuItem.Enabled = !IsNullEmulator(); - LoadState1MenuItem.Enabled = !IsNullEmulator() && StateSlots.HasSlot(1); - LoadState2MenuItem.Enabled = !IsNullEmulator() && StateSlots.HasSlot(2); - LoadState3MenuItem.Enabled = !IsNullEmulator() && StateSlots.HasSlot(3); - LoadState4MenuItem.Enabled = !IsNullEmulator() && StateSlots.HasSlot(4); - LoadState5MenuItem.Enabled = !IsNullEmulator() && StateSlots.HasSlot(5); - LoadState6MenuItem.Enabled = !IsNullEmulator() && StateSlots.HasSlot(6); - LoadState7MenuItem.Enabled = !IsNullEmulator() && StateSlots.HasSlot(7); - LoadState8MenuItem.Enabled = !IsNullEmulator() && StateSlots.HasSlot(8); - LoadState9MenuItem.Enabled = !IsNullEmulator() && StateSlots.HasSlot(9); - LoadState0MenuItem.Enabled = !IsNullEmulator() && StateSlots.HasSlot(0); - } - - private void SaveSlotSubMenu_DropDownOpened(object sender, EventArgs e) - { - SelectSlot0MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 0"].Bindings; - SelectSlot1MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 1"].Bindings; - SelectSlot2MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 2"].Bindings; - SelectSlot3MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 3"].Bindings; - SelectSlot4MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 4"].Bindings; - SelectSlot5MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 5"].Bindings; - SelectSlot6MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 6"].Bindings; - SelectSlot7MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 7"].Bindings; - SelectSlot8MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 8"].Bindings; - SelectSlot9MenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 9"].Bindings; - PreviousSlotMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Previous Slot"].Bindings; - NextSlotMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Next Slot"].Bindings; - SaveToCurrentSlotMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Quick Save"].Bindings; - LoadCurrentSlotMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Quick Load"].Bindings; - - SaveToCurrentSlotMenuItem.Enabled = LoadCurrentSlotMenuItem.Enabled = !IsNullEmulator(); - - SelectSlot0MenuItem.Checked = false; - SelectSlot1MenuItem.Checked = false; - SelectSlot2MenuItem.Checked = false; - SelectSlot3MenuItem.Checked = false; - SelectSlot4MenuItem.Checked = false; - SelectSlot5MenuItem.Checked = false; - SelectSlot6MenuItem.Checked = false; - SelectSlot7MenuItem.Checked = false; - SelectSlot8MenuItem.Checked = false; - SelectSlot9MenuItem.Checked = false; - SelectSlot1MenuItem.Checked = false; - - switch (Global.Config.SaveSlot) - { - case 0: - SelectSlot0MenuItem.Checked = true; - break; - case 1: - SelectSlot1MenuItem.Checked = true; - break; - case 2: - SelectSlot2MenuItem.Checked = true; - break; - case 3: - SelectSlot3MenuItem.Checked = true; - break; - case 4: - SelectSlot4MenuItem.Checked = true; - break; - case 5: - SelectSlot5MenuItem.Checked = true; - break; - case 6: - SelectSlot6MenuItem.Checked = true; - break; - case 7: - SelectSlot7MenuItem.Checked = true; - break; - case 8: - SelectSlot8MenuItem.Checked = true; - break; - case 9: - SelectSlot9MenuItem.Checked = true; - break; - } - } - - private void MovieSubMenu_DropDownOpened(object sender, EventArgs e) - { - FullMovieLoadstatesMenuItem.Enabled = !Global.MovieSession.MultiTrack.IsActive; - StopMovieWithoutSavingMenuItem.Enabled = Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie.HasChanges; - StopMovieMenuItem.Enabled - = PlayFromBeginningMenuItem.Enabled - = SaveMovieMenuItem.Enabled - = Global.MovieSession.Movie.IsActive; - - ReadonlyMenuItem.Checked = ReadOnly; - BindSavestatesToMoviesMenuItem.Checked = Global.Config.BindSavestatesToMovies; - AutomaticallyBackupMoviesMenuItem.Checked = Global.Config.EnableBackupMovies; - FullMovieLoadstatesMenuItem.Checked = Global.Config.VBAStyleMovieLoadState; - - ReadonlyMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Toggle read-only"].Bindings; - RecordMovieMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Record Movie"].Bindings; - PlayMovieMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Play Movie"].Bindings; - StopMovieMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Stop Movie"].Bindings; - PlayFromBeginningMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Play from beginning"].Bindings; - SaveMovieMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save Movie"].Bindings; - } - - private void RecentMovieSubMenu_DropDownOpened(object sender, EventArgs e) - { - RecentMenuItem.DropDownItems.Clear(); - RecentMenuItem.DropDownItems.AddRange( - ToolHelpers.GenerateRecentMenu(Global.Config.RecentMovies, LoadMoviesFromRecent) - ); - RecentMenuItem.DropDownItems.Add( - ToolHelpers.GenerateAutoLoadItem(Global.Config.RecentMovies) - ); - } - - private void AVSubMenu_DropDownOpened(object sender, EventArgs e) - { - RecordAVMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Record A/V"].Bindings; - StopAVIMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Stop A/V"].Bindings; - CaptureOSDMenuItem.Checked = Global.Config.AVI_CaptureOSD; - - if (CurrAviWriter == null) - { - RecordAVMenuItem.Enabled = true; - StopAVIMenuItem.Enabled = false; - } - else - { - RecordAVMenuItem.Enabled = false; - StopAVIMenuItem.Enabled = true; - } - } - - private void ScreenshotSubMenu_DropDownOpening(object sender, EventArgs e) - { - ScreenshotCaptureOSDMenuItem1.Checked = Global.Config.Screenshot_CaptureOSD; - ScreenshotMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Screenshot"].Bindings; - } - - private void OpenRomMenuItem_Click(object sender, EventArgs e) + private void openROMToolStripMenuItem_Click(object sender, EventArgs e) { OpenROM(); } - private void CloseRomMenuItem_Click(object sender, EventArgs e) - { - CloseROM(); - } - - private void Savestate1MenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave1"); } - private void Savestate2MenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave2"); } - private void Savestate3MenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave3"); } - private void Savestate4MenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave4"); } - private void Savestate5MenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave5"); } - private void Savestate6MenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave6"); } - private void Savestate7MenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave7"); } - private void Savestate8MenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave8"); } - private void Savestate9MenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave9"); } - private void Savestate0MenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave0"); } - - private void SaveNamedStateMenuItem_Click(object sender, EventArgs e) - { - SaveStateAs(); - } - - private void Loadstate1MenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave1"); } - private void Loadstate2MenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave2"); } - private void Loadstate3MenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave3"); } - private void Loadstate4MenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave4"); } - private void Loadstate5MenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave5"); } - private void Loadstate6MenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave6"); } - private void Loadstate7MenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave7"); } - private void Loadstate8MenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave8"); } - private void Loadstate9MenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave9"); } - private void Loadstate0MenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave0"); } - - private void LoadNamedStateMenuItem_Click(object sender, EventArgs e) - { - LoadStateAs(); - } - - private void AutoloadLastSlotMenuItem_Click(object sender, EventArgs e) - { - Global.Config.AutoLoadLastSaveSlot ^= true; - } - - private void SelectSlotMenuItems_Click(object sender, EventArgs e) - { - if (sender == SelectSlot0MenuItem) Global.Config.SaveSlot = 0; - else if (sender == SelectSlot1MenuItem) Global.Config.SaveSlot = 1; - else if (sender == SelectSlot2MenuItem) Global.Config.SaveSlot = 2; - else if (sender == SelectSlot3MenuItem) Global.Config.SaveSlot = 3; - else if (sender == SelectSlot4MenuItem) Global.Config.SaveSlot = 4; - else if (sender == SelectSlot5MenuItem) Global.Config.SaveSlot = 5; - else if (sender == SelectSlot6MenuItem) Global.Config.SaveSlot = 6; - else if (sender == SelectSlot7MenuItem) Global.Config.SaveSlot = 7; - else if (sender == SelectSlot8MenuItem) Global.Config.SaveSlot = 8; - else if (sender == SelectSlot9MenuItem) Global.Config.SaveSlot = 9; - - UpdateStatusSlots(); - SaveSlotSelectedMessage(); - } - - private void PreviousSlotMenuItem_Click(object sender, EventArgs e) - { - PreviousSlot(); - } - - private void NextSlotMenuItem_Click(object sender, EventArgs e) - { - NextSlot(); - } - - private void SaveToCurrentSlotMenuItem_Click(object sender, EventArgs e) - { - SaveState("QuickSave" + Global.Config.SaveSlot.ToString()); - } - - private void LoadCurrentSlotMenuItem_Click(object sender, EventArgs e) - { - LoadState("QuickSave" + Global.Config.SaveSlot.ToString()); - } - - private void ReadonlyMenuItem_Click(object sender, EventArgs e) - { - ToggleReadOnly(); - } - - private void RecordMovieMenuItem_Click(object sender, EventArgs e) - { - RecordMovie(); - } - - private void PlayMovieMenuItem_Click(object sender, EventArgs e) - { - PlayMovie(); - } - - private void StopMovieMenuItem_Click(object sender, EventArgs e) - { - StopMovie(); - } - - private void PlayFromBeginningMenuItem_Click(object sender, EventArgs e) - { - PlayMovieFromBeginning(); - } - - private void ImportMovieMenuItem_Click(object sender, EventArgs e) - { - var ofd = new OpenFileDialog - { - InitialDirectory = PathManager.GetRomsPath(Global.Emulator.SystemId), - Multiselect = true, - Filter = FormatFilter( - "Movie Files", "*.fm2;*.mc2;*.mcm;*.mmv;*.gmv;*.vbm;*.lsmv;*.fcm;*.fmv;*.vmv;*.nmv;*.smv;*.zmv;", - "FCEUX", "*.fm2", - "PCEjin/Mednafen", "*.mc2;*.mcm", - "Dega", "*.mmv", - "Gens", "*.gmv", - "Visual Boy Advance", "*.vbm", - "LSNES", "*.lsmv", - "FCEU", "*.fcm", - "Famtasia", "*.fmv", - "VirtuaNES", "*.vmv", - "Nintendulator", "*.nmv", - "Snes9x", "*.smv", - "ZSNES", "*.zmv", - "All Files", "*.*"), - RestoreDirectory = false - }; - - GlobalWinF.Sound.StopSound(); - var result = ofd.ShowDialog(); - GlobalWinF.Sound.StartSound(); - if (result != DialogResult.OK) - { - return; - } - else - { - foreach (string fn in ofd.FileNames) - { - ProcessMovieImport(fn); - } - } - } - - private void SaveMovieMenuItem_Click(object sender, EventArgs e) - { - SaveMovie(); - } - - private void stopMovieWithoutSaveMenuItem_Click(object sender, EventArgs e) - { - StopMovie(true); - } - - private void BindSavestatesToMoviesMenuItem_Click(object sender, EventArgs e) - { - Global.Config.BindSavestatesToMovies ^= true; - } - - private void AutomaticMovieBackupMenuItem_Click(object sender, EventArgs e) - { - Global.Config.EnableBackupMovies ^= true; - } - - private void FullMovieLoadstatesMenuItem_Click(object sender, EventArgs e) - { - Global.Config.VBAStyleMovieLoadState ^= true; - } - - private void RecordAVMenuItem_Click(object sender, EventArgs e) + private void recordAVIToolStripMenuItem_Click(object sender, EventArgs e) { RecordAVI(); } - private void StopAVMenuItem_Click(object sender, EventArgs e) + private void stopAVIToolStripMenuItem_Click(object sender, EventArgs e) { StopAVI(); } - private void CaptureOSDMenuItem_Click(object sender, EventArgs e) - { - Global.Config.AVI_CaptureOSD ^= true; - } - - private void ScreenshotMenuItem_Click(object sender, EventArgs e) - { - TakeScreenshot(); - } - - private void ScreenshotAsMenuItem_Click(object sender, EventArgs e) - { - string path = String.Format(PathManager.ScreenshotPrefix(Global.Game) + ".{0:yyyy-MM-dd HH.mm.ss}.png", DateTime.Now); - - SaveFileDialog sfd = new SaveFileDialog - { - InitialDirectory = Path.GetDirectoryName(path), - FileName = Path.GetFileName(path), - Filter = "PNG File (*.png)|*.png" - }; - - GlobalWinF.Sound.StopSound(); - var result = sfd.ShowDialog(); - GlobalWinF.Sound.StartSound(); - if (result == DialogResult.OK) - { - TakeScreenshot(sfd.FileName); - } - } - - private void ScreenshotClipboardMenuItem_Click(object sender, EventArgs e) - { - TakeScreenshotToClipboard(); - } - - private void ScreenshotCaptureOSDMenuItem_Click(object sender, EventArgs e) - { - Global.Config.Screenshot_CaptureOSD ^= true; - } - - private void ExitMenuItem_Click(object sender, EventArgs e) - { - if (RamWatch1.AskSave()) - { - Close(); - } - } - - #endregion - - #region Emulation Menu - - private void emulationToolStripMenuItem_DropDownOpened(object sender, EventArgs e) - { - RebootCoreMenuItem.Enabled = !IsNullEmulator(); - - if (didMenuPause) - { - PauseMenuItem.Checked = wasPaused; - } - else - { - PauseMenuItem.Checked = EmulatorPaused; - } - - SoftResetMenuItem.Enabled = Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset") && - (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished); - - HardResetMenuItem.Enabled = Global.Emulator.ControllerDefinition.BoolButtons.Contains("Power") && - (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished); - - PauseMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Pause"].Bindings; - RebootCoreMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Reboot Core"].Bindings; - SoftResetMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Soft Reset"].Bindings; - HardResetMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Hard Reset"].Bindings; - } - - private void PauseMenuItem_Click(object sender, EventArgs e) - { - if (EmulatorPaused) - { - UnpauseEmulator(); - } - else - { - PauseEmulator(); - } - } - - private void PowerMenuItem_Click(object sender, EventArgs e) - { - RebootCore(); - } - - private void SoftResetMenuItem_Click(object sender, EventArgs e) - { - SoftReset(); - } - - private void HardResetMenuItem_Click(object sender, EventArgs e) - { - HardReset(); - } - - #endregion - - #region View - - private void ViewSubMenu_DropDownOpened(object sender, EventArgs e) - { - DisplayFPSMenuItem.Checked = Global.Config.DisplayFPS; - DisplayFrameCounterMenuItem.Checked = Global.Config.DisplayFrameCounter; - DisplayLagCounterMenuItem.Checked = Global.Config.DisplayLagCounter; - DisplayInputMenuItem.Checked = Global.Config.DisplayInput; - DisplayRerecordCountMenuItem.Checked = Global.Config.DisplayRerecordCount; - DisplaySubtitlesMenuItem.Checked = Global.Config.DisplaySubtitles; - - DisplayFPSMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Display FPS"].Bindings; - DisplayFrameCounterMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Frame Counter"].Bindings; - DisplayLagCounterMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Lag Counter"].Bindings; - DisplayInputMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Input Display"].Bindings; - SwitchToFullscreenMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Full Screen"].Bindings; - - DisplayStatusBarMenuItem.Checked = Global.Config.DisplayStatusBar; - DisplayLogWindowMenuItem.Checked = Global.Config.ShowLogWindow; - } - - private void DisplayFilterSubMenu_DropDownOpened(object sender, EventArgs e) - { - DisplayFilterNoneMenuItem.Checked = Global.Config.TargetDisplayFilter == 0; - x2SAIMenuItem.Checked = Global.Config.TargetDisplayFilter == 1; - SuperX2SAIMenuItem.Checked = Global.Config.TargetDisplayFilter == 2; - SuperEagleMenuItem.Checked = Global.Config.TargetDisplayFilter == 3; - } - - private void DisplayFilterMenuItem_Click(object sender, EventArgs e) - { - if (sender == DisplayFilterNoneMenuItem) Global.Config.TargetDisplayFilter = 0; - if (sender == x2SAIMenuItem) Global.Config.TargetDisplayFilter = 1; - if (sender == SuperX2SAIMenuItem) Global.Config.TargetDisplayFilter = 2; - if (sender == SuperEagleMenuItem) Global.Config.TargetDisplayFilter = 3; - } - - private void WindowSizeSubMenu_DropDownOpened(object sender, EventArgs e) - { - x1MenuItem.Checked = - x2MenuItem.Checked = - x3MenuItem.Checked = - x4MenuItem.Checked = - x5MenuItem.Checked = false; - - switch (Global.Config.TargetZoomFactor) - { - case 1: x1MenuItem.Checked = true; break; - case 2: x2MenuItem.Checked = true; break; - case 3: x3MenuItem.Checked = true; break; - case 4: x4MenuItem.Checked = true; break; - case 5: x5MenuItem.Checked = true; break; - case 10: mzMenuItem.Checked = true; break; - } - } - - private void WindowSize_Click(object sender, EventArgs e) - { - if (sender == x1MenuItem) Global.Config.TargetZoomFactor = 1; - if (sender == x2MenuItem) Global.Config.TargetZoomFactor = 2; - if (sender == x3MenuItem) Global.Config.TargetZoomFactor = 3; - if (sender == x4MenuItem) Global.Config.TargetZoomFactor = 4; - if (sender == x5MenuItem) Global.Config.TargetZoomFactor = 5; - if (sender == mzMenuItem) Global.Config.TargetZoomFactor = 10; - - FrameBufferResized(); - } - - private void SwitchToFullscreenMenuItem_Click(object sender, EventArgs e) - { - ToggleFullscreen(); - } - - private void DisplayFPSMenuItem_Click(object sender, EventArgs e) - { - GlobalWinF.DisplayManager.NeedsToPaint = true; - ToggleFPS(); - } - - private void DisplayFrameCounterMenuItem_Click(object sender, EventArgs e) - { - GlobalWinF.DisplayManager.NeedsToPaint = true; - ToggleFrameCounter(); - } - - private void DisplayLagCounterMenuItem_Click(object sender, EventArgs e) - { - GlobalWinF.DisplayManager.NeedsToPaint = true; - ToggleLagCounter(); - } - - private void DisplayInputMenuItem_Click(object sender, EventArgs e) - { - GlobalWinF.DisplayManager.NeedsToPaint = true; - ToggleInputDisplay(); - } - - private void DisplayRerecordsMenuItem_Click(object sender, EventArgs e) - { - GlobalWinF.DisplayManager.NeedsToPaint = true; - Global.Config.DisplayRerecordCount ^= true; - } - - private void DisplaySubtitlesMenuItem_Click(object sender, EventArgs e) - { - GlobalWinF.DisplayManager.NeedsToPaint = true; - Global.Config.DisplaySubtitles ^= true; - } - - private void DisplayStatusBarMenuItem_Click(object sender, EventArgs e) - { - Global.Config.DisplayStatusBar ^= true; - - if (!InFullscreen) - { - StatusSlot0.Visible = Global.Config.DisplayStatusBar; - PerformLayout(); - FrameBufferResized(); - } - } - - private void DisplayLogWindowMenuItem_Click(object sender, EventArgs e) - { - Global.Config.ShowLogWindow ^= true; - - if (Global.Config.ShowLogWindow) - { - ShowConsole(); - } - else - { - HideConsole(); - } - } - - #endregion - - #region Config - - private void ConfigSubMenu_DropDownOpened(object sender, EventArgs e) - { - ControllersMenuItem.Enabled = !(Global.Emulator is NullEmulator); - } - - private void EnableMenuItem_DropDownOpened(object sender, EventArgs e) - { - EnableContextMenuMenuItem.Checked = Global.Config.ShowContextMenu; - BackupSavestatesMenuItem.Checked = Global.Config.BackupSavestates; - AutoSavestatesMenuItem.Checked = Global.Config.AutoSavestates; - SaveScreenshotInSavestatesMenuItem.Checked = Global.Config.SaveScreenshotWithStates; - FrameAdvanceSkipLagMenuItem.Checked = Global.Config.SkipLagFrame; - BackupSaveramMenuItem.Checked = Global.Config.BackupSaveram; - } - - private void GuiSubMenu_DropDownOpened(object sender, EventArgs e) - { - PauseWhenMenuActivatedMenuItem.Checked = Global.Config.PauseWhenMenuActivated; - StartPausedMenuItem.Checked = Global.Config.StartPaused; - SaveWindowPositionMenuItem.Checked = Global.Config.SaveWindowPosition; - ForceGDIMenuItem.Checked = Global.Config.DisplayGDI; - UseBilinearMenuItem.Checked = Global.Config.DispBlurry; - SuppressGuiLayerMenuItem.Checked = Global.Config.SuppressGui; - ShowMenuInFullScreenMenuItem.Checked = Global.Config.ShowMenuInFullscreen; - RunInBackgroundMenuItem.Checked = Global.Config.RunInBackground; - BackgroundInputMenuItem.Checked = Global.Config.AcceptBackgroundInput; - SingleInstanceModeMenuItem.Checked = Global.Config.SingleInstanceMode; - LogWindowAsConsoleMenuItem.Checked = Global.Config.WIN32_CONSOLE; - DontAskToSaveChangesMenuItem.Checked = Global.Config.SupressAskSave; - - BackgroundInputMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Toggle BG Input"].Bindings; - } - - private void FrameSkipMenuItem_DropDownOpened(object sender, EventArgs e) - { - MinimizeSkippingMenuItem.Checked = Global.Config.AutoMinimizeSkipping; - ClickThrottleMenuItem.Checked = Global.Config.ClockThrottle; - VsyncThrottleMenuItem.Checked = Global.Config.VSyncThrottle; - NeverSkipMenuItem.Checked = Global.Config.FrameSkip == 0; - Frameskip1MenuItem.Checked = Global.Config.FrameSkip == 1; - Frameskip2MenuItem.Checked = Global.Config.FrameSkip == 2; - Frameskip3MenuItem.Checked = Global.Config.FrameSkip == 3; - Frameskip4MenuItem.Checked = Global.Config.FrameSkip == 4; - Frameskip5MenuItem.Checked = Global.Config.FrameSkip == 5; - Frameskip6MenuItem.Checked = Global.Config.FrameSkip == 6; - Frameskip7MenuItem.Checked = Global.Config.FrameSkip == 7; - Frameskip8MenuItem.Checked = Global.Config.FrameSkip == 8; - Frameskip9MenuItem.Checked = Global.Config.FrameSkip == 9; - MinimizeSkippingMenuItem.Enabled = !NeverSkipMenuItem.Checked; - if (!MinimizeSkippingMenuItem.Enabled) MinimizeSkippingMenuItem.Checked = true; - AudioThrottleMenuItem.Enabled = Global.Config.SoundEnabled; - AudioThrottleMenuItem.Checked = Global.Config.SoundThrottle; - VsyncEnabledMenuItem.Checked = Global.Config.VSync; - - Speed100MenuItem.Checked = Global.Config.SpeedPercent == 100; - Speed100MenuItem.Image = (Global.Config.SpeedPercentAlternate == 100) ? Properties.Resources.FastForward : null; - Speed150MenuItem.Checked = Global.Config.SpeedPercent == 150; - Speed150MenuItem.Image = (Global.Config.SpeedPercentAlternate == 150) ? Properties.Resources.FastForward : null; - Speed200MenuItem.Checked = Global.Config.SpeedPercent == 200; - Speed200MenuItem.Image = (Global.Config.SpeedPercentAlternate == 200) ? Properties.Resources.FastForward : null; - Speed75MenuItem.Checked = Global.Config.SpeedPercent == 75; - Speed75MenuItem.Image = (Global.Config.SpeedPercentAlternate == 75) ? Properties.Resources.FastForward : null; - Speed50MenuItem.Checked = Global.Config.SpeedPercent == 50; - Speed50MenuItem.Image = (Global.Config.SpeedPercentAlternate == 50) ? Properties.Resources.FastForward : null; - } - - private void KeyPriorityMenuItem_DropDownOpened(object sender, EventArgs e) - { - switch (Global.Config.Input_Hotkey_OverrideOptions) - { - default: - case 0: - BothHkAndControllerMenuItem.Checked = true; - InputOverHkMenuItem.Checked = false; - HkOverInputMenuItem.Checked = false; - break; - case 1: - BothHkAndControllerMenuItem.Checked = false; - InputOverHkMenuItem.Checked = true; - HkOverInputMenuItem.Checked = false; - break; - case 2: - BothHkAndControllerMenuItem.Checked = false; - InputOverHkMenuItem.Checked = false; - HkOverInputMenuItem.Checked = true; - break; - } - } - - private void SavestateTypeMenuItem_DropDownOpened(object sender, EventArgs e) - { - SavestateTypeDefaultMenuItem.Checked = false; - SavestateBinaryMenuItem.Checked = false; - SavestateTextMenuItem.Checked = false; - switch (Global.Config.SaveStateType) - { - case Config.SaveStateTypeE.Binary: SavestateBinaryMenuItem.Checked = true; break; - case Config.SaveStateTypeE.Text: SavestateTextMenuItem.Checked = true; break; - case Config.SaveStateTypeE.Default: SavestateTypeDefaultMenuItem.Checked = true; break; - } - } - - private void ControllersMenuItem_Click(object sender, EventArgs e) - { - ControllerConfig controller = new ControllerConfig(Global.Emulator.ControllerDefinition); - if (controller.ShowDialog() == DialogResult.OK) - { - InitControls(); - SyncControls(); - } - } - - private void HotkeysMenuItem_Click(object sender, EventArgs e) - { - HotkeyConfig hotkeys = new HotkeyConfig(); - if (hotkeys.ShowDialog() == DialogResult.OK) - { - InitControls(); - SyncControls(); - } - } - - private void MessagesMenuItem_Click(object sender, EventArgs e) - { - new MessageConfig().ShowDialog(); - } - - private void PathsMenuItem_Click(object sender, EventArgs e) - { - new PathConfig().ShowDialog(); - } - - private void SoundMenuItem_Click(object sender, EventArgs e) - { - SoundConfig sound = new SoundConfig(); - if (sound.ShowDialog() == DialogResult.OK) - { - RewireSound(); - } - } - - private void AutofireMenuItem_Click(object sender, EventArgs e) - { - new AutofireConfig().ShowDialog(); - } - - private void RewindOptionsMenuItem_Click(object sender, EventArgs e) - { - new RewindConfig().ShowDialog(); - } - - private void FirmwaresMenuItem_Click(object sender, EventArgs e) - { - new FirmwaresConfig().Show(); - } - - private void EnableContextMenuMenuItem_Click(object sender, EventArgs e) - { - Global.Config.ShowContextMenu ^= true; - if (Global.Config.ShowContextMenu) - { - GlobalWinF.OSD.AddMessage("Context menu enabled"); - } - else - { - GlobalWinF.OSD.AddMessage("Context menu disabled"); - } - } - - private void BackupSavestatesMenuItem_Click(object sender, EventArgs e) - { - Global.Config.BackupSavestates ^= true; - if (Global.Config.BackupSavestates) - { - GlobalWinF.OSD.AddMessage("Backup savestates enabled"); - } - else - { - GlobalWinF.OSD.AddMessage("Backup savestates disabled"); - } - } - - private void AutoSavestatesMenuItem_Click(object sender, EventArgs e) - { - Global.Config.AutoSavestates ^= true; - if (Global.Config.AutoSavestates) - { - GlobalWinF.OSD.AddMessage("AutoSavestates enabled"); - } - else - { - GlobalWinF.OSD.AddMessage("AutoSavestates disabled"); - } - } - - private void ScreenshotWithSavestatesMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SaveScreenshotWithStates ^= true; - if (Global.Config.SaveScreenshotWithStates) - { - GlobalWinF.OSD.AddMessage("Screenshots will be saved in savestates"); - } - else - { - GlobalWinF.OSD.AddMessage("Screenshots will not be saved in savestates"); - } - } - - private void frameAdvanceSkipLagFramesToolStripMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SkipLagFrame ^= true; - } - - private void BackupSaveramMenuItem_Click(object sender, EventArgs e) - { - Global.Config.BackupSaveram ^= true; - if (Global.Config.BackupSaveram) - { - GlobalWinF.OSD.AddMessage("Backup saveram enabled"); - } - else - { - GlobalWinF.OSD.AddMessage("Backup saveram disabled"); - } - } - - private void PauseWhenMenuActivatedMenuItem_Click(object sender, EventArgs e) - { - Global.Config.PauseWhenMenuActivated ^= true; - } - - private void StartPausedMenuItem_Click(object sender, EventArgs e) - { - Global.Config.StartPaused ^= true; - } - - private void SaveWindowPositionMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SaveWindowPosition ^= true; - } - - private void UseGDIMenuItem_Click(object sender, EventArgs e) - { - Global.Config.DisplayGDI ^= true; - SyncPresentationMode(); - } - - private void UseBilinearMenuItem_Click(object sender, EventArgs e) - { - Global.Config.DispBlurry ^= true; - } - - private void SuppressGuiLayerMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SuppressGui ^= true; - } - - private void ShowMenuInFullScreenMenuItem_Click(object sender, EventArgs e) - { - Global.Config.ShowMenuInFullscreen ^= true; - } - - private void RunInBackgroundMenuItem_Click(object sender, EventArgs e) - { - Global.Config.RunInBackground ^= true; - } - - private void BackgroundInputMenuItem_Click(object sender, EventArgs e) - { - ToggleBackgroundInput(); - } - - private void SingleInstanceModeMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SingleInstanceMode ^= true; - MessageBox.Show("BizHawk must be restarted for this setting to take effect.", "Reboot Required", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - - private void DontAskToSaveChangesMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SupressAskSave ^= true; - } - - private void LogWindowAsConsoleMenuItem_Click(object sender, EventArgs e) - { - Global.Config.WIN32_CONSOLE ^= true; - } - - private void ClickThrottleMenuItem_Click(object sender, EventArgs e) - { - Global.Config.ClockThrottle ^= true; - if (Global.Config.ClockThrottle) - { - bool old = Global.Config.SoundThrottle; - Global.Config.SoundThrottle = false; - if (old) - { - RewireSound(); - } - old = Global.Config.VSyncThrottle; - Global.Config.VSyncThrottle = false; - if (old) - { - GlobalWinF.RenderPanel.Resized = true; - } - } - LimitFrameRateMessage(); - } - - private void AudioThrottleMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SoundThrottle ^= true; - RewireSound(); - if (Global.Config.SoundThrottle) - { - Global.Config.ClockThrottle = false; - bool old = Global.Config.VSyncThrottle; - Global.Config.VSyncThrottle = false; - if (old) - { - GlobalWinF.RenderPanel.Resized = true; - } - } - } - - private void VsyncThrottleMenuItem_Click(object sender, EventArgs e) - { - Global.Config.VSyncThrottle ^= true; - GlobalWinF.RenderPanel.Resized = true; - if (Global.Config.VSyncThrottle) - { - Global.Config.ClockThrottle = false; - bool old = Global.Config.SoundThrottle; - Global.Config.SoundThrottle = false; - if (old) - { - RewireSound(); - } - } - VsyncMessage(); - } - - private void VsyncEnabledMenuItem_Click(object sender, EventArgs e) - { - Global.Config.VSync ^= true; - if (!Global.Config.VSyncThrottle) // when vsync throttle is on, vsync is forced to on, so no change to make here - { - GlobalWinF.RenderPanel.Resized = true; - } - } - - private void MinimizeSkippingMenuItem_Click(object sender, EventArgs e) - { - Global.Config.AutoMinimizeSkipping ^= true; - } - - private void NeverSkipMenuItem_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 0; FrameSkipMessage(); } - private void Frameskip1MenuItem_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 1; FrameSkipMessage(); } - private void Frameskip2MenuItem_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 2; FrameSkipMessage(); } - private void Frameskip3MenuItem_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 3; FrameSkipMessage(); } - private void Frameskip4MenuItem_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 4; FrameSkipMessage(); } - private void Frameskip5MenuItem_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 5; FrameSkipMessage(); } - private void Frameskip6MenuItem_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 6; FrameSkipMessage(); } - private void Frameskip7MenuItem_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 7; FrameSkipMessage(); } - private void Frameskip8MenuItem_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 8; FrameSkipMessage(); } - private void Frameskip9MenuItem_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 9; FrameSkipMessage(); } - - private void Speed50MenuItem_Click(object sender, EventArgs e) { ClickSpeedItem(50); } - private void Speed75MenuItem_Click(object sender, EventArgs e) { ClickSpeedItem(75); } - private void Speed100MenuItem_Click(object sender, EventArgs e) { ClickSpeedItem(100); } - private void Speed150MenuItem_Click(object sender, EventArgs e) { ClickSpeedItem(150); } - private void Speed200MenuItem_Click(object sender, EventArgs e) { ClickSpeedItem(200); } - - private void BothHkAndControllerMenuItem_Click(object sender, EventArgs e) - { - Global.Config.Input_Hotkey_OverrideOptions = 0; - UpdateKeyPriorityIcon(); - } - - private void InputOverHkMenuItem_Click(object sender, EventArgs e) - { - Global.Config.Input_Hotkey_OverrideOptions = 1; - UpdateKeyPriorityIcon(); - } - - private void HkOverInputMenuItem_Click(object sender, EventArgs e) - { - Global.Config.Input_Hotkey_OverrideOptions = 2; - UpdateKeyPriorityIcon(); - } - - private void SavestateTypeDefaultMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SaveStateType = Config.SaveStateTypeE.Default; - } - - private void SavestateBinaryMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SaveStateType = Config.SaveStateTypeE.Binary; - } - - private void SavestateTextMenuItem_Click(object sender, EventArgs e) - { - Global.Config.SaveStateType = Config.SaveStateTypeE.Text; - } - - - private void SaveConfigMenuItem_Click(object sender, EventArgs e) - { - SaveConfig(); - GlobalWinF.OSD.AddMessage("Saved settings"); - } - - private void LoadConfigMenuItem_Click(object sender, EventArgs e) - { - Global.Config = ConfigService.Load(PathManager.DefaultIniPath, Global.Config); - Global.Config.ResolveDefaults(); - GlobalWinF.OSD.AddMessage("Config file loaded"); - } - - #endregion - - #region Tools - - private void toolsToolStripMenuItem_DropDownOpened(object sender, EventArgs e) - { - ToolBoxMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["ToolBox"].Bindings; - RamWatchMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Ram Watch"].Bindings; - RamSearchMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Ram Search"].Bindings; - HexEditorMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Hex Editor"].Bindings; - LuaConsoleMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Lua Console"].Bindings; - CheatsMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Cheats"].Bindings; - TAStudioMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["TAStudio"].Bindings; - VirtualPadMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Virtual Pad"].Bindings; - TraceLoggerMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Trace Logger"].Bindings; - ToolBoxMenuItem.Enabled = !ToolBox1.IsHandleCreated || ToolBox1.IsDisposed; - TraceLoggerMenuItem.Enabled = Global.Emulator.CoreComm.CpuTraceAvailable; - - CheatsMenuItem.Enabled = !(Global.Emulator is NullEmulator); - } - - private void ToolBoxMenuItem_Click(object sender, EventArgs e) - { - LoadToolBox(); - } - - private void RamWatchMenuItem_Click(object sender, EventArgs e) - { - LoadRamWatch(true); - } - - private void RamSearchMenuItem_Click(object sender, EventArgs e) - { - LoadRamSearch(); - } - - private void HexEditorMenuItem_Click(object sender, EventArgs e) - { - LoadHexEditor(); - } - - private void TraceLoggerMenuItem_Click(object sender, EventArgs e) - { - LoadTraceLogger(); - } - - private void TAStudioMenuItem_Click(object sender, EventArgs e) - { - LoadTAStudio(); - } - - private void VirtualPadMenuItem_Click(object sender, EventArgs e) - { - LoadVirtualPads(); - } - - private void CheatsMenuItem_Click(object sender, EventArgs e) - { - LoadCheatsWindow(); - } - - private void LuaConsoleMenuItem_Click(object sender, EventArgs e) - { - OpenLuaConsole(); - } - - private void CreateDualGbXmlMenuItem_Click(object sender, EventArgs e) - { - GlobalWinF.Sound.StopSound(); - using (var dlg = new GBtools.DualGBXMLCreator()) - { - dlg.ShowDialog(this); - } - GlobalWinF.Sound.StartSound(); - } - - #endregion - private void DumpStatus_Click(object sender, EventArgs e) { string details = Global.Emulator.CoreComm.RomStatusDetails; @@ -1214,7 +37,193 @@ namespace BizHawk.MultiClient GlobalWinF.Sound.StartSound(); } - + private void saveWindowPositionToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveWindowPosition ^= true; + } + + private void startPausedToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.StartPaused ^= true; + } + + private void luaConsoleToolStripMenuItem_Click(object sender, EventArgs e) + { + OpenLuaConsole(); + } + + private void miLimitFramerate_Click(object sender, EventArgs e) + { + Global.Config.ClockThrottle ^= true; + if (Global.Config.ClockThrottle) + { + bool old = Global.Config.SoundThrottle; + Global.Config.SoundThrottle = false; + if (old) + RewireSound(); + old = Global.Config.VSyncThrottle; + Global.Config.VSyncThrottle = false; + if (old) + GlobalWinF.RenderPanel.Resized = true; + } + LimitFrameRateMessage(); + } + + private void audioThrottleToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SoundThrottle ^= true; + RewireSound(); + if (Global.Config.SoundThrottle) + { + Global.Config.ClockThrottle = false; + bool old = Global.Config.VSyncThrottle; + Global.Config.VSyncThrottle = false; + if (old) + GlobalWinF.RenderPanel.Resized = true; + } + + } + + private void miDisplayVsync_Click(object sender, EventArgs e) + { + Global.Config.VSyncThrottle ^= true; + GlobalWinF.RenderPanel.Resized = true; + if (Global.Config.VSyncThrottle) + { + Global.Config.ClockThrottle = false; + bool old = Global.Config.SoundThrottle; + Global.Config.SoundThrottle = false; + if (old) + RewireSound(); + } + VsyncMessage(); + } + + private void vSyncEnabledToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.VSync ^= true; + if (!Global.Config.VSyncThrottle) // when vsync throttle is on, vsync is forced to on, so no change to make here + GlobalWinF.RenderPanel.Resized = true; + } + + public void LimitFrameRateMessage() + { + if (Global.Config.ClockThrottle) + { + GlobalWinF.OSD.AddMessage("Framerate limiting on"); + } + else + { + GlobalWinF.OSD.AddMessage("Framerate limiting off"); + } + } + + + public void VsyncMessage() + { + if (Global.Config.VSyncThrottle) + { + GlobalWinF.OSD.AddMessage("Display Vsync is set to on"); + } + else + { + GlobalWinF.OSD.AddMessage("Display Vsync is set to off"); + } + } + + private void miAutoMinimizeSkipping_Click(object sender, EventArgs e) + { + Global.Config.AutoMinimizeSkipping ^= true; + } + + public void MinimizeFrameskipMessage() + { + if (Global.Config.AutoMinimizeSkipping) + { + GlobalWinF.OSD.AddMessage("Autominimizing set to on"); + } + else + { + GlobalWinF.OSD.AddMessage("Autominimizing set to off"); + } + } + + private void miFrameskip0_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 0; FrameSkipMessage(); } + private void miFrameskip1_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 1; FrameSkipMessage(); } + private void miFrameskip2_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 2; FrameSkipMessage(); } + private void miFrameskip3_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 3; FrameSkipMessage(); } + private void miFrameskip4_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 4; FrameSkipMessage(); } + private void miFrameskip5_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 5; FrameSkipMessage(); } + private void miFrameskip6_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 6; FrameSkipMessage(); } + private void miFrameskip7_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 7; FrameSkipMessage(); } + private void miFrameskip8_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 8; FrameSkipMessage(); } + private void miFrameskip9_Click(object sender, EventArgs e) { Global.Config.FrameSkip = 9; FrameSkipMessage(); } + + public void FrameSkipMessage() + { + GlobalWinF.OSD.AddMessage("Frameskipping set to " + Global.Config.FrameSkip.ToString()); + } + + public void ClickSpeedItem(int num) + { + if ((ModifierKeys & Keys.Control) != 0) SetSpeedPercentAlternate(num); + else SetSpeedPercent(num); + } + private void miSpeed50_Click(object sender, EventArgs e) { ClickSpeedItem(50); } + private void miSpeed75_Click(object sender, EventArgs e) { ClickSpeedItem(75); } + private void miSpeed100_Click(object sender, EventArgs e) { ClickSpeedItem(100); } + private void miSpeed150_Click(object sender, EventArgs e) { ClickSpeedItem(150); } + private void miSpeed200_Click(object sender, EventArgs e) { ClickSpeedItem(200); } + + private void pauseWhenMenuActivatedToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.PauseWhenMenuActivated ^= true; + } + + private void soundToolStripMenuItem_Click(object sender, EventArgs e) + { + OpenSoundConfigDialog(); + } + + private void OpenSoundConfigDialog() + { + SoundConfig s = new SoundConfig(); + var result = s.ShowDialog(); + if (result == DialogResult.OK) + RewireSound(); + } + + private void zoomMenuItem_Click(object sender, EventArgs e) + { + if (sender == x1MenuItem) Global.Config.TargetZoomFactor = 1; + if (sender == x2MenuItem) Global.Config.TargetZoomFactor = 2; + if (sender == x3MenuItem) Global.Config.TargetZoomFactor = 3; + if (sender == x4MenuItem) Global.Config.TargetZoomFactor = 4; + if (sender == x5MenuItem) Global.Config.TargetZoomFactor = 5; + if (sender == mzMenuItem) Global.Config.TargetZoomFactor = 10; + + x1MenuItem.Checked = Global.Config.TargetZoomFactor == 1; + x2MenuItem.Checked = Global.Config.TargetZoomFactor == 2; + x3MenuItem.Checked = Global.Config.TargetZoomFactor == 3; + x4MenuItem.Checked = Global.Config.TargetZoomFactor == 4; + x5MenuItem.Checked = Global.Config.TargetZoomFactor == 5; + mzMenuItem.Checked = Global.Config.TargetZoomFactor == 10; + + FrameBufferResized(); + } + + private void DisplayFilterMenuItem_Click(object sender, EventArgs e) + { + if (sender == DisplayFilterNoneMenuItem) Global.Config.TargetDisplayFilter = 0; + if (sender == x2SAIMenuItem) Global.Config.TargetDisplayFilter = 1; + if (sender == SuperX2SAIMenuItem) Global.Config.TargetDisplayFilter = 2; + if (sender == SuperEagleMenuItem) Global.Config.TargetDisplayFilter = 3; + + DisplayFilterNoneMenuItem.Checked = Global.Config.TargetDisplayFilter == 0; + x2SAIMenuItem.Checked = Global.Config.TargetDisplayFilter == 1; + SuperX2SAIMenuItem.Checked = Global.Config.TargetDisplayFilter == 2; + SuperEagleMenuItem.Checked = Global.Config.TargetDisplayFilter == 3; + } private void smsEnableFMChipToolStripMenuItem_Click(object sender, EventArgs e) { @@ -1258,11 +267,160 @@ namespace BizHawk.MultiClient FlagNeedsReboot(); } + private void recordMovieToolStripMenuItem_Click(object sender, EventArgs e) + { + RecordMovie(); + } + + private void playMovieToolStripMenuItem_Click(object sender, EventArgs e) + { + PlayMovie(); + } + + private void stopMovieToolStripMenuItem_Click(object sender, EventArgs e) + { + StopMovie(); + } + + private void playFromBeginningToolStripMenuItem_Click(object sender, EventArgs e) + { + PlayMovieFromBeginning(); + } + + + private void RAMWatchToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadRamWatch(true); + } + + private void rAMSearchToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadRamSearch(); + } + + private void selectSlot1ToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveSlot = 1; + UpdateStatusSlots(); + SaveSlotSelectedMessage(); + } + + private void selectSlot2ToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveSlot = 2; + UpdateStatusSlots(); + SaveSlotSelectedMessage(); + } + + private void selectSlot3ToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveSlot = 3; + UpdateStatusSlots(); + SaveSlotSelectedMessage(); + } + + private void selectSlot4ToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveSlot = 4; + UpdateStatusSlots(); + SaveSlotSelectedMessage(); + } + + private void selectSlot5ToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveSlot = 5; + UpdateStatusSlots(); + SaveSlotSelectedMessage(); + } + + private void selectSlot6ToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveSlot = 6; + UpdateStatusSlots(); + SaveSlotSelectedMessage(); + } + + private void selectSlot7ToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveSlot = 7; + UpdateStatusSlots(); + SaveSlotSelectedMessage(); + } + + private void selectSlot8ToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveSlot = 8; + UpdateStatusSlots(); + SaveSlotSelectedMessage(); + } + + private void selectSlot9ToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveSlot = 9; + UpdateStatusSlots(); + SaveSlotSelectedMessage(); + } + + private void selectSlot10ToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveSlot = 0; + UpdateStatusSlots(); + SaveSlotSelectedMessage(); + } + + private void previousSlotToolStripMenuItem_Click(object sender, EventArgs e) + { + PreviousSlot(); + } + + private void nextSlotToolStripMenuItem_Click(object sender, EventArgs e) + { + NextSlot(); + } + + private void saveToCurrentSlotToolStripMenuItem_Click(object sender, EventArgs e) + { + SaveState("QuickSave" + Global.Config.SaveSlot.ToString()); + } + + private void loadCurrentSlotToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadState("QuickSave" + Global.Config.SaveSlot.ToString()); + } + + private void closeROMToolStripMenuItem_Click(object sender, EventArgs e) + { + CloseROM(); + } + + private void powerToolStripMenuItem_Click(object sender, EventArgs e) + { + RebootCore(); + } + public void RebootCore() { LoadRom(CurrentlyOpenRom); } + private void resetToolStripMenuItem_Click(object sender, EventArgs e) + { + SoftReset(); + } + + private void hardResetToolStripMenuItem_Click(object sender, EventArgs e) + { + HardReset(); + } + + private void pauseToolStripMenuItem_Click(object sender, EventArgs e) + { + if (EmulatorPaused) + UnpauseEmulator(); + else + PauseEmulator(); + } + private void helpToolStripMenuItem1_Click(object sender, EventArgs e) { System.Diagnostics.Process.Start("http://tasvideos.org/BizHawk.html"); @@ -1276,16 +434,115 @@ namespace BizHawk.MultiClient new BizBox().ShowDialog(); } + private void controllersToolStripMenuItem_Click(object sender, EventArgs e) + { + OpenControllerConfig(); + } + + private void OpenControllerConfig() + { + ControllerConfig c = new ControllerConfig(Global.Emulator.ControllerDefinition); + c.ShowDialog(); + if (c.DialogResult == DialogResult.OK) + { + InitControls(); + SyncControls(); + } + } + + private void hotkeysToolStripMenuItem_Click(object sender, EventArgs e) + { + OpenHotkeyDialog(); + } + + private void OpenHotkeyDialog() + { + HotkeyConfig h = new HotkeyConfig(); + h.ShowDialog(); + if (h.DialogResult == DialogResult.OK) + { + InitControls(); + SyncControls(); + } + } + + private void displayFPSToolStripMenuItem_Click(object sender, EventArgs e) + { + GlobalWinF.DisplayManager.NeedsToPaint = true; + ToggleFPS(); + } + + private void displayFrameCounterToolStripMenuItem_Click(object sender, EventArgs e) + { + GlobalWinF.DisplayManager.NeedsToPaint = true; + ToggleFrameCounter(); + } + + private void displayInputToolStripMenuItem_Click(object sender, EventArgs e) + { + GlobalWinF.DisplayManager.NeedsToPaint = true; + ToggleInputDisplay(); + } + + private void displayLagCounterToolStripMenuItem_Click(object sender, EventArgs e) + { + GlobalWinF.DisplayManager.NeedsToPaint = true; + ToggleLagCounter(); + } + + private void screenshotF12ToolStripMenuItem_Click(object sender, EventArgs e) + { + TakeScreenshot(); + } + private void forumsToolStripMenuItem_Click(object sender, EventArgs e) { System.Diagnostics.Process.Start("http://tasvideos.org/forum/viewforum.php?f=64"); } + private void screenshotClipboardToolStripMenuItem_Click(object sender, EventArgs e) + { + TakeScreenshotToClipboard(); + } + + private void savestate1toolStripMenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave1"); } + private void savestate2toolStripMenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave2"); } + private void savestate3toolStripMenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave3"); } + private void savestate4toolStripMenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave4"); } + private void savestate5toolStripMenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave5"); } + private void savestate6toolStripMenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave6"); } + private void savestate7toolStripMenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave7"); } + private void savestate8toolStripMenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave8"); } + private void savestate9toolStripMenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave9"); } + private void savestate0toolStripMenuItem_Click(object sender, EventArgs e) { SaveState("QuickSave0"); } + + private void loadstate1toolStripMenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave1"); } + private void loadstate2toolStripMenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave2"); } + private void loadstate3toolStripMenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave3"); } + private void loadstate4toolStripMenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave4"); } + private void loadstate5toolStripMenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave5"); } + private void loadstate6toolStripMenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave6"); } + private void loadstate7toolStripMenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave7"); } + private void loadstate8toolStripMenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave8"); } + private void loadstate9toolStripMenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave9"); } + private void loadstate0toolStripMenuItem_Click(object sender, EventArgs e) { LoadState("QuickSave0"); } + + private void exitToolStripMenuItem_Click(object sender, EventArgs e) + { + if (RamWatch1.AskSave()) + Close(); + } + private void PPUViewerToolStripMenuItem_Click(object sender, EventArgs e) { LoadNESPPU(); } + private void hexEditorToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadHexEditor(); + } + private void MainForm_Shown(object sender, EventArgs e) { HandlePlatformMenus(); @@ -1296,16 +553,124 @@ namespace BizHawk.MultiClient LoadGameGenieEC(); } + private void cheatsToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadCheatsWindow(); + } + + private void forceGDIPPresentationToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.DisplayGDI ^= true; + SyncPresentationMode(); + } + + private void miSuppressGuiLayer_Click(object sender, EventArgs e) + { + Global.Config.SuppressGui ^= true; + } + private void debuggerToolStripMenuItem_Click(object sender, EventArgs e) { LoadNESDebugger(); } + private void saveStateToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + savestate1toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 1"].Bindings; + savestate2toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 2"].Bindings; + savestate3toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 3"].Bindings; + savestate4toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 4"].Bindings; + savestate5toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 5"].Bindings; + savestate6toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 6"].Bindings; + savestate7toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 7"].Bindings; + savestate8toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 8"].Bindings; + savestate9toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 9"].Bindings; + savestate0toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save State 0"].Bindings; + saveNamedStateToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save Named State"].Bindings; + } + + private void loadStateToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + loadstate1toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 1"].Bindings; + loadstate2toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 2"].Bindings; + loadstate3toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 3"].Bindings; + loadstate4toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 4"].Bindings; + loadstate5toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 5"].Bindings; + loadstate6toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 6"].Bindings; + loadstate7toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 7"].Bindings; + loadstate8toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 8"].Bindings; + loadstate9toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 9"].Bindings; + loadstate0toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load State 0"].Bindings; + loadNamedStateToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Load Named State"].Bindings; + + autoLoadLastSlotToolStripMenuItem.Checked = Global.Config.AutoLoadLastSaveSlot; + } + private void nametableViewerToolStripMenuItem_Click(object sender, EventArgs e) { LoadNESNameTable(); } + private void saveNamedStateToolStripMenuItem_Click(object sender, EventArgs e) + { + SaveStateAs(); + } + + private void loadNamedStateToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadStateAs(); + } + + private void toolBoxToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadToolBox(); + } + + private void toolsToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + toolBoxToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["ToolBox"].Bindings; + rAMWatchToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Ram Watch"].Bindings; + rAMSearchToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Ram Search"].Bindings; + hexEditorToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Hex Editor"].Bindings; + luaConsoleToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Lua Console"].Bindings; + cheatsToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Cheats"].Bindings; + tAStudioToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["TAStudio"].Bindings; + virtualPadToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Virtual Pad"].Bindings; + traceLoggerToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Trace Logger"].Bindings; + toolBoxToolStripMenuItem.Enabled = !ToolBox1.IsHandleCreated || ToolBox1.IsDisposed; + traceLoggerToolStripMenuItem.Enabled = Global.Emulator.CoreComm.CpuTraceAvailable; + + cheatsToolStripMenuItem.Enabled = !(Global.Emulator is NullEmulator); + } + + private void saveSlotToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + selectSlot10ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 0"].Bindings; + selectSlot1ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 1"].Bindings; + selectSlot2ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 2"].Bindings; + selectSlot3ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 3"].Bindings; + selectSlot4ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 4"].Bindings; + selectSlot5ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 5"].Bindings; + selectSlot6ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 6"].Bindings; + selectSlot7ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 7"].Bindings; + selectSlot8ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 8"].Bindings; + selectSlot9ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Select State 9"].Bindings; + previousSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Previous Slot"].Bindings; + nextSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Next Slot"].Bindings; + saveToCurrentSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Quick Save"].Bindings; + loadCurrentSlotToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Quick Load"].Bindings; + } + + private void switchToFullscreenToolStripMenuItem_Click(object sender, EventArgs e) + { + ToggleFullscreen(); + } + + private void messagesToolStripMenuItem_Click(object sender, EventArgs e) + { + new MessageConfig().ShowDialog(); + } + private void autoloadVirtualKeyboardToolStripMenuItem_Click(object sender, EventArgs e) { if (!(Global.Emulator is TI83)) return; @@ -1326,6 +691,98 @@ namespace BizHawk.MultiClient if (!MainForm.INTERIM) loadTIFileToolStripMenuItem.Visible = false; } + private void pathsToolStripMenuItem_Click(object sender, EventArgs e) + { + new PathConfig().ShowDialog(); + } + + private void displayRerecordCountToolStripMenuItem_Click(object sender, EventArgs e) + { + GlobalWinF.DisplayManager.NeedsToPaint = true; + Global.Config.DisplayRerecordCount ^= true; + } + + private void recentROMToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + recentROMToolStripMenuItem.DropDownItems.Clear(); + recentROMToolStripMenuItem.DropDownItems.AddRange( + ToolHelpers.GenerateRecentMenu(Global.Config.RecentRoms, LoadRomFromRecent) + ); + recentROMToolStripMenuItem.DropDownItems.Add( + ToolHelpers.GenerateAutoLoadItem(Global.Config.RecentRoms) + ); + } + + private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + recentToolStripMenuItem.DropDownItems.Clear(); + recentToolStripMenuItem.DropDownItems.AddRange( + ToolHelpers.GenerateRecentMenu(Global.Config.RecentMovies, LoadMoviesFromRecent) + ); + recentToolStripMenuItem.DropDownItems.Add( + ToolHelpers.GenerateAutoLoadItem(Global.Config.RecentMovies) + ); + } + + private void screenshotAsToolStripMenuItem_Click(object sender, EventArgs e) + { + string path = String.Format(PathManager.ScreenshotPrefix(Global.Game) + ".{0:yyyy-MM-dd HH.mm.ss}.png", DateTime.Now); + + SaveFileDialog sfd = new SaveFileDialog + { + InitialDirectory = Path.GetDirectoryName(path), + FileName = Path.GetFileName(path), + Filter = "PNG File (*.png)|*.png" + }; + + GlobalWinF.Sound.StopSound(); + var result = sfd.ShowDialog(); + GlobalWinF.Sound.StartSound(); + if (result != DialogResult.OK) + return; + TakeScreenshot(sfd.FileName); + } + + private void runInBackgroundToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.RunInBackground ^= true; + } + + private void bindSavestatesToMoviesToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.BindSavestatesToMovies ^= true; + } + + private void acceptBackgroundInputToolStripMenuItem_Click(object sender, EventArgs e) + { + ToggleBackgroundInput(); + } + + public void ToggleBackgroundInput() + { + Global.Config.AcceptBackgroundInput ^= true; + if (Global.Config.AcceptBackgroundInput) + { + GlobalWinF.OSD.AddMessage("Background Input enabled"); + } + else + { + GlobalWinF.OSD.AddMessage("Background Input disabled"); + } + } + + private void displayStatusBarToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.DisplayStatusBar ^= true; + displayStatusBarToolStripMenuItem.Checked = Global.Config.DisplayStatusBar; + if (!InFullscreen) + { + StatusSlot0.Visible = Global.Config.DisplayStatusBar; + PerformLayout(); + FrameBufferResized(); + } + } + private void graphicsSettingsToolStripMenuItem_Click(object sender, EventArgs e) { NESGraphicsConfig g = new NESGraphicsConfig(); @@ -1351,7 +808,7 @@ namespace BizHawk.MultiClient { if (Global.Config.ShowContextMenu && e.Button == MouseButtons.Right) { - Point p = new Point(e.X, e.Y + MainformMenu.Height); + Point p = new Point(e.X, e.Y + menuStrip1.Height); Point po = PointToScreen(p); contextMenuStrip1.Show(po); } @@ -1367,6 +824,19 @@ namespace BizHawk.MultiClient LoadRomFromRecent(Global.Config.RecentRoms[0]); } + private void enableContextMenuToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.ShowContextMenu ^= true; + if (Global.Config.ShowContextMenu) + { + GlobalWinF.OSD.AddMessage("Context menu enabled"); + } + else + { + GlobalWinF.OSD.AddMessage("Context menu disabled"); + } + } + private void recordMovieToolStripMenuItem1_Click(object sender, EventArgs e) { RecordMovie(); @@ -1578,16 +1048,55 @@ namespace BizHawk.MultiClient Global.MovieSession.Movie.WriteBackup(); } + private void automaticallyBackupMoviesToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.EnableBackupMovies ^= true; + } + private void stopMovieToolStripMenuItem1_Click(object sender, EventArgs e) { StopMovie(); } + private void displayLogWindowToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.ShowLogWindow ^= true; + displayLogWindowToolStripMenuItem.Checked = Global.Config.ShowLogWindow; + if (Global.Config.ShowLogWindow) + ShowConsole(); + else + HideConsole(); + } + private void PauseStrip_Click(object sender, EventArgs e) { TogglePause(); } + private void displaySubtitlesToolStripMenuItem_Click(object sender, EventArgs e) + { + GlobalWinF.DisplayManager.NeedsToPaint = true; + Global.Config.DisplaySubtitles ^= true; + } + + private void aVIWAVToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + recordAVIToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Record A/V"].Bindings; + stopAVIToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Stop A/V"].Bindings; + captureOSDToolStripMenuItem.Checked = Global.Config.AVI_CaptureOSD; + + if (CurrAviWriter == null) + { + recordAVIToolStripMenuItem.Enabled = true; + stopAVIToolStripMenuItem.Enabled = false; + } + else + { + recordAVIToolStripMenuItem.Enabled = false; + stopAVIToolStripMenuItem.Enabled = true; + } + } + private void viewCommentsToolStripMenuItem_Click(object sender, EventArgs e) { if (Global.MovieSession.Movie.IsActive) @@ -1608,6 +1117,18 @@ namespace BizHawk.MultiClient } } + private void tAStudioToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadTAStudio(); + } + + private void singleInstanceModeToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SingleInstanceMode ^= true; + + MessageBox.Show("BizHawk must be restarted for this setting to take effect.", "Reboot Required", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + private void MainForm_Deactivate(object sender, EventArgs e) { if (!Global.Config.RunInBackground) @@ -1633,6 +1154,112 @@ namespace BizHawk.MultiClient } } + private void readonlyToolStripMenuItem_Click(object sender, EventArgs e) + { + ToggleReadOnly(); + } + + private void movieToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + fullMovieLoadstatesToolStripMenuItem.Enabled = !Global.MovieSession.MultiTrack.IsActive; + stopMovieWithoutSavingToolStripMenuItem.Enabled = Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie.HasChanges; + stopMovieToolStripMenuItem.Enabled + = playFromBeginningToolStripMenuItem.Enabled + = saveMovieToolStripMenuItem.Enabled + = Global.MovieSession.Movie.IsActive; + + readonlyToolStripMenuItem.Checked = ReadOnly; + bindSavestatesToMoviesToolStripMenuItem.Checked = Global.Config.BindSavestatesToMovies; + automaticallyBackupMoviesToolStripMenuItem.Checked = Global.Config.EnableBackupMovies; + fullMovieLoadstatesToolStripMenuItem.Checked = Global.Config.VBAStyleMovieLoadState; + + readonlyToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Toggle read-only"].Bindings; + recordMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Record Movie"].Bindings; + playMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Play Movie"].Bindings; + stopMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Stop Movie"].Bindings; + playFromBeginningToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Play from beginning"].Bindings; + saveMovieToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Save Movie"].Bindings; + } + + private void saveConfigToolStripMenuItem_Click(object sender, EventArgs e) + { + SaveConfig(); + GlobalWinF.OSD.AddMessage("Saved settings"); + } + + private void loadConfigToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config = ConfigService.Load(PathManager.DefaultIniPath, Global.Config); + Global.Config.ResolveDefaults(); + GlobalWinF.OSD.AddMessage("Config file loaded"); + } + + private void frameSkipToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + miAutoMinimizeSkipping.Checked = Global.Config.AutoMinimizeSkipping; + miLimitFramerate.Checked = Global.Config.ClockThrottle; + miDisplayVsync.Checked = Global.Config.VSyncThrottle; + miFrameskip0.Checked = Global.Config.FrameSkip == 0; + miFrameskip1.Checked = Global.Config.FrameSkip == 1; + miFrameskip2.Checked = Global.Config.FrameSkip == 2; + miFrameskip3.Checked = Global.Config.FrameSkip == 3; + miFrameskip4.Checked = Global.Config.FrameSkip == 4; + miFrameskip5.Checked = Global.Config.FrameSkip == 5; + miFrameskip6.Checked = Global.Config.FrameSkip == 6; + miFrameskip7.Checked = Global.Config.FrameSkip == 7; + miFrameskip8.Checked = Global.Config.FrameSkip == 8; + miFrameskip9.Checked = Global.Config.FrameSkip == 9; + miAutoMinimizeSkipping.Enabled = !miFrameskip0.Checked; + if (!miAutoMinimizeSkipping.Enabled) miAutoMinimizeSkipping.Checked = true; + audioThrottleToolStripMenuItem.Enabled = Global.Config.SoundEnabled; + audioThrottleToolStripMenuItem.Checked = Global.Config.SoundThrottle; + vSyncEnabledToolStripMenuItem.Checked = Global.Config.VSync; + + miSpeed100.Checked = Global.Config.SpeedPercent == 100; + miSpeed100.Image = (Global.Config.SpeedPercentAlternate == 100) ? Properties.Resources.FastForward : null; + miSpeed150.Checked = Global.Config.SpeedPercent == 150; + miSpeed150.Image = (Global.Config.SpeedPercentAlternate == 150) ? Properties.Resources.FastForward : null; + miSpeed200.Checked = Global.Config.SpeedPercent == 200; + miSpeed200.Image = (Global.Config.SpeedPercentAlternate == 200) ? Properties.Resources.FastForward : null; + miSpeed75.Checked = Global.Config.SpeedPercent == 75; + miSpeed75.Image = (Global.Config.SpeedPercentAlternate == 75) ? Properties.Resources.FastForward : null; + miSpeed50.Checked = Global.Config.SpeedPercent == 50; + miSpeed50.Image = (Global.Config.SpeedPercentAlternate == 50) ? Properties.Resources.FastForward : null; + } + + private void gUIToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + pauseWhenMenuActivatedToolStripMenuItem.Checked = Global.Config.PauseWhenMenuActivated; + startPausedToolStripMenuItem.Checked = Global.Config.StartPaused; + saveWindowPositionToolStripMenuItem.Checked = Global.Config.SaveWindowPosition; + forceGDIPPresentationToolStripMenuItem.Checked = Global.Config.DisplayGDI; + blurryToolStripMenuItem.Checked = Global.Config.DispBlurry; + miSuppressGuiLayer.Checked = Global.Config.SuppressGui; + showMenuInFullScreenToolStripMenuItem.Checked = Global.Config.ShowMenuInFullscreen; + runInBackgroundToolStripMenuItem.Checked = Global.Config.RunInBackground; + acceptBackgroundInputToolStripMenuItem.Checked = Global.Config.AcceptBackgroundInput; + singleInstanceModeToolStripMenuItem.Checked = Global.Config.SingleInstanceMode; + logWindowAsConsoleToolStripMenuItem.Checked = Global.Config.WIN32_CONSOLE; + neverBeAskedToSaveChangesToolStripMenuItem.Checked = Global.Config.SupressAskSave; + + acceptBackgroundInputToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Toggle BG Input"].Bindings; + } + + private void enableToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + enableContextMenuToolStripMenuItem.Checked = Global.Config.ShowContextMenu; + backupSavestatesToolStripMenuItem.Checked = Global.Config.BackupSavestates; + autoSavestatesToolStripMenuItem.Checked = Global.Config.AutoSavestates; + saveScreenshotWithSavestatesToolStripMenuItem.Checked = Global.Config.SaveScreenshotWithStates; + frameAdvanceSkipLagFramesToolStripMenuItem.Checked = Global.Config.SkipLagFrame; + backupSaveramToolStripMenuItem.Checked = Global.Config.BackupSaveram; + } + + private void frameAdvanceSkipLagFramesToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SkipLagFrame ^= true; + } + private void menuStrip1_MenuActivate(object sender, EventArgs e) { HandlePlatformMenus(); @@ -1656,6 +1283,176 @@ namespace BizHawk.MultiClient } } + private void viewToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + displayFPSToolStripMenuItem.Checked = Global.Config.DisplayFPS; + displayFrameCounterToolStripMenuItem.Checked = Global.Config.DisplayFrameCounter; + displayLagCounterToolStripMenuItem.Checked = Global.Config.DisplayLagCounter; + displayInputToolStripMenuItem.Checked = Global.Config.DisplayInput; + displayRerecordCountToolStripMenuItem.Checked = Global.Config.DisplayRerecordCount; + displaySubtitlesToolStripMenuItem.Checked = Global.Config.DisplaySubtitles; + + displayFPSToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Display FPS"].Bindings; + displayFrameCounterToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Frame Counter"].Bindings; + displayLagCounterToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Lag Counter"].Bindings; + displayInputToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Input Display"].Bindings; + switchToFullscreenToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Full Screen"].Bindings; + + x1MenuItem.Checked = false; + x2MenuItem.Checked = false; + x3MenuItem.Checked = false; + x4MenuItem.Checked = false; + x5MenuItem.Checked = false; + switch (Global.Config.TargetZoomFactor) + { + case 1: x1MenuItem.Checked = true; break; + case 2: x2MenuItem.Checked = true; break; + case 3: x3MenuItem.Checked = true; break; + case 4: x4MenuItem.Checked = true; break; + case 5: x5MenuItem.Checked = true; break; + case 10: mzMenuItem.Checked = true; break; + } + } + + private void fileToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + if (IsNullEmulator()) + { + movieToolStripMenuItem.Enabled = false; + AVIWAVToolStripMenuItem.Enabled = false; + screenshotToolStripMenuItem.Enabled = false; + closeROMToolStripMenuItem.Enabled = false; + saveToCurrentSlotToolStripMenuItem.Enabled = false; + loadCurrentSlotToolStripMenuItem.Enabled = false; + loadNamedStateToolStripMenuItem.Enabled = false; + saveNamedStateToolStripMenuItem.Enabled = false; + savestate1toolStripMenuItem.Enabled = false; + savestate2toolStripMenuItem.Enabled = false; + savestate3toolStripMenuItem.Enabled = false; + savestate4toolStripMenuItem.Enabled = false; + savestate5toolStripMenuItem.Enabled = false; + savestate6toolStripMenuItem.Enabled = false; + savestate7toolStripMenuItem.Enabled = false; + savestate8toolStripMenuItem.Enabled = false; + savestate9toolStripMenuItem.Enabled = false; + savestate0toolStripMenuItem.Enabled = false; + loadstate1toolStripMenuItem.Enabled = false; + loadstate2toolStripMenuItem.Enabled = false; + loadstate3toolStripMenuItem.Enabled = false; + loadstate4toolStripMenuItem.Enabled = false; + loadstate5toolStripMenuItem.Enabled = false; + loadstate6toolStripMenuItem.Enabled = false; + loadstate7toolStripMenuItem.Enabled = false; + loadstate8toolStripMenuItem.Enabled = false; + loadstate9toolStripMenuItem.Enabled = false; + loadstate0toolStripMenuItem.Enabled = false; + } + else + { + movieToolStripMenuItem.Enabled = true; + AVIWAVToolStripMenuItem.Enabled = true; + screenshotToolStripMenuItem.Enabled = true; + closeROMToolStripMenuItem.Enabled = true; + saveToCurrentSlotToolStripMenuItem.Enabled = true; + loadCurrentSlotToolStripMenuItem.Enabled = true; + loadNamedStateToolStripMenuItem.Enabled = true; + saveNamedStateToolStripMenuItem.Enabled = true; + savestate1toolStripMenuItem.Enabled = true; + savestate2toolStripMenuItem.Enabled = true; + savestate3toolStripMenuItem.Enabled = true; + savestate4toolStripMenuItem.Enabled = true; + savestate5toolStripMenuItem.Enabled = true; + savestate6toolStripMenuItem.Enabled = true; + savestate7toolStripMenuItem.Enabled = true; + savestate8toolStripMenuItem.Enabled = true; + savestate9toolStripMenuItem.Enabled = true; + savestate0toolStripMenuItem.Enabled = true; + loadstate1toolStripMenuItem.Enabled = true; + loadstate2toolStripMenuItem.Enabled = true; + loadstate3toolStripMenuItem.Enabled = true; + loadstate4toolStripMenuItem.Enabled = true; + loadstate5toolStripMenuItem.Enabled = true; + loadstate6toolStripMenuItem.Enabled = true; + loadstate7toolStripMenuItem.Enabled = true; + loadstate8toolStripMenuItem.Enabled = true; + loadstate9toolStripMenuItem.Enabled = true; + loadstate0toolStripMenuItem.Enabled = true; + } + + selectSlot10ToolStripMenuItem.Checked = false; + selectSlot1ToolStripMenuItem.Checked = false; + selectSlot2ToolStripMenuItem.Checked = false; + selectSlot3ToolStripMenuItem.Checked = false; + selectSlot4ToolStripMenuItem.Checked = false; + selectSlot5ToolStripMenuItem.Checked = false; + selectSlot6ToolStripMenuItem.Checked = false; + selectSlot7ToolStripMenuItem.Checked = false; + selectSlot8ToolStripMenuItem.Checked = false; + selectSlot9ToolStripMenuItem.Checked = false; + selectSlot1ToolStripMenuItem.Checked = false; + + switch (Global.Config.SaveSlot) + { + case 0: + selectSlot10ToolStripMenuItem.Checked = true; + break; + case 1: + selectSlot1ToolStripMenuItem.Checked = true; + break; + case 2: + selectSlot2ToolStripMenuItem.Checked = true; + break; + case 3: + selectSlot3ToolStripMenuItem.Checked = true; + break; + case 4: + selectSlot4ToolStripMenuItem.Checked = true; + break; + case 5: + selectSlot5ToolStripMenuItem.Checked = true; + break; + case 6: + selectSlot6ToolStripMenuItem.Checked = true; + break; + case 7: + selectSlot7ToolStripMenuItem.Checked = true; + break; + case 8: + selectSlot8ToolStripMenuItem.Checked = true; + break; + case 9: + selectSlot9ToolStripMenuItem.Checked = true; + break; + } + + screenshotF12ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Screenshot"].Bindings; + openROMToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Open ROM"].Bindings; + closeROMToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Close ROM"].Bindings; + } + + private void emulationToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + rebootCoreToolStripMenuItem.Enabled = !IsNullEmulator(); + + resetToolStripMenuItem.Enabled = Global.Emulator.ControllerDefinition.BoolButtons.Contains("Reset") && + (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished); + + + hardResetToolStripMenuItem.Enabled = Global.Emulator.ControllerDefinition.BoolButtons.Contains("Power") && + (!Global.MovieSession.Movie.IsPlaying || Global.MovieSession.Movie.IsFinished); + + pauseToolStripMenuItem.Checked = EmulatorPaused; + if (didMenuPause) + { + pauseToolStripMenuItem.Checked = wasPaused; + } + + pauseToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Pause"].Bindings; + rebootCoreToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Reboot Core"].Bindings; + resetToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Soft Reset"].Bindings; + hardResetToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Hard Reset"].Bindings; + } + private void pCEToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { pceAlwaysPerformSpriteLimitToolStripMenuItem.Checked = Global.Config.PceSpriteLimit; @@ -1701,6 +1498,45 @@ namespace BizHawk.MultiClient base.OnClosed(e); } + private void backupSavestatesToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.BackupSavestates ^= true; + if (Global.Config.BackupSavestates) + { + GlobalWinF.OSD.AddMessage("Backup savestates enabled"); + } + else + { + GlobalWinF.OSD.AddMessage("Backup savestates disabled"); + } + } + + void autoSavestatesToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.AutoSavestates ^= true; + if (Global.Config.AutoSavestates) + { + GlobalWinF.OSD.AddMessage("AutoSavestates enabled"); + } + else + { + GlobalWinF.OSD.AddMessage("AutoSavestates disabled"); + } + } + + void screenshotWithSavestatesToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveScreenshotWithStates ^= true; + if (Global.Config.SaveScreenshotWithStates) + { + GlobalWinF.OSD.AddMessage("Screenshots will be saved in savestates"); + } + else + { + GlobalWinF.OSD.AddMessage("Screenshots will not be saved in savestates"); + } + } + private void undoSavestateToolStripMenuItem_Click(object sender, EventArgs e) { string path = PathManager.SaveStatePrefix(Global.Game) + "." + "QuickSave" + Global.Config.SaveSlot + ".State"; @@ -1732,6 +1568,26 @@ namespace BizHawk.MultiClient } } + private void autofireToolStripMenuItem_Click(object sender, EventArgs e) + { + new AutofireConfig().ShowDialog(); + } + + private void autoLoadLastSlotToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.AutoLoadLastSaveSlot ^= true; + } + + private void logWindowAsConsoleToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.WIN32_CONSOLE ^= true; + } + + private void showMenuInFullScreenToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.ShowMenuInFullscreen ^= true; + } + private void showMenuToolStripMenuItem_Click(object sender, EventArgs e) { ShowHideMenu(); @@ -2085,6 +1941,11 @@ namespace BizHawk.MultiClient oBJ3ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Toggle OBJ 4"].Bindings; } + private void captureOSDToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.AVI_CaptureOSD ^= true; + } + private void forceDMGModeToolStripMenuItem_Click(object sender, EventArgs e) { Global.Config.GB_ForceDMG ^= true; @@ -2258,6 +2119,42 @@ namespace BizHawk.MultiClient e.Effect = e.Data.GetDataPresent(DataFormats.FileDrop) ? DragDropEffects.Copy : DragDropEffects.None; } + private void importMovieToolStripMenuItem_Click(object sender, EventArgs e) + { + var ofd = new OpenFileDialog + { + InitialDirectory = PathManager.GetRomsPath(Global.Emulator.SystemId), + Multiselect = true, + Filter = FormatFilter( + "Movie Files", "*.fm2;*.mc2;*.mcm;*.mmv;*.gmv;*.vbm;*.lsmv;*.fcm;*.fmv;*.vmv;*.nmv;*.smv;*.zmv;", + "FCEUX", "*.fm2", + "PCEjin/Mednafen", "*.mc2;*.mcm", + "Dega", "*.mmv", + "Gens", "*.gmv", + "Visual Boy Advance", "*.vbm", + "LSNES", "*.lsmv", + "FCEU", "*.fcm", + "Famtasia", "*.fmv", + "VirtuaNES", "*.vmv", + "Nintendulator", "*.nmv", + "Snes9x", "*.smv", + "ZSNES", "*.zmv", + "All Files", "*.*"), + RestoreDirectory = false + }; + + GlobalWinF.Sound.StopSound(); + var result = ofd.ShowDialog(); + GlobalWinF.Sound.StartSound(); + if (result != DialogResult.OK) + return; + + foreach (string fn in ofd.FileNames) + { + ProcessMovieImport(fn); + } + } + private void FormDragDrop(object sender, DragEventArgs e) { string[] filePaths = (string[])e.Data.GetData(DataFormats.FileDrop); @@ -2343,6 +2240,11 @@ namespace BizHawk.MultiClient StopMovie(true); } + private void stopMovieWithoutSavingToolStripMenuItem_Click(object sender, EventArgs e) + { + StopMovie(true); + } + private void SNESgameGenieCodesToolStripMenuItem_Click(object sender, EventArgs e) { LoadGameGenieEC(); @@ -2358,6 +2260,16 @@ namespace BizHawk.MultiClient LoadGameGenieEC(); } + private void createDualGBXMLToolStripMenuItem_Click(object sender, EventArgs e) + { + GlobalWinF.Sound.StopSound(); + using (var dlg = new GBtools.DualGBXMLCreator()) + { + dlg.ShowDialog(this); + } + GlobalWinF.Sound.StartSound(); + } + private void tempN64PluginControlToolStripMenuItem_Click(object sender, EventArgs e) { var result = new N64VideoPluginconfig().ShowDialog(); @@ -2371,6 +2283,34 @@ namespace BizHawk.MultiClient } } + private void savestateTypeToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + defaultToolStripMenuItem.Checked = false; + binaryToolStripMenuItem.Checked = false; + textToolStripMenuItem.Checked = false; + switch (Global.Config.SaveStateType) + { + case Config.SaveStateTypeE.Binary: binaryToolStripMenuItem.Checked = true; break; + case Config.SaveStateTypeE.Text: textToolStripMenuItem.Checked = true; break; + case Config.SaveStateTypeE.Default: defaultToolStripMenuItem.Checked = true; break; + } + } + + private void defaultToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveStateType = Config.SaveStateTypeE.Default; + } + + private void binaryToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveStateType = Config.SaveStateTypeE.Binary; + } + + private void textToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SaveStateType = Config.SaveStateTypeE.Text; + } + private void preferencesToolStripMenuItem_Click(object sender, EventArgs e) { using (var dlg = new SaturnPrefs()) @@ -2383,6 +2323,16 @@ namespace BizHawk.MultiClient } } + private void controllersToolStripMenuItem1_Click(object sender, EventArgs e) + { + OpenControllerConfig(); + } + + private void hotkeysToolStripMenuItem1_Click(object sender, EventArgs e) + { + OpenHotkeyDialog(); + } + private void messagesToolStripMenuItem1_Click(object sender, EventArgs e) { new MessageConfig().ShowDialog(); @@ -2393,11 +2343,21 @@ namespace BizHawk.MultiClient new PathConfig().ShowDialog(); } + private void soundToolStripMenuItem1_Click(object sender, EventArgs e) + { + OpenSoundConfigDialog(); + } + private void autofireToolStripMenuItem1_Click(object sender, EventArgs e) { new AutofireConfig().ShowDialog(); } + private void neverBeAskedToSaveChangesToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.SupressAskSave ^= true; + } + private void soundChannelsToolStripMenuItem_Click(object sender, EventArgs e) { LoadNesSoundConfig(); @@ -2422,6 +2382,16 @@ namespace BizHawk.MultiClient } } + private void captureOSDToolStripMenuItem1_Click(object sender, EventArgs e) + { + Global.Config.Screenshot_CaptureOSD ^= true; + } + + private void screenshotToolStripMenuItem_DropDownOpening(object sender, EventArgs e) + { + captureOSDToolStripMenuItem1.Checked = Global.Config.Screenshot_CaptureOSD; + } + private void sNESToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { if ((Global.Emulator as LibsnesCore).IsSGB) @@ -2449,11 +2419,35 @@ namespace BizHawk.MultiClient GlobalWinF.RenderPanel.Resized = true; } + private void backupSaveramToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.BackupSaveram ^= true; + if (Global.Config.BackupSaveram) + { + GlobalWinF.OSD.AddMessage("Backup saveram enabled"); + } + else + { + GlobalWinF.OSD.AddMessage("Backup saveram disabled"); + } + + } + private void toolStripStatusLabel2_Click(object sender, EventArgs e) { RebootCore(); } + private void traceLoggerToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadTraceLogger(); + } + + private void blurryToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.DispBlurry ^= true; + } + private void showClippedRegionsToolStripMenuItem_Click(object sender, EventArgs e) { Global.Config.GGShowClippedRegions ^= true; @@ -2466,11 +2460,21 @@ namespace BizHawk.MultiClient GlobalWinF.CoreComm.GG_HighlightActiveDisplayRegion = Global.Config.GGHighlightActiveDisplayRegion; } + private void saveMovieToolStripMenuItem_Click(object sender, EventArgs e) + { + SaveMovie(); + } + private void saveMovieToolStripMenuItem1_Click(object sender, EventArgs e) { SaveMovie(); } + private void virtualPadToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadVirtualPads(); + } + private void showBGToolStripMenuItem_Click(object sender, EventArgs e) { Global.Config.Atari2600_ShowBG ^= true; @@ -2518,6 +2522,10 @@ namespace BizHawk.MultiClient LoadGBGPUView(); } + private void miLimitFramerate_DropDownOpened(object sender, EventArgs e) + { + } + private void skipBIOIntroToolStripMenuItem_Click(object sender, EventArgs e) { Global.Config.ColecoSkipBiosIntro ^= true; @@ -2534,6 +2542,47 @@ namespace BizHawk.MultiClient LoadGBAGPUView(); } + private void bothHotkeysAndControllersToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.Input_Hotkey_OverrideOptions = 0; + UpdateKeyPriorityIcon(); + } + + private void inputOverridesHotkeysToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.Input_Hotkey_OverrideOptions = 1; + UpdateKeyPriorityIcon(); + } + + private void hotkeysOverrideInputToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.Input_Hotkey_OverrideOptions = 2; + UpdateKeyPriorityIcon(); + } + + private void keyPriorityToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + switch (Global.Config.Input_Hotkey_OverrideOptions) + { + default: + case 0: + bothHotkeysAndControllersToolStripMenuItem.Checked = true; + inputOverridesHotkeysToolStripMenuItem.Checked = false; + hotkeysOverrideInputToolStripMenuItem.Checked = false; + break; + case 1: + bothHotkeysAndControllersToolStripMenuItem.Checked = false; + inputOverridesHotkeysToolStripMenuItem.Checked = true; + hotkeysOverrideInputToolStripMenuItem.Checked = false; + break; + case 2: + bothHotkeysAndControllersToolStripMenuItem.Checked = false; + inputOverridesHotkeysToolStripMenuItem.Checked = false; + hotkeysOverrideInputToolStripMenuItem.Checked = true; + break; + } + } + private void KeyPriorityStatusBarLabel_Click(object sender, EventArgs e) { switch (Global.Config.Input_Hotkey_OverrideOptions) @@ -2552,6 +2601,16 @@ namespace BizHawk.MultiClient UpdateKeyPriorityIcon(); } + private void fullMovieLoadstatesToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.VBAStyleMovieLoadState ^= true; + } + + private void rewindOptionsToolStripMenuItem_Click(object sender, EventArgs e) + { + new RewindConfig().ShowDialog(); + } + private void loadTIFileToolStripMenuItem_Click(object sender, EventArgs e) { OpenFileDialog OFD = new OpenFileDialog(); diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index dd694718e8..445826a724 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -189,7 +189,7 @@ namespace BizHawk.MultiClient { ShowConsole(); //PsxApi.StdioFixes(); - DisplayLogWindowMenuItem.Checked = true; + displayLogWindowToolStripMenuItem.Checked = true; } throttle = new Throttle(); @@ -429,7 +429,7 @@ namespace BizHawk.MultiClient } else { - DisplayStatusBarMenuItem.Checked = true; + displayStatusBarToolStripMenuItem.Checked = true; } if (Global.Config.StartPaused) @@ -625,7 +625,7 @@ namespace BizHawk.MultiClient { bool fastforward = GlobalWinF.ClientControls["Fast Forward"] || FastForward; bool superfastforward = GlobalWinF.ClientControls["Turbo"]; - Global.ForceNoThrottle = unthrottled || fastforward; + GlobalWinF.ForceNoThrottle = unthrottled || fastforward; // realtime throttle is never going to be so exact that using a double here is wrong throttle.SetCoreFps(Global.Emulator.CoreComm.VsyncRate); @@ -1228,9 +1228,10 @@ namespace BizHawk.MultiClient } else if (file.Extension.ToLower() == ".xml") { - try + var XMLG = XmlGame.Create(file); + + if (XMLG != null) { - var XMLG = XmlGame.Create(file); // if load fails, are we supposed to retry as a bsnes XML???????? game = XMLG.GI; switch (game.System) @@ -1255,11 +1256,9 @@ namespace BizHawk.MultiClient default: return false; } + } - catch(Exception ex) - { - System.Windows.Forms.MessageBox.Show(ex.ToString(), "XMLGame Load Error"); - } + // if load fails, are we supposed to retry as a bsnes XML???????? } else // most extensions { @@ -3207,7 +3206,7 @@ namespace BizHawk.MultiClient //sends an alt+mnemonic combination void SendAltKeyChar(char c) { - typeof(ToolStrip).InvokeMember("ProcessMnemonicInternal", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Instance, null, MainformMenu, new object[] { c }); + typeof(ToolStrip).InvokeMember("ProcessMnemonicInternal", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.InvokeMethod | System.Reflection.BindingFlags.Instance, null, menuStrip1, new object[] { c }); } string FormatFilter(params string[] args) @@ -4033,19 +4032,19 @@ namespace BizHawk.MultiClient private void ShowConsole() { LogConsole.ShowConsole(); - LogWindowAsConsoleMenuItem.Enabled = false; + logWindowAsConsoleToolStripMenuItem.Enabled = false; } private void HideConsole() { LogConsole.HideConsole(); - LogWindowAsConsoleMenuItem.Enabled = true; + logWindowAsConsoleToolStripMenuItem.Enabled = true; } public void notifyLogWindowClosing() { - DisplayLogWindowMenuItem.Checked = false; - LogWindowAsConsoleMenuItem.Enabled = true; + displayLogWindowToolStripMenuItem.Checked = false; + logWindowAsConsoleToolStripMenuItem.Enabled = true; } private void MainForm_Load(object sender, EventArgs e) @@ -4284,6 +4283,16 @@ namespace BizHawk.MultiClient } } + private void configToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + controllersToolStripMenuItem.Enabled = !(Global.Emulator is NullEmulator); + } + + private void firmwaresToolStripMenuItem_Click(object sender, EventArgs e) + { + new FirmwaresConfig().Show(); + } + private void menuStrip1_Leave(object sender, EventArgs e) { GlobalWinF.DisplayManager.NeedsToPaint = true; @@ -4318,65 +4327,5 @@ namespace BizHawk.MultiClient { CloseROM(clearSRAM: true); } - - public void ToggleBackgroundInput() - { - Global.Config.AcceptBackgroundInput ^= true; - if (Global.Config.AcceptBackgroundInput) - { - GlobalWinF.OSD.AddMessage("Background Input enabled"); - } - else - { - GlobalWinF.OSD.AddMessage("Background Input disabled"); - } - } - - public void LimitFrameRateMessage() - { - if (Global.Config.ClockThrottle) - { - GlobalWinF.OSD.AddMessage("Framerate limiting on"); - } - else - { - GlobalWinF.OSD.AddMessage("Framerate limiting off"); - } - } - - public void ClickSpeedItem(int num) - { - if ((ModifierKeys & Keys.Control) != 0) SetSpeedPercentAlternate(num); - else SetSpeedPercent(num); - } - - public void VsyncMessage() - { - if (Global.Config.VSyncThrottle) - { - GlobalWinF.OSD.AddMessage("Display Vsync is set to on"); - } - else - { - GlobalWinF.OSD.AddMessage("Display Vsync is set to off"); - } - } - - public void MinimizeFrameskipMessage() - { - if (Global.Config.AutoMinimizeSkipping) - { - GlobalWinF.OSD.AddMessage("Autominimizing set to on"); - } - else - { - GlobalWinF.OSD.AddMessage("Autominimizing set to off"); - } - } - - public void FrameSkipMessage() - { - GlobalWinF.OSD.AddMessage("Frameskipping set to " + Global.Config.FrameSkip.ToString()); - } } } diff --git a/BizHawk.MultiClient/MainForm.resx b/BizHawk.MultiClient/MainForm.resx index 1a9135e58d..7234c3d0c1 100644 --- a/BizHawk.MultiClient/MainForm.resx +++ b/BizHawk.MultiClient/MainForm.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 diff --git a/BizHawk.Common/MruStack.cs b/BizHawk.MultiClient/MruStack.cs similarity index 89% rename from BizHawk.Common/MruStack.cs rename to BizHawk.MultiClient/MruStack.cs index 72f915dea0..9b7713998f 100644 --- a/BizHawk.Common/MruStack.cs +++ b/BizHawk.MultiClient/MruStack.cs @@ -1,4 +1,4 @@ -namespace BizHawk.Common +namespace BizHawk.MultiClient { public class MruStack { diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs index 37e1876dd2..bdec14fb5c 100644 --- a/BizHawk.MultiClient/RenderPanel.cs +++ b/BizHawk.MultiClient/RenderPanel.cs @@ -392,7 +392,7 @@ namespace BizHawk.MultiClient { get { - if (Global.ForceNoThrottle) + if (GlobalWinF.ForceNoThrottle) return false; return Global.Config.VSyncThrottle || Global.Config.VSync; } diff --git a/BizHawk.Client.Common/SavestateManager.cs b/BizHawk.MultiClient/SavestateManager.cs similarity index 79% rename from BizHawk.Client.Common/SavestateManager.cs rename to BizHawk.MultiClient/SavestateManager.cs index d0e94b9e68..c4ac71c5a6 100644 --- a/BizHawk.Client.Common/SavestateManager.cs +++ b/BizHawk.MultiClient/SavestateManager.cs @@ -1,8 +1,10 @@ using System.IO; -namespace BizHawk.Client.Common +using BizHawk.Client.Common; + +namespace BizHawk.MultiClient { - public class SavestateManager + class SavestateManager { private readonly bool[] slots = new bool[10]; private readonly bool[] redo = new bool[10]; @@ -30,17 +32,14 @@ namespace BizHawk.Client.Common } } - public bool HasSavestateSlots + public bool HasSavestateSlots() { - get + Update(); + for (int x = 0; x < 10; x++) { - Update(); - for (int x = 0; x < 10; x++) - { - if (slots[x]) return true; - } - return false; + if (slots[x]) return true; } + return false; } public bool HasSlot(int slot) diff --git a/BizHawk.MultiClient/Sound.cs b/BizHawk.MultiClient/Sound.cs index c114ce516f..a481e17934 100644 --- a/BizHawk.MultiClient/Sound.cs +++ b/BizHawk.MultiClient/Sound.cs @@ -208,7 +208,7 @@ namespace BizHawk.MultiClient samplesProvided = 2 * nsampgot; - if (!Global.ForceNoThrottle) + if (!GlobalWinF.ForceNoThrottle) while (samplesNeeded < samplesProvided) { System.Threading.Thread.Sleep((samplesProvided - samplesNeeded) / 88); // let audio clock control sleep time diff --git a/BizHawk.Client.Common/XmlGame.cs b/BizHawk.MultiClient/XmlGame.cs similarity index 89% rename from BizHawk.Client.Common/XmlGame.cs rename to BizHawk.MultiClient/XmlGame.cs index 8740535395..c429a94aec 100644 --- a/BizHawk.Client.Common/XmlGame.cs +++ b/BizHawk.MultiClient/XmlGame.cs @@ -5,7 +5,9 @@ using System.Text; using System.IO; using System.Xml; -namespace BizHawk.Client.Common +using BizHawk.Client.Common; + +namespace BizHawk.MultiClient { public class XmlGame { @@ -94,9 +96,10 @@ namespace BizHawk.Client.Common } return ret; } - catch(Exception ex) + catch (Exception e) { - throw new InvalidOperationException(ex.ToString()); + System.Windows.Forms.MessageBox.Show(e.ToString(), "XMLGame Load Error"); + return null; } } diff --git a/BizHawk.Client.Common/PathManager.cs b/BizHawk.MultiClient/config/PathManager.cs similarity index 93% rename from BizHawk.Client.Common/PathManager.cs rename to BizHawk.MultiClient/config/PathManager.cs index c2e6bcaf5a..16c47670bf 100644 --- a/BizHawk.Client.Common/PathManager.cs +++ b/BizHawk.MultiClient/config/PathManager.cs @@ -3,13 +3,17 @@ using System.Linq; using System.IO; using System.Reflection; -namespace BizHawk.Client.Common +using BizHawk.Client.Common; + +namespace BizHawk.MultiClient { public static class PathManager { public static string GetExeDirectoryAbsolute() { - return AppDomain.CurrentDomain.BaseDirectory; + var uri = new Uri(Assembly.GetEntryAssembly().GetName().CodeBase); + string module = uri.LocalPath + System.Web.HttpUtility.UrlDecode(uri.Fragment); + return Path.GetDirectoryName(module); } /// diff --git a/BizHawk.MultiClient/tools/NES/MovieConvert.cs b/BizHawk.MultiClient/tools/NES/MovieConvert.cs new file mode 100644 index 0000000000..cda25a13df --- /dev/null +++ b/BizHawk.MultiClient/tools/NES/MovieConvert.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace BizHawk.MultiClient.movie +{ + public static class MovieConvert + { + public static void ConvertFCM(string path) + { + + } + + public static void ConvertMMV(string path) + { + + } + + public static void ConvertMCM(string path) + { + + } + + public static void ConvertSMV(string path) + { + + } + + public static void ConvertGMV(string path) + { + + } + + public static void ConvertVBM(string path) + { + + } + } +} diff --git a/BizHawk.MultiClient/tools/ToolHelpers.cs b/BizHawk.MultiClient/tools/ToolHelpers.cs index 903c8ab1c7..705c39cbdc 100644 --- a/BizHawk.MultiClient/tools/ToolHelpers.cs +++ b/BizHawk.MultiClient/tools/ToolHelpers.cs @@ -11,55 +11,6 @@ namespace BizHawk.MultiClient { class ToolHelpers { - public static FileInfo GetWatchFileFromUser(string currentFile) - { - var ofd = new OpenFileDialog(); - if (!String.IsNullOrWhiteSpace(currentFile)) - { - ofd.FileName = Path.GetFileNameWithoutExtension(currentFile); - } - ofd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.WatchPath, null); - ofd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*"; - ofd.RestoreDirectory = true; - - GlobalWinF.Sound.StopSound(); - var result = ofd.ShowDialog(); - GlobalWinF.Sound.StartSound(); - if (result != DialogResult.OK) - return null; - var file = new FileInfo(ofd.FileName); - return file; - } - - public static FileInfo GetWatchSaveFileFromUser(string currentFile) - { - var sfd = new SaveFileDialog(); - if (!String.IsNullOrWhiteSpace(currentFile)) - { - sfd.FileName = Path.GetFileNameWithoutExtension(currentFile); - sfd.InitialDirectory = Path.GetDirectoryName(currentFile); - } - else if (!(Global.Emulator is NullEmulator)) - { - sfd.FileName = PathManager.FilesystemSafeName(Global.Game); - sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.WatchPath, null); - } - else - { - sfd.FileName = "NULL"; - sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.WatchPath, null); - } - sfd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*"; - sfd.RestoreDirectory = true; - GlobalWinF.Sound.StopSound(); - var result = sfd.ShowDialog(); - GlobalWinF.Sound.StartSound(); - if (result != DialogResult.OK) - return null; - var file = new FileInfo(sfd.FileName); - return file; - } - public static FileInfo GetCheatFileFromUser(string currentFile) { var ofd = new OpenFileDialog(); diff --git a/BizHawk.MultiClient/tools/Watch/RamSearch.cs b/BizHawk.MultiClient/tools/Watch/RamSearch.cs index 335e5c5ae0..626dd6f03b 100644 --- a/BizHawk.MultiClient/tools/Watch/RamSearch.cs +++ b/BizHawk.MultiClient/tools/Watch/RamSearch.cs @@ -19,15 +19,19 @@ namespace BizHawk.MultiClient /// public partial class RamSearch : Form { - //TODO: DoSearch grabs the state of widgets and passes it to the engine before running, so rip out code that is attempting to keep the state up to date through change events + public const string ADDRESS = "AddressColumn"; + public const string VALUE = "ValueColumn"; + public const string PREV = "PrevColumn"; + public const string CHANGES = "ChangesColumn"; + public const string DIFF = "DiffColumn"; private readonly Dictionary DefaultColumnWidths = new Dictionary { - { WatchList.ADDRESS, 60 }, - { WatchList.VALUE, 59 }, - { WatchList.PREV, 59 }, - { WatchList.CHANGES, 55 }, - { WatchList.DIFF, 59 }, + { ADDRESS, 60 }, + { VALUE, 59 }, + { PREV, 59 }, + { CHANGES, 55 }, + { DIFF, 59 }, }; private string CurrentFileName = String.Empty; @@ -170,19 +174,19 @@ namespace BizHawk.MultiClient string columnName = WatchListView.Columns[column].Name; switch (columnName) { - case WatchList.ADDRESS: + case ADDRESS: text = Searches[index].AddressString; break; - case WatchList.VALUE: + case VALUE: text = Searches[index].ValueString; break; - case WatchList.PREV: + case PREV: text = Searches[index].PreviousStr; break; - case WatchList.CHANGES: + case CHANGES: text = Searches[index].ChangeCount.ToString(); break; - case WatchList.DIFF: + case DIFF: text = Searches[index].Diff; break; } @@ -409,39 +413,10 @@ namespace BizHawk.MultiClient } } - private RamSearchEngine.ComparisonOperator Operator - { - get - { - if (NotEqualToRadio.Checked) return RamSearchEngine.ComparisonOperator.NotEqual; - else if (LessThanRadio.Checked) return RamSearchEngine.ComparisonOperator.LessThan; - else if (GreaterThanRadio.Checked) return RamSearchEngine.ComparisonOperator.GreaterThan; - else if (LessThanOrEqualToRadio.Checked) return RamSearchEngine.ComparisonOperator.LessThanEqual; - else if (GreaterThanOrEqualToRadio.Checked) return RamSearchEngine.ComparisonOperator.GreaterThanEqual; - else if (DifferentByRadio.Checked) return RamSearchEngine.ComparisonOperator.DifferentBy; - else return RamSearchEngine.ComparisonOperator.Equal; - } - } - - private RamSearchEngine.Compare Compare - { - get - { - if (SpecificValueRadio.Checked) return RamSearchEngine.Compare.SpecificValue; - else if (SpecificAddressRadio.Checked) return RamSearchEngine.Compare.SpecificAddress; - else if (NumberOfChangesRadio.Checked) return RamSearchEngine.Compare.Changes; - else if (DifferenceRadio.Checked) return RamSearchEngine.Compare.Difference; - else return RamSearchEngine.Compare.Previous; - } - } - public void DoSearch() { Searches.CompareValue = CompareToValue; Searches.DifferentBy = DifferentByValue; - Searches.Operator = Operator; - Searches.CompareTo = Compare; - int removed = Searches.DoSearch(); SetTotal(); WatchListView.ItemCount = Searches.Count; @@ -540,11 +515,11 @@ namespace BizHawk.MultiClient private void LoadColumnInfo() { WatchListView.Columns.Clear(); - ToolHelpers.AddColumn(WatchListView, WatchList.ADDRESS, true, GetColumnWidth(WatchList.ADDRESS)); - ToolHelpers.AddColumn(WatchListView, WatchList.VALUE, true, GetColumnWidth(WatchList.VALUE)); - ToolHelpers.AddColumn(WatchListView, WatchList.PREV, Global.Config.RamSearchShowPrevColumn, GetColumnWidth(WatchList.PREV)); - ToolHelpers.AddColumn(WatchListView, WatchList.CHANGES, Global.Config.RamSearchShowChangeColumn, GetColumnWidth(WatchList.CHANGES)); - ToolHelpers.AddColumn(WatchListView, WatchList.DIFF, Global.Config.RamSearchShowDiffColumn, GetColumnWidth(WatchList.DIFF)); + ToolHelpers.AddColumn(WatchListView, ADDRESS, true, GetColumnWidth(ADDRESS)); + ToolHelpers.AddColumn(WatchListView, VALUE, true, GetColumnWidth(VALUE)); + ToolHelpers.AddColumn(WatchListView, PREV, Global.Config.RamSearchShowPrevColumn, GetColumnWidth(PREV)); + ToolHelpers.AddColumn(WatchListView, CHANGES, Global.Config.RamSearchShowChangeColumn, GetColumnWidth(CHANGES)); + ToolHelpers.AddColumn(WatchListView, DIFF, Global.Config.RamSearchShowDiffColumn, GetColumnWidth(DIFF)); ColumnPositions(); } @@ -567,34 +542,34 @@ namespace BizHawk.MultiClient private void SaveColumnInfo() { - if (WatchListView.Columns[WatchList.ADDRESS] != null) + if (WatchListView.Columns[ADDRESS] != null) { - Global.Config.RamSearchColumnIndexes[WatchList.ADDRESS] = WatchListView.Columns[WatchList.ADDRESS].DisplayIndex; - Global.Config.RamSearchColumnWidths[WatchList.ADDRESS] = WatchListView.Columns[WatchList.ADDRESS].Width; + Global.Config.RamSearchColumnIndexes[ADDRESS] = WatchListView.Columns[ADDRESS].DisplayIndex; + Global.Config.RamSearchColumnWidths[ADDRESS] = WatchListView.Columns[ADDRESS].Width; } - if (WatchListView.Columns[WatchList.VALUE] != null) + if (WatchListView.Columns[VALUE] != null) { - Global.Config.RamSearchColumnIndexes[WatchList.VALUE] = WatchListView.Columns[WatchList.VALUE].DisplayIndex; - Global.Config.RamSearchColumnWidths[WatchList.VALUE] = WatchListView.Columns[WatchList.VALUE].Width; + Global.Config.RamSearchColumnIndexes[VALUE] = WatchListView.Columns[VALUE].DisplayIndex; + Global.Config.RamSearchColumnWidths[VALUE] = WatchListView.Columns[VALUE].Width; } - if (WatchListView.Columns[WatchList.PREV] != null) + if (WatchListView.Columns[PREV] != null) { - Global.Config.RamSearchColumnIndexes[WatchList.PREV] = WatchListView.Columns[WatchList.PREV].DisplayIndex; - Global.Config.RamSearchColumnWidths[WatchList.PREV] = WatchListView.Columns[WatchList.PREV].Width; + Global.Config.RamSearchColumnIndexes[PREV] = WatchListView.Columns[PREV].DisplayIndex; + Global.Config.RamSearchColumnWidths[PREV] = WatchListView.Columns[PREV].Width; } - if (WatchListView.Columns[WatchList.CHANGES] != null) + if (WatchListView.Columns[CHANGES] != null) { - Global.Config.RamSearchColumnIndexes[WatchList.CHANGES] = WatchListView.Columns[WatchList.CHANGES].DisplayIndex; - Global.Config.RamSearchColumnWidths[WatchList.CHANGES] = WatchListView.Columns[WatchList.CHANGES].Width; + Global.Config.RamSearchColumnIndexes[CHANGES] = WatchListView.Columns[CHANGES].DisplayIndex; + Global.Config.RamSearchColumnWidths[CHANGES] = WatchListView.Columns[CHANGES].Width; } - if (WatchListView.Columns[WatchList.DIFF] != null) + if (WatchListView.Columns[DIFF] != null) { - Global.Config.RamSearchColumnIndexes[WatchList.DIFF] = WatchListView.Columns[WatchList.DIFF].DisplayIndex; - Global.Config.RamSearchColumnWidths[WatchList.DIFF] = WatchListView.Columns[WatchList.DIFF].Width; + Global.Config.RamSearchColumnIndexes[DIFF] = WatchListView.Columns[DIFF].DisplayIndex; + Global.Config.RamSearchColumnWidths[DIFF] = WatchListView.Columns[DIFF].Width; } } @@ -725,7 +700,7 @@ namespace BizHawk.MultiClient DifferenceRadio.Enabled = true; DifferentByBox.Enabled = true; ClearChangeCountsToolBarItem.Enabled = true; - WatchListView.Columns[WatchList.CHANGES].Width = Global.Config.RamSearchColumnWidths[WatchList.CHANGES]; + WatchListView.Columns[CHANGES].Width = Global.Config.RamSearchColumnWidths[CHANGES]; SetReboot(true); } @@ -748,8 +723,8 @@ namespace BizHawk.MultiClient PreviousValueRadio.Checked = true; } - Global.Config.RamSearchColumnWidths[WatchList.CHANGES] = WatchListView.Columns[WatchList.CHANGES].Width; - WatchListView.Columns[WatchList.CHANGES].Width = 0; + Global.Config.RamSearchColumnWidths[CHANGES] = WatchListView.Columns[CHANGES].Width; + WatchListView.Columns[CHANGES].Width = 0; SetReboot(true); } @@ -871,15 +846,15 @@ namespace BizHawk.MultiClient { default: return String.Empty; - case WatchList.ADDRESS: + case ADDRESS: return Searches[index].AddressString; - case WatchList.VALUE: + case VALUE: return Searches[index].ValueString; - case WatchList.PREV: + case PREV: return Searches[index].PreviousStr; - case WatchList.CHANGES: + case CHANGES: return Searches[index].ChangeCount.ToString(); - case WatchList.DIFF: + case DIFF: return Searches[index].Diff; } } @@ -936,7 +911,7 @@ namespace BizHawk.MultiClient private void OpenMenuItem_Click(object sender, EventArgs e) { LoadWatchFile( - ToolHelpers.GetWatchFileFromUser(String.Empty), + WatchList.GetFileFromUser(String.Empty), sender == AppendFileMenuItem, sender == TruncateFromFileMenuItem ); @@ -953,22 +928,10 @@ namespace BizHawk.MultiClient watches.Add(Searches[i]); } - if (!String.IsNullOrWhiteSpace(watches.CurrentFileName)) + if (watches.Save()) { - if (watches.Save()) - { - CurrentFileName = watches.CurrentFileName; - MessageLabel.Text = Path.GetFileName(CurrentFileName) + " saved"; - } - } - else - { - bool result = watches.SaveAs(ToolHelpers.GetWatchSaveFileFromUser(watches.CurrentFileName)); - if (result) - { - MessageLabel.Text = Path.GetFileName(CurrentFileName) + " saved"; - Global.Config.RecentWatches.Add(watches.CurrentFileName); - } + CurrentFileName = watches.CurrentFileName; + MessageLabel.Text = Path.GetFileName(CurrentFileName) + " saved"; } } } @@ -982,7 +945,7 @@ namespace BizHawk.MultiClient watches.Add(Searches[i]); } - if (watches.SaveAs(ToolHelpers.GetWatchSaveFileFromUser(watches.CurrentFileName))) + if (watches.SaveAs()) { CurrentFileName = watches.CurrentFileName; MessageLabel.Text = Path.GetFileName(CurrentFileName) + " saved"; @@ -1160,10 +1123,6 @@ namespace BizHawk.MultiClient if (Searches.CanUndo) { Searches.Undo(); - SetTotal(); - WatchListView.ItemCount = Searches.Count; - ToggleSearchDependentToolBarItems(); - forcePreviewClear = true; UpdateUndoToolBarButtons(); } } @@ -1173,10 +1132,6 @@ namespace BizHawk.MultiClient if (Searches.CanRedo) { Searches.Redo(); - SetTotal(); - WatchListView.ItemCount = Searches.Count; - ToggleSearchDependentToolBarItems(); - forcePreviewClear = true; UpdateUndoToolBarButtons(); } } @@ -1319,11 +1274,11 @@ namespace BizHawk.MultiClient Global.Config.RamSearchShowPrevColumn = true; Global.Config.RamSearchShowDiffColumn = false; - WatchListView.Columns[WatchList.ADDRESS].Width = DefaultColumnWidths[WatchList.ADDRESS]; - WatchListView.Columns[WatchList.VALUE].Width = DefaultColumnWidths[WatchList.VALUE]; - //WatchListView.Columns[WatchList.PREV].Width = DefaultColumnWidths[WatchList.PREV]; - WatchListView.Columns[WatchList.CHANGES].Width = DefaultColumnWidths[WatchList.CHANGES]; - //WatchListView.Columns[WatchList.DIFF].Width = DefaultColumnWidths[WatchList.DIFF]; + WatchListView.Columns[ADDRESS].Width = DefaultColumnWidths[ADDRESS]; + WatchListView.Columns[VALUE].Width = DefaultColumnWidths[VALUE]; + //WatchListView.Columns[PREV].Width = DefaultColumnWidths[PREV]; + WatchListView.Columns[CHANGES].Width = DefaultColumnWidths[CHANGES]; + //WatchListView.Columns[DIFF].Width = DefaultColumnWidths[DIFF]; Global.Config.RamSearchSaveWindowPosition = true; Global.Config.RamSearchAlwaysOnTop = TopMost = false; @@ -1676,11 +1631,11 @@ namespace BizHawk.MultiClient private void WatchListView_ColumnReordered(object sender, ColumnReorderedEventArgs e) { - Global.Config.RamSearchColumnIndexes[WatchList.ADDRESS] = WatchListView.Columns[WatchList.ADDRESS].DisplayIndex; - Global.Config.RamSearchColumnIndexes[WatchList.VALUE] = WatchListView.Columns[WatchList.VALUE].DisplayIndex; - Global.Config.RamSearchColumnIndexes[WatchList.PREV] = WatchListView.Columns[WatchList.ADDRESS].DisplayIndex; - Global.Config.RamSearchColumnIndexes[WatchList.CHANGES] = WatchListView.Columns[WatchList.CHANGES].DisplayIndex; - Global.Config.RamSearchColumnIndexes[WatchList.DIFF] = WatchListView.Columns[WatchList.DIFF].DisplayIndex; + Global.Config.RamSearchColumnIndexes[ADDRESS] = WatchListView.Columns[ADDRESS].DisplayIndex; + Global.Config.RamSearchColumnIndexes[VALUE] = WatchListView.Columns[VALUE].DisplayIndex; + Global.Config.RamSearchColumnIndexes[PREV] = WatchListView.Columns[ADDRESS].DisplayIndex; + Global.Config.RamSearchColumnIndexes[CHANGES] = WatchListView.Columns[CHANGES].DisplayIndex; + Global.Config.RamSearchColumnIndexes[DIFF] = WatchListView.Columns[DIFF].DisplayIndex; } private void WatchListView_Enter(object sender, EventArgs e) diff --git a/BizHawk.Client.Common/tools/RamSearchEngine.cs b/BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs similarity index 94% rename from BizHawk.Client.Common/tools/RamSearchEngine.cs rename to BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs index 3e92b5711b..3133daa029 100644 --- a/BizHawk.Client.Common/tools/RamSearchEngine.cs +++ b/BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs @@ -6,9 +6,9 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using BizHawk.Common; +using BizHawk.Client.Common; -namespace BizHawk.Client.Common +namespace BizHawk.MultiClient { //TODO: move me //http://stackoverflow.com/questions/1766328/can-linq-use-binary-search-when-the-collection-is-ordered @@ -49,6 +49,8 @@ namespace BizHawk.Client.Common public class RamSearchEngine { + + public enum ComparisonOperator { Equal, GreaterThan, GreaterThanEqual, LessThan, LessThanEqual, NotEqual, DifferentBy }; public enum Compare { Previous, SpecificValue, SpecificAddress, Changes, Difference } @@ -59,7 +61,7 @@ namespace BizHawk.Client.Common private List _watchList = new List(); private Settings _settings = new Settings(); - private UndoHistory _history = new UndoHistory(true); + private WatchHistory _history = new WatchHistory(true); private bool _keepHistory = true; public RamSearchEngine(Settings settings) @@ -406,7 +408,7 @@ namespace BizHawk.Client.Common { switch(column) { - case WatchList.ADDRESS: + case RamSearch.ADDRESS: if (reverse) { _watchList = _watchList.OrderByDescending(x => x.Address).ToList(); @@ -416,7 +418,7 @@ namespace BizHawk.Client.Common _watchList = _watchList.OrderBy(x => x.Address).ToList(); } break; - case WatchList.VALUE: + case RamSearch.VALUE: if (reverse) { _watchList = _watchList.OrderByDescending(x => GetValue(x.Address)).ToList(); @@ -426,7 +428,7 @@ namespace BizHawk.Client.Common _watchList = _watchList.OrderBy(x => GetValue(x.Address)).ToList(); } break; - case WatchList.PREV: + case RamSearch.PREV: if (reverse) { _watchList = _watchList.OrderByDescending(x => x.Previous).ToList(); @@ -436,7 +438,7 @@ namespace BizHawk.Client.Common _watchList = _watchList.OrderBy(x => x.Previous).ToList(); } break; - case WatchList.CHANGES: + case RamSearch.CHANGES: if (_settings.Mode == Settings.SearchMode.Detailed) { if (reverse) @@ -455,7 +457,7 @@ namespace BizHawk.Client.Common } } break; - case WatchList.DIFF: + case RamSearch.DIFF: if (reverse) { _watchList = _watchList.OrderByDescending(x => (GetValue(x.Address) - x.Previous)).ToList(); @@ -497,7 +499,7 @@ namespace BizHawk.Client.Common { if (_keepHistory) { - _watchList = _history.Undo().ToList(); + _watchList = _history.Undo(); } } @@ -505,7 +507,7 @@ namespace BizHawk.Client.Common { if (_keepHistory) { - _watchList = _history.Redo().ToList(); + _watchList = _history.Redo(); } } diff --git a/BizHawk.MultiClient/tools/Watch/RamWatch.cs b/BizHawk.MultiClient/tools/Watch/RamWatch.cs index 2cab1aa448..f9781f5167 100644 --- a/BizHawk.MultiClient/tools/Watch/RamWatch.cs +++ b/BizHawk.MultiClient/tools/Watch/RamWatch.cs @@ -737,16 +737,6 @@ namespace BizHawk.MultiClient WatchListView.Refresh(); } - private void SaveAs() - { - bool result = Watches.SaveAs(ToolHelpers.GetWatchSaveFileFromUser(Watches.CurrentFileName)); - if (result) - { - UpdateMessageLabel(saved: true); - Global.Config.RecentWatches.Add(Watches.CurrentFileName); - } - } - #region Winform Events private void NewRamWatch_Load(object sender, EventArgs e) @@ -793,27 +783,25 @@ namespace BizHawk.MultiClient private void openToolStripMenuItem_Click(object sender, EventArgs e) { bool append = sender == appendFileToolStripMenuItem; - LoadWatchFile(ToolHelpers.GetWatchFileFromUser(Watches.CurrentFileName), append); + LoadWatchFile(WatchList.GetFileFromUser(Watches.CurrentFileName), append); } private void saveToolStripMenuItem_Click(object sender, EventArgs e) { - if (!String.IsNullOrWhiteSpace(Watches.CurrentFileName)) + if (Watches.Save()) { - if (Watches.Save()) - { - UpdateMessageLabel(saved: true); - } - } - else - { - SaveAs(); + UpdateMessageLabel(saved: true); } } private void saveAsToolStripMenuItem_Click(object sender, EventArgs e) { - SaveAs(); + bool result = Watches.SaveAs(); + if (result) + { + UpdateMessageLabel(saved: true); + Global.Config.RecentWatches.Add(Watches.CurrentFileName); + } } private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e) diff --git a/BizHawk.Common/UndoHistory.cs b/BizHawk.MultiClient/tools/Watch/WatchHistory.cs similarity index 61% rename from BizHawk.Common/UndoHistory.cs rename to BizHawk.MultiClient/tools/Watch/WatchHistory.cs index b96552c03f..83b64d9740 100644 --- a/BizHawk.Common/UndoHistory.cs +++ b/BizHawk.MultiClient/tools/Watch/WatchHistory.cs @@ -1,21 +1,20 @@ using System.Collections.Generic; using System.Linq; -namespace BizHawk.Common +namespace BizHawk.MultiClient { - public class UndoHistory + public class WatchHistory { - private List> _history = new List>(); + private List> _history = new List>(); private int curPos; //1-based - public bool Enabled { get; private set; } - public UndoHistory(bool enabled) + public WatchHistory(bool enabled) { Enabled = enabled; } - public UndoHistory(IEnumerable newState, bool enabled) + public WatchHistory(List newState, bool enabled) { AddState(newState); Enabled = enabled; @@ -23,7 +22,7 @@ namespace BizHawk.Common public void Clear() { - _history = new List>(); + _history = new List>(); curPos = 0; } @@ -42,7 +41,7 @@ namespace BizHawk.Common get { return Enabled && _history.Any(); } } - public void AddState(IEnumerable newState) + public void AddState(List newState) { if (Enabled) { @@ -54,12 +53,12 @@ namespace BizHawk.Common } } - _history.Add(newState.ToList()); + _history.Add(newState); curPos = _history.Count; } } - public IEnumerable Undo() + public List Undo() { if (CanUndo && Enabled) { @@ -72,7 +71,7 @@ namespace BizHawk.Common } } - public IEnumerable Redo() + public List Redo() { if (CanRedo && Enabled) { diff --git a/BizHawk.Client.Common/tools/WatchList.cs b/BizHawk.MultiClient/tools/Watch/WatchList.cs similarity index 81% rename from BizHawk.Client.Common/tools/WatchList.cs rename to BizHawk.MultiClient/tools/Watch/WatchList.cs index 8665e9dd9c..b8fd0c0dac 100644 --- a/BizHawk.Client.Common/tools/WatchList.cs +++ b/BizHawk.MultiClient/tools/Watch/WatchList.cs @@ -4,11 +4,16 @@ using System.Globalization; using System.IO; using System.Linq; using System.Text; +using System.Windows.Forms; -namespace BizHawk.Client.Common +using BizHawk.Client.Common; + +namespace BizHawk.MultiClient { public class WatchList : IEnumerable { + + public const string ADDRESS = "AddressColumn"; public const string VALUE = "ValueColumn"; public const string PREV = "PrevColumn"; @@ -292,6 +297,26 @@ namespace BizHawk.Client.Common public string CurrentFileName { get { return _currentFilename; } set { _currentFilename = value; } } public bool Changes { get; set; } + public bool Save() + { + bool result; + if (!String.IsNullOrWhiteSpace(CurrentFileName)) + { + result = SaveFile(); + } + else + { + result = SaveAs(); + } + + if (result) + { + Changes = false; + } + + return result; + } + public bool Load(string path, bool append) { bool result = LoadFile(path, append); @@ -321,7 +346,7 @@ namespace BizHawk.Client.Common } } - public bool Save() + private bool SaveFile() { if (String.IsNullOrWhiteSpace(CurrentFileName)) { @@ -355,12 +380,13 @@ namespace BizHawk.Client.Common return true; } - public bool SaveAs(FileInfo file) + public bool SaveAs() { + var file = GetSaveFileFromUser(CurrentFileName); if (file != null) { CurrentFileName = file.FullName; - return Save(); + return SaveFile(); } else { @@ -520,6 +546,53 @@ namespace BizHawk.Client.Common return 0; } + public static FileInfo GetFileFromUser(string currentFile) + { + var ofd = new OpenFileDialog(); + if (currentFile.Length > 0) + ofd.FileName = Path.GetFileNameWithoutExtension(currentFile); + ofd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.WatchPath, null); + ofd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*"; + ofd.RestoreDirectory = true; + + GlobalWinF.Sound.StopSound(); + var result = ofd.ShowDialog(); + GlobalWinF.Sound.StartSound(); + if (result != DialogResult.OK) + return null; + var file = new FileInfo(ofd.FileName); + return file; + } + + public static FileInfo GetSaveFileFromUser(string currentFile) + { + var sfd = new SaveFileDialog(); + if (currentFile.Length > 0) + { + sfd.FileName = Path.GetFileNameWithoutExtension(currentFile); + sfd.InitialDirectory = Path.GetDirectoryName(currentFile); + } + else if (!(Global.Emulator is NullEmulator)) + { + sfd.FileName = PathManager.FilesystemSafeName(Global.Game); + sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.WatchPath, null); + } + else + { + sfd.FileName = "NULL"; + sfd.InitialDirectory = PathManager.MakeAbsolutePath(Global.Config.PathEntries.WatchPath, null); + } + sfd.Filter = "Watch Files (*.wch)|*.wch|All Files|*.*"; + sfd.RestoreDirectory = true; + GlobalWinF.Sound.StopSound(); + var result = sfd.ShowDialog(); + GlobalWinF.Sound.StartSound(); + if (result != DialogResult.OK) + return null; + var file = new FileInfo(sfd.FileName); + return file; + } + #endregion } } diff --git a/BizHawk.sln b/BizHawk.sln index 1f1fe47c80..0355e2d56d 100644 --- a/BizHawk.sln +++ b/BizHawk.sln @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.PCE_Debugger", "Biz EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Client.Common", "BizHawk.Client.Common\BizHawk.Client.Common.csproj", "{24A0AA3C-B25F-4197-B23D-476D6462DBA0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BizHawk.Common", "BizHawk.Common\BizHawk.Common.csproj", "{866F8D13-0678-4FF9-80A4-A3993FD4D8A3}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -91,18 +89,6 @@ Global {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Release|Mixed Platforms.Build.0 = Release|Any CPU {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Release|Win32.ActiveCfg = Release|Any CPU {24A0AA3C-B25F-4197-B23D-476D6462DBA0}.Release|x86.ActiveCfg = Release|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|Win32.ActiveCfg = Debug|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Debug|x86.ActiveCfg = Debug|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Any CPU.Build.0 = Release|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|Win32.ActiveCfg = Release|Any CPU - {866F8D13-0678-4FF9-80A4-A3993FD4D8A3}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE