From d36fb7e9cb2fc7d8687091a9571b9deafd24cbfd Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Mon, 28 Mar 2011 15:47:33 +0000 Subject: [PATCH] Start a NES Debugger, just dressing suff, basic dialog, virtuallistview, window position settings, and other little things --- .../BizHawk.MultiClient.csproj | 13 +- BizHawk.MultiClient/Config.cs | 10 +- BizHawk.MultiClient/MainForm.Designer.cs | 2174 +++++++++-------- BizHawk.MultiClient/MainForm.MenuItems.cs | 6 + BizHawk.MultiClient/MainForm.cs | 17 +- .../NEStools/NESDebugger.Designer.cs | 181 ++ BizHawk.MultiClient/NEStools/NESDebugger.cs | 94 + BizHawk.MultiClient/NEStools/NESDebugger.resx | 148 ++ BizHawk.MultiClient/NEStools/NESGameGenie.cs | 2 +- .../Properties/Resources.Designer.cs | 7 + BizHawk.MultiClient/Properties/Resources.resx | 3 + BizHawk.MultiClient/images/Debugger.ico | Bin 0 -> 1150 bytes BizHawk.MultiClient/images/Debugger.png | Bin 0 -> 3470 bytes 13 files changed, 1568 insertions(+), 1087 deletions(-) create mode 100644 BizHawk.MultiClient/NEStools/NESDebugger.Designer.cs create mode 100644 BizHawk.MultiClient/NEStools/NESDebugger.cs create mode 100644 BizHawk.MultiClient/NEStools/NESDebugger.resx create mode 100644 BizHawk.MultiClient/images/Debugger.ico create mode 100644 BizHawk.MultiClient/images/Debugger.png diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 3fa48abf7c..015650e5f3 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.30729 + 9.0.21022 2.0 {DD448B37-BA3F-4544-9754-5406E8094723} Exe @@ -132,6 +132,12 @@ Component + + Form + + + NESDebugger.cs + Form @@ -307,6 +313,10 @@ + + NESDebugger.cs + Designer + NESGameGenie.cs Designer @@ -394,6 +404,7 @@ + diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index c8dc00ea2b..98800d553b 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -93,12 +93,20 @@ public int HexEditorWidth = -1; public int HexEditorHeight = -1; - // NESPPU Setings + // NESPPU Settings public bool AutoLoadNESPPU = false; public bool NESPPUSaveWindowPosition = true; public int NESPPUWndx = -1; public int NESPPUWndy = -1; + // NESDebuger Settings + public bool AutoLoadNESDebugger = false; + public bool NESDebuggerSaveWindowPosition = true; + public int NESDebuggerWndx = -1; + public int NESDebuggerWndy = -1; + public int NESDebuggerWidth = -1; + public int NESDebuggerHeight = -1; + // Cheats Dialog public bool AutoLoadCheats = false; public bool CheatsSaveWindowPosition = true; diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 1b0aa925bc..c92576129b 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -28,148 +28,149 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.recentROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autoloadMostRecentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.closeROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - 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.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.loadNamedStateToolStripMenuItem = 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.saveToCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.movieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.recentToolStripMenuItem = 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.replayInputLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.screenshotF12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.emulationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.powerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.sega8bitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.enableFMChipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.overclockWhenKnownSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.forceStereoSeparationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.viewToolStripMenuItem = 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.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - 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.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.controllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.hotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.soundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gUIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pauseWhenMenuActivatedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.startPausedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.enableRewindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.forceGDIPPresentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.frameSkipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.miLimitFramerate = new System.Windows.Forms.ToolStripMenuItem(); - this.miDisplayVsync = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); - 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.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.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); - this.saveConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.rAMWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.rAMSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.rAMPokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.hexEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); - this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.NESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pPUViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.menuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // menuStrip1 - // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recentROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autoloadMostRecentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.closeROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + 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.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.loadNamedStateToolStripMenuItem = 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.saveToCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadCurrentSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.movieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recentToolStripMenuItem = 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.replayInputLogToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.screenshotF12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.emulationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pauseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.powerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.sega8bitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.enableFMChipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.overclockWhenKnownSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.forceStereoSeparationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.viewToolStripMenuItem = 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.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + 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.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.controllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.soundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gUIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pauseWhenMenuActivatedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.startPausedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.enableRewindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.forceGDIPPresentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.frameSkipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.miLimitFramerate = new System.Windows.Forms.ToolStripMenuItem(); + this.miDisplayVsync = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); + 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.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.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); + this.saveConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rAMWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rAMSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rAMPokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hexEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); + this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.NESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pPUViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.debuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.emulationToolStripMenuItem, this.viewToolStripMenuItem, @@ -177,17 +178,17 @@ this.toolsToolStripMenuItem, this.NESToolStripMenuItem, this.helpToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(470, 24); - this.menuStrip1.TabIndex = 0; - this.menuStrip1.Text = "menuStrip1"; - this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate); - this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(470, 24); + this.menuStrip1.TabIndex = 0; + this.menuStrip1.Text = "menuStrip1"; + this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate); + this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.openROMToolStripMenuItem, this.recentROMToolStripMenuItem, this.closeROMToolStripMenuItem, @@ -200,71 +201,71 @@ this.screenshotF12ToolStripMenuItem, this.toolStripSeparator4, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); - this.fileToolStripMenuItem.Text = "&File"; - this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); - // - // openROMToolStripMenuItem - // - this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; - this.openROMToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openROMToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.openROMToolStripMenuItem.Text = "Open ROM"; - this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); - // - // recentROMToolStripMenuItem - // - this.recentROMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Text = "&File"; + this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); + // + // openROMToolStripMenuItem + // + this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; + this.openROMToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.openROMToolStripMenuItem.Text = "Open ROM"; + this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); + // + // recentROMToolStripMenuItem + // + this.recentROMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.noneToolStripMenuItem, this.toolStripSeparator3, this.clearToolStripMenuItem, this.autoloadMostRecentToolStripMenuItem}); - this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; - this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.recentROMToolStripMenuItem.Text = "Recent ROM"; - this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); - // - // noneToolStripMenuItem - // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.noneToolStripMenuItem.Text = "None"; - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(188, 6); - // - // clearToolStripMenuItem - // - this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.clearToolStripMenuItem.Text = "&Clear"; - this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); - // - // autoloadMostRecentToolStripMenuItem - // - this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem"; - this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent"; - this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click); - // - // closeROMToolStripMenuItem - // - this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; - this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(177, 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(174, 6); - // - // saveStateToolStripMenuItem - // - this.saveStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; + this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.recentROMToolStripMenuItem.Text = "Recent ROM"; + this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); + // + // noneToolStripMenuItem + // + this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; + this.noneToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.noneToolStripMenuItem.Text = "None"; + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(188, 6); + // + // clearToolStripMenuItem + // + this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; + this.clearToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.clearToolStripMenuItem.Text = "&Clear"; + this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click); + // + // autoloadMostRecentToolStripMenuItem + // + this.autoloadMostRecentToolStripMenuItem.Name = "autoloadMostRecentToolStripMenuItem"; + this.autoloadMostRecentToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent"; + this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click); + // + // closeROMToolStripMenuItem + // + this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; + this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(177, 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(174, 6); + // + // saveStateToolStripMenuItem + // + this.saveStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.savestate1toolStripMenuItem, this.savestate2toolStripMenuItem, this.savestate3toolStripMenuItem, @@ -277,95 +278,95 @@ this.savestate0toolStripMenuItem, this.toolStripSeparator6, this.saveNamedStateToolStripMenuItem}); - this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; - this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.saveStateToolStripMenuItem.Text = "Save State"; - this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); - // - // savestate1toolStripMenuItem - // - this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; - this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.savestate1toolStripMenuItem.Text = "1"; - this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); - // - // savestate2toolStripMenuItem - // - this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; - this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.savestate2toolStripMenuItem.Text = "2"; - this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); - // - // savestate3toolStripMenuItem - // - this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; - this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.savestate3toolStripMenuItem.Text = "3"; - this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); - // - // savestate4toolStripMenuItem - // - this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; - this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.savestate4toolStripMenuItem.Text = "4"; - this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); - // - // savestate5toolStripMenuItem - // - this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; - this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.savestate5toolStripMenuItem.Text = "5"; - this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); - // - // savestate6toolStripMenuItem - // - this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; - this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.savestate6toolStripMenuItem.Text = "6"; - this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); - // - // savestate7toolStripMenuItem - // - this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; - this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.savestate7toolStripMenuItem.Text = "7"; - this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); - // - // savestate8toolStripMenuItem - // - this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; - this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.savestate8toolStripMenuItem.Text = "8"; - this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); - // - // savestate9toolStripMenuItem - // - this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; - this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.savestate9toolStripMenuItem.Text = "9"; - this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); - // - // savestate0toolStripMenuItem - // - this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; - this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(174, 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(171, 6); - // - // saveNamedStateToolStripMenuItem - // - this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; - this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(174, 22); - this.saveNamedStateToolStripMenuItem.Text = "Save Named State"; - // - // loadStateToolStripMenuItem - // - this.loadStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; + this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.saveStateToolStripMenuItem.Text = "Save State"; + this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); + // + // savestate1toolStripMenuItem + // + this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; + this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.savestate1toolStripMenuItem.Text = "1"; + this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); + // + // savestate2toolStripMenuItem + // + this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; + this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.savestate2toolStripMenuItem.Text = "2"; + this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); + // + // savestate3toolStripMenuItem + // + this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; + this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.savestate3toolStripMenuItem.Text = "3"; + this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); + // + // savestate4toolStripMenuItem + // + this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; + this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.savestate4toolStripMenuItem.Text = "4"; + this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); + // + // savestate5toolStripMenuItem + // + this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; + this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.savestate5toolStripMenuItem.Text = "5"; + this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); + // + // savestate6toolStripMenuItem + // + this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; + this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.savestate6toolStripMenuItem.Text = "6"; + this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); + // + // savestate7toolStripMenuItem + // + this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; + this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.savestate7toolStripMenuItem.Text = "7"; + this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); + // + // savestate8toolStripMenuItem + // + this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; + this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.savestate8toolStripMenuItem.Text = "8"; + this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); + // + // savestate9toolStripMenuItem + // + this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; + this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.savestate9toolStripMenuItem.Text = "9"; + this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); + // + // savestate0toolStripMenuItem + // + this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; + this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(174, 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(171, 6); + // + // saveNamedStateToolStripMenuItem + // + this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; + this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(174, 22); + this.saveNamedStateToolStripMenuItem.Text = "Save Named State"; + // + // loadStateToolStripMenuItem + // + this.loadStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.loadstate1toolStripMenuItem, this.loadstate2toolStripMenuItem, this.loadstate3toolStripMenuItem, @@ -378,95 +379,95 @@ this.loadstate0toolStripMenuItem, this.toolStripSeparator7, this.loadNamedStateToolStripMenuItem}); - this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; - this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.loadStateToolStripMenuItem.Text = "Load State"; - this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); - // - // loadstate1toolStripMenuItem - // - this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; - this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(173, 22); - this.loadstate1toolStripMenuItem.Text = "1"; - this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); - // - // loadstate2toolStripMenuItem - // - this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; - this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(173, 22); - this.loadstate2toolStripMenuItem.Text = "2"; - this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); - // - // loadstate3toolStripMenuItem - // - this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; - this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(173, 22); - this.loadstate3toolStripMenuItem.Text = "3"; - this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); - // - // loadstate4toolStripMenuItem - // - this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; - this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(173, 22); - this.loadstate4toolStripMenuItem.Text = "4"; - this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); - // - // loadstate5toolStripMenuItem - // - this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; - this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(173, 22); - this.loadstate5toolStripMenuItem.Text = "5"; - this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); - // - // loadstate6toolStripMenuItem - // - this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; - this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(173, 22); - this.loadstate6toolStripMenuItem.Text = "6"; - this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); - // - // loadstate7toolStripMenuItem - // - this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; - this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(173, 22); - this.loadstate7toolStripMenuItem.Text = "7"; - this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); - // - // loadstate8toolStripMenuItem - // - this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; - this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(173, 22); - this.loadstate8toolStripMenuItem.Text = "8"; - this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); - // - // loadstate9toolStripMenuItem - // - this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; - this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(173, 22); - this.loadstate9toolStripMenuItem.Text = "9"; - this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); - // - // loadstate0toolStripMenuItem - // - this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; - this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(173, 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(170, 6); - // - // loadNamedStateToolStripMenuItem - // - this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; - this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(173, 22); - this.loadNamedStateToolStripMenuItem.Text = "Load Named State"; - // - // saveSlotToolStripMenuItem - // - this.saveSlotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; + this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.loadStateToolStripMenuItem.Text = "Load State"; + this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); + // + // loadstate1toolStripMenuItem + // + this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; + this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.loadstate1toolStripMenuItem.Text = "1"; + this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); + // + // loadstate2toolStripMenuItem + // + this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; + this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.loadstate2toolStripMenuItem.Text = "2"; + this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); + // + // loadstate3toolStripMenuItem + // + this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; + this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.loadstate3toolStripMenuItem.Text = "3"; + this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); + // + // loadstate4toolStripMenuItem + // + this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; + this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.loadstate4toolStripMenuItem.Text = "4"; + this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); + // + // loadstate5toolStripMenuItem + // + this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; + this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.loadstate5toolStripMenuItem.Text = "5"; + this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); + // + // loadstate6toolStripMenuItem + // + this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; + this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.loadstate6toolStripMenuItem.Text = "6"; + this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); + // + // loadstate7toolStripMenuItem + // + this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; + this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.loadstate7toolStripMenuItem.Text = "7"; + this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); + // + // loadstate8toolStripMenuItem + // + this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; + this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.loadstate8toolStripMenuItem.Text = "8"; + this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); + // + // loadstate9toolStripMenuItem + // + this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; + this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.loadstate9toolStripMenuItem.Text = "9"; + this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); + // + // loadstate0toolStripMenuItem + // + this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; + this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(173, 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(170, 6); + // + // loadNamedStateToolStripMenuItem + // + this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; + this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(173, 22); + this.loadNamedStateToolStripMenuItem.Text = "Load Named State"; + // + // saveSlotToolStripMenuItem + // + this.saveSlotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.selectSlot10ToolStripMenuItem, this.selectSlot1ToolStripMenuItem, this.selectSlot2ToolStripMenuItem, @@ -482,373 +483,373 @@ this.toolStripSeparator5, this.saveToCurrentSlotToolStripMenuItem, this.loadCurrentSlotToolStripMenuItem}); - this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; - this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.saveSlotToolStripMenuItem.Text = "SaveSlot"; - // - // selectSlot10ToolStripMenuItem - // - this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem"; - this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0"; - this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click); - // - // selectSlot1ToolStripMenuItem - // - this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem"; - this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1"; - this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click); - // - // selectSlot2ToolStripMenuItem - // - this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem"; - this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2"; - this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click); - // - // selectSlot3ToolStripMenuItem - // - this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem"; - this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3"; - this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click); - // - // selectSlot4ToolStripMenuItem - // - this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem"; - this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4"; - this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click); - // - // selectSlot5ToolStripMenuItem - // - this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem"; - this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5"; - this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click); - // - // selectSlot6ToolStripMenuItem - // - this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem"; - this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6"; - this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click); - // - // selectSlot7ToolStripMenuItem - // - this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem"; - this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7"; - this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click); - // - // selectSlot8ToolStripMenuItem - // - this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem"; - this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8"; - this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click); - // - // selectSlot9ToolStripMenuItem - // - this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem"; - this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9"; - this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click); - // - // previousSlotToolStripMenuItem - // - this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem"; - this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.previousSlotToolStripMenuItem.Text = "Previous Slot"; - this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click); - // - // nextSlotToolStripMenuItem - // - this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem"; - this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 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(180, 6); - // - // saveToCurrentSlotToolStripMenuItem - // - this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem"; - this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22); - this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot"; - this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click); - // - // loadCurrentSlotToolStripMenuItem - // - this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem"; - this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 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(174, 6); - // - // movieToolStripMenuItem - // - this.movieToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; + this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.saveSlotToolStripMenuItem.Text = "SaveSlot"; + // + // selectSlot10ToolStripMenuItem + // + this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem"; + this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0"; + this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click); + // + // selectSlot1ToolStripMenuItem + // + this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem"; + this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1"; + this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click); + // + // selectSlot2ToolStripMenuItem + // + this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem"; + this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2"; + this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click); + // + // selectSlot3ToolStripMenuItem + // + this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem"; + this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3"; + this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click); + // + // selectSlot4ToolStripMenuItem + // + this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem"; + this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4"; + this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click); + // + // selectSlot5ToolStripMenuItem + // + this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem"; + this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5"; + this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click); + // + // selectSlot6ToolStripMenuItem + // + this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem"; + this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6"; + this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click); + // + // selectSlot7ToolStripMenuItem + // + this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem"; + this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7"; + this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click); + // + // selectSlot8ToolStripMenuItem + // + this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem"; + this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8"; + this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click); + // + // selectSlot9ToolStripMenuItem + // + this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem"; + this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9"; + this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click); + // + // previousSlotToolStripMenuItem + // + this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem"; + this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.previousSlotToolStripMenuItem.Text = "Previous Slot"; + this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click); + // + // nextSlotToolStripMenuItem + // + this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem"; + this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 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(180, 6); + // + // saveToCurrentSlotToolStripMenuItem + // + this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem"; + this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot"; + this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click); + // + // loadCurrentSlotToolStripMenuItem + // + this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem"; + this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(183, 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(174, 6); + // + // movieToolStripMenuItem + // + this.movieToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.recentToolStripMenuItem, this.recordMovieToolStripMenuItem, this.playMovieToolStripMenuItem, this.stopMovieToolStripMenuItem, this.playFromBeginningToolStripMenuItem, this.replayInputLogToolStripMenuItem}); - this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; - this.movieToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.movieToolStripMenuItem.Text = "Movie"; - // - // recentToolStripMenuItem - // - this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; - this.recentToolStripMenuItem.Size = new System.Drawing.Size(179, 22); - this.recentToolStripMenuItem.Text = "Recent"; - // - // recordMovieToolStripMenuItem - // - this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem"; - this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(179, 22); - this.recordMovieToolStripMenuItem.Text = "&Record Movie..."; - this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click); - // - // playMovieToolStripMenuItem - // - this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem"; - this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(179, 22); - this.playMovieToolStripMenuItem.Text = "&Play Movie..."; - this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click); - // - // stopMovieToolStripMenuItem - // - this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem"; - this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(179, 22); - this.stopMovieToolStripMenuItem.Text = "Stop Movie"; - this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click); - // - // playFromBeginningToolStripMenuItem - // - this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem"; - this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(179, 22); - this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning"; - this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click); - // - // replayInputLogToolStripMenuItem - // - this.replayInputLogToolStripMenuItem.Name = "replayInputLogToolStripMenuItem"; - this.replayInputLogToolStripMenuItem.Size = new System.Drawing.Size(179, 22); - this.replayInputLogToolStripMenuItem.Text = "Replay Input Log"; - this.replayInputLogToolStripMenuItem.Click += new System.EventHandler(this.replayInputLogToolStripMenuItem_Click); - // - // screenshotF12ToolStripMenuItem - // - this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; - this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; - this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(174, 6); - // - // exitToolStripMenuItem - // - 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(177, 22); - this.exitToolStripMenuItem.Text = "Exit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // emulationToolStripMenuItem - // - this.emulationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; + this.movieToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.movieToolStripMenuItem.Text = "Movie"; + // + // recentToolStripMenuItem + // + this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; + this.recentToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.recentToolStripMenuItem.Text = "Recent"; + // + // recordMovieToolStripMenuItem + // + this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem"; + this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.recordMovieToolStripMenuItem.Text = "&Record Movie..."; + this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click); + // + // playMovieToolStripMenuItem + // + this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem"; + this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.playMovieToolStripMenuItem.Text = "&Play Movie..."; + this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click); + // + // stopMovieToolStripMenuItem + // + this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem"; + this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.stopMovieToolStripMenuItem.Text = "Stop Movie"; + this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click); + // + // playFromBeginningToolStripMenuItem + // + this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem"; + this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning"; + this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click); + // + // replayInputLogToolStripMenuItem + // + this.replayInputLogToolStripMenuItem.Name = "replayInputLogToolStripMenuItem"; + this.replayInputLogToolStripMenuItem.Size = new System.Drawing.Size(179, 22); + this.replayInputLogToolStripMenuItem.Text = "Replay Input Log"; + this.replayInputLogToolStripMenuItem.Click += new System.EventHandler(this.replayInputLogToolStripMenuItem_Click); + // + // screenshotF12ToolStripMenuItem + // + this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; + this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(177, 22); + this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; + this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(174, 6); + // + // exitToolStripMenuItem + // + 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(177, 22); + this.exitToolStripMenuItem.Text = "Exit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // emulationToolStripMenuItem + // + this.emulationToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pauseToolStripMenuItem, this.toolStripSeparator1, this.powerToolStripMenuItem, this.resetToolStripMenuItem, this.toolStripSeparator8, this.sega8bitToolStripMenuItem}); - this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem"; - this.emulationToolStripMenuItem.Size = new System.Drawing.Size(65, 20); - this.emulationToolStripMenuItem.Text = "&Emulation"; - this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); - // - // pauseToolStripMenuItem - // - this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; - this.pauseToolStripMenuItem.Size = new System.Drawing.Size(144, 22); - this.pauseToolStripMenuItem.Text = "&Pause"; - this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6); - // - // powerToolStripMenuItem - // - this.powerToolStripMenuItem.Name = "powerToolStripMenuItem"; - this.powerToolStripMenuItem.Size = new System.Drawing.Size(144, 22); - this.powerToolStripMenuItem.Text = "Power Cycle"; - this.powerToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); - // - // resetToolStripMenuItem - // - this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(144, 22); - this.resetToolStripMenuItem.Text = "&Reset"; - this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); - // - // toolStripSeparator8 - // - this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(141, 6); - // - // sega8bitToolStripMenuItem - // - this.sega8bitToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem"; + this.emulationToolStripMenuItem.Size = new System.Drawing.Size(65, 20); + this.emulationToolStripMenuItem.Text = "&Emulation"; + this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); + // + // pauseToolStripMenuItem + // + this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; + this.pauseToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.pauseToolStripMenuItem.Text = "&Pause"; + this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6); + // + // powerToolStripMenuItem + // + this.powerToolStripMenuItem.Name = "powerToolStripMenuItem"; + this.powerToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.powerToolStripMenuItem.Text = "Power Cycle"; + this.powerToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); + // + // resetToolStripMenuItem + // + this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; + this.resetToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.resetToolStripMenuItem.Text = "&Reset"; + this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); + // + // toolStripSeparator8 + // + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(141, 6); + // + // sega8bitToolStripMenuItem + // + this.sega8bitToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.enableFMChipToolStripMenuItem, this.overclockWhenKnownSafeToolStripMenuItem, this.forceStereoSeparationToolStripMenuItem}); - this.sega8bitToolStripMenuItem.Name = "sega8bitToolStripMenuItem"; - this.sega8bitToolStripMenuItem.Size = new System.Drawing.Size(144, 22); - this.sega8bitToolStripMenuItem.Text = "Sega 8-bit"; - // - // enableFMChipToolStripMenuItem - // - this.enableFMChipToolStripMenuItem.Name = "enableFMChipToolStripMenuItem"; - this.enableFMChipToolStripMenuItem.Size = new System.Drawing.Size(221, 22); - this.enableFMChipToolStripMenuItem.Text = "Enable FM Chip"; - this.enableFMChipToolStripMenuItem.Click += new System.EventHandler(this.enableFMChipToolStripMenuItem_Click); - // - // overclockWhenKnownSafeToolStripMenuItem - // - this.overclockWhenKnownSafeToolStripMenuItem.Name = "overclockWhenKnownSafeToolStripMenuItem"; - this.overclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(221, 22); - this.overclockWhenKnownSafeToolStripMenuItem.Text = "Overclock when Known Safe"; - this.overclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.overclockWhenKnownSafeToolStripMenuItem_Click); - // - // forceStereoSeparationToolStripMenuItem - // - this.forceStereoSeparationToolStripMenuItem.Name = "forceStereoSeparationToolStripMenuItem"; - this.forceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(221, 22); - this.forceStereoSeparationToolStripMenuItem.Text = "Force Stereo Separation"; - this.forceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.forceStereoSeparationToolStripMenuItem_Click); - // - // viewToolStripMenuItem - // - this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.sega8bitToolStripMenuItem.Name = "sega8bitToolStripMenuItem"; + this.sega8bitToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.sega8bitToolStripMenuItem.Text = "Sega 8-bit"; + // + // enableFMChipToolStripMenuItem + // + this.enableFMChipToolStripMenuItem.Name = "enableFMChipToolStripMenuItem"; + this.enableFMChipToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.enableFMChipToolStripMenuItem.Text = "Enable FM Chip"; + this.enableFMChipToolStripMenuItem.Click += new System.EventHandler(this.enableFMChipToolStripMenuItem_Click); + // + // overclockWhenKnownSafeToolStripMenuItem + // + this.overclockWhenKnownSafeToolStripMenuItem.Name = "overclockWhenKnownSafeToolStripMenuItem"; + this.overclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.overclockWhenKnownSafeToolStripMenuItem.Text = "Overclock when Known Safe"; + this.overclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.overclockWhenKnownSafeToolStripMenuItem_Click); + // + // forceStereoSeparationToolStripMenuItem + // + this.forceStereoSeparationToolStripMenuItem.Name = "forceStereoSeparationToolStripMenuItem"; + this.forceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(221, 22); + this.forceStereoSeparationToolStripMenuItem.Text = "Force Stereo Separation"; + this.forceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.forceStereoSeparationToolStripMenuItem_Click); + // + // viewToolStripMenuItem + // + this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.windowSizeMenuItem, this.toolStripSeparator2, this.displayFPSToolStripMenuItem, this.displayFrameCounterToolStripMenuItem, this.displayLagCounterToolStripMenuItem, this.displayInputToolStripMenuItem}); - this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 20); - this.viewToolStripMenuItem.Text = "&View"; - this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened); - // - // windowSizeMenuItem - // - this.windowSizeMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; + this.viewToolStripMenuItem.Size = new System.Drawing.Size(41, 20); + this.viewToolStripMenuItem.Text = "&View"; + this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened); + // + // windowSizeMenuItem + // + this.windowSizeMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.x1MenuItem, this.x2MenuItem, this.x3MenuItem, this.x4MenuItem, this.x5MenuItem, this.mzMenuItem}); - this.windowSizeMenuItem.Name = "windowSizeMenuItem"; - this.windowSizeMenuItem.Size = new System.Drawing.Size(191, 22); - this.windowSizeMenuItem.Text = "&Window Size"; - // - // x1MenuItem - // - this.x1MenuItem.Name = "x1MenuItem"; - this.x1MenuItem.Size = new System.Drawing.Size(105, 22); - this.x1MenuItem.Text = "&1x"; - this.x1MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // x2MenuItem - // - this.x2MenuItem.Name = "x2MenuItem"; - this.x2MenuItem.Size = new System.Drawing.Size(105, 22); - this.x2MenuItem.Text = "&2x"; - this.x2MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // x3MenuItem - // - this.x3MenuItem.Name = "x3MenuItem"; - this.x3MenuItem.Size = new System.Drawing.Size(105, 22); - this.x3MenuItem.Text = "&3x"; - this.x3MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // x4MenuItem - // - this.x4MenuItem.Name = "x4MenuItem"; - this.x4MenuItem.Size = new System.Drawing.Size(105, 22); - this.x4MenuItem.Text = "&4x"; - this.x4MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // x5MenuItem - // - this.x5MenuItem.Name = "x5MenuItem"; - this.x5MenuItem.Size = new System.Drawing.Size(105, 22); - this.x5MenuItem.Text = "&5x"; - this.x5MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // mzMenuItem - // - this.mzMenuItem.Name = "mzMenuItem"; - this.mzMenuItem.Size = new System.Drawing.Size(105, 22); - this.mzMenuItem.Text = "&Max"; - this.mzMenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(188, 6); - // - // displayFPSToolStripMenuItem - // - this.displayFPSToolStripMenuItem.Name = "displayFPSToolStripMenuItem"; - this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.displayFPSToolStripMenuItem.Text = "Display FPS"; - this.displayFPSToolStripMenuItem.Click += new System.EventHandler(this.displayFPSToolStripMenuItem_Click); - // - // displayFrameCounterToolStripMenuItem - // - this.displayFrameCounterToolStripMenuItem.Name = "displayFrameCounterToolStripMenuItem"; - this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.displayFrameCounterToolStripMenuItem.Text = "Display FrameCounter"; - this.displayFrameCounterToolStripMenuItem.Click += new System.EventHandler(this.displayFrameCounterToolStripMenuItem_Click); - // - // displayLagCounterToolStripMenuItem - // - this.displayLagCounterToolStripMenuItem.Name = "displayLagCounterToolStripMenuItem"; - this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter"; - this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click); - // - // displayInputToolStripMenuItem - // - this.displayInputToolStripMenuItem.Name = "displayInputToolStripMenuItem"; - this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(191, 22); - this.displayInputToolStripMenuItem.Text = "Display Input"; - this.displayInputToolStripMenuItem.Click += new System.EventHandler(this.displayInputToolStripMenuItem_Click); - // - // configToolStripMenuItem - // - this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.windowSizeMenuItem.Name = "windowSizeMenuItem"; + this.windowSizeMenuItem.Size = new System.Drawing.Size(191, 22); + this.windowSizeMenuItem.Text = "&Window Size"; + // + // x1MenuItem + // + this.x1MenuItem.Name = "x1MenuItem"; + this.x1MenuItem.Size = new System.Drawing.Size(105, 22); + this.x1MenuItem.Text = "&1x"; + this.x1MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // x2MenuItem + // + this.x2MenuItem.Name = "x2MenuItem"; + this.x2MenuItem.Size = new System.Drawing.Size(105, 22); + this.x2MenuItem.Text = "&2x"; + this.x2MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // x3MenuItem + // + this.x3MenuItem.Name = "x3MenuItem"; + this.x3MenuItem.Size = new System.Drawing.Size(105, 22); + this.x3MenuItem.Text = "&3x"; + this.x3MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // x4MenuItem + // + this.x4MenuItem.Name = "x4MenuItem"; + this.x4MenuItem.Size = new System.Drawing.Size(105, 22); + this.x4MenuItem.Text = "&4x"; + this.x4MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // x5MenuItem + // + this.x5MenuItem.Name = "x5MenuItem"; + this.x5MenuItem.Size = new System.Drawing.Size(105, 22); + this.x5MenuItem.Text = "&5x"; + this.x5MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // mzMenuItem + // + this.mzMenuItem.Name = "mzMenuItem"; + this.mzMenuItem.Size = new System.Drawing.Size(105, 22); + this.mzMenuItem.Text = "&Max"; + this.mzMenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(188, 6); + // + // displayFPSToolStripMenuItem + // + this.displayFPSToolStripMenuItem.Name = "displayFPSToolStripMenuItem"; + this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.displayFPSToolStripMenuItem.Text = "Display FPS"; + this.displayFPSToolStripMenuItem.Click += new System.EventHandler(this.displayFPSToolStripMenuItem_Click); + // + // displayFrameCounterToolStripMenuItem + // + this.displayFrameCounterToolStripMenuItem.Name = "displayFrameCounterToolStripMenuItem"; + this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.displayFrameCounterToolStripMenuItem.Text = "Display FrameCounter"; + this.displayFrameCounterToolStripMenuItem.Click += new System.EventHandler(this.displayFrameCounterToolStripMenuItem_Click); + // + // displayLagCounterToolStripMenuItem + // + this.displayLagCounterToolStripMenuItem.Name = "displayLagCounterToolStripMenuItem"; + this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter"; + this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click); + // + // displayInputToolStripMenuItem + // + this.displayInputToolStripMenuItem.Name = "displayInputToolStripMenuItem"; + this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(191, 22); + this.displayInputToolStripMenuItem.Text = "Display Input"; + this.displayInputToolStripMenuItem.Click += new System.EventHandler(this.displayInputToolStripMenuItem_Click); + // + // configToolStripMenuItem + // + this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.controllersToolStripMenuItem, this.hotkeysToolStripMenuItem, this.toolStripSeparator9, @@ -858,87 +859,87 @@ this.toolStripSeparator10, this.saveConfigToolStripMenuItem, this.loadConfigToolStripMenuItem}); - this.configToolStripMenuItem.Name = "configToolStripMenuItem"; - this.configToolStripMenuItem.Size = new System.Drawing.Size(50, 20); - this.configToolStripMenuItem.Text = "&Config"; - // - // controllersToolStripMenuItem - // - this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; - this.controllersToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.controllersToolStripMenuItem.Text = "&Controllers"; - this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); - // - // hotkeysToolStripMenuItem - // - this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; - this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.hotkeysToolStripMenuItem.Text = "&Hotkeys"; - this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); - // - // toolStripSeparator9 - // - this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(140, 6); - // - // soundToolStripMenuItem - // - this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; - this.soundToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.soundToolStripMenuItem.Text = "&Sound"; - this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); - // - // gUIToolStripMenuItem - // - this.gUIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.configToolStripMenuItem.Name = "configToolStripMenuItem"; + this.configToolStripMenuItem.Size = new System.Drawing.Size(50, 20); + this.configToolStripMenuItem.Text = "&Config"; + // + // controllersToolStripMenuItem + // + this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; + this.controllersToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.controllersToolStripMenuItem.Text = "&Controllers"; + this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); + // + // hotkeysToolStripMenuItem + // + this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; + this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.hotkeysToolStripMenuItem.Text = "&Hotkeys"; + this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); + // + // toolStripSeparator9 + // + this.toolStripSeparator9.Name = "toolStripSeparator9"; + this.toolStripSeparator9.Size = new System.Drawing.Size(140, 6); + // + // soundToolStripMenuItem + // + this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; + this.soundToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.soundToolStripMenuItem.Text = "&Sound"; + this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); + // + // gUIToolStripMenuItem + // + this.gUIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pauseWhenMenuActivatedToolStripMenuItem, this.saveWindowPositionToolStripMenuItem, this.startPausedToolStripMenuItem, this.enableRewindToolStripMenuItem, this.forceGDIPPresentationToolStripMenuItem}); - this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; - this.gUIToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.gUIToolStripMenuItem.Text = "GUI"; - this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); - // - // pauseWhenMenuActivatedToolStripMenuItem - // - this.pauseWhenMenuActivatedToolStripMenuItem.Name = "pauseWhenMenuActivatedToolStripMenuItem"; - this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(220, 22); - this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated"; - this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click); - // - // saveWindowPositionToolStripMenuItem - // - this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; - this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(220, 22); - this.saveWindowPositionToolStripMenuItem.Text = "Save window position"; - this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); - // - // startPausedToolStripMenuItem - // - this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem"; - this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(220, 22); - this.startPausedToolStripMenuItem.Text = "Start paused"; - this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click); - // - // enableRewindToolStripMenuItem - // - this.enableRewindToolStripMenuItem.Name = "enableRewindToolStripMenuItem"; - this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(220, 22); - this.enableRewindToolStripMenuItem.Text = "&Enable Rewind"; - this.enableRewindToolStripMenuItem.Click += new System.EventHandler(this.enableRewindToolStripMenuItem_Click); - // - // forceGDIPPresentationToolStripMenuItem - // - this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem"; - this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(220, 22); - this.forceGDIPPresentationToolStripMenuItem.Text = "Force GDI+ Presentation"; - this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click); - // - // frameSkipToolStripMenuItem - // - this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; + this.gUIToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.gUIToolStripMenuItem.Text = "GUI"; + this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); + // + // pauseWhenMenuActivatedToolStripMenuItem + // + this.pauseWhenMenuActivatedToolStripMenuItem.Name = "pauseWhenMenuActivatedToolStripMenuItem"; + this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated"; + this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click); + // + // saveWindowPositionToolStripMenuItem + // + this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.saveWindowPositionToolStripMenuItem.Text = "Save window position"; + this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); + // + // startPausedToolStripMenuItem + // + this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem"; + this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.startPausedToolStripMenuItem.Text = "Start paused"; + this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click); + // + // enableRewindToolStripMenuItem + // + this.enableRewindToolStripMenuItem.Name = "enableRewindToolStripMenuItem"; + this.enableRewindToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.enableRewindToolStripMenuItem.Text = "&Enable Rewind"; + this.enableRewindToolStripMenuItem.Click += new System.EventHandler(this.enableRewindToolStripMenuItem_Click); + // + // forceGDIPPresentationToolStripMenuItem + // + this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem"; + this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(220, 22); + this.forceGDIPPresentationToolStripMenuItem.Text = "Force GDI+ Presentation"; + this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click); + // + // frameSkipToolStripMenuItem + // + this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.miLimitFramerate, this.miDisplayVsync, this.toolStripMenuItem3, @@ -959,168 +960,168 @@ this.miSpeed100, this.miSpeed150, this.miSpeed200}); - this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; - this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; - this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); - // - // miLimitFramerate - // - this.miLimitFramerate.Name = "miLimitFramerate"; - this.miLimitFramerate.Size = new System.Drawing.Size(192, 22); - this.miLimitFramerate.Text = "Limit Framerate"; - this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click); - // - // miDisplayVsync - // - this.miDisplayVsync.Name = "miDisplayVsync"; - this.miDisplayVsync.Size = new System.Drawing.Size(192, 22); - this.miDisplayVsync.Text = "Display VSync"; - this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click); - // - // toolStripMenuItem3 - // - this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(189, 6); - // - // miAutoMinimizeSkipping - // - this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping"; - this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(192, 22); - this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping"; - this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click); - // - // miFrameskip0 - // - this.miFrameskip0.Name = "miFrameskip0"; - this.miFrameskip0.Size = new System.Drawing.Size(192, 22); - this.miFrameskip0.Text = "0 (never skip)"; - this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click); - // - // miFrameskip1 - // - this.miFrameskip1.Name = "miFrameskip1"; - this.miFrameskip1.Size = new System.Drawing.Size(192, 22); - this.miFrameskip1.Text = "1"; - this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click); - // - // miFrameskip2 - // - this.miFrameskip2.Name = "miFrameskip2"; - this.miFrameskip2.Size = new System.Drawing.Size(192, 22); - this.miFrameskip2.Text = "2"; - this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click); - // - // miFrameskip3 - // - this.miFrameskip3.Name = "miFrameskip3"; - this.miFrameskip3.Size = new System.Drawing.Size(192, 22); - this.miFrameskip3.Text = "3"; - this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click); - // - // miFrameskip4 - // - this.miFrameskip4.Name = "miFrameskip4"; - this.miFrameskip4.Size = new System.Drawing.Size(192, 22); - this.miFrameskip4.Text = "4"; - this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click); - // - // miFrameskip5 - // - this.miFrameskip5.Name = "miFrameskip5"; - this.miFrameskip5.Size = new System.Drawing.Size(192, 22); - this.miFrameskip5.Text = "5"; - this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click); - // - // miFrameskip6 - // - this.miFrameskip6.Name = "miFrameskip6"; - this.miFrameskip6.Size = new System.Drawing.Size(192, 22); - this.miFrameskip6.Text = "6"; - this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click); - // - // miFrameskip7 - // - this.miFrameskip7.Name = "miFrameskip7"; - this.miFrameskip7.Size = new System.Drawing.Size(192, 22); - this.miFrameskip7.Text = "7"; - this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click); - // - // miFrameskip8 - // - this.miFrameskip8.Name = "miFrameskip8"; - this.miFrameskip8.Size = new System.Drawing.Size(192, 22); - this.miFrameskip8.Text = "8"; - this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click); - // - // miFrameskip9 - // - this.miFrameskip9.Name = "miFrameskip9"; - this.miFrameskip9.Size = new System.Drawing.Size(192, 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(189, 6); - // - // miSpeed50 - // - this.miSpeed50.Name = "miSpeed50"; - this.miSpeed50.Size = new System.Drawing.Size(192, 22); - this.miSpeed50.Text = "Speed 50%"; - this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click); - // - // miSpeed75 - // - this.miSpeed75.Name = "miSpeed75"; - this.miSpeed75.Size = new System.Drawing.Size(192, 22); - this.miSpeed75.Text = "Speed 75%"; - this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click); - // - // miSpeed100 - // - this.miSpeed100.Name = "miSpeed100"; - this.miSpeed100.Size = new System.Drawing.Size(192, 22); - this.miSpeed100.Text = "Speed 100%"; - this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click); - // - // miSpeed150 - // - this.miSpeed150.Name = "miSpeed150"; - this.miSpeed150.Size = new System.Drawing.Size(192, 22); - this.miSpeed150.Text = "Speed 150%"; - this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click); - // - // miSpeed200 - // - this.miSpeed200.Name = "miSpeed200"; - this.miSpeed200.Size = new System.Drawing.Size(192, 22); - this.miSpeed200.Text = "Speed 200%"; - this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click); - // - // toolStripSeparator10 - // - this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(140, 6); - // - // saveConfigToolStripMenuItem - // - this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; - this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.saveConfigToolStripMenuItem.Text = "Save Config"; - this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); - // - // loadConfigToolStripMenuItem - // - this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; - this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.loadConfigToolStripMenuItem.Text = "Load Config"; - // - // toolsToolStripMenuItem - // - this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; + this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; + this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); + // + // miLimitFramerate + // + this.miLimitFramerate.Name = "miLimitFramerate"; + this.miLimitFramerate.Size = new System.Drawing.Size(192, 22); + this.miLimitFramerate.Text = "Limit Framerate"; + this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click); + // + // miDisplayVsync + // + this.miDisplayVsync.Name = "miDisplayVsync"; + this.miDisplayVsync.Size = new System.Drawing.Size(192, 22); + this.miDisplayVsync.Text = "Display VSync"; + this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click); + // + // toolStripMenuItem3 + // + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(189, 6); + // + // miAutoMinimizeSkipping + // + this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping"; + this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(192, 22); + this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping"; + this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click); + // + // miFrameskip0 + // + this.miFrameskip0.Name = "miFrameskip0"; + this.miFrameskip0.Size = new System.Drawing.Size(192, 22); + this.miFrameskip0.Text = "0 (never skip)"; + this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click); + // + // miFrameskip1 + // + this.miFrameskip1.Name = "miFrameskip1"; + this.miFrameskip1.Size = new System.Drawing.Size(192, 22); + this.miFrameskip1.Text = "1"; + this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click); + // + // miFrameskip2 + // + this.miFrameskip2.Name = "miFrameskip2"; + this.miFrameskip2.Size = new System.Drawing.Size(192, 22); + this.miFrameskip2.Text = "2"; + this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click); + // + // miFrameskip3 + // + this.miFrameskip3.Name = "miFrameskip3"; + this.miFrameskip3.Size = new System.Drawing.Size(192, 22); + this.miFrameskip3.Text = "3"; + this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click); + // + // miFrameskip4 + // + this.miFrameskip4.Name = "miFrameskip4"; + this.miFrameskip4.Size = new System.Drawing.Size(192, 22); + this.miFrameskip4.Text = "4"; + this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click); + // + // miFrameskip5 + // + this.miFrameskip5.Name = "miFrameskip5"; + this.miFrameskip5.Size = new System.Drawing.Size(192, 22); + this.miFrameskip5.Text = "5"; + this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click); + // + // miFrameskip6 + // + this.miFrameskip6.Name = "miFrameskip6"; + this.miFrameskip6.Size = new System.Drawing.Size(192, 22); + this.miFrameskip6.Text = "6"; + this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click); + // + // miFrameskip7 + // + this.miFrameskip7.Name = "miFrameskip7"; + this.miFrameskip7.Size = new System.Drawing.Size(192, 22); + this.miFrameskip7.Text = "7"; + this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click); + // + // miFrameskip8 + // + this.miFrameskip8.Name = "miFrameskip8"; + this.miFrameskip8.Size = new System.Drawing.Size(192, 22); + this.miFrameskip8.Text = "8"; + this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click); + // + // miFrameskip9 + // + this.miFrameskip9.Name = "miFrameskip9"; + this.miFrameskip9.Size = new System.Drawing.Size(192, 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(189, 6); + // + // miSpeed50 + // + this.miSpeed50.Name = "miSpeed50"; + this.miSpeed50.Size = new System.Drawing.Size(192, 22); + this.miSpeed50.Text = "Speed 50%"; + this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click); + // + // miSpeed75 + // + this.miSpeed75.Name = "miSpeed75"; + this.miSpeed75.Size = new System.Drawing.Size(192, 22); + this.miSpeed75.Text = "Speed 75%"; + this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click); + // + // miSpeed100 + // + this.miSpeed100.Name = "miSpeed100"; + this.miSpeed100.Size = new System.Drawing.Size(192, 22); + this.miSpeed100.Text = "Speed 100%"; + this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click); + // + // miSpeed150 + // + this.miSpeed150.Name = "miSpeed150"; + this.miSpeed150.Size = new System.Drawing.Size(192, 22); + this.miSpeed150.Text = "Speed 150%"; + this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click); + // + // miSpeed200 + // + this.miSpeed200.Name = "miSpeed200"; + this.miSpeed200.Size = new System.Drawing.Size(192, 22); + this.miSpeed200.Text = "Speed 200%"; + this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click); + // + // toolStripSeparator10 + // + this.toolStripSeparator10.Name = "toolStripSeparator10"; + this.toolStripSeparator10.Size = new System.Drawing.Size(140, 6); + // + // saveConfigToolStripMenuItem + // + this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; + this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.saveConfigToolStripMenuItem.Text = "Save Config"; + this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); + // + // loadConfigToolStripMenuItem + // + this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; + this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.loadConfigToolStripMenuItem.Text = "Load Config"; + // + // toolsToolStripMenuItem + // + this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.rAMWatchToolStripMenuItem, this.rAMSearchToolStripMenuItem, this.rAMPokeToolStripMenuItem, @@ -1128,122 +1129,130 @@ this.luaConsoleToolStripMenuItem, this.toolStripSeparator11, this.cheatsToolStripMenuItem}); - this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20); - this.toolsToolStripMenuItem.Text = "&Tools"; - // - // rAMWatchToolStripMenuItem - // - this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; - this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); - // - // rAMSearchToolStripMenuItem - // - this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; - this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); - // - // rAMPokeToolStripMenuItem - // - this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; - this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); - // - // hexEditorToolStripMenuItem - // - this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; - this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); - // - // luaConsoleToolStripMenuItem - // - this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.luaConsoleToolStripMenuItem.Text = "Lua Console"; - this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); - // - // toolStripSeparator11 - // - this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(140, 6); - // - // cheatsToolStripMenuItem - // - this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(143, 22); - this.cheatsToolStripMenuItem.Text = "Cheats"; - this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); - // - // NESToolStripMenuItem - // - this.NESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(44, 20); + this.toolsToolStripMenuItem.Text = "&Tools"; + // + // rAMWatchToolStripMenuItem + // + this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; + this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); + // + // rAMSearchToolStripMenuItem + // + this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; + this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); + // + // rAMPokeToolStripMenuItem + // + this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; + this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); + // + // hexEditorToolStripMenuItem + // + this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; + this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); + // + // luaConsoleToolStripMenuItem + // + this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.luaConsoleToolStripMenuItem.Text = "Lua Console"; + this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); + // + // toolStripSeparator11 + // + this.toolStripSeparator11.Name = "toolStripSeparator11"; + this.toolStripSeparator11.Size = new System.Drawing.Size(149, 6); + // + // cheatsToolStripMenuItem + // + this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.cheatsToolStripMenuItem.Text = "Cheats"; + this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); + // + // NESToolStripMenuItem + // + this.NESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pPUViewerToolStripMenuItem, + this.debuggerToolStripMenuItem, this.gameGenieCodesToolStripMenuItem}); - this.NESToolStripMenuItem.Name = "NESToolStripMenuItem"; - this.NESToolStripMenuItem.Size = new System.Drawing.Size(38, 20); - this.NESToolStripMenuItem.Text = "&NES"; - // - // pPUViewerToolStripMenuItem - // - this.pPUViewerToolStripMenuItem.Name = "pPUViewerToolStripMenuItem"; - this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(228, 22); - this.pPUViewerToolStripMenuItem.Text = "&PPU Viewer"; - this.pPUViewerToolStripMenuItem.Click += new System.EventHandler(this.PPUViewerToolStripMenuItem_Click); - // - // gameGenieCodesToolStripMenuItem - // - this.gameGenieCodesToolStripMenuItem.Name = "gameGenieCodesToolStripMenuItem"; - this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(228, 22); - this.gameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; - this.gameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.gameGenieCodesToolStripMenuItem_Click); - // - // helpToolStripMenuItem - // - this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.NESToolStripMenuItem.Name = "NESToolStripMenuItem"; + this.NESToolStripMenuItem.Size = new System.Drawing.Size(38, 20); + this.NESToolStripMenuItem.Text = "&NES"; + // + // pPUViewerToolStripMenuItem + // + this.pPUViewerToolStripMenuItem.Name = "pPUViewerToolStripMenuItem"; + this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(228, 22); + this.pPUViewerToolStripMenuItem.Text = "&PPU Viewer"; + this.pPUViewerToolStripMenuItem.Click += new System.EventHandler(this.PPUViewerToolStripMenuItem_Click); + // + // gameGenieCodesToolStripMenuItem + // + this.gameGenieCodesToolStripMenuItem.Name = "gameGenieCodesToolStripMenuItem"; + this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(228, 22); + this.gameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; + this.gameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.gameGenieCodesToolStripMenuItem_Click); + // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.helpToolStripMenuItem1, this.aboutToolStripMenuItem}); - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); - this.helpToolStripMenuItem.Text = "&Help"; - // - // helpToolStripMenuItem1 - // - this.helpToolStripMenuItem1.Enabled = false; - this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; - this.helpToolStripMenuItem1.Size = new System.Drawing.Size(114, 22); - this.helpToolStripMenuItem1.Text = "&Help"; - this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); - // - // aboutToolStripMenuItem - // - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(114, 22); - this.aboutToolStripMenuItem.Text = "&About"; - this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); - // - // MainForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(470, 378); - this.Controls.Add(this.menuStrip1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menuStrip1; - this.MaximizeBox = false; - this.Name = "MainForm"; - this.Text = "BizHawk"; - this.Load += new System.EventHandler(this.MainForm_Load); - this.Shown += new System.EventHandler(this.MainForm_Shown); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20); + this.helpToolStripMenuItem.Text = "&Help"; + // + // helpToolStripMenuItem1 + // + this.helpToolStripMenuItem1.Enabled = false; + this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; + this.helpToolStripMenuItem1.Size = new System.Drawing.Size(114, 22); + this.helpToolStripMenuItem1.Text = "&Help"; + this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); + // + // aboutToolStripMenuItem + // + this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(114, 22); + this.aboutToolStripMenuItem.Text = "&About"; + this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); + // + // debuggerToolStripMenuItem + // + this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem"; + this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(228, 22); + this.debuggerToolStripMenuItem.Text = "&Debugger"; + this.debuggerToolStripMenuItem.Click += new System.EventHandler(this.debuggerToolStripMenuItem_Click); + // + // MainForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(470, 378); + this.Controls.Add(this.menuStrip1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.menuStrip1; + this.MaximizeBox = false; + this.Name = "MainForm"; + this.Text = "BizHawk"; + this.Load += new System.EventHandler(this.MainForm_Load); + this.Shown += new System.EventHandler(this.MainForm_Shown); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -1384,6 +1393,7 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; private System.Windows.Forms.ToolStripMenuItem cheatsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem forceGDIPPresentationToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem debuggerToolStripMenuItem; } } diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 71aa31c017..c372bd7254 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -254,6 +254,7 @@ namespace BizHawk.MultiClient RamSearch1.Restart(); HexEditor1.Restart(); NESPPU1.Restart(); + NESDebug1.Restart(); Cheats1.Restart(); Text = "BizHawk"; HandlePlatformMenus(); @@ -426,5 +427,10 @@ namespace BizHawk.MultiClient SyncPresentationMode(); } + private void debuggerToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadNESDebugger(); + } + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 7a71552362..d6d7377375 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -48,6 +48,7 @@ namespace BizHawk.MultiClient public RamSearch RamSearch1 = new RamSearch(); public HexEditor HexEditor1 = new HexEditor(); public NESPPU NESPPU1 = new NESPPU(); + public NESDebugger NESDebug1 = new NESDebugger(); public Cheats Cheats1 = new Cheats(); public MainForm(string[] args) @@ -134,6 +135,8 @@ namespace BizHawk.MultiClient LoadCheatsWindow(); if (Global.Config.AutoLoadNESPPU && Global.Emulator is NES) LoadNESPPU(); + if (Global.Config.AutoLoadNESDebugger && Global.Emulator is NES) + LoadNESDebugger(); if (Global.Config.NESGGAutoload && Global.Emulator is NES) LoadGameGenieEC(); @@ -557,6 +560,7 @@ namespace BizHawk.MultiClient RamSearch1.Restart(); HexEditor1.Restart(); NESPPU1.Restart(); + NESDebug1.Restart(); if (Global.Config.LoadCheatFileByGame) { if (Cheats1.AttemptLoadCheatFile()) @@ -1070,6 +1074,17 @@ namespace BizHawk.MultiClient NESPPU1.Focus(); } + public void LoadNESDebugger() + { + if (!NESDebug1.IsHandleCreated || NESDebug1.IsDisposed) + { + NESDebug1 = new NESDebugger(); + NESDebug1.Show(); + } + else + NESDebug1.Focus(); + } + public void LoadCheatsWindow() { if (!Cheats1.IsHandleCreated || Cheats1.IsDisposed) @@ -1304,7 +1319,5 @@ namespace BizHawk.MultiClient loadstate0toolStripMenuItem.ShortcutKeyDisplayString = Global.Config.LoadSlot9; //loadNamedStateToolStripMenuItem //eh? } - - } } \ No newline at end of file diff --git a/BizHawk.MultiClient/NEStools/NESDebugger.Designer.cs b/BizHawk.MultiClient/NEStools/NESDebugger.Designer.cs new file mode 100644 index 0000000000..f949486e81 --- /dev/null +++ b/BizHawk.MultiClient/NEStools/NESDebugger.Designer.cs @@ -0,0 +1,181 @@ +namespace BizHawk.MultiClient +{ + partial class NESDebugger + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NESDebugger)); + this.DebugView = new BizHawk.VirtualListView(); + this.Address = new System.Windows.Forms.ColumnHeader(); + this.Instruction = new System.Windows.Forms.ColumnHeader(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.restoreOriginalSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // DebugView + // + this.DebugView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.DebugView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.Address, + this.Instruction}); + this.DebugView.GridLines = true; + this.DebugView.ItemCount = 0; + this.DebugView.Location = new System.Drawing.Point(12, 40); + this.DebugView.Name = "DebugView"; + this.DebugView.selectedItem = -1; + this.DebugView.Size = new System.Drawing.Size(241, 351); + this.DebugView.TabIndex = 0; + this.DebugView.UseCompatibleStateImageBehavior = false; + this.DebugView.View = System.Windows.Forms.View.Details; + // + // Address + // + this.Address.Text = "Address"; + this.Address.Width = 94; + // + // Instruction + // + this.Instruction.Text = "Instruction"; + this.Instruction.Width = 143; + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem, + this.debugToolStripMenuItem, + this.optionsToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(470, 24); + this.menuStrip1.TabIndex = 1; + this.menuStrip1.Text = "menuStrip1"; + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.exitToolStripMenuItem}); + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Text = "&File"; + // + // exitToolStripMenuItem + // + 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(143, 22); + this.exitToolStripMenuItem.Text = "E&xit"; + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // debugToolStripMenuItem + // + this.debugToolStripMenuItem.Name = "debugToolStripMenuItem"; + this.debugToolStripMenuItem.Size = new System.Drawing.Size(50, 20); + this.debugToolStripMenuItem.Text = "&Debug"; + // + // optionsToolStripMenuItem + // + this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.autoloadToolStripMenuItem, + this.saveWindowPositionToolStripMenuItem, + this.toolStripSeparator1, + this.restoreOriginalSizeToolStripMenuItem}); + this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); + this.optionsToolStripMenuItem.Text = "&Options"; + this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); + // + // autoloadToolStripMenuItem + // + this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem"; + this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.autoloadToolStripMenuItem.Text = "Auto-load"; + this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click); + // + // saveWindowPositionToolStripMenuItem + // + this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.saveWindowPositionToolStripMenuItem.Text = "Save window position"; + this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(185, 6); + // + // restoreOriginalSizeToolStripMenuItem + // + this.restoreOriginalSizeToolStripMenuItem.Name = "restoreOriginalSizeToolStripMenuItem"; + this.restoreOriginalSizeToolStripMenuItem.Size = new System.Drawing.Size(188, 22); + this.restoreOriginalSizeToolStripMenuItem.Text = "Restore Window Size"; + this.restoreOriginalSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreOriginalSizeToolStripMenuItem_Click); + // + // NESDebugger + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(470, 403); + this.Controls.Add(this.DebugView); + this.Controls.Add(this.menuStrip1); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.menuStrip1; + this.Name = "NESDebugger"; + this.Text = "NESDebugger"; + this.Load += new System.EventHandler(this.NESDebugger_Load); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private VirtualListView DebugView; + private System.Windows.Forms.ColumnHeader Address; + private System.Windows.Forms.ColumnHeader Instruction; + private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem debugToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem autoloadToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripMenuItem restoreOriginalSizeToolStripMenuItem; + } +} \ No newline at end of file diff --git a/BizHawk.MultiClient/NEStools/NESDebugger.cs b/BizHawk.MultiClient/NEStools/NESDebugger.cs new file mode 100644 index 0000000000..78f46ce2d6 --- /dev/null +++ b/BizHawk.MultiClient/NEStools/NESDebugger.cs @@ -0,0 +1,94 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace BizHawk.MultiClient +{ + public partial class NESDebugger : Form + { + int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired + int defaultHeight; + + public NESDebugger() + { + InitializeComponent(); + DebugView.QueryItemText += new QueryItemTextHandler(DebugView_QueryItemText); + DebugView.QueryItemBkColor += new QueryItemBkColorHandler(DebugView_QueryItemBkColor); + DebugView.VirtualMode = true; + Closing += (o, e) => SaveConfigSettings(); + } + + public void Restart() + { + + } + + private void NESDebugger_Load(object sender, EventArgs e) + { + LoadConfigSettings(); + } + + private void LoadConfigSettings() + { + defaultWidth = this.Size.Width; //Save these first so that the user can restore to its original size + defaultHeight = this.Size.Height; + + if (Global.Config.NESDebuggerSaveWindowPosition && Global.Config.NESDebuggerWndx >= 0 && Global.Config.NESDebuggerWndy >= 0) + this.Location = new Point(Global.Config.NESDebuggerWndx, Global.Config.NESDebuggerWndy); + + if (Global.Config.NESDebuggerWidth >= 0 && Global.Config.NESDebuggerHeight >= 0) + { + this.Size = new System.Drawing.Size(Global.Config.NESDebuggerWidth, Global.Config.NESDebuggerHeight); + } + } + + public void SaveConfigSettings() + { + Global.Config.NESDebuggerWndx = this.Location.X; + Global.Config.NESDebuggerWndy = this.Location.Y; + Global.Config.NESDebuggerWidth = this.Right - this.Left; + Global.Config.NESDebuggerHeight = this.Bottom - this.Top; + } + + private void DebugView_QueryItemBkColor(int index, int column, ref Color color) + { + + } + + void DebugView_QueryItemText(int index, int column, out string text) + { + text = ""; + } + + private void exitToolStripMenuItem_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void autoloadToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.AutoLoadNESDebugger ^= true; + } + + private void saveWindowPositionToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.NESDebuggerSaveWindowPosition ^= true; + } + + private void optionsToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + autoloadToolStripMenuItem.Checked = Global.Config.AutoLoadNESDebugger; + saveWindowPositionToolStripMenuItem.Checked = Global.Config.NESDebuggerSaveWindowPosition; + } + + private void restoreOriginalSizeToolStripMenuItem_Click(object sender, EventArgs e) + { + this.Size = new System.Drawing.Size(defaultWidth, defaultHeight); + } + } +} diff --git a/BizHawk.MultiClient/NEStools/NESDebugger.resx b/BizHawk.MultiClient/NEStools/NESDebugger.resx new file mode 100644 index 0000000000..293e36120d --- /dev/null +++ b/BizHawk.MultiClient/NEStools/NESDebugger.resx @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + + + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAMQOAADEDgAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB4rHL/X5dW/2OWW/9omWD/Vo5M/1SRS/8AAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAGSiX/9BiTv/usi18ePf4v/p5Or/5OHl/9jY2P/Fy8Xldp9x/zuF + Nv8AAAAAAAAAAAAAAAAAAAAAAAAAAHKsbv9UlU//9e70///0///a49r/4Obg/+/r7//o5ej/5+Hn//Hj + 8v+6wrfpPIM3/wAAAAAAAAAAAAAAAIq5hv9MlEb//fr8///9////+///ert6/0ulS//Q59D//fr9/+3t + 7f/d4N7/8+Tz/6q8p/NFjUH/AAAAAAAAAABAjTr/2+nW/////////v///////3S5dP8AcgD/Pp8+/9ju + 2P///P//8PHw/+Hh3//r4e3/X5ld/wAAAACPvIv/ZKJd//////////////////////9+v37/BXkF/wB0 + AP9Lp0v/2O7Y//78/v/r6+r/6+Tr/7LBsO9Nkkb/aKVi/8vhx////////v3+////////////fb59/wZ6 + Bv8AegD/AHkA/0mlSf/Y7Nj/+PT4/+fk6P/b1tn/X5pW/1eaUP/w9+////////39/f///////////329 + ff8FfAX/AH4A/wB2AP8AegD/pdOl//v5+//o5+j/6uDr/3Siaf9cnVX/4u7h///////9/f3///////// + //99vn3/BnwG/wB0AP8Oew7/fLx8/+327f/49/j/6+rs/+Tf4/9emlf/hLN9/4Czff///////v7+//// + ////////fL18/wByAP8MdQz/gcCB//r++v//////8vTy//Pu9P/J0cbpQY4+/wAAAABFjD//9frz//// + /////v///////260bv8Kdgr/fbt9//n9+f///////f39//Ly8v//9P//b6Np/wAAAAAAAAAAYJ5a/1iZ + Uv/////////////+//+ayZr/h8GH//L58v///////f39//3+/f///f//2NzV5VmbVP8AAAAAAAAAAAAA + AABYmVL/4vTg8f//////////8vjy//7//v//////////////////////4Ord61GVTP8AAAAAAAAAAAAA + AAAAAAAAAAAAAEuQRv+kzZ7/9//1///////////////////////w9ez/m8GV/1GVS/8AAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAm8KX/2CeW/9fnVr/aqVk/2qkZv9WllD/dqtx/466i/8AAAAAAAAAAAAA + AAAAAAAA//8AAPgfAADgBwAAwAMAAIABAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAAgAEAAMAD + AADgBwAA8A8AAA== + + + \ No newline at end of file diff --git a/BizHawk.MultiClient/NEStools/NESGameGenie.cs b/BizHawk.MultiClient/NEStools/NESGameGenie.cs index 46f45ee976..78bfc7583a 100644 --- a/BizHawk.MultiClient/NEStools/NESGameGenie.cs +++ b/BizHawk.MultiClient/NEStools/NESGameGenie.cs @@ -45,7 +45,7 @@ namespace BizHawk.MultiClient AddCheat.Enabled = false; - if (Global.Config.NESGGWndx >= 0 && Global.Config.NESGGWndy >= 0) + if (Global.Config.NESGGSaveWindowPosition && Global.Config.NESGGWndx >= 0 && Global.Config.NESGGWndy >= 0) Location = new Point(Global.Config.NESGGWndx, Global.Config.NESGGWndy); } diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index b859149a72..67d621d864 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -95,6 +95,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap Debugger { + get { + object obj = ResourceManager.GetObject("Debugger", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap FindHS { get { object obj = ResourceManager.GetObject("FindHS", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index 60a07d6dc0..b848d5a793 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -603,4 +603,7 @@ ..\images\Cheats.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\Debugger.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/BizHawk.MultiClient/images/Debugger.ico b/BizHawk.MultiClient/images/Debugger.ico new file mode 100644 index 0000000000000000000000000000000000000000..4290942ab483afd57e746ecbfc162f1dcc8d585a GIT binary patch literal 1150 zcmcIjTTc^F5I#h~gb?J(SAFysXd(vX0TNP-V6Z5NB}xqNfPvITYL`H~5Jm733!wx^ zkcLEgFkWJ~DG*T!F~Jzg3L;(F+RIYfZd+*!yPs#bwm>xcG?riP@=A=uJ8yGXGDyJXi-!hZ^VGOHtWb4s}~TitefKubLHo z8f4$h#PItUe(TaQTsAjsoEs zhJY=AN23FQoYw3_j-#!Iu;7}bKuS_fX@|5Rbp%EIyew%OrfCzJCz>Hd zXgnnuD@t@ebg^GQ+fR2DCGhgSmhsC$i(d(*LI?{q&E|gMc8hzFFEr+F!^Yo*>TWLj zKlES?p?G*g`$8+|nlPf!`1g0zHQ9mko>FMKOHggDKz08GsM`ymdt8gQ;g;X(f?C3R c39;-VWPAr9jY%<%_q0{VeR7-}@7qntPh53xU;qFB literal 0 HcmV?d00001 diff --git a/BizHawk.MultiClient/images/Debugger.png b/BizHawk.MultiClient/images/Debugger.png new file mode 100644 index 0000000000000000000000000000000000000000..5ad6108c787684810df738dd50d2bbf28e1e22ac GIT binary patch literal 3470 zcmV;94RP{`P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}00081Nkl&VO!!WQbY|={8 zakqoh_fO-@JJ^;@wvc6g<=W~s%hzM(y*!mmD|rh7A*cX1@6vw1o!i5=u}q7C=Mge& zszTM6Rm(mk5*;kQN?FAQ7`_1oz=Ebvn`l_mfS32c6V62TK(Nx}r!zxhjkxOxmP?-y$sG(SPz`DJ*00Zv^=9_Y)eA wO%YUppcP~$;~>lDX6sdB@$5SV-Ut5;0KJ~jy|sTKRR91007*qoM6N<$f`N8?RsaA1 literal 0 HcmV?d00001