diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 6614cfc5fa..ff6bbb3a2f 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -43,7 +43,6 @@ namespace BizHawk.MultiClient public bool StackOSDMessages = true; public int TargetZoomFactor = 2; public int TargetDisplayFilter = 0; - public bool AutoLoadMostRecentRom = false; public RecentFiles RecentRoms = new RecentFiles(8); public bool PauseWhenMenuActivated = true; public bool SaveWindowPosition = true; @@ -164,7 +163,6 @@ namespace BizHawk.MultiClient // Lua Console public RecentFiles RecentLua = new RecentFiles(8); public RecentFiles RecentLuaSession = new RecentFiles(8); - public bool AutoLoadLuaSession = false; public bool AutoLoadLuaConsole = false; public bool LuaConsoleSaveWindowPosition = true; public int LuaConsoleWndx = -1; //Negative numbers will be ignored even with save window position set @@ -201,7 +199,6 @@ namespace BizHawk.MultiClient public int RamWatchPrev_Type = 1; // RamSearch Settings - public bool AutoLoadRamSearch = false; public bool RamSearchSaveWindowPosition = true; public RecentFiles RecentSearches = new RecentFiles(8); public int RamSearchWndx = -1; //Negative numbers will be ignored even with save window position set @@ -360,7 +357,6 @@ namespace BizHawk.MultiClient // Cheats Dialog public bool Cheats_ValuesAsHex = true; - public bool AutoLoadCheats = false; public bool CheatsSaveWindowPosition = true; public bool DisableCheatsOnLoad = false; public bool LoadCheatFileByGame = true; @@ -427,7 +423,6 @@ namespace BizHawk.MultiClient //Movie Settings public RecentFiles RecentMovies = new RecentFiles(8); - public bool AutoLoadMostRecentMovie = false; public bool BindSavestatesToMovies = true; public string DefaultAuthor = "default user"; public bool UseDefaultAuthor = true; diff --git a/BizHawk.MultiClient/MainForm.Designer.cs b/BizHawk.MultiClient/MainForm.Designer.cs index 198f49df16..2c773c13f4 100644 --- a/BizHawk.MultiClient/MainForm.Designer.cs +++ b/BizHawk.MultiClient/MainForm.Designer.cs @@ -17,347 +17,341 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - this.menuStrip1 = new MenuStripEx(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.recentROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.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.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator(); - this.autoLoadLastSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectSlot10ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectSlot1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectSlot2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectSlot3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectSlot4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectSlot5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectSlot6ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectSlot7ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectSlot8ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.selectSlot9ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.previousSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.nextSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.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.readonlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); - this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); - this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.autoloadMostRecentToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.recordMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.playMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.stopMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.playFromBeginningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.importMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.stopMovieWithoutSavingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); - this.bindSavestatesToMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.automaticallyBackupMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fullMovieLoadstatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AVIWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.recordAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.stopAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator(); - this.captureOSDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.screenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.screenshotF12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.screenshotAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.screenshotClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator(); - this.captureOSDToolStripMenuItem1 = 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.rebootCoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.hardResetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.windowFilterMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DisplayFilterNoneMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.x2SAIMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SuperX2SAIMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SuperEagleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.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.switchToFullscreenToolStripMenuItem = 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.displayRerecordCountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.displaySubtitlesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); - this.displayStatusBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.displayLogWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.controllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.hotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.messagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pathsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.soundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autofireToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.rewindOptionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.firmwaresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.enableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.enableContextMenuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.backupSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autoSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveScreenshotWithSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.frameAdvanceSkipLagFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.backupSaveramToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gUIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pauseWhenMenuActivatedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.startPausedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator(); - this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.forceGDIPPresentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.blurryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.miSuppressGuiLayer = new System.Windows.Forms.ToolStripMenuItem(); - this.showMenuInFullScreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.runInBackgroundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.acceptBackgroundInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.singleInstanceModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.neverBeAskedToSaveChangesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator(); - this.logWindowAsConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.frameSkipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.miLimitFramerate = new System.Windows.Forms.ToolStripMenuItem(); - this.audioThrottleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.miDisplayVsync = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator27 = new System.Windows.Forms.ToolStripSeparator(); - this.vSyncEnabledToolStripMenuItem = 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.keyPriorityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bothHotkeysAndControllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.inputOverridesHotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.hotkeysOverrideInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.savestateTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.defaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.binaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.textToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); - this.saveConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolBoxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); - 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.traceLoggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tAStudioToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.virtualPadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); - this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator29 = new System.Windows.Forms.ToolStripSeparator(); - this.createDualGBXMLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.newRamWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.NESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.debuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pPUViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.nametableViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); - this.graphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.soundChannelsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.nESSpeicalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pCEToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pceBGViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator(); - this.pceAlwaysPerformSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pceAlwaysEqualizeVolumesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pceArcadeCardRewindEnableHackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pceGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.sMSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.smsEnableFMChipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.smsOverclockWhenKnownSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.smsForceStereoSeparationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.smsSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showClippedRegionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.highlightActiveDisplayRegionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator(); - this.smsGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.GGgameGenieEncoderDecoderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tI83ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.keypadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); - this.autoloadVirtualKeyboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.atariToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bWToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.p0DifficultyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.rightDifficultyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator(); - this.showBGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showPlayfieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showPlayer1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showPlayer2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showMissle1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showMissle2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.showBallToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.forceDMGModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gBAInCGBModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.multicartCompatibilityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.changeDMGPalettesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadGBInSGBToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator28 = new System.Windows.Forms.ToolStripSeparator(); - this.gPUViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.GBgameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gBAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.gPUViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.sNESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.displayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bG0ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bG1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bG2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.bG3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.oBJ0ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.oBJ1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.oBJ2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.oBJ3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator(); - this.graphicsDebuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadGBInSGBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SNESgameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.miSnesOptions = new System.Windows.Forms.ToolStripMenuItem(); - this.colecoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.skipBIOSIntroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.n64ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.N64PluginSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saturnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.preferencesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.StatusSlot0 = new System.Windows.Forms.StatusStrip(); - this.DumpStatus = new System.Windows.Forms.ToolStripDropDownButton(); - this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel(); - this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton(); - this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton(); - this.RebootStatusBarIcon = new System.Windows.Forms.ToolStripStatusLabel(); - this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusBarLedLight = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot1 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot2 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot3 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot4 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot5 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot6 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot7 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot8 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot9 = new System.Windows.Forms.ToolStripStatusLabel(); - this.StatusSlot10 = new System.Windows.Forms.ToolStripStatusLabel(); - this.CheatStatus = new System.Windows.Forms.ToolStripStatusLabel(); - this.KeyPriorityStatusBarLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.cmiOpenRom = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiLoadLastRom = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator_afterRomLoading = new System.Windows.Forms.ToolStripSeparator(); - this.cmiRecordMovie = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiPlayMovie = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiRestartMovie = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiStopMovie = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiLoadLastMovie = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiMakeMovieBackup = new System.Windows.Forms.ToolStripMenuItem(); - this.ContextMenuStopMovieNoSaving = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiViewSubtitles = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiAddSubtitle = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiViewComments = new System.Windows.Forms.ToolStripMenuItem(); - this.saveMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator_afterMovie = new System.Windows.Forms.ToolStripSeparator(); - this.cmiUndoSavestate = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiSeparator20 = new System.Windows.Forms.ToolStripSeparator(); - this.configToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.controllersToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.hotkeysToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.messagesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.pathsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.soundToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.autofireToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.rewindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiScreenshot = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); - this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.menuStrip1.SuspendLayout(); - this.StatusSlot0.SuspendLayout(); - this.contextMenuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // menuStrip1 - // - this.menuStrip1.ClickThrough = true; - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); + this.menuStrip1 = new MenuStripEx(); + this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recentROMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.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.toolStripSeparator21 = new System.Windows.Forms.ToolStripSeparator(); + this.autoLoadLastSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot10ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot4ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot5ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot6ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot7ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot8ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.selectSlot9ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.previousSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.nextSlotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.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.readonlyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); + this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); + this.recordMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.playMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.stopMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.playFromBeginningToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.importMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveMovieToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.stopMovieWithoutSavingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); + this.bindSavestatesToMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.automaticallyBackupMoviesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.fullMovieLoadstatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AVIWAVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recordAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.stopAVIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator(); + this.captureOSDToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.screenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.screenshotF12ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.screenshotAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.screenshotClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator(); + this.captureOSDToolStripMenuItem1 = 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.rebootCoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hardResetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.windowFilterMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DisplayFilterNoneMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.x2SAIMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SuperX2SAIMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SuperEagleMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.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.switchToFullscreenToolStripMenuItem = 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.displayRerecordCountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displaySubtitlesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); + this.displayStatusBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displayLogWindowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.configToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.controllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.messagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pathsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.soundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autofireToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rewindOptionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.firmwaresToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.enableToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.enableContextMenuToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backupSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autoSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveScreenshotWithSavestatesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.frameAdvanceSkipLagFramesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backupSaveramToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gUIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pauseWhenMenuActivatedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.startPausedToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator22 = new System.Windows.Forms.ToolStripSeparator(); + this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.forceGDIPPresentationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.blurryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.miSuppressGuiLayer = new System.Windows.Forms.ToolStripMenuItem(); + this.showMenuInFullScreenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.runInBackgroundToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.acceptBackgroundInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.singleInstanceModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.neverBeAskedToSaveChangesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator23 = new System.Windows.Forms.ToolStripSeparator(); + this.logWindowAsConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.frameSkipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.miLimitFramerate = new System.Windows.Forms.ToolStripMenuItem(); + this.audioThrottleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.miDisplayVsync = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator27 = new System.Windows.Forms.ToolStripSeparator(); + this.vSyncEnabledToolStripMenuItem = 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.keyPriorityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bothHotkeysAndControllersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.inputOverridesHotkeysToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.hotkeysOverrideInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.savestateTypeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.defaultToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.binaryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.textToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); + this.saveConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadConfigToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolBoxToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); + 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.traceLoggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tAStudioToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.virtualPadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); + this.luaConsoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator29 = new System.Windows.Forms.ToolStripSeparator(); + this.createDualGBXMLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.newRamWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.NESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.debuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pPUViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.nametableViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); + this.graphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.soundChannelsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.nESSpeicalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pCEToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pceBGViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator(); + this.pceAlwaysPerformSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pceAlwaysEqualizeVolumesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pceArcadeCardRewindEnableHackToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.pceGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.sMSToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.smsEnableFMChipToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.smsOverclockWhenKnownSafeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.smsForceStereoSeparationToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.smsSpriteLimitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showClippedRegionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.highlightActiveDisplayRegionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator24 = new System.Windows.Forms.ToolStripSeparator(); + this.smsGraphicsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.GGgameGenieEncoderDecoderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tI83ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.keypadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); + this.autoloadVirtualKeyboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.atariToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bWToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.p0DifficultyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.rightDifficultyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator(); + this.showBGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showPlayfieldToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showPlayer1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showPlayer2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showMissle1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showMissle2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.showBallToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.forceDMGModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gBAInCGBModeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.multicartCompatibilityToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.changeDMGPalettesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadGBInSGBToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator28 = new System.Windows.Forms.ToolStripSeparator(); + this.gPUViewerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.GBgameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gBAToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.gPUViewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.sNESToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.displayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bG0ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bG1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bG2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.bG3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.oBJ0ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.oBJ1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.oBJ2ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.oBJ3ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator(); + this.graphicsDebuggerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadGBInSGBToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SNESgameGenieCodesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.miSnesOptions = new System.Windows.Forms.ToolStripMenuItem(); + this.colecoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.skipBIOSIntroToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.n64ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.N64PluginSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saturnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.preferencesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.helpToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.forumsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.StatusSlot0 = new System.Windows.Forms.StatusStrip(); + this.DumpStatus = new System.Windows.Forms.ToolStripDropDownButton(); + this.EmuStatus = new System.Windows.Forms.ToolStripStatusLabel(); + this.PlayRecordStatus = new System.Windows.Forms.ToolStripDropDownButton(); + this.PauseStrip = new System.Windows.Forms.ToolStripDropDownButton(); + this.RebootStatusBarIcon = new System.Windows.Forms.ToolStripStatusLabel(); + this.AVIStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusBarLedLight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusSlot1 = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusSlot2 = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusSlot3 = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusSlot4 = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusSlot5 = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusSlot6 = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusSlot7 = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusSlot8 = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusSlot9 = new System.Windows.Forms.ToolStripStatusLabel(); + this.StatusSlot10 = new System.Windows.Forms.ToolStripStatusLabel(); + this.CheatStatus = new System.Windows.Forms.ToolStripStatusLabel(); + this.KeyPriorityStatusBarLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.cmiOpenRom = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiLoadLastRom = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator_afterRomLoading = new System.Windows.Forms.ToolStripSeparator(); + this.cmiRecordMovie = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiPlayMovie = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiRestartMovie = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiStopMovie = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiLoadLastMovie = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiMakeMovieBackup = new System.Windows.Forms.ToolStripMenuItem(); + this.ContextMenuStopMovieNoSaving = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiViewSubtitles = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiAddSubtitle = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiViewComments = new System.Windows.Forms.ToolStripMenuItem(); + this.saveMovieToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator_afterMovie = new System.Windows.Forms.ToolStripSeparator(); + this.cmiUndoSavestate = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiSeparator20 = new System.Windows.Forms.ToolStripSeparator(); + this.configToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.controllersToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.hotkeysToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.messagesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.pathsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.soundToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.autofireToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.rewindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiScreenshot = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiScreenshotClipboard = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiCloseRom = new System.Windows.Forms.ToolStripMenuItem(); + this.cmiShowMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.menuStrip1.SuspendLayout(); + this.StatusSlot0.SuspendLayout(); + this.contextMenuStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // menuStrip1 + // + this.menuStrip1.ClickThrough = true; + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.emulationToolStripMenuItem, this.viewToolStripMenuItem, @@ -375,19 +369,19 @@ this.n64ToolStripMenuItem, this.saturnToolStripMenuItem, this.helpToolStripMenuItem}); - this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(470, 42); - this.menuStrip1.TabIndex = 0; - this.menuStrip1.Text = "menuStrip1"; - this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); - this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate); - this.menuStrip1.Leave += new System.EventHandler(this.menuStrip1_Leave); - // - // fileToolStripMenuItem - // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(470, 42); + this.menuStrip1.TabIndex = 0; + this.menuStrip1.Text = "menuStrip1"; + this.menuStrip1.MenuActivate += new System.EventHandler(this.menuStrip1_MenuActivate); + this.menuStrip1.MenuDeactivate += new System.EventHandler(this.menuStrip1_MenuDeactivate); + this.menuStrip1.Leave += new System.EventHandler(this.menuStrip1_Leave); + // + // fileToolStripMenuItem + // + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.openROMToolStripMenuItem, this.recentROMToolStripMenuItem, this.closeROMToolStripMenuItem, @@ -401,73 +395,50 @@ this.screenshotToolStripMenuItem, this.toolStripSeparator4, this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 19); - this.fileToolStripMenuItem.Text = "&File"; - this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); - // - // openROMToolStripMenuItem - // - this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; - this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; - this.openROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.openROMToolStripMenuItem.Text = "Open ROM"; - this.openROMToolStripMenuItem.Click += new System.EventHandler(this.openROMToolStripMenuItem_Click); - // - // recentROMToolStripMenuItem - // - this.recentROMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.noneToolStripMenuItem, - this.toolStripSeparator3, - this.clearToolStripMenuItem, - this.autoloadMostRecentToolStripMenuItem}); - this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; - this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; - this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.recentROMToolStripMenuItem.Text = "Recent ROM"; - this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); - // - // noneToolStripMenuItem - // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(192, 22); - this.noneToolStripMenuItem.Text = "None"; - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6); - // - // clearToolStripMenuItem - // - this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(192, 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(192, 22); - this.autoloadMostRecentToolStripMenuItem.Text = "&Autoload Most Recent"; - this.autoloadMostRecentToolStripMenuItem.Click += new System.EventHandler(this.autoloadMostRecentToolStripMenuItem_Click); - // - // closeROMToolStripMenuItem - // - this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; - this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; - this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.closeROMToolStripMenuItem.Text = "&Close ROM"; - this.closeROMToolStripMenuItem.Click += new System.EventHandler(this.closeROMToolStripMenuItem_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(137, 6); - // - // saveStateToolStripMenuItem - // - this.saveStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 19); + this.fileToolStripMenuItem.Text = "&File"; + this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); + // + // openROMToolStripMenuItem + // + this.openROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.openROMToolStripMenuItem.Name = "openROMToolStripMenuItem"; + this.openROMToolStripMenuItem.Size = new System.Drawing.Size(152, 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.toolStripSeparator3}); + this.recentROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.recentROMToolStripMenuItem.Name = "recentROMToolStripMenuItem"; + this.recentROMToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.recentROMToolStripMenuItem.Text = "Recent ROM"; + this.recentROMToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentROMToolStripMenuItem_DropDownOpened); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6); + // + // closeROMToolStripMenuItem + // + this.closeROMToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Close; + this.closeROMToolStripMenuItem.Name = "closeROMToolStripMenuItem"; + this.closeROMToolStripMenuItem.Size = new System.Drawing.Size(152, 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(149, 6); + // + // saveStateToolStripMenuItem + // + this.saveStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.savestate1toolStripMenuItem, this.savestate2toolStripMenuItem, this.savestate3toolStripMenuItem, @@ -480,96 +451,96 @@ this.savestate0toolStripMenuItem, this.toolStripSeparator6, this.saveNamedStateToolStripMenuItem}); - this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; - this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.saveStateToolStripMenuItem.Text = "Save State"; - this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); - // - // savestate1toolStripMenuItem - // - this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; - this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.savestate1toolStripMenuItem.Text = "1"; - this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); - // - // savestate2toolStripMenuItem - // - this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; - this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.savestate2toolStripMenuItem.Text = "2"; - this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); - // - // savestate3toolStripMenuItem - // - this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; - this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.savestate3toolStripMenuItem.Text = "3"; - this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); - // - // savestate4toolStripMenuItem - // - this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; - this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.savestate4toolStripMenuItem.Text = "4"; - this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); - // - // savestate5toolStripMenuItem - // - this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; - this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.savestate5toolStripMenuItem.Text = "5"; - this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); - // - // savestate6toolStripMenuItem - // - this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; - this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.savestate6toolStripMenuItem.Text = "6"; - this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); - // - // savestate7toolStripMenuItem - // - this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; - this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.savestate7toolStripMenuItem.Text = "7"; - this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); - // - // savestate8toolStripMenuItem - // - this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; - this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.savestate8toolStripMenuItem.Text = "8"; - this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); - // - // savestate9toolStripMenuItem - // - this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; - this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.savestate9toolStripMenuItem.Text = "9"; - this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); - // - // savestate0toolStripMenuItem - // - this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; - this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.savestate0toolStripMenuItem.Text = "0"; - this.savestate0toolStripMenuItem.Click += new System.EventHandler(this.savestate0toolStripMenuItem_Click); - // - // toolStripSeparator6 - // - this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6); - // - // saveNamedStateToolStripMenuItem - // - this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; - this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.saveNamedStateToolStripMenuItem.Text = "Save Named State..."; - this.saveNamedStateToolStripMenuItem.Click += new System.EventHandler(this.saveNamedStateToolStripMenuItem_Click); - // - // loadStateToolStripMenuItem - // - this.loadStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveStateToolStripMenuItem.Name = "saveStateToolStripMenuItem"; + this.saveStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveStateToolStripMenuItem.Text = "Save State"; + this.saveStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveStateToolStripMenuItem_DropDownOpened); + // + // savestate1toolStripMenuItem + // + this.savestate1toolStripMenuItem.Name = "savestate1toolStripMenuItem"; + this.savestate1toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate1toolStripMenuItem.Text = "1"; + this.savestate1toolStripMenuItem.Click += new System.EventHandler(this.savestate1toolStripMenuItem_Click); + // + // savestate2toolStripMenuItem + // + this.savestate2toolStripMenuItem.Name = "savestate2toolStripMenuItem"; + this.savestate2toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate2toolStripMenuItem.Text = "2"; + this.savestate2toolStripMenuItem.Click += new System.EventHandler(this.savestate2toolStripMenuItem_Click); + // + // savestate3toolStripMenuItem + // + this.savestate3toolStripMenuItem.Name = "savestate3toolStripMenuItem"; + this.savestate3toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate3toolStripMenuItem.Text = "3"; + this.savestate3toolStripMenuItem.Click += new System.EventHandler(this.savestate3toolStripMenuItem_Click); + // + // savestate4toolStripMenuItem + // + this.savestate4toolStripMenuItem.Name = "savestate4toolStripMenuItem"; + this.savestate4toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate4toolStripMenuItem.Text = "4"; + this.savestate4toolStripMenuItem.Click += new System.EventHandler(this.savestate4toolStripMenuItem_Click); + // + // savestate5toolStripMenuItem + // + this.savestate5toolStripMenuItem.Name = "savestate5toolStripMenuItem"; + this.savestate5toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate5toolStripMenuItem.Text = "5"; + this.savestate5toolStripMenuItem.Click += new System.EventHandler(this.savestate5toolStripMenuItem_Click); + // + // savestate6toolStripMenuItem + // + this.savestate6toolStripMenuItem.Name = "savestate6toolStripMenuItem"; + this.savestate6toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate6toolStripMenuItem.Text = "6"; + this.savestate6toolStripMenuItem.Click += new System.EventHandler(this.savestate6toolStripMenuItem_Click); + // + // savestate7toolStripMenuItem + // + this.savestate7toolStripMenuItem.Name = "savestate7toolStripMenuItem"; + this.savestate7toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate7toolStripMenuItem.Text = "7"; + this.savestate7toolStripMenuItem.Click += new System.EventHandler(this.savestate7toolStripMenuItem_Click); + // + // savestate8toolStripMenuItem + // + this.savestate8toolStripMenuItem.Name = "savestate8toolStripMenuItem"; + this.savestate8toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate8toolStripMenuItem.Text = "8"; + this.savestate8toolStripMenuItem.Click += new System.EventHandler(this.savestate8toolStripMenuItem_Click); + // + // savestate9toolStripMenuItem + // + this.savestate9toolStripMenuItem.Name = "savestate9toolStripMenuItem"; + this.savestate9toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate9toolStripMenuItem.Text = "9"; + this.savestate9toolStripMenuItem.Click += new System.EventHandler(this.savestate9toolStripMenuItem_Click); + // + // savestate0toolStripMenuItem + // + this.savestate0toolStripMenuItem.Name = "savestate0toolStripMenuItem"; + this.savestate0toolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.savestate0toolStripMenuItem.Text = "0"; + this.savestate0toolStripMenuItem.Click += new System.EventHandler(this.savestate0toolStripMenuItem_Click); + // + // toolStripSeparator6 + // + this.toolStripSeparator6.Name = "toolStripSeparator6"; + this.toolStripSeparator6.Size = new System.Drawing.Size(175, 6); + // + // saveNamedStateToolStripMenuItem + // + this.saveNamedStateToolStripMenuItem.Name = "saveNamedStateToolStripMenuItem"; + this.saveNamedStateToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.saveNamedStateToolStripMenuItem.Text = "Save Named State..."; + this.saveNamedStateToolStripMenuItem.Click += new System.EventHandler(this.saveNamedStateToolStripMenuItem_Click); + // + // loadStateToolStripMenuItem + // + this.loadStateToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.loadstate1toolStripMenuItem, this.loadstate2toolStripMenuItem, this.loadstate3toolStripMenuItem, @@ -584,108 +555,108 @@ this.loadNamedStateToolStripMenuItem, this.toolStripSeparator21, this.autoLoadLastSlotToolStripMenuItem}); - this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; - this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.loadStateToolStripMenuItem.Text = "Load State"; - this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); - // - // loadstate1toolStripMenuItem - // - this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; - this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadstate1toolStripMenuItem.Text = "1"; - this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); - // - // loadstate2toolStripMenuItem - // - this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; - this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadstate2toolStripMenuItem.Text = "2"; - this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); - // - // loadstate3toolStripMenuItem - // - this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; - this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadstate3toolStripMenuItem.Text = "3"; - this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); - // - // loadstate4toolStripMenuItem - // - this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; - this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadstate4toolStripMenuItem.Text = "4"; - this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); - // - // loadstate5toolStripMenuItem - // - this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; - this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadstate5toolStripMenuItem.Text = "5"; - this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); - // - // loadstate6toolStripMenuItem - // - this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; - this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadstate6toolStripMenuItem.Text = "6"; - this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); - // - // loadstate7toolStripMenuItem - // - this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; - this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadstate7toolStripMenuItem.Text = "7"; - this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); - // - // loadstate8toolStripMenuItem - // - this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; - this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadstate8toolStripMenuItem.Text = "8"; - this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); - // - // loadstate9toolStripMenuItem - // - this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; - this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadstate9toolStripMenuItem.Text = "9"; - this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); - // - // loadstate0toolStripMenuItem - // - this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; - this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadstate0toolStripMenuItem.Text = "0"; - this.loadstate0toolStripMenuItem.Click += new System.EventHandler(this.loadstate0toolStripMenuItem_Click); - // - // toolStripSeparator7 - // - this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); - // - // loadNamedStateToolStripMenuItem - // - this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; - this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.loadNamedStateToolStripMenuItem.Text = "Load Named State..."; - this.loadNamedStateToolStripMenuItem.Click += new System.EventHandler(this.loadNamedStateToolStripMenuItem_Click); - // - // toolStripSeparator21 - // - this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6); - // - // autoLoadLastSlotToolStripMenuItem - // - this.autoLoadLastSlotToolStripMenuItem.Name = "autoLoadLastSlotToolStripMenuItem"; - this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.autoLoadLastSlotToolStripMenuItem.Text = "AutoLoad last Slot"; - this.autoLoadLastSlotToolStripMenuItem.Click += new System.EventHandler(this.autoLoadLastSlotToolStripMenuItem_Click); - // - // saveSlotToolStripMenuItem - // - this.saveSlotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.loadStateToolStripMenuItem.Name = "loadStateToolStripMenuItem"; + this.loadStateToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.loadStateToolStripMenuItem.Text = "Load State"; + this.loadStateToolStripMenuItem.DropDownOpened += new System.EventHandler(this.loadStateToolStripMenuItem_DropDownOpened); + // + // loadstate1toolStripMenuItem + // + this.loadstate1toolStripMenuItem.Name = "loadstate1toolStripMenuItem"; + this.loadstate1toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate1toolStripMenuItem.Text = "1"; + this.loadstate1toolStripMenuItem.Click += new System.EventHandler(this.loadstate1toolStripMenuItem_Click); + // + // loadstate2toolStripMenuItem + // + this.loadstate2toolStripMenuItem.Name = "loadstate2toolStripMenuItem"; + this.loadstate2toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate2toolStripMenuItem.Text = "2"; + this.loadstate2toolStripMenuItem.Click += new System.EventHandler(this.loadstate2toolStripMenuItem_Click); + // + // loadstate3toolStripMenuItem + // + this.loadstate3toolStripMenuItem.Name = "loadstate3toolStripMenuItem"; + this.loadstate3toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate3toolStripMenuItem.Text = "3"; + this.loadstate3toolStripMenuItem.Click += new System.EventHandler(this.loadstate3toolStripMenuItem_Click); + // + // loadstate4toolStripMenuItem + // + this.loadstate4toolStripMenuItem.Name = "loadstate4toolStripMenuItem"; + this.loadstate4toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate4toolStripMenuItem.Text = "4"; + this.loadstate4toolStripMenuItem.Click += new System.EventHandler(this.loadstate4toolStripMenuItem_Click); + // + // loadstate5toolStripMenuItem + // + this.loadstate5toolStripMenuItem.Name = "loadstate5toolStripMenuItem"; + this.loadstate5toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate5toolStripMenuItem.Text = "5"; + this.loadstate5toolStripMenuItem.Click += new System.EventHandler(this.loadstate5toolStripMenuItem_Click); + // + // loadstate6toolStripMenuItem + // + this.loadstate6toolStripMenuItem.Name = "loadstate6toolStripMenuItem"; + this.loadstate6toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate6toolStripMenuItem.Text = "6"; + this.loadstate6toolStripMenuItem.Click += new System.EventHandler(this.loadstate6toolStripMenuItem_Click); + // + // loadstate7toolStripMenuItem + // + this.loadstate7toolStripMenuItem.Name = "loadstate7toolStripMenuItem"; + this.loadstate7toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate7toolStripMenuItem.Text = "7"; + this.loadstate7toolStripMenuItem.Click += new System.EventHandler(this.loadstate7toolStripMenuItem_Click); + // + // loadstate8toolStripMenuItem + // + this.loadstate8toolStripMenuItem.Name = "loadstate8toolStripMenuItem"; + this.loadstate8toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate8toolStripMenuItem.Text = "8"; + this.loadstate8toolStripMenuItem.Click += new System.EventHandler(this.loadstate8toolStripMenuItem_Click); + // + // loadstate9toolStripMenuItem + // + this.loadstate9toolStripMenuItem.Name = "loadstate9toolStripMenuItem"; + this.loadstate9toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate9toolStripMenuItem.Text = "9"; + this.loadstate9toolStripMenuItem.Click += new System.EventHandler(this.loadstate9toolStripMenuItem_Click); + // + // loadstate0toolStripMenuItem + // + this.loadstate0toolStripMenuItem.Name = "loadstate0toolStripMenuItem"; + this.loadstate0toolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadstate0toolStripMenuItem.Text = "0"; + this.loadstate0toolStripMenuItem.Click += new System.EventHandler(this.loadstate0toolStripMenuItem_Click); + // + // toolStripSeparator7 + // + this.toolStripSeparator7.Name = "toolStripSeparator7"; + this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); + // + // loadNamedStateToolStripMenuItem + // + this.loadNamedStateToolStripMenuItem.Name = "loadNamedStateToolStripMenuItem"; + this.loadNamedStateToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.loadNamedStateToolStripMenuItem.Text = "Load Named State..."; + this.loadNamedStateToolStripMenuItem.Click += new System.EventHandler(this.loadNamedStateToolStripMenuItem_Click); + // + // toolStripSeparator21 + // + this.toolStripSeparator21.Name = "toolStripSeparator21"; + this.toolStripSeparator21.Size = new System.Drawing.Size(177, 6); + // + // autoLoadLastSlotToolStripMenuItem + // + this.autoLoadLastSlotToolStripMenuItem.Name = "autoLoadLastSlotToolStripMenuItem"; + this.autoLoadLastSlotToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.autoLoadLastSlotToolStripMenuItem.Text = "AutoLoad last Slot"; + this.autoLoadLastSlotToolStripMenuItem.Click += new System.EventHandler(this.autoLoadLastSlotToolStripMenuItem_Click); + // + // saveSlotToolStripMenuItem + // + this.saveSlotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.selectSlot10ToolStripMenuItem, this.selectSlot1ToolStripMenuItem, this.selectSlot2ToolStripMenuItem, @@ -701,124 +672,124 @@ this.toolStripSeparator5, this.saveToCurrentSlotToolStripMenuItem, this.loadCurrentSlotToolStripMenuItem}); - this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; - this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.saveSlotToolStripMenuItem.Text = "SaveSlot"; - this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); - // - // selectSlot10ToolStripMenuItem - // - this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem"; - this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0"; - this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click); - // - // selectSlot1ToolStripMenuItem - // - this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem"; - this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1"; - this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click); - // - // selectSlot2ToolStripMenuItem - // - this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem"; - this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2"; - this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click); - // - // selectSlot3ToolStripMenuItem - // - this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem"; - this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3"; - this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click); - // - // selectSlot4ToolStripMenuItem - // - this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem"; - this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4"; - this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click); - // - // selectSlot5ToolStripMenuItem - // - this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem"; - this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5"; - this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click); - // - // selectSlot6ToolStripMenuItem - // - this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem"; - this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6"; - this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click); - // - // selectSlot7ToolStripMenuItem - // - this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem"; - this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7"; - this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click); - // - // selectSlot8ToolStripMenuItem - // - this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem"; - this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8"; - this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click); - // - // selectSlot9ToolStripMenuItem - // - this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem"; - this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9"; - this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click); - // - // previousSlotToolStripMenuItem - // - this.previousSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft; - this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem"; - this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.previousSlotToolStripMenuItem.Text = "Previous Slot"; - this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click); - // - // nextSlotToolStripMenuItem - // - this.nextSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight; - this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem"; - this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.nextSlotToolStripMenuItem.Text = "Next Slot"; - this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click); - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6); - // - // saveToCurrentSlotToolStripMenuItem - // - this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem"; - this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot"; - this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click); - // - // loadCurrentSlotToolStripMenuItem - // - this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem"; - this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); - this.loadCurrentSlotToolStripMenuItem.Text = "Load Current Slot"; - this.loadCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.loadCurrentSlotToolStripMenuItem_Click); - // - // toolStripMenuItem2 - // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(137, 6); - // - // movieToolStripMenuItem - // - this.movieToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saveSlotToolStripMenuItem.Name = "saveSlotToolStripMenuItem"; + this.saveSlotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveSlotToolStripMenuItem.Text = "SaveSlot"; + this.saveSlotToolStripMenuItem.DropDownOpened += new System.EventHandler(this.saveSlotToolStripMenuItem_DropDownOpened); + // + // selectSlot10ToolStripMenuItem + // + this.selectSlot10ToolStripMenuItem.Name = "selectSlot10ToolStripMenuItem"; + this.selectSlot10ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot10ToolStripMenuItem.Text = "Select Slot 0"; + this.selectSlot10ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot10ToolStripMenuItem_Click); + // + // selectSlot1ToolStripMenuItem + // + this.selectSlot1ToolStripMenuItem.Name = "selectSlot1ToolStripMenuItem"; + this.selectSlot1ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot1ToolStripMenuItem.Text = "Select Slot 1"; + this.selectSlot1ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot1ToolStripMenuItem_Click); + // + // selectSlot2ToolStripMenuItem + // + this.selectSlot2ToolStripMenuItem.Name = "selectSlot2ToolStripMenuItem"; + this.selectSlot2ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot2ToolStripMenuItem.Text = "Select Slot 2"; + this.selectSlot2ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot2ToolStripMenuItem_Click); + // + // selectSlot3ToolStripMenuItem + // + this.selectSlot3ToolStripMenuItem.Name = "selectSlot3ToolStripMenuItem"; + this.selectSlot3ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot3ToolStripMenuItem.Text = "Select Slot 3"; + this.selectSlot3ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot3ToolStripMenuItem_Click); + // + // selectSlot4ToolStripMenuItem + // + this.selectSlot4ToolStripMenuItem.Name = "selectSlot4ToolStripMenuItem"; + this.selectSlot4ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot4ToolStripMenuItem.Text = "Select Slot 4"; + this.selectSlot4ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot4ToolStripMenuItem_Click); + // + // selectSlot5ToolStripMenuItem + // + this.selectSlot5ToolStripMenuItem.Name = "selectSlot5ToolStripMenuItem"; + this.selectSlot5ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot5ToolStripMenuItem.Text = "Select Slot 5"; + this.selectSlot5ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot5ToolStripMenuItem_Click); + // + // selectSlot6ToolStripMenuItem + // + this.selectSlot6ToolStripMenuItem.Name = "selectSlot6ToolStripMenuItem"; + this.selectSlot6ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot6ToolStripMenuItem.Text = "Select Slot 6"; + this.selectSlot6ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot6ToolStripMenuItem_Click); + // + // selectSlot7ToolStripMenuItem + // + this.selectSlot7ToolStripMenuItem.Name = "selectSlot7ToolStripMenuItem"; + this.selectSlot7ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot7ToolStripMenuItem.Text = "Select Slot 7"; + this.selectSlot7ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot7ToolStripMenuItem_Click); + // + // selectSlot8ToolStripMenuItem + // + this.selectSlot8ToolStripMenuItem.Name = "selectSlot8ToolStripMenuItem"; + this.selectSlot8ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot8ToolStripMenuItem.Text = "Select Slot 8"; + this.selectSlot8ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot8ToolStripMenuItem_Click); + // + // selectSlot9ToolStripMenuItem + // + this.selectSlot9ToolStripMenuItem.Name = "selectSlot9ToolStripMenuItem"; + this.selectSlot9ToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.selectSlot9ToolStripMenuItem.Text = "Select Slot 9"; + this.selectSlot9ToolStripMenuItem.Click += new System.EventHandler(this.selectSlot9ToolStripMenuItem_Click); + // + // previousSlotToolStripMenuItem + // + this.previousSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveLeft; + this.previousSlotToolStripMenuItem.Name = "previousSlotToolStripMenuItem"; + this.previousSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.previousSlotToolStripMenuItem.Text = "Previous Slot"; + this.previousSlotToolStripMenuItem.Click += new System.EventHandler(this.previousSlotToolStripMenuItem_Click); + // + // nextSlotToolStripMenuItem + // + this.nextSlotToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveRight; + this.nextSlotToolStripMenuItem.Name = "nextSlotToolStripMenuItem"; + this.nextSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.nextSlotToolStripMenuItem.Text = "Next Slot"; + this.nextSlotToolStripMenuItem.Click += new System.EventHandler(this.nextSlotToolStripMenuItem_Click); + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(175, 6); + // + // saveToCurrentSlotToolStripMenuItem + // + this.saveToCurrentSlotToolStripMenuItem.Name = "saveToCurrentSlotToolStripMenuItem"; + this.saveToCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.saveToCurrentSlotToolStripMenuItem.Text = "Save to Current Slot"; + this.saveToCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.saveToCurrentSlotToolStripMenuItem_Click); + // + // loadCurrentSlotToolStripMenuItem + // + this.loadCurrentSlotToolStripMenuItem.Name = "loadCurrentSlotToolStripMenuItem"; + this.loadCurrentSlotToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.loadCurrentSlotToolStripMenuItem.Text = "Load Current Slot"; + this.loadCurrentSlotToolStripMenuItem.Click += new System.EventHandler(this.loadCurrentSlotToolStripMenuItem_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6); + // + // movieToolStripMenuItem + // + this.movieToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.readonlyToolStripMenuItem, this.toolStripSeparator15, this.recentToolStripMenuItem, @@ -833,294 +804,273 @@ this.bindSavestatesToMoviesToolStripMenuItem, this.automaticallyBackupMoviesToolStripMenuItem, this.fullMovieLoadstatesToolStripMenuItem}); - this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; - this.movieToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.movieToolStripMenuItem.Text = "Movie"; - this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened); - // - // readonlyToolStripMenuItem - // - this.readonlyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly; - this.readonlyToolStripMenuItem.Name = "readonlyToolStripMenuItem"; - this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.readonlyToolStripMenuItem.Text = "Read-only"; - this.readonlyToolStripMenuItem.Click += new System.EventHandler(this.readonlyToolStripMenuItem_Click); - // - // toolStripSeparator15 - // - this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6); - // - // recentToolStripMenuItem - // - this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.noneToolStripMenuItem1, - this.toolStripSeparator16, - this.clearToolStripMenuItem1, - this.autoloadMostRecentToolStripMenuItem1}); - this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; - this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; - this.recentToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.recentToolStripMenuItem.Text = "Recent"; - this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); - // - // noneToolStripMenuItem1 - // - this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1"; - this.noneToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); - this.noneToolStripMenuItem1.Text = "None"; - // - // toolStripSeparator16 - // - this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(189, 6); - // - // clearToolStripMenuItem1 - // - this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; - this.clearToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); - this.clearToolStripMenuItem1.Text = "Clear"; - // - // autoloadMostRecentToolStripMenuItem1 - // - this.autoloadMostRecentToolStripMenuItem1.Name = "autoloadMostRecentToolStripMenuItem1"; - this.autoloadMostRecentToolStripMenuItem1.Size = new System.Drawing.Size(192, 22); - this.autoloadMostRecentToolStripMenuItem1.Text = "&Autoload Most Recent"; - // - // recordMovieToolStripMenuItem - // - this.recordMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; - this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem"; - this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.recordMovieToolStripMenuItem.Text = "&Record Movie..."; - this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click); - // - // playMovieToolStripMenuItem - // - this.playMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play; - this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem"; - this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.playMovieToolStripMenuItem.Text = "&Play Movie..."; - this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click); - // - // stopMovieToolStripMenuItem - // - this.stopMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; - this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem"; - this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.stopMovieToolStripMenuItem.Text = "Stop Movie"; - this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click); - // - // playFromBeginningToolStripMenuItem - // - this.playFromBeginningToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; - this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem"; - this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning"; - this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click); - // - // importMovieToolStripMenuItem - // - this.importMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import; - this.importMovieToolStripMenuItem.Name = "importMovieToolStripMenuItem"; - this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.importMovieToolStripMenuItem.Text = "Import Movies..."; - this.importMovieToolStripMenuItem.Click += new System.EventHandler(this.importMovieToolStripMenuItem_Click); - // - // saveMovieToolStripMenuItem - // - this.saveMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; - this.saveMovieToolStripMenuItem.Name = "saveMovieToolStripMenuItem"; - this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.saveMovieToolStripMenuItem.Text = "&Save Movie"; - this.saveMovieToolStripMenuItem.Click += new System.EventHandler(this.saveMovieToolStripMenuItem_Click); - // - // stopMovieWithoutSavingToolStripMenuItem - // - this.stopMovieWithoutSavingToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; - this.stopMovieWithoutSavingToolStripMenuItem.Name = "stopMovieWithoutSavingToolStripMenuItem"; - this.stopMovieWithoutSavingToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.stopMovieWithoutSavingToolStripMenuItem.Text = "Stop Movie without Saving"; - this.stopMovieWithoutSavingToolStripMenuItem.Click += new System.EventHandler(this.stopMovieWithoutSavingToolStripMenuItem_Click); - // - // toolStripSeparator14 - // - this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6); - // - // bindSavestatesToMoviesToolStripMenuItem - // - this.bindSavestatesToMoviesToolStripMenuItem.Name = "bindSavestatesToMoviesToolStripMenuItem"; - this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.bindSavestatesToMoviesToolStripMenuItem.Text = "Bind Savestates to Movies"; - this.bindSavestatesToMoviesToolStripMenuItem.Click += new System.EventHandler(this.bindSavestatesToMoviesToolStripMenuItem_Click); - // - // automaticallyBackupMoviesToolStripMenuItem - // - this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem"; - this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies"; - this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click); - // - // fullMovieLoadstatesToolStripMenuItem - // - this.fullMovieLoadstatesToolStripMenuItem.Name = "fullMovieLoadstatesToolStripMenuItem"; - this.fullMovieLoadstatesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); - this.fullMovieLoadstatesToolStripMenuItem.Text = "Full Movie Loadstates"; - this.fullMovieLoadstatesToolStripMenuItem.Click += new System.EventHandler(this.fullMovieLoadstatesToolStripMenuItem_Click); - // - // AVIWAVToolStripMenuItem - // - this.AVIWAVToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.movieToolStripMenuItem.Name = "movieToolStripMenuItem"; + this.movieToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.movieToolStripMenuItem.Text = "Movie"; + this.movieToolStripMenuItem.DropDownOpened += new System.EventHandler(this.movieToolStripMenuItem_DropDownOpened); + // + // readonlyToolStripMenuItem + // + this.readonlyToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ReadOnly; + this.readonlyToolStripMenuItem.Name = "readonlyToolStripMenuItem"; + this.readonlyToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.readonlyToolStripMenuItem.Text = "Read-only"; + this.readonlyToolStripMenuItem.Click += new System.EventHandler(this.readonlyToolStripMenuItem_Click); + // + // toolStripSeparator15 + // + this.toolStripSeparator15.Name = "toolStripSeparator15"; + this.toolStripSeparator15.Size = new System.Drawing.Size(228, 6); + // + // recentToolStripMenuItem + // + this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripSeparator16}); + this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; + this.recentToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.recentToolStripMenuItem.Text = "Recent"; + this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); + // + // toolStripSeparator16 + // + this.toolStripSeparator16.Name = "toolStripSeparator16"; + this.toolStripSeparator16.Size = new System.Drawing.Size(149, 6); + // + // recordMovieToolStripMenuItem + // + this.recordMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; + this.recordMovieToolStripMenuItem.Name = "recordMovieToolStripMenuItem"; + this.recordMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.recordMovieToolStripMenuItem.Text = "&Record Movie..."; + this.recordMovieToolStripMenuItem.Click += new System.EventHandler(this.recordMovieToolStripMenuItem_Click); + // + // playMovieToolStripMenuItem + // + this.playMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Play; + this.playMovieToolStripMenuItem.Name = "playMovieToolStripMenuItem"; + this.playMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.playMovieToolStripMenuItem.Text = "&Play Movie..."; + this.playMovieToolStripMenuItem.Click += new System.EventHandler(this.playMovieToolStripMenuItem_Click); + // + // stopMovieToolStripMenuItem + // + this.stopMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.stopMovieToolStripMenuItem.Name = "stopMovieToolStripMenuItem"; + this.stopMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.stopMovieToolStripMenuItem.Text = "Stop Movie"; + this.stopMovieToolStripMenuItem.Click += new System.EventHandler(this.stopMovieToolStripMenuItem_Click); + // + // playFromBeginningToolStripMenuItem + // + this.playFromBeginningToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.restart; + this.playFromBeginningToolStripMenuItem.Name = "playFromBeginningToolStripMenuItem"; + this.playFromBeginningToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.playFromBeginningToolStripMenuItem.Text = "Play from Beginning"; + this.playFromBeginningToolStripMenuItem.Click += new System.EventHandler(this.playFromBeginningToolStripMenuItem_Click); + // + // importMovieToolStripMenuItem + // + this.importMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Import; + this.importMovieToolStripMenuItem.Name = "importMovieToolStripMenuItem"; + this.importMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.importMovieToolStripMenuItem.Text = "Import Movies..."; + this.importMovieToolStripMenuItem.Click += new System.EventHandler(this.importMovieToolStripMenuItem_Click); + // + // saveMovieToolStripMenuItem + // + this.saveMovieToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.saveMovieToolStripMenuItem.Name = "saveMovieToolStripMenuItem"; + this.saveMovieToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.saveMovieToolStripMenuItem.Text = "&Save Movie"; + this.saveMovieToolStripMenuItem.Click += new System.EventHandler(this.saveMovieToolStripMenuItem_Click); + // + // stopMovieWithoutSavingToolStripMenuItem + // + this.stopMovieWithoutSavingToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.stopMovieWithoutSavingToolStripMenuItem.Name = "stopMovieWithoutSavingToolStripMenuItem"; + this.stopMovieWithoutSavingToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.stopMovieWithoutSavingToolStripMenuItem.Text = "Stop Movie without Saving"; + this.stopMovieWithoutSavingToolStripMenuItem.Click += new System.EventHandler(this.stopMovieWithoutSavingToolStripMenuItem_Click); + // + // toolStripSeparator14 + // + this.toolStripSeparator14.Name = "toolStripSeparator14"; + this.toolStripSeparator14.Size = new System.Drawing.Size(228, 6); + // + // bindSavestatesToMoviesToolStripMenuItem + // + this.bindSavestatesToMoviesToolStripMenuItem.Name = "bindSavestatesToMoviesToolStripMenuItem"; + this.bindSavestatesToMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.bindSavestatesToMoviesToolStripMenuItem.Text = "Bind Savestates to Movies"; + this.bindSavestatesToMoviesToolStripMenuItem.Click += new System.EventHandler(this.bindSavestatesToMoviesToolStripMenuItem_Click); + // + // automaticallyBackupMoviesToolStripMenuItem + // + this.automaticallyBackupMoviesToolStripMenuItem.Name = "automaticallyBackupMoviesToolStripMenuItem"; + this.automaticallyBackupMoviesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.automaticallyBackupMoviesToolStripMenuItem.Text = "Automatically Backup Movies"; + this.automaticallyBackupMoviesToolStripMenuItem.Click += new System.EventHandler(this.automaticallyBackupMoviesToolStripMenuItem_Click); + // + // fullMovieLoadstatesToolStripMenuItem + // + this.fullMovieLoadstatesToolStripMenuItem.Name = "fullMovieLoadstatesToolStripMenuItem"; + this.fullMovieLoadstatesToolStripMenuItem.Size = new System.Drawing.Size(231, 22); + this.fullMovieLoadstatesToolStripMenuItem.Text = "Full Movie Loadstates"; + this.fullMovieLoadstatesToolStripMenuItem.Click += new System.EventHandler(this.fullMovieLoadstatesToolStripMenuItem_Click); + // + // AVIWAVToolStripMenuItem + // + this.AVIWAVToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.recordAVIToolStripMenuItem, this.stopAVIToolStripMenuItem, this.toolStripSeparator19, this.captureOSDToolStripMenuItem}); - this.AVIWAVToolStripMenuItem.Name = "AVIWAVToolStripMenuItem"; - this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.AVIWAVToolStripMenuItem.Text = "AVI/WAV"; - this.AVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened); - // - // recordAVIToolStripMenuItem - // - this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI; - this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem"; - this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); - this.recordAVIToolStripMenuItem.Text = "Record AVI/WAV"; - this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click); - // - // stopAVIToolStripMenuItem - // - this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; - this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem"; - this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); - this.stopAVIToolStripMenuItem.Text = "Stop AVI/WAV"; - this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click); - // - // toolStripSeparator19 - // - this.toolStripSeparator19.Name = "toolStripSeparator19"; - this.toolStripSeparator19.Size = new System.Drawing.Size(160, 6); - // - // captureOSDToolStripMenuItem - // - this.captureOSDToolStripMenuItem.Name = "captureOSDToolStripMenuItem"; - this.captureOSDToolStripMenuItem.Size = new System.Drawing.Size(163, 22); - this.captureOSDToolStripMenuItem.Text = "Capture OSD"; - this.captureOSDToolStripMenuItem.Click += new System.EventHandler(this.captureOSDToolStripMenuItem_Click); - // - // screenshotToolStripMenuItem - // - this.screenshotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.AVIWAVToolStripMenuItem.Name = "AVIWAVToolStripMenuItem"; + this.AVIWAVToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.AVIWAVToolStripMenuItem.Text = "AVI/WAV"; + this.AVIWAVToolStripMenuItem.DropDownOpened += new System.EventHandler(this.aVIWAVToolStripMenuItem_DropDownOpened); + // + // recordAVIToolStripMenuItem + // + this.recordAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AVI; + this.recordAVIToolStripMenuItem.Name = "recordAVIToolStripMenuItem"; + this.recordAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.recordAVIToolStripMenuItem.Text = "Record AVI/WAV"; + this.recordAVIToolStripMenuItem.Click += new System.EventHandler(this.recordAVIToolStripMenuItem_Click); + // + // stopAVIToolStripMenuItem + // + this.stopAVIToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.stopAVIToolStripMenuItem.Name = "stopAVIToolStripMenuItem"; + this.stopAVIToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.stopAVIToolStripMenuItem.Text = "Stop AVI/WAV"; + this.stopAVIToolStripMenuItem.Click += new System.EventHandler(this.stopAVIToolStripMenuItem_Click); + // + // toolStripSeparator19 + // + this.toolStripSeparator19.Name = "toolStripSeparator19"; + this.toolStripSeparator19.Size = new System.Drawing.Size(160, 6); + // + // captureOSDToolStripMenuItem + // + this.captureOSDToolStripMenuItem.Name = "captureOSDToolStripMenuItem"; + this.captureOSDToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.captureOSDToolStripMenuItem.Text = "Capture OSD"; + this.captureOSDToolStripMenuItem.Click += new System.EventHandler(this.captureOSDToolStripMenuItem_Click); + // + // screenshotToolStripMenuItem + // + this.screenshotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.screenshotF12ToolStripMenuItem, this.screenshotAsToolStripMenuItem, this.screenshotClipboardToolStripMenuItem, this.toolStripSeparator20, this.captureOSDToolStripMenuItem1}); - this.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem"; - this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.screenshotToolStripMenuItem.Text = "Screenshot"; - this.screenshotToolStripMenuItem.DropDownOpening += new System.EventHandler(this.screenshotToolStripMenuItem_DropDownOpening); - // - // screenshotF12ToolStripMenuItem - // - this.screenshotF12ToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; - this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; - this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(245, 22); - this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; - this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); - // - // screenshotAsToolStripMenuItem - // - this.screenshotAsToolStripMenuItem.Name = "screenshotAsToolStripMenuItem"; - this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(245, 22); - this.screenshotAsToolStripMenuItem.Text = "Screenshot As..."; - this.screenshotAsToolStripMenuItem.Click += new System.EventHandler(this.screenshotAsToolStripMenuItem_Click); - // - // screenshotClipboardToolStripMenuItem - // - this.screenshotClipboardToolStripMenuItem.Name = "screenshotClipboardToolStripMenuItem"; - this.screenshotClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(245, 22); - this.screenshotClipboardToolStripMenuItem.Text = "Screenshot -> Clipboard"; - this.screenshotClipboardToolStripMenuItem.Click += new System.EventHandler(this.screenshotClipboardToolStripMenuItem_Click); - // - // toolStripSeparator20 - // - this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(242, 6); - // - // captureOSDToolStripMenuItem1 - // - this.captureOSDToolStripMenuItem1.Name = "captureOSDToolStripMenuItem1"; - this.captureOSDToolStripMenuItem1.Size = new System.Drawing.Size(245, 22); - this.captureOSDToolStripMenuItem1.Text = "Capture OSD"; - this.captureOSDToolStripMenuItem1.Click += new System.EventHandler(this.captureOSDToolStripMenuItem1_Click); - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(137, 6); - // - // 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(140, 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.screenshotToolStripMenuItem.Name = "screenshotToolStripMenuItem"; + this.screenshotToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.screenshotToolStripMenuItem.Text = "Screenshot"; + this.screenshotToolStripMenuItem.DropDownOpening += new System.EventHandler(this.screenshotToolStripMenuItem_DropDownOpening); + // + // screenshotF12ToolStripMenuItem + // + this.screenshotF12ToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.camera; + this.screenshotF12ToolStripMenuItem.Name = "screenshotF12ToolStripMenuItem"; + this.screenshotF12ToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotF12ToolStripMenuItem.Text = "Screenshot"; + this.screenshotF12ToolStripMenuItem.Click += new System.EventHandler(this.screenshotF12ToolStripMenuItem_Click); + // + // screenshotAsToolStripMenuItem + // + this.screenshotAsToolStripMenuItem.Name = "screenshotAsToolStripMenuItem"; + this.screenshotAsToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotAsToolStripMenuItem.Text = "Screenshot As..."; + this.screenshotAsToolStripMenuItem.Click += new System.EventHandler(this.screenshotAsToolStripMenuItem_Click); + // + // screenshotClipboardToolStripMenuItem + // + this.screenshotClipboardToolStripMenuItem.Name = "screenshotClipboardToolStripMenuItem"; + this.screenshotClipboardToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); + this.screenshotClipboardToolStripMenuItem.Size = new System.Drawing.Size(245, 22); + this.screenshotClipboardToolStripMenuItem.Text = "Screenshot -> Clipboard"; + this.screenshotClipboardToolStripMenuItem.Click += new System.EventHandler(this.screenshotClipboardToolStripMenuItem_Click); + // + // toolStripSeparator20 + // + this.toolStripSeparator20.Name = "toolStripSeparator20"; + this.toolStripSeparator20.Size = new System.Drawing.Size(242, 6); + // + // captureOSDToolStripMenuItem1 + // + this.captureOSDToolStripMenuItem1.Name = "captureOSDToolStripMenuItem1"; + this.captureOSDToolStripMenuItem1.Size = new System.Drawing.Size(245, 22); + this.captureOSDToolStripMenuItem1.Text = "Capture OSD"; + this.captureOSDToolStripMenuItem1.Click += new System.EventHandler(this.captureOSDToolStripMenuItem1_Click); + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(149, 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(152, 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.rebootCoreToolStripMenuItem, this.toolStripSeparator1, this.resetToolStripMenuItem, this.hardResetToolStripMenuItem}); - this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem"; - this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 19); - this.emulationToolStripMenuItem.Text = "&Emulation"; - this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); - // - // pauseToolStripMenuItem - // - this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; - this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; - this.pauseToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.pauseToolStripMenuItem.Text = "&Pause"; - this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); - // - // rebootCoreToolStripMenuItem - // - this.rebootCoreToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; - this.rebootCoreToolStripMenuItem.Name = "rebootCoreToolStripMenuItem"; - this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.rebootCoreToolStripMenuItem.Text = "&Reboot Core"; - this.rebootCoreToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(137, 6); - // - // resetToolStripMenuItem - // - this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.resetToolStripMenuItem.Text = "&Soft Reset"; - this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); - // - // hardResetToolStripMenuItem - // - this.hardResetToolStripMenuItem.Name = "hardResetToolStripMenuItem"; - this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); - this.hardResetToolStripMenuItem.Text = "&Hard Reset"; - this.hardResetToolStripMenuItem.Click += new System.EventHandler(this.hardResetToolStripMenuItem_Click); - // - // viewToolStripMenuItem - // - this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.emulationToolStripMenuItem.Name = "emulationToolStripMenuItem"; + this.emulationToolStripMenuItem.Size = new System.Drawing.Size(73, 19); + this.emulationToolStripMenuItem.Text = "&Emulation"; + this.emulationToolStripMenuItem.DropDownOpened += new System.EventHandler(this.emulationToolStripMenuItem_DropDownOpened); + // + // pauseToolStripMenuItem + // + this.pauseToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Pause; + this.pauseToolStripMenuItem.Name = "pauseToolStripMenuItem"; + this.pauseToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.pauseToolStripMenuItem.Text = "&Pause"; + this.pauseToolStripMenuItem.Click += new System.EventHandler(this.pauseToolStripMenuItem_Click); + // + // rebootCoreToolStripMenuItem + // + this.rebootCoreToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; + this.rebootCoreToolStripMenuItem.Name = "rebootCoreToolStripMenuItem"; + this.rebootCoreToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.rebootCoreToolStripMenuItem.Text = "&Reboot Core"; + this.rebootCoreToolStripMenuItem.Click += new System.EventHandler(this.powerToolStripMenuItem_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(137, 6); + // + // resetToolStripMenuItem + // + this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; + this.resetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.resetToolStripMenuItem.Text = "&Soft Reset"; + this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); + // + // hardResetToolStripMenuItem + // + this.hardResetToolStripMenuItem.Name = "hardResetToolStripMenuItem"; + this.hardResetToolStripMenuItem.Size = new System.Drawing.Size(140, 22); + this.hardResetToolStripMenuItem.Text = "&Hard Reset"; + this.hardResetToolStripMenuItem.Click += new System.EventHandler(this.hardResetToolStripMenuItem_Click); + // + // viewToolStripMenuItem + // + this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.windowFilterMenuItem, this.windowSizeMenuItem, this.switchToFullscreenToolStripMenuItem, @@ -1134,182 +1084,182 @@ this.toolStripMenuItem4, this.displayStatusBarToolStripMenuItem, this.displayLogWindowToolStripMenuItem}); - this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; - this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 19); - this.viewToolStripMenuItem.Text = "&View"; - this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened); - // - // windowFilterMenuItem - // - this.windowFilterMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.viewToolStripMenuItem.Name = "viewToolStripMenuItem"; + this.viewToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.viewToolStripMenuItem.Text = "&View"; + this.viewToolStripMenuItem.DropDownOpened += new System.EventHandler(this.viewToolStripMenuItem_DropDownOpened); + // + // windowFilterMenuItem + // + this.windowFilterMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DisplayFilterNoneMenuItem, this.x2SAIMenuItem, this.SuperX2SAIMenuItem, this.SuperEagleMenuItem}); - this.windowFilterMenuItem.Name = "windowFilterMenuItem"; - this.windowFilterMenuItem.Size = new System.Drawing.Size(198, 22); - this.windowFilterMenuItem.Text = "Display Filter"; - // - // DisplayFilterNoneMenuItem - // - this.DisplayFilterNoneMenuItem.Name = "DisplayFilterNoneMenuItem"; - this.DisplayFilterNoneMenuItem.Size = new System.Drawing.Size(135, 22); - this.DisplayFilterNoneMenuItem.Text = "None"; - this.DisplayFilterNoneMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); - // - // x2SAIMenuItem - // - this.x2SAIMenuItem.Name = "x2SAIMenuItem"; - this.x2SAIMenuItem.Size = new System.Drawing.Size(135, 22); - this.x2SAIMenuItem.Text = "2xSAI"; - this.x2SAIMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); - // - // SuperX2SAIMenuItem - // - this.SuperX2SAIMenuItem.Name = "SuperX2SAIMenuItem"; - this.SuperX2SAIMenuItem.Size = new System.Drawing.Size(135, 22); - this.SuperX2SAIMenuItem.Text = "Super 2xSAI"; - this.SuperX2SAIMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); - // - // SuperEagleMenuItem - // - this.SuperEagleMenuItem.Name = "SuperEagleMenuItem"; - this.SuperEagleMenuItem.Size = new System.Drawing.Size(135, 22); - this.SuperEagleMenuItem.Text = "Super Eagle"; - this.SuperEagleMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); - // - // windowSizeMenuItem - // - this.windowSizeMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.windowFilterMenuItem.Name = "windowFilterMenuItem"; + this.windowFilterMenuItem.Size = new System.Drawing.Size(198, 22); + this.windowFilterMenuItem.Text = "Display Filter"; + // + // DisplayFilterNoneMenuItem + // + this.DisplayFilterNoneMenuItem.Name = "DisplayFilterNoneMenuItem"; + this.DisplayFilterNoneMenuItem.Size = new System.Drawing.Size(135, 22); + this.DisplayFilterNoneMenuItem.Text = "None"; + this.DisplayFilterNoneMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); + // + // x2SAIMenuItem + // + this.x2SAIMenuItem.Name = "x2SAIMenuItem"; + this.x2SAIMenuItem.Size = new System.Drawing.Size(135, 22); + this.x2SAIMenuItem.Text = "2xSAI"; + this.x2SAIMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); + // + // SuperX2SAIMenuItem + // + this.SuperX2SAIMenuItem.Name = "SuperX2SAIMenuItem"; + this.SuperX2SAIMenuItem.Size = new System.Drawing.Size(135, 22); + this.SuperX2SAIMenuItem.Text = "Super 2xSAI"; + this.SuperX2SAIMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); + // + // SuperEagleMenuItem + // + this.SuperEagleMenuItem.Name = "SuperEagleMenuItem"; + this.SuperEagleMenuItem.Size = new System.Drawing.Size(135, 22); + this.SuperEagleMenuItem.Text = "Super Eagle"; + this.SuperEagleMenuItem.Click += new System.EventHandler(this.DisplayFilterMenuItem_Click); + // + // 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(198, 22); - this.windowSizeMenuItem.Text = "&Window Size"; - // - // x1MenuItem - // - this.x1MenuItem.Name = "x1MenuItem"; - this.x1MenuItem.Size = new System.Drawing.Size(96, 22); - this.x1MenuItem.Text = "&1x"; - this.x1MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // x2MenuItem - // - this.x2MenuItem.Name = "x2MenuItem"; - this.x2MenuItem.Size = new System.Drawing.Size(96, 22); - this.x2MenuItem.Text = "&2x"; - this.x2MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // x3MenuItem - // - this.x3MenuItem.Name = "x3MenuItem"; - this.x3MenuItem.Size = new System.Drawing.Size(96, 22); - this.x3MenuItem.Text = "&3x"; - this.x3MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // x4MenuItem - // - this.x4MenuItem.Name = "x4MenuItem"; - this.x4MenuItem.Size = new System.Drawing.Size(96, 22); - this.x4MenuItem.Text = "&4x"; - this.x4MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // x5MenuItem - // - this.x5MenuItem.Name = "x5MenuItem"; - this.x5MenuItem.Size = new System.Drawing.Size(96, 22); - this.x5MenuItem.Text = "&5x"; - this.x5MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // mzMenuItem - // - this.mzMenuItem.Name = "mzMenuItem"; - this.mzMenuItem.Size = new System.Drawing.Size(96, 22); - this.mzMenuItem.Text = "&Max"; - this.mzMenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); - // - // switchToFullscreenToolStripMenuItem - // - this.switchToFullscreenToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen; - this.switchToFullscreenToolStripMenuItem.Name = "switchToFullscreenToolStripMenuItem"; - this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(198, 22); - this.switchToFullscreenToolStripMenuItem.Text = "Switch to Fullscreen"; - this.switchToFullscreenToolStripMenuItem.Click += new System.EventHandler(this.switchToFullscreenToolStripMenuItem_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(195, 6); - // - // displayFPSToolStripMenuItem - // - this.displayFPSToolStripMenuItem.Name = "displayFPSToolStripMenuItem"; - this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(198, 22); - this.displayFPSToolStripMenuItem.Text = "Display FPS"; - this.displayFPSToolStripMenuItem.Click += new System.EventHandler(this.displayFPSToolStripMenuItem_Click); - // - // displayFrameCounterToolStripMenuItem - // - this.displayFrameCounterToolStripMenuItem.Name = "displayFrameCounterToolStripMenuItem"; - this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); - this.displayFrameCounterToolStripMenuItem.Text = "Display FrameCounter"; - this.displayFrameCounterToolStripMenuItem.Click += new System.EventHandler(this.displayFrameCounterToolStripMenuItem_Click); - // - // displayLagCounterToolStripMenuItem - // - this.displayLagCounterToolStripMenuItem.Name = "displayLagCounterToolStripMenuItem"; - this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); - this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter"; - this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click); - // - // displayInputToolStripMenuItem - // - this.displayInputToolStripMenuItem.Name = "displayInputToolStripMenuItem"; - this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(198, 22); - this.displayInputToolStripMenuItem.Text = "Display Input"; - this.displayInputToolStripMenuItem.Click += new System.EventHandler(this.displayInputToolStripMenuItem_Click); - // - // displayRerecordCountToolStripMenuItem - // - this.displayRerecordCountToolStripMenuItem.Name = "displayRerecordCountToolStripMenuItem"; - this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(198, 22); - this.displayRerecordCountToolStripMenuItem.Text = "Display Rerecord Count"; - this.displayRerecordCountToolStripMenuItem.Click += new System.EventHandler(this.displayRerecordCountToolStripMenuItem_Click); - // - // displaySubtitlesToolStripMenuItem - // - this.displaySubtitlesToolStripMenuItem.Name = "displaySubtitlesToolStripMenuItem"; - this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(198, 22); - this.displaySubtitlesToolStripMenuItem.Text = "Display Subtitles"; - this.displaySubtitlesToolStripMenuItem.Click += new System.EventHandler(this.displaySubtitlesToolStripMenuItem_Click); - // - // toolStripMenuItem4 - // - this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(195, 6); - // - // displayStatusBarToolStripMenuItem - // - this.displayStatusBarToolStripMenuItem.Name = "displayStatusBarToolStripMenuItem"; - this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(198, 22); - this.displayStatusBarToolStripMenuItem.Text = "Display Status Bar"; - this.displayStatusBarToolStripMenuItem.Click += new System.EventHandler(this.displayStatusBarToolStripMenuItem_Click); - // - // displayLogWindowToolStripMenuItem - // - this.displayLogWindowToolStripMenuItem.Name = "displayLogWindowToolStripMenuItem"; - this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(198, 22); - this.displayLogWindowToolStripMenuItem.Text = "Display Log Window"; - this.displayLogWindowToolStripMenuItem.Click += new System.EventHandler(this.displayLogWindowToolStripMenuItem_Click); - // - // configToolStripMenuItem - // - this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.windowSizeMenuItem.Name = "windowSizeMenuItem"; + this.windowSizeMenuItem.Size = new System.Drawing.Size(198, 22); + this.windowSizeMenuItem.Text = "&Window Size"; + // + // x1MenuItem + // + this.x1MenuItem.Name = "x1MenuItem"; + this.x1MenuItem.Size = new System.Drawing.Size(96, 22); + this.x1MenuItem.Text = "&1x"; + this.x1MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // x2MenuItem + // + this.x2MenuItem.Name = "x2MenuItem"; + this.x2MenuItem.Size = new System.Drawing.Size(96, 22); + this.x2MenuItem.Text = "&2x"; + this.x2MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // x3MenuItem + // + this.x3MenuItem.Name = "x3MenuItem"; + this.x3MenuItem.Size = new System.Drawing.Size(96, 22); + this.x3MenuItem.Text = "&3x"; + this.x3MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // x4MenuItem + // + this.x4MenuItem.Name = "x4MenuItem"; + this.x4MenuItem.Size = new System.Drawing.Size(96, 22); + this.x4MenuItem.Text = "&4x"; + this.x4MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // x5MenuItem + // + this.x5MenuItem.Name = "x5MenuItem"; + this.x5MenuItem.Size = new System.Drawing.Size(96, 22); + this.x5MenuItem.Text = "&5x"; + this.x5MenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // mzMenuItem + // + this.mzMenuItem.Name = "mzMenuItem"; + this.mzMenuItem.Size = new System.Drawing.Size(96, 22); + this.mzMenuItem.Text = "&Max"; + this.mzMenuItem.Click += new System.EventHandler(this.zoomMenuItem_Click); + // + // switchToFullscreenToolStripMenuItem + // + this.switchToFullscreenToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Fullscreen; + this.switchToFullscreenToolStripMenuItem.Name = "switchToFullscreenToolStripMenuItem"; + this.switchToFullscreenToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.switchToFullscreenToolStripMenuItem.Text = "Switch to Fullscreen"; + this.switchToFullscreenToolStripMenuItem.Click += new System.EventHandler(this.switchToFullscreenToolStripMenuItem_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(195, 6); + // + // displayFPSToolStripMenuItem + // + this.displayFPSToolStripMenuItem.Name = "displayFPSToolStripMenuItem"; + this.displayFPSToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayFPSToolStripMenuItem.Text = "Display FPS"; + this.displayFPSToolStripMenuItem.Click += new System.EventHandler(this.displayFPSToolStripMenuItem_Click); + // + // displayFrameCounterToolStripMenuItem + // + this.displayFrameCounterToolStripMenuItem.Name = "displayFrameCounterToolStripMenuItem"; + this.displayFrameCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayFrameCounterToolStripMenuItem.Text = "Display FrameCounter"; + this.displayFrameCounterToolStripMenuItem.Click += new System.EventHandler(this.displayFrameCounterToolStripMenuItem_Click); + // + // displayLagCounterToolStripMenuItem + // + this.displayLagCounterToolStripMenuItem.Name = "displayLagCounterToolStripMenuItem"; + this.displayLagCounterToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayLagCounterToolStripMenuItem.Text = "Display Lag Counter"; + this.displayLagCounterToolStripMenuItem.Click += new System.EventHandler(this.displayLagCounterToolStripMenuItem_Click); + // + // displayInputToolStripMenuItem + // + this.displayInputToolStripMenuItem.Name = "displayInputToolStripMenuItem"; + this.displayInputToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayInputToolStripMenuItem.Text = "Display Input"; + this.displayInputToolStripMenuItem.Click += new System.EventHandler(this.displayInputToolStripMenuItem_Click); + // + // displayRerecordCountToolStripMenuItem + // + this.displayRerecordCountToolStripMenuItem.Name = "displayRerecordCountToolStripMenuItem"; + this.displayRerecordCountToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayRerecordCountToolStripMenuItem.Text = "Display Rerecord Count"; + this.displayRerecordCountToolStripMenuItem.Click += new System.EventHandler(this.displayRerecordCountToolStripMenuItem_Click); + // + // displaySubtitlesToolStripMenuItem + // + this.displaySubtitlesToolStripMenuItem.Name = "displaySubtitlesToolStripMenuItem"; + this.displaySubtitlesToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displaySubtitlesToolStripMenuItem.Text = "Display Subtitles"; + this.displaySubtitlesToolStripMenuItem.Click += new System.EventHandler(this.displaySubtitlesToolStripMenuItem_Click); + // + // toolStripMenuItem4 + // + this.toolStripMenuItem4.Name = "toolStripMenuItem4"; + this.toolStripMenuItem4.Size = new System.Drawing.Size(195, 6); + // + // displayStatusBarToolStripMenuItem + // + this.displayStatusBarToolStripMenuItem.Name = "displayStatusBarToolStripMenuItem"; + this.displayStatusBarToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayStatusBarToolStripMenuItem.Text = "Display Status Bar"; + this.displayStatusBarToolStripMenuItem.Click += new System.EventHandler(this.displayStatusBarToolStripMenuItem_Click); + // + // displayLogWindowToolStripMenuItem + // + this.displayLogWindowToolStripMenuItem.Name = "displayLogWindowToolStripMenuItem"; + this.displayLogWindowToolStripMenuItem.Size = new System.Drawing.Size(198, 22); + this.displayLogWindowToolStripMenuItem.Text = "Display Log Window"; + this.displayLogWindowToolStripMenuItem.Click += new System.EventHandler(this.displayLogWindowToolStripMenuItem_Click); + // + // configToolStripMenuItem + // + this.configToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.controllersToolStripMenuItem, this.hotkeysToolStripMenuItem, this.messagesToolStripMenuItem, @@ -1327,138 +1277,138 @@ this.toolStripSeparator10, this.saveConfigToolStripMenuItem, this.loadConfigToolStripMenuItem}); - this.configToolStripMenuItem.Name = "configToolStripMenuItem"; - this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 19); - this.configToolStripMenuItem.Text = "&Config"; - this.configToolStripMenuItem.DropDownOpened += new System.EventHandler(this.configToolStripMenuItem_DropDownOpened); - // - // controllersToolStripMenuItem - // - this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; - this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; - this.controllersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.controllersToolStripMenuItem.Text = "&Controllers..."; - this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); - // - // hotkeysToolStripMenuItem - // - this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; - this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; - this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.hotkeysToolStripMenuItem.Text = "&Hotkeys..."; - this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); - // - // messagesToolStripMenuItem - // - this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; - this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem"; - this.messagesToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.messagesToolStripMenuItem.Text = "&Messages..."; - this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click); - // - // pathsToolStripMenuItem - // - this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; - this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem"; - this.pathsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.pathsToolStripMenuItem.Text = "Paths..."; - this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click); - // - // soundToolStripMenuItem - // - this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; - this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; - this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.soundToolStripMenuItem.Text = "&Sound..."; - this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); - // - // autofireToolStripMenuItem - // - this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; - this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem"; - this.autofireToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.autofireToolStripMenuItem.Text = "&Autofire..."; - this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click); - // - // rewindOptionsToolStripMenuItem - // - this.rewindOptionsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; - this.rewindOptionsToolStripMenuItem.Name = "rewindOptionsToolStripMenuItem"; - this.rewindOptionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.rewindOptionsToolStripMenuItem.Text = "&Rewind..."; - this.rewindOptionsToolStripMenuItem.Click += new System.EventHandler(this.rewindOptionsToolStripMenuItem_Click); - // - // firmwaresToolStripMenuItem - // - this.firmwaresToolStripMenuItem.Name = "firmwaresToolStripMenuItem"; - this.firmwaresToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.firmwaresToolStripMenuItem.Text = "&Firmwares"; - this.firmwaresToolStripMenuItem.Click += new System.EventHandler(this.firmwaresToolStripMenuItem_Click); - // - // toolStripSeparator9 - // - this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6); - // - // enableToolStripMenuItem - // - this.enableToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.configToolStripMenuItem.Name = "configToolStripMenuItem"; + this.configToolStripMenuItem.Size = new System.Drawing.Size(55, 19); + this.configToolStripMenuItem.Text = "&Config"; + this.configToolStripMenuItem.DropDownOpened += new System.EventHandler(this.configToolStripMenuItem_DropDownOpened); + // + // controllersToolStripMenuItem + // + this.controllersToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; + this.controllersToolStripMenuItem.Name = "controllersToolStripMenuItem"; + this.controllersToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.controllersToolStripMenuItem.Text = "&Controllers..."; + this.controllersToolStripMenuItem.Click += new System.EventHandler(this.controllersToolStripMenuItem_Click); + // + // hotkeysToolStripMenuItem + // + this.hotkeysToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; + this.hotkeysToolStripMenuItem.Name = "hotkeysToolStripMenuItem"; + this.hotkeysToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.hotkeysToolStripMenuItem.Text = "&Hotkeys..."; + this.hotkeysToolStripMenuItem.Click += new System.EventHandler(this.hotkeysToolStripMenuItem_Click); + // + // messagesToolStripMenuItem + // + this.messagesToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; + this.messagesToolStripMenuItem.Name = "messagesToolStripMenuItem"; + this.messagesToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.messagesToolStripMenuItem.Text = "&Messages..."; + this.messagesToolStripMenuItem.Click += new System.EventHandler(this.messagesToolStripMenuItem_Click); + // + // pathsToolStripMenuItem + // + this.pathsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; + this.pathsToolStripMenuItem.Name = "pathsToolStripMenuItem"; + this.pathsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.pathsToolStripMenuItem.Text = "Paths..."; + this.pathsToolStripMenuItem.Click += new System.EventHandler(this.pathsToolStripMenuItem_Click); + // + // soundToolStripMenuItem + // + this.soundToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; + this.soundToolStripMenuItem.Name = "soundToolStripMenuItem"; + this.soundToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.soundToolStripMenuItem.Text = "&Sound..."; + this.soundToolStripMenuItem.Click += new System.EventHandler(this.soundToolStripMenuItem_Click); + // + // autofireToolStripMenuItem + // + this.autofireToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; + this.autofireToolStripMenuItem.Name = "autofireToolStripMenuItem"; + this.autofireToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.autofireToolStripMenuItem.Text = "&Autofire..."; + this.autofireToolStripMenuItem.Click += new System.EventHandler(this.autofireToolStripMenuItem_Click); + // + // rewindOptionsToolStripMenuItem + // + this.rewindOptionsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; + this.rewindOptionsToolStripMenuItem.Name = "rewindOptionsToolStripMenuItem"; + this.rewindOptionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.rewindOptionsToolStripMenuItem.Text = "&Rewind..."; + this.rewindOptionsToolStripMenuItem.Click += new System.EventHandler(this.rewindOptionsToolStripMenuItem_Click); + // + // firmwaresToolStripMenuItem + // + this.firmwaresToolStripMenuItem.Name = "firmwaresToolStripMenuItem"; + this.firmwaresToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.firmwaresToolStripMenuItem.Text = "&Firmwares"; + this.firmwaresToolStripMenuItem.Click += new System.EventHandler(this.firmwaresToolStripMenuItem_Click); + // + // toolStripSeparator9 + // + this.toolStripSeparator9.Name = "toolStripSeparator9"; + this.toolStripSeparator9.Size = new System.Drawing.Size(149, 6); + // + // enableToolStripMenuItem + // + this.enableToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.enableContextMenuToolStripMenuItem, this.backupSavestatesToolStripMenuItem, this.autoSavestatesToolStripMenuItem, this.saveScreenshotWithSavestatesToolStripMenuItem, this.frameAdvanceSkipLagFramesToolStripMenuItem, this.backupSaveramToolStripMenuItem}); - this.enableToolStripMenuItem.Name = "enableToolStripMenuItem"; - this.enableToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.enableToolStripMenuItem.Text = "&Enable"; - this.enableToolStripMenuItem.DropDownOpened += new System.EventHandler(this.enableToolStripMenuItem_DropDownOpened); - // - // enableContextMenuToolStripMenuItem - // - this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem"; - this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(252, 22); - this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu"; - this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click); - // - // backupSavestatesToolStripMenuItem - // - this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem"; - this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); - this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates"; - this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click); - // - // autoSavestatesToolStripMenuItem - // - this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem"; - this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); - this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates"; - this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click); - // - // saveScreenshotWithSavestatesToolStripMenuItem - // - this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem"; - this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); - this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates"; - this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click); - // - // frameAdvanceSkipLagFramesToolStripMenuItem - // - this.frameAdvanceSkipLagFramesToolStripMenuItem.Name = "frameAdvanceSkipLagFramesToolStripMenuItem"; - this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); - this.frameAdvanceSkipLagFramesToolStripMenuItem.Text = "Frame Advance - Skip Lag Frames"; - this.frameAdvanceSkipLagFramesToolStripMenuItem.Click += new System.EventHandler(this.frameAdvanceSkipLagFramesToolStripMenuItem_Click); - // - // backupSaveramToolStripMenuItem - // - this.backupSaveramToolStripMenuItem.Name = "backupSaveramToolStripMenuItem"; - this.backupSaveramToolStripMenuItem.Size = new System.Drawing.Size(252, 22); - this.backupSaveramToolStripMenuItem.Text = "Backup Saveram"; - this.backupSaveramToolStripMenuItem.Click += new System.EventHandler(this.backupSaveramToolStripMenuItem_Click); - // - // gUIToolStripMenuItem - // - this.gUIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.enableToolStripMenuItem.Name = "enableToolStripMenuItem"; + this.enableToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.enableToolStripMenuItem.Text = "&Enable"; + this.enableToolStripMenuItem.DropDownOpened += new System.EventHandler(this.enableToolStripMenuItem_DropDownOpened); + // + // enableContextMenuToolStripMenuItem + // + this.enableContextMenuToolStripMenuItem.Name = "enableContextMenuToolStripMenuItem"; + this.enableContextMenuToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.enableContextMenuToolStripMenuItem.Text = "Enable Context Menu"; + this.enableContextMenuToolStripMenuItem.Click += new System.EventHandler(this.enableContextMenuToolStripMenuItem_Click); + // + // backupSavestatesToolStripMenuItem + // + this.backupSavestatesToolStripMenuItem.Name = "backupSavestatesToolStripMenuItem"; + this.backupSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.backupSavestatesToolStripMenuItem.Text = "Backup Savestates"; + this.backupSavestatesToolStripMenuItem.Click += new System.EventHandler(this.backupSavestatesToolStripMenuItem_Click); + // + // autoSavestatesToolStripMenuItem + // + this.autoSavestatesToolStripMenuItem.Name = "autoSavestatesToolStripMenuItem"; + this.autoSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.autoSavestatesToolStripMenuItem.Text = "Auto Savestates"; + this.autoSavestatesToolStripMenuItem.Click += new System.EventHandler(this.autoSavestatesToolStripMenuItem_Click); + // + // saveScreenshotWithSavestatesToolStripMenuItem + // + this.saveScreenshotWithSavestatesToolStripMenuItem.Name = "saveScreenshotWithSavestatesToolStripMenuItem"; + this.saveScreenshotWithSavestatesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.saveScreenshotWithSavestatesToolStripMenuItem.Text = "Save Screenshot with Savestates"; + this.saveScreenshotWithSavestatesToolStripMenuItem.Click += new System.EventHandler(this.screenshotWithSavestatesToolStripMenuItem_Click); + // + // frameAdvanceSkipLagFramesToolStripMenuItem + // + this.frameAdvanceSkipLagFramesToolStripMenuItem.Name = "frameAdvanceSkipLagFramesToolStripMenuItem"; + this.frameAdvanceSkipLagFramesToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.frameAdvanceSkipLagFramesToolStripMenuItem.Text = "Frame Advance - Skip Lag Frames"; + this.frameAdvanceSkipLagFramesToolStripMenuItem.Click += new System.EventHandler(this.frameAdvanceSkipLagFramesToolStripMenuItem_Click); + // + // backupSaveramToolStripMenuItem + // + this.backupSaveramToolStripMenuItem.Name = "backupSaveramToolStripMenuItem"; + this.backupSaveramToolStripMenuItem.Size = new System.Drawing.Size(252, 22); + this.backupSaveramToolStripMenuItem.Text = "Backup Saveram"; + this.backupSaveramToolStripMenuItem.Click += new System.EventHandler(this.backupSaveramToolStripMenuItem_Click); + // + // gUIToolStripMenuItem + // + this.gUIToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pauseWhenMenuActivatedToolStripMenuItem, this.startPausedToolStripMenuItem, this.toolStripSeparator22, @@ -1473,108 +1423,108 @@ this.neverBeAskedToSaveChangesToolStripMenuItem, this.toolStripSeparator23, this.logWindowAsConsoleToolStripMenuItem}); - this.gUIToolStripMenuItem.Name = "gUIToolStripMenuItem"; - this.gUIToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.gUIToolStripMenuItem.Text = "GUI"; - this.gUIToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gUIToolStripMenuItem_DropDownOpened); - // - // pauseWhenMenuActivatedToolStripMenuItem - // - this.pauseWhenMenuActivatedToolStripMenuItem.Name = "pauseWhenMenuActivatedToolStripMenuItem"; - this.pauseWhenMenuActivatedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated"; - this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click); - // - // startPausedToolStripMenuItem - // - this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem"; - this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.startPausedToolStripMenuItem.Text = "Start paused"; - this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click); - // - // toolStripSeparator22 - // - this.toolStripSeparator22.Name = "toolStripSeparator22"; - this.toolStripSeparator22.Size = new System.Drawing.Size(238, 6); - // - // saveWindowPositionToolStripMenuItem - // - this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; - this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.saveWindowPositionToolStripMenuItem.Text = "Save window position"; - this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); - // - // forceGDIPPresentationToolStripMenuItem - // - this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem"; - this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.forceGDIPPresentationToolStripMenuItem.Text = "Use GDI+ Display Method"; - this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click); - // - // blurryToolStripMenuItem - // - this.blurryToolStripMenuItem.Name = "blurryToolStripMenuItem"; - this.blurryToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.blurryToolStripMenuItem.Text = "Use Bilinear Filtering"; - this.blurryToolStripMenuItem.Click += new System.EventHandler(this.blurryToolStripMenuItem_Click); - // - // miSuppressGuiLayer - // - this.miSuppressGuiLayer.Name = "miSuppressGuiLayer"; - this.miSuppressGuiLayer.Size = new System.Drawing.Size(241, 22); - this.miSuppressGuiLayer.Text = "Suppress GUI Layer"; - this.miSuppressGuiLayer.Click += new System.EventHandler(this.miSuppressGuiLayer_Click); - // - // showMenuInFullScreenToolStripMenuItem - // - this.showMenuInFullScreenToolStripMenuItem.Name = "showMenuInFullScreenToolStripMenuItem"; - this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.showMenuInFullScreenToolStripMenuItem.Text = "Show Menu in Full Screen"; - this.showMenuInFullScreenToolStripMenuItem.Click += new System.EventHandler(this.showMenuInFullScreenToolStripMenuItem_Click); - // - // runInBackgroundToolStripMenuItem - // - this.runInBackgroundToolStripMenuItem.Name = "runInBackgroundToolStripMenuItem"; - this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.runInBackgroundToolStripMenuItem.Text = "Run in Background"; - this.runInBackgroundToolStripMenuItem.Click += new System.EventHandler(this.runInBackgroundToolStripMenuItem_Click); - // - // acceptBackgroundInputToolStripMenuItem - // - this.acceptBackgroundInputToolStripMenuItem.Name = "acceptBackgroundInputToolStripMenuItem"; - this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input"; - this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click); - // - // singleInstanceModeToolStripMenuItem - // - this.singleInstanceModeToolStripMenuItem.Name = "singleInstanceModeToolStripMenuItem"; - this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.singleInstanceModeToolStripMenuItem.Text = "Single Instance Mode"; - this.singleInstanceModeToolStripMenuItem.Click += new System.EventHandler(this.singleInstanceModeToolStripMenuItem_Click); - // - // neverBeAskedToSaveChangesToolStripMenuItem - // - this.neverBeAskedToSaveChangesToolStripMenuItem.Name = "neverBeAskedToSaveChangesToolStripMenuItem"; - this.neverBeAskedToSaveChangesToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.neverBeAskedToSaveChangesToolStripMenuItem.Text = "Never be asked to save changes"; - this.neverBeAskedToSaveChangesToolStripMenuItem.Click += new System.EventHandler(this.neverBeAskedToSaveChangesToolStripMenuItem_Click); - // - // toolStripSeparator23 - // - this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(238, 6); - // - // logWindowAsConsoleToolStripMenuItem - // - this.logWindowAsConsoleToolStripMenuItem.Name = "logWindowAsConsoleToolStripMenuItem"; - this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.logWindowAsConsoleToolStripMenuItem.Text = "Log Window as Console"; - this.logWindowAsConsoleToolStripMenuItem.Click += new System.EventHandler(this.logWindowAsConsoleToolStripMenuItem_Click); - // - // frameSkipToolStripMenuItem - // - this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + 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(241, 22); + this.pauseWhenMenuActivatedToolStripMenuItem.Text = "Pause when menu activated"; + this.pauseWhenMenuActivatedToolStripMenuItem.Click += new System.EventHandler(this.pauseWhenMenuActivatedToolStripMenuItem_Click); + // + // startPausedToolStripMenuItem + // + this.startPausedToolStripMenuItem.Name = "startPausedToolStripMenuItem"; + this.startPausedToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.startPausedToolStripMenuItem.Text = "Start paused"; + this.startPausedToolStripMenuItem.Click += new System.EventHandler(this.startPausedToolStripMenuItem_Click); + // + // toolStripSeparator22 + // + this.toolStripSeparator22.Name = "toolStripSeparator22"; + this.toolStripSeparator22.Size = new System.Drawing.Size(238, 6); + // + // saveWindowPositionToolStripMenuItem + // + this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.saveWindowPositionToolStripMenuItem.Text = "Save window position"; + this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); + // + // forceGDIPPresentationToolStripMenuItem + // + this.forceGDIPPresentationToolStripMenuItem.Name = "forceGDIPPresentationToolStripMenuItem"; + this.forceGDIPPresentationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.forceGDIPPresentationToolStripMenuItem.Text = "Use GDI+ Display Method"; + this.forceGDIPPresentationToolStripMenuItem.Click += new System.EventHandler(this.forceGDIPPresentationToolStripMenuItem_Click); + // + // blurryToolStripMenuItem + // + this.blurryToolStripMenuItem.Name = "blurryToolStripMenuItem"; + this.blurryToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.blurryToolStripMenuItem.Text = "Use Bilinear Filtering"; + this.blurryToolStripMenuItem.Click += new System.EventHandler(this.blurryToolStripMenuItem_Click); + // + // miSuppressGuiLayer + // + this.miSuppressGuiLayer.Name = "miSuppressGuiLayer"; + this.miSuppressGuiLayer.Size = new System.Drawing.Size(241, 22); + this.miSuppressGuiLayer.Text = "Suppress GUI Layer"; + this.miSuppressGuiLayer.Click += new System.EventHandler(this.miSuppressGuiLayer_Click); + // + // showMenuInFullScreenToolStripMenuItem + // + this.showMenuInFullScreenToolStripMenuItem.Name = "showMenuInFullScreenToolStripMenuItem"; + this.showMenuInFullScreenToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.showMenuInFullScreenToolStripMenuItem.Text = "Show Menu in Full Screen"; + this.showMenuInFullScreenToolStripMenuItem.Click += new System.EventHandler(this.showMenuInFullScreenToolStripMenuItem_Click); + // + // runInBackgroundToolStripMenuItem + // + this.runInBackgroundToolStripMenuItem.Name = "runInBackgroundToolStripMenuItem"; + this.runInBackgroundToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.runInBackgroundToolStripMenuItem.Text = "Run in Background"; + this.runInBackgroundToolStripMenuItem.Click += new System.EventHandler(this.runInBackgroundToolStripMenuItem_Click); + // + // acceptBackgroundInputToolStripMenuItem + // + this.acceptBackgroundInputToolStripMenuItem.Name = "acceptBackgroundInputToolStripMenuItem"; + this.acceptBackgroundInputToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.acceptBackgroundInputToolStripMenuItem.Text = "Accept Background Input"; + this.acceptBackgroundInputToolStripMenuItem.Click += new System.EventHandler(this.acceptBackgroundInputToolStripMenuItem_Click); + // + // singleInstanceModeToolStripMenuItem + // + this.singleInstanceModeToolStripMenuItem.Name = "singleInstanceModeToolStripMenuItem"; + this.singleInstanceModeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.singleInstanceModeToolStripMenuItem.Text = "Single Instance Mode"; + this.singleInstanceModeToolStripMenuItem.Click += new System.EventHandler(this.singleInstanceModeToolStripMenuItem_Click); + // + // neverBeAskedToSaveChangesToolStripMenuItem + // + this.neverBeAskedToSaveChangesToolStripMenuItem.Name = "neverBeAskedToSaveChangesToolStripMenuItem"; + this.neverBeAskedToSaveChangesToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.neverBeAskedToSaveChangesToolStripMenuItem.Text = "Never be asked to save changes"; + this.neverBeAskedToSaveChangesToolStripMenuItem.Click += new System.EventHandler(this.neverBeAskedToSaveChangesToolStripMenuItem_Click); + // + // toolStripSeparator23 + // + this.toolStripSeparator23.Name = "toolStripSeparator23"; + this.toolStripSeparator23.Size = new System.Drawing.Size(238, 6); + // + // logWindowAsConsoleToolStripMenuItem + // + this.logWindowAsConsoleToolStripMenuItem.Name = "logWindowAsConsoleToolStripMenuItem"; + this.logWindowAsConsoleToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.logWindowAsConsoleToolStripMenuItem.Text = "Log Window as Console"; + this.logWindowAsConsoleToolStripMenuItem.Click += new System.EventHandler(this.logWindowAsConsoleToolStripMenuItem_Click); + // + // frameSkipToolStripMenuItem + // + this.frameSkipToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.miLimitFramerate, this.audioThrottleToolStripMenuItem, this.miDisplayVsync, @@ -1598,255 +1548,255 @@ 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(202, 22); - this.miLimitFramerate.Text = "Clock Throttle"; - this.miLimitFramerate.DropDownOpened += new System.EventHandler(this.miLimitFramerate_DropDownOpened); - this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click); - // - // audioThrottleToolStripMenuItem - // - this.audioThrottleToolStripMenuItem.Name = "audioThrottleToolStripMenuItem"; - this.audioThrottleToolStripMenuItem.Size = new System.Drawing.Size(202, 22); - this.audioThrottleToolStripMenuItem.Text = "Audio Throttle"; - this.audioThrottleToolStripMenuItem.Click += new System.EventHandler(this.audioThrottleToolStripMenuItem_Click); - // - // miDisplayVsync - // - this.miDisplayVsync.Name = "miDisplayVsync"; - this.miDisplayVsync.Size = new System.Drawing.Size(202, 22); - this.miDisplayVsync.Text = "VSync Throttle"; - this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click); - // - // toolStripSeparator27 - // - this.toolStripSeparator27.Name = "toolStripSeparator27"; - this.toolStripSeparator27.Size = new System.Drawing.Size(199, 6); - // - // vSyncEnabledToolStripMenuItem - // - this.vSyncEnabledToolStripMenuItem.Name = "vSyncEnabledToolStripMenuItem"; - this.vSyncEnabledToolStripMenuItem.Size = new System.Drawing.Size(202, 22); - this.vSyncEnabledToolStripMenuItem.Text = "VSync Enabled"; - this.vSyncEnabledToolStripMenuItem.Click += new System.EventHandler(this.vSyncEnabledToolStripMenuItem_Click); - // - // toolStripMenuItem3 - // - this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6); - // - // miAutoMinimizeSkipping - // - this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping"; - this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(202, 22); - this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping"; - this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click); - // - // miFrameskip0 - // - this.miFrameskip0.Name = "miFrameskip0"; - this.miFrameskip0.Size = new System.Drawing.Size(202, 22); - this.miFrameskip0.Text = "0 (never skip)"; - this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click); - // - // miFrameskip1 - // - this.miFrameskip1.Name = "miFrameskip1"; - this.miFrameskip1.Size = new System.Drawing.Size(202, 22); - this.miFrameskip1.Text = "1"; - this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click); - // - // miFrameskip2 - // - this.miFrameskip2.Name = "miFrameskip2"; - this.miFrameskip2.Size = new System.Drawing.Size(202, 22); - this.miFrameskip2.Text = "2"; - this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click); - // - // miFrameskip3 - // - this.miFrameskip3.Name = "miFrameskip3"; - this.miFrameskip3.Size = new System.Drawing.Size(202, 22); - this.miFrameskip3.Text = "3"; - this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click); - // - // miFrameskip4 - // - this.miFrameskip4.Name = "miFrameskip4"; - this.miFrameskip4.Size = new System.Drawing.Size(202, 22); - this.miFrameskip4.Text = "4"; - this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click); - // - // miFrameskip5 - // - this.miFrameskip5.Name = "miFrameskip5"; - this.miFrameskip5.Size = new System.Drawing.Size(202, 22); - this.miFrameskip5.Text = "5"; - this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click); - // - // miFrameskip6 - // - this.miFrameskip6.Name = "miFrameskip6"; - this.miFrameskip6.Size = new System.Drawing.Size(202, 22); - this.miFrameskip6.Text = "6"; - this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click); - // - // miFrameskip7 - // - this.miFrameskip7.Name = "miFrameskip7"; - this.miFrameskip7.Size = new System.Drawing.Size(202, 22); - this.miFrameskip7.Text = "7"; - this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click); - // - // miFrameskip8 - // - this.miFrameskip8.Name = "miFrameskip8"; - this.miFrameskip8.Size = new System.Drawing.Size(202, 22); - this.miFrameskip8.Text = "8"; - this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click); - // - // miFrameskip9 - // - this.miFrameskip9.Name = "miFrameskip9"; - this.miFrameskip9.Size = new System.Drawing.Size(202, 22); - this.miFrameskip9.Text = "9"; - this.miFrameskip9.Click += new System.EventHandler(this.miFrameskip9_Click); - // - // toolStripMenuItem5 - // - this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); - // - // miSpeed50 - // - this.miSpeed50.Name = "miSpeed50"; - this.miSpeed50.Size = new System.Drawing.Size(202, 22); - this.miSpeed50.Text = "Speed 50%"; - this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click); - // - // miSpeed75 - // - this.miSpeed75.Name = "miSpeed75"; - this.miSpeed75.Size = new System.Drawing.Size(202, 22); - this.miSpeed75.Text = "Speed 75%"; - this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click); - // - // miSpeed100 - // - this.miSpeed100.Name = "miSpeed100"; - this.miSpeed100.Size = new System.Drawing.Size(202, 22); - this.miSpeed100.Text = "Speed 100%"; - this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click); - // - // miSpeed150 - // - this.miSpeed150.Name = "miSpeed150"; - this.miSpeed150.Size = new System.Drawing.Size(202, 22); - this.miSpeed150.Text = "Speed 150%"; - this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click); - // - // miSpeed200 - // - this.miSpeed200.Name = "miSpeed200"; - this.miSpeed200.Size = new System.Drawing.Size(202, 22); - this.miSpeed200.Text = "Speed 200%"; - this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click); - // - // keyPriorityToolStripMenuItem - // - this.keyPriorityToolStripMenuItem.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(202, 22); + this.miLimitFramerate.Text = "Clock Throttle"; + this.miLimitFramerate.DropDownOpened += new System.EventHandler(this.miLimitFramerate_DropDownOpened); + this.miLimitFramerate.Click += new System.EventHandler(this.miLimitFramerate_Click); + // + // audioThrottleToolStripMenuItem + // + this.audioThrottleToolStripMenuItem.Name = "audioThrottleToolStripMenuItem"; + this.audioThrottleToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.audioThrottleToolStripMenuItem.Text = "Audio Throttle"; + this.audioThrottleToolStripMenuItem.Click += new System.EventHandler(this.audioThrottleToolStripMenuItem_Click); + // + // miDisplayVsync + // + this.miDisplayVsync.Name = "miDisplayVsync"; + this.miDisplayVsync.Size = new System.Drawing.Size(202, 22); + this.miDisplayVsync.Text = "VSync Throttle"; + this.miDisplayVsync.Click += new System.EventHandler(this.miDisplayVsync_Click); + // + // toolStripSeparator27 + // + this.toolStripSeparator27.Name = "toolStripSeparator27"; + this.toolStripSeparator27.Size = new System.Drawing.Size(199, 6); + // + // vSyncEnabledToolStripMenuItem + // + this.vSyncEnabledToolStripMenuItem.Name = "vSyncEnabledToolStripMenuItem"; + this.vSyncEnabledToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.vSyncEnabledToolStripMenuItem.Text = "VSync Enabled"; + this.vSyncEnabledToolStripMenuItem.Click += new System.EventHandler(this.vSyncEnabledToolStripMenuItem_Click); + // + // toolStripMenuItem3 + // + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(199, 6); + // + // miAutoMinimizeSkipping + // + this.miAutoMinimizeSkipping.Name = "miAutoMinimizeSkipping"; + this.miAutoMinimizeSkipping.Size = new System.Drawing.Size(202, 22); + this.miAutoMinimizeSkipping.Text = "Auto-minimize skipping"; + this.miAutoMinimizeSkipping.Click += new System.EventHandler(this.miAutoMinimizeSkipping_Click); + // + // miFrameskip0 + // + this.miFrameskip0.Name = "miFrameskip0"; + this.miFrameskip0.Size = new System.Drawing.Size(202, 22); + this.miFrameskip0.Text = "0 (never skip)"; + this.miFrameskip0.Click += new System.EventHandler(this.miFrameskip0_Click); + // + // miFrameskip1 + // + this.miFrameskip1.Name = "miFrameskip1"; + this.miFrameskip1.Size = new System.Drawing.Size(202, 22); + this.miFrameskip1.Text = "1"; + this.miFrameskip1.Click += new System.EventHandler(this.miFrameskip1_Click); + // + // miFrameskip2 + // + this.miFrameskip2.Name = "miFrameskip2"; + this.miFrameskip2.Size = new System.Drawing.Size(202, 22); + this.miFrameskip2.Text = "2"; + this.miFrameskip2.Click += new System.EventHandler(this.miFrameskip2_Click); + // + // miFrameskip3 + // + this.miFrameskip3.Name = "miFrameskip3"; + this.miFrameskip3.Size = new System.Drawing.Size(202, 22); + this.miFrameskip3.Text = "3"; + this.miFrameskip3.Click += new System.EventHandler(this.miFrameskip3_Click); + // + // miFrameskip4 + // + this.miFrameskip4.Name = "miFrameskip4"; + this.miFrameskip4.Size = new System.Drawing.Size(202, 22); + this.miFrameskip4.Text = "4"; + this.miFrameskip4.Click += new System.EventHandler(this.miFrameskip4_Click); + // + // miFrameskip5 + // + this.miFrameskip5.Name = "miFrameskip5"; + this.miFrameskip5.Size = new System.Drawing.Size(202, 22); + this.miFrameskip5.Text = "5"; + this.miFrameskip5.Click += new System.EventHandler(this.miFrameskip5_Click); + // + // miFrameskip6 + // + this.miFrameskip6.Name = "miFrameskip6"; + this.miFrameskip6.Size = new System.Drawing.Size(202, 22); + this.miFrameskip6.Text = "6"; + this.miFrameskip6.Click += new System.EventHandler(this.miFrameskip6_Click); + // + // miFrameskip7 + // + this.miFrameskip7.Name = "miFrameskip7"; + this.miFrameskip7.Size = new System.Drawing.Size(202, 22); + this.miFrameskip7.Text = "7"; + this.miFrameskip7.Click += new System.EventHandler(this.miFrameskip7_Click); + // + // miFrameskip8 + // + this.miFrameskip8.Name = "miFrameskip8"; + this.miFrameskip8.Size = new System.Drawing.Size(202, 22); + this.miFrameskip8.Text = "8"; + this.miFrameskip8.Click += new System.EventHandler(this.miFrameskip8_Click); + // + // miFrameskip9 + // + this.miFrameskip9.Name = "miFrameskip9"; + this.miFrameskip9.Size = new System.Drawing.Size(202, 22); + this.miFrameskip9.Text = "9"; + this.miFrameskip9.Click += new System.EventHandler(this.miFrameskip9_Click); + // + // toolStripMenuItem5 + // + this.toolStripMenuItem5.Name = "toolStripMenuItem5"; + this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); + // + // miSpeed50 + // + this.miSpeed50.Name = "miSpeed50"; + this.miSpeed50.Size = new System.Drawing.Size(202, 22); + this.miSpeed50.Text = "Speed 50%"; + this.miSpeed50.Click += new System.EventHandler(this.miSpeed50_Click); + // + // miSpeed75 + // + this.miSpeed75.Name = "miSpeed75"; + this.miSpeed75.Size = new System.Drawing.Size(202, 22); + this.miSpeed75.Text = "Speed 75%"; + this.miSpeed75.Click += new System.EventHandler(this.miSpeed75_Click); + // + // miSpeed100 + // + this.miSpeed100.Name = "miSpeed100"; + this.miSpeed100.Size = new System.Drawing.Size(202, 22); + this.miSpeed100.Text = "Speed 100%"; + this.miSpeed100.Click += new System.EventHandler(this.miSpeed100_Click); + // + // miSpeed150 + // + this.miSpeed150.Name = "miSpeed150"; + this.miSpeed150.Size = new System.Drawing.Size(202, 22); + this.miSpeed150.Text = "Speed 150%"; + this.miSpeed150.Click += new System.EventHandler(this.miSpeed150_Click); + // + // miSpeed200 + // + this.miSpeed200.Name = "miSpeed200"; + this.miSpeed200.Size = new System.Drawing.Size(202, 22); + this.miSpeed200.Text = "Speed 200%"; + this.miSpeed200.Click += new System.EventHandler(this.miSpeed200_Click); + // + // keyPriorityToolStripMenuItem + // + this.keyPriorityToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bothHotkeysAndControllersToolStripMenuItem, this.inputOverridesHotkeysToolStripMenuItem, this.hotkeysOverrideInputToolStripMenuItem}); - this.keyPriorityToolStripMenuItem.Name = "keyPriorityToolStripMenuItem"; - this.keyPriorityToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.keyPriorityToolStripMenuItem.Text = "Key Priority"; - this.keyPriorityToolStripMenuItem.DropDownOpened += new System.EventHandler(this.keyPriorityToolStripMenuItem_DropDownOpened); - // - // bothHotkeysAndControllersToolStripMenuItem - // - this.bothHotkeysAndControllersToolStripMenuItem.Name = "bothHotkeysAndControllersToolStripMenuItem"; - this.bothHotkeysAndControllersToolStripMenuItem.Size = new System.Drawing.Size(229, 22); - this.bothHotkeysAndControllersToolStripMenuItem.Text = "Both Hotkeys and Controllers"; - this.bothHotkeysAndControllersToolStripMenuItem.Click += new System.EventHandler(this.bothHotkeysAndControllersToolStripMenuItem_Click); - // - // inputOverridesHotkeysToolStripMenuItem - // - this.inputOverridesHotkeysToolStripMenuItem.Name = "inputOverridesHotkeysToolStripMenuItem"; - this.inputOverridesHotkeysToolStripMenuItem.Size = new System.Drawing.Size(229, 22); - this.inputOverridesHotkeysToolStripMenuItem.Text = "Input overrides Hotkeys"; - this.inputOverridesHotkeysToolStripMenuItem.Click += new System.EventHandler(this.inputOverridesHotkeysToolStripMenuItem_Click); - // - // hotkeysOverrideInputToolStripMenuItem - // - this.hotkeysOverrideInputToolStripMenuItem.Name = "hotkeysOverrideInputToolStripMenuItem"; - this.hotkeysOverrideInputToolStripMenuItem.Size = new System.Drawing.Size(229, 22); - this.hotkeysOverrideInputToolStripMenuItem.Text = "Hotkeys override Input"; - this.hotkeysOverrideInputToolStripMenuItem.Click += new System.EventHandler(this.hotkeysOverrideInputToolStripMenuItem_Click); - // - // savestateTypeToolStripMenuItem - // - this.savestateTypeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.keyPriorityToolStripMenuItem.Name = "keyPriorityToolStripMenuItem"; + this.keyPriorityToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.keyPriorityToolStripMenuItem.Text = "Key Priority"; + this.keyPriorityToolStripMenuItem.DropDownOpened += new System.EventHandler(this.keyPriorityToolStripMenuItem_DropDownOpened); + // + // bothHotkeysAndControllersToolStripMenuItem + // + this.bothHotkeysAndControllersToolStripMenuItem.Name = "bothHotkeysAndControllersToolStripMenuItem"; + this.bothHotkeysAndControllersToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.bothHotkeysAndControllersToolStripMenuItem.Text = "Both Hotkeys and Controllers"; + this.bothHotkeysAndControllersToolStripMenuItem.Click += new System.EventHandler(this.bothHotkeysAndControllersToolStripMenuItem_Click); + // + // inputOverridesHotkeysToolStripMenuItem + // + this.inputOverridesHotkeysToolStripMenuItem.Name = "inputOverridesHotkeysToolStripMenuItem"; + this.inputOverridesHotkeysToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.inputOverridesHotkeysToolStripMenuItem.Text = "Input overrides Hotkeys"; + this.inputOverridesHotkeysToolStripMenuItem.Click += new System.EventHandler(this.inputOverridesHotkeysToolStripMenuItem_Click); + // + // hotkeysOverrideInputToolStripMenuItem + // + this.hotkeysOverrideInputToolStripMenuItem.Name = "hotkeysOverrideInputToolStripMenuItem"; + this.hotkeysOverrideInputToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.hotkeysOverrideInputToolStripMenuItem.Text = "Hotkeys override Input"; + this.hotkeysOverrideInputToolStripMenuItem.Click += new System.EventHandler(this.hotkeysOverrideInputToolStripMenuItem_Click); + // + // savestateTypeToolStripMenuItem + // + this.savestateTypeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.defaultToolStripMenuItem, this.binaryToolStripMenuItem, this.textToolStripMenuItem}); - this.savestateTypeToolStripMenuItem.Name = "savestateTypeToolStripMenuItem"; - this.savestateTypeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.savestateTypeToolStripMenuItem.Text = "Savestate Type"; - this.savestateTypeToolStripMenuItem.DropDownOpened += new System.EventHandler(this.savestateTypeToolStripMenuItem_DropDownOpened); - // - // defaultToolStripMenuItem - // - this.defaultToolStripMenuItem.Name = "defaultToolStripMenuItem"; - this.defaultToolStripMenuItem.Size = new System.Drawing.Size(112, 22); - this.defaultToolStripMenuItem.Text = "Default"; - this.defaultToolStripMenuItem.Click += new System.EventHandler(this.defaultToolStripMenuItem_Click); - // - // binaryToolStripMenuItem - // - this.binaryToolStripMenuItem.Name = "binaryToolStripMenuItem"; - this.binaryToolStripMenuItem.Size = new System.Drawing.Size(112, 22); - this.binaryToolStripMenuItem.Text = "Binary"; - this.binaryToolStripMenuItem.Click += new System.EventHandler(this.binaryToolStripMenuItem_Click); - // - // textToolStripMenuItem - // - this.textToolStripMenuItem.Name = "textToolStripMenuItem"; - this.textToolStripMenuItem.Size = new System.Drawing.Size(112, 22); - this.textToolStripMenuItem.Text = "Text"; - this.textToolStripMenuItem.Click += new System.EventHandler(this.textToolStripMenuItem_Click); - // - // toolStripSeparator10 - // - this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(149, 6); - // - // saveConfigToolStripMenuItem - // - this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save; - this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; - this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.saveConfigToolStripMenuItem.Text = "Save Config"; - this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); - // - // loadConfigToolStripMenuItem - // - this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; - this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; - this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.loadConfigToolStripMenuItem.Text = "Load Config"; - this.loadConfigToolStripMenuItem.Click += new System.EventHandler(this.loadConfigToolStripMenuItem_Click); - // - // toolsToolStripMenuItem - // - this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.savestateTypeToolStripMenuItem.Name = "savestateTypeToolStripMenuItem"; + this.savestateTypeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.savestateTypeToolStripMenuItem.Text = "Savestate Type"; + this.savestateTypeToolStripMenuItem.DropDownOpened += new System.EventHandler(this.savestateTypeToolStripMenuItem_DropDownOpened); + // + // defaultToolStripMenuItem + // + this.defaultToolStripMenuItem.Name = "defaultToolStripMenuItem"; + this.defaultToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.defaultToolStripMenuItem.Text = "Default"; + this.defaultToolStripMenuItem.Click += new System.EventHandler(this.defaultToolStripMenuItem_Click); + // + // binaryToolStripMenuItem + // + this.binaryToolStripMenuItem.Name = "binaryToolStripMenuItem"; + this.binaryToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.binaryToolStripMenuItem.Text = "Binary"; + this.binaryToolStripMenuItem.Click += new System.EventHandler(this.binaryToolStripMenuItem_Click); + // + // textToolStripMenuItem + // + this.textToolStripMenuItem.Name = "textToolStripMenuItem"; + this.textToolStripMenuItem.Size = new System.Drawing.Size(112, 22); + this.textToolStripMenuItem.Text = "Text"; + this.textToolStripMenuItem.Click += new System.EventHandler(this.textToolStripMenuItem_Click); + // + // toolStripSeparator10 + // + this.toolStripSeparator10.Name = "toolStripSeparator10"; + this.toolStripSeparator10.Size = new System.Drawing.Size(149, 6); + // + // saveConfigToolStripMenuItem + // + this.saveConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Save; + this.saveConfigToolStripMenuItem.Name = "saveConfigToolStripMenuItem"; + this.saveConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveConfigToolStripMenuItem.Text = "Save Config"; + this.saveConfigToolStripMenuItem.Click += new System.EventHandler(this.saveConfigToolStripMenuItem_Click); + // + // loadConfigToolStripMenuItem + // + this.loadConfigToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.LoadConfig; + this.loadConfigToolStripMenuItem.Name = "loadConfigToolStripMenuItem"; + this.loadConfigToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.loadConfigToolStripMenuItem.Text = "Load Config"; + this.loadConfigToolStripMenuItem.Click += new System.EventHandler(this.loadConfigToolStripMenuItem_Click); + // + // toolsToolStripMenuItem + // + this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolBoxToolStripMenuItem, this.toolStripSeparator12, this.rAMWatchToolStripMenuItem, @@ -1862,124 +1812,124 @@ this.toolStripSeparator29, this.createDualGBXMLToolStripMenuItem, this.newRamWatchToolStripMenuItem}); - this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); - this.toolsToolStripMenuItem.Text = "&Tools"; - this.toolsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpened); - // - // toolBoxToolStripMenuItem - // - this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; - this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; - this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.toolBoxToolStripMenuItem.Text = "&Tool Box"; - this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); - // - // toolStripSeparator12 - // - this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(186, 6); - // - // rAMWatchToolStripMenuItem - // - this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; - this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; - this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; - this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); - // - // rAMSearchToolStripMenuItem - // - this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; - this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; - this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; - this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); - // - // rAMPokeToolStripMenuItem - // - this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; - this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; - this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; - this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); - // - // hexEditorToolStripMenuItem - // - this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; - this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; - this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; - this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); - // - // traceLoggerToolStripMenuItem - // - this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; - this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; - this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; - this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); - // - // tAStudioToolStripMenuItem - // - this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; - this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; - this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.tAStudioToolStripMenuItem.Text = "&TAStudio"; - this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); - // - // virtualPadToolStripMenuItem - // - this.virtualPadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; - this.virtualPadToolStripMenuItem.Name = "virtualPadToolStripMenuItem"; - this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.virtualPadToolStripMenuItem.Text = "Virtual Pad"; - this.virtualPadToolStripMenuItem.Click += new System.EventHandler(this.virtualPadToolStripMenuItem_Click); - // - // toolStripSeparator11 - // - this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(186, 6); - // - // luaConsoleToolStripMenuItem - // - this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; - this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; - this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.luaConsoleToolStripMenuItem.Text = "Lua Console"; - this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); - // - // cheatsToolStripMenuItem - // - this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; - this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.cheatsToolStripMenuItem.Text = "Cheats"; - this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); - // - // toolStripSeparator29 - // - this.toolStripSeparator29.Name = "toolStripSeparator29"; - this.toolStripSeparator29.Size = new System.Drawing.Size(186, 6); - // - // createDualGBXMLToolStripMenuItem - // - this.createDualGBXMLToolStripMenuItem.Name = "createDualGBXMLToolStripMenuItem"; - this.createDualGBXMLToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.createDualGBXMLToolStripMenuItem.Text = "Create Dual GB XML..."; - this.createDualGBXMLToolStripMenuItem.Click += new System.EventHandler(this.createDualGBXMLToolStripMenuItem_Click); - // - // newRamWatchToolStripMenuItem - // - this.newRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; - this.newRamWatchToolStripMenuItem.Name = "newRamWatchToolStripMenuItem"; - this.newRamWatchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); - this.newRamWatchToolStripMenuItem.Text = "New Ram Watch"; - this.newRamWatchToolStripMenuItem.Click += new System.EventHandler(this.newRamWatchToolStripMenuItem_Click); - // - // NESToolStripMenuItem - // - this.NESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(48, 19); + this.toolsToolStripMenuItem.Text = "&Tools"; + this.toolsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolsToolStripMenuItem_DropDownOpened); + // + // toolBoxToolStripMenuItem + // + this.toolBoxToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.ToolBox; + this.toolBoxToolStripMenuItem.Name = "toolBoxToolStripMenuItem"; + this.toolBoxToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.toolBoxToolStripMenuItem.Text = "&Tool Box"; + this.toolBoxToolStripMenuItem.Click += new System.EventHandler(this.toolBoxToolStripMenuItem_Click); + // + // toolStripSeparator12 + // + this.toolStripSeparator12.Name = "toolStripSeparator12"; + this.toolStripSeparator12.Size = new System.Drawing.Size(186, 6); + // + // rAMWatchToolStripMenuItem + // + this.rAMWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.rAMWatchToolStripMenuItem.Name = "rAMWatchToolStripMenuItem"; + this.rAMWatchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.rAMWatchToolStripMenuItem.Text = "RAM &Watch"; + this.rAMWatchToolStripMenuItem.Click += new System.EventHandler(this.RAMWatchToolStripMenuItem_Click); + // + // rAMSearchToolStripMenuItem + // + this.rAMSearchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.search; + this.rAMSearchToolStripMenuItem.Name = "rAMSearchToolStripMenuItem"; + this.rAMSearchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.rAMSearchToolStripMenuItem.Text = "RAM &Search"; + this.rAMSearchToolStripMenuItem.Click += new System.EventHandler(this.rAMSearchToolStripMenuItem_Click); + // + // rAMPokeToolStripMenuItem + // + this.rAMPokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.rAMPokeToolStripMenuItem.Name = "rAMPokeToolStripMenuItem"; + this.rAMPokeToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.rAMPokeToolStripMenuItem.Text = "RAM &Poke"; + this.rAMPokeToolStripMenuItem.Click += new System.EventHandler(this.RAMPokeToolStripMenuItem_Click); + // + // hexEditorToolStripMenuItem + // + this.hexEditorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; + this.hexEditorToolStripMenuItem.Name = "hexEditorToolStripMenuItem"; + this.hexEditorToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.hexEditorToolStripMenuItem.Text = "&Hex Editor"; + this.hexEditorToolStripMenuItem.Click += new System.EventHandler(this.hexEditorToolStripMenuItem_Click); + // + // traceLoggerToolStripMenuItem + // + this.traceLoggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.pencil; + this.traceLoggerToolStripMenuItem.Name = "traceLoggerToolStripMenuItem"; + this.traceLoggerToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.traceLoggerToolStripMenuItem.Text = "Trace &Logger"; + this.traceLoggerToolStripMenuItem.Click += new System.EventHandler(this.traceLoggerToolStripMenuItem_Click); + // + // tAStudioToolStripMenuItem + // + this.tAStudioToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; + this.tAStudioToolStripMenuItem.Name = "tAStudioToolStripMenuItem"; + this.tAStudioToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.tAStudioToolStripMenuItem.Text = "&TAStudio"; + this.tAStudioToolStripMenuItem.Click += new System.EventHandler(this.tAStudioToolStripMenuItem_Click); + // + // virtualPadToolStripMenuItem + // + this.virtualPadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; + this.virtualPadToolStripMenuItem.Name = "virtualPadToolStripMenuItem"; + this.virtualPadToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.virtualPadToolStripMenuItem.Text = "Virtual Pad"; + this.virtualPadToolStripMenuItem.Click += new System.EventHandler(this.virtualPadToolStripMenuItem_Click); + // + // toolStripSeparator11 + // + this.toolStripSeparator11.Name = "toolStripSeparator11"; + this.toolStripSeparator11.Size = new System.Drawing.Size(186, 6); + // + // luaConsoleToolStripMenuItem + // + this.luaConsoleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Lua; + this.luaConsoleToolStripMenuItem.Name = "luaConsoleToolStripMenuItem"; + this.luaConsoleToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.luaConsoleToolStripMenuItem.Text = "Lua Console"; + this.luaConsoleToolStripMenuItem.Click += new System.EventHandler(this.luaConsoleToolStripMenuItem_Click); + // + // cheatsToolStripMenuItem + // + this.cheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; + this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.cheatsToolStripMenuItem.Text = "Cheats"; + this.cheatsToolStripMenuItem.Click += new System.EventHandler(this.cheatsToolStripMenuItem_Click); + // + // toolStripSeparator29 + // + this.toolStripSeparator29.Name = "toolStripSeparator29"; + this.toolStripSeparator29.Size = new System.Drawing.Size(186, 6); + // + // createDualGBXMLToolStripMenuItem + // + this.createDualGBXMLToolStripMenuItem.Name = "createDualGBXMLToolStripMenuItem"; + this.createDualGBXMLToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.createDualGBXMLToolStripMenuItem.Text = "Create Dual GB XML..."; + this.createDualGBXMLToolStripMenuItem.Click += new System.EventHandler(this.createDualGBXMLToolStripMenuItem_Click); + // + // newRamWatchToolStripMenuItem + // + this.newRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; + this.newRamWatchToolStripMenuItem.Name = "newRamWatchToolStripMenuItem"; + this.newRamWatchToolStripMenuItem.Size = new System.Drawing.Size(189, 22); + this.newRamWatchToolStripMenuItem.Text = "New Ram Watch"; + this.newRamWatchToolStripMenuItem.Click += new System.EventHandler(this.newRamWatchToolStripMenuItem_Click); + // + // NESToolStripMenuItem + // + this.NESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.debuggerToolStripMenuItem, this.pPUViewerToolStripMenuItem, this.nametableViewerToolStripMenuItem, @@ -1988,121 +1938,121 @@ this.graphicsSettingsToolStripMenuItem, this.soundChannelsToolStripMenuItem, this.nESSpeicalToolStripMenuItem}); - this.NESToolStripMenuItem.Name = "NESToolStripMenuItem"; - this.NESToolStripMenuItem.Size = new System.Drawing.Size(40, 19); - this.NESToolStripMenuItem.Text = "&NES"; - // - // debuggerToolStripMenuItem - // - this.debuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; - this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem"; - this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.debuggerToolStripMenuItem.Text = "&Debugger"; - this.debuggerToolStripMenuItem.Click += new System.EventHandler(this.debuggerToolStripMenuItem_Click); - // - // pPUViewerToolStripMenuItem - // - this.pPUViewerToolStripMenuItem.Name = "pPUViewerToolStripMenuItem"; - this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.pPUViewerToolStripMenuItem.Text = "&PPU Viewer"; - this.pPUViewerToolStripMenuItem.Click += new System.EventHandler(this.PPUViewerToolStripMenuItem_Click); - // - // nametableViewerToolStripMenuItem - // - this.nametableViewerToolStripMenuItem.Name = "nametableViewerToolStripMenuItem"; - this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.nametableViewerToolStripMenuItem.Text = "&Nametable Viewer"; - this.nametableViewerToolStripMenuItem.Click += new System.EventHandler(this.nametableViewerToolStripMenuItem_Click); - // - // gameGenieCodesToolStripMenuItem - // - this.gameGenieCodesToolStripMenuItem.Name = "gameGenieCodesToolStripMenuItem"; - this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.gameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; - this.gameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.gameGenieCodesToolStripMenuItem_Click); - // - // toolStripSeparator17 - // - this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6); - // - // graphicsSettingsToolStripMenuItem - // - this.graphicsSettingsToolStripMenuItem.Name = "graphicsSettingsToolStripMenuItem"; - this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.graphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; - this.graphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.graphicsSettingsToolStripMenuItem_Click); - // - // soundChannelsToolStripMenuItem - // - this.soundChannelsToolStripMenuItem.Name = "soundChannelsToolStripMenuItem"; - this.soundChannelsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.soundChannelsToolStripMenuItem.Text = "Sound Channels"; - this.soundChannelsToolStripMenuItem.Click += new System.EventHandler(this.soundChannelsToolStripMenuItem_Click); - // - // nESSpeicalToolStripMenuItem - // - this.nESSpeicalToolStripMenuItem.Name = "nESSpeicalToolStripMenuItem"; - this.nESSpeicalToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.nESSpeicalToolStripMenuItem.Text = "Special Controls"; - // - // pCEToolStripMenuItem - // - this.pCEToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.NESToolStripMenuItem.Name = "NESToolStripMenuItem"; + this.NESToolStripMenuItem.Size = new System.Drawing.Size(40, 19); + this.NESToolStripMenuItem.Text = "&NES"; + // + // debuggerToolStripMenuItem + // + this.debuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; + this.debuggerToolStripMenuItem.Name = "debuggerToolStripMenuItem"; + this.debuggerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.debuggerToolStripMenuItem.Text = "&Debugger"; + this.debuggerToolStripMenuItem.Click += new System.EventHandler(this.debuggerToolStripMenuItem_Click); + // + // pPUViewerToolStripMenuItem + // + this.pPUViewerToolStripMenuItem.Name = "pPUViewerToolStripMenuItem"; + this.pPUViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.pPUViewerToolStripMenuItem.Text = "&PPU Viewer"; + this.pPUViewerToolStripMenuItem.Click += new System.EventHandler(this.PPUViewerToolStripMenuItem_Click); + // + // nametableViewerToolStripMenuItem + // + this.nametableViewerToolStripMenuItem.Name = "nametableViewerToolStripMenuItem"; + this.nametableViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.nametableViewerToolStripMenuItem.Text = "&Nametable Viewer"; + this.nametableViewerToolStripMenuItem.Click += new System.EventHandler(this.nametableViewerToolStripMenuItem_Click); + // + // gameGenieCodesToolStripMenuItem + // + this.gameGenieCodesToolStripMenuItem.Name = "gameGenieCodesToolStripMenuItem"; + this.gameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.gameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; + this.gameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.gameGenieCodesToolStripMenuItem_Click); + // + // toolStripSeparator17 + // + this.toolStripSeparator17.Name = "toolStripSeparator17"; + this.toolStripSeparator17.Size = new System.Drawing.Size(230, 6); + // + // graphicsSettingsToolStripMenuItem + // + this.graphicsSettingsToolStripMenuItem.Name = "graphicsSettingsToolStripMenuItem"; + this.graphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.graphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; + this.graphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.graphicsSettingsToolStripMenuItem_Click); + // + // soundChannelsToolStripMenuItem + // + this.soundChannelsToolStripMenuItem.Name = "soundChannelsToolStripMenuItem"; + this.soundChannelsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.soundChannelsToolStripMenuItem.Text = "Sound Channels"; + this.soundChannelsToolStripMenuItem.Click += new System.EventHandler(this.soundChannelsToolStripMenuItem_Click); + // + // nESSpeicalToolStripMenuItem + // + this.nESSpeicalToolStripMenuItem.Name = "nESSpeicalToolStripMenuItem"; + this.nESSpeicalToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.nESSpeicalToolStripMenuItem.Text = "Special Controls"; + // + // pCEToolStripMenuItem + // + this.pCEToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pceBGViewerToolStripMenuItem, this.toolStripSeparator25, this.pceAlwaysPerformSpriteLimitToolStripMenuItem, this.pceAlwaysEqualizeVolumesToolStripMenuItem, this.pceArcadeCardRewindEnableHackToolStripMenuItem, this.pceGraphicsSettingsToolStripMenuItem}); - this.pCEToolStripMenuItem.Name = "pCEToolStripMenuItem"; - this.pCEToolStripMenuItem.Size = new System.Drawing.Size(40, 19); - this.pCEToolStripMenuItem.Text = "&PCE"; - this.pCEToolStripMenuItem.DropDownOpened += new System.EventHandler(this.pCEToolStripMenuItem_DropDownOpened); - // - // pceBGViewerToolStripMenuItem - // - this.pceBGViewerToolStripMenuItem.Name = "pceBGViewerToolStripMenuItem"; - this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(259, 22); - this.pceBGViewerToolStripMenuItem.Text = "&BG Viewer"; - this.pceBGViewerToolStripMenuItem.Click += new System.EventHandler(this.justatestToolStripMenuItem_Click); - // - // toolStripSeparator25 - // - this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(256, 6); - // - // pceAlwaysPerformSpriteLimitToolStripMenuItem - // - this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Name = "pceAlwaysPerformSpriteLimitToolStripMenuItem"; - this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(259, 22); - this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Text = "Always Perform Sprite Limit"; - this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.pceAlwaysPerformSpriteLimitToolStripMenuItem_Click); - // - // pceAlwaysEqualizeVolumesToolStripMenuItem - // - this.pceAlwaysEqualizeVolumesToolStripMenuItem.Name = "pceAlwaysEqualizeVolumesToolStripMenuItem"; - this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(259, 22); - this.pceAlwaysEqualizeVolumesToolStripMenuItem.Text = "Always Equalize Volumes (PCE-CD)"; - this.pceAlwaysEqualizeVolumesToolStripMenuItem.Click += new System.EventHandler(this.pceAlwayEqualizeVolumesLimitToolStripMenuItem_Click); - // - // pceArcadeCardRewindEnableHackToolStripMenuItem - // - this.pceArcadeCardRewindEnableHackToolStripMenuItem.Name = "pceArcadeCardRewindEnableHackToolStripMenuItem"; - this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(259, 22); - this.pceArcadeCardRewindEnableHackToolStripMenuItem.Text = "Arcade Card Rewind-Enable Hack"; - this.pceArcadeCardRewindEnableHackToolStripMenuItem.Click += new System.EventHandler(this.pceArcadeCardRewindEnableHackToolStripMenuItem_Click); - // - // pceGraphicsSettingsToolStripMenuItem - // - this.pceGraphicsSettingsToolStripMenuItem.Name = "pceGraphicsSettingsToolStripMenuItem"; - this.pceGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(259, 22); - this.pceGraphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; - this.pceGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.pceGraphicsSettingsToolStripMenuItem_Click); - // - // sMSToolStripMenuItem - // - this.sMSToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.pCEToolStripMenuItem.Name = "pCEToolStripMenuItem"; + this.pCEToolStripMenuItem.Size = new System.Drawing.Size(40, 19); + this.pCEToolStripMenuItem.Text = "&PCE"; + this.pCEToolStripMenuItem.DropDownOpened += new System.EventHandler(this.pCEToolStripMenuItem_DropDownOpened); + // + // pceBGViewerToolStripMenuItem + // + this.pceBGViewerToolStripMenuItem.Name = "pceBGViewerToolStripMenuItem"; + this.pceBGViewerToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceBGViewerToolStripMenuItem.Text = "&BG Viewer"; + this.pceBGViewerToolStripMenuItem.Click += new System.EventHandler(this.justatestToolStripMenuItem_Click); + // + // toolStripSeparator25 + // + this.toolStripSeparator25.Name = "toolStripSeparator25"; + this.toolStripSeparator25.Size = new System.Drawing.Size(256, 6); + // + // pceAlwaysPerformSpriteLimitToolStripMenuItem + // + this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Name = "pceAlwaysPerformSpriteLimitToolStripMenuItem"; + this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Text = "Always Perform Sprite Limit"; + this.pceAlwaysPerformSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.pceAlwaysPerformSpriteLimitToolStripMenuItem_Click); + // + // pceAlwaysEqualizeVolumesToolStripMenuItem + // + this.pceAlwaysEqualizeVolumesToolStripMenuItem.Name = "pceAlwaysEqualizeVolumesToolStripMenuItem"; + this.pceAlwaysEqualizeVolumesToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceAlwaysEqualizeVolumesToolStripMenuItem.Text = "Always Equalize Volumes (PCE-CD)"; + this.pceAlwaysEqualizeVolumesToolStripMenuItem.Click += new System.EventHandler(this.pceAlwayEqualizeVolumesLimitToolStripMenuItem_Click); + // + // pceArcadeCardRewindEnableHackToolStripMenuItem + // + this.pceArcadeCardRewindEnableHackToolStripMenuItem.Name = "pceArcadeCardRewindEnableHackToolStripMenuItem"; + this.pceArcadeCardRewindEnableHackToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceArcadeCardRewindEnableHackToolStripMenuItem.Text = "Arcade Card Rewind-Enable Hack"; + this.pceArcadeCardRewindEnableHackToolStripMenuItem.Click += new System.EventHandler(this.pceArcadeCardRewindEnableHackToolStripMenuItem_Click); + // + // pceGraphicsSettingsToolStripMenuItem + // + this.pceGraphicsSettingsToolStripMenuItem.Name = "pceGraphicsSettingsToolStripMenuItem"; + this.pceGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(259, 22); + this.pceGraphicsSettingsToolStripMenuItem.Text = "Graphics Settings"; + this.pceGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.pceGraphicsSettingsToolStripMenuItem_Click); + // + // sMSToolStripMenuItem + // + this.sMSToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.smsEnableFMChipToolStripMenuItem, this.smsOverclockWhenKnownSafeToolStripMenuItem, this.smsForceStereoSeparationToolStripMenuItem, @@ -2112,108 +2062,108 @@ this.toolStripSeparator24, this.smsGraphicsSettingsToolStripMenuItem, this.GGgameGenieEncoderDecoderToolStripMenuItem}); - this.sMSToolStripMenuItem.Name = "sMSToolStripMenuItem"; - this.sMSToolStripMenuItem.Size = new System.Drawing.Size(42, 19); - this.sMSToolStripMenuItem.Text = "&SMS"; - this.sMSToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sMSToolStripMenuItem_DropDownOpened); - // - // smsEnableFMChipToolStripMenuItem - // - this.smsEnableFMChipToolStripMenuItem.Name = "smsEnableFMChipToolStripMenuItem"; - this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.smsEnableFMChipToolStripMenuItem.Text = "&Enable FM Chip"; - this.smsEnableFMChipToolStripMenuItem.Click += new System.EventHandler(this.smsEnableFMChipToolStripMenuItem_Click); - // - // smsOverclockWhenKnownSafeToolStripMenuItem - // - this.smsOverclockWhenKnownSafeToolStripMenuItem.Name = "smsOverclockWhenKnownSafeToolStripMenuItem"; - this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.smsOverclockWhenKnownSafeToolStripMenuItem.Text = "&Overclock when Known Safe"; - this.smsOverclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.smsOverclockWhenKnownSafeToolStripMenuItem_Click); - // - // smsForceStereoSeparationToolStripMenuItem - // - this.smsForceStereoSeparationToolStripMenuItem.Name = "smsForceStereoSeparationToolStripMenuItem"; - this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.smsForceStereoSeparationToolStripMenuItem.Text = "&Force Stereo Separation"; - this.smsForceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.smsForceStereoSeparationToolStripMenuItem_Click); - // - // smsSpriteLimitToolStripMenuItem - // - this.smsSpriteLimitToolStripMenuItem.Name = "smsSpriteLimitToolStripMenuItem"; - this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.smsSpriteLimitToolStripMenuItem.Text = "Sprite &Limit"; - this.smsSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.smsSpriteLimitToolStripMenuItem_Click); - // - // showClippedRegionsToolStripMenuItem - // - this.showClippedRegionsToolStripMenuItem.Name = "showClippedRegionsToolStripMenuItem"; - this.showClippedRegionsToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.showClippedRegionsToolStripMenuItem.Text = "&Show Clipped Regions"; - this.showClippedRegionsToolStripMenuItem.Click += new System.EventHandler(this.showClippedRegionsToolStripMenuItem_Click); - // - // highlightActiveDisplayRegionToolStripMenuItem - // - this.highlightActiveDisplayRegionToolStripMenuItem.Name = "highlightActiveDisplayRegionToolStripMenuItem"; - this.highlightActiveDisplayRegionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.highlightActiveDisplayRegionToolStripMenuItem.Text = "&Highlight Active Display Region"; - this.highlightActiveDisplayRegionToolStripMenuItem.Click += new System.EventHandler(this.highlightActiveDisplayRegionToolStripMenuItem_Click); - // - // toolStripSeparator24 - // - this.toolStripSeparator24.Name = "toolStripSeparator24"; - this.toolStripSeparator24.Size = new System.Drawing.Size(238, 6); - // - // smsGraphicsSettingsToolStripMenuItem - // - this.smsGraphicsSettingsToolStripMenuItem.Name = "smsGraphicsSettingsToolStripMenuItem"; - this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.smsGraphicsSettingsToolStripMenuItem.Text = "&Graphics Settings..."; - this.smsGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.smsGraphicsSettingsToolStripMenuItem_Click); - // - // GGgameGenieEncoderDecoderToolStripMenuItem - // - this.GGgameGenieEncoderDecoderToolStripMenuItem.Name = "GGgameGenieEncoderDecoderToolStripMenuItem"; - this.GGgameGenieEncoderDecoderToolStripMenuItem.Size = new System.Drawing.Size(241, 22); - this.GGgameGenieEncoderDecoderToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; - this.GGgameGenieEncoderDecoderToolStripMenuItem.Click += new System.EventHandler(this.GGgameGenieEncoderDecoderToolStripMenuItem_Click); - // - // tI83ToolStripMenuItem - // - this.tI83ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.sMSToolStripMenuItem.Name = "sMSToolStripMenuItem"; + this.sMSToolStripMenuItem.Size = new System.Drawing.Size(42, 19); + this.sMSToolStripMenuItem.Text = "&SMS"; + this.sMSToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sMSToolStripMenuItem_DropDownOpened); + // + // smsEnableFMChipToolStripMenuItem + // + this.smsEnableFMChipToolStripMenuItem.Name = "smsEnableFMChipToolStripMenuItem"; + this.smsEnableFMChipToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsEnableFMChipToolStripMenuItem.Text = "&Enable FM Chip"; + this.smsEnableFMChipToolStripMenuItem.Click += new System.EventHandler(this.smsEnableFMChipToolStripMenuItem_Click); + // + // smsOverclockWhenKnownSafeToolStripMenuItem + // + this.smsOverclockWhenKnownSafeToolStripMenuItem.Name = "smsOverclockWhenKnownSafeToolStripMenuItem"; + this.smsOverclockWhenKnownSafeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsOverclockWhenKnownSafeToolStripMenuItem.Text = "&Overclock when Known Safe"; + this.smsOverclockWhenKnownSafeToolStripMenuItem.Click += new System.EventHandler(this.smsOverclockWhenKnownSafeToolStripMenuItem_Click); + // + // smsForceStereoSeparationToolStripMenuItem + // + this.smsForceStereoSeparationToolStripMenuItem.Name = "smsForceStereoSeparationToolStripMenuItem"; + this.smsForceStereoSeparationToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsForceStereoSeparationToolStripMenuItem.Text = "&Force Stereo Separation"; + this.smsForceStereoSeparationToolStripMenuItem.Click += new System.EventHandler(this.smsForceStereoSeparationToolStripMenuItem_Click); + // + // smsSpriteLimitToolStripMenuItem + // + this.smsSpriteLimitToolStripMenuItem.Name = "smsSpriteLimitToolStripMenuItem"; + this.smsSpriteLimitToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsSpriteLimitToolStripMenuItem.Text = "Sprite &Limit"; + this.smsSpriteLimitToolStripMenuItem.Click += new System.EventHandler(this.smsSpriteLimitToolStripMenuItem_Click); + // + // showClippedRegionsToolStripMenuItem + // + this.showClippedRegionsToolStripMenuItem.Name = "showClippedRegionsToolStripMenuItem"; + this.showClippedRegionsToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.showClippedRegionsToolStripMenuItem.Text = "&Show Clipped Regions"; + this.showClippedRegionsToolStripMenuItem.Click += new System.EventHandler(this.showClippedRegionsToolStripMenuItem_Click); + // + // highlightActiveDisplayRegionToolStripMenuItem + // + this.highlightActiveDisplayRegionToolStripMenuItem.Name = "highlightActiveDisplayRegionToolStripMenuItem"; + this.highlightActiveDisplayRegionToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.highlightActiveDisplayRegionToolStripMenuItem.Text = "&Highlight Active Display Region"; + this.highlightActiveDisplayRegionToolStripMenuItem.Click += new System.EventHandler(this.highlightActiveDisplayRegionToolStripMenuItem_Click); + // + // toolStripSeparator24 + // + this.toolStripSeparator24.Name = "toolStripSeparator24"; + this.toolStripSeparator24.Size = new System.Drawing.Size(238, 6); + // + // smsGraphicsSettingsToolStripMenuItem + // + this.smsGraphicsSettingsToolStripMenuItem.Name = "smsGraphicsSettingsToolStripMenuItem"; + this.smsGraphicsSettingsToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.smsGraphicsSettingsToolStripMenuItem.Text = "&Graphics Settings..."; + this.smsGraphicsSettingsToolStripMenuItem.Click += new System.EventHandler(this.smsGraphicsSettingsToolStripMenuItem_Click); + // + // GGgameGenieEncoderDecoderToolStripMenuItem + // + this.GGgameGenieEncoderDecoderToolStripMenuItem.Name = "GGgameGenieEncoderDecoderToolStripMenuItem"; + this.GGgameGenieEncoderDecoderToolStripMenuItem.Size = new System.Drawing.Size(241, 22); + this.GGgameGenieEncoderDecoderToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; + this.GGgameGenieEncoderDecoderToolStripMenuItem.Click += new System.EventHandler(this.GGgameGenieEncoderDecoderToolStripMenuItem_Click); + // + // tI83ToolStripMenuItem + // + this.tI83ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.keypadToolStripMenuItem, this.toolStripSeparator13, this.autoloadVirtualKeyboardToolStripMenuItem}); - this.tI83ToolStripMenuItem.Name = "tI83ToolStripMenuItem"; - this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 19); - this.tI83ToolStripMenuItem.Text = "TI83"; - this.tI83ToolStripMenuItem.DropDownOpened += new System.EventHandler(this.tI83ToolStripMenuItem_DropDownOpened); - // - // keypadToolStripMenuItem - // - this.keypadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.calculator; - this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem"; - this.keypadToolStripMenuItem.Size = new System.Drawing.Size(165, 22); - this.keypadToolStripMenuItem.Text = "Keypad"; - this.keypadToolStripMenuItem.Click += new System.EventHandler(this.keypadToolStripMenuItem_Click); - // - // toolStripSeparator13 - // - this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6); - // - // autoloadVirtualKeyboardToolStripMenuItem - // - this.autoloadVirtualKeyboardToolStripMenuItem.Checked = true; - this.autoloadVirtualKeyboardToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.autoloadVirtualKeyboardToolStripMenuItem.Name = "autoloadVirtualKeyboardToolStripMenuItem"; - this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(165, 22); - this.autoloadVirtualKeyboardToolStripMenuItem.Text = "Autoload Keypad"; - this.autoloadVirtualKeyboardToolStripMenuItem.Click += new System.EventHandler(this.autoloadVirtualKeyboardToolStripMenuItem_Click); - // - // atariToolStripMenuItem - // - this.atariToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tI83ToolStripMenuItem.Name = "tI83ToolStripMenuItem"; + this.tI83ToolStripMenuItem.Size = new System.Drawing.Size(41, 19); + this.tI83ToolStripMenuItem.Text = "TI83"; + this.tI83ToolStripMenuItem.DropDownOpened += new System.EventHandler(this.tI83ToolStripMenuItem_DropDownOpened); + // + // keypadToolStripMenuItem + // + this.keypadToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.calculator; + this.keypadToolStripMenuItem.Name = "keypadToolStripMenuItem"; + this.keypadToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.keypadToolStripMenuItem.Text = "Keypad"; + this.keypadToolStripMenuItem.Click += new System.EventHandler(this.keypadToolStripMenuItem_Click); + // + // toolStripSeparator13 + // + this.toolStripSeparator13.Name = "toolStripSeparator13"; + this.toolStripSeparator13.Size = new System.Drawing.Size(162, 6); + // + // autoloadVirtualKeyboardToolStripMenuItem + // + this.autoloadVirtualKeyboardToolStripMenuItem.Checked = true; + this.autoloadVirtualKeyboardToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.autoloadVirtualKeyboardToolStripMenuItem.Name = "autoloadVirtualKeyboardToolStripMenuItem"; + this.autoloadVirtualKeyboardToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.autoloadVirtualKeyboardToolStripMenuItem.Text = "Autoload Keypad"; + this.autoloadVirtualKeyboardToolStripMenuItem.Click += new System.EventHandler(this.autoloadVirtualKeyboardToolStripMenuItem_Click); + // + // atariToolStripMenuItem + // + this.atariToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bWToolStripMenuItem, this.p0DifficultyToolStripMenuItem, this.rightDifficultyToolStripMenuItem, @@ -2225,89 +2175,89 @@ this.showMissle1ToolStripMenuItem, this.showMissle2ToolStripMenuItem, this.showBallToolStripMenuItem}); - this.atariToolStripMenuItem.Name = "atariToolStripMenuItem"; - this.atariToolStripMenuItem.Size = new System.Drawing.Size(44, 19); - this.atariToolStripMenuItem.Text = "&Atari"; - this.atariToolStripMenuItem.DropDownOpened += new System.EventHandler(this.atariToolStripMenuItem_DropDownOpened); - // - // bWToolStripMenuItem - // - this.bWToolStripMenuItem.Name = "bWToolStripMenuItem"; - this.bWToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.bWToolStripMenuItem.Text = "B-W TV"; - this.bWToolStripMenuItem.Click += new System.EventHandler(this.bWToolStripMenuItem_Click); - // - // p0DifficultyToolStripMenuItem - // - this.p0DifficultyToolStripMenuItem.Name = "p0DifficultyToolStripMenuItem"; - this.p0DifficultyToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.p0DifficultyToolStripMenuItem.Text = "Left Difficulty"; - this.p0DifficultyToolStripMenuItem.Click += new System.EventHandler(this.p0DifficultyToolStripMenuItem_Click); - // - // rightDifficultyToolStripMenuItem - // - this.rightDifficultyToolStripMenuItem.Name = "rightDifficultyToolStripMenuItem"; - this.rightDifficultyToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.rightDifficultyToolStripMenuItem.Text = "Right Difficulty"; - this.rightDifficultyToolStripMenuItem.Click += new System.EventHandler(this.rightDifficultyToolStripMenuItem_Click); - // - // toolStripSeparator26 - // - this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(150, 6); - // - // showBGToolStripMenuItem - // - this.showBGToolStripMenuItem.Name = "showBGToolStripMenuItem"; - this.showBGToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.showBGToolStripMenuItem.Text = "Show BG"; - this.showBGToolStripMenuItem.Click += new System.EventHandler(this.showBGToolStripMenuItem_Click); - // - // showPlayfieldToolStripMenuItem - // - this.showPlayfieldToolStripMenuItem.Name = "showPlayfieldToolStripMenuItem"; - this.showPlayfieldToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.showPlayfieldToolStripMenuItem.Text = "Show Playfield"; - this.showPlayfieldToolStripMenuItem.Click += new System.EventHandler(this.showPlayfieldToolStripMenuItem_Click); - // - // showPlayer1ToolStripMenuItem - // - this.showPlayer1ToolStripMenuItem.Name = "showPlayer1ToolStripMenuItem"; - this.showPlayer1ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.showPlayer1ToolStripMenuItem.Text = "Show Player 1"; - this.showPlayer1ToolStripMenuItem.Click += new System.EventHandler(this.showPlayer1ToolStripMenuItem_Click); - // - // showPlayer2ToolStripMenuItem - // - this.showPlayer2ToolStripMenuItem.Name = "showPlayer2ToolStripMenuItem"; - this.showPlayer2ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.showPlayer2ToolStripMenuItem.Text = "Show Player 2"; - this.showPlayer2ToolStripMenuItem.Click += new System.EventHandler(this.showPlayer2ToolStripMenuItem_Click); - // - // showMissle1ToolStripMenuItem - // - this.showMissle1ToolStripMenuItem.Name = "showMissle1ToolStripMenuItem"; - this.showMissle1ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.showMissle1ToolStripMenuItem.Text = "Show Missle 1"; - this.showMissle1ToolStripMenuItem.Click += new System.EventHandler(this.showMissle1ToolStripMenuItem_Click); - // - // showMissle2ToolStripMenuItem - // - this.showMissle2ToolStripMenuItem.Name = "showMissle2ToolStripMenuItem"; - this.showMissle2ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.showMissle2ToolStripMenuItem.Text = "Show Missle 2"; - this.showMissle2ToolStripMenuItem.Click += new System.EventHandler(this.showMissle2ToolStripMenuItem_Click); - // - // showBallToolStripMenuItem - // - this.showBallToolStripMenuItem.Name = "showBallToolStripMenuItem"; - this.showBallToolStripMenuItem.Size = new System.Drawing.Size(153, 22); - this.showBallToolStripMenuItem.Text = "Show Ball"; - this.showBallToolStripMenuItem.Click += new System.EventHandler(this.showBallToolStripMenuItem_Click); - // - // gBToolStripMenuItem - // - this.gBToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.atariToolStripMenuItem.Name = "atariToolStripMenuItem"; + this.atariToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.atariToolStripMenuItem.Text = "&Atari"; + this.atariToolStripMenuItem.DropDownOpened += new System.EventHandler(this.atariToolStripMenuItem_DropDownOpened); + // + // bWToolStripMenuItem + // + this.bWToolStripMenuItem.Name = "bWToolStripMenuItem"; + this.bWToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.bWToolStripMenuItem.Text = "B-W TV"; + this.bWToolStripMenuItem.Click += new System.EventHandler(this.bWToolStripMenuItem_Click); + // + // p0DifficultyToolStripMenuItem + // + this.p0DifficultyToolStripMenuItem.Name = "p0DifficultyToolStripMenuItem"; + this.p0DifficultyToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.p0DifficultyToolStripMenuItem.Text = "Left Difficulty"; + this.p0DifficultyToolStripMenuItem.Click += new System.EventHandler(this.p0DifficultyToolStripMenuItem_Click); + // + // rightDifficultyToolStripMenuItem + // + this.rightDifficultyToolStripMenuItem.Name = "rightDifficultyToolStripMenuItem"; + this.rightDifficultyToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.rightDifficultyToolStripMenuItem.Text = "Right Difficulty"; + this.rightDifficultyToolStripMenuItem.Click += new System.EventHandler(this.rightDifficultyToolStripMenuItem_Click); + // + // toolStripSeparator26 + // + this.toolStripSeparator26.Name = "toolStripSeparator26"; + this.toolStripSeparator26.Size = new System.Drawing.Size(150, 6); + // + // showBGToolStripMenuItem + // + this.showBGToolStripMenuItem.Name = "showBGToolStripMenuItem"; + this.showBGToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showBGToolStripMenuItem.Text = "Show BG"; + this.showBGToolStripMenuItem.Click += new System.EventHandler(this.showBGToolStripMenuItem_Click); + // + // showPlayfieldToolStripMenuItem + // + this.showPlayfieldToolStripMenuItem.Name = "showPlayfieldToolStripMenuItem"; + this.showPlayfieldToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayfieldToolStripMenuItem.Text = "Show Playfield"; + this.showPlayfieldToolStripMenuItem.Click += new System.EventHandler(this.showPlayfieldToolStripMenuItem_Click); + // + // showPlayer1ToolStripMenuItem + // + this.showPlayer1ToolStripMenuItem.Name = "showPlayer1ToolStripMenuItem"; + this.showPlayer1ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayer1ToolStripMenuItem.Text = "Show Player 1"; + this.showPlayer1ToolStripMenuItem.Click += new System.EventHandler(this.showPlayer1ToolStripMenuItem_Click); + // + // showPlayer2ToolStripMenuItem + // + this.showPlayer2ToolStripMenuItem.Name = "showPlayer2ToolStripMenuItem"; + this.showPlayer2ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showPlayer2ToolStripMenuItem.Text = "Show Player 2"; + this.showPlayer2ToolStripMenuItem.Click += new System.EventHandler(this.showPlayer2ToolStripMenuItem_Click); + // + // showMissle1ToolStripMenuItem + // + this.showMissle1ToolStripMenuItem.Name = "showMissle1ToolStripMenuItem"; + this.showMissle1ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showMissle1ToolStripMenuItem.Text = "Show Missle 1"; + this.showMissle1ToolStripMenuItem.Click += new System.EventHandler(this.showMissle1ToolStripMenuItem_Click); + // + // showMissle2ToolStripMenuItem + // + this.showMissle2ToolStripMenuItem.Name = "showMissle2ToolStripMenuItem"; + this.showMissle2ToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showMissle2ToolStripMenuItem.Text = "Show Missle 2"; + this.showMissle2ToolStripMenuItem.Click += new System.EventHandler(this.showMissle2ToolStripMenuItem_Click); + // + // showBallToolStripMenuItem + // + this.showBallToolStripMenuItem.Name = "showBallToolStripMenuItem"; + this.showBallToolStripMenuItem.Size = new System.Drawing.Size(153, 22); + this.showBallToolStripMenuItem.Text = "Show Ball"; + this.showBallToolStripMenuItem.Click += new System.EventHandler(this.showBallToolStripMenuItem_Click); + // + // gBToolStripMenuItem + // + this.gBToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.forceDMGModeToolStripMenuItem, this.gBAInCGBModeToolStripMenuItem, this.multicartCompatibilityToolStripMenuItem, @@ -2317,102 +2267,102 @@ this.toolStripSeparator28, this.gPUViewerToolStripMenuItem, this.GBgameGenieCodesToolStripMenuItem}); - this.gBToolStripMenuItem.Name = "gBToolStripMenuItem"; - this.gBToolStripMenuItem.Size = new System.Drawing.Size(34, 19); - this.gBToolStripMenuItem.Text = "&GB"; - this.gBToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gBToolStripMenuItem_DropDownOpened); - // - // forceDMGModeToolStripMenuItem - // - this.forceDMGModeToolStripMenuItem.Name = "forceDMGModeToolStripMenuItem"; - this.forceDMGModeToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.forceDMGModeToolStripMenuItem.Text = "Force DMG Mode"; - this.forceDMGModeToolStripMenuItem.Click += new System.EventHandler(this.forceDMGModeToolStripMenuItem_Click); - // - // gBAInCGBModeToolStripMenuItem - // - this.gBAInCGBModeToolStripMenuItem.Name = "gBAInCGBModeToolStripMenuItem"; - this.gBAInCGBModeToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.gBAInCGBModeToolStripMenuItem.Text = "GBA in CGB mode"; - this.gBAInCGBModeToolStripMenuItem.Click += new System.EventHandler(this.gBAInCGBModeToolStripMenuItem_Click); - // - // multicartCompatibilityToolStripMenuItem - // - this.multicartCompatibilityToolStripMenuItem.Name = "multicartCompatibilityToolStripMenuItem"; - this.multicartCompatibilityToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.multicartCompatibilityToolStripMenuItem.Text = "Multicart Compatibility"; - this.multicartCompatibilityToolStripMenuItem.Click += new System.EventHandler(this.multicartCompatibilityToolStripMenuItem_Click); - // - // toolStripSeparator8 - // - this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(230, 6); - // - // changeDMGPalettesToolStripMenuItem - // - this.changeDMGPalettesToolStripMenuItem.Name = "changeDMGPalettesToolStripMenuItem"; - this.changeDMGPalettesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.changeDMGPalettesToolStripMenuItem.Text = "Change Palettes..."; - this.changeDMGPalettesToolStripMenuItem.Click += new System.EventHandler(this.changeDMGPalettesToolStripMenuItem_Click); - // - // loadGBInSGBToolStripMenuItem1 - // - this.loadGBInSGBToolStripMenuItem1.Name = "loadGBInSGBToolStripMenuItem1"; - this.loadGBInSGBToolStripMenuItem1.Size = new System.Drawing.Size(233, 22); - this.loadGBInSGBToolStripMenuItem1.Text = "Load GB in SGB"; - this.loadGBInSGBToolStripMenuItem1.Click += new System.EventHandler(this.loadGBInSGBToolStripMenuItem1_Click); - // - // toolStripSeparator28 - // - this.toolStripSeparator28.Name = "toolStripSeparator28"; - this.toolStripSeparator28.Size = new System.Drawing.Size(230, 6); - // - // gPUViewerToolStripMenuItem - // - this.gPUViewerToolStripMenuItem.Name = "gPUViewerToolStripMenuItem"; - this.gPUViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.gPUViewerToolStripMenuItem.Text = "GPU Viewer"; - this.gPUViewerToolStripMenuItem.Click += new System.EventHandler(this.gPUViewerToolStripMenuItem_Click); - // - // GBgameGenieCodesToolStripMenuItem - // - this.GBgameGenieCodesToolStripMenuItem.Name = "GBgameGenieCodesToolStripMenuItem"; - this.GBgameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.GBgameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; - this.GBgameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.GBgameGenieCodesToolStripMenuItem_Click); - // - // gBAToolStripMenuItem - // - this.gBAToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.gBToolStripMenuItem.Name = "gBToolStripMenuItem"; + this.gBToolStripMenuItem.Size = new System.Drawing.Size(34, 19); + this.gBToolStripMenuItem.Text = "&GB"; + this.gBToolStripMenuItem.DropDownOpened += new System.EventHandler(this.gBToolStripMenuItem_DropDownOpened); + // + // forceDMGModeToolStripMenuItem + // + this.forceDMGModeToolStripMenuItem.Name = "forceDMGModeToolStripMenuItem"; + this.forceDMGModeToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.forceDMGModeToolStripMenuItem.Text = "Force DMG Mode"; + this.forceDMGModeToolStripMenuItem.Click += new System.EventHandler(this.forceDMGModeToolStripMenuItem_Click); + // + // gBAInCGBModeToolStripMenuItem + // + this.gBAInCGBModeToolStripMenuItem.Name = "gBAInCGBModeToolStripMenuItem"; + this.gBAInCGBModeToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.gBAInCGBModeToolStripMenuItem.Text = "GBA in CGB mode"; + this.gBAInCGBModeToolStripMenuItem.Click += new System.EventHandler(this.gBAInCGBModeToolStripMenuItem_Click); + // + // multicartCompatibilityToolStripMenuItem + // + this.multicartCompatibilityToolStripMenuItem.Name = "multicartCompatibilityToolStripMenuItem"; + this.multicartCompatibilityToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.multicartCompatibilityToolStripMenuItem.Text = "Multicart Compatibility"; + this.multicartCompatibilityToolStripMenuItem.Click += new System.EventHandler(this.multicartCompatibilityToolStripMenuItem_Click); + // + // toolStripSeparator8 + // + this.toolStripSeparator8.Name = "toolStripSeparator8"; + this.toolStripSeparator8.Size = new System.Drawing.Size(230, 6); + // + // changeDMGPalettesToolStripMenuItem + // + this.changeDMGPalettesToolStripMenuItem.Name = "changeDMGPalettesToolStripMenuItem"; + this.changeDMGPalettesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.changeDMGPalettesToolStripMenuItem.Text = "Change Palettes..."; + this.changeDMGPalettesToolStripMenuItem.Click += new System.EventHandler(this.changeDMGPalettesToolStripMenuItem_Click); + // + // loadGBInSGBToolStripMenuItem1 + // + this.loadGBInSGBToolStripMenuItem1.Name = "loadGBInSGBToolStripMenuItem1"; + this.loadGBInSGBToolStripMenuItem1.Size = new System.Drawing.Size(233, 22); + this.loadGBInSGBToolStripMenuItem1.Text = "Load GB in SGB"; + this.loadGBInSGBToolStripMenuItem1.Click += new System.EventHandler(this.loadGBInSGBToolStripMenuItem1_Click); + // + // toolStripSeparator28 + // + this.toolStripSeparator28.Name = "toolStripSeparator28"; + this.toolStripSeparator28.Size = new System.Drawing.Size(230, 6); + // + // gPUViewerToolStripMenuItem + // + this.gPUViewerToolStripMenuItem.Name = "gPUViewerToolStripMenuItem"; + this.gPUViewerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.gPUViewerToolStripMenuItem.Text = "GPU Viewer"; + this.gPUViewerToolStripMenuItem.Click += new System.EventHandler(this.gPUViewerToolStripMenuItem_Click); + // + // GBgameGenieCodesToolStripMenuItem + // + this.GBgameGenieCodesToolStripMenuItem.Name = "GBgameGenieCodesToolStripMenuItem"; + this.GBgameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.GBgameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; + this.GBgameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.GBgameGenieCodesToolStripMenuItem_Click); + // + // gBAToolStripMenuItem + // + this.gBAToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.gPUViewToolStripMenuItem}); - this.gBAToolStripMenuItem.Name = "gBAToolStripMenuItem"; - this.gBAToolStripMenuItem.Size = new System.Drawing.Size(42, 19); - this.gBAToolStripMenuItem.Text = "GBA"; - // - // gPUViewToolStripMenuItem - // - this.gPUViewToolStripMenuItem.Name = "gPUViewToolStripMenuItem"; - this.gPUViewToolStripMenuItem.Size = new System.Drawing.Size(135, 22); - this.gPUViewToolStripMenuItem.Text = "GPU Viewer"; - this.gPUViewToolStripMenuItem.Click += new System.EventHandler(this.gPUViewToolStripMenuItem_Click); - // - // sNESToolStripMenuItem - // - this.sNESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.gBAToolStripMenuItem.Name = "gBAToolStripMenuItem"; + this.gBAToolStripMenuItem.Size = new System.Drawing.Size(42, 19); + this.gBAToolStripMenuItem.Text = "GBA"; + // + // gPUViewToolStripMenuItem + // + this.gPUViewToolStripMenuItem.Name = "gPUViewToolStripMenuItem"; + this.gPUViewToolStripMenuItem.Size = new System.Drawing.Size(135, 22); + this.gPUViewToolStripMenuItem.Text = "GPU Viewer"; + this.gPUViewToolStripMenuItem.Click += new System.EventHandler(this.gPUViewToolStripMenuItem_Click); + // + // sNESToolStripMenuItem + // + this.sNESToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.displayToolStripMenuItem, this.toolStripSeparator18, this.graphicsDebuggerToolStripMenuItem, this.loadGBInSGBToolStripMenuItem, this.SNESgameGenieCodesToolStripMenuItem, this.miSnesOptions}); - this.sNESToolStripMenuItem.Name = "sNESToolStripMenuItem"; - this.sNESToolStripMenuItem.Size = new System.Drawing.Size(46, 19); - this.sNESToolStripMenuItem.Text = "&SNES"; - this.sNESToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sNESToolStripMenuItem_DropDownOpened); - // - // displayToolStripMenuItem - // - this.displayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.sNESToolStripMenuItem.Name = "sNESToolStripMenuItem"; + this.sNESToolStripMenuItem.Size = new System.Drawing.Size(46, 19); + this.sNESToolStripMenuItem.Text = "&SNES"; + this.sNESToolStripMenuItem.DropDownOpened += new System.EventHandler(this.sNESToolStripMenuItem_DropDownOpened); + // + // displayToolStripMenuItem + // + this.displayToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bG0ToolStripMenuItem, this.bG1ToolStripMenuItem, this.bG2ToolStripMenuItem, @@ -2421,185 +2371,185 @@ this.oBJ1ToolStripMenuItem, this.oBJ2ToolStripMenuItem, this.oBJ3ToolStripMenuItem}); - this.displayToolStripMenuItem.Name = "displayToolStripMenuItem"; - this.displayToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.displayToolStripMenuItem.Text = "Display"; - this.displayToolStripMenuItem.DropDownOpened += new System.EventHandler(this.displayToolStripMenuItem_DropDownOpened); - // - // bG0ToolStripMenuItem - // - this.bG0ToolStripMenuItem.Name = "bG0ToolStripMenuItem"; - this.bG0ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.bG0ToolStripMenuItem.Text = "BG 1"; - this.bG0ToolStripMenuItem.Click += new System.EventHandler(this.bG1ToolStripMenuItem_Click); - // - // bG1ToolStripMenuItem - // - this.bG1ToolStripMenuItem.Name = "bG1ToolStripMenuItem"; - this.bG1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.bG1ToolStripMenuItem.Text = "BG 2"; - this.bG1ToolStripMenuItem.Click += new System.EventHandler(this.bG1ToolStripMenuItem_Click_1); - // - // bG2ToolStripMenuItem - // - this.bG2ToolStripMenuItem.Name = "bG2ToolStripMenuItem"; - this.bG2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.bG2ToolStripMenuItem.Text = "BG 3"; - this.bG2ToolStripMenuItem.Click += new System.EventHandler(this.bG2ToolStripMenuItem_Click); - // - // bG3ToolStripMenuItem - // - this.bG3ToolStripMenuItem.Name = "bG3ToolStripMenuItem"; - this.bG3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.bG3ToolStripMenuItem.Text = "BG 4"; - this.bG3ToolStripMenuItem.Click += new System.EventHandler(this.bG3ToolStripMenuItem_Click); - // - // oBJ0ToolStripMenuItem - // - this.oBJ0ToolStripMenuItem.Name = "oBJ0ToolStripMenuItem"; - this.oBJ0ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.oBJ0ToolStripMenuItem.Text = "OBJ 1"; - this.oBJ0ToolStripMenuItem.Click += new System.EventHandler(this.oBJ0ToolStripMenuItem_Click); - // - // oBJ1ToolStripMenuItem - // - this.oBJ1ToolStripMenuItem.Name = "oBJ1ToolStripMenuItem"; - this.oBJ1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.oBJ1ToolStripMenuItem.Text = "OBJ 2"; - this.oBJ1ToolStripMenuItem.Click += new System.EventHandler(this.oBJ1ToolStripMenuItem_Click); - // - // oBJ2ToolStripMenuItem - // - this.oBJ2ToolStripMenuItem.Name = "oBJ2ToolStripMenuItem"; - this.oBJ2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.oBJ2ToolStripMenuItem.Text = "OBJ 3"; - this.oBJ2ToolStripMenuItem.Click += new System.EventHandler(this.oBJ2ToolStripMenuItem_Click); - // - // oBJ3ToolStripMenuItem - // - this.oBJ3ToolStripMenuItem.Name = "oBJ3ToolStripMenuItem"; - this.oBJ3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.oBJ3ToolStripMenuItem.Text = "OBJ 4"; - this.oBJ3ToolStripMenuItem.Click += new System.EventHandler(this.oBJ3ToolStripMenuItem_Click); - // - // toolStripSeparator18 - // - this.toolStripSeparator18.Name = "toolStripSeparator18"; - this.toolStripSeparator18.Size = new System.Drawing.Size(230, 6); - // - // graphicsDebuggerToolStripMenuItem - // - this.graphicsDebuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; - this.graphicsDebuggerToolStripMenuItem.Name = "graphicsDebuggerToolStripMenuItem"; - this.graphicsDebuggerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.graphicsDebuggerToolStripMenuItem.Text = "Graphics Debugger"; - this.graphicsDebuggerToolStripMenuItem.Click += new System.EventHandler(this.graphicsDebuggerToolStripMenuItem_Click); - // - // loadGBInSGBToolStripMenuItem - // - this.loadGBInSGBToolStripMenuItem.Name = "loadGBInSGBToolStripMenuItem"; - this.loadGBInSGBToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.loadGBInSGBToolStripMenuItem.Text = "Load GB in SGB"; - this.loadGBInSGBToolStripMenuItem.Click += new System.EventHandler(this.loadGBInSGBToolStripMenuItem_Click); - // - // SNESgameGenieCodesToolStripMenuItem - // - this.SNESgameGenieCodesToolStripMenuItem.Name = "SNESgameGenieCodesToolStripMenuItem"; - this.SNESgameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); - this.SNESgameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; - this.SNESgameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.SNESgameGenieCodesToolStripMenuItem_Click); - // - // miSnesOptions - // - this.miSnesOptions.Name = "miSnesOptions"; - this.miSnesOptions.Size = new System.Drawing.Size(233, 22); - this.miSnesOptions.Text = "&Options"; - this.miSnesOptions.Click += new System.EventHandler(this.miSnesOptions_Click); - // - // colecoToolStripMenuItem - // - this.colecoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.displayToolStripMenuItem.Name = "displayToolStripMenuItem"; + this.displayToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.displayToolStripMenuItem.Text = "Display"; + this.displayToolStripMenuItem.DropDownOpened += new System.EventHandler(this.displayToolStripMenuItem_DropDownOpened); + // + // bG0ToolStripMenuItem + // + this.bG0ToolStripMenuItem.Name = "bG0ToolStripMenuItem"; + this.bG0ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG0ToolStripMenuItem.Text = "BG 1"; + this.bG0ToolStripMenuItem.Click += new System.EventHandler(this.bG1ToolStripMenuItem_Click); + // + // bG1ToolStripMenuItem + // + this.bG1ToolStripMenuItem.Name = "bG1ToolStripMenuItem"; + this.bG1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG1ToolStripMenuItem.Text = "BG 2"; + this.bG1ToolStripMenuItem.Click += new System.EventHandler(this.bG1ToolStripMenuItem_Click_1); + // + // bG2ToolStripMenuItem + // + this.bG2ToolStripMenuItem.Name = "bG2ToolStripMenuItem"; + this.bG2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG2ToolStripMenuItem.Text = "BG 3"; + this.bG2ToolStripMenuItem.Click += new System.EventHandler(this.bG2ToolStripMenuItem_Click); + // + // bG3ToolStripMenuItem + // + this.bG3ToolStripMenuItem.Name = "bG3ToolStripMenuItem"; + this.bG3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.bG3ToolStripMenuItem.Text = "BG 4"; + this.bG3ToolStripMenuItem.Click += new System.EventHandler(this.bG3ToolStripMenuItem_Click); + // + // oBJ0ToolStripMenuItem + // + this.oBJ0ToolStripMenuItem.Name = "oBJ0ToolStripMenuItem"; + this.oBJ0ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ0ToolStripMenuItem.Text = "OBJ 1"; + this.oBJ0ToolStripMenuItem.Click += new System.EventHandler(this.oBJ0ToolStripMenuItem_Click); + // + // oBJ1ToolStripMenuItem + // + this.oBJ1ToolStripMenuItem.Name = "oBJ1ToolStripMenuItem"; + this.oBJ1ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ1ToolStripMenuItem.Text = "OBJ 2"; + this.oBJ1ToolStripMenuItem.Click += new System.EventHandler(this.oBJ1ToolStripMenuItem_Click); + // + // oBJ2ToolStripMenuItem + // + this.oBJ2ToolStripMenuItem.Name = "oBJ2ToolStripMenuItem"; + this.oBJ2ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ2ToolStripMenuItem.Text = "OBJ 3"; + this.oBJ2ToolStripMenuItem.Click += new System.EventHandler(this.oBJ2ToolStripMenuItem_Click); + // + // oBJ3ToolStripMenuItem + // + this.oBJ3ToolStripMenuItem.Name = "oBJ3ToolStripMenuItem"; + this.oBJ3ToolStripMenuItem.Size = new System.Drawing.Size(103, 22); + this.oBJ3ToolStripMenuItem.Text = "OBJ 4"; + this.oBJ3ToolStripMenuItem.Click += new System.EventHandler(this.oBJ3ToolStripMenuItem_Click); + // + // toolStripSeparator18 + // + this.toolStripSeparator18.Name = "toolStripSeparator18"; + this.toolStripSeparator18.Size = new System.Drawing.Size(230, 6); + // + // graphicsDebuggerToolStripMenuItem + // + this.graphicsDebuggerToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Bug; + this.graphicsDebuggerToolStripMenuItem.Name = "graphicsDebuggerToolStripMenuItem"; + this.graphicsDebuggerToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.graphicsDebuggerToolStripMenuItem.Text = "Graphics Debugger"; + this.graphicsDebuggerToolStripMenuItem.Click += new System.EventHandler(this.graphicsDebuggerToolStripMenuItem_Click); + // + // loadGBInSGBToolStripMenuItem + // + this.loadGBInSGBToolStripMenuItem.Name = "loadGBInSGBToolStripMenuItem"; + this.loadGBInSGBToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.loadGBInSGBToolStripMenuItem.Text = "Load GB in SGB"; + this.loadGBInSGBToolStripMenuItem.Click += new System.EventHandler(this.loadGBInSGBToolStripMenuItem_Click); + // + // SNESgameGenieCodesToolStripMenuItem + // + this.SNESgameGenieCodesToolStripMenuItem.Name = "SNESgameGenieCodesToolStripMenuItem"; + this.SNESgameGenieCodesToolStripMenuItem.Size = new System.Drawing.Size(233, 22); + this.SNESgameGenieCodesToolStripMenuItem.Text = "&Game Genie Encoder/Decoder"; + this.SNESgameGenieCodesToolStripMenuItem.Click += new System.EventHandler(this.SNESgameGenieCodesToolStripMenuItem_Click); + // + // miSnesOptions + // + this.miSnesOptions.Name = "miSnesOptions"; + this.miSnesOptions.Size = new System.Drawing.Size(233, 22); + this.miSnesOptions.Text = "&Options"; + this.miSnesOptions.Click += new System.EventHandler(this.miSnesOptions_Click); + // + // colecoToolStripMenuItem + // + this.colecoToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.skipBIOSIntroToolStripMenuItem}); - this.colecoToolStripMenuItem.Name = "colecoToolStripMenuItem"; - this.colecoToolStripMenuItem.Size = new System.Drawing.Size(56, 19); - this.colecoToolStripMenuItem.Text = "&Coleco"; - this.colecoToolStripMenuItem.DropDownOpened += new System.EventHandler(this.colecoToolStripMenuItem_DropDownOpened); - // - // skipBIOSIntroToolStripMenuItem - // - this.skipBIOSIntroToolStripMenuItem.Name = "skipBIOSIntroToolStripMenuItem"; - this.skipBIOSIntroToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.skipBIOSIntroToolStripMenuItem.Text = "&Skip BIOS intro"; - this.skipBIOSIntroToolStripMenuItem.Click += new System.EventHandler(this.skipBIOIntroToolStripMenuItem_Click); - // - // n64ToolStripMenuItem - // - this.n64ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.colecoToolStripMenuItem.Name = "colecoToolStripMenuItem"; + this.colecoToolStripMenuItem.Size = new System.Drawing.Size(56, 19); + this.colecoToolStripMenuItem.Text = "&Coleco"; + this.colecoToolStripMenuItem.DropDownOpened += new System.EventHandler(this.colecoToolStripMenuItem_DropDownOpened); + // + // skipBIOSIntroToolStripMenuItem + // + this.skipBIOSIntroToolStripMenuItem.Name = "skipBIOSIntroToolStripMenuItem"; + this.skipBIOSIntroToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.skipBIOSIntroToolStripMenuItem.Text = "&Skip BIOS intro"; + this.skipBIOSIntroToolStripMenuItem.Click += new System.EventHandler(this.skipBIOIntroToolStripMenuItem_Click); + // + // n64ToolStripMenuItem + // + this.n64ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.N64PluginSettingsToolStripMenuItem}); - this.n64ToolStripMenuItem.Name = "n64ToolStripMenuItem"; - this.n64ToolStripMenuItem.Size = new System.Drawing.Size(40, 19); - this.n64ToolStripMenuItem.Text = "N64"; - // - // N64PluginSettingsToolStripMenuItem - // - this.N64PluginSettingsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("N64PluginSettingsToolStripMenuItem.Image"))); - this.N64PluginSettingsToolStripMenuItem.Name = "N64PluginSettingsToolStripMenuItem"; - this.N64PluginSettingsToolStripMenuItem.Size = new System.Drawing.Size(186, 22); - this.N64PluginSettingsToolStripMenuItem.Text = "Video Plugin Settings"; - this.N64PluginSettingsToolStripMenuItem.Click += new System.EventHandler(this.tempN64PluginControlToolStripMenuItem_Click); - // - // saturnToolStripMenuItem - // - this.saturnToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.n64ToolStripMenuItem.Name = "n64ToolStripMenuItem"; + this.n64ToolStripMenuItem.Size = new System.Drawing.Size(40, 19); + this.n64ToolStripMenuItem.Text = "N64"; + // + // N64PluginSettingsToolStripMenuItem + // + this.N64PluginSettingsToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("N64PluginSettingsToolStripMenuItem.Image"))); + this.N64PluginSettingsToolStripMenuItem.Name = "N64PluginSettingsToolStripMenuItem"; + this.N64PluginSettingsToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.N64PluginSettingsToolStripMenuItem.Text = "Video Plugin Settings"; + this.N64PluginSettingsToolStripMenuItem.Click += new System.EventHandler(this.tempN64PluginControlToolStripMenuItem_Click); + // + // saturnToolStripMenuItem + // + this.saturnToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.preferencesToolStripMenuItem}); - this.saturnToolStripMenuItem.Name = "saturnToolStripMenuItem"; - this.saturnToolStripMenuItem.Size = new System.Drawing.Size(53, 19); - this.saturnToolStripMenuItem.Text = "Saturn"; - // - // preferencesToolStripMenuItem - // - this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem"; - this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(144, 22); - this.preferencesToolStripMenuItem.Text = "Preferences..."; - this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.preferencesToolStripMenuItem_Click); - // - // helpToolStripMenuItem - // - this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.saturnToolStripMenuItem.Name = "saturnToolStripMenuItem"; + this.saturnToolStripMenuItem.Size = new System.Drawing.Size(53, 19); + this.saturnToolStripMenuItem.Text = "Saturn"; + // + // preferencesToolStripMenuItem + // + this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem"; + this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(144, 22); + this.preferencesToolStripMenuItem.Text = "Preferences..."; + this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.preferencesToolStripMenuItem_Click); + // + // helpToolStripMenuItem + // + this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.helpToolStripMenuItem1, this.forumsToolStripMenuItem, this.aboutToolStripMenuItem}); - this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; - this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 19); - this.helpToolStripMenuItem.Text = "&Help"; - // - // helpToolStripMenuItem1 - // - this.helpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Help; - this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; - this.helpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22); - this.helpToolStripMenuItem1.Text = "&Online Help..."; - this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); - // - // forumsToolStripMenuItem - // - this.forumsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; - this.forumsToolStripMenuItem.Name = "forumsToolStripMenuItem"; - this.forumsToolStripMenuItem.Size = new System.Drawing.Size(146, 22); - this.forumsToolStripMenuItem.Text = "Forums..."; - this.forumsToolStripMenuItem.Click += new System.EventHandler(this.forumsToolStripMenuItem_Click); - // - // aboutToolStripMenuItem - // - this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall; - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22); - this.aboutToolStripMenuItem.Text = "&About"; - this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); - // - // StatusSlot0 - // - this.StatusSlot0.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.helpToolStripMenuItem.Name = "helpToolStripMenuItem"; + this.helpToolStripMenuItem.Size = new System.Drawing.Size(44, 19); + this.helpToolStripMenuItem.Text = "&Help"; + // + // helpToolStripMenuItem1 + // + this.helpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Help; + this.helpToolStripMenuItem1.Name = "helpToolStripMenuItem1"; + this.helpToolStripMenuItem1.Size = new System.Drawing.Size(146, 22); + this.helpToolStripMenuItem1.Text = "&Online Help..."; + this.helpToolStripMenuItem1.Click += new System.EventHandler(this.helpToolStripMenuItem1_Click); + // + // forumsToolStripMenuItem + // + this.forumsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio; + this.forumsToolStripMenuItem.Name = "forumsToolStripMenuItem"; + this.forumsToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.forumsToolStripMenuItem.Text = "Forums..."; + this.forumsToolStripMenuItem.Click += new System.EventHandler(this.forumsToolStripMenuItem_Click); + // + // aboutToolStripMenuItem + // + this.aboutToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CorpHawkSmall; + this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(146, 22); + this.aboutToolStripMenuItem.Text = "&About"; + this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); + // + // StatusSlot0 + // + this.StatusSlot0.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DumpStatus, this.EmuStatus, this.PlayRecordStatus, @@ -2620,174 +2570,174 @@ this.StatusSlot10, this.CheatStatus, this.KeyPriorityStatusBarLabel}); - this.StatusSlot0.Location = new System.Drawing.Point(0, 386); - this.StatusSlot0.Name = "StatusSlot0"; - this.StatusSlot0.ShowItemToolTips = true; - this.StatusSlot0.Size = new System.Drawing.Size(470, 22); - this.StatusSlot0.SizingGrip = false; - this.StatusSlot0.TabIndex = 1; - this.StatusSlot0.Text = "0"; - // - // DumpStatus - // - this.DumpStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.DumpStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; - this.DumpStatus.ImageTransparentColor = System.Drawing.Color.Magenta; - this.DumpStatus.Name = "DumpStatus"; - this.DumpStatus.ShowDropDownArrow = false; - this.DumpStatus.Size = new System.Drawing.Size(20, 20); - this.DumpStatus.Text = "No ROM loaded"; - this.DumpStatus.Click += new System.EventHandler(this.DumpStatus_Click); - // - // EmuStatus - // - this.EmuStatus.Name = "EmuStatus"; - this.EmuStatus.Size = new System.Drawing.Size(0, 17); - // - // PlayRecordStatus - // - this.PlayRecordStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PlayRecordStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; - this.PlayRecordStatus.ImageTransparentColor = System.Drawing.Color.Magenta; - this.PlayRecordStatus.Name = "PlayRecordStatus"; - this.PlayRecordStatus.ShowDropDownArrow = false; - this.PlayRecordStatus.Size = new System.Drawing.Size(20, 20); - this.PlayRecordStatus.Text = "No movie is active"; - // - // PauseStrip - // - this.PauseStrip.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.PauseStrip.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.PauseStrip.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; - this.PauseStrip.ImageTransparentColor = System.Drawing.Color.Magenta; - this.PauseStrip.Name = "PauseStrip"; - this.PauseStrip.ShowDropDownArrow = false; - this.PauseStrip.Size = new System.Drawing.Size(20, 20); - this.PauseStrip.Text = "toolStripDropDownButton1"; - this.PauseStrip.ToolTipText = "Emulator is paused"; - this.PauseStrip.Click += new System.EventHandler(this.PauseStrip_Click); - // - // RebootStatusBarIcon - // - this.RebootStatusBarIcon.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.RebootStatusBarIcon.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; - this.RebootStatusBarIcon.Name = "RebootStatusBarIcon"; - this.RebootStatusBarIcon.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.RebootStatusBarIcon.Size = new System.Drawing.Size(16, 17); - this.RebootStatusBarIcon.Text = "Reboot"; - this.RebootStatusBarIcon.ToolTipText = "A reboot of the core is needed for a setting change to take affect"; - this.RebootStatusBarIcon.Click += new System.EventHandler(this.toolStripStatusLabel2_Click); - // - // AVIStatusLabel - // - this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.AVIStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; - this.AVIStatusLabel.Name = "AVIStatusLabel"; - this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17); - this.AVIStatusLabel.Text = "AVI Capture"; - // - // StatusBarLedLight - // - this.StatusBarLedLight.Image = global::BizHawk.MultiClient.Properties.Resources.LightOff; - this.StatusBarLedLight.Name = "StatusBarLedLight"; - this.StatusBarLedLight.Size = new System.Drawing.Size(16, 17); - this.StatusBarLedLight.ToolTipText = "Disk Drive LED Light"; - // - // toolStripStatusLabel1 - // - this.toolStripStatusLabel1.BackColor = System.Drawing.SystemColors.Control; - this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17); - this.toolStripStatusLabel1.Text = "Save slots"; - // - // StatusSlot1 - // - this.StatusSlot1.Name = "StatusSlot1"; - this.StatusSlot1.Size = new System.Drawing.Size(13, 17); - this.StatusSlot1.Text = "1"; - this.StatusSlot1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot1_MouseUp); - // - // StatusSlot2 - // - this.StatusSlot2.Name = "StatusSlot2"; - this.StatusSlot2.Size = new System.Drawing.Size(13, 17); - this.StatusSlot2.Text = "2"; - this.StatusSlot2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot2_MouseUp); - // - // StatusSlot3 - // - this.StatusSlot3.Name = "StatusSlot3"; - this.StatusSlot3.Size = new System.Drawing.Size(13, 17); - this.StatusSlot3.Text = "3"; - this.StatusSlot3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot3_MouseUp); - // - // StatusSlot4 - // - this.StatusSlot4.Name = "StatusSlot4"; - this.StatusSlot4.Size = new System.Drawing.Size(13, 17); - this.StatusSlot4.Text = "4"; - this.StatusSlot4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot4_MouseUp); - // - // StatusSlot5 - // - this.StatusSlot5.Name = "StatusSlot5"; - this.StatusSlot5.Size = new System.Drawing.Size(13, 17); - this.StatusSlot5.Text = "5"; - this.StatusSlot5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot5_MouseUp); - // - // StatusSlot6 - // - this.StatusSlot6.Name = "StatusSlot6"; - this.StatusSlot6.Size = new System.Drawing.Size(13, 17); - this.StatusSlot6.Text = "6"; - this.StatusSlot6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot6_MouseUp); - // - // StatusSlot7 - // - this.StatusSlot7.Name = "StatusSlot7"; - this.StatusSlot7.Size = new System.Drawing.Size(13, 17); - this.StatusSlot7.Text = "7"; - this.StatusSlot7.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot7_MouseUp); - // - // StatusSlot8 - // - this.StatusSlot8.Name = "StatusSlot8"; - this.StatusSlot8.Size = new System.Drawing.Size(13, 17); - this.StatusSlot8.Text = "8"; - this.StatusSlot8.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot8_MouseUp); - // - // StatusSlot9 - // - this.StatusSlot9.Name = "StatusSlot9"; - this.StatusSlot9.Size = new System.Drawing.Size(13, 17); - this.StatusSlot9.Text = "9"; - this.StatusSlot9.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot9_MouseUp); - // - // StatusSlot10 - // - this.StatusSlot10.Name = "StatusSlot10"; - this.StatusSlot10.Size = new System.Drawing.Size(13, 17); - this.StatusSlot10.Text = "0"; - this.StatusSlot10.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot10_MouseUp); - // - // CheatStatus - // - this.CheatStatus.Name = "CheatStatus"; - this.CheatStatus.Size = new System.Drawing.Size(0, 17); - this.CheatStatus.Click += new System.EventHandler(this.FreezeStatus_Click); - // - // KeyPriorityStatusBarLabel - // - this.KeyPriorityStatusBarLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.KeyPriorityStatusBarLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Both; - this.KeyPriorityStatusBarLabel.Name = "KeyPriorityStatusBarLabel"; - this.KeyPriorityStatusBarLabel.Size = new System.Drawing.Size(16, 17); - this.KeyPriorityStatusBarLabel.Text = "KeyPriority"; - this.KeyPriorityStatusBarLabel.Click += new System.EventHandler(this.KeyPriorityStatusBarLabel_Click); - // - // contextMenuStrip1 - // - this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.StatusSlot0.Location = new System.Drawing.Point(0, 386); + this.StatusSlot0.Name = "StatusSlot0"; + this.StatusSlot0.ShowItemToolTips = true; + this.StatusSlot0.Size = new System.Drawing.Size(470, 22); + this.StatusSlot0.SizingGrip = false; + this.StatusSlot0.TabIndex = 1; + this.StatusSlot0.Text = "0"; + // + // DumpStatus + // + this.DumpStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.DumpStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.DumpStatus.ImageTransparentColor = System.Drawing.Color.Magenta; + this.DumpStatus.Name = "DumpStatus"; + this.DumpStatus.ShowDropDownArrow = false; + this.DumpStatus.Size = new System.Drawing.Size(20, 20); + this.DumpStatus.Text = "No ROM loaded"; + this.DumpStatus.Click += new System.EventHandler(this.DumpStatus_Click); + // + // EmuStatus + // + this.EmuStatus.Name = "EmuStatus"; + this.EmuStatus.Size = new System.Drawing.Size(0, 17); + // + // PlayRecordStatus + // + this.PlayRecordStatus.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.PlayRecordStatus.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.PlayRecordStatus.ImageTransparentColor = System.Drawing.Color.Magenta; + this.PlayRecordStatus.Name = "PlayRecordStatus"; + this.PlayRecordStatus.ShowDropDownArrow = false; + this.PlayRecordStatus.Size = new System.Drawing.Size(20, 20); + this.PlayRecordStatus.Text = "No movie is active"; + // + // PauseStrip + // + this.PauseStrip.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.PauseStrip.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.PauseStrip.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.PauseStrip.ImageTransparentColor = System.Drawing.Color.Magenta; + this.PauseStrip.Name = "PauseStrip"; + this.PauseStrip.ShowDropDownArrow = false; + this.PauseStrip.Size = new System.Drawing.Size(20, 20); + this.PauseStrip.Text = "toolStripDropDownButton1"; + this.PauseStrip.ToolTipText = "Emulator is paused"; + this.PauseStrip.Click += new System.EventHandler(this.PauseStrip_Click); + // + // RebootStatusBarIcon + // + this.RebootStatusBarIcon.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.RebootStatusBarIcon.Image = global::BizHawk.MultiClient.Properties.Resources.reboot; + this.RebootStatusBarIcon.Name = "RebootStatusBarIcon"; + this.RebootStatusBarIcon.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.RebootStatusBarIcon.Size = new System.Drawing.Size(16, 17); + this.RebootStatusBarIcon.Text = "Reboot"; + this.RebootStatusBarIcon.ToolTipText = "A reboot of the core is needed for a setting change to take affect"; + this.RebootStatusBarIcon.Click += new System.EventHandler(this.toolStripStatusLabel2_Click); + // + // AVIStatusLabel + // + this.AVIStatusLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.AVIStatusLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Blank; + this.AVIStatusLabel.Name = "AVIStatusLabel"; + this.AVIStatusLabel.Size = new System.Drawing.Size(16, 17); + this.AVIStatusLabel.Text = "AVI Capture"; + // + // StatusBarLedLight + // + this.StatusBarLedLight.Image = global::BizHawk.MultiClient.Properties.Resources.LightOff; + this.StatusBarLedLight.Name = "StatusBarLedLight"; + this.StatusBarLedLight.Size = new System.Drawing.Size(16, 17); + this.StatusBarLedLight.ToolTipText = "Disk Drive LED Light"; + // + // toolStripStatusLabel1 + // + this.toolStripStatusLabel1.BackColor = System.Drawing.SystemColors.Control; + this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; + this.toolStripStatusLabel1.Size = new System.Drawing.Size(58, 17); + this.toolStripStatusLabel1.Text = "Save slots"; + // + // StatusSlot1 + // + this.StatusSlot1.Name = "StatusSlot1"; + this.StatusSlot1.Size = new System.Drawing.Size(13, 17); + this.StatusSlot1.Text = "1"; + this.StatusSlot1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot1_MouseUp); + // + // StatusSlot2 + // + this.StatusSlot2.Name = "StatusSlot2"; + this.StatusSlot2.Size = new System.Drawing.Size(13, 17); + this.StatusSlot2.Text = "2"; + this.StatusSlot2.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot2_MouseUp); + // + // StatusSlot3 + // + this.StatusSlot3.Name = "StatusSlot3"; + this.StatusSlot3.Size = new System.Drawing.Size(13, 17); + this.StatusSlot3.Text = "3"; + this.StatusSlot3.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot3_MouseUp); + // + // StatusSlot4 + // + this.StatusSlot4.Name = "StatusSlot4"; + this.StatusSlot4.Size = new System.Drawing.Size(13, 17); + this.StatusSlot4.Text = "4"; + this.StatusSlot4.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot4_MouseUp); + // + // StatusSlot5 + // + this.StatusSlot5.Name = "StatusSlot5"; + this.StatusSlot5.Size = new System.Drawing.Size(13, 17); + this.StatusSlot5.Text = "5"; + this.StatusSlot5.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot5_MouseUp); + // + // StatusSlot6 + // + this.StatusSlot6.Name = "StatusSlot6"; + this.StatusSlot6.Size = new System.Drawing.Size(13, 17); + this.StatusSlot6.Text = "6"; + this.StatusSlot6.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot6_MouseUp); + // + // StatusSlot7 + // + this.StatusSlot7.Name = "StatusSlot7"; + this.StatusSlot7.Size = new System.Drawing.Size(13, 17); + this.StatusSlot7.Text = "7"; + this.StatusSlot7.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot7_MouseUp); + // + // StatusSlot8 + // + this.StatusSlot8.Name = "StatusSlot8"; + this.StatusSlot8.Size = new System.Drawing.Size(13, 17); + this.StatusSlot8.Text = "8"; + this.StatusSlot8.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot8_MouseUp); + // + // StatusSlot9 + // + this.StatusSlot9.Name = "StatusSlot9"; + this.StatusSlot9.Size = new System.Drawing.Size(13, 17); + this.StatusSlot9.Text = "9"; + this.StatusSlot9.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot9_MouseUp); + // + // StatusSlot10 + // + this.StatusSlot10.Name = "StatusSlot10"; + this.StatusSlot10.Size = new System.Drawing.Size(13, 17); + this.StatusSlot10.Text = "0"; + this.StatusSlot10.MouseUp += new System.Windows.Forms.MouseEventHandler(this.StatusSlot10_MouseUp); + // + // CheatStatus + // + this.CheatStatus.Name = "CheatStatus"; + this.CheatStatus.Size = new System.Drawing.Size(0, 17); + this.CheatStatus.Click += new System.EventHandler(this.FreezeStatus_Click); + // + // KeyPriorityStatusBarLabel + // + this.KeyPriorityStatusBarLabel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.KeyPriorityStatusBarLabel.Image = global::BizHawk.MultiClient.Properties.Resources.Both; + this.KeyPriorityStatusBarLabel.Name = "KeyPriorityStatusBarLabel"; + this.KeyPriorityStatusBarLabel.Size = new System.Drawing.Size(16, 17); + this.KeyPriorityStatusBarLabel.Text = "KeyPriority"; + this.KeyPriorityStatusBarLabel.Click += new System.EventHandler(this.KeyPriorityStatusBarLabel_Click); + // + // contextMenuStrip1 + // + this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmiOpenRom, this.cmiLoadLastRom, this.toolStripSeparator_afterRomLoading, @@ -2810,137 +2760,137 @@ this.cmiScreenshotClipboard, this.cmiCloseRom, this.cmiShowMenu}); - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(217, 440); - this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing); - this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); - // - // cmiOpenRom - // - this.cmiOpenRom.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; - this.cmiOpenRom.Name = "cmiOpenRom"; - this.cmiOpenRom.Size = new System.Drawing.Size(216, 22); - this.cmiOpenRom.Text = "Open Rom"; - this.cmiOpenRom.Click += new System.EventHandler(this.openRomToolStripMenuItem1_Click); - // - // cmiLoadLastRom - // - this.cmiLoadLastRom.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; - this.cmiLoadLastRom.Name = "cmiLoadLastRom"; - this.cmiLoadLastRom.Size = new System.Drawing.Size(216, 22); - this.cmiLoadLastRom.Text = "Load Last ROM"; - this.cmiLoadLastRom.Click += new System.EventHandler(this.loadLastROMToolStripMenuItem_Click); - // - // toolStripSeparator_afterRomLoading - // - this.toolStripSeparator_afterRomLoading.Name = "toolStripSeparator_afterRomLoading"; - this.toolStripSeparator_afterRomLoading.Size = new System.Drawing.Size(213, 6); - // - // cmiRecordMovie - // - this.cmiRecordMovie.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; - this.cmiRecordMovie.Name = "cmiRecordMovie"; - this.cmiRecordMovie.Size = new System.Drawing.Size(216, 22); - this.cmiRecordMovie.Text = "Record Movie"; - this.cmiRecordMovie.Click += new System.EventHandler(this.recordMovieToolStripMenuItem1_Click); - // - // cmiPlayMovie - // - this.cmiPlayMovie.Image = global::BizHawk.MultiClient.Properties.Resources.Play; - this.cmiPlayMovie.Name = "cmiPlayMovie"; - this.cmiPlayMovie.Size = new System.Drawing.Size(216, 22); - this.cmiPlayMovie.Text = "Play Movie"; - this.cmiPlayMovie.Click += new System.EventHandler(this.playMovieToolStripMenuItem1_Click); - // - // cmiRestartMovie - // - this.cmiRestartMovie.Image = global::BizHawk.MultiClient.Properties.Resources.restart; - this.cmiRestartMovie.Name = "cmiRestartMovie"; - this.cmiRestartMovie.Size = new System.Drawing.Size(216, 22); - this.cmiRestartMovie.Text = "Restart Movie"; - this.cmiRestartMovie.Click += new System.EventHandler(this.restartMovieToolStripMenuItem_Click); - // - // cmiStopMovie - // - this.cmiStopMovie.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; - this.cmiStopMovie.Name = "cmiStopMovie"; - this.cmiStopMovie.Size = new System.Drawing.Size(216, 22); - this.cmiStopMovie.Text = "Stop Movie"; - this.cmiStopMovie.Click += new System.EventHandler(this.stopMovieToolStripMenuItem1_Click); - // - // cmiLoadLastMovie - // - this.cmiLoadLastMovie.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; - this.cmiLoadLastMovie.Name = "cmiLoadLastMovie"; - this.cmiLoadLastMovie.Size = new System.Drawing.Size(216, 22); - this.cmiLoadLastMovie.Text = "Load Last Movie"; - this.cmiLoadLastMovie.Click += new System.EventHandler(this.loadLastMovieToolStripMenuItem_Click); - // - // cmiMakeMovieBackup - // - this.cmiMakeMovieBackup.Name = "cmiMakeMovieBackup"; - this.cmiMakeMovieBackup.Size = new System.Drawing.Size(216, 22); - this.cmiMakeMovieBackup.Text = "Make Movie Backup"; - this.cmiMakeMovieBackup.Click += new System.EventHandler(this.makeMovieBackupToolStripMenuItem_Click); - // - // ContextMenuStopMovieNoSaving - // - this.ContextMenuStopMovieNoSaving.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; - this.ContextMenuStopMovieNoSaving.Name = "ContextMenuStopMovieNoSaving"; - this.ContextMenuStopMovieNoSaving.Size = new System.Drawing.Size(216, 22); - this.ContextMenuStopMovieNoSaving.Text = "Stop Movie without Saving"; - this.ContextMenuStopMovieNoSaving.Click += new System.EventHandler(this.toolStripMenuItem6_Click); - // - // cmiViewSubtitles - // - this.cmiViewSubtitles.Name = "cmiViewSubtitles"; - this.cmiViewSubtitles.Size = new System.Drawing.Size(216, 22); - this.cmiViewSubtitles.Text = "View Subtitles"; - this.cmiViewSubtitles.Click += new System.EventHandler(this.viewSubtitlesToolStripMenuItem_Click); - // - // cmiAddSubtitle - // - this.cmiAddSubtitle.Name = "cmiAddSubtitle"; - this.cmiAddSubtitle.Size = new System.Drawing.Size(216, 22); - this.cmiAddSubtitle.Text = "Add Subtitle"; - this.cmiAddSubtitle.Click += new System.EventHandler(this.AddSubtitleToolStripMenuItem_Click); - // - // cmiViewComments - // - this.cmiViewComments.Name = "cmiViewComments"; - this.cmiViewComments.Size = new System.Drawing.Size(216, 22); - this.cmiViewComments.Text = "View Comments"; - this.cmiViewComments.Click += new System.EventHandler(this.viewCommentsToolStripMenuItem_Click); - // - // saveMovieToolStripMenuItem1 - // - this.saveMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; - this.saveMovieToolStripMenuItem1.Name = "saveMovieToolStripMenuItem1"; - this.saveMovieToolStripMenuItem1.Size = new System.Drawing.Size(216, 22); - this.saveMovieToolStripMenuItem1.Text = "Save Movie"; - this.saveMovieToolStripMenuItem1.Click += new System.EventHandler(this.saveMovieToolStripMenuItem1_Click); - // - // toolStripSeparator_afterMovie - // - this.toolStripSeparator_afterMovie.Name = "toolStripSeparator_afterMovie"; - this.toolStripSeparator_afterMovie.Size = new System.Drawing.Size(213, 6); - // - // cmiUndoSavestate - // - this.cmiUndoSavestate.Image = global::BizHawk.MultiClient.Properties.Resources.undo; - this.cmiUndoSavestate.Name = "cmiUndoSavestate"; - this.cmiUndoSavestate.Size = new System.Drawing.Size(216, 22); - this.cmiUndoSavestate.Text = "Undo Savestate"; - this.cmiUndoSavestate.Click += new System.EventHandler(this.undoSavestateToolStripMenuItem_Click); - // - // cmiSeparator20 - // - this.cmiSeparator20.Name = "cmiSeparator20"; - this.cmiSeparator20.Size = new System.Drawing.Size(213, 6); - // - // configToolStripMenuItem1 - // - this.configToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.contextMenuStrip1.Name = "contextMenuStrip1"; + this.contextMenuStrip1.Size = new System.Drawing.Size(217, 440); + this.contextMenuStrip1.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.contextMenuStrip1_Closing); + this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); + // + // cmiOpenRom + // + this.cmiOpenRom.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; + this.cmiOpenRom.Name = "cmiOpenRom"; + this.cmiOpenRom.Size = new System.Drawing.Size(216, 22); + this.cmiOpenRom.Text = "Open Rom"; + this.cmiOpenRom.Click += new System.EventHandler(this.openRomToolStripMenuItem1_Click); + // + // cmiLoadLastRom + // + this.cmiLoadLastRom.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.cmiLoadLastRom.Name = "cmiLoadLastRom"; + this.cmiLoadLastRom.Size = new System.Drawing.Size(216, 22); + this.cmiLoadLastRom.Text = "Load Last ROM"; + this.cmiLoadLastRom.Click += new System.EventHandler(this.loadLastROMToolStripMenuItem_Click); + // + // toolStripSeparator_afterRomLoading + // + this.toolStripSeparator_afterRomLoading.Name = "toolStripSeparator_afterRomLoading"; + this.toolStripSeparator_afterRomLoading.Size = new System.Drawing.Size(213, 6); + // + // cmiRecordMovie + // + this.cmiRecordMovie.Image = global::BizHawk.MultiClient.Properties.Resources.RecordHS; + this.cmiRecordMovie.Name = "cmiRecordMovie"; + this.cmiRecordMovie.Size = new System.Drawing.Size(216, 22); + this.cmiRecordMovie.Text = "Record Movie"; + this.cmiRecordMovie.Click += new System.EventHandler(this.recordMovieToolStripMenuItem1_Click); + // + // cmiPlayMovie + // + this.cmiPlayMovie.Image = global::BizHawk.MultiClient.Properties.Resources.Play; + this.cmiPlayMovie.Name = "cmiPlayMovie"; + this.cmiPlayMovie.Size = new System.Drawing.Size(216, 22); + this.cmiPlayMovie.Text = "Play Movie"; + this.cmiPlayMovie.Click += new System.EventHandler(this.playMovieToolStripMenuItem1_Click); + // + // cmiRestartMovie + // + this.cmiRestartMovie.Image = global::BizHawk.MultiClient.Properties.Resources.restart; + this.cmiRestartMovie.Name = "cmiRestartMovie"; + this.cmiRestartMovie.Size = new System.Drawing.Size(216, 22); + this.cmiRestartMovie.Text = "Restart Movie"; + this.cmiRestartMovie.Click += new System.EventHandler(this.restartMovieToolStripMenuItem_Click); + // + // cmiStopMovie + // + this.cmiStopMovie.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.cmiStopMovie.Name = "cmiStopMovie"; + this.cmiStopMovie.Size = new System.Drawing.Size(216, 22); + this.cmiStopMovie.Text = "Stop Movie"; + this.cmiStopMovie.Click += new System.EventHandler(this.stopMovieToolStripMenuItem1_Click); + // + // cmiLoadLastMovie + // + this.cmiLoadLastMovie.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; + this.cmiLoadLastMovie.Name = "cmiLoadLastMovie"; + this.cmiLoadLastMovie.Size = new System.Drawing.Size(216, 22); + this.cmiLoadLastMovie.Text = "Load Last Movie"; + this.cmiLoadLastMovie.Click += new System.EventHandler(this.loadLastMovieToolStripMenuItem_Click); + // + // cmiMakeMovieBackup + // + this.cmiMakeMovieBackup.Name = "cmiMakeMovieBackup"; + this.cmiMakeMovieBackup.Size = new System.Drawing.Size(216, 22); + this.cmiMakeMovieBackup.Text = "Make Movie Backup"; + this.cmiMakeMovieBackup.Click += new System.EventHandler(this.makeMovieBackupToolStripMenuItem_Click); + // + // ContextMenuStopMovieNoSaving + // + this.ContextMenuStopMovieNoSaving.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; + this.ContextMenuStopMovieNoSaving.Name = "ContextMenuStopMovieNoSaving"; + this.ContextMenuStopMovieNoSaving.Size = new System.Drawing.Size(216, 22); + this.ContextMenuStopMovieNoSaving.Text = "Stop Movie without Saving"; + this.ContextMenuStopMovieNoSaving.Click += new System.EventHandler(this.toolStripMenuItem6_Click); + // + // cmiViewSubtitles + // + this.cmiViewSubtitles.Name = "cmiViewSubtitles"; + this.cmiViewSubtitles.Size = new System.Drawing.Size(216, 22); + this.cmiViewSubtitles.Text = "View Subtitles"; + this.cmiViewSubtitles.Click += new System.EventHandler(this.viewSubtitlesToolStripMenuItem_Click); + // + // cmiAddSubtitle + // + this.cmiAddSubtitle.Name = "cmiAddSubtitle"; + this.cmiAddSubtitle.Size = new System.Drawing.Size(216, 22); + this.cmiAddSubtitle.Text = "Add Subtitle"; + this.cmiAddSubtitle.Click += new System.EventHandler(this.AddSubtitleToolStripMenuItem_Click); + // + // cmiViewComments + // + this.cmiViewComments.Name = "cmiViewComments"; + this.cmiViewComments.Size = new System.Drawing.Size(216, 22); + this.cmiViewComments.Text = "View Comments"; + this.cmiViewComments.Click += new System.EventHandler(this.viewCommentsToolStripMenuItem_Click); + // + // saveMovieToolStripMenuItem1 + // + this.saveMovieToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; + this.saveMovieToolStripMenuItem1.Name = "saveMovieToolStripMenuItem1"; + this.saveMovieToolStripMenuItem1.Size = new System.Drawing.Size(216, 22); + this.saveMovieToolStripMenuItem1.Text = "Save Movie"; + this.saveMovieToolStripMenuItem1.Click += new System.EventHandler(this.saveMovieToolStripMenuItem1_Click); + // + // toolStripSeparator_afterMovie + // + this.toolStripSeparator_afterMovie.Name = "toolStripSeparator_afterMovie"; + this.toolStripSeparator_afterMovie.Size = new System.Drawing.Size(213, 6); + // + // cmiUndoSavestate + // + this.cmiUndoSavestate.Image = global::BizHawk.MultiClient.Properties.Resources.undo; + this.cmiUndoSavestate.Name = "cmiUndoSavestate"; + this.cmiUndoSavestate.Size = new System.Drawing.Size(216, 22); + this.cmiUndoSavestate.Text = "Undo Savestate"; + this.cmiUndoSavestate.Click += new System.EventHandler(this.undoSavestateToolStripMenuItem_Click); + // + // cmiSeparator20 + // + this.cmiSeparator20.Name = "cmiSeparator20"; + this.cmiSeparator20.Size = new System.Drawing.Size(213, 6); + // + // configToolStripMenuItem1 + // + this.configToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.controllersToolStripMenuItem1, this.hotkeysToolStripMenuItem1, this.messagesToolStripMenuItem1, @@ -2948,122 +2898,122 @@ this.soundToolStripMenuItem1, this.autofireToolStripMenuItem1, this.rewindToolStripMenuItem}); - this.configToolStripMenuItem1.Name = "configToolStripMenuItem1"; - this.configToolStripMenuItem1.Size = new System.Drawing.Size(216, 22); - this.configToolStripMenuItem1.Text = "Config"; - // - // controllersToolStripMenuItem1 - // - this.controllersToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; - this.controllersToolStripMenuItem1.Name = "controllersToolStripMenuItem1"; - this.controllersToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); - this.controllersToolStripMenuItem1.Text = "&Controllers..."; - this.controllersToolStripMenuItem1.Click += new System.EventHandler(this.controllersToolStripMenuItem1_Click); - // - // hotkeysToolStripMenuItem1 - // - this.hotkeysToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; - this.hotkeysToolStripMenuItem1.Name = "hotkeysToolStripMenuItem1"; - this.hotkeysToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); - this.hotkeysToolStripMenuItem1.Text = "&Hotkeys..."; - this.hotkeysToolStripMenuItem1.Click += new System.EventHandler(this.hotkeysToolStripMenuItem1_Click); - // - // messagesToolStripMenuItem1 - // - this.messagesToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; - this.messagesToolStripMenuItem1.Name = "messagesToolStripMenuItem1"; - this.messagesToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); - this.messagesToolStripMenuItem1.Text = "&Messages..."; - this.messagesToolStripMenuItem1.Click += new System.EventHandler(this.messagesToolStripMenuItem1_Click); - // - // pathsToolStripMenuItem1 - // - this.pathsToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; - this.pathsToolStripMenuItem1.Name = "pathsToolStripMenuItem1"; - this.pathsToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); - this.pathsToolStripMenuItem1.Text = "Paths..."; - this.pathsToolStripMenuItem1.Click += new System.EventHandler(this.pathsToolStripMenuItem1_Click); - // - // soundToolStripMenuItem1 - // - this.soundToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; - this.soundToolStripMenuItem1.Name = "soundToolStripMenuItem1"; - this.soundToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); - this.soundToolStripMenuItem1.Text = "&Sound..."; - this.soundToolStripMenuItem1.Click += new System.EventHandler(this.soundToolStripMenuItem1_Click); - // - // autofireToolStripMenuItem1 - // - this.autofireToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; - this.autofireToolStripMenuItem1.Name = "autofireToolStripMenuItem1"; - this.autofireToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); - this.autofireToolStripMenuItem1.Text = "&Autofire..."; - this.autofireToolStripMenuItem1.Click += new System.EventHandler(this.autofireToolStripMenuItem1_Click); - // - // rewindToolStripMenuItem - // - this.rewindToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; - this.rewindToolStripMenuItem.Name = "rewindToolStripMenuItem"; - this.rewindToolStripMenuItem.Size = new System.Drawing.Size(141, 22); - this.rewindToolStripMenuItem.Text = "&Rewind"; - this.rewindToolStripMenuItem.Click += new System.EventHandler(this.rewindOptionsToolStripMenuItem_Click); - // - // cmiScreenshot - // - this.cmiScreenshot.Image = global::BizHawk.MultiClient.Properties.Resources.camera; - this.cmiScreenshot.Name = "cmiScreenshot"; - this.cmiScreenshot.Size = new System.Drawing.Size(216, 22); - this.cmiScreenshot.Text = "Screenshot"; - // - // cmiScreenshotClipboard - // - this.cmiScreenshotClipboard.Image = global::BizHawk.MultiClient.Properties.Resources.camera; - this.cmiScreenshotClipboard.Name = "cmiScreenshotClipboard"; - this.cmiScreenshotClipboard.Size = new System.Drawing.Size(216, 22); - this.cmiScreenshotClipboard.Text = "Screenshot -> Clipboard"; - this.cmiScreenshotClipboard.Click += new System.EventHandler(this.screenshotToClipboardToolStripMenuItem_Click); - // - // cmiCloseRom - // - this.cmiCloseRom.Image = global::BizHawk.MultiClient.Properties.Resources.Close; - this.cmiCloseRom.Name = "cmiCloseRom"; - this.cmiCloseRom.Size = new System.Drawing.Size(216, 22); - this.cmiCloseRom.Text = "Close ROM"; - this.cmiCloseRom.Click += new System.EventHandler(this.closeROMToolStripMenuItem1_Click); - // - // cmiShowMenu - // - this.cmiShowMenu.Name = "cmiShowMenu"; - this.cmiShowMenu.Size = new System.Drawing.Size(216, 22); - this.cmiShowMenu.Text = "Show Menu"; - this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); - // - // MainForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(470, 408); - this.Controls.Add(this.StatusSlot0); - this.Controls.Add(this.menuStrip1); - this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.MainMenuStrip = this.menuStrip1; - this.Name = "MainForm"; - this.Text = "BizHawk"; - this.Activated += new System.EventHandler(this.MainForm_Activated); - this.Deactivate += new System.EventHandler(this.MainForm_Deactivate); - this.Load += new System.EventHandler(this.MainForm_Load); - this.Shown += new System.EventHandler(this.MainForm_Shown); - this.Paint += new System.Windows.Forms.PaintEventHandler(this.MainForm_Paint); - this.Enter += new System.EventHandler(this.MainForm_Enter); - this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseClick); - this.Resize += new System.EventHandler(this.MainForm_Resize); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.StatusSlot0.ResumeLayout(false); - this.StatusSlot0.PerformLayout(); - this.contextMenuStrip1.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); + this.configToolStripMenuItem1.Name = "configToolStripMenuItem1"; + this.configToolStripMenuItem1.Size = new System.Drawing.Size(216, 22); + this.configToolStripMenuItem1.Text = "Config"; + // + // controllersToolStripMenuItem1 + // + this.controllersToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.GameController; + this.controllersToolStripMenuItem1.Name = "controllersToolStripMenuItem1"; + this.controllersToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.controllersToolStripMenuItem1.Text = "&Controllers..."; + this.controllersToolStripMenuItem1.Click += new System.EventHandler(this.controllersToolStripMenuItem1_Click); + // + // hotkeysToolStripMenuItem1 + // + this.hotkeysToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.HotKeys; + this.hotkeysToolStripMenuItem1.Name = "hotkeysToolStripMenuItem1"; + this.hotkeysToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.hotkeysToolStripMenuItem1.Text = "&Hotkeys..."; + this.hotkeysToolStripMenuItem1.Click += new System.EventHandler(this.hotkeysToolStripMenuItem1_Click); + // + // messagesToolStripMenuItem1 + // + this.messagesToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.MessageConfig; + this.messagesToolStripMenuItem1.Name = "messagesToolStripMenuItem1"; + this.messagesToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.messagesToolStripMenuItem1.Text = "&Messages..."; + this.messagesToolStripMenuItem1.Click += new System.EventHandler(this.messagesToolStripMenuItem1_Click); + // + // pathsToolStripMenuItem1 + // + this.pathsToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.CopyFolderHS; + this.pathsToolStripMenuItem1.Name = "pathsToolStripMenuItem1"; + this.pathsToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.pathsToolStripMenuItem1.Text = "Paths..."; + this.pathsToolStripMenuItem1.Click += new System.EventHandler(this.pathsToolStripMenuItem1_Click); + // + // soundToolStripMenuItem1 + // + this.soundToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.AudioHS; + this.soundToolStripMenuItem1.Name = "soundToolStripMenuItem1"; + this.soundToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.soundToolStripMenuItem1.Text = "&Sound..."; + this.soundToolStripMenuItem1.Click += new System.EventHandler(this.soundToolStripMenuItem1_Click); + // + // autofireToolStripMenuItem1 + // + this.autofireToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Lightning; + this.autofireToolStripMenuItem1.Name = "autofireToolStripMenuItem1"; + this.autofireToolStripMenuItem1.Size = new System.Drawing.Size(141, 22); + this.autofireToolStripMenuItem1.Text = "&Autofire..."; + this.autofireToolStripMenuItem1.Click += new System.EventHandler(this.autofireToolStripMenuItem1_Click); + // + // rewindToolStripMenuItem + // + this.rewindToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Previous; + this.rewindToolStripMenuItem.Name = "rewindToolStripMenuItem"; + this.rewindToolStripMenuItem.Size = new System.Drawing.Size(141, 22); + this.rewindToolStripMenuItem.Text = "&Rewind"; + this.rewindToolStripMenuItem.Click += new System.EventHandler(this.rewindOptionsToolStripMenuItem_Click); + // + // cmiScreenshot + // + this.cmiScreenshot.Image = global::BizHawk.MultiClient.Properties.Resources.camera; + this.cmiScreenshot.Name = "cmiScreenshot"; + this.cmiScreenshot.Size = new System.Drawing.Size(216, 22); + this.cmiScreenshot.Text = "Screenshot"; + // + // cmiScreenshotClipboard + // + this.cmiScreenshotClipboard.Image = global::BizHawk.MultiClient.Properties.Resources.camera; + this.cmiScreenshotClipboard.Name = "cmiScreenshotClipboard"; + this.cmiScreenshotClipboard.Size = new System.Drawing.Size(216, 22); + this.cmiScreenshotClipboard.Text = "Screenshot -> Clipboard"; + this.cmiScreenshotClipboard.Click += new System.EventHandler(this.screenshotToClipboardToolStripMenuItem_Click); + // + // cmiCloseRom + // + this.cmiCloseRom.Image = global::BizHawk.MultiClient.Properties.Resources.Close; + this.cmiCloseRom.Name = "cmiCloseRom"; + this.cmiCloseRom.Size = new System.Drawing.Size(216, 22); + this.cmiCloseRom.Text = "Close ROM"; + this.cmiCloseRom.Click += new System.EventHandler(this.closeROMToolStripMenuItem1_Click); + // + // cmiShowMenu + // + this.cmiShowMenu.Name = "cmiShowMenu"; + this.cmiShowMenu.Size = new System.Drawing.Size(216, 22); + this.cmiShowMenu.Text = "Show Menu"; + this.cmiShowMenu.Click += new System.EventHandler(this.showMenuToolStripMenuItem_Click); + // + // MainForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 14F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(470, 408); + this.Controls.Add(this.StatusSlot0); + this.Controls.Add(this.menuStrip1); + this.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.MainMenuStrip = this.menuStrip1; + this.Name = "MainForm"; + this.Text = "BizHawk"; + this.Activated += new System.EventHandler(this.MainForm_Activated); + this.Deactivate += new System.EventHandler(this.MainForm_Deactivate); + this.Load += new System.EventHandler(this.MainForm_Load); + this.Shown += new System.EventHandler(this.MainForm_Shown); + this.Paint += new System.Windows.Forms.PaintEventHandler(this.MainForm_Paint); + this.Enter += new System.EventHandler(this.MainForm_Enter); + this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.MainForm_MouseClick); + this.Resize += new System.EventHandler(this.MainForm_Resize); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + this.StatusSlot0.ResumeLayout(false); + this.StatusSlot0.PerformLayout(); + this.contextMenuStrip1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -3120,10 +3070,7 @@ private System.Windows.Forms.ToolStripMenuItem displayLagCounterToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem luaConsoleToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem recentROMToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; - private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem autoloadMostRecentToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripMenuItem saveSlotToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem selectSlot1ToolStripMenuItem; @@ -3211,9 +3158,6 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator14; private System.Windows.Forms.ToolStripMenuItem readonlyToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator15; - private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem autoloadMostRecentToolStripMenuItem1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator16; private System.Windows.Forms.ToolStripMenuItem displayRerecordCountToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem screenshotToolStripMenuItem; diff --git a/BizHawk.MultiClient/MainForm.MenuItems.cs b/BizHawk.MultiClient/MainForm.MenuItems.cs index 0729032f2c..8ab3bb23dc 100644 --- a/BizHawk.MultiClient/MainForm.MenuItems.cs +++ b/BizHawk.MultiClient/MainForm.MenuItems.cs @@ -301,17 +301,6 @@ namespace BizHawk.MultiClient LoadRamSearch(); } - - private void autoloadMostRecentToolStripMenuItem_Click(object sender, EventArgs e) - { - UpdateAutoLoadRecentRom(); - } - - private void clearToolStripMenuItem_Click(object sender, EventArgs e) - { - Global.Config.RecentRoms.Clear(); - } - private void selectSlot1ToolStripMenuItem_Click(object sender, EventArgs e) { Global.Config.SaveSlot = 1; @@ -717,69 +706,16 @@ namespace BizHawk.MultiClient private void recentROMToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { - //Clear out recent Roms list - //repopulate it with an up to date list recentROMToolStripMenuItem.DropDownItems.Clear(); - - if (Global.Config.RecentRoms.Empty) - { - var none = new ToolStripMenuItem {Enabled = false, Text = "None"}; - recentROMToolStripMenuItem.DropDownItems.Add(none); - } - else - { - for (int x = 0; x < Global.Config.RecentRoms.Count; x++) - { - string path = Global.Config.RecentRoms[x]; - var item = new ToolStripMenuItem {Text = path}; - item.Click += (o, ev) => LoadRomFromRecent(path); - recentROMToolStripMenuItem.DropDownItems.Add(item); - } - } - - recentROMToolStripMenuItem.DropDownItems.Add("-"); - var clearitem = new ToolStripMenuItem {Text = "&Clear"}; - clearitem.Click += (o, ev) => Global.Config.RecentRoms.Clear(); - recentROMToolStripMenuItem.DropDownItems.Add(clearitem); - var auto = new ToolStripMenuItem {Text = "&Autoload Most Recent"}; - auto.Click += (o, ev) => UpdateAutoLoadRecentRom(); - auto.Checked = Global.Config.AutoLoadMostRecentRom; - recentROMToolStripMenuItem.DropDownItems.Add(auto); + recentROMToolStripMenuItem.DropDownItems.AddRange(Global.Config.RecentRoms.GenerateRecentMenu(LoadRomFromRecent)); + recentROMToolStripMenuItem.DropDownItems.Add(Global.Config.RecentRoms.GenerateAutoLoadItem()); } private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { - //Clear out recent Movies list - //repopulate it with an up to date list - recentToolStripMenuItem.DropDownItems.Clear(); - - if (Global.Config.RecentMovies.Empty) - { - var none = new ToolStripMenuItem {Enabled = false, Text = "None"}; - recentToolStripMenuItem.DropDownItems.Add(none); - } - else - { - for (int x = 0; x < Global.Config.RecentMovies.Count; x++) - { - string path = Global.Config.RecentMovies[x]; - var item = new ToolStripMenuItem {Text = path}; - item.Click += (o, ev) => LoadMoviesFromRecent(path); - recentToolStripMenuItem.DropDownItems.Add(item); - } - } - - recentToolStripMenuItem.DropDownItems.Add("-"); - - var clearitem = new ToolStripMenuItem {Text = "&Clear"}; - clearitem.Click += (o, ev) => Global.Config.RecentMovies.Clear(); - recentToolStripMenuItem.DropDownItems.Add(clearitem); - - var auto = new ToolStripMenuItem {Text = "&Autoload Most Recent"}; - auto.Click += (o, ev) => UpdateAutoLoadRecentMovie(); - auto.Checked = Global.Config.AutoLoadMostRecentMovie; - recentToolStripMenuItem.DropDownItems.Add(auto); + recentToolStripMenuItem.DropDownItems.AddRange(Global.Config.RecentMovies.GenerateRecentMenu(LoadMoviesFromRecent)); + recentToolStripMenuItem.DropDownItems.Add(Global.Config.RecentMovies.GenerateAutoLoadItem()); } private void screenshotAsToolStripMenuItem_Click(object sender, EventArgs e) @@ -1484,7 +1420,6 @@ namespace BizHawk.MultiClient break; } - autoloadMostRecentToolStripMenuItem.Checked = Global.Config.AutoLoadMostRecentRom; screenshotF12ToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Screenshot"].Bindings; openROMToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Open ROM"].Bindings; closeROMToolStripMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Close ROM"].Bindings; diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 399f54c6d2..af88f7d10e 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -276,8 +276,10 @@ namespace BizHawk.MultiClient MessageBox.Show("Failed to load " + cmdRom + " specified on commandline"); } } - else if (Global.Config.AutoLoadMostRecentRom && !Global.Config.RecentRoms.Empty) + else if (Global.Config.RecentRoms.AutoLoad && !Global.Config.RecentRoms.Empty) + { LoadRomFromRecent(Global.Config.RecentRoms[0]); + } if (cmdMovie != null) { @@ -298,7 +300,7 @@ namespace BizHawk.MultiClient Global.Config.RecentMovies.Add(cmdMovie); } } - else if (Global.Config.AutoLoadMostRecentMovie && !Global.Config.RecentMovies.Empty) + else if (Global.Config.RecentMovies.AutoLoad && !Global.Config.RecentMovies.Empty) { if (Global.Game == null) { @@ -333,39 +335,58 @@ namespace BizHawk.MultiClient LoadNewRamWatch(true); } } - if (Global.Config.AutoLoadRamSearch) + if (Global.Config.RecentSearches.AutoLoad) + { LoadRamSearch(); + } if (Global.Config.AutoLoadHexEditor) + { LoadHexEditor(); - if (Global.Config.AutoLoadCheats) + } + if (Global.Config.RecentCheats.AutoLoad) + { LoadCheatsWindow(); + } if (Global.Config.AutoLoadNESPPU && Global.Emulator is NES) + { LoadNESPPU(); + } if (Global.Config.AutoLoadNESNameTable && Global.Emulator is NES) + { LoadNESNameTable(); + } if (Global.Config.AutoLoadNESDebugger && Global.Emulator is NES) + { LoadNESDebugger(); + } if (Global.Config.NESGGAutoload && Global.Emulator is NES) + { LoadGameGenieEC(); + } if (Global.Config.AutoLoadGBGPUView && Global.Emulator is Gameboy) + { LoadGBGPUView(); - + } if (Global.Config.AutoloadTAStudio) { LoadTAStudio(); } - if (Global.Config.AutoloadVirtualPad) { LoadVirtualPads(); } - if (Global.Config.AutoLoadLuaConsole) + { OpenLuaConsole(); + } if (Global.Config.PCEBGViewerAutoload && Global.Emulator is PCEngine) + { LoadPCEBGViewer(); + } if (Global.Config.AutoLoadSNESGraphicsDebugger && Global.Emulator is LibsnesCore) + { LoadSNESGraphicsDebugger(); + } if (Global.Config.TraceLoggerAutoLoad) { if (Global.CoreComm.CpuTraceAvailable) @@ -375,15 +396,23 @@ namespace BizHawk.MultiClient } if (Global.Config.MainWndx >= 0 && Global.Config.MainWndy >= 0 && Global.Config.SaveWindowPosition) + { Location = new Point(Global.Config.MainWndx, Global.Config.MainWndy); + } if (Global.Config.DisplayStatusBar == false) + { StatusSlot0.Visible = false; + } else + { displayStatusBarToolStripMenuItem.Checked = true; + } if (Global.Config.StartPaused) + { PauseEmulator(); + } if (!INTERIM) { @@ -2654,34 +2683,6 @@ namespace BizHawk.MultiClient Global.OSD.AddMessage("Slot " + Global.Config.SaveSlot + " selected."); } - private void UpdateAutoLoadRecentRom() - { - if (Global.Config.AutoLoadMostRecentRom) - { - autoloadMostRecentToolStripMenuItem.Checked = false; - Global.Config.AutoLoadMostRecentRom = false; - } - else - { - autoloadMostRecentToolStripMenuItem.Checked = true; - Global.Config.AutoLoadMostRecentRom = true; - } - } - - private void UpdateAutoLoadRecentMovie() - { - if (Global.Config.AutoLoadMostRecentMovie) - { - autoloadMostRecentToolStripMenuItem1.Checked = false; - Global.Config.AutoLoadMostRecentMovie = false; - } - else - { - autoloadMostRecentToolStripMenuItem1.Checked = true; - Global.Config.AutoLoadMostRecentMovie = true; - } - } - public void LoadRamSearch() { if (!RamSearch1.IsHandleCreated || RamSearch1.IsDisposed) diff --git a/BizHawk.MultiClient/RecentFiles.cs b/BizHawk.MultiClient/RecentFiles.cs index 1daee00cca..1734257ce7 100644 --- a/BizHawk.MultiClient/RecentFiles.cs +++ b/BizHawk.MultiClient/RecentFiles.cs @@ -96,7 +96,7 @@ namespace BizHawk.MultiClient } } - public List GenerateRecentMenu(Action loadFileCallback) + public ToolStripItem[] GenerateRecentMenu(Action loadFileCallback) { var items = new List(); @@ -109,8 +109,9 @@ namespace BizHawk.MultiClient { foreach (string filename in recentlist) { - var item = new ToolStripMenuItem { Text = filename }; - item.Click += (o, ev) => loadFileCallback(filename); + string temp = filename; + var item = new ToolStripMenuItem { Text = temp }; + item.Click += (o, ev) => loadFileCallback(temp); items.Add(item); } } @@ -121,7 +122,7 @@ namespace BizHawk.MultiClient clearitem.Click += (o, ev) => recentlist.Clear(); items.Add(clearitem); - return items; + return items.ToArray(); } public ToolStripMenuItem GenerateAutoLoadItem() diff --git a/BizHawk.MultiClient/tools/Cheats.Designer.cs b/BizHawk.MultiClient/tools/Cheats.Designer.cs index b25be982c7..218ea5d4b9 100644 --- a/BizHawk.MultiClient/tools/Cheats.Designer.cs +++ b/BizHawk.MultiClient/tools/Cheats.Designer.cs @@ -38,9 +38,7 @@ this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.appendFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cheatsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -114,6 +112,7 @@ // // CheatsMenu // + this.CheatsMenu.ClickThrough = true; this.CheatsMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.cheatsToolStripMenuItem, @@ -136,7 +135,7 @@ this.toolStripSeparator1, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); // @@ -145,7 +144,7 @@ this.newToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.NewFile; this.newToolStripMenuItem.Name = "newToolStripMenuItem"; this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.newToolStripMenuItem.Text = "&New"; this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // @@ -154,7 +153,7 @@ this.openToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.OpenFile; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.openToolStripMenuItem.Text = "&Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); // @@ -163,7 +162,7 @@ this.saveToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.saveToolStripMenuItem.Text = "&Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // @@ -172,56 +171,42 @@ this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.saveAsToolStripMenuItem.Text = "Save &As..."; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); // // appendFileToolStripMenuItem // this.appendFileToolStripMenuItem.Name = "appendFileToolStripMenuItem"; - this.appendFileToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.appendFileToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.appendFileToolStripMenuItem.Text = "Append File"; this.appendFileToolStripMenuItem.Click += new System.EventHandler(this.appendFileToolStripMenuItem_Click); // // recentToolStripMenuItem // this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.noneToolStripMenuItem, - this.toolStripSeparator4, - this.clearToolStripMenuItem}); + this.toolStripSeparator4}); this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; - this.recentToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.recentToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.recentToolStripMenuItem.Text = "Recent"; this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); // - // noneToolStripMenuItem - // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(99, 22); - this.noneToolStripMenuItem.Text = "None"; - // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(96, 6); - // - // clearToolStripMenuItem - // - this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(99, 22); - this.clearToolStripMenuItem.Text = "Clear"; + this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(190, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(192, 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(193, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.exitToolStripMenuItem.Text = "E&xit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -241,7 +226,7 @@ this.toolStripSeparator7, this.openGameGenieEncoderDecoderToolStripMenuItem}); this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(53, 20); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(55, 20); this.cheatsToolStripMenuItem.Text = "&Cheats"; this.cheatsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.cheatsToolStripMenuItem_DropDownOpened); // @@ -249,7 +234,7 @@ // this.addCheatToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.addCheatToolStripMenuItem.Name = "addCheatToolStripMenuItem"; - this.addCheatToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.addCheatToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.addCheatToolStripMenuItem.Text = "&Add Cheat"; this.addCheatToolStripMenuItem.Click += new System.EventHandler(this.addCheatToolStripMenuItem_Click); // @@ -258,7 +243,7 @@ this.removeCheatToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; this.removeCheatToolStripMenuItem.Name = "removeCheatToolStripMenuItem"; this.removeCheatToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.removeCheatToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.removeCheatToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.removeCheatToolStripMenuItem.Text = "&Remove Cheat"; this.removeCheatToolStripMenuItem.Click += new System.EventHandler(this.removeCheatToolStripMenuItem_Click); // @@ -267,7 +252,7 @@ this.duplicateToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate; this.duplicateToolStripMenuItem.Name = "duplicateToolStripMenuItem"; this.duplicateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.duplicateToolStripMenuItem.Text = "&Duplicate"; this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.duplicateToolStripMenuItem_Click); // @@ -276,21 +261,21 @@ this.insertSeparatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator; this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem"; this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); - this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.insertSeparatorToolStripMenuItem.Text = "Insert Separator"; this.insertSeparatorToolStripMenuItem.Click += new System.EventHandler(this.insertSeparatorToolStripMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(230, 6); // // moveUpToolStripMenuItem // this.moveUpToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp; this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); - this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.moveUpToolStripMenuItem.Text = "Move &Up"; this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click); // @@ -299,7 +284,7 @@ this.moveDownToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown; this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.moveDownToolStripMenuItem.Text = "Move &Down"; this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click); // @@ -307,32 +292,32 @@ // this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; this.selectAllToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.selectAllToolStripMenuItem.Text = "Select &All"; this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(230, 6); // // disableAllCheatsToolStripMenuItem // this.disableAllCheatsToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.disableAllCheatsToolStripMenuItem.Name = "disableAllCheatsToolStripMenuItem"; - this.disableAllCheatsToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.disableAllCheatsToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.disableAllCheatsToolStripMenuItem.Text = "Disable all Cheats"; this.disableAllCheatsToolStripMenuItem.Click += new System.EventHandler(this.disableAllCheatsToolStripMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(214, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(230, 6); // // openGameGenieEncoderDecoderToolStripMenuItem // this.openGameGenieEncoderDecoderToolStripMenuItem.Name = "openGameGenieEncoderDecoderToolStripMenuItem"; - this.openGameGenieEncoderDecoderToolStripMenuItem.Size = new System.Drawing.Size(217, 22); + this.openGameGenieEncoderDecoderToolStripMenuItem.Size = new System.Drawing.Size(233, 22); this.openGameGenieEncoderDecoderToolStripMenuItem.Text = "Game Genie Encoder/Decoder"; this.openGameGenieEncoderDecoderToolStripMenuItem.Click += new System.EventHandler(this.openGameGenieEncoderDecoderToolStripMenuItem_Click); // @@ -348,61 +333,61 @@ this.toolStripSeparator5, this.restoreWindowSizeToolStripMenuItem}); this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); this.optionsToolStripMenuItem.Text = "&Options"; this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); // // LoadCheatFileByGameToolStripMenuItem // this.LoadCheatFileByGameToolStripMenuItem.Name = "LoadCheatFileByGameToolStripMenuItem"; - this.LoadCheatFileByGameToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.LoadCheatFileByGameToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.LoadCheatFileByGameToolStripMenuItem.Text = "Load Cheat File by Game"; this.LoadCheatFileByGameToolStripMenuItem.Click += new System.EventHandler(this.LoadCheatFileByGameToolStripMenuItem_Click); // // saveCheatsOnCloseToolStripMenuItem // this.saveCheatsOnCloseToolStripMenuItem.Name = "saveCheatsOnCloseToolStripMenuItem"; - this.saveCheatsOnCloseToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.saveCheatsOnCloseToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.saveCheatsOnCloseToolStripMenuItem.Text = "Save Cheats on Close"; this.saveCheatsOnCloseToolStripMenuItem.Click += new System.EventHandler(this.saveCheatsOnCloseToolStripMenuItem_Click); // // CheatsOnOffLoadToolStripMenuItem // this.CheatsOnOffLoadToolStripMenuItem.Name = "CheatsOnOffLoadToolStripMenuItem"; - this.CheatsOnOffLoadToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.CheatsOnOffLoadToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.CheatsOnOffLoadToolStripMenuItem.Text = "Disable Cheats on Load"; this.CheatsOnOffLoadToolStripMenuItem.Click += new System.EventHandler(this.CheatsOnOffLoadToolStripMenuItem_Click); // // showValuesAsHexToolStripMenuItem // this.showValuesAsHexToolStripMenuItem.Name = "showValuesAsHexToolStripMenuItem"; - this.showValuesAsHexToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.showValuesAsHexToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.showValuesAsHexToolStripMenuItem.Text = "Show Values as Hex"; this.showValuesAsHexToolStripMenuItem.Click += new System.EventHandler(this.showValuesAsHexToolStripMenuItem_Click); // // autoloadDialogToolStripMenuItem // this.autoloadDialogToolStripMenuItem.Name = "autoloadDialogToolStripMenuItem"; - this.autoloadDialogToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.autoloadDialogToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.autoloadDialogToolStripMenuItem.Text = "Auto-load Dialog"; this.autoloadDialogToolStripMenuItem.Click += new System.EventHandler(this.autoloadDialogToolStripMenuItem_Click); // // saveWindowPositionToolStripMenuItem // this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; - this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position"; this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(190, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(202, 6); // // restoreWindowSizeToolStripMenuItem // this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; - this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.restoreWindowSizeToolStripMenuItem.Text = "Restore Default Settings"; this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); // @@ -523,7 +508,7 @@ this.toolStripButtonLoadGameGenie.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButtonLoadGameGenie.Image"))); this.toolStripButtonLoadGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButtonLoadGameGenie.Name = "toolStripButtonLoadGameGenie"; - this.toolStripButtonLoadGameGenie.Size = new System.Drawing.Size(68, 22); + this.toolStripButtonLoadGameGenie.Size = new System.Drawing.Size(75, 22); this.toolStripButtonLoadGameGenie.Text = "Game Genie"; this.toolStripButtonLoadGameGenie.ToolTipText = "Open the Game Genie Encoder/Decoder"; this.toolStripButtonLoadGameGenie.Click += new System.EventHandler(this.toolStripButton1_Click); @@ -789,13 +774,13 @@ this.removeSelectedToolStripMenuItem, this.disableAllCheatsToolStripMenuItem1}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(160, 70); + this.contextMenuStrip1.Size = new System.Drawing.Size(169, 70); // // toggleToolStripMenuItem // this.toggleToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Refresh1; this.toggleToolStripMenuItem.Name = "toggleToolStripMenuItem"; - this.toggleToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.toggleToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.toggleToolStripMenuItem.Text = "Toggle"; this.toggleToolStripMenuItem.Click += new System.EventHandler(this.toggleToolStripMenuItem_Click); // @@ -803,7 +788,7 @@ // this.removeSelectedToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete; this.removeSelectedToolStripMenuItem.Name = "removeSelectedToolStripMenuItem"; - this.removeSelectedToolStripMenuItem.Size = new System.Drawing.Size(159, 22); + this.removeSelectedToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.removeSelectedToolStripMenuItem.Text = "Remove Selected"; this.removeSelectedToolStripMenuItem.Click += new System.EventHandler(this.removeSelectedToolStripMenuItem_Click); // @@ -811,7 +796,7 @@ // this.disableAllCheatsToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.Stop; this.disableAllCheatsToolStripMenuItem1.Name = "disableAllCheatsToolStripMenuItem1"; - this.disableAllCheatsToolStripMenuItem1.Size = new System.Drawing.Size(159, 22); + this.disableAllCheatsToolStripMenuItem1.Size = new System.Drawing.Size(168, 22); this.disableAllCheatsToolStripMenuItem1.Text = "Disable All Cheats"; this.disableAllCheatsToolStripMenuItem1.Click += new System.EventHandler(this.disableAllCheatsToolStripMenuItem1_Click); // @@ -899,10 +884,8 @@ private System.Windows.Forms.Button AddCheatButton; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label NumCheatsLabel; - private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; - private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem; + private System.Windows.Forms.Label NumCheatsLabel; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ComboBox DomainComboBox; private System.Windows.Forms.Label label6; private System.Windows.Forms.Button EditButton; diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs index 8a5f8cf062..df6ffb9692 100644 --- a/BizHawk.MultiClient/tools/Cheats.cs +++ b/BizHawk.MultiClient/tools/Cheats.cs @@ -254,31 +254,8 @@ namespace BizHawk.MultiClient private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { - //Clear out recent Cheats list - //repopulate it with an up to date list recentToolStripMenuItem.DropDownItems.Clear(); - - if (Global.Config.RecentCheats.Empty) - { - var none = new ToolStripMenuItem {Enabled = false, Text = "None"}; - recentToolStripMenuItem.DropDownItems.Add(none); - } - else - { - for (int x = 0; x < Global.Config.RecentCheats.Count; x++) - { - string path = Global.Config.RecentCheats[x]; - var item = new ToolStripMenuItem {Text = path}; - item.Click += (o, ev) => LoadCheatFromRecent(path); - recentToolStripMenuItem.DropDownItems.Add(item); - } - } - - recentToolStripMenuItem.DropDownItems.Add("-"); - - var clearitem = new ToolStripMenuItem {Text = "&Clear"}; - clearitem.Click += (o, ev) => Global.Config.RecentCheats.Clear(); - recentToolStripMenuItem.DropDownItems.Add(clearitem); + recentToolStripMenuItem.DropDownItems.AddRange(Global.Config.RecentCheats.GenerateRecentMenu(LoadCheatFromRecent)); } private void LoadConfigSettings() @@ -739,7 +716,7 @@ namespace BizHawk.MultiClient { saveWindowPositionToolStripMenuItem.Checked = Global.Config.CheatsSaveWindowPosition; CheatsOnOffLoadToolStripMenuItem.Checked = Global.Config.DisableCheatsOnLoad; - autoloadDialogToolStripMenuItem.Checked = Global.Config.AutoLoadCheats; + autoloadDialogToolStripMenuItem.Checked = Global.Config.RecentCheats.AutoLoad; LoadCheatFileByGameToolStripMenuItem.Checked = Global.Config.LoadCheatFileByGame; saveCheatsOnCloseToolStripMenuItem.Checked = Global.Config.CheatsAutoSaveOnClose; showValuesAsHexToolStripMenuItem.Checked = Global.Config.Cheats_ValuesAsHex; @@ -1050,7 +1027,7 @@ namespace BizHawk.MultiClient private void autoloadDialogToolStripMenuItem_Click(object sender, EventArgs e) { - Global.Config.AutoLoadCheats ^= true; + Global.Config.RecentCheats.AutoLoad ^= true; } private void LoadCheatFileByGameToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.MultiClient/tools/Cheats.resx b/BizHawk.MultiClient/tools/Cheats.resx index 20794a4690..cf67c2e2c5 100644 --- a/BizHawk.MultiClient/tools/Cheats.resx +++ b/BizHawk.MultiClient/tools/Cheats.resx @@ -127,73 +127,73 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEPSURBVDhPrdPZasJAFAZgX8q+Q32N9o2kXkjphQsigoJC - ixa1VAWXiohG7IakbmjcNcYl5i8TCQSdGXPhgcPczHwz5xzGZrtWRN+bOM1wqo5gvAJfrIBy4w/cu8hh - VjyG3nDjuOcjkbTABB58cSRy9SMiiPSXhF6rTMDpedEPG0ktJfD8wQT26gEEMSAq4I3mqYCmaZCVHQZj - WQfst3f0Ep7CGSqw3amYzBWI/TkfcAdTZ4B60LCQt+hJK3yJEz7g8ifOAGWzhzRdo9WdofYt8QFSnzlI - 42bLDdqDBZqtMUpC3zpgbtxPe4rq5xDZSsc6YG6c8DtCodZDsihaA4x5s1bmGI0Zkw2X8lofWHf+AdjM - 9sNc+xBlAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU + 0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j + LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei + ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3 + mS9gn2bY4UY/UzQ7E9TqfeTFtnuB+XAfzSHKr11kSl/uBebDiZ89ZCst3OUkdwL28sIVsE83ock+EIQV + 2Mz2wxeg6/UAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPlZNdSNNRGMb/F110ZZEVhVBgeeHNICiiuggp - olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdPKMgr7kApFItTUkWZqVhSVYmao5Nev/xyoQ4k88Nyc - 8z6/93nP4QjCfy6lwc4ltZVso4P/tMyXRcmMHqZ0EeY6jZQVInzuf0e1Tb9Ina3P/tkpLD6XkNg8BJe5 - u93C+HDVrP4M2ZkcMOOw5tLZ9nxJyJE4HSExBoKkBQhVpTrGhso9zNPfiph0JlB+U01ZcRbmwnRMeWlc - 08opUCV6QissGsZ+WOY6z4hmuuXglC6pRYBbJSp+fzXNxnaZ66o1s3rkyKHWruJuWRYOcwZ2kxKr8TI3 - DCkU6+QYNUnuNGWmLEY+5uOK3degoKZcx3SfEvozPfVB3OtNhi4ZvI2nrTIc23U9gtmYwa8eNXzScq8i - l6bHWnfRwhHeREJzGFONgYw/CeB9qQSZNNR9FyUGBT87lfQ3plJj1zLTq4COGDegLVo0HmeqKZjx+gOM - PNzDYPU2lLF+4jhyN6BIl8pgexK3bRpaXopJuhJEwGloiWDmVSgTLw4xWreXoZrtfK/wp/nKak4E+s6/ - hDFHTkd9GndsOdCTBq1i3NdHmWgIYvRpAMO1OxlwSPhi2YpT641CuoWzsSfnAfnZiVRZ1Tjvx9GsF+bU - pF1BvWolD9JXUZmyDnOiD1cvbCZiYXfXCPrMi+gVZ8hOiiL53DHORwdzKnw/hw/uYt9uCTskfvj7+rBp - 41rWr/Fig7fX8j/Tsn/fcgx/ARfG3ml6M3rzAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp + olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4 + 4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm + YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl + 5Kni3aFlFg2j3y1z5mnRTJccnNIltQhwq0jFry+mOXNtpWZWDx1Z1NhV3C3JwGFOw25SYjVe5oYhiUKd + HKMmwQUrMWUw/CF3NnZvvYKqUh1TvUroS3fXe7HXkwidMngTS2t5KLbregSzMY2f3Wr4qKW6LJvGR1rX + 0MLor8OhKYTJBn/GHvvxrliCTBrsOqXIoOBHh5K+hmSq7FqmexTQHuUytkaKxuNMNgYyVneA4Qd7GKjc + hjLaRzxH7gIU6JIZaEvgtk1D8wsxSWecCDgNzWFMvwxm/PkhRmr3Mli1nW9lvjRdWc0Jf+/5jzRmyWmv + S+GOLQu6U6BFjPvqKOP1AYw88WOoZif9DgmfLVtxaj1RSLdwNvrkPCA3M54KqxrnvRia9MKcGrUrqFOt + 5H7qKsqT1mGO9+Lqhc2ELdw+U/r0i+gVZ8hMiCDx3DHORwZyKnQ/hw/uYt9uCTskPvh6e7Fp41rWr/Fg + g6eHO+A/lyD8ARfG3mk9fv1YAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIsSURBVDhPrZPdS5NxFMf3L3TfTdBFtzU1hmuxGjzlHMqq - YVgRvT2RL+XSZZqoWJlGLV8gW+HSScvpJJxU+AamSI2hTCVLM1e0xKGm2EQw+PY7v+j5tTIvoh+cy8/n - POec76NS/Y/37GkUVL72ZbR5l/DYvYDGhgjuO2ZQW/MJ9tsh3CifQmnJBAoLXiMvdxQXzgeh9Cawtweo - qV7FRm9ldQ3GtF4cTnvCSxF4Wxe5oLLiy195giMLK9htfg61WoblkEcI3I/muaC05PO6gp/w+/Ai4kw+ - FFyexgFzkxA462e54JLt3R+CX+GRyQi2SV5Yc8aRmuIUgrq7YS7IzhqNEfwODwbD2Kx3Q5YDMJkcQlBd - 9ZEL5DMBRbAe3OP/gE2JDThy9AWSkmqF4GblNLq7wE4JHD/5CpZjA3zbtDCamT6bOv+A+3DQ0glJsgvB - 1bJJdPjAMgA0ub6xu39F+fU5vlRaGM2cmRFU4OTUdhgMFUJwpXAcnmbgoXONBScKY3pOTJlP2JB+roh3 - Tk5h8H4P9PoyIbDljTEYqLoT5Z1JwEKCOK2EobezGJuag5x7DXuNbRzW7nFBpysSAoql4x6UzyYBwWfz - b+FNaB6hmSVcLLYjXu9icCPidz2ANjFfCDIzhtncy3zmrQYPtuyQ0NLRD1/XILr7/Bh4OYR9JgvUunok - MHi7pg4ajVUIKNOnT/XzeFLCKCR0ZzoVbZsWRjNTVyqCdyZkxwr+9a/+Dk60OMVjMFpXAAAAAElFTkSu - QmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW + DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3 + 8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ + 1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH + 4AJizD4UXJrCAUuzEDgbZrjgou2DiohshIcnQtgme5GTPYbkJKcQ1N8OckHW2REVi+RXuM8fxGaDG4oy + ALPZIQQ11Z+5QDk1oKJ/hjv7P2FTfCMOH3mFxMQ6IbhROYWOdrCnBI4dfwPr0V4+bRoY9UzXppMjcDdS + rC8hy3YhuFI2gTYf2A4Aza4f7N2/o/zaLB8qDYx6zszwr8P7k1thNFYIweXCMXgeAfedq2xxwjClZUeV + Jd2GtDNFETiJwfs8MBjKhMCWN8pgoLoqzE8miH1GjE7G4PsZjE7OQsm9ij2mFg7rdrug1xcJAa2l4w7W + r00Cgk/n38S7wBwC04u4UGxHrMHF4CbEJtyDLj5fCDIzhljfSxzeavRgyw4Zj9t64GvvQ0d3P3pfD2Kv + 2QqNvgFxDN6urYdWmyMElJMnevh60obRktA701PRtGlg1DOdSkXwzrisaMG/RZLWAE60OMW5fNhvAAAA + AElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHiSURBVDhPpZPRT5JRGMb9U0rHnHXtH9BaWa0222pe1EVb - 2briQq+6atlsyzVstIkhzcLSAfahtJbS0mESaQaJlIGTzBkslPEpiSDor+87LAnawM13e+7O+3uf55z3 - VFUdtBwT31AljQeELCNe+hwfCC//Yl9stbm0zMMerrc9J7i4XBliHwsU9ed2dunqf4PTHeBSS2dliGXU - JwDOEEifwR+WeWh+jTQpY5tIYHUleDKaQD8UFwquZIpd9Tk8ew4y2znkjTSRWFIASqt9YJX6Zje+hfUC - xGRziXO97m10IzK3pZ+0Pg3T/3btP0CLMYZjSuZo0zCf5uN5iEHJq+beTGVZTaRYiqzzNbyG6VVUADqk - nJBfmXpFF+VI00vqLgxS2/gsD1DzbqWze5O1phA3DF94YF0qciD/zrKwsoV7bgOjNIPm3OMCQE6mmf8e - wxeM4PH/YPzjIm29+ee9NZBEa4hy+X6I83dmhYzSNJoz3QVA/emrlKpVPysAWSVeLJFlLrzJmFfG/i7O - o0EPNQ368jtyrX1KAP6d/NdBt+091Sd05QEXb7pIZXYwDXnpsc9gfDEtJqvNBsskh4/fKw9o0DqV27YK - 1Taa0ZztoeZUF9UnO5XmDg4du1t5zff1mQ566A8dAOcMIXbZrQAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH + Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++ + 79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S + +1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO + rpQkVqdXfOz0bWAcVLghfaXxkUz3y2VxvpMGSwL3uMKh+gHezSSLEnNhX23vtYzKUirDfGyFj/Iy1mdx + UWqR8iKhwtQLxjgH659y4EwvVXWPiwJt3/Ws+muywRrlqvkDdx3zQrCN8l1ldnEd3/QqFmkS/akHJYGS + zjLzOUEwEsMf+sLI2zmaOou/93pPGoM5zvk7UU7fnBKxSBPoT7SXBNW1F/9Io2lKCNTCeomUyrS8xnBA + wfUqyf1eP5U1ptJD/o1LzeNCsHPydtqdr6k4aiwvOHvNSya3ibU/QIdrEkvfhJislc32MfYfuV1eUGPw + FF7bIVJVZ0N/soPK421UHGstlFvYd/hWecF/Qqf7CR0A5wwgSQA2AAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIISURBVDhPpZP7S1NxGMbPPxKaXVUkMEq8IpKUCoY/hGgI - ymqkDYYXcCjDZOANURSjCNGFQUTsl4GXVMxKk62YU4fXQpaIlygHQxBRH8/zwvyaIAYe+HLgnPN8nue9 - HA3nvDTq63oW/jm13XOwvPTB3DYFY5MH+bXfcN8ygfTSMSSXfESicQDxBqdYHwH29g9w2tnZ3UcguIvN - rR3417exuBJE5N1n/wfwLgXEOc38Bc6xNRHb+/y4nm49G0Bnit2zf9H6bkliE/jKuYxrd6oVgDWfjB+K - TWeKMyrGEVfowITvD9re/9ABVQrAhh0HHK+ZselMMaN/mvwtDb+aVqkA7HYIwIj3ysfluPTorJnP6Ezx - oHsD1s5ZXEktUwCOioB5f1CEPR9+wTG6iuiserTo8dkwng7HT/R+XUPF8xlcTjErAOdMcW6NW8STiwG8 - 7vej8oUPN/PsEv3t8Ao0TZP3T1u8uJRkUgAuSYHtO97oLxmXd5t9Ho8aPTK+GzntqNfrLm2fFoihwYOI - xGIF4KjoGBLzY1OrF9k6OOFxnwDC4wxIMX1G0pMhgVyMNyoA13PAtS7OrJk1PrC69LUdQWxuF6IybHrX - LRI7JrtZdoDAo1XmbjMyD+tjSXxGcXRmnYg5ttD9QuxDhN0uUgDOmbvNTpPOJaGAo2K36cyaGZvOFIfd - KlSA8/zRh9ABIDUG+1JpAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== diff --git a/BizHawk.MultiClient/tools/LuaConsole.Designer.cs b/BizHawk.MultiClient/tools/LuaConsole.Designer.cs index 0ff78d47c2..85e49a3150 100644 --- a/BizHawk.MultiClient/tools/LuaConsole.Designer.cs +++ b/BizHawk.MultiClient/tools/LuaConsole.Designer.cs @@ -46,13 +46,9 @@ this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.recentSessionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.clearToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.recentToolStripMenuItem = 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.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.scriptToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -83,6 +79,7 @@ this.OutputBox = new System.Windows.Forms.RichTextBox(); this.contextMenuStrip2 = new System.Windows.Forms.ContextMenuStrip(this.components); this.clearToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); + this.registeredFunctionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.NumberOfScripts = new System.Windows.Forms.Label(); this.OutputMessages = new System.Windows.Forms.Label(); @@ -100,7 +97,6 @@ this.LuaListView = new BizHawk.VirtualListView(); this.Script = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.PathName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.registeredFunctionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.contextMenuStrip2.SuspendLayout(); @@ -177,6 +173,7 @@ // // menuStrip1 // + this.menuStrip1.ClickThrough = true; this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, this.scriptToolStripMenuItem, @@ -251,59 +248,31 @@ // recentSessionsToolStripMenuItem // this.recentSessionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.noneToolStripMenuItem1, - this.toolStripSeparator8, - this.clearToolStripMenuItem1}); + this.toolStripSeparator8}); this.recentSessionsToolStripMenuItem.Name = "recentSessionsToolStripMenuItem"; this.recentSessionsToolStripMenuItem.Size = new System.Drawing.Size(237, 22); this.recentSessionsToolStripMenuItem.Text = "Recent Sessions"; this.recentSessionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentSessionsToolStripMenuItem_DropDownOpened); // - // noneToolStripMenuItem1 - // - this.noneToolStripMenuItem1.Name = "noneToolStripMenuItem1"; - this.noneToolStripMenuItem1.Size = new System.Drawing.Size(103, 22); - this.noneToolStripMenuItem1.Text = "None"; - // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(100, 6); - // - // clearToolStripMenuItem1 - // - this.clearToolStripMenuItem1.Name = "clearToolStripMenuItem1"; - this.clearToolStripMenuItem1.Size = new System.Drawing.Size(103, 22); - this.clearToolStripMenuItem1.Text = "Clear"; + this.toolStripSeparator8.Size = new System.Drawing.Size(149, 6); // // recentToolStripMenuItem // this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.noneToolStripMenuItem, - this.toolStripSeparator3, - this.clearToolStripMenuItem}); + this.toolStripSeparator3}); this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; this.recentToolStripMenuItem.Size = new System.Drawing.Size(237, 22); this.recentToolStripMenuItem.Text = "Recent Scripts"; this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); // - // noneToolStripMenuItem - // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.noneToolStripMenuItem.Text = "None"; - // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(100, 6); - // - // clearToolStripMenuItem - // - this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.clearToolStripMenuItem.Text = "Clear"; + this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); // // toolStripSeparator1 // @@ -550,7 +519,7 @@ this.clearToolStripMenuItem2, this.registeredFunctionsToolStripMenuItem}); this.contextMenuStrip2.Name = "contextMenuStrip2"; - this.contextMenuStrip2.Size = new System.Drawing.Size(185, 70); + this.contextMenuStrip2.Size = new System.Drawing.Size(185, 48); this.contextMenuStrip2.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip2_Opening); // // clearToolStripMenuItem2 @@ -560,6 +529,13 @@ this.clearToolStripMenuItem2.Text = "&Clear"; this.clearToolStripMenuItem2.Click += new System.EventHandler(this.clearToolStripMenuItem2_Click); // + // registeredFunctionsToolStripMenuItem + // + this.registeredFunctionsToolStripMenuItem.Name = "registeredFunctionsToolStripMenuItem"; + this.registeredFunctionsToolStripMenuItem.Size = new System.Drawing.Size(184, 22); + this.registeredFunctionsToolStripMenuItem.Text = "&Registered Functions"; + this.registeredFunctionsToolStripMenuItem.Click += new System.EventHandler(this.showRegisteredFunctionsToolStripMenuItem_Click); + // // groupBox1 // this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -740,13 +716,6 @@ this.PathName.Text = "Path"; this.PathName.Width = 195; // - // registeredFunctionsToolStripMenuItem - // - this.registeredFunctionsToolStripMenuItem.Name = "registeredFunctionsToolStripMenuItem"; - this.registeredFunctionsToolStripMenuItem.Size = new System.Drawing.Size(184, 22); - this.registeredFunctionsToolStripMenuItem.Text = "&Registered Functions"; - this.registeredFunctionsToolStripMenuItem.Click += new System.EventHandler(this.showRegisteredFunctionsToolStripMenuItem_Click); - // // LuaConsole // this.AllowDrop = true; @@ -802,10 +771,8 @@ private System.Windows.Forms.ToolStripMenuItem insertSeparatorToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem turnOffAllScriptsToolStripMenuItem; private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; - private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; - private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; private System.Windows.Forms.ToolStripMenuItem stopAllScriptsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem autoloadConsoleToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem removeScriptToolStripMenuItem; @@ -833,9 +800,7 @@ private System.Windows.Forms.ToolStripMenuItem openSessionToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator9; private System.Windows.Forms.ToolStripMenuItem recentSessionsToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; - private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem luaFunctionsListToolStripMenuItem; private System.Windows.Forms.ContextMenuStrip contextMenuStrip2; diff --git a/BizHawk.MultiClient/tools/LuaConsole.cs b/BizHawk.MultiClient/tools/LuaConsole.cs index 0d5e4340ee..fc82079470 100644 --- a/BizHawk.MultiClient/tools/LuaConsole.cs +++ b/BizHawk.MultiClient/tools/LuaConsole.cs @@ -98,7 +98,7 @@ namespace BizHawk.MultiClient private void LuaConsole_Load(object sender, EventArgs e) { LoadConfigSettings(); - if (Global.Config.AutoLoadLuaSession) + if (Global.Config.RecentLuaSession.AutoLoad) { if (!Global.Config.RecentLuaSession.Empty) { @@ -253,7 +253,7 @@ namespace BizHawk.MultiClient { saveWindowPositionToolStripMenuItem.Checked = Global.Config.LuaConsoleSaveWindowPosition; autoloadConsoleToolStripMenuItem.Checked = Global.Config.AutoLoadLuaConsole; - autoloadSessionToolStripMenuItem.Checked = Global.Config.AutoLoadLuaSession; + autoloadSessionToolStripMenuItem.Checked = Global.Config.RecentLuaSession.AutoLoad; disableScriptsOnLoadToolStripMenuItem.Checked = Global.Config.DisableLuaScriptsOnLoad; } @@ -532,31 +532,8 @@ namespace BizHawk.MultiClient private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { - //Clear out recent Cheats list - //repopulate it with an up to date list recentToolStripMenuItem.DropDownItems.Clear(); - - if (Global.Config.RecentLua.Empty) - { - var none = new ToolStripMenuItem {Enabled = false, Text = "None"}; - recentToolStripMenuItem.DropDownItems.Add(none); - } - else - { - for (int x = 0; x < Global.Config.RecentLua.Count; x++) - { - string path = Global.Config.RecentLua[x]; - var item = new ToolStripMenuItem {Text = path}; - item.Click += (o, ev) => LoadLuaFromRecent(path); - recentToolStripMenuItem.DropDownItems.Add(item); - } - } - - recentToolStripMenuItem.DropDownItems.Add("-"); - - var clearitem = new ToolStripMenuItem {Text = "&Clear"}; - clearitem.Click += (o, ev) => Global.Config.RecentLua.Clear(); - recentToolStripMenuItem.DropDownItems.Add(clearitem); + recentToolStripMenuItem.DropDownItems.AddRange(Global.Config.RecentLua.GenerateRecentMenu(LoadLuaFromRecent)); } private void LoadLuaFromRecent(string path) @@ -1008,31 +985,8 @@ namespace BizHawk.MultiClient private void recentSessionsToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { - //Clear out recent Cheats list - //repopulate it with an up to date list recentSessionsToolStripMenuItem.DropDownItems.Clear(); - - if (Global.Config.RecentLuaSession.Empty) - { - var none = new ToolStripMenuItem {Enabled = false, Text = "None"}; - recentSessionsToolStripMenuItem.DropDownItems.Add(none); - } - else - { - for (int x = 0; x < Global.Config.RecentLuaSession.Count; x++) - { - string path = Global.Config.RecentLuaSession[x]; - var item = new ToolStripMenuItem {Text = path}; - item.Click += (o, ev) => LoadSessionFromRecent(path); - recentSessionsToolStripMenuItem.DropDownItems.Add(item); - } - } - - recentSessionsToolStripMenuItem.DropDownItems.Add("-"); - - var clearitem = new ToolStripMenuItem {Text = "&Clear"}; - clearitem.Click += (o, ev) => Global.Config.RecentLuaSession.Clear(); - recentSessionsToolStripMenuItem.DropDownItems.Add(clearitem); + recentSessionsToolStripMenuItem.DropDownItems.AddRange(Global.Config.RecentLuaSession.GenerateRecentMenu(LoadSessionFromRecent)); } public void LoadSessionFromRecent(string file) @@ -1207,7 +1161,7 @@ namespace BizHawk.MultiClient private void autoloadSessionToolStripMenuItem_Click(object sender, EventArgs e) { - Global.Config.AutoLoadLuaSession ^= true; + Global.Config.RecentLuaSession.AutoLoad ^= true; } private void TogglePause() diff --git a/BizHawk.MultiClient/tools/NewRamWatch.cs b/BizHawk.MultiClient/tools/NewRamWatch.cs index 9a9588a6e2..fa7c25cc11 100644 --- a/BizHawk.MultiClient/tools/NewRamWatch.cs +++ b/BizHawk.MultiClient/tools/NewRamWatch.cs @@ -321,7 +321,7 @@ namespace BizHawk.MultiClient private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { recentToolStripMenuItem.DropDownItems.Clear(); - recentToolStripMenuItem.DropDownItems.AddRange(Global.Config.RecentWatches.GenerateRecentMenu(LoadWatchFromRecent).ToArray()); + recentToolStripMenuItem.DropDownItems.AddRange(Global.Config.RecentWatches.GenerateRecentMenu(LoadWatchFromRecent)); recentToolStripMenuItem.DropDownItems.Add(Global.Config.RecentWatches.GenerateAutoLoadItem()); } diff --git a/BizHawk.MultiClient/tools/RamSearch.Designer.cs b/BizHawk.MultiClient/tools/RamSearch.Designer.cs index 5658fe5fd3..62492d2214 100644 --- a/BizHawk.MultiClient/tools/RamSearch.Designer.cs +++ b/BizHawk.MultiClient/tools/RamSearch.Designer.cs @@ -58,6 +58,8 @@ this.unfreezeAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); this.viewInHexEditorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); + this.clearPreviewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1 = new MenuStripEx(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.newSearchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -68,9 +70,7 @@ this.appendFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TruncateFromFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.recentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.noneToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.searchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -149,8 +149,6 @@ this.MemDomainLabel = new System.Windows.Forms.Label(); this.MessageLabel = new System.Windows.Forms.Label(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); - this.clearPreviewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SearchtoolStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -354,7 +352,7 @@ this.toolStripSeparator14, this.clearPreviewToolStripMenuItem}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(216, 242); + this.contextMenuStrip1.Size = new System.Drawing.Size(216, 220); this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening); // // startNewSearchToolStripMenuItem @@ -434,6 +432,18 @@ this.viewInHexEditorToolStripMenuItem.Text = "View in Hex Editor"; this.viewInHexEditorToolStripMenuItem.Click += new System.EventHandler(this.viewInHexEditorToolStripMenuItem_Click); // + // toolStripSeparator14 + // + this.toolStripSeparator14.Name = "toolStripSeparator14"; + this.toolStripSeparator14.Size = new System.Drawing.Size(212, 6); + // + // clearPreviewToolStripMenuItem + // + this.clearPreviewToolStripMenuItem.Name = "clearPreviewToolStripMenuItem"; + this.clearPreviewToolStripMenuItem.Size = new System.Drawing.Size(215, 22); + this.clearPreviewToolStripMenuItem.Text = "&Clear Preview"; + this.clearPreviewToolStripMenuItem.Click += new System.EventHandler(this.clearPreviewToolStripMenuItem_Click); + // // menuStrip1 // this.menuStrip1.ClickThrough = true; @@ -522,31 +532,17 @@ // recentToolStripMenuItem // this.recentToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.noneToolStripMenuItem, - this.toolStripSeparator2, - this.clearToolStripMenuItem}); + this.toolStripSeparator2}); this.recentToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Recent; this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; this.recentToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.recentToolStripMenuItem.Text = "Recent"; this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); // - // noneToolStripMenuItem - // - this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.noneToolStripMenuItem.Text = "None"; - // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(100, 6); - // - // clearToolStripMenuItem - // - this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(103, 22); - this.clearToolStripMenuItem.Text = "Clear"; + this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); // // toolStripSeparator4 // @@ -1290,18 +1286,6 @@ this.MessageLabel.TabIndex = 9; this.MessageLabel.Text = " "; // - // toolStripSeparator14 - // - this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(212, 6); - // - // clearPreviewToolStripMenuItem - // - this.clearPreviewToolStripMenuItem.Name = "clearPreviewToolStripMenuItem"; - this.clearPreviewToolStripMenuItem.Size = new System.Drawing.Size(215, 22); - this.clearPreviewToolStripMenuItem.Text = "&Clear Preview"; - this.clearPreviewToolStripMenuItem.Click += new System.EventHandler(this.clearPreviewToolStripMenuItem_Click); - // // RamSearch // this.AllowDrop = true; @@ -1405,10 +1389,8 @@ private System.Windows.Forms.Label MemDomainLabel; private System.Windows.Forms.Label MessageLabel; private System.Windows.Forms.Label label1; - private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem noneToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; - private System.Windows.Forms.ToolStripMenuItem clearToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem recentToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripMenuItem appendFileToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripMenuItem searchToolStripMenuItem; diff --git a/BizHawk.MultiClient/tools/RamSearch.cs b/BizHawk.MultiClient/tools/RamSearch.cs index be6709b6f4..8bb7cedfa7 100644 --- a/BizHawk.MultiClient/tools/RamSearch.cs +++ b/BizHawk.MultiClient/tools/RamSearch.cs @@ -1856,31 +1856,8 @@ namespace BizHawk.MultiClient private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { - //Clear out recent Roms list - //repopulate it with an up to date list recentToolStripMenuItem.DropDownItems.Clear(); - - if (Global.Config.RecentSearches.Empty) - { - var none = new ToolStripMenuItem { Enabled = false, Text = "None" }; - recentToolStripMenuItem.DropDownItems.Add(none); - } - else - { - for (int x = 0; x < Global.Config.RecentSearches.Count; x++) - { - string path = Global.Config.RecentSearches[x]; - var item = new ToolStripMenuItem { Text = path }; - item.Click += (o, ev) => LoadSearchFromRecent(path); - recentToolStripMenuItem.DropDownItems.Add(item); - } - } - - recentToolStripMenuItem.DropDownItems.Add("-"); - - var clearitem = new ToolStripMenuItem { Text = "&Clear" }; - clearitem.Click += (o, ev) => Global.Config.RecentSearches.Clear(); - recentToolStripMenuItem.DropDownItems.Add(clearitem); + recentToolStripMenuItem.DropDownItems.AddRange(Global.Config.RecentSearches.GenerateRecentMenu(LoadSearchFromRecent)); } private void appendFileToolStripMenuItem_Click(object sender, EventArgs e) @@ -1921,7 +1898,7 @@ namespace BizHawk.MultiClient saveWindowPositionToolStripMenuItem.Checked = Global.Config.RamSearchSaveWindowPosition; previewModeToolStripMenuItem.Checked = Global.Config.RamSearchPreviewMode; alwaysExcludeRamSearchListToolStripMenuItem.Checked = Global.Config.AlwaysExcludeRamWatch; - autoloadDialogToolStripMenuItem.Checked = Global.Config.AutoLoadRamSearch; + autoloadDialogToolStripMenuItem.Checked = Global.Config.RecentSearches.AutoLoad; } private void searchToolStripMenuItem1_Click(object sender, EventArgs e) @@ -2713,7 +2690,7 @@ namespace BizHawk.MultiClient private void autoloadDialogToolStripMenuItem_Click(object sender, EventArgs e) { - Global.Config.AutoLoadRamSearch ^= true; + Global.Config.RecentSearches.AutoLoad ^= true; } private void unfreezeAllToolStripMenuItem_Click(object sender, EventArgs e)