diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 01fcd4a852..c8dc00ea2b 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -50,6 +50,7 @@ public bool DisplayInput = false; public int DispInpx = 0; public int DispInpy = 24; + public bool ForceGDI = false; // Sound options public bool SoundEnabled = true; diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 7134fd53bb..1085a6089b 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -28,147 +28,148 @@ /// 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.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.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.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); - this.cheatsToolStripMenuItem = 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.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.forceGDIPPresentationToolStripMenuItem = 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, @@ -176,17 +177,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, @@ -199,71 +200,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, @@ -276,105 +277,105 @@ this.savestate0toolStripMenuItem, this.toolStripSeparator6, this.saveNamedStateToolStripMenuItem}); - this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; - this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.saveStateToolStripMenuItem.Text = "Save State"; - // - // savestate1toolStripMenuItem - // - this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; - this.savestate1toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F1))); - this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.savestate1toolStripMenuItem.Text = "1"; - this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); - // - // savestate2toolStripMenuItem - // - this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; - this.savestate2toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F2))); - this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.savestate2toolStripMenuItem.Text = "2"; - this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); - // - // savestate3toolStripMenuItem - // - this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; - this.savestate3toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F3))); - this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.savestate3toolStripMenuItem.Text = "3"; - this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); - // - // savestate4toolStripMenuItem - // - this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; - this.savestate4toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F4))); - this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.savestate4toolStripMenuItem.Text = "4"; - this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); - // - // savestate5toolStripMenuItem - // - this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; - this.savestate5toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F5))); - this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.savestate5toolStripMenuItem.Text = "5"; - this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); - // - // savestate6toolStripMenuItem - // - this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; - this.savestate6toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F6))); - this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.savestate6toolStripMenuItem.Text = "6"; - this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); - // - // savestate7toolStripMenuItem - // - this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; - this.savestate7toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F7))); - this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.savestate7toolStripMenuItem.Text = "7"; - this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); - // - // savestate8toolStripMenuItem - // - this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; - this.savestate8toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F8))); - this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.savestate8toolStripMenuItem.Text = "8"; - this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); - // - // savestate9toolStripMenuItem - // - this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; - this.savestate9toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F9))); - this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.savestate9toolStripMenuItem.Text = "9"; - this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); - // - // savestate0toolStripMenuItem - // - this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; - this.savestate0toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F10))); - this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(212, 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(209, 6); - // - // saveNamedStateToolStripMenuItem - // - this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; - this.saveNamedStateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(212, 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"; + // + // savestate1toolStripMenuItem + // + this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; + this.savestate1toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F1))); + this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.savestate1toolStripMenuItem.Text = "1"; + this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); + // + // savestate2toolStripMenuItem + // + this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; + this.savestate2toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F2))); + this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.savestate2toolStripMenuItem.Text = "2"; + this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); + // + // savestate3toolStripMenuItem + // + this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; + this.savestate3toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F3))); + this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.savestate3toolStripMenuItem.Text = "3"; + this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); + // + // savestate4toolStripMenuItem + // + this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; + this.savestate4toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F4))); + this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.savestate4toolStripMenuItem.Text = "4"; + this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); + // + // savestate5toolStripMenuItem + // + this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; + this.savestate5toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F5))); + this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.savestate5toolStripMenuItem.Text = "5"; + this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); + // + // savestate6toolStripMenuItem + // + this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; + this.savestate6toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F6))); + this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.savestate6toolStripMenuItem.Text = "6"; + this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); + // + // savestate7toolStripMenuItem + // + this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; + this.savestate7toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F7))); + this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.savestate7toolStripMenuItem.Text = "7"; + this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); + // + // savestate8toolStripMenuItem + // + this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; + this.savestate8toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F8))); + this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.savestate8toolStripMenuItem.Text = "8"; + this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); + // + // savestate9toolStripMenuItem + // + this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; + this.savestate9toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F9))); + this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.savestate9toolStripMenuItem.Text = "9"; + this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); + // + // savestate0toolStripMenuItem + // + this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; + this.savestate0toolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F10))); + this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(212, 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(209, 6); + // + // saveNamedStateToolStripMenuItem + // + this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; + this.saveNamedStateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + this.saveNamedStateToolStripMenuItem.Text = "Save Named State"; + // + // loadStateToolStripMenuItem + // + this.loadStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.loadstate1toolStripMenuItem, this.loadstate2toolStripMenuItem, this.loadstate3toolStripMenuItem, @@ -387,105 +388,105 @@ this.loadstate0toolStripMenuItem, this.toolStripSeparator7, this.loadNamedStateToolStripMenuItem}); - this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; - this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(177, 22); - this.loadStateToolStripMenuItem.Text = "Load State"; - // - // loadstate1toolStripMenuItem - // - this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; - this.loadstate1toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; - this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.loadstate1toolStripMenuItem.Text = "1"; - this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); - // - // loadstate2toolStripMenuItem - // - this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; - this.loadstate2toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F2; - this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.loadstate2toolStripMenuItem.Text = "2"; - this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); - // - // loadstate3toolStripMenuItem - // - this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; - this.loadstate3toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; - this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.loadstate3toolStripMenuItem.Text = "3"; - this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); - // - // loadstate4toolStripMenuItem - // - this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; - this.loadstate4toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F4; - this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.loadstate4toolStripMenuItem.Text = "4"; - this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); - // - // loadstate5toolStripMenuItem - // - this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; - this.loadstate5toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; - this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.loadstate5toolStripMenuItem.Text = "5"; - this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); - // - // loadstate6toolStripMenuItem - // - this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; - this.loadstate6toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F6; - this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.loadstate6toolStripMenuItem.Text = "6"; - this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); - // - // loadstate7toolStripMenuItem - // - this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; - this.loadstate7toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F7; - this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.loadstate7toolStripMenuItem.Text = "7"; - this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); - // - // loadstate8toolStripMenuItem - // - this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; - this.loadstate8toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F8; - this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.loadstate8toolStripMenuItem.Text = "8"; - this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); - // - // loadstate9toolStripMenuItem - // - this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; - this.loadstate9toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F9; - this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(210, 22); - this.loadstate9toolStripMenuItem.Text = "9"; - this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); - // - // loadstate0toolStripMenuItem - // - this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; - this.loadstate0toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F10; - this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(210, 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(207, 6); - // - // loadNamedStateToolStripMenuItem - // - this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; - this.loadNamedStateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L))); - this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(210, 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"; + // + // loadstate1toolStripMenuItem + // + this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; + this.loadstate1toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F1; + this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.loadstate1toolStripMenuItem.Text = "1"; + this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); + // + // loadstate2toolStripMenuItem + // + this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; + this.loadstate2toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F2; + this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.loadstate2toolStripMenuItem.Text = "2"; + this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); + // + // loadstate3toolStripMenuItem + // + this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; + this.loadstate3toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F3; + this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.loadstate3toolStripMenuItem.Text = "3"; + this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); + // + // loadstate4toolStripMenuItem + // + this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; + this.loadstate4toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F4; + this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.loadstate4toolStripMenuItem.Text = "4"; + this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); + // + // loadstate5toolStripMenuItem + // + this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; + this.loadstate5toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F5; + this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.loadstate5toolStripMenuItem.Text = "5"; + this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); + // + // loadstate6toolStripMenuItem + // + this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; + this.loadstate6toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F6; + this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.loadstate6toolStripMenuItem.Text = "6"; + this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); + // + // loadstate7toolStripMenuItem + // + this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; + this.loadstate7toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F7; + this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.loadstate7toolStripMenuItem.Text = "7"; + this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); + // + // loadstate8toolStripMenuItem + // + this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; + this.loadstate8toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F8; + this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.loadstate8toolStripMenuItem.Text = "8"; + this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); + // + // loadstate9toolStripMenuItem + // + this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; + this.loadstate9toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F9; + this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.loadstate9toolStripMenuItem.Text = "9"; + this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); + // + // loadstate0toolStripMenuItem + // + this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; + this.loadstate0toolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.F10; + this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(210, 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(207, 6); + // + // loadNamedStateToolStripMenuItem + // + this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; + this.loadNamedStateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.L))); + this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(210, 22); + this.loadNamedStateToolStripMenuItem.Text = "Load Named State"; + // + // saveSlotToolStripMenuItem + // + this.saveSlotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.selectSlot10ToolStripMenuItem, this.selectSlot1ToolStripMenuItem, this.selectSlot2ToolStripMenuItem, @@ -501,374 +502,374 @@ 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.ShortcutKeys = System.Windows.Forms.Keys.F12; - 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.ShortcutKeys = System.Windows.Forms.Keys.F12; + 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, @@ -878,79 +879,80 @@ 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(152, 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(152, 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(149, 6); - // - // soundToolStripMenuItem - // - this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; - this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.soundToolStripMenuItem.Text = "&Sound"; - this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); - // - // 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(152, 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(152, 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(149, 6); + // + // soundToolStripMenuItem + // + this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; + this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.soundToolStripMenuItem.Text = "&Sound"; + this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); + // + // gUIToolStripMenuItem + // + this.gUIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pauseWhenMenuActivatedToolStripMenuItem, this.saveWindowPositionToolStripMenuItem, this.startPausedToolStripMenuItem, - this.enableRewindToolStripMenuItem}); - this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; - this.gUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.gUIToolStripMenuItem.Text = "GUI"; - this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); - // - // 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); - // - // frameSkipToolStripMenuItem - // - this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.enableRewindToolStripMenuItem, + this.forceGDIPPresentationToolStripMenuItem}); + this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; + this.gUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.gUIToolStripMenuItem.Text = "GUI"; + this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); + // + // 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); + // + // frameSkipToolStripMenuItem + // + this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.miLimitFramerate, this.miDisplayVsync, this.toolStripMenuItem3, @@ -971,168 +973,168 @@ this.miSpeed100, this.miSpeed150, this.miSpeed200}); - this.frameSkipToolStripMenuItem.Name = "frameSkipToolStripMenuItem"; - this.frameSkipToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.frameSkipToolStripMenuItem.Text = "Speed/Skip"; - this.frameSkipToolStripMenuItem.DropDownOpened += new System.EventHandler(this.frameSkipToolStripMenuItem_DropDownOpened); - // - // 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(149, 6); - // - // saveConfigToolStripMenuItem - // - this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; - this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.saveConfigToolStripMenuItem.Text = "Save Config"; - this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); - // - // loadConfigToolStripMenuItem - // - this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; - this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 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(152, 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(149, 6); + // + // saveConfigToolStripMenuItem + // + this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; + this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveConfigToolStripMenuItem.Text = "Save Config"; + this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); + // + // loadConfigToolStripMenuItem + // + this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; + this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.loadConfigToolStripMenuItem.Text = "Load Config"; + // + // toolsToolStripMenuItem + // + this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.rAMWatchToolStripMenuItem, this.rAMSearchToolStripMenuItem, this.rAMPokeToolStripMenuItem, @@ -1140,122 +1142,129 @@ 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(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); - // - // 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(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.pPUViewerToolStripMenuItem, 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); - // - // 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); - // - // 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); + // + // 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); + // + // 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(); } @@ -1395,6 +1404,7 @@ private System.Windows.Forms.ToolStripMenuItem enableRewindToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; private System.Windows.Forms.ToolStripMenuItem cheatsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem forceGDIPPresentationToolStripMenuItem; } } diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index ac9cc92cd9..71aa31c017 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -16,7 +16,7 @@ namespace BizHawk.MultiClient { partial class MainForm { - private void rAMPokeToolStripMenuItem_Click(object sender, EventArgs e) + private void RAMPokeToolStripMenuItem_Click(object sender, EventArgs e) { RamPoke r = new RamPoke(); r.Show(); @@ -383,6 +383,48 @@ namespace BizHawk.MultiClient LoadRom(file.FullName); } + private void replayInputLogToolStripMenuItem_Click(object sender, EventArgs e) + { + InputLog.StopMovie(); + InputLog.StartPlayback(); + LoadRom(CurrentlyOpenRom); + } + + private void PPUViewerToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadNESPPU(); + } + + private void enableRewindToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.RewindEnabled ^= true; + } + + private void hexEditorToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadHexEditor(); + } + + private void MainForm_Shown(object sender, EventArgs e) + { + HandlePlatformMenus(); + } + + private void gameGenieCodesToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadGameGenieEC(); + } + + private void cheatsToolStripMenuItem_Click(object sender, EventArgs e) + { + LoadCheatsWindow(); + } + + private void forceGDIPPresentationToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.ForceGDI ^= true; + SyncPresentationMode(); + } } } \ No newline at end of file diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 033c6cc2f0..7103ac3007 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -52,6 +52,8 @@ namespace BizHawk.MultiClient public MainForm(string[] args) { + InitializeComponent(); + //in order to allow late construction of this database, we hook up a delegate here to dearchive the data and provide it on demand //we could background thread this later instead if we wanted to be real clever NES.BootGodDB.GetDatabaseBytes = () => { @@ -60,28 +62,10 @@ namespace BizHawk.MultiClient }; Global.MainForm = this; - Global.Config = ConfigService.Load("config.ini"); - - if (Global.Direct3D != null) - renderTarget = new ViewportPanel(); - else renderTarget = retainedPanel = new RetainedViewportPanel(); - - renderTarget.Dock = DockStyle.Fill; - renderTarget.BackColor = Color.Black; - Controls.Add(renderTarget); - - InitializeComponent(); Database.LoadDatabase("gamedb.txt"); - if (Global.Direct3D != null) - { - Global.RenderPanel = new Direct3DRenderPanel(Global.Direct3D, renderTarget); - } - else - { - Global.RenderPanel = new SysdrawingRenderPanel(retainedPanel); - } + SyncPresentationMode(); Load += (o, e) => { @@ -160,6 +144,44 @@ namespace BizHawk.MultiClient PauseEmulator(); } + void SyncPresentationMode() + { + bool gdi = Global.Config.ForceGDI; + if (Global.Direct3D == null) + { + gdi = Global.Config.ForceGDI = true; + } + + if (renderTarget != null) + { + renderTarget.Dispose(); + Controls.Remove(renderTarget); + } + + if (retainedPanel != null) retainedPanel.Dispose(); + if (Global.RenderPanel != null) Global.RenderPanel.Dispose(); + + if (gdi) + renderTarget = retainedPanel = new RetainedViewportPanel(); + else renderTarget = new ViewportPanel(); + Controls.Add(renderTarget); + Controls.SetChildIndex(renderTarget, 0); + + renderTarget.Dock = DockStyle.Fill; + renderTarget.BackColor = Color.Black; + + if (gdi) + { + Global.RenderPanel = new SysdrawingRenderPanel(retainedPanel); + retainedPanel.ActivateThreaded(); + } + else + { + Global.RenderPanel = new Direct3DRenderPanel(Global.Direct3D, renderTarget); + } + } + + void SetSpeedPercent(int value) { Global.Config.SpeedPercent = value; @@ -503,7 +525,7 @@ namespace BizHawk.MultiClient Global.Game.Name = (Global.Emulator as NES).GameName; } - Text = DisplayNameForSystem(game.System) + " - " + game.Name; + Text = DisplayNameForSystem(game.System) + " - " + game.Name + " \\"; ResetRewindBuffer(); Global.Config.RecentRoms.Add(file.CanonicalName); if (File.Exists(game.SaveRamPath)) @@ -731,6 +753,8 @@ namespace BizHawk.MultiClient { runloop_second = DateTime.Now; Global.RenderPanel.FPS = runloop_fps; + Text = Text.Substring(0, Text.IndexOf('\\')) + "\\ " + runloop_fps + " fps"; + Global.RenderPanel.FPS = runloop_fps; runloop_fps = 0; } @@ -1179,6 +1203,7 @@ namespace BizHawk.MultiClient saveWindowPositionToolStripMenuItem.Checked = Global.Config.SaveWindowPosition; startPausedToolStripMenuItem.Checked = Global.Config.StartPaused; enableRewindToolStripMenuItem.Checked = Global.Config.RewindEnabled; + forceGDIPPresentationToolStripMenuItem.Checked = Global.Config.ForceGDI; } private void MainForm_Load(object sender, EventArgs e) @@ -1245,41 +1270,6 @@ namespace BizHawk.MultiClient ConfigService.Save("config.ini", Global.Config); } - private void replayInputLogToolStripMenuItem_Click(object sender, EventArgs e) - { - InputLog.StopMovie(); - InputLog.StartPlayback(); - LoadRom(CurrentlyOpenRom); - } - - private void pPUViewerToolStripMenuItem_Click(object sender, EventArgs e) - { - LoadNESPPU(); - } - - private void enableRewindToolStripMenuItem_Click(object sender, EventArgs e) - { - Global.Config.RewindEnabled ^= true; - } - - private void hexEditorToolStripMenuItem_Click(object sender, EventArgs e) - { - LoadHexEditor(); - } - - private void MainForm_Shown(object sender, EventArgs e) - { - HandlePlatformMenus(); - } - - private void gameGenieCodesToolStripMenuItem_Click(object sender, EventArgs e) - { - LoadGameGenieEC(); - } - - private void cheatsToolStripMenuItem_Click(object sender, EventArgs e) - { - LoadCheatsWindow(); - } + } } \ No newline at end of file diff --git a/BizHawk.MultiClient/Program.cs b/BizHawk.MultiClient/Program.cs index 0625cb9c22..a5dd7fde17 100644 --- a/BizHawk.MultiClient/Program.cs +++ b/BizHawk.MultiClient/Program.cs @@ -13,16 +13,20 @@ namespace BizHawk.MultiClient Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); + Global.Config = ConfigService.Load("config.ini"); + try { Global.DSound = new DirectSound(); } catch { MessageBox.Show("Couldn't initialize DirectSound!"); return; } - try { Global.Direct3D = new Direct3D(); } - catch { - //can fallback to GDI rendering - } + try { Global.Direct3D = new Direct3D(); } + catch + { + //can fallback to GDI rendering + Global.Config.ForceGDI = true; + } try { var mf = new MainForm(args); diff --git a/BizHawk.Util/ViewportPanel.cs b/BizHawk.Util/ViewportPanel.cs index 4e83024702..3ca948cb18 100644 --- a/BizHawk.Util/ViewportPanel.cs +++ b/BizHawk.Util/ViewportPanel.cs @@ -1,4 +1,6 @@ using System; +using System.Collections.Generic; +using System.Threading; using System.Drawing; using System.Drawing.Imaging; using System.Drawing.Drawing2D; @@ -11,17 +13,96 @@ namespace BizHawk.Core /// public class RetainedViewportPanel : Control { + Thread threadPaint; + EventWaitHandle ewh; + volatile bool killSignal; + + /// + /// Turns this panel into multi-threaded mode. + /// This will sort of glitch out other gdi things on the system, but at least its fast... + /// + public void ActivateThreaded() + { + ewh = new EventWaitHandle(false, EventResetMode.AutoReset); + threadPaint = new Thread(PaintProc); + threadPaint.Start(); + } + public RetainedViewportPanel() { CreateHandle(); SetStyle(ControlStyles.AllPaintingInWmPaint, true); SetStyle(ControlStyles.UserPaint, true); - SetStyle(ControlStyles.DoubleBuffer, true); + SetStyle(ControlStyles.DoubleBuffer, false); SetStyle(ControlStyles.Opaque, true); SetStyle(ControlStyles.UserMouse, true); } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + if (threadPaint != null) + { + killSignal = true; + ewh.Set(); + ewh.WaitOne(); + } + CleanupDisposeQueue(); + } + + void DoPaint() + { + if (bmp != null) + { + using (Graphics g = CreateGraphics()) + { + g.PixelOffsetMode = PixelOffsetMode.HighSpeed; + g.InterpolationMode = InterpolationMode.NearestNeighbor; + g.CompositingMode = CompositingMode.SourceCopy; + g.CompositingQuality = CompositingQuality.HighSpeed; + g.DrawImage(bmp, 0, 0, Width, Height); + } + } + + CleanupDisposeQueue(); + } + + void PaintProc() + { + for (; ; ) + { + ewh.WaitOne(); + if (killSignal) + { + ewh.Set(); + return; + } + + DoPaint(); + } + } + + void CleanupDisposeQueue() + { + lock (this) + { + while (DisposeQueue.Count > 0) + DisposeQueue.Dequeue().Dispose(); + } + } + + Queue DisposeQueue = new Queue(); + + void SignalPaint() + { + if (threadPaint == null) + DoPaint(); + else + ewh.Set(); + } + //Size logicalSize; ////int pitch; //public void SetLogicalSize(int w, int h) @@ -36,24 +117,26 @@ namespace BizHawk.Core /// public void SetBitmap(Bitmap newbmp) { - if (bmp != null) bmp.Dispose(); - bmp = newbmp; - Refresh(); + lock (this) + { + if(bmp != null) DisposeQueue.Enqueue(bmp); + bmp = newbmp; + } + SignalPaint(); } Bitmap bmp; + protected override void OnPaintBackground(PaintEventArgs pevent) + { + + } + + protected override void OnPaint(PaintEventArgs e) { + SignalPaint(); base.OnPaint(e); - if (bmp != null) - { - e.Graphics.PixelOffsetMode = PixelOffsetMode.HighSpeed; - e.Graphics.InterpolationMode = InterpolationMode.NearestNeighbor; - e.Graphics.CompositingMode = CompositingMode.SourceCopy; - e.Graphics.CompositingQuality = CompositingQuality.HighSpeed; - e.Graphics.DrawImage(bmp, 0, 0, Width, Height); - } } }