diff --git a/Core/CodeDataLogger.cpp b/Core/CodeDataLogger.cpp index bc979b3d..6c3aa0f1 100644 --- a/Core/CodeDataLogger.cpp +++ b/Core/CodeDataLogger.cpp @@ -146,6 +146,12 @@ CdlRatios CodeDataLogger::GetRatios() return ratios; } +bool CodeDataLogger::IsNone(uint32_t absoluteAddr) +{ + return _cdlData[absoluteAddr] == (uint8_t)CdlPrgFlags::None; +} + + bool CodeDataLogger::IsCode(uint32_t absoluteAddr) { return (_cdlData[absoluteAddr] & (uint8_t)CdlPrgFlags::Code) == (uint8_t)CdlPrgFlags::Code; diff --git a/Core/CodeDataLogger.h b/Core/CodeDataLogger.h index 3a317951..0d7e69da 100644 --- a/Core/CodeDataLogger.h +++ b/Core/CodeDataLogger.h @@ -80,6 +80,7 @@ public: CdlRatios GetRatios(); + bool IsNone(uint32_t absoluteAddr); bool IsCode(uint32_t absoluteAddr); bool IsJumpTarget(uint32_t absoluteAddr); bool IsSubEntryPoint(uint32_t absoluteAddr); diff --git a/Core/Debugger.cpp b/Core/Debugger.cpp index dc733b52..d1f95942 100644 --- a/Core/Debugger.cpp +++ b/Core/Debugger.cpp @@ -767,6 +767,7 @@ bool Debugger::ProcessRamOperation(MemoryOperationType type, uint16_t &addr, uin AddressTypeInfo addressInfo; GetAbsoluteAddressAndType(addr, &addressInfo); int32_t absoluteAddr = addressInfo.Type == AddressType::PrgRom ? addressInfo.Address : -1; + bool isUnlogged = absoluteAddr >= 0 ? _codeDataLogger->IsNone(absoluteAddr) : false; if(addressInfo.Type == AddressType::PrgRom && addressInfo.Address >= 0 && type != MemoryOperationType::DummyRead && type != MemoryOperationType::DummyWrite && _runToCycle == -1) { if(type == MemoryOperationType::ExecOperand) { _codeDataLogger->SetFlag(absoluteAddr, CdlPrgFlags::Code); @@ -820,6 +821,9 @@ bool Debugger::ProcessRamOperation(MemoryOperationType type, uint16_t &addr, uin } else if(CheckFlag(DebuggerFlags::BreakOnUnofficialOpCode) && _disassembler->IsUnofficialOpCode(value)) { Step(1); breakSource = BreakSource::BreakOnUnofficialOpCode; + } else if(CheckFlag(DebuggerFlags::BreakOnUnlogged) && isUnlogged && type == MemoryOperationType::ExecOpCode && absoluteAddr >= 0) { + Step(1); + breakSource = BreakSource::BreakOnUnlogged; } if(_runToCycle != -1) { diff --git a/Core/DebuggerTypes.h b/Core/DebuggerTypes.h index 5f5e7a17..0669785b 100644 --- a/Core/DebuggerTypes.h +++ b/Core/DebuggerTypes.h @@ -43,6 +43,7 @@ enum class DebuggerFlags BreakOnPpu2006ScrollGlitch = 0x20000, BreakOnBusConflict = 0x40000, + BreakOnUnlogged = 0x80000, }; enum class BreakSource @@ -61,7 +62,8 @@ enum class BreakSource Pause = 10, BreakAfterSuspend = 11, BreakOnPpu2006ScrollGlitch = 12, - BreakOnBusConflict = 13 + BreakOnBusConflict = 13, + BreakOnUnlogged = 14 }; enum class AddressType diff --git a/Core/EmulationSettings.h b/Core/EmulationSettings.h index ed0ede8d..166c9d1d 100644 --- a/Core/EmulationSettings.h +++ b/Core/EmulationSettings.h @@ -733,6 +733,7 @@ private: bool _spritesEnabled = true; uint32_t _screenRotation = 0; uint32_t _exclusiveRefreshRate = 60; + uint32_t _exclusiveRefreshRate2 = 50; ConsoleType _consoleType = ConsoleType::Nes; ExpansionPortDevice _expansionDevice = ExpansionPortDevice::None; @@ -1316,6 +1317,30 @@ public: return _exclusiveRefreshRate; } + void SetExclusiveRefreshRate2(uint32_t refreshRate) + { + _exclusiveRefreshRate2 = refreshRate; + } + + uint32_t GetExclusiveRefreshRate2() + { + return _exclusiveRefreshRate2; + } + + uint32_t GetExclusiveRefreshRateByModel(NesModel m) + { + switch (m) { + case NesModel::NTSC: + return _exclusiveRefreshRate; + break; + case NesModel::PAL: + case NesModel::Dendy: + return _exclusiveRefreshRate2; + break; + } + return _exclusiveRefreshRate; + } + void SetExpansionDevice(ExpansionPortDevice expansionDevice) { _expansionDevice = expansionDevice; diff --git a/Core/HdData.h b/Core/HdData.h index afaea444..dc76338c 100644 --- a/Core/HdData.h +++ b/Core/HdData.h @@ -90,6 +90,7 @@ struct HdPpuTileInfo : public HdTileKey uint8_t BgColor; uint8_t SpriteColor; uint8_t PpuBackgroundColor; + uint32_t PaletteOffset; uint8_t OAMIndex; }; diff --git a/Core/HdPackBuilder.cpp b/Core/HdPackBuilder.cpp index 2da8630e..5242385b 100644 --- a/Core/HdPackBuilder.cpp +++ b/Core/HdPackBuilder.cpp @@ -273,22 +273,24 @@ void HdPackBuilder::ProcessTile(uint32_t x, uint32_t y, uint16_t tileAddr, HdPpu } } - if ((x == 0 || ((tile.OffsetX & 0x07) == 0)) && (y == 0 || ((tile.OffsetY & 0x07) == 0))) { + if ((x == 0 || ((tile.OffsetX & 0x07) == 0)) && (y == 0 || (((tile.OffsetY & 0x07) == 0) && !tile.VerticalMirroring) || (((tile.OffsetY & 0x07) == 0x07) && tile.VerticalMirroring))) { HdScreenTileInfo t; t.IsChrRamTile = tile.IsChrRamTile; t.PaletteColors = tile.PaletteColors; - t.ScreenX = x - tile.OffsetX; - t.ScreenY = y - tile.OffsetY - (tile.IsSpriteTile() ? 1 : 0); memcpy(t.TileData, tile.TileData, 16); t.TileIndex = tile.TileIndex; t.IsNew = isNew; if (tile.IsSpriteTile()) { + t.ScreenX = x; + t.ScreenY = y; t.BackgroundPriority = tile.BackgroundPriority; t.HorizontalMirroring = tile.HorizontalMirroring; t.VerticalMirroring = tile.VerticalMirroring; spritesOnScreen.push_back(t); } else { + t.ScreenX = x - tile.OffsetX; + t.ScreenY = y - tile.OffsetY; bgTilesOnScreen.push_back(t); } } diff --git a/Core/HdPackConditions.h b/Core/HdPackConditions.h index b35a7241..e11ac4d0 100644 --- a/Core/HdPackConditions.h +++ b/Core/HdPackConditions.h @@ -135,6 +135,55 @@ struct HdPackBgPriorityCondition : public HdPackCondition } }; +struct HdPackSpPalette0Condition : public HdPackCondition +{ + string GetConditionName() override { return "sppalette0"; } + string ToString() override { return ""; } + bool IsExcludedFromFile() override { return true; } + + bool InternalCheckCondition(HdScreenInfo* screenInfo, int x, int y, HdPpuTileInfo* tile) override + { + return tile && ((0x03 & (tile->PaletteOffset >> 2)) == 0x00); + } +}; + +struct HdPackSpPalette1Condition : public HdPackCondition +{ + string GetConditionName() override { return "sppalette1"; } + string ToString() override { return ""; } + bool IsExcludedFromFile() override { return true; } + + bool InternalCheckCondition(HdScreenInfo* screenInfo, int x, int y, HdPpuTileInfo* tile) override + { + return tile && ((0x03 & (tile->PaletteOffset >> 2)) == 0x01); + } +}; + +struct HdPackSpPalette2Condition : public HdPackCondition +{ + string GetConditionName() override { return "sppalette2"; } + string ToString() override { return ""; } + bool IsExcludedFromFile() override { return true; } + + bool InternalCheckCondition(HdScreenInfo* screenInfo, int x, int y, HdPpuTileInfo* tile) override + { + return tile && ((0x03 & (tile->PaletteOffset >> 2)) == 0x02); + } +}; + +struct HdPackSpPalette3Condition : public HdPackCondition +{ + string GetConditionName() override { return "sppalette3"; } + string ToString() override { return ""; } + bool IsExcludedFromFile() override { return true; } + + bool InternalCheckCondition(HdScreenInfo* screenInfo, int x, int y, HdPpuTileInfo* tile) override + { + return tile && ((0x03 & (tile->PaletteOffset >> 2)) == 0x03); + } +}; + + struct HdPackMemoryCheckCondition : public HdPackBaseMemoryCondition { HdPackMemoryCheckCondition() { _useCache = true; } diff --git a/Core/HdPackLoader.cpp b/Core/HdPackLoader.cpp index cbc419f6..cddfaa5e 100644 --- a/Core/HdPackLoader.cpp +++ b/Core/HdPackLoader.cpp @@ -13,6 +13,15 @@ #define checkConstraint(x, y) if(!(x)) { MessageManager::Log(y); return; } +static const char windowsSlash = '\\'; +static const char unixSlash = '/'; +#if defined(_WIN32) +#define convertPathToNative(filepath) std::replace(filepath.begin(), filepath.end(), unixSlash, windowsSlash) +#else +#define convertPathToNative(filepath) std::replace(filepath.begin(), filepath.end(), windowsSlash, unixSlash) +#endif +#define convertPathToNativeVector(vector, idx) if (vector.size() > idx) { convertPathToNative(vector[idx]); } + HdPackLoader::HdPackLoader() { } @@ -165,14 +174,17 @@ bool HdPackLoader::LoadPack() ProcessOverscanTag(tokens); } else if(lineContent.substr(0, 5) == "") { lineContent = lineContent.substr(5); + convertPathToNative(lineContent); if(!ProcessImgTag(lineContent)) { return false; } } else if(lineContent.substr(0, 7) == "") { tokens = StringUtilities::Split(lineContent.substr(7), ','); + convertPathToNativeVector(tokens, 0); ProcessPatchTag(tokens); } else if(lineContent.substr(0, 12) == "") { tokens = StringUtilities::Split(lineContent.substr(12), ','); + convertPathToNativeVector(tokens, 0); ProcessBackgroundTag(tokens, conditions); } else if(lineContent.substr(0, 11) == "") { tokens = StringUtilities::Split(lineContent.substr(11), ','); @@ -186,9 +198,11 @@ bool HdPackLoader::LoadPack() ProcessOptionTag(tokens); } else if(lineContent.substr(0, 5) == "") { tokens = StringUtilities::Split(lineContent.substr(5), ','); + convertPathToNativeVector(tokens, 2); ProcessBgmTag(tokens); } else if(lineContent.substr(0, 5) == "") { tokens = StringUtilities::Split(lineContent.substr(5), ','); + convertPathToNativeVector(tokens, 2); ProcessSfxTag(tokens); } } @@ -259,6 +273,38 @@ void HdPackLoader::InitializeGlobalConditions() HdPackCondition* invBgpriority = new HdPackBgPriorityCondition(); invBgpriority->Name = "!bgpriority"; _data->Conditions.push_back(unique_ptr(invBgpriority)); + + HdPackCondition* sppalette0 = new HdPackSpPalette0Condition(); + sppalette0->Name = "sppalette0"; + _data->Conditions.push_back(unique_ptr(sppalette0)); + + HdPackCondition* invSppalette0 = new HdPackSpPalette0Condition(); + invSppalette0->Name = "!sppalette0"; + _data->Conditions.push_back(unique_ptr(invSppalette0)); + + HdPackCondition* sppalette1 = new HdPackSpPalette1Condition(); + sppalette1->Name = "sppalette1"; + _data->Conditions.push_back(unique_ptr(sppalette1)); + + HdPackCondition* invSppalette1 = new HdPackSpPalette1Condition(); + invSppalette1->Name = "!sppalette1"; + _data->Conditions.push_back(unique_ptr(invSppalette1)); + + HdPackCondition* sppalette2 = new HdPackSpPalette2Condition(); + sppalette2->Name = "sppalette2"; + _data->Conditions.push_back(unique_ptr(sppalette2)); + + HdPackCondition* invSppalette2 = new HdPackSpPalette2Condition(); + invSppalette2->Name = "!sppalette2"; + _data->Conditions.push_back(unique_ptr(invSppalette2)); + + HdPackCondition* sppalette3 = new HdPackSpPalette3Condition(); + sppalette3->Name = "sppalette3"; + _data->Conditions.push_back(unique_ptr(sppalette3)); + + HdPackCondition* invSppalette3 = new HdPackSpPalette3Condition(); + invSppalette3->Name = "!sppalette3"; + _data->Conditions.push_back(unique_ptr(invSppalette3)); } void HdPackLoader::ProcessOverscanTag(vector &tokens) diff --git a/Core/HdPpu.cpp b/Core/HdPpu.cpp index 41bf45cb..92946d11 100644 --- a/Core/HdPpu.cpp +++ b/Core/HdPpu.cpp @@ -96,6 +96,7 @@ void HdPpu::DrawPixel() } else { tileInfo.Sprite[j].SpriteColor = ReadPaletteRAM(sprite.PaletteOffset + tileInfo.Sprite[j].SpriteColorIndex); } + tileInfo.Sprite[j].PaletteOffset = sprite.PaletteOffset; tileInfo.Sprite[j].PpuBackgroundColor = tileInfo.Tile.PpuBackgroundColor; tileInfo.Sprite[j].BgColorIndex = tileInfo.Tile.BgColorIndex; diff --git a/Docs/content/configuration/Video.md b/Docs/content/configuration/Video.md index 8e72ec7d..d58e19d5 100644 --- a/Docs/content/configuration/Video.md +++ b/Docs/content/configuration/Video.md @@ -23,7 +23,7 @@ chapter: false **Fulscreen Resolution**: This option is shown only when exclusive fullsceen mode is enabled. It allows you to select the screen resolution that should be used when in exclusive fullscreen mode. The default resolution is the current Windows screen resolution. -**Requested Refresh Rate**: This option is shown only when exclusive fullsceen mode is enabled. It allows you to select your preferred refresh rate when running in exclusive fullscreen mode. +**Requested Refresh Rate**: This option is shown only when exclusive fullsceen mode is enabled. It allows you to select your preferred refresh rate for NTSC and PAL/Dendy when running in exclusive fullscreen mode. **Use integer scale values when entering fullscreen mode**: By default, fullscreen mode fills the entire screen. However, this can cause non-integer scaling values to be used -- for example, in 1080p resolution, the scale becomes 4.5x. Since this can cause irregularly shaped pixels, you can use this option to use the nearest integer scale value instead (e.g 4x in this example). diff --git a/Docs/content/debugging/Debugger.md b/Docs/content/debugging/Debugger.md index d2bcf820..da283d2a 100644 --- a/Docs/content/debugging/Debugger.md +++ b/Docs/content/debugging/Debugger.md @@ -392,6 +392,7 @@ The `Break Options` submenu contains a number of options to configure under whic * **Break on unofficial opcodes**: Break the emulation whenever an unofficial opcode is about to execute. * **Break on BRK**: Break the emulation whenever a BRK instruction is about to execute. * **Break on CPU crash**: Break the emulation whenever an instruction that will cause the CPU to freeze is about to execute. +* **Break on unlogged code**: Break the emulation whenever an instruction that haven't been logged is about to execute.
diff --git a/Docs/content/hdpacks/_index.md b/Docs/content/hdpacks/_index.md index 33b7f591..f4b835e1 100644 --- a/Docs/content/hdpacks/_index.md +++ b/Docs/content/hdpacks/_index.md @@ -113,6 +113,10 @@ A number of built-in conditions can be used to check the value of some flags: * `hmirror`: True if the current pixel is a sprite pixel, and the sprite is mirrored horizontally. * `vmirror`: True if the current pixel is a sprite pixel, and the sprite is mirrored vertically. * `bgpriority`: True if the current pixel is a sprite pixel, and the sprite is marked as a background priority sprite. +* `sppalette0`: True if the current pixel is a sprite pixel, and the sprite is using the palette at address $3F10. +* `sppalette1`: True if the current pixel is a sprite pixel, and the sprite is using the palette at address $3F14. +* `sppalette2`: True if the current pixel is a sprite pixel, and the sprite is using the palette at address $3F18. +* `sppalette3`: True if the current pixel is a sprite pixel, and the sprite is using the palette at address $3F1C. **Example:** `[hmirror]...` diff --git a/Docs/static/images/SpriteViewer.png b/Docs/static/images/SpriteViewer.png index fa348578..9aaf71da 100644 Binary files a/Docs/static/images/SpriteViewer.png and b/Docs/static/images/SpriteViewer.png differ diff --git a/Docs/static/images/VideoOptions_General.png b/Docs/static/images/VideoOptions_General.png index 8b265f85..e5e07abe 100644 Binary files a/Docs/static/images/VideoOptions_General.png and b/Docs/static/images/VideoOptions_General.png differ diff --git a/GUI.NET/Config/DebugInfo.cs b/GUI.NET/Config/DebugInfo.cs index 3f814600..dbbfa27f 100644 --- a/GUI.NET/Config/DebugInfo.cs +++ b/GUI.NET/Config/DebugInfo.cs @@ -354,6 +354,7 @@ namespace Mesen.GUI.Config public bool BreakOnInit = true; public bool BreakOnPlay = false; public bool BreakOnFirstCycle = true; + public bool BreakOnUnlogged = false; public bool BringToFrontOnPause = false; public bool BringToFrontOnBreak = true; diff --git a/GUI.NET/Config/VideoInfo.cs b/GUI.NET/Config/VideoInfo.cs index 696455c6..37558f0b 100644 --- a/GUI.NET/Config/VideoInfo.cs +++ b/GUI.NET/Config/VideoInfo.cs @@ -57,6 +57,7 @@ namespace Mesen.GUI.Config public bool UseExclusiveFullscreen = false; public string FullscreenResolution = ""; public VideoRefreshRates ExclusiveFullscreenRefreshRate = VideoRefreshRates._60; + public VideoRefreshRates ExclusiveFullscreenRefreshRate2 = VideoRefreshRates._50; public bool UseCustomVsPalette = false; public bool ShowColorIndexes = true; @@ -100,6 +101,7 @@ namespace Mesen.GUI.Config InteropEmu.SetScreenRotation((UInt32)videoInfo.ScreenRotation); InteropEmu.SetExclusiveRefreshRate((UInt32)videoInfo.ExclusiveFullscreenRefreshRate); + InteropEmu.SetExclusiveRefreshRate2((UInt32)videoInfo.ExclusiveFullscreenRefreshRate2); InteropEmu.SetVideoFilter(videoInfo.VideoFilter); InteropEmu.SetVideoResizeFilter(videoInfo.UseBilinearInterpolation ? VideoResizeFilter.Bilinear : VideoResizeFilter.NearestNeighbor); diff --git a/GUI.NET/Debugger/Controls/ctrlSpriteViewer.Designer.cs b/GUI.NET/Debugger/Controls/ctrlSpriteViewer.Designer.cs index 0f951224..c9665d8e 100644 --- a/GUI.NET/Debugger/Controls/ctrlSpriteViewer.Designer.cs +++ b/GUI.NET/Debugger/Controls/ctrlSpriteViewer.Designer.cs @@ -29,188 +29,190 @@ namespace Mesen.GUI.Debugger.Controls /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.tlpMain = new System.Windows.Forms.TableLayoutPanel(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.grpSpriteInfo = new System.Windows.Forms.GroupBox(); - this.tlpInfo = new System.Windows.Forms.TableLayoutPanel(); - this.txtSpriteIndex = new System.Windows.Forms.TextBox(); - this.lblSpriteIndex = new System.Windows.Forms.Label(); - this.picPreview = new Mesen.GUI.Controls.ctrlMesenPictureBox(); - this.ctxMenu = new Mesen.GUI.Controls.ctrlMesenContextMenuStrip(this.components); - this.mnuEditInMemoryViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowInChrViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuCopyHdPack = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuCopyAllSpritesHdPack = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuCopyToClipboard = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuExportToPng = new System.Windows.Forms.ToolStripMenuItem(); - this.lblScreenPreview = new System.Windows.Forms.Label(); - this.lblTileIndex = new System.Windows.Forms.Label(); - this.txtTileIndex = new System.Windows.Forms.TextBox(); - this.lblTile = new System.Windows.Forms.Label(); - this.picTile = new System.Windows.Forms.PictureBox(); - this.chkDisplaySpriteOutlines = new System.Windows.Forms.CheckBox(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.chkHorizontalMirroring = new System.Windows.Forms.CheckBox(); - this.chkVerticalMirroring = new System.Windows.Forms.CheckBox(); - this.chkBackgroundPriority = new System.Windows.Forms.CheckBox(); - this.lblPosition = new System.Windows.Forms.Label(); - this.lblPalette = new System.Windows.Forms.Label(); - this.txtPosition = new System.Windows.Forms.TextBox(); - this.ctrlTilePalette = new Mesen.GUI.Debugger.Controls.ctrlTilePalette(); - this.lblTileAddress = new System.Windows.Forms.Label(); - this.lblPaletteAddr = new System.Windows.Forms.Label(); - this.txtTileAddress = new System.Windows.Forms.TextBox(); - this.txtPaletteAddress = new System.Windows.Forms.TextBox(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.radCpuPage = new System.Windows.Forms.RadioButton(); - this.label1 = new System.Windows.Forms.Label(); - this.radSpriteRam = new System.Windows.Forms.RadioButton(); - this.nudCpuPage = new System.Windows.Forms.NumericUpDown(); - this.picSprites = new Mesen.GUI.Controls.ctrlMesenPictureBox(); - this.tlpMain.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.grpSpriteInfo.SuspendLayout(); - this.tlpInfo.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picPreview)).BeginInit(); - this.ctxMenu.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picTile)).BeginInit(); - this.tableLayoutPanel1.SuspendLayout(); - this.tableLayoutPanel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudCpuPage)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.picSprites)).BeginInit(); - this.SuspendLayout(); - // - // tlpMain - // - this.tlpMain.ColumnCount = 2; - this.tlpMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tlpMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpMain.Controls.Add(this.tableLayoutPanel2, 1, 0); - this.tlpMain.Controls.Add(this.picSprites, 0, 0); - this.tlpMain.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpMain.Location = new System.Drawing.Point(0, 0); - this.tlpMain.Name = "tlpMain"; - this.tlpMain.RowCount = 3; - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpMain.Size = new System.Drawing.Size(682, 527); - this.tlpMain.TabIndex = 3; - // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.ColumnCount = 1; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Controls.Add(this.grpSpriteInfo, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel3, 0, 0); - this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel2.Location = new System.Drawing.Point(266, 0); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 2; - this.tlpMain.SetRowSpan(this.tableLayoutPanel2, 3); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(416, 527); - this.tableLayoutPanel2.TabIndex = 28; - // - // grpSpriteInfo - // - this.grpSpriteInfo.Controls.Add(this.tlpInfo); - this.grpSpriteInfo.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpSpriteInfo.Location = new System.Drawing.Point(3, 28); - this.grpSpriteInfo.Name = "grpSpriteInfo"; - this.grpSpriteInfo.Size = new System.Drawing.Size(410, 496); - this.grpSpriteInfo.TabIndex = 4; - this.grpSpriteInfo.TabStop = false; - this.grpSpriteInfo.Text = "Sprite Info"; - // - // tlpInfo - // - this.tlpInfo.ColumnCount = 5; - this.tlpInfo.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tlpInfo.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tlpInfo.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tlpInfo.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tlpInfo.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpInfo.Controls.Add(this.txtSpriteIndex, 1, 0); - this.tlpInfo.Controls.Add(this.lblSpriteIndex, 0, 0); - this.tlpInfo.Controls.Add(this.picPreview, 1, 5); - this.tlpInfo.Controls.Add(this.lblScreenPreview, 0, 5); - this.tlpInfo.Controls.Add(this.lblTileIndex, 0, 1); - this.tlpInfo.Controls.Add(this.txtTileIndex, 1, 1); - this.tlpInfo.Controls.Add(this.lblTile, 0, 2); - this.tlpInfo.Controls.Add(this.picTile, 1, 2); - this.tlpInfo.Controls.Add(this.chkDisplaySpriteOutlines, 0, 6); - this.tlpInfo.Controls.Add(this.tableLayoutPanel1, 2, 4); - this.tlpInfo.Controls.Add(this.lblPosition, 2, 3); - this.tlpInfo.Controls.Add(this.lblPalette, 2, 2); - this.tlpInfo.Controls.Add(this.txtPosition, 3, 3); - this.tlpInfo.Controls.Add(this.ctrlTilePalette, 3, 2); - this.tlpInfo.Controls.Add(this.lblTileAddress, 2, 0); - this.tlpInfo.Controls.Add(this.lblPaletteAddr, 2, 1); - this.tlpInfo.Controls.Add(this.txtTileAddress, 3, 0); - this.tlpInfo.Controls.Add(this.txtPaletteAddress, 3, 1); - this.tlpInfo.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpInfo.Location = new System.Drawing.Point(3, 16); - this.tlpInfo.Name = "tlpInfo"; - this.tlpInfo.RowCount = 7; - this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tlpInfo.Size = new System.Drawing.Size(404, 477); - this.tlpInfo.TabIndex = 0; - // - // txtSpriteIndex - // - this.txtSpriteIndex.BackColor = System.Drawing.SystemColors.Window; - this.txtSpriteIndex.Location = new System.Drawing.Point(75, 3); - this.txtSpriteIndex.Name = "txtSpriteIndex"; - this.txtSpriteIndex.ReadOnly = true; - this.txtSpriteIndex.Size = new System.Drawing.Size(26, 20); - this.txtSpriteIndex.TabIndex = 23; - // - // lblSpriteIndex - // - this.lblSpriteIndex.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblSpriteIndex.AutoSize = true; - this.lblSpriteIndex.Location = new System.Drawing.Point(3, 6); - this.lblSpriteIndex.Name = "lblSpriteIndex"; - this.lblSpriteIndex.Size = new System.Drawing.Size(66, 13); - this.lblSpriteIndex.TabIndex = 22; - this.lblSpriteIndex.Text = "Sprite Index:"; - // - // picPreview - // - this.picPreview.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.picPreview.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tlpInfo.SetColumnSpan(this.picPreview, 4); - this.picPreview.ContextMenuStrip = this.ctxMenu; - this.picPreview.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Default; - this.picPreview.Location = new System.Drawing.Point(76, 192); - this.picPreview.Margin = new System.Windows.Forms.Padding(4); - this.picPreview.Name = "picPreview"; - this.picPreview.Size = new System.Drawing.Size(258, 242); - this.picPreview.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.picPreview.TabIndex = 21; - this.picPreview.TabStop = false; - this.picPreview.DoubleClick += new System.EventHandler(this.picSprites_DoubleClick); - this.picPreview.MouseEnter += new System.EventHandler(this.picPreview_MouseEnter); - this.picPreview.MouseLeave += new System.EventHandler(this.picPreview_MouseLeave); - this.picPreview.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picPreview_MouseMove); - // - // ctxMenu - // - this.ctxMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + this.tlpMain = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.grpSpriteInfo = new System.Windows.Forms.GroupBox(); + this.tlpInfo = new System.Windows.Forms.TableLayoutPanel(); + this.txtSpriteIndex = new System.Windows.Forms.TextBox(); + this.lblSpriteIndex = new System.Windows.Forms.Label(); + this.picPreview = new Mesen.GUI.Controls.ctrlMesenPictureBox(); + this.ctxMenu = new Mesen.GUI.Controls.ctrlMesenContextMenuStrip(this.components); + this.mnuEditInMemoryViewer = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowInChrViewer = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuCopyHdPack = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuCopyAllSpritesHdPack = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuCopyToClipboard = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuExportToPng = new System.Windows.Forms.ToolStripMenuItem(); + this.lblScreenPreview = new System.Windows.Forms.Label(); + this.lblTileIndex = new System.Windows.Forms.Label(); + this.txtTileIndex = new System.Windows.Forms.TextBox(); + this.lblTile = new System.Windows.Forms.Label(); + this.picTile = new System.Windows.Forms.PictureBox(); + this.chkDisplaySpriteOutlines = new System.Windows.Forms.CheckBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.chkHorizontalMirroring = new System.Windows.Forms.CheckBox(); + this.chkVerticalMirroring = new System.Windows.Forms.CheckBox(); + this.chkBackgroundPriority = new System.Windows.Forms.CheckBox(); + this.lblPosition = new System.Windows.Forms.Label(); + this.lblPalette = new System.Windows.Forms.Label(); + this.txtPosition = new System.Windows.Forms.TextBox(); + this.ctrlTilePalette = new Mesen.GUI.Debugger.Controls.ctrlTilePalette(); + this.lblTileAddress = new System.Windows.Forms.Label(); + this.lblPaletteAddr = new System.Windows.Forms.Label(); + this.txtTileAddress = new System.Windows.Forms.TextBox(); + this.txtPaletteAddress = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.radCpuPage = new System.Windows.Forms.RadioButton(); + this.label1 = new System.Windows.Forms.Label(); + this.radSpriteRam = new System.Windows.Forms.RadioButton(); + this.nudCpuPage = new System.Windows.Forms.NumericUpDown(); + this.picSprites = new Mesen.GUI.Controls.ctrlMesenPictureBox(); + this.tlpMain.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.grpSpriteInfo.SuspendLayout(); + this.tlpInfo.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picPreview)).BeginInit(); + this.ctxMenu.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picTile)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudCpuPage)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.picSprites)).BeginInit(); + this.SuspendLayout(); + // + // tlpMain + // + this.tlpMain.ColumnCount = 2; + this.tlpMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpMain.Controls.Add(this.tableLayoutPanel2, 1, 0); + this.tlpMain.Controls.Add(this.picSprites, 0, 0); + this.tlpMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpMain.Location = new System.Drawing.Point(0, 0); + this.tlpMain.Name = "tlpMain"; + this.tlpMain.RowCount = 3; + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpMain.Size = new System.Drawing.Size(682, 486); + this.tlpMain.TabIndex = 3; + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 1; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Controls.Add(this.grpSpriteInfo, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.tableLayoutPanel3, 0, 0); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel2.Location = new System.Drawing.Point(266, 0); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 2; + this.tlpMain.SetRowSpan(this.tableLayoutPanel2, 3); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(416, 486); + this.tableLayoutPanel2.TabIndex = 28; + // + // grpSpriteInfo + // + this.grpSpriteInfo.Controls.Add(this.tlpInfo); + this.grpSpriteInfo.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpSpriteInfo.Location = new System.Drawing.Point(3, 26); + this.grpSpriteInfo.Name = "grpSpriteInfo"; + this.grpSpriteInfo.Size = new System.Drawing.Size(410, 458); + this.grpSpriteInfo.TabIndex = 4; + this.grpSpriteInfo.TabStop = false; + this.grpSpriteInfo.Text = "Sprite Info"; + // + // tlpInfo + // + this.tlpInfo.ColumnCount = 5; + this.tlpInfo.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpInfo.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpInfo.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpInfo.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpInfo.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpInfo.Controls.Add(this.txtSpriteIndex, 1, 0); + this.tlpInfo.Controls.Add(this.lblSpriteIndex, 0, 0); + this.tlpInfo.Controls.Add(this.picPreview, 1, 5); + this.tlpInfo.Controls.Add(this.lblScreenPreview, 0, 5); + this.tlpInfo.Controls.Add(this.lblTileIndex, 0, 1); + this.tlpInfo.Controls.Add(this.txtTileIndex, 1, 1); + this.tlpInfo.Controls.Add(this.lblTile, 0, 2); + this.tlpInfo.Controls.Add(this.picTile, 1, 2); + this.tlpInfo.Controls.Add(this.chkDisplaySpriteOutlines, 0, 6); + this.tlpInfo.Controls.Add(this.tableLayoutPanel1, 2, 4); + this.tlpInfo.Controls.Add(this.lblPosition, 2, 3); + this.tlpInfo.Controls.Add(this.lblPalette, 2, 2); + this.tlpInfo.Controls.Add(this.txtPosition, 3, 3); + this.tlpInfo.Controls.Add(this.ctrlTilePalette, 3, 2); + this.tlpInfo.Controls.Add(this.lblTileAddress, 2, 0); + this.tlpInfo.Controls.Add(this.lblPaletteAddr, 2, 1); + this.tlpInfo.Controls.Add(this.txtTileAddress, 3, 0); + this.tlpInfo.Controls.Add(this.txtPaletteAddress, 3, 1); + this.tlpInfo.Controls.Add(this.label2, 4, 3); + this.tlpInfo.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpInfo.Location = new System.Drawing.Point(3, 18); + this.tlpInfo.Name = "tlpInfo"; + this.tlpInfo.RowCount = 7; + this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpInfo.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 18F)); + this.tlpInfo.Size = new System.Drawing.Size(404, 437); + this.tlpInfo.TabIndex = 0; + // + // txtSpriteIndex + // + this.txtSpriteIndex.BackColor = System.Drawing.SystemColors.Window; + this.txtSpriteIndex.Location = new System.Drawing.Point(74, 3); + this.txtSpriteIndex.Name = "txtSpriteIndex"; + this.txtSpriteIndex.ReadOnly = true; + this.txtSpriteIndex.Size = new System.Drawing.Size(26, 22); + this.txtSpriteIndex.TabIndex = 23; + // + // lblSpriteIndex + // + this.lblSpriteIndex.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblSpriteIndex.AutoSize = true; + this.lblSpriteIndex.Location = new System.Drawing.Point(3, 8); + this.lblSpriteIndex.Name = "lblSpriteIndex"; + this.lblSpriteIndex.Size = new System.Drawing.Size(65, 12); + this.lblSpriteIndex.TabIndex = 22; + this.lblSpriteIndex.Text = "Sprite Index:"; + // + // picPreview + // + this.picPreview.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.picPreview.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tlpInfo.SetColumnSpan(this.picPreview, 4); + this.picPreview.ContextMenuStrip = this.ctxMenu; + this.picPreview.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Default; + this.picPreview.Location = new System.Drawing.Point(75, 186); + this.picPreview.Margin = new System.Windows.Forms.Padding(4); + this.picPreview.Name = "picPreview"; + this.picPreview.Size = new System.Drawing.Size(258, 224); + this.picPreview.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.picPreview.TabIndex = 21; + this.picPreview.TabStop = false; + this.picPreview.DoubleClick += new System.EventHandler(this.picSprites_DoubleClick); + this.picPreview.MouseEnter += new System.EventHandler(this.picPreview_MouseEnter); + this.picPreview.MouseLeave += new System.EventHandler(this.picPreview_MouseLeave); + this.picPreview.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picPreview_MouseMove); + // + // ctxMenu + // + this.ctxMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuEditInMemoryViewer, this.mnuShowInChrViewer, this.toolStripMenuItem1, @@ -219,373 +221,383 @@ namespace Mesen.GUI.Debugger.Controls this.toolStripMenuItem2, this.mnuCopyToClipboard, this.mnuExportToPng}); - this.ctxMenu.Name = "ctxMenu"; - this.ctxMenu.Size = new System.Drawing.Size(255, 148); - this.ctxMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenu_Opening); - // - // mnuEditInMemoryViewer - // - this.mnuEditInMemoryViewer.Image = global::Mesen.GUI.Properties.Resources.CheatCode; - this.mnuEditInMemoryViewer.Name = "mnuEditInMemoryViewer"; - this.mnuEditInMemoryViewer.Size = new System.Drawing.Size(254, 22); - this.mnuEditInMemoryViewer.Text = "Edit in Memory Viewer"; - this.mnuEditInMemoryViewer.Click += new System.EventHandler(this.mnuEditInMemoryViewer_Click); - // - // mnuShowInChrViewer - // - this.mnuShowInChrViewer.Image = global::Mesen.GUI.Properties.Resources.NextArrow; - this.mnuShowInChrViewer.Name = "mnuShowInChrViewer"; - this.mnuShowInChrViewer.ShortcutKeyDisplayString = "Dbl-Click"; - this.mnuShowInChrViewer.Size = new System.Drawing.Size(254, 22); - this.mnuShowInChrViewer.Text = "View in CHR viewer"; - this.mnuShowInChrViewer.Click += new System.EventHandler(this.mnuShowInChrViewer_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(251, 6); - // - // mnuCopyHdPack - // - this.mnuCopyHdPack.Name = "mnuCopyHdPack"; - this.mnuCopyHdPack.Size = new System.Drawing.Size(254, 22); - this.mnuCopyHdPack.Text = "Copy Tile (HD Pack Format)"; - this.mnuCopyHdPack.Click += new System.EventHandler(this.mnuCopyHdPack_Click); - // - // mnuCopyAllSpritesHdPack - // - this.mnuCopyAllSpritesHdPack.Name = "mnuCopyAllSpritesHdPack"; - this.mnuCopyAllSpritesHdPack.Size = new System.Drawing.Size(254, 22); - this.mnuCopyAllSpritesHdPack.Text = "Copy All Sprites (HD Pack Format)"; - this.mnuCopyAllSpritesHdPack.Click += new System.EventHandler(this.mnuCopyAllSpritesHdPack_Click); - // - // toolStripMenuItem2 - // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(251, 6); - // - // mnuCopyToClipboard - // - this.mnuCopyToClipboard.Image = global::Mesen.GUI.Properties.Resources.Copy; - this.mnuCopyToClipboard.Name = "mnuCopyToClipboard"; - this.mnuCopyToClipboard.Size = new System.Drawing.Size(254, 22); - this.mnuCopyToClipboard.Text = "Copy image to clipboard"; - this.mnuCopyToClipboard.Click += new System.EventHandler(this.mnuCopyToClipboard_Click); - // - // mnuExportToPng - // - this.mnuExportToPng.Image = global::Mesen.GUI.Properties.Resources.Export; - this.mnuExportToPng.Name = "mnuExportToPng"; - this.mnuExportToPng.Size = new System.Drawing.Size(254, 22); - this.mnuExportToPng.Text = "Export image to PNG"; - this.mnuExportToPng.Click += new System.EventHandler(this.mnuExportToPng_Click); - // - // lblScreenPreview - // - this.lblScreenPreview.AutoSize = true; - this.lblScreenPreview.Location = new System.Drawing.Point(3, 193); - this.lblScreenPreview.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0); - this.lblScreenPreview.Name = "lblScreenPreview"; - this.lblScreenPreview.Size = new System.Drawing.Size(48, 13); - this.lblScreenPreview.TabIndex = 20; - this.lblScreenPreview.Text = "Preview:"; - // - // lblTileIndex - // - this.lblTileIndex.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblTileIndex.AutoSize = true; - this.lblTileIndex.Location = new System.Drawing.Point(3, 32); - this.lblTileIndex.Name = "lblTileIndex"; - this.lblTileIndex.Size = new System.Drawing.Size(56, 13); - this.lblTileIndex.TabIndex = 0; - this.lblTileIndex.Text = "Tile Index:"; - // - // txtTileIndex - // - this.txtTileIndex.BackColor = System.Drawing.SystemColors.Window; - this.txtTileIndex.Location = new System.Drawing.Point(75, 29); - this.txtTileIndex.Name = "txtTileIndex"; - this.txtTileIndex.ReadOnly = true; - this.txtTileIndex.Size = new System.Drawing.Size(26, 20); - this.txtTileIndex.TabIndex = 7; - // - // lblTile - // - this.lblTile.AutoSize = true; - this.lblTile.Location = new System.Drawing.Point(3, 57); - this.lblTile.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0); - this.lblTile.Name = "lblTile"; - this.lblTile.Size = new System.Drawing.Size(27, 13); - this.lblTile.TabIndex = 6; - this.lblTile.Text = "Tile:"; - // - // picTile - // - this.picTile.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.picTile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picTile.Location = new System.Drawing.Point(75, 55); - this.picTile.Name = "picTile"; - this.tlpInfo.SetRowSpan(this.picTile, 3); - this.picTile.Size = new System.Drawing.Size(66, 130); - this.picTile.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.picTile.TabIndex = 12; - this.picTile.TabStop = false; - // - // chkDisplaySpriteOutlines - // - this.chkDisplaySpriteOutlines.AutoSize = true; - this.tlpInfo.SetColumnSpan(this.chkDisplaySpriteOutlines, 4); - this.chkDisplaySpriteOutlines.Location = new System.Drawing.Point(3, 441); - this.chkDisplaySpriteOutlines.Name = "chkDisplaySpriteOutlines"; - this.chkDisplaySpriteOutlines.Size = new System.Drawing.Size(227, 17); - this.chkDisplaySpriteOutlines.TabIndex = 27; - this.chkDisplaySpriteOutlines.Text = "Display outline around all sprites in preview"; - this.chkDisplaySpriteOutlines.UseVisualStyleBackColor = true; - this.chkDisplaySpriteOutlines.Click += new System.EventHandler(this.chkDisplaySpriteOutlines_Click); - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.AutoSize = true; - this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.tableLayoutPanel1.ColumnCount = 1; - this.tlpInfo.SetColumnSpan(this.tableLayoutPanel1, 2); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.chkHorizontalMirroring, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.chkVerticalMirroring, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.chkBackgroundPriority, 0, 2); - this.tableLayoutPanel1.Location = new System.Drawing.Point(144, 118); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(3); - this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.Size = new System.Drawing.Size(130, 57); - this.tableLayoutPanel1.TabIndex = 24; - // - // chkHorizontalMirroring - // - this.chkHorizontalMirroring.AutoCheck = false; - this.chkHorizontalMirroring.AutoSize = true; - this.chkHorizontalMirroring.Location = new System.Drawing.Point(6, 3); - this.chkHorizontalMirroring.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); - this.chkHorizontalMirroring.Name = "chkHorizontalMirroring"; - this.chkHorizontalMirroring.Size = new System.Drawing.Size(89, 17); - this.chkHorizontalMirroring.TabIndex = 13; - this.chkHorizontalMirroring.Text = "Horizontal flip"; - this.chkHorizontalMirroring.UseVisualStyleBackColor = true; - // - // chkVerticalMirroring - // - this.chkVerticalMirroring.AutoCheck = false; - this.chkVerticalMirroring.AutoSize = true; - this.chkVerticalMirroring.Location = new System.Drawing.Point(6, 20); - this.chkVerticalMirroring.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); - this.chkVerticalMirroring.Name = "chkVerticalMirroring"; - this.chkVerticalMirroring.Size = new System.Drawing.Size(77, 17); - this.chkVerticalMirroring.TabIndex = 14; - this.chkVerticalMirroring.Text = "Vertical flip"; - this.chkVerticalMirroring.UseVisualStyleBackColor = true; - // - // chkBackgroundPriority - // - this.chkBackgroundPriority.AutoCheck = false; - this.chkBackgroundPriority.AutoSize = true; - this.chkBackgroundPriority.Location = new System.Drawing.Point(6, 37); - this.chkBackgroundPriority.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); - this.chkBackgroundPriority.Name = "chkBackgroundPriority"; - this.chkBackgroundPriority.Size = new System.Drawing.Size(118, 17); - this.chkBackgroundPriority.TabIndex = 19; - this.chkBackgroundPriority.Text = "Background Priority"; - this.chkBackgroundPriority.UseVisualStyleBackColor = true; - // - // lblPosition - // - this.lblPosition.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPosition.AutoSize = true; - this.lblPosition.Location = new System.Drawing.Point(147, 98); - this.lblPosition.Name = "lblPosition"; - this.lblPosition.Size = new System.Drawing.Size(73, 13); - this.lblPosition.TabIndex = 16; - this.lblPosition.Text = "Position (X,Y):"; - // - // lblPalette - // - this.lblPalette.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPalette.AutoSize = true; - this.lblPalette.Location = new System.Drawing.Point(147, 68); - this.lblPalette.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0); - this.lblPalette.Name = "lblPalette"; - this.lblPalette.Size = new System.Drawing.Size(43, 13); - this.lblPalette.TabIndex = 26; - this.lblPalette.Text = "Palette:"; - // - // txtPosition - // - this.txtPosition.BackColor = System.Drawing.SystemColors.Window; - this.txtPosition.Location = new System.Drawing.Point(237, 95); - this.txtPosition.Name = "txtPosition"; - this.txtPosition.ReadOnly = true; - this.txtPosition.Size = new System.Drawing.Size(66, 20); - this.txtPosition.TabIndex = 18; - // - // ctrlTilePalette - // - this.ctrlTilePalette.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.tlpInfo.SetColumnSpan(this.ctrlTilePalette, 2); - this.ctrlTilePalette.DisplayIndexes = false; - this.ctrlTilePalette.HighlightMouseOver = false; - this.ctrlTilePalette.Location = new System.Drawing.Point(237, 55); - this.ctrlTilePalette.Name = "ctrlTilePalette"; - this.ctrlTilePalette.Size = new System.Drawing.Size(130, 34); - this.ctrlTilePalette.TabIndex = 25; - // - // lblTileAddress - // - this.lblTileAddress.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblTileAddress.AutoSize = true; - this.lblTileAddress.Location = new System.Drawing.Point(147, 6); - this.lblTileAddress.Name = "lblTileAddress"; - this.lblTileAddress.Size = new System.Drawing.Size(68, 13); - this.lblTileAddress.TabIndex = 1; - this.lblTileAddress.Text = "Tile Address:"; - // - // lblPaletteAddr - // - this.lblPaletteAddr.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblPaletteAddr.AutoSize = true; - this.lblPaletteAddr.Location = new System.Drawing.Point(147, 32); - this.lblPaletteAddr.Name = "lblPaletteAddr"; - this.lblPaletteAddr.Size = new System.Drawing.Size(84, 13); - this.lblPaletteAddr.TabIndex = 15; - this.lblPaletteAddr.Text = "Palette Address:"; - // - // txtTileAddress - // - this.txtTileAddress.BackColor = System.Drawing.SystemColors.Window; - this.txtTileAddress.Location = new System.Drawing.Point(237, 3); - this.txtTileAddress.Name = "txtTileAddress"; - this.txtTileAddress.ReadOnly = true; - this.txtTileAddress.Size = new System.Drawing.Size(42, 20); - this.txtTileAddress.TabIndex = 8; - // - // txtPaletteAddress - // - this.txtPaletteAddress.BackColor = System.Drawing.SystemColors.Window; - this.txtPaletteAddress.Location = new System.Drawing.Point(237, 29); - this.txtPaletteAddress.Name = "txtPaletteAddress"; - this.txtPaletteAddress.ReadOnly = true; - this.txtPaletteAddress.Size = new System.Drawing.Size(42, 20); - this.txtPaletteAddress.TabIndex = 17; - // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.ColumnCount = 5; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Controls.Add(this.radCpuPage, 2, 0); - this.tableLayoutPanel3.Controls.Add(this.label1, 0, 0); - this.tableLayoutPanel3.Controls.Add(this.radSpriteRam, 1, 0); - this.tableLayoutPanel3.Controls.Add(this.nudCpuPage, 3, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 1; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(416, 25); - this.tableLayoutPanel3.TabIndex = 5; - // - // radCpuPage - // - this.radCpuPage.AutoSize = true; - this.radCpuPage.Location = new System.Drawing.Point(164, 3); - this.radCpuPage.Name = "radCpuPage"; - this.radCpuPage.Size = new System.Drawing.Size(85, 17); - this.radCpuPage.TabIndex = 2; - this.radCpuPage.Text = "CPU Page #"; - this.radCpuPage.UseVisualStyleBackColor = true; - // - // label1 - // - this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 6); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(70, 13); - this.label1.TabIndex = 0; - this.label1.Text = "Data Source:"; - // - // radSpriteRam - // - this.radSpriteRam.AutoSize = true; - this.radSpriteRam.Checked = true; - this.radSpriteRam.Location = new System.Drawing.Point(79, 3); - this.radSpriteRam.Name = "radSpriteRam"; - this.radSpriteRam.Size = new System.Drawing.Size(79, 17); - this.radSpriteRam.TabIndex = 1; - this.radSpriteRam.TabStop = true; - this.radSpriteRam.Text = "Sprite RAM"; - this.radSpriteRam.UseVisualStyleBackColor = true; - // - // nudCpuPage - // - this.nudCpuPage.Hexadecimal = true; - this.nudCpuPage.Location = new System.Drawing.Point(255, 3); - this.nudCpuPage.Maximum = new decimal(new int[] { + this.ctxMenu.Name = "ctxMenu"; + this.ctxMenu.Size = new System.Drawing.Size(264, 148); + this.ctxMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ctxMenu_Opening); + // + // mnuEditInMemoryViewer + // + this.mnuEditInMemoryViewer.Image = global::Mesen.GUI.Properties.Resources.CheatCode; + this.mnuEditInMemoryViewer.Name = "mnuEditInMemoryViewer"; + this.mnuEditInMemoryViewer.Size = new System.Drawing.Size(263, 22); + this.mnuEditInMemoryViewer.Text = "Edit in Memory Viewer"; + this.mnuEditInMemoryViewer.Click += new System.EventHandler(this.mnuEditInMemoryViewer_Click); + // + // mnuShowInChrViewer + // + this.mnuShowInChrViewer.Image = global::Mesen.GUI.Properties.Resources.NextArrow; + this.mnuShowInChrViewer.Name = "mnuShowInChrViewer"; + this.mnuShowInChrViewer.ShortcutKeyDisplayString = "Dbl-Click"; + this.mnuShowInChrViewer.Size = new System.Drawing.Size(263, 22); + this.mnuShowInChrViewer.Text = "View in CHR viewer"; + this.mnuShowInChrViewer.Click += new System.EventHandler(this.mnuShowInChrViewer_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(260, 6); + // + // mnuCopyHdPack + // + this.mnuCopyHdPack.Name = "mnuCopyHdPack"; + this.mnuCopyHdPack.Size = new System.Drawing.Size(263, 22); + this.mnuCopyHdPack.Text = "Copy Tile (HD Pack Format)"; + this.mnuCopyHdPack.Click += new System.EventHandler(this.mnuCopyHdPack_Click); + // + // mnuCopyAllSpritesHdPack + // + this.mnuCopyAllSpritesHdPack.Name = "mnuCopyAllSpritesHdPack"; + this.mnuCopyAllSpritesHdPack.Size = new System.Drawing.Size(263, 22); + this.mnuCopyAllSpritesHdPack.Text = "Copy All Sprites (HD Pack Format)"; + this.mnuCopyAllSpritesHdPack.Click += new System.EventHandler(this.mnuCopyAllSpritesHdPack_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(260, 6); + // + // mnuCopyToClipboard + // + this.mnuCopyToClipboard.Image = global::Mesen.GUI.Properties.Resources.Copy; + this.mnuCopyToClipboard.Name = "mnuCopyToClipboard"; + this.mnuCopyToClipboard.Size = new System.Drawing.Size(263, 22); + this.mnuCopyToClipboard.Text = "Copy image to clipboard"; + this.mnuCopyToClipboard.Click += new System.EventHandler(this.mnuCopyToClipboard_Click); + // + // mnuExportToPng + // + this.mnuExportToPng.Image = global::Mesen.GUI.Properties.Resources.Export; + this.mnuExportToPng.Name = "mnuExportToPng"; + this.mnuExportToPng.Size = new System.Drawing.Size(263, 22); + this.mnuExportToPng.Text = "Export image to PNG"; + this.mnuExportToPng.Click += new System.EventHandler(this.mnuExportToPng_Click); + // + // lblScreenPreview + // + this.lblScreenPreview.AutoSize = true; + this.lblScreenPreview.Location = new System.Drawing.Point(3, 187); + this.lblScreenPreview.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0); + this.lblScreenPreview.Name = "lblScreenPreview"; + this.lblScreenPreview.Size = new System.Drawing.Size(45, 12); + this.lblScreenPreview.TabIndex = 20; + this.lblScreenPreview.Text = "Preview:"; + // + // lblTileIndex + // + this.lblTileIndex.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblTileIndex.AutoSize = true; + this.lblTileIndex.Location = new System.Drawing.Point(3, 36); + this.lblTileIndex.Name = "lblTileIndex"; + this.lblTileIndex.Size = new System.Drawing.Size(56, 12); + this.lblTileIndex.TabIndex = 0; + this.lblTileIndex.Text = "Tile Index:"; + // + // txtTileIndex + // + this.txtTileIndex.BackColor = System.Drawing.SystemColors.Window; + this.txtTileIndex.Location = new System.Drawing.Point(74, 31); + this.txtTileIndex.Name = "txtTileIndex"; + this.txtTileIndex.ReadOnly = true; + this.txtTileIndex.Size = new System.Drawing.Size(26, 22); + this.txtTileIndex.TabIndex = 7; + // + // lblTile + // + this.lblTile.AutoSize = true; + this.lblTile.Location = new System.Drawing.Point(3, 61); + this.lblTile.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0); + this.lblTile.Name = "lblTile"; + this.lblTile.Size = new System.Drawing.Size(26, 12); + this.lblTile.TabIndex = 6; + this.lblTile.Text = "Tile:"; + // + // picTile + // + this.picTile.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.picTile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.picTile.Location = new System.Drawing.Point(74, 59); + this.picTile.Name = "picTile"; + this.tlpInfo.SetRowSpan(this.picTile, 3); + this.picTile.Size = new System.Drawing.Size(66, 120); + this.picTile.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.picTile.TabIndex = 12; + this.picTile.TabStop = false; + // + // chkDisplaySpriteOutlines + // + this.chkDisplaySpriteOutlines.AutoSize = true; + this.tlpInfo.SetColumnSpan(this.chkDisplaySpriteOutlines, 4); + this.chkDisplaySpriteOutlines.Location = new System.Drawing.Point(3, 417); + this.chkDisplaySpriteOutlines.Name = "chkDisplaySpriteOutlines"; + this.chkDisplaySpriteOutlines.Size = new System.Drawing.Size(228, 16); + this.chkDisplaySpriteOutlines.TabIndex = 27; + this.chkDisplaySpriteOutlines.Text = "Display outline around all sprites in preview"; + this.chkDisplaySpriteOutlines.UseVisualStyleBackColor = true; + this.chkDisplaySpriteOutlines.Click += new System.EventHandler(this.chkDisplaySpriteOutlines_Click); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.AutoSize = true; + this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + this.tableLayoutPanel1.ColumnCount = 1; + this.tlpInfo.SetColumnSpan(this.tableLayoutPanel1, 2); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Controls.Add(this.chkHorizontalMirroring, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.chkVerticalMirroring, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.chkBackgroundPriority, 0, 2); + this.tableLayoutPanel1.Location = new System.Drawing.Point(143, 121); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(3); + this.tableLayoutPanel1.RowCount = 3; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.Size = new System.Drawing.Size(132, 54); + this.tableLayoutPanel1.TabIndex = 24; + // + // chkHorizontalMirroring + // + this.chkHorizontalMirroring.AutoCheck = false; + this.chkHorizontalMirroring.AutoSize = true; + this.chkHorizontalMirroring.Location = new System.Drawing.Point(6, 3); + this.chkHorizontalMirroring.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.chkHorizontalMirroring.Name = "chkHorizontalMirroring"; + this.chkHorizontalMirroring.Size = new System.Drawing.Size(92, 16); + this.chkHorizontalMirroring.TabIndex = 13; + this.chkHorizontalMirroring.Text = "Horizontal flip"; + this.chkHorizontalMirroring.UseVisualStyleBackColor = true; + // + // chkVerticalMirroring + // + this.chkVerticalMirroring.AutoCheck = false; + this.chkVerticalMirroring.AutoSize = true; + this.chkVerticalMirroring.Location = new System.Drawing.Point(6, 19); + this.chkVerticalMirroring.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.chkVerticalMirroring.Name = "chkVerticalMirroring"; + this.chkVerticalMirroring.Size = new System.Drawing.Size(79, 16); + this.chkVerticalMirroring.TabIndex = 14; + this.chkVerticalMirroring.Text = "Vertical flip"; + this.chkVerticalMirroring.UseVisualStyleBackColor = true; + // + // chkBackgroundPriority + // + this.chkBackgroundPriority.AutoCheck = false; + this.chkBackgroundPriority.AutoSize = true; + this.chkBackgroundPriority.Location = new System.Drawing.Point(6, 35); + this.chkBackgroundPriority.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.chkBackgroundPriority.Name = "chkBackgroundPriority"; + this.chkBackgroundPriority.Size = new System.Drawing.Size(120, 16); + this.chkBackgroundPriority.TabIndex = 19; + this.chkBackgroundPriority.Text = "Background Priority"; + this.chkBackgroundPriority.UseVisualStyleBackColor = true; + // + // lblPosition + // + this.lblPosition.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPosition.AutoSize = true; + this.lblPosition.Location = new System.Drawing.Point(146, 101); + this.lblPosition.Name = "lblPosition"; + this.lblPosition.Size = new System.Drawing.Size(75, 12); + this.lblPosition.TabIndex = 16; + this.lblPosition.Text = "Position (X,Y):"; + // + // lblPalette + // + this.lblPalette.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPalette.AutoSize = true; + this.lblPalette.Location = new System.Drawing.Point(146, 71); + this.lblPalette.Margin = new System.Windows.Forms.Padding(3, 5, 3, 0); + this.lblPalette.Name = "lblPalette"; + this.lblPalette.Size = new System.Drawing.Size(38, 12); + this.lblPalette.TabIndex = 26; + this.lblPalette.Text = "Palette:"; + // + // txtPosition + // + this.txtPosition.BackColor = System.Drawing.SystemColors.Window; + this.txtPosition.Location = new System.Drawing.Point(230, 96); + this.txtPosition.Name = "txtPosition"; + this.txtPosition.ReadOnly = true; + this.txtPosition.Size = new System.Drawing.Size(66, 22); + this.txtPosition.TabIndex = 18; + // + // ctrlTilePalette + // + this.ctrlTilePalette.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.tlpInfo.SetColumnSpan(this.ctrlTilePalette, 2); + this.ctrlTilePalette.DisplayIndexes = false; + this.ctrlTilePalette.HighlightMouseOver = false; + this.ctrlTilePalette.Location = new System.Drawing.Point(230, 59); + this.ctrlTilePalette.Name = "ctrlTilePalette"; + this.ctrlTilePalette.Size = new System.Drawing.Size(130, 31); + this.ctrlTilePalette.TabIndex = 25; + // + // lblTileAddress + // + this.lblTileAddress.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblTileAddress.AutoSize = true; + this.lblTileAddress.Location = new System.Drawing.Point(146, 8); + this.lblTileAddress.Name = "lblTileAddress"; + this.lblTileAddress.Size = new System.Drawing.Size(66, 12); + this.lblTileAddress.TabIndex = 1; + this.lblTileAddress.Text = "Tile Address:"; + // + // lblPaletteAddr + // + this.lblPaletteAddr.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblPaletteAddr.AutoSize = true; + this.lblPaletteAddr.Location = new System.Drawing.Point(146, 36); + this.lblPaletteAddr.Name = "lblPaletteAddr"; + this.lblPaletteAddr.Size = new System.Drawing.Size(78, 12); + this.lblPaletteAddr.TabIndex = 15; + this.lblPaletteAddr.Text = "Palette Address:"; + // + // txtTileAddress + // + this.txtTileAddress.BackColor = System.Drawing.SystemColors.Window; + this.txtTileAddress.Location = new System.Drawing.Point(230, 3); + this.txtTileAddress.Name = "txtTileAddress"; + this.txtTileAddress.ReadOnly = true; + this.txtTileAddress.Size = new System.Drawing.Size(42, 22); + this.txtTileAddress.TabIndex = 8; + // + // txtPaletteAddress + // + this.txtPaletteAddress.BackColor = System.Drawing.SystemColors.Window; + this.txtPaletteAddress.Location = new System.Drawing.Point(230, 31); + this.txtPaletteAddress.Name = "txtPaletteAddress"; + this.txtPaletteAddress.ReadOnly = true; + this.txtPaletteAddress.Size = new System.Drawing.Size(42, 22); + this.txtPaletteAddress.TabIndex = 17; + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(302, 101); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(88, 12); + this.label2.TabIndex = 28; + this.label2.Text = "(Y = OAM[0] +1)"; + // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.ColumnCount = 5; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel3.Controls.Add(this.radCpuPage, 2, 0); + this.tableLayoutPanel3.Controls.Add(this.label1, 0, 0); + this.tableLayoutPanel3.Controls.Add(this.radSpriteRam, 1, 0); + this.tableLayoutPanel3.Controls.Add(this.nudCpuPage, 3, 0); + this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 1; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(416, 23); + this.tableLayoutPanel3.TabIndex = 5; + // + // radCpuPage + // + this.radCpuPage.AutoSize = true; + this.radCpuPage.Location = new System.Drawing.Point(158, 3); + this.radCpuPage.Name = "radCpuPage"; + this.radCpuPage.Size = new System.Drawing.Size(79, 16); + this.radCpuPage.TabIndex = 2; + this.radCpuPage.Text = "CPU Page #"; + this.radCpuPage.UseVisualStyleBackColor = true; + // + // label1 + // + this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(3, 5); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(64, 12); + this.label1.TabIndex = 0; + this.label1.Text = "Data Source:"; + // + // radSpriteRam + // + this.radSpriteRam.AutoSize = true; + this.radSpriteRam.Checked = true; + this.radSpriteRam.Location = new System.Drawing.Point(73, 3); + this.radSpriteRam.Name = "radSpriteRam"; + this.radSpriteRam.Size = new System.Drawing.Size(79, 16); + this.radSpriteRam.TabIndex = 1; + this.radSpriteRam.TabStop = true; + this.radSpriteRam.Text = "Sprite RAM"; + this.radSpriteRam.UseVisualStyleBackColor = true; + // + // nudCpuPage + // + this.nudCpuPage.Hexadecimal = true; + this.nudCpuPage.Location = new System.Drawing.Point(243, 3); + this.nudCpuPage.Maximum = new decimal(new int[] { 255, 0, 0, 0}); - this.nudCpuPage.Name = "nudCpuPage"; - this.nudCpuPage.Size = new System.Drawing.Size(42, 20); - this.nudCpuPage.TabIndex = 3; - this.nudCpuPage.Click += new System.EventHandler(this.nudCpuPage_Click); - // - // picSprites - // - this.picSprites.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picSprites.ContextMenuStrip = this.ctxMenu; - this.picSprites.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Default; - this.picSprites.Location = new System.Drawing.Point(4, 4); - this.picSprites.Margin = new System.Windows.Forms.Padding(4); - this.picSprites.Name = "picSprites"; - this.tlpMain.SetRowSpan(this.picSprites, 2); - this.picSprites.Size = new System.Drawing.Size(258, 514); - this.picSprites.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.picSprites.TabIndex = 0; - this.picSprites.TabStop = false; - this.picSprites.DoubleClick += new System.EventHandler(this.picSprites_DoubleClick); - this.picSprites.MouseEnter += new System.EventHandler(this.picSprites_MouseEnter); - this.picSprites.MouseLeave += new System.EventHandler(this.picSprites_MouseLeave); - this.picSprites.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picSprites_MouseMove); - // - // ctrlSpriteViewer - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.tlpMain); - this.Name = "ctrlSpriteViewer"; - this.Size = new System.Drawing.Size(682, 527); - this.tlpMain.ResumeLayout(false); - this.tableLayoutPanel2.ResumeLayout(false); - this.grpSpriteInfo.ResumeLayout(false); - this.tlpInfo.ResumeLayout(false); - this.tlpInfo.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picPreview)).EndInit(); - this.ctxMenu.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.picTile)).EndInit(); - this.tableLayoutPanel1.ResumeLayout(false); - this.tableLayoutPanel1.PerformLayout(); - this.tableLayoutPanel3.ResumeLayout(false); - this.tableLayoutPanel3.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.nudCpuPage)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.picSprites)).EndInit(); - this.ResumeLayout(false); + this.nudCpuPage.Name = "nudCpuPage"; + this.nudCpuPage.Size = new System.Drawing.Size(42, 22); + this.nudCpuPage.TabIndex = 3; + this.nudCpuPage.Click += new System.EventHandler(this.nudCpuPage_Click); + // + // picSprites + // + this.picSprites.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.picSprites.ContextMenuStrip = this.ctxMenu; + this.picSprites.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.Default; + this.picSprites.Location = new System.Drawing.Point(4, 4); + this.picSprites.Margin = new System.Windows.Forms.Padding(4); + this.picSprites.Name = "picSprites"; + this.tlpMain.SetRowSpan(this.picSprites, 2); + this.picSprites.Size = new System.Drawing.Size(258, 475); + this.picSprites.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.picSprites.TabIndex = 0; + this.picSprites.TabStop = false; + this.picSprites.DoubleClick += new System.EventHandler(this.picSprites_DoubleClick); + this.picSprites.MouseEnter += new System.EventHandler(this.picSprites_MouseEnter); + this.picSprites.MouseLeave += new System.EventHandler(this.picSprites_MouseLeave); + this.picSprites.MouseMove += new System.Windows.Forms.MouseEventHandler(this.picSprites_MouseMove); + // + // ctrlSpriteViewer + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.tlpMain); + this.Name = "ctrlSpriteViewer"; + this.Size = new System.Drawing.Size(682, 486); + this.tlpMain.ResumeLayout(false); + this.tableLayoutPanel2.ResumeLayout(false); + this.grpSpriteInfo.ResumeLayout(false); + this.tlpInfo.ResumeLayout(false); + this.tlpInfo.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picPreview)).EndInit(); + this.ctxMenu.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.picTile)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudCpuPage)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.picSprites)).EndInit(); + this.ResumeLayout(false); } @@ -631,5 +643,6 @@ namespace Mesen.GUI.Debugger.Controls private System.Windows.Forms.Label label1; private System.Windows.Forms.RadioButton radSpriteRam; private System.Windows.Forms.NumericUpDown nudCpuPage; + private System.Windows.Forms.Label label2; } } diff --git a/GUI.NET/Debugger/Controls/ctrlSpriteViewer.cs b/GUI.NET/Debugger/Controls/ctrlSpriteViewer.cs index ab741916..55be6965 100644 --- a/GUI.NET/Debugger/Controls/ctrlSpriteViewer.cs +++ b/GUI.NET/Debugger/Controls/ctrlSpriteViewer.cs @@ -319,7 +319,7 @@ namespace Mesen.GUI.Debugger.Controls _forceRefresh = false; _selectedSprite = ramAddr / 4; - int spriteY = _spriteRam[ramAddr]; + int spriteY = _spriteRam[ramAddr] + 1; int tileIndex = _spriteRam[ramAddr + 1]; int attributes = _spriteRam[ramAddr + 2]; int spriteX = _spriteRam[ramAddr + 3]; diff --git a/GUI.NET/Debugger/frmDebugger.Designer.cs b/GUI.NET/Debugger/frmDebugger.Designer.cs index bc27f7af..fb3985b9 100644 --- a/GUI.NET/Debugger/frmDebugger.Designer.cs +++ b/GUI.NET/Debugger/frmDebugger.Designer.cs @@ -29,573 +29,574 @@ namespace Mesen.GUI.Debugger /// private void InitializeComponent() { - this.splitContainer = new Mesen.GUI.Controls.ctrlSplitContainer(); - this.ctrlSplitContainerTop = new Mesen.GUI.Controls.ctrlSplitContainer(); - this.tlpTop = new System.Windows.Forms.TableLayoutPanel(); - this.panel1 = new System.Windows.Forms.Panel(); - this.ctrlSourceViewer = new Mesen.GUI.Debugger.Controls.ctrlSourceViewer(); - this.ctrlDebuggerCode = new Mesen.GUI.Debugger.ctrlDebuggerCode(); - this.panel2 = new System.Windows.Forms.Panel(); - this.ctrlSourceViewerSplit = new Mesen.GUI.Debugger.Controls.ctrlSourceViewer(); - this.ctrlDebuggerCodeSplit = new Mesen.GUI.Debugger.ctrlDebuggerCode(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.ctrlConsoleStatus = new Mesen.GUI.Debugger.ctrlConsoleStatus(); - this.tlpVerticalLayout = new System.Windows.Forms.TableLayoutPanel(); - this.tlpFunctionLabelLists = new System.Windows.Forms.TableLayoutPanel(); - this.grpLabels = new System.Windows.Forms.GroupBox(); - this.ctrlLabelList = new Mesen.GUI.Debugger.Controls.ctrlLabelList(); - this.grpFunctions = new System.Windows.Forms.GroupBox(); - this.ctrlFunctionList = new Mesen.GUI.Debugger.Controls.ctrlFunctionList(); - this.picWatchHelp = new System.Windows.Forms.PictureBox(); - this.tableLayoutPanel10 = new System.Windows.Forms.TableLayoutPanel(); - this.grpWatch = new System.Windows.Forms.GroupBox(); - this.ctrlWatch = new Mesen.GUI.Debugger.ctrlWatch(); - this.grpBreakpoints = new System.Windows.Forms.GroupBox(); - this.ctrlBreakpoints = new Mesen.GUI.Debugger.Controls.ctrlBreakpoints(); - this.grpCallstack = new System.Windows.Forms.GroupBox(); - this.ctrlCallstack = new Mesen.GUI.Debugger.Controls.ctrlCallstack(); - this.menuStrip = new Mesen.GUI.Controls.ctrlMesenMenuStrip(); - this.mnuFile = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuSaveRom = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuSaveRomAs = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuSaveAsIps = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuRevertChanges = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem14 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuWorkspace = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuImportLabels = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuExportLabels = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuImportSettings = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem16 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuResetWorkspace = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuResetLabels = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuAutoLoadDbgFiles = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuAutoLoadCdlFiles = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuDisableDefaultLabels = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuClose = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuCode = new System.Windows.Forms.ToolStripMenuItem(); - this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuContinue = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreak = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuStepInto = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuStepOver = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuStepOut = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuStepBack = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuReset = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPowerCycle = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem24 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuToggleBreakpoint = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuDisableEnableBreakpoint = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuRunCpuCycle = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuRunPpuCycle = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuRunScanline = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuRunOneFrame = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuBreakIn = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOn = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuSearch = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuGoToAll = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuGoToAddress = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuGoTo = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem29 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuFind = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuFindNext = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuFindPrev = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuFindAllOccurrences = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuOptions = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuDisassemblyOptions = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuDisassemble = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuDisassembleVerifiedCode = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuDisassembleVerifiedData = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuDisassembleUnidentifiedData = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShow = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowVerifiedCode = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowVerifiedData = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowUnidentifiedData = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuDisplayOpCodesInLowerCase = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowEffectiveAddresses = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowMemoryValues = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOptions = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOnReset = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOnUnofficialOpcodes = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOnBrk = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOnCrash = new System.Windows.Forms.ToolStripMenuItem(); - this.sepBreakNsfOptions = new System.Windows.Forms.ToolStripSeparator(); - this.mnuBreakOnInit = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOnPlay = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem26 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuBreakOnBusConflict = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOnDecayedOamRead = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOnPpu2006ScrollGlitch = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOnUninitMemoryRead = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem15 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuBreakOnOpen = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBreakOnDebuggerFocus = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem20 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuBringToFrontOnBreak = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuBringToFrontOnPause = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem28 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuEnableSubInstructionBreakpoints = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuShowOptions = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowToolbar = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowCpuMemoryMapping = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowPpuMemoryMapping = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowFunctionLabelLists = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowBottomPanel = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuTooltipOptions = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowCodePreview = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowOpCodeTooltips = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem18 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuOnlyShowTooltipOnShift = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuCopyOptions = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuCopyAddresses = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuCopyByteCode = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuCopyComments = new System.Windows.Forms.ToolStripMenuItem(); - this.fontSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuIncreaseFontSize = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuDecreaseFontSize = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuResetFontSize = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem21 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuSelectFont = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuConfigureColors = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuSplitView = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuUseVerticalLayout = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuAutoCreateJumpLabels = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem25 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuHidePauseIcon = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPpuPartialDraw = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPpuShowPreviousFrame = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem19 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuShowBreakNotifications = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowInstructionProgression = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuShowSelectionLength = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem27 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuAlwaysScrollToCenter = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuRefreshWhileRunning = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuReloadRomOnPowerCycle = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuConfigureExternalEditor = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPreferences = new System.Windows.Forms.ToolStripMenuItem(); - this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuApuViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuAssembler = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuEventViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuMemoryViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuProfiler = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPpuViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuScriptWindow = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuTextHooker = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuTraceLogger = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuWatchWindow = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem13 = new System.Windows.Forms.ToolStripSeparator(); - this.pPUViewerCompactToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuOpenNametableViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuOpenChrViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuOpenSpriteViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuOpenPaletteViewer = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem17 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuEditHeader = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem30 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuCodeDataLogger = new System.Windows.Forms.ToolStripMenuItem(); - this.autoLoadsaveCDLFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuLoadCdlFile = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuSaveAsCdlFile = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuResetCdlLog = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuCdlGenerateRom = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuCdlStripUnusedData = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuCdlStripUsedData = new System.Windows.Forms.ToolStripMenuItem(); - this.statusStrip = new System.Windows.Forms.StatusStrip(); - this.lblPrgAnalysis = new System.Windows.Forms.ToolStripStatusLabel(); - this.lblPrgAnalysisResult = new System.Windows.Forms.ToolStripStatusLabel(); - this.lblChrAnalysis = new System.Windows.Forms.ToolStripStatusLabel(); - this.lblChrAnalysisResult = new System.Windows.Forms.ToolStripStatusLabel(); - this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); - this.lblCyclesElapsedCount = new System.Windows.Forms.ToolStripStatusLabel(); - this.lblCyclesElapsed = new System.Windows.Forms.ToolStripStatusLabel(); - this.ctrlPpuMemoryMapping = new Mesen.GUI.Debugger.Controls.ctrlMemoryMapping(); - this.ctrlCpuMemoryMapping = new Mesen.GUI.Debugger.Controls.ctrlMemoryMapping(); - this.tsToolbar = new Mesen.GUI.Controls.ctrlMesenToolStrip(); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); - this.splitContainer.Panel1.SuspendLayout(); - this.splitContainer.Panel2.SuspendLayout(); - this.splitContainer.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.ctrlSplitContainerTop)).BeginInit(); - this.ctrlSplitContainerTop.Panel1.SuspendLayout(); - this.ctrlSplitContainerTop.Panel2.SuspendLayout(); - this.ctrlSplitContainerTop.SuspendLayout(); - this.tlpTop.SuspendLayout(); - this.panel1.SuspendLayout(); - this.panel2.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - this.tlpFunctionLabelLists.SuspendLayout(); - this.grpLabels.SuspendLayout(); - this.grpFunctions.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picWatchHelp)).BeginInit(); - this.tableLayoutPanel10.SuspendLayout(); - this.grpWatch.SuspendLayout(); - this.grpBreakpoints.SuspendLayout(); - this.grpCallstack.SuspendLayout(); - this.menuStrip.SuspendLayout(); - this.statusStrip.SuspendLayout(); - this.SuspendLayout(); - // - // splitContainer - // - this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer.HidePanel2 = false; - this.splitContainer.Location = new System.Drawing.Point(0, 24); - this.splitContainer.Name = "splitContainer"; - this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer.Panel1 - // - this.splitContainer.Panel1.Controls.Add(this.ctrlSplitContainerTop); - this.splitContainer.Panel1MinSize = 400; - // - // splitContainer.Panel2 - // - this.splitContainer.Panel2.Controls.Add(this.picWatchHelp); - this.splitContainer.Panel2.Controls.Add(this.tableLayoutPanel10); - this.splitContainer.Panel2MinSize = 100; - this.splitContainer.Size = new System.Drawing.Size(1075, 570); - this.splitContainer.SplitterDistance = 407; - this.splitContainer.SplitterWidth = 7; - this.splitContainer.TabIndex = 1; - this.splitContainer.TabStop = false; - this.splitContainer.PanelCollapsed += new System.EventHandler(this.splitContainer_PanelCollapsed); - this.splitContainer.PanelExpanded += new System.EventHandler(this.splitContainer_PanelExpanded); - // - // ctrlSplitContainerTop - // - this.ctrlSplitContainerTop.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlSplitContainerTop.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.ctrlSplitContainerTop.HidePanel2 = false; - this.ctrlSplitContainerTop.Location = new System.Drawing.Point(0, 0); - this.ctrlSplitContainerTop.Name = "ctrlSplitContainerTop"; - // - // ctrlSplitContainerTop.Panel1 - // - this.ctrlSplitContainerTop.Panel1.Controls.Add(this.tlpTop); - this.ctrlSplitContainerTop.Panel1MinSize = 750; - // - // ctrlSplitContainerTop.Panel2 - // - this.ctrlSplitContainerTop.Panel2.Controls.Add(this.tlpFunctionLabelLists); - this.ctrlSplitContainerTop.Panel2MinSize = 150; - this.ctrlSplitContainerTop.Size = new System.Drawing.Size(1075, 407); - this.ctrlSplitContainerTop.SplitterDistance = 821; - this.ctrlSplitContainerTop.SplitterWidth = 7; - this.ctrlSplitContainerTop.TabIndex = 3; - this.ctrlSplitContainerTop.PanelCollapsed += new System.EventHandler(this.ctrlSplitContainerTop_PanelCollapsed); - this.ctrlSplitContainerTop.PanelExpanded += new System.EventHandler(this.ctrlSplitContainerTop_PanelExpanded); - // - // tlpTop - // - this.tlpTop.ColumnCount = 3; - this.tlpTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0F)); - this.tlpTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tlpTop.Controls.Add(this.panel1, 0, 0); - this.tlpTop.Controls.Add(this.panel2, 1, 0); - this.tlpTop.Controls.Add(this.tableLayoutPanel1, 2, 0); - this.tlpTop.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpTop.Location = new System.Drawing.Point(0, 0); - this.tlpTop.Name = "tlpTop"; - this.tlpTop.RowCount = 1; - this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 407F)); - this.tlpTop.Size = new System.Drawing.Size(821, 407); - this.tlpTop.TabIndex = 2; - // - // panel1 - // - this.panel1.Controls.Add(this.ctrlSourceViewer); - this.panel1.Controls.Add(this.ctrlDebuggerCode); - this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(3, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(357, 407); - this.panel1.TabIndex = 5; - // - // ctrlSourceViewer - // - this.ctrlSourceViewer.CurrentFile = null; - this.ctrlSourceViewer.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlSourceViewer.Location = new System.Drawing.Point(0, 0); - this.ctrlSourceViewer.Name = "ctrlSourceViewer"; - this.ctrlSourceViewer.Size = new System.Drawing.Size(357, 407); - this.ctrlSourceViewer.SymbolProvider = null; - this.ctrlSourceViewer.TabIndex = 7; - this.ctrlSourceViewer.Visible = false; - this.ctrlSourceViewer.Enter += new System.EventHandler(this.ctrlDebuggerCode_Enter); - // - // ctrlDebuggerCode - // - this.ctrlDebuggerCode.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlDebuggerCode.HideSelection = false; - this.ctrlDebuggerCode.Location = new System.Drawing.Point(0, 0); - this.ctrlDebuggerCode.Name = "ctrlDebuggerCode"; - this.ctrlDebuggerCode.ShowMemoryValues = false; - this.ctrlDebuggerCode.Size = new System.Drawing.Size(357, 407); - this.ctrlDebuggerCode.SymbolProvider = null; - this.ctrlDebuggerCode.TabIndex = 2; - this.ctrlDebuggerCode.OnEditCode += new Mesen.GUI.Debugger.ctrlDebuggerCode.AssemblerEventHandler(this.ctrlDebuggerCode_OnEditCode); - this.ctrlDebuggerCode.Enter += new System.EventHandler(this.ctrlDebuggerCode_Enter); - // - // panel2 - // - this.panel2.Controls.Add(this.ctrlSourceViewerSplit); - this.panel2.Controls.Add(this.ctrlDebuggerCodeSplit); - this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(363, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1, 407); - this.panel2.TabIndex = 6; - // - // ctrlSourceViewerSplit - // - this.ctrlSourceViewerSplit.CurrentFile = null; - this.ctrlSourceViewerSplit.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlSourceViewerSplit.Location = new System.Drawing.Point(0, 0); - this.ctrlSourceViewerSplit.Name = "ctrlSourceViewerSplit"; - this.ctrlSourceViewerSplit.Size = new System.Drawing.Size(1, 407); - this.ctrlSourceViewerSplit.SymbolProvider = null; - this.ctrlSourceViewerSplit.TabIndex = 8; - this.ctrlSourceViewerSplit.Visible = false; - this.ctrlSourceViewerSplit.Enter += new System.EventHandler(this.ctrlDebuggerCode_Enter); - // - // ctrlDebuggerCodeSplit - // - this.ctrlDebuggerCodeSplit.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlDebuggerCodeSplit.HideSelection = false; - this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(0, 0); - this.ctrlDebuggerCodeSplit.Name = "ctrlDebuggerCodeSplit"; - this.ctrlDebuggerCodeSplit.ShowMemoryValues = false; - this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(1, 407); - this.ctrlDebuggerCodeSplit.SymbolProvider = null; - this.ctrlDebuggerCodeSplit.TabIndex = 4; - this.ctrlDebuggerCodeSplit.Visible = false; - this.ctrlDebuggerCodeSplit.OnEditCode += new Mesen.GUI.Debugger.ctrlDebuggerCode.AssemblerEventHandler(this.ctrlDebuggerCode_OnEditCode); - this.ctrlDebuggerCodeSplit.Enter += new System.EventHandler(this.ctrlDebuggerCode_Enter); - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.ColumnCount = 1; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.ctrlConsoleStatus, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.tlpVerticalLayout, 0, 1); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(363, 0); - this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 2; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(458, 407); - this.tableLayoutPanel1.TabIndex = 7; - // - // ctrlConsoleStatus - // - this.ctrlConsoleStatus.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlConsoleStatus.Location = new System.Drawing.Point(0, 0); - this.ctrlConsoleStatus.Margin = new System.Windows.Forms.Padding(0); - this.ctrlConsoleStatus.Name = "ctrlConsoleStatus"; - this.ctrlConsoleStatus.Size = new System.Drawing.Size(458, 400); - this.ctrlConsoleStatus.TabIndex = 3; - this.ctrlConsoleStatus.OnGotoLocation += new System.EventHandler(this.ctrlConsoleStatus_OnGotoLocation); - // - // tlpVerticalLayout - // - this.tlpVerticalLayout.ColumnCount = 2; - this.tlpVerticalLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tlpVerticalLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tlpVerticalLayout.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpVerticalLayout.Location = new System.Drawing.Point(0, 400); - this.tlpVerticalLayout.Margin = new System.Windows.Forms.Padding(0); - this.tlpVerticalLayout.Name = "tlpVerticalLayout"; - this.tlpVerticalLayout.RowCount = 1; - this.tlpVerticalLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tlpVerticalLayout.Size = new System.Drawing.Size(458, 7); - this.tlpVerticalLayout.TabIndex = 4; - // - // tlpFunctionLabelLists - // - this.tlpFunctionLabelLists.ColumnCount = 1; - this.tlpFunctionLabelLists.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tlpFunctionLabelLists.Controls.Add(this.grpLabels, 0, 1); - this.tlpFunctionLabelLists.Controls.Add(this.grpFunctions, 0, 0); - this.tlpFunctionLabelLists.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpFunctionLabelLists.Location = new System.Drawing.Point(0, 0); - this.tlpFunctionLabelLists.Margin = new System.Windows.Forms.Padding(0); - this.tlpFunctionLabelLists.Name = "tlpFunctionLabelLists"; - this.tlpFunctionLabelLists.RowCount = 2; - this.tlpFunctionLabelLists.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tlpFunctionLabelLists.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tlpFunctionLabelLists.Size = new System.Drawing.Size(247, 407); - this.tlpFunctionLabelLists.TabIndex = 5; - // - // grpLabels - // - this.grpLabels.Controls.Add(this.ctrlLabelList); - this.grpLabels.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpLabels.Location = new System.Drawing.Point(3, 206); - this.grpLabels.Name = "grpLabels"; - this.grpLabels.Size = new System.Drawing.Size(241, 198); - this.grpLabels.TabIndex = 6; - this.grpLabels.TabStop = false; - this.grpLabels.Text = "Labels"; - // - // ctrlLabelList - // - this.ctrlLabelList.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlLabelList.Location = new System.Drawing.Point(3, 16); - this.ctrlLabelList.Name = "ctrlLabelList"; - this.ctrlLabelList.Size = new System.Drawing.Size(235, 179); - this.ctrlLabelList.TabIndex = 0; - this.ctrlLabelList.OnFindOccurrence += new System.EventHandler(this.ctrlLabelList_OnFindOccurrence); - this.ctrlLabelList.OnLabelSelected += new Mesen.GUI.Debugger.GoToDestinationEventHandler(this.ctrlLabelList_OnLabelSelected); - // - // grpFunctions - // - this.grpFunctions.Controls.Add(this.ctrlFunctionList); - this.grpFunctions.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpFunctions.Location = new System.Drawing.Point(3, 3); - this.grpFunctions.Name = "grpFunctions"; - this.grpFunctions.Size = new System.Drawing.Size(241, 197); - this.grpFunctions.TabIndex = 5; - this.grpFunctions.TabStop = false; - this.grpFunctions.Text = "Functions"; - // - // ctrlFunctionList - // - this.ctrlFunctionList.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlFunctionList.Location = new System.Drawing.Point(3, 16); - this.ctrlFunctionList.Name = "ctrlFunctionList"; - this.ctrlFunctionList.Size = new System.Drawing.Size(235, 178); - this.ctrlFunctionList.TabIndex = 0; - this.ctrlFunctionList.OnFindOccurrence += new System.EventHandler(this.ctrlFunctionList_OnFindOccurrence); - this.ctrlFunctionList.OnFunctionSelected += new Mesen.GUI.Debugger.GoToDestinationEventHandler(this.ctrlFunctionList_OnFunctionSelected); - // - // picWatchHelp - // - this.picWatchHelp.Image = global::Mesen.GUI.Properties.Resources.Help; - this.picWatchHelp.Location = new System.Drawing.Point(50, 2); - this.picWatchHelp.Name = "picWatchHelp"; - this.picWatchHelp.Size = new System.Drawing.Size(16, 16); - this.picWatchHelp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; - this.picWatchHelp.TabIndex = 1; - this.picWatchHelp.TabStop = false; - // - // tableLayoutPanel10 - // - this.tableLayoutPanel10.ColumnCount = 3; - this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); - this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F)); - this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F)); - this.tableLayoutPanel10.Controls.Add(this.grpWatch, 0, 0); - this.tableLayoutPanel10.Controls.Add(this.grpBreakpoints, 1, 0); - this.tableLayoutPanel10.Controls.Add(this.grpCallstack, 2, 0); - this.tableLayoutPanel10.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel10.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel10.Name = "tableLayoutPanel10"; - this.tableLayoutPanel10.RowCount = 3; - this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel10.Size = new System.Drawing.Size(1075, 156); - this.tableLayoutPanel10.TabIndex = 0; - // - // grpWatch - // - this.grpWatch.Controls.Add(this.ctrlWatch); - this.grpWatch.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpWatch.Location = new System.Drawing.Point(3, 3); - this.grpWatch.Name = "grpWatch"; - this.grpWatch.Size = new System.Drawing.Size(352, 150); - this.grpWatch.TabIndex = 2; - this.grpWatch.TabStop = false; - this.grpWatch.Text = "Watch"; - // - // ctrlWatch - // - this.ctrlWatch.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlWatch.Location = new System.Drawing.Point(3, 16); - this.ctrlWatch.Name = "ctrlWatch"; - this.ctrlWatch.Size = new System.Drawing.Size(346, 131); - this.ctrlWatch.TabIndex = 0; - // - // grpBreakpoints - // - this.grpBreakpoints.Controls.Add(this.ctrlBreakpoints); - this.grpBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpBreakpoints.Location = new System.Drawing.Point(361, 3); - this.grpBreakpoints.Name = "grpBreakpoints"; - this.grpBreakpoints.Size = new System.Drawing.Size(352, 150); - this.grpBreakpoints.TabIndex = 3; - this.grpBreakpoints.TabStop = false; - this.grpBreakpoints.Text = "Breakpoints"; - // - // ctrlBreakpoints - // - this.ctrlBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlBreakpoints.Location = new System.Drawing.Point(3, 16); - this.ctrlBreakpoints.Name = "ctrlBreakpoints"; - this.ctrlBreakpoints.Size = new System.Drawing.Size(346, 131); - this.ctrlBreakpoints.TabIndex = 0; - this.ctrlBreakpoints.BreakpointNavigation += new System.EventHandler(this.ctrlBreakpoints_BreakpointNavigation); - // - // grpCallstack - // - this.grpCallstack.Controls.Add(this.ctrlCallstack); - this.grpCallstack.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpCallstack.Location = new System.Drawing.Point(719, 3); - this.grpCallstack.Name = "grpCallstack"; - this.grpCallstack.Size = new System.Drawing.Size(353, 150); - this.grpCallstack.TabIndex = 4; - this.grpCallstack.TabStop = false; - this.grpCallstack.Text = "Call Stack"; - // - // ctrlCallstack - // - this.ctrlCallstack.Dock = System.Windows.Forms.DockStyle.Fill; - this.ctrlCallstack.Location = new System.Drawing.Point(3, 16); - this.ctrlCallstack.Name = "ctrlCallstack"; - this.ctrlCallstack.Size = new System.Drawing.Size(347, 131); - this.ctrlCallstack.TabIndex = 0; - this.ctrlCallstack.FunctionSelected += new System.EventHandler(this.ctrlCallstack_FunctionSelected); - // - // menuStrip - // - this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.splitContainer = new Mesen.GUI.Controls.ctrlSplitContainer(); + this.ctrlSplitContainerTop = new Mesen.GUI.Controls.ctrlSplitContainer(); + this.tlpTop = new System.Windows.Forms.TableLayoutPanel(); + this.panel1 = new System.Windows.Forms.Panel(); + this.ctrlSourceViewer = new Mesen.GUI.Debugger.Controls.ctrlSourceViewer(); + this.ctrlDebuggerCode = new Mesen.GUI.Debugger.ctrlDebuggerCode(); + this.panel2 = new System.Windows.Forms.Panel(); + this.ctrlSourceViewerSplit = new Mesen.GUI.Debugger.Controls.ctrlSourceViewer(); + this.ctrlDebuggerCodeSplit = new Mesen.GUI.Debugger.ctrlDebuggerCode(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.ctrlConsoleStatus = new Mesen.GUI.Debugger.ctrlConsoleStatus(); + this.tlpVerticalLayout = new System.Windows.Forms.TableLayoutPanel(); + this.tlpFunctionLabelLists = new System.Windows.Forms.TableLayoutPanel(); + this.grpLabels = new System.Windows.Forms.GroupBox(); + this.ctrlLabelList = new Mesen.GUI.Debugger.Controls.ctrlLabelList(); + this.grpFunctions = new System.Windows.Forms.GroupBox(); + this.ctrlFunctionList = new Mesen.GUI.Debugger.Controls.ctrlFunctionList(); + this.picWatchHelp = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel10 = new System.Windows.Forms.TableLayoutPanel(); + this.grpWatch = new System.Windows.Forms.GroupBox(); + this.ctrlWatch = new Mesen.GUI.Debugger.ctrlWatch(); + this.grpBreakpoints = new System.Windows.Forms.GroupBox(); + this.ctrlBreakpoints = new Mesen.GUI.Debugger.Controls.ctrlBreakpoints(); + this.grpCallstack = new System.Windows.Forms.GroupBox(); + this.ctrlCallstack = new Mesen.GUI.Debugger.Controls.ctrlCallstack(); + this.menuStrip = new Mesen.GUI.Controls.ctrlMesenMenuStrip(); + this.mnuFile = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuSaveRom = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuSaveRomAs = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuSaveAsIps = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuRevertChanges = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem14 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuWorkspace = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuImportLabels = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuExportLabels = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuImportSettings = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem16 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuResetWorkspace = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuResetLabels = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem10 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuAutoLoadDbgFiles = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuAutoLoadCdlFiles = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuDisableDefaultLabels = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuClose = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuCode = new System.Windows.Forms.ToolStripMenuItem(); + this.debugToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuContinue = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreak = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuStepInto = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuStepOver = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuStepOut = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuStepBack = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuReset = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPowerCycle = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem24 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuToggleBreakpoint = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuDisableEnableBreakpoint = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuRunCpuCycle = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuRunPpuCycle = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuRunScanline = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuRunOneFrame = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem8 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuBreakIn = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOn = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuSearch = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuGoToAll = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuGoToAddress = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuGoTo = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem29 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuFind = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuFindNext = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuFindPrev = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem9 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuFindAllOccurrences = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuOptions = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuDisassemblyOptions = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuDisassemble = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuDisassembleVerifiedCode = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuDisassembleVerifiedData = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuDisassembleUnidentifiedData = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShow = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowVerifiedCode = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowVerifiedData = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowUnidentifiedData = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem7 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuDisplayOpCodesInLowerCase = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowEffectiveAddresses = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowMemoryValues = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOptions = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOnReset = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOnUnofficialOpcodes = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOnBrk = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOnCrash = new System.Windows.Forms.ToolStripMenuItem(); + this.sepBreakNsfOptions = new System.Windows.Forms.ToolStripSeparator(); + this.mnuBreakOnInit = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOnPlay = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem26 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuBreakOnBusConflict = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOnDecayedOamRead = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOnPpu2006ScrollGlitch = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOnUninitMemoryRead = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem15 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuBreakOnOpen = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBreakOnDebuggerFocus = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem20 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuBringToFrontOnBreak = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuBringToFrontOnPause = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem28 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuEnableSubInstructionBreakpoints = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem12 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuShowOptions = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowToolbar = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowCpuMemoryMapping = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowPpuMemoryMapping = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowFunctionLabelLists = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowBottomPanel = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuTooltipOptions = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowCodePreview = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowOpCodeTooltips = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem18 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuOnlyShowTooltipOnShift = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuCopyOptions = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuCopyAddresses = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuCopyByteCode = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuCopyComments = new System.Windows.Forms.ToolStripMenuItem(); + this.fontSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuIncreaseFontSize = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuDecreaseFontSize = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuResetFontSize = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem21 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuSelectFont = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuConfigureColors = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuSplitView = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuUseVerticalLayout = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem11 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuAutoCreateJumpLabels = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem25 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuHidePauseIcon = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPpuPartialDraw = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPpuShowPreviousFrame = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem19 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuShowBreakNotifications = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowInstructionProgression = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuShowSelectionLength = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem27 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuAlwaysScrollToCenter = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuRefreshWhileRunning = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem6 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuReloadRomOnPowerCycle = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuConfigureExternalEditor = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPreferences = new System.Windows.Forms.ToolStripMenuItem(); + this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuApuViewer = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuAssembler = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuEventViewer = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuMemoryViewer = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuProfiler = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPpuViewer = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuScriptWindow = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuTextHooker = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuTraceLogger = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuWatchWindow = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem13 = new System.Windows.Forms.ToolStripSeparator(); + this.pPUViewerCompactToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuOpenNametableViewer = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuOpenChrViewer = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuOpenSpriteViewer = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuOpenPaletteViewer = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem17 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuEditHeader = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem30 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuCodeDataLogger = new System.Windows.Forms.ToolStripMenuItem(); + this.autoLoadsaveCDLFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuLoadCdlFile = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuSaveAsCdlFile = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuResetCdlLog = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuCdlGenerateRom = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuCdlStripUnusedData = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuCdlStripUsedData = new System.Windows.Forms.ToolStripMenuItem(); + this.statusStrip = new System.Windows.Forms.StatusStrip(); + this.lblPrgAnalysis = new System.Windows.Forms.ToolStripStatusLabel(); + this.lblPrgAnalysisResult = new System.Windows.Forms.ToolStripStatusLabel(); + this.lblChrAnalysis = new System.Windows.Forms.ToolStripStatusLabel(); + this.lblChrAnalysisResult = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); + this.lblCyclesElapsedCount = new System.Windows.Forms.ToolStripStatusLabel(); + this.lblCyclesElapsed = new System.Windows.Forms.ToolStripStatusLabel(); + this.ctrlPpuMemoryMapping = new Mesen.GUI.Debugger.Controls.ctrlMemoryMapping(); + this.ctrlCpuMemoryMapping = new Mesen.GUI.Debugger.Controls.ctrlMemoryMapping(); + this.tsToolbar = new Mesen.GUI.Controls.ctrlMesenToolStrip(); + this.mnuBreakOnUnlogged = new System.Windows.Forms.ToolStripMenuItem(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); + this.splitContainer.Panel1.SuspendLayout(); + this.splitContainer.Panel2.SuspendLayout(); + this.splitContainer.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.ctrlSplitContainerTop)).BeginInit(); + this.ctrlSplitContainerTop.Panel1.SuspendLayout(); + this.ctrlSplitContainerTop.Panel2.SuspendLayout(); + this.ctrlSplitContainerTop.SuspendLayout(); + this.tlpTop.SuspendLayout(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + this.tlpFunctionLabelLists.SuspendLayout(); + this.grpLabels.SuspendLayout(); + this.grpFunctions.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picWatchHelp)).BeginInit(); + this.tableLayoutPanel10.SuspendLayout(); + this.grpWatch.SuspendLayout(); + this.grpBreakpoints.SuspendLayout(); + this.grpCallstack.SuspendLayout(); + this.menuStrip.SuspendLayout(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer + // + this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer.HidePanel2 = false; + this.splitContainer.Location = new System.Drawing.Point(0, 24); + this.splitContainer.Name = "splitContainer"; + this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer.Panel1 + // + this.splitContainer.Panel1.Controls.Add(this.ctrlSplitContainerTop); + this.splitContainer.Panel1MinSize = 400; + // + // splitContainer.Panel2 + // + this.splitContainer.Panel2.Controls.Add(this.picWatchHelp); + this.splitContainer.Panel2.Controls.Add(this.tableLayoutPanel10); + this.splitContainer.Panel2MinSize = 100; + this.splitContainer.Size = new System.Drawing.Size(1075, 570); + this.splitContainer.SplitterDistance = 404; + this.splitContainer.SplitterWidth = 7; + this.splitContainer.TabIndex = 1; + this.splitContainer.TabStop = false; + this.splitContainer.PanelCollapsed += new System.EventHandler(this.splitContainer_PanelCollapsed); + this.splitContainer.PanelExpanded += new System.EventHandler(this.splitContainer_PanelExpanded); + // + // ctrlSplitContainerTop + // + this.ctrlSplitContainerTop.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlSplitContainerTop.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.ctrlSplitContainerTop.HidePanel2 = false; + this.ctrlSplitContainerTop.Location = new System.Drawing.Point(0, 0); + this.ctrlSplitContainerTop.Name = "ctrlSplitContainerTop"; + // + // ctrlSplitContainerTop.Panel1 + // + this.ctrlSplitContainerTop.Panel1.Controls.Add(this.tlpTop); + this.ctrlSplitContainerTop.Panel1MinSize = 750; + // + // ctrlSplitContainerTop.Panel2 + // + this.ctrlSplitContainerTop.Panel2.Controls.Add(this.tlpFunctionLabelLists); + this.ctrlSplitContainerTop.Panel2MinSize = 150; + this.ctrlSplitContainerTop.Size = new System.Drawing.Size(1075, 404); + this.ctrlSplitContainerTop.SplitterDistance = 818; + this.ctrlSplitContainerTop.SplitterWidth = 7; + this.ctrlSplitContainerTop.TabIndex = 3; + this.ctrlSplitContainerTop.PanelCollapsed += new System.EventHandler(this.ctrlSplitContainerTop_PanelCollapsed); + this.ctrlSplitContainerTop.PanelExpanded += new System.EventHandler(this.ctrlSplitContainerTop_PanelExpanded); + // + // tlpTop + // + this.tlpTop.ColumnCount = 3; + this.tlpTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 0F)); + this.tlpTop.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpTop.Controls.Add(this.panel1, 0, 0); + this.tlpTop.Controls.Add(this.panel2, 1, 0); + this.tlpTop.Controls.Add(this.tableLayoutPanel1, 2, 0); + this.tlpTop.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpTop.Location = new System.Drawing.Point(0, 0); + this.tlpTop.Name = "tlpTop"; + this.tlpTop.RowCount = 1; + this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 404F)); + this.tlpTop.Size = new System.Drawing.Size(818, 404); + this.tlpTop.TabIndex = 2; + // + // panel1 + // + this.panel1.Controls.Add(this.ctrlSourceViewer); + this.panel1.Controls.Add(this.ctrlDebuggerCode); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(3, 0); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(354, 404); + this.panel1.TabIndex = 5; + // + // ctrlSourceViewer + // + this.ctrlSourceViewer.CurrentFile = null; + this.ctrlSourceViewer.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlSourceViewer.Location = new System.Drawing.Point(0, 0); + this.ctrlSourceViewer.Name = "ctrlSourceViewer"; + this.ctrlSourceViewer.Size = new System.Drawing.Size(354, 404); + this.ctrlSourceViewer.SymbolProvider = null; + this.ctrlSourceViewer.TabIndex = 7; + this.ctrlSourceViewer.Visible = false; + this.ctrlSourceViewer.Enter += new System.EventHandler(this.ctrlDebuggerCode_Enter); + // + // ctrlDebuggerCode + // + this.ctrlDebuggerCode.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlDebuggerCode.HideSelection = false; + this.ctrlDebuggerCode.Location = new System.Drawing.Point(0, 0); + this.ctrlDebuggerCode.Name = "ctrlDebuggerCode"; + this.ctrlDebuggerCode.ShowMemoryValues = false; + this.ctrlDebuggerCode.Size = new System.Drawing.Size(354, 404); + this.ctrlDebuggerCode.SymbolProvider = null; + this.ctrlDebuggerCode.TabIndex = 2; + this.ctrlDebuggerCode.OnEditCode += new Mesen.GUI.Debugger.ctrlDebuggerCode.AssemblerEventHandler(this.ctrlDebuggerCode_OnEditCode); + this.ctrlDebuggerCode.Enter += new System.EventHandler(this.ctrlDebuggerCode_Enter); + // + // panel2 + // + this.panel2.Controls.Add(this.ctrlSourceViewerSplit); + this.panel2.Controls.Add(this.ctrlDebuggerCodeSplit); + this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel2.Location = new System.Drawing.Point(360, 0); + this.panel2.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(1, 404); + this.panel2.TabIndex = 6; + // + // ctrlSourceViewerSplit + // + this.ctrlSourceViewerSplit.CurrentFile = null; + this.ctrlSourceViewerSplit.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlSourceViewerSplit.Location = new System.Drawing.Point(0, 0); + this.ctrlSourceViewerSplit.Name = "ctrlSourceViewerSplit"; + this.ctrlSourceViewerSplit.Size = new System.Drawing.Size(1, 404); + this.ctrlSourceViewerSplit.SymbolProvider = null; + this.ctrlSourceViewerSplit.TabIndex = 8; + this.ctrlSourceViewerSplit.Visible = false; + this.ctrlSourceViewerSplit.Enter += new System.EventHandler(this.ctrlDebuggerCode_Enter); + // + // ctrlDebuggerCodeSplit + // + this.ctrlDebuggerCodeSplit.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlDebuggerCodeSplit.HideSelection = false; + this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(0, 0); + this.ctrlDebuggerCodeSplit.Name = "ctrlDebuggerCodeSplit"; + this.ctrlDebuggerCodeSplit.ShowMemoryValues = false; + this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(1, 404); + this.ctrlDebuggerCodeSplit.SymbolProvider = null; + this.ctrlDebuggerCodeSplit.TabIndex = 4; + this.ctrlDebuggerCodeSplit.Visible = false; + this.ctrlDebuggerCodeSplit.OnEditCode += new Mesen.GUI.Debugger.ctrlDebuggerCode.AssemblerEventHandler(this.ctrlDebuggerCode_OnEditCode); + this.ctrlDebuggerCodeSplit.Enter += new System.EventHandler(this.ctrlDebuggerCode_Enter); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Controls.Add(this.ctrlConsoleStatus, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.tlpVerticalLayout, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(360, 0); + this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(458, 404); + this.tableLayoutPanel1.TabIndex = 7; + // + // ctrlConsoleStatus + // + this.ctrlConsoleStatus.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlConsoleStatus.Location = new System.Drawing.Point(0, 0); + this.ctrlConsoleStatus.Margin = new System.Windows.Forms.Padding(0); + this.ctrlConsoleStatus.Name = "ctrlConsoleStatus"; + this.ctrlConsoleStatus.Size = new System.Drawing.Size(458, 400); + this.ctrlConsoleStatus.TabIndex = 3; + this.ctrlConsoleStatus.OnGotoLocation += new System.EventHandler(this.ctrlConsoleStatus_OnGotoLocation); + // + // tlpVerticalLayout + // + this.tlpVerticalLayout.ColumnCount = 2; + this.tlpVerticalLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tlpVerticalLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tlpVerticalLayout.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpVerticalLayout.Location = new System.Drawing.Point(0, 400); + this.tlpVerticalLayout.Margin = new System.Windows.Forms.Padding(0); + this.tlpVerticalLayout.Name = "tlpVerticalLayout"; + this.tlpVerticalLayout.RowCount = 1; + this.tlpVerticalLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tlpVerticalLayout.Size = new System.Drawing.Size(458, 4); + this.tlpVerticalLayout.TabIndex = 4; + // + // tlpFunctionLabelLists + // + this.tlpFunctionLabelLists.ColumnCount = 1; + this.tlpFunctionLabelLists.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tlpFunctionLabelLists.Controls.Add(this.grpLabels, 0, 1); + this.tlpFunctionLabelLists.Controls.Add(this.grpFunctions, 0, 0); + this.tlpFunctionLabelLists.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpFunctionLabelLists.Location = new System.Drawing.Point(0, 0); + this.tlpFunctionLabelLists.Margin = new System.Windows.Forms.Padding(0); + this.tlpFunctionLabelLists.Name = "tlpFunctionLabelLists"; + this.tlpFunctionLabelLists.RowCount = 2; + this.tlpFunctionLabelLists.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tlpFunctionLabelLists.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tlpFunctionLabelLists.Size = new System.Drawing.Size(250, 404); + this.tlpFunctionLabelLists.TabIndex = 5; + // + // grpLabels + // + this.grpLabels.Controls.Add(this.ctrlLabelList); + this.grpLabels.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpLabels.Location = new System.Drawing.Point(3, 205); + this.grpLabels.Name = "grpLabels"; + this.grpLabels.Size = new System.Drawing.Size(244, 196); + this.grpLabels.TabIndex = 6; + this.grpLabels.TabStop = false; + this.grpLabels.Text = "Labels"; + // + // ctrlLabelList + // + this.ctrlLabelList.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlLabelList.Location = new System.Drawing.Point(3, 16); + this.ctrlLabelList.Name = "ctrlLabelList"; + this.ctrlLabelList.Size = new System.Drawing.Size(238, 177); + this.ctrlLabelList.TabIndex = 0; + this.ctrlLabelList.OnFindOccurrence += new System.EventHandler(this.ctrlLabelList_OnFindOccurrence); + this.ctrlLabelList.OnLabelSelected += new Mesen.GUI.Debugger.GoToDestinationEventHandler(this.ctrlLabelList_OnLabelSelected); + // + // grpFunctions + // + this.grpFunctions.Controls.Add(this.ctrlFunctionList); + this.grpFunctions.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpFunctions.Location = new System.Drawing.Point(3, 3); + this.grpFunctions.Name = "grpFunctions"; + this.grpFunctions.Size = new System.Drawing.Size(244, 196); + this.grpFunctions.TabIndex = 5; + this.grpFunctions.TabStop = false; + this.grpFunctions.Text = "Functions"; + // + // ctrlFunctionList + // + this.ctrlFunctionList.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlFunctionList.Location = new System.Drawing.Point(3, 16); + this.ctrlFunctionList.Name = "ctrlFunctionList"; + this.ctrlFunctionList.Size = new System.Drawing.Size(238, 177); + this.ctrlFunctionList.TabIndex = 0; + this.ctrlFunctionList.OnFindOccurrence += new System.EventHandler(this.ctrlFunctionList_OnFindOccurrence); + this.ctrlFunctionList.OnFunctionSelected += new Mesen.GUI.Debugger.GoToDestinationEventHandler(this.ctrlFunctionList_OnFunctionSelected); + // + // picWatchHelp + // + this.picWatchHelp.Image = global::Mesen.GUI.Properties.Resources.Help; + this.picWatchHelp.Location = new System.Drawing.Point(50, 2); + this.picWatchHelp.Name = "picWatchHelp"; + this.picWatchHelp.Size = new System.Drawing.Size(16, 16); + this.picWatchHelp.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage; + this.picWatchHelp.TabIndex = 1; + this.picWatchHelp.TabStop = false; + // + // tableLayoutPanel10 + // + this.tableLayoutPanel10.ColumnCount = 3; + this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F)); + this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F)); + this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F)); + this.tableLayoutPanel10.Controls.Add(this.grpWatch, 0, 0); + this.tableLayoutPanel10.Controls.Add(this.grpBreakpoints, 1, 0); + this.tableLayoutPanel10.Controls.Add(this.grpCallstack, 2, 0); + this.tableLayoutPanel10.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel10.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel10.Name = "tableLayoutPanel10"; + this.tableLayoutPanel10.RowCount = 3; + this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel10.Size = new System.Drawing.Size(1075, 159); + this.tableLayoutPanel10.TabIndex = 0; + // + // grpWatch + // + this.grpWatch.Controls.Add(this.ctrlWatch); + this.grpWatch.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpWatch.Location = new System.Drawing.Point(3, 3); + this.grpWatch.Name = "grpWatch"; + this.grpWatch.Size = new System.Drawing.Size(352, 153); + this.grpWatch.TabIndex = 2; + this.grpWatch.TabStop = false; + this.grpWatch.Text = "Watch"; + // + // ctrlWatch + // + this.ctrlWatch.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlWatch.Location = new System.Drawing.Point(3, 16); + this.ctrlWatch.Name = "ctrlWatch"; + this.ctrlWatch.Size = new System.Drawing.Size(346, 134); + this.ctrlWatch.TabIndex = 0; + // + // grpBreakpoints + // + this.grpBreakpoints.Controls.Add(this.ctrlBreakpoints); + this.grpBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpBreakpoints.Location = new System.Drawing.Point(361, 3); + this.grpBreakpoints.Name = "grpBreakpoints"; + this.grpBreakpoints.Size = new System.Drawing.Size(352, 153); + this.grpBreakpoints.TabIndex = 3; + this.grpBreakpoints.TabStop = false; + this.grpBreakpoints.Text = "Breakpoints"; + // + // ctrlBreakpoints + // + this.ctrlBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlBreakpoints.Location = new System.Drawing.Point(3, 16); + this.ctrlBreakpoints.Name = "ctrlBreakpoints"; + this.ctrlBreakpoints.Size = new System.Drawing.Size(346, 134); + this.ctrlBreakpoints.TabIndex = 0; + this.ctrlBreakpoints.BreakpointNavigation += new System.EventHandler(this.ctrlBreakpoints_BreakpointNavigation); + // + // grpCallstack + // + this.grpCallstack.Controls.Add(this.ctrlCallstack); + this.grpCallstack.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpCallstack.Location = new System.Drawing.Point(719, 3); + this.grpCallstack.Name = "grpCallstack"; + this.grpCallstack.Size = new System.Drawing.Size(353, 153); + this.grpCallstack.TabIndex = 4; + this.grpCallstack.TabStop = false; + this.grpCallstack.Text = "Call Stack"; + // + // ctrlCallstack + // + this.ctrlCallstack.Dock = System.Windows.Forms.DockStyle.Fill; + this.ctrlCallstack.Location = new System.Drawing.Point(3, 16); + this.ctrlCallstack.Name = "ctrlCallstack"; + this.ctrlCallstack.Size = new System.Drawing.Size(347, 134); + this.ctrlCallstack.TabIndex = 0; + this.ctrlCallstack.FunctionSelected += new System.EventHandler(this.ctrlCallstack_FunctionSelected); + // + // menuStrip + // + this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuFile, this.mnuCode, this.debugToolStripMenuItem, this.mnuSearch, this.mnuOptions, this.toolsToolStripMenuItem}); - this.menuStrip.Location = new System.Drawing.Point(0, 0); - this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(1075, 24); - this.menuStrip.TabIndex = 2; - this.menuStrip.Text = "menuStrip1"; - // - // mnuFile - // - this.mnuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.menuStrip.Location = new System.Drawing.Point(0, 0); + this.menuStrip.Name = "menuStrip"; + this.menuStrip.Size = new System.Drawing.Size(1075, 24); + this.menuStrip.TabIndex = 2; + this.menuStrip.Text = "menuStrip1"; + // + // mnuFile + // + this.mnuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuSaveRom, this.mnuSaveRomAs, this.mnuSaveAsIps, @@ -604,49 +605,49 @@ namespace Mesen.GUI.Debugger this.mnuWorkspace, this.toolStripMenuItem3, this.mnuClose}); - this.mnuFile.Name = "mnuFile"; - this.mnuFile.Size = new System.Drawing.Size(37, 20); - this.mnuFile.Text = "File"; - this.mnuFile.DropDownOpening += new System.EventHandler(this.mnuFile_DropDownOpening); - // - // mnuSaveRom - // - this.mnuSaveRom.Image = global::Mesen.GUI.Properties.Resources.Floppy; - this.mnuSaveRom.Name = "mnuSaveRom"; - this.mnuSaveRom.Size = new System.Drawing.Size(208, 22); - this.mnuSaveRom.Text = "Save ROM"; - this.mnuSaveRom.Click += new System.EventHandler(this.mnuSaveRom_Click); - // - // mnuSaveRomAs - // - this.mnuSaveRomAs.Name = "mnuSaveRomAs"; - this.mnuSaveRomAs.Size = new System.Drawing.Size(208, 22); - this.mnuSaveRomAs.Text = "Save ROM as..."; - this.mnuSaveRomAs.Click += new System.EventHandler(this.mnuSaveRomAs_Click); - // - // mnuSaveAsIps - // - this.mnuSaveAsIps.Name = "mnuSaveAsIps"; - this.mnuSaveAsIps.Size = new System.Drawing.Size(208, 22); - this.mnuSaveAsIps.Text = "Save edits as IPS"; - this.mnuSaveAsIps.Click += new System.EventHandler(this.mnuSaveAsIps_Click); - // - // mnuRevertChanges - // - this.mnuRevertChanges.Image = global::Mesen.GUI.Properties.Resources.Undo; - this.mnuRevertChanges.Name = "mnuRevertChanges"; - this.mnuRevertChanges.Size = new System.Drawing.Size(208, 22); - this.mnuRevertChanges.Text = "Revert PRG/CHR changes"; - this.mnuRevertChanges.Click += new System.EventHandler(this.mnuRevertChanges_Click); - // - // toolStripMenuItem14 - // - this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(205, 6); - // - // mnuWorkspace - // - this.mnuWorkspace.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuFile.Name = "mnuFile"; + this.mnuFile.Size = new System.Drawing.Size(38, 20); + this.mnuFile.Text = "File"; + this.mnuFile.DropDownOpening += new System.EventHandler(this.mnuFile_DropDownOpening); + // + // mnuSaveRom + // + this.mnuSaveRom.Image = global::Mesen.GUI.Properties.Resources.Floppy; + this.mnuSaveRom.Name = "mnuSaveRom"; + this.mnuSaveRom.Size = new System.Drawing.Size(217, 22); + this.mnuSaveRom.Text = "Save ROM"; + this.mnuSaveRom.Click += new System.EventHandler(this.mnuSaveRom_Click); + // + // mnuSaveRomAs + // + this.mnuSaveRomAs.Name = "mnuSaveRomAs"; + this.mnuSaveRomAs.Size = new System.Drawing.Size(217, 22); + this.mnuSaveRomAs.Text = "Save ROM as..."; + this.mnuSaveRomAs.Click += new System.EventHandler(this.mnuSaveRomAs_Click); + // + // mnuSaveAsIps + // + this.mnuSaveAsIps.Name = "mnuSaveAsIps"; + this.mnuSaveAsIps.Size = new System.Drawing.Size(217, 22); + this.mnuSaveAsIps.Text = "Save edits as IPS"; + this.mnuSaveAsIps.Click += new System.EventHandler(this.mnuSaveAsIps_Click); + // + // mnuRevertChanges + // + this.mnuRevertChanges.Image = global::Mesen.GUI.Properties.Resources.Undo; + this.mnuRevertChanges.Name = "mnuRevertChanges"; + this.mnuRevertChanges.Size = new System.Drawing.Size(217, 22); + this.mnuRevertChanges.Text = "Revert PRG/CHR changes"; + this.mnuRevertChanges.Click += new System.EventHandler(this.mnuRevertChanges_Click); + // + // toolStripMenuItem14 + // + this.toolStripMenuItem14.Name = "toolStripMenuItem14"; + this.toolStripMenuItem14.Size = new System.Drawing.Size(214, 6); + // + // mnuWorkspace + // + this.mnuWorkspace.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuImportLabels, this.mnuExportLabels, this.mnuImportSettings, @@ -657,106 +658,106 @@ namespace Mesen.GUI.Debugger this.mnuAutoLoadDbgFiles, this.mnuAutoLoadCdlFiles, this.mnuDisableDefaultLabels}); - this.mnuWorkspace.Name = "mnuWorkspace"; - this.mnuWorkspace.Size = new System.Drawing.Size(208, 22); - this.mnuWorkspace.Text = "Workspace"; - // - // mnuImportLabels - // - this.mnuImportLabels.Image = global::Mesen.GUI.Properties.Resources.Import; - this.mnuImportLabels.Name = "mnuImportLabels"; - this.mnuImportLabels.Size = new System.Drawing.Size(207, 22); - this.mnuImportLabels.Text = "Import Labels"; - this.mnuImportLabels.Click += new System.EventHandler(this.mnuImportLabels_Click); - // - // mnuExportLabels - // - this.mnuExportLabels.Image = global::Mesen.GUI.Properties.Resources.Export; - this.mnuExportLabels.Name = "mnuExportLabels"; - this.mnuExportLabels.Size = new System.Drawing.Size(207, 22); - this.mnuExportLabels.Text = "Export Labels"; - this.mnuExportLabels.Click += new System.EventHandler(this.mnuExportLabels_Click); - // - // mnuImportSettings - // - this.mnuImportSettings.Image = global::Mesen.GUI.Properties.Resources.Cog; - this.mnuImportSettings.Name = "mnuImportSettings"; - this.mnuImportSettings.Size = new System.Drawing.Size(207, 22); - this.mnuImportSettings.Text = "Import Settings"; - this.mnuImportSettings.Click += new System.EventHandler(this.mnuImportSettings_Click); - // - // toolStripMenuItem16 - // - this.toolStripMenuItem16.Name = "toolStripMenuItem16"; - this.toolStripMenuItem16.Size = new System.Drawing.Size(204, 6); - // - // mnuResetWorkspace - // - this.mnuResetWorkspace.Image = global::Mesen.GUI.Properties.Resources.Reset; - this.mnuResetWorkspace.Name = "mnuResetWorkspace"; - this.mnuResetWorkspace.Size = new System.Drawing.Size(207, 22); - this.mnuResetWorkspace.Text = "Reset Workspace"; - this.mnuResetWorkspace.Click += new System.EventHandler(this.mnuResetWorkspace_Click); - // - // mnuResetLabels - // - this.mnuResetLabels.Name = "mnuResetLabels"; - this.mnuResetLabels.Size = new System.Drawing.Size(207, 22); - this.mnuResetLabels.Text = "Reset Labels"; - this.mnuResetLabels.Click += new System.EventHandler(this.mnuResetLabels_Click); - // - // toolStripMenuItem10 - // - this.toolStripMenuItem10.Name = "toolStripMenuItem10"; - this.toolStripMenuItem10.Size = new System.Drawing.Size(204, 6); - // - // mnuAutoLoadDbgFiles - // - this.mnuAutoLoadDbgFiles.CheckOnClick = true; - this.mnuAutoLoadDbgFiles.Name = "mnuAutoLoadDbgFiles"; - this.mnuAutoLoadDbgFiles.Size = new System.Drawing.Size(207, 22); - this.mnuAutoLoadDbgFiles.Text = "Auto-load DBG/MLB files"; - this.mnuAutoLoadDbgFiles.Click += new System.EventHandler(this.mnuAutoLoadDbgFiles_Click); - // - // mnuAutoLoadCdlFiles - // - this.mnuAutoLoadCdlFiles.CheckOnClick = true; - this.mnuAutoLoadCdlFiles.Name = "mnuAutoLoadCdlFiles"; - this.mnuAutoLoadCdlFiles.Size = new System.Drawing.Size(207, 22); - this.mnuAutoLoadCdlFiles.Text = "Auto-load CDL files"; - this.mnuAutoLoadCdlFiles.Click += new System.EventHandler(this.mnuAutoLoadCdlFiles_Click); - // - // mnuDisableDefaultLabels - // - this.mnuDisableDefaultLabels.CheckOnClick = true; - this.mnuDisableDefaultLabels.Name = "mnuDisableDefaultLabels"; - this.mnuDisableDefaultLabels.Size = new System.Drawing.Size(207, 22); - this.mnuDisableDefaultLabels.Text = "Disable default labels"; - this.mnuDisableDefaultLabels.Click += new System.EventHandler(this.mnuDisableDefaultLabels_Click); - // - // toolStripMenuItem3 - // - this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(205, 6); - // - // mnuClose - // - this.mnuClose.Image = global::Mesen.GUI.Properties.Resources.Exit; - this.mnuClose.Name = "mnuClose"; - this.mnuClose.Size = new System.Drawing.Size(208, 22); - this.mnuClose.Text = "Close"; - this.mnuClose.Click += new System.EventHandler(this.mnuClose_Click); - // - // mnuCode - // - this.mnuCode.Name = "mnuCode"; - this.mnuCode.Size = new System.Drawing.Size(47, 20); - this.mnuCode.Text = "Code"; - this.mnuCode.DropDownOpening += new System.EventHandler(this.mnuCode_DropDownOpening); - // - // debugToolStripMenuItem - // - this.debugToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuWorkspace.Name = "mnuWorkspace"; + this.mnuWorkspace.Size = new System.Drawing.Size(217, 22); + this.mnuWorkspace.Text = "Workspace"; + // + // mnuImportLabels + // + this.mnuImportLabels.Image = global::Mesen.GUI.Properties.Resources.Import; + this.mnuImportLabels.Name = "mnuImportLabels"; + this.mnuImportLabels.Size = new System.Drawing.Size(215, 22); + this.mnuImportLabels.Text = "Import Labels"; + this.mnuImportLabels.Click += new System.EventHandler(this.mnuImportLabels_Click); + // + // mnuExportLabels + // + this.mnuExportLabels.Image = global::Mesen.GUI.Properties.Resources.Export; + this.mnuExportLabels.Name = "mnuExportLabels"; + this.mnuExportLabels.Size = new System.Drawing.Size(215, 22); + this.mnuExportLabels.Text = "Export Labels"; + this.mnuExportLabels.Click += new System.EventHandler(this.mnuExportLabels_Click); + // + // mnuImportSettings + // + this.mnuImportSettings.Image = global::Mesen.GUI.Properties.Resources.Cog; + this.mnuImportSettings.Name = "mnuImportSettings"; + this.mnuImportSettings.Size = new System.Drawing.Size(215, 22); + this.mnuImportSettings.Text = "Import Settings"; + this.mnuImportSettings.Click += new System.EventHandler(this.mnuImportSettings_Click); + // + // toolStripMenuItem16 + // + this.toolStripMenuItem16.Name = "toolStripMenuItem16"; + this.toolStripMenuItem16.Size = new System.Drawing.Size(212, 6); + // + // mnuResetWorkspace + // + this.mnuResetWorkspace.Image = global::Mesen.GUI.Properties.Resources.Reset; + this.mnuResetWorkspace.Name = "mnuResetWorkspace"; + this.mnuResetWorkspace.Size = new System.Drawing.Size(215, 22); + this.mnuResetWorkspace.Text = "Reset Workspace"; + this.mnuResetWorkspace.Click += new System.EventHandler(this.mnuResetWorkspace_Click); + // + // mnuResetLabels + // + this.mnuResetLabels.Name = "mnuResetLabels"; + this.mnuResetLabels.Size = new System.Drawing.Size(215, 22); + this.mnuResetLabels.Text = "Reset Labels"; + this.mnuResetLabels.Click += new System.EventHandler(this.mnuResetLabels_Click); + // + // toolStripMenuItem10 + // + this.toolStripMenuItem10.Name = "toolStripMenuItem10"; + this.toolStripMenuItem10.Size = new System.Drawing.Size(212, 6); + // + // mnuAutoLoadDbgFiles + // + this.mnuAutoLoadDbgFiles.CheckOnClick = true; + this.mnuAutoLoadDbgFiles.Name = "mnuAutoLoadDbgFiles"; + this.mnuAutoLoadDbgFiles.Size = new System.Drawing.Size(215, 22); + this.mnuAutoLoadDbgFiles.Text = "Auto-load DBG/MLB files"; + this.mnuAutoLoadDbgFiles.Click += new System.EventHandler(this.mnuAutoLoadDbgFiles_Click); + // + // mnuAutoLoadCdlFiles + // + this.mnuAutoLoadCdlFiles.CheckOnClick = true; + this.mnuAutoLoadCdlFiles.Name = "mnuAutoLoadCdlFiles"; + this.mnuAutoLoadCdlFiles.Size = new System.Drawing.Size(215, 22); + this.mnuAutoLoadCdlFiles.Text = "Auto-load CDL files"; + this.mnuAutoLoadCdlFiles.Click += new System.EventHandler(this.mnuAutoLoadCdlFiles_Click); + // + // mnuDisableDefaultLabels + // + this.mnuDisableDefaultLabels.CheckOnClick = true; + this.mnuDisableDefaultLabels.Name = "mnuDisableDefaultLabels"; + this.mnuDisableDefaultLabels.Size = new System.Drawing.Size(215, 22); + this.mnuDisableDefaultLabels.Text = "Disable default labels"; + this.mnuDisableDefaultLabels.Click += new System.EventHandler(this.mnuDisableDefaultLabels_Click); + // + // toolStripMenuItem3 + // + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(214, 6); + // + // mnuClose + // + this.mnuClose.Image = global::Mesen.GUI.Properties.Resources.Exit; + this.mnuClose.Name = "mnuClose"; + this.mnuClose.Size = new System.Drawing.Size(217, 22); + this.mnuClose.Text = "Close"; + this.mnuClose.Click += new System.EventHandler(this.mnuClose_Click); + // + // mnuCode + // + this.mnuCode.Name = "mnuCode"; + this.mnuCode.Size = new System.Drawing.Size(50, 20); + this.mnuCode.Text = "Code"; + this.mnuCode.DropDownOpening += new System.EventHandler(this.mnuCode_DropDownOpening); + // + // debugToolStripMenuItem + // + this.debugToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuContinue, this.mnuBreak, this.mnuStepInto, @@ -777,162 +778,162 @@ namespace Mesen.GUI.Debugger this.toolStripMenuItem8, this.mnuBreakIn, this.mnuBreakOn}); - this.debugToolStripMenuItem.Name = "debugToolStripMenuItem"; - this.debugToolStripMenuItem.Size = new System.Drawing.Size(54, 20); - this.debugToolStripMenuItem.Text = "Debug"; - // - // mnuContinue - // - this.mnuContinue.Enabled = false; - this.mnuContinue.Image = global::Mesen.GUI.Properties.Resources.Play; - this.mnuContinue.Name = "mnuContinue"; - this.mnuContinue.Size = new System.Drawing.Size(212, 22); - this.mnuContinue.Text = "Continue"; - this.mnuContinue.Click += new System.EventHandler(this.mnuContinue_Click); - // - // mnuBreak - // - this.mnuBreak.Enabled = false; - this.mnuBreak.Image = global::Mesen.GUI.Properties.Resources.Pause; - this.mnuBreak.Name = "mnuBreak"; - this.mnuBreak.ShortcutKeyDisplayString = ""; - this.mnuBreak.Size = new System.Drawing.Size(212, 22); - this.mnuBreak.Text = "Break"; - this.mnuBreak.Click += new System.EventHandler(this.mnuBreak_Click); - // - // mnuStepInto - // - this.mnuStepInto.Image = global::Mesen.GUI.Properties.Resources.StepInto; - this.mnuStepInto.Name = "mnuStepInto"; - this.mnuStepInto.Size = new System.Drawing.Size(212, 22); - this.mnuStepInto.Text = "Step Into"; - this.mnuStepInto.Click += new System.EventHandler(this.mnuStepInto_Click); - // - // mnuStepOver - // - this.mnuStepOver.Image = global::Mesen.GUI.Properties.Resources.StepOver; - this.mnuStepOver.Name = "mnuStepOver"; - this.mnuStepOver.Size = new System.Drawing.Size(212, 22); - this.mnuStepOver.Text = "Step Over"; - this.mnuStepOver.Click += new System.EventHandler(this.mnuStepOver_Click); - // - // mnuStepOut - // - this.mnuStepOut.Image = global::Mesen.GUI.Properties.Resources.StepOut; - this.mnuStepOut.Name = "mnuStepOut"; - this.mnuStepOut.Size = new System.Drawing.Size(212, 22); - this.mnuStepOut.Text = "Step Out"; - this.mnuStepOut.Click += new System.EventHandler(this.mnuStepOut_Click); - // - // mnuStepBack - // - this.mnuStepBack.Image = global::Mesen.GUI.Properties.Resources.StepBack; - this.mnuStepBack.Name = "mnuStepBack"; - this.mnuStepBack.Size = new System.Drawing.Size(212, 22); - this.mnuStepBack.Text = "Step Back"; - this.mnuStepBack.Click += new System.EventHandler(this.mnuStepBack_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(209, 6); - // - // mnuReset - // - this.mnuReset.Image = global::Mesen.GUI.Properties.Resources.Reset; - this.mnuReset.Name = "mnuReset"; - this.mnuReset.Size = new System.Drawing.Size(212, 22); - this.mnuReset.Text = "Reset"; - this.mnuReset.Click += new System.EventHandler(this.mnuReset_Click); - // - // mnuPowerCycle - // - this.mnuPowerCycle.Image = global::Mesen.GUI.Properties.Resources.PowerCycle; - this.mnuPowerCycle.Name = "mnuPowerCycle"; - this.mnuPowerCycle.Size = new System.Drawing.Size(212, 22); - this.mnuPowerCycle.Text = "Power Cycle"; - this.mnuPowerCycle.Click += new System.EventHandler(this.mnuPowerCycle_Click); - // - // toolStripMenuItem24 - // - this.toolStripMenuItem24.Name = "toolStripMenuItem24"; - this.toolStripMenuItem24.Size = new System.Drawing.Size(209, 6); - // - // mnuToggleBreakpoint - // - this.mnuToggleBreakpoint.Image = global::Mesen.GUI.Properties.Resources.Breakpoint; - this.mnuToggleBreakpoint.Name = "mnuToggleBreakpoint"; - this.mnuToggleBreakpoint.Size = new System.Drawing.Size(212, 22); - this.mnuToggleBreakpoint.Text = "Toggle Breakpoint"; - this.mnuToggleBreakpoint.Click += new System.EventHandler(this.mnuToggleBreakpoint_Click); - // - // mnuDisableEnableBreakpoint - // - this.mnuDisableEnableBreakpoint.Image = global::Mesen.GUI.Properties.Resources.BreakpointDisabled; - this.mnuDisableEnableBreakpoint.Name = "mnuDisableEnableBreakpoint"; - this.mnuDisableEnableBreakpoint.Size = new System.Drawing.Size(212, 22); - this.mnuDisableEnableBreakpoint.Text = "Disable/Enable Breakpoint"; - this.mnuDisableEnableBreakpoint.Click += new System.EventHandler(this.mnuDisableEnableBreakpoint_Click); - // - // toolStripMenuItem2 - // - this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(209, 6); - // - // mnuRunCpuCycle - // - this.mnuRunCpuCycle.Image = global::Mesen.GUI.Properties.Resources.JumpTarget; - this.mnuRunCpuCycle.Name = "mnuRunCpuCycle"; - this.mnuRunCpuCycle.Size = new System.Drawing.Size(212, 22); - this.mnuRunCpuCycle.Text = "Run one CPU cycle"; - this.mnuRunCpuCycle.Click += new System.EventHandler(this.mnuRunCpuCycle_Click); - // - // mnuRunPpuCycle - // - this.mnuRunPpuCycle.Image = global::Mesen.GUI.Properties.Resources.RunPpuCycle; - this.mnuRunPpuCycle.Name = "mnuRunPpuCycle"; - this.mnuRunPpuCycle.Size = new System.Drawing.Size(212, 22); - this.mnuRunPpuCycle.Text = "Run one PPU cycle"; - this.mnuRunPpuCycle.Click += new System.EventHandler(this.mnuRunPpuCycle_Click); - // - // mnuRunScanline - // - this.mnuRunScanline.Image = global::Mesen.GUI.Properties.Resources.RunPpuScanline; - this.mnuRunScanline.Name = "mnuRunScanline"; - this.mnuRunScanline.Size = new System.Drawing.Size(212, 22); - this.mnuRunScanline.Text = "Run one scanline"; - this.mnuRunScanline.Click += new System.EventHandler(this.mnuRunScanline_Click); - // - // mnuRunOneFrame - // - this.mnuRunOneFrame.Image = global::Mesen.GUI.Properties.Resources.RunPpuFrame; - this.mnuRunOneFrame.Name = "mnuRunOneFrame"; - this.mnuRunOneFrame.Size = new System.Drawing.Size(212, 22); - this.mnuRunOneFrame.Text = "Run one frame"; - this.mnuRunOneFrame.Click += new System.EventHandler(this.mnuRunOneFrame_Click); - // - // toolStripMenuItem8 - // - this.toolStripMenuItem8.Name = "toolStripMenuItem8"; - this.toolStripMenuItem8.Size = new System.Drawing.Size(209, 6); - // - // mnuBreakIn - // - this.mnuBreakIn.Name = "mnuBreakIn"; - this.mnuBreakIn.Size = new System.Drawing.Size(212, 22); - this.mnuBreakIn.Text = "Break in..."; - this.mnuBreakIn.Click += new System.EventHandler(this.mnuBreakIn_Click); - // - // mnuBreakOn - // - this.mnuBreakOn.Name = "mnuBreakOn"; - this.mnuBreakOn.Size = new System.Drawing.Size(212, 22); - this.mnuBreakOn.Text = "Break on..."; - this.mnuBreakOn.Click += new System.EventHandler(this.mnuBreakOn_Click); - // - // mnuSearch - // - this.mnuSearch.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.debugToolStripMenuItem.Name = "debugToolStripMenuItem"; + this.debugToolStripMenuItem.Size = new System.Drawing.Size(58, 20); + this.debugToolStripMenuItem.Text = "Debug"; + // + // mnuContinue + // + this.mnuContinue.Enabled = false; + this.mnuContinue.Image = global::Mesen.GUI.Properties.Resources.Play; + this.mnuContinue.Name = "mnuContinue"; + this.mnuContinue.Size = new System.Drawing.Size(224, 22); + this.mnuContinue.Text = "Continue"; + this.mnuContinue.Click += new System.EventHandler(this.mnuContinue_Click); + // + // mnuBreak + // + this.mnuBreak.Enabled = false; + this.mnuBreak.Image = global::Mesen.GUI.Properties.Resources.Pause; + this.mnuBreak.Name = "mnuBreak"; + this.mnuBreak.ShortcutKeyDisplayString = ""; + this.mnuBreak.Size = new System.Drawing.Size(224, 22); + this.mnuBreak.Text = "Break"; + this.mnuBreak.Click += new System.EventHandler(this.mnuBreak_Click); + // + // mnuStepInto + // + this.mnuStepInto.Image = global::Mesen.GUI.Properties.Resources.StepInto; + this.mnuStepInto.Name = "mnuStepInto"; + this.mnuStepInto.Size = new System.Drawing.Size(224, 22); + this.mnuStepInto.Text = "Step Into"; + this.mnuStepInto.Click += new System.EventHandler(this.mnuStepInto_Click); + // + // mnuStepOver + // + this.mnuStepOver.Image = global::Mesen.GUI.Properties.Resources.StepOver; + this.mnuStepOver.Name = "mnuStepOver"; + this.mnuStepOver.Size = new System.Drawing.Size(224, 22); + this.mnuStepOver.Text = "Step Over"; + this.mnuStepOver.Click += new System.EventHandler(this.mnuStepOver_Click); + // + // mnuStepOut + // + this.mnuStepOut.Image = global::Mesen.GUI.Properties.Resources.StepOut; + this.mnuStepOut.Name = "mnuStepOut"; + this.mnuStepOut.Size = new System.Drawing.Size(224, 22); + this.mnuStepOut.Text = "Step Out"; + this.mnuStepOut.Click += new System.EventHandler(this.mnuStepOut_Click); + // + // mnuStepBack + // + this.mnuStepBack.Image = global::Mesen.GUI.Properties.Resources.StepBack; + this.mnuStepBack.Name = "mnuStepBack"; + this.mnuStepBack.Size = new System.Drawing.Size(224, 22); + this.mnuStepBack.Text = "Step Back"; + this.mnuStepBack.Click += new System.EventHandler(this.mnuStepBack_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(221, 6); + // + // mnuReset + // + this.mnuReset.Image = global::Mesen.GUI.Properties.Resources.Reset; + this.mnuReset.Name = "mnuReset"; + this.mnuReset.Size = new System.Drawing.Size(224, 22); + this.mnuReset.Text = "Reset"; + this.mnuReset.Click += new System.EventHandler(this.mnuReset_Click); + // + // mnuPowerCycle + // + this.mnuPowerCycle.Image = global::Mesen.GUI.Properties.Resources.PowerCycle; + this.mnuPowerCycle.Name = "mnuPowerCycle"; + this.mnuPowerCycle.Size = new System.Drawing.Size(224, 22); + this.mnuPowerCycle.Text = "Power Cycle"; + this.mnuPowerCycle.Click += new System.EventHandler(this.mnuPowerCycle_Click); + // + // toolStripMenuItem24 + // + this.toolStripMenuItem24.Name = "toolStripMenuItem24"; + this.toolStripMenuItem24.Size = new System.Drawing.Size(221, 6); + // + // mnuToggleBreakpoint + // + this.mnuToggleBreakpoint.Image = global::Mesen.GUI.Properties.Resources.Breakpoint; + this.mnuToggleBreakpoint.Name = "mnuToggleBreakpoint"; + this.mnuToggleBreakpoint.Size = new System.Drawing.Size(224, 22); + this.mnuToggleBreakpoint.Text = "Toggle Breakpoint"; + this.mnuToggleBreakpoint.Click += new System.EventHandler(this.mnuToggleBreakpoint_Click); + // + // mnuDisableEnableBreakpoint + // + this.mnuDisableEnableBreakpoint.Image = global::Mesen.GUI.Properties.Resources.BreakpointDisabled; + this.mnuDisableEnableBreakpoint.Name = "mnuDisableEnableBreakpoint"; + this.mnuDisableEnableBreakpoint.Size = new System.Drawing.Size(224, 22); + this.mnuDisableEnableBreakpoint.Text = "Disable/Enable Breakpoint"; + this.mnuDisableEnableBreakpoint.Click += new System.EventHandler(this.mnuDisableEnableBreakpoint_Click); + // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(221, 6); + // + // mnuRunCpuCycle + // + this.mnuRunCpuCycle.Image = global::Mesen.GUI.Properties.Resources.JumpTarget; + this.mnuRunCpuCycle.Name = "mnuRunCpuCycle"; + this.mnuRunCpuCycle.Size = new System.Drawing.Size(224, 22); + this.mnuRunCpuCycle.Text = "Run one CPU cycle"; + this.mnuRunCpuCycle.Click += new System.EventHandler(this.mnuRunCpuCycle_Click); + // + // mnuRunPpuCycle + // + this.mnuRunPpuCycle.Image = global::Mesen.GUI.Properties.Resources.RunPpuCycle; + this.mnuRunPpuCycle.Name = "mnuRunPpuCycle"; + this.mnuRunPpuCycle.Size = new System.Drawing.Size(224, 22); + this.mnuRunPpuCycle.Text = "Run one PPU cycle"; + this.mnuRunPpuCycle.Click += new System.EventHandler(this.mnuRunPpuCycle_Click); + // + // mnuRunScanline + // + this.mnuRunScanline.Image = global::Mesen.GUI.Properties.Resources.RunPpuScanline; + this.mnuRunScanline.Name = "mnuRunScanline"; + this.mnuRunScanline.Size = new System.Drawing.Size(224, 22); + this.mnuRunScanline.Text = "Run one scanline"; + this.mnuRunScanline.Click += new System.EventHandler(this.mnuRunScanline_Click); + // + // mnuRunOneFrame + // + this.mnuRunOneFrame.Image = global::Mesen.GUI.Properties.Resources.RunPpuFrame; + this.mnuRunOneFrame.Name = "mnuRunOneFrame"; + this.mnuRunOneFrame.Size = new System.Drawing.Size(224, 22); + this.mnuRunOneFrame.Text = "Run one frame"; + this.mnuRunOneFrame.Click += new System.EventHandler(this.mnuRunOneFrame_Click); + // + // toolStripMenuItem8 + // + this.toolStripMenuItem8.Name = "toolStripMenuItem8"; + this.toolStripMenuItem8.Size = new System.Drawing.Size(221, 6); + // + // mnuBreakIn + // + this.mnuBreakIn.Name = "mnuBreakIn"; + this.mnuBreakIn.Size = new System.Drawing.Size(224, 22); + this.mnuBreakIn.Text = "Break in..."; + this.mnuBreakIn.Click += new System.EventHandler(this.mnuBreakIn_Click); + // + // mnuBreakOn + // + this.mnuBreakOn.Name = "mnuBreakOn"; + this.mnuBreakOn.Size = new System.Drawing.Size(224, 22); + this.mnuBreakOn.Text = "Break on..."; + this.mnuBreakOn.Click += new System.EventHandler(this.mnuBreakOn_Click); + // + // mnuSearch + // + this.mnuSearch.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuGoToAll, this.mnuGoToAddress, this.mnuGoTo, @@ -942,75 +943,75 @@ namespace Mesen.GUI.Debugger this.mnuFindPrev, this.toolStripMenuItem9, this.mnuFindAllOccurrences}); - this.mnuSearch.Name = "mnuSearch"; - this.mnuSearch.Size = new System.Drawing.Size(54, 20); - this.mnuSearch.Text = "Search"; - this.mnuSearch.DropDownOpening += new System.EventHandler(this.mnuSearch_DropDownOpening); - // - // mnuGoToAll - // - this.mnuGoToAll.Name = "mnuGoToAll"; - this.mnuGoToAll.Size = new System.Drawing.Size(183, 22); - this.mnuGoToAll.Text = "Go to All"; - this.mnuGoToAll.Click += new System.EventHandler(this.mnuGoToAll_Click); - // - // mnuGoToAddress - // - this.mnuGoToAddress.Name = "mnuGoToAddress"; - this.mnuGoToAddress.Size = new System.Drawing.Size(183, 22); - this.mnuGoToAddress.Text = "Go to Address"; - this.mnuGoToAddress.Click += new System.EventHandler(this.mnuGoToAddress_Click); - // - // mnuGoTo - // - this.mnuGoTo.Name = "mnuGoTo"; - this.mnuGoTo.Size = new System.Drawing.Size(183, 22); - this.mnuGoTo.Text = "Go to..."; - // - // toolStripMenuItem29 - // - this.toolStripMenuItem29.Name = "toolStripMenuItem29"; - this.toolStripMenuItem29.Size = new System.Drawing.Size(180, 6); - // - // mnuFind - // - this.mnuFind.Image = global::Mesen.GUI.Properties.Resources.Find; - this.mnuFind.Name = "mnuFind"; - this.mnuFind.Size = new System.Drawing.Size(183, 22); - this.mnuFind.Text = "Find..."; - this.mnuFind.Click += new System.EventHandler(this.mnuFind_Click); - // - // mnuFindNext - // - this.mnuFindNext.Image = global::Mesen.GUI.Properties.Resources.NextArrow; - this.mnuFindNext.Name = "mnuFindNext"; - this.mnuFindNext.Size = new System.Drawing.Size(183, 22); - this.mnuFindNext.Text = "Find Next"; - this.mnuFindNext.Click += new System.EventHandler(this.mnuFindNext_Click); - // - // mnuFindPrev - // - this.mnuFindPrev.Image = global::Mesen.GUI.Properties.Resources.PreviousArrow; - this.mnuFindPrev.Name = "mnuFindPrev"; - this.mnuFindPrev.Size = new System.Drawing.Size(183, 22); - this.mnuFindPrev.Text = "Find Previous"; - this.mnuFindPrev.Click += new System.EventHandler(this.mnuFindPrev_Click); - // - // toolStripMenuItem9 - // - this.toolStripMenuItem9.Name = "toolStripMenuItem9"; - this.toolStripMenuItem9.Size = new System.Drawing.Size(180, 6); - // - // mnuFindAllOccurrences - // - this.mnuFindAllOccurrences.Name = "mnuFindAllOccurrences"; - this.mnuFindAllOccurrences.Size = new System.Drawing.Size(183, 22); - this.mnuFindAllOccurrences.Text = "Find All Occurrences"; - this.mnuFindAllOccurrences.Click += new System.EventHandler(this.mnuFindAllOccurrences_Click); - // - // mnuOptions - // - this.mnuOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuSearch.Name = "mnuSearch"; + this.mnuSearch.Size = new System.Drawing.Size(57, 20); + this.mnuSearch.Text = "Search"; + this.mnuSearch.DropDownOpening += new System.EventHandler(this.mnuSearch_DropDownOpening); + // + // mnuGoToAll + // + this.mnuGoToAll.Name = "mnuGoToAll"; + this.mnuGoToAll.Size = new System.Drawing.Size(187, 22); + this.mnuGoToAll.Text = "Go to All"; + this.mnuGoToAll.Click += new System.EventHandler(this.mnuGoToAll_Click); + // + // mnuGoToAddress + // + this.mnuGoToAddress.Name = "mnuGoToAddress"; + this.mnuGoToAddress.Size = new System.Drawing.Size(187, 22); + this.mnuGoToAddress.Text = "Go to Address"; + this.mnuGoToAddress.Click += new System.EventHandler(this.mnuGoToAddress_Click); + // + // mnuGoTo + // + this.mnuGoTo.Name = "mnuGoTo"; + this.mnuGoTo.Size = new System.Drawing.Size(187, 22); + this.mnuGoTo.Text = "Go to..."; + // + // toolStripMenuItem29 + // + this.toolStripMenuItem29.Name = "toolStripMenuItem29"; + this.toolStripMenuItem29.Size = new System.Drawing.Size(184, 6); + // + // mnuFind + // + this.mnuFind.Image = global::Mesen.GUI.Properties.Resources.Find; + this.mnuFind.Name = "mnuFind"; + this.mnuFind.Size = new System.Drawing.Size(187, 22); + this.mnuFind.Text = "Find..."; + this.mnuFind.Click += new System.EventHandler(this.mnuFind_Click); + // + // mnuFindNext + // + this.mnuFindNext.Image = global::Mesen.GUI.Properties.Resources.NextArrow; + this.mnuFindNext.Name = "mnuFindNext"; + this.mnuFindNext.Size = new System.Drawing.Size(187, 22); + this.mnuFindNext.Text = "Find Next"; + this.mnuFindNext.Click += new System.EventHandler(this.mnuFindNext_Click); + // + // mnuFindPrev + // + this.mnuFindPrev.Image = global::Mesen.GUI.Properties.Resources.PreviousArrow; + this.mnuFindPrev.Name = "mnuFindPrev"; + this.mnuFindPrev.Size = new System.Drawing.Size(187, 22); + this.mnuFindPrev.Text = "Find Previous"; + this.mnuFindPrev.Click += new System.EventHandler(this.mnuFindPrev_Click); + // + // toolStripMenuItem9 + // + this.toolStripMenuItem9.Name = "toolStripMenuItem9"; + this.toolStripMenuItem9.Size = new System.Drawing.Size(184, 6); + // + // mnuFindAllOccurrences + // + this.mnuFindAllOccurrences.Name = "mnuFindAllOccurrences"; + this.mnuFindAllOccurrences.Size = new System.Drawing.Size(187, 22); + this.mnuFindAllOccurrences.Text = "Find All Occurrences"; + this.mnuFindAllOccurrences.Click += new System.EventHandler(this.mnuFindAllOccurrences_Click); + // + // mnuOptions + // + this.mnuOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuDisassemblyOptions, this.mnuBreakOptions, this.toolStripMenuItem12, @@ -1040,131 +1041,132 @@ namespace Mesen.GUI.Debugger this.toolStripSeparator2, this.mnuConfigureExternalEditor, this.mnuPreferences}); - this.mnuOptions.Name = "mnuOptions"; - this.mnuOptions.Size = new System.Drawing.Size(61, 20); - this.mnuOptions.Text = "Options"; - // - // mnuDisassemblyOptions - // - this.mnuDisassemblyOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuOptions.Name = "mnuOptions"; + this.mnuOptions.Size = new System.Drawing.Size(64, 20); + this.mnuOptions.Text = "Options"; + // + // mnuDisassemblyOptions + // + this.mnuDisassemblyOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuDisassemble, this.mnuShow, this.toolStripMenuItem7, this.mnuDisplayOpCodesInLowerCase, this.mnuShowEffectiveAddresses, this.mnuShowMemoryValues}); - this.mnuDisassemblyOptions.Name = "mnuDisassemblyOptions"; - this.mnuDisassemblyOptions.Size = new System.Drawing.Size(266, 22); - this.mnuDisassemblyOptions.Text = "Disassembly Options"; - // - // mnuDisassemble - // - this.mnuDisassemble.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuDisassemblyOptions.Name = "mnuDisassemblyOptions"; + this.mnuDisassemblyOptions.Size = new System.Drawing.Size(277, 22); + this.mnuDisassemblyOptions.Text = "Disassembly Options"; + // + // mnuDisassemble + // + this.mnuDisassemble.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuDisassembleVerifiedCode, this.mnuDisassembleVerifiedData, this.mnuDisassembleUnidentifiedData}); - this.mnuDisassemble.Name = "mnuDisassemble"; - this.mnuDisassemble.Size = new System.Drawing.Size(236, 22); - this.mnuDisassemble.Text = "Disassemble..."; - // - // mnuDisassembleVerifiedCode - // - this.mnuDisassembleVerifiedCode.Checked = true; - this.mnuDisassembleVerifiedCode.CheckState = System.Windows.Forms.CheckState.Checked; - this.mnuDisassembleVerifiedCode.Enabled = false; - this.mnuDisassembleVerifiedCode.Name = "mnuDisassembleVerifiedCode"; - this.mnuDisassembleVerifiedCode.Size = new System.Drawing.Size(250, 22); - this.mnuDisassembleVerifiedCode.Text = "Verified Code"; - // - // mnuDisassembleVerifiedData - // - this.mnuDisassembleVerifiedData.CheckOnClick = true; - this.mnuDisassembleVerifiedData.Name = "mnuDisassembleVerifiedData"; - this.mnuDisassembleVerifiedData.Size = new System.Drawing.Size(250, 22); - this.mnuDisassembleVerifiedData.Text = "Verified Data (not recommended)"; - this.mnuDisassembleVerifiedData.Click += new System.EventHandler(this.mnuDisassembleVerifiedData_Click); - // - // mnuDisassembleUnidentifiedData - // - this.mnuDisassembleUnidentifiedData.CheckOnClick = true; - this.mnuDisassembleUnidentifiedData.Name = "mnuDisassembleUnidentifiedData"; - this.mnuDisassembleUnidentifiedData.Size = new System.Drawing.Size(250, 22); - this.mnuDisassembleUnidentifiedData.Text = "Unidentified Code/Data"; - this.mnuDisassembleUnidentifiedData.Click += new System.EventHandler(this.mnuDisassembleUnidentifiedData_Click); - // - // mnuShow - // - this.mnuShow.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuDisassemble.Name = "mnuDisassemble"; + this.mnuDisassemble.Size = new System.Drawing.Size(247, 22); + this.mnuDisassemble.Text = "Disassemble..."; + // + // mnuDisassembleVerifiedCode + // + this.mnuDisassembleVerifiedCode.Checked = true; + this.mnuDisassembleVerifiedCode.CheckState = System.Windows.Forms.CheckState.Checked; + this.mnuDisassembleVerifiedCode.Enabled = false; + this.mnuDisassembleVerifiedCode.Name = "mnuDisassembleVerifiedCode"; + this.mnuDisassembleVerifiedCode.Size = new System.Drawing.Size(265, 22); + this.mnuDisassembleVerifiedCode.Text = "Verified Code"; + // + // mnuDisassembleVerifiedData + // + this.mnuDisassembleVerifiedData.CheckOnClick = true; + this.mnuDisassembleVerifiedData.Name = "mnuDisassembleVerifiedData"; + this.mnuDisassembleVerifiedData.Size = new System.Drawing.Size(265, 22); + this.mnuDisassembleVerifiedData.Text = "Verified Data (not recommended)"; + this.mnuDisassembleVerifiedData.Click += new System.EventHandler(this.mnuDisassembleVerifiedData_Click); + // + // mnuDisassembleUnidentifiedData + // + this.mnuDisassembleUnidentifiedData.CheckOnClick = true; + this.mnuDisassembleUnidentifiedData.Name = "mnuDisassembleUnidentifiedData"; + this.mnuDisassembleUnidentifiedData.Size = new System.Drawing.Size(265, 22); + this.mnuDisassembleUnidentifiedData.Text = "Unidentified Code/Data"; + this.mnuDisassembleUnidentifiedData.Click += new System.EventHandler(this.mnuDisassembleUnidentifiedData_Click); + // + // mnuShow + // + this.mnuShow.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuShowVerifiedCode, this.mnuShowVerifiedData, this.mnuShowUnidentifiedData}); - this.mnuShow.Name = "mnuShow"; - this.mnuShow.Size = new System.Drawing.Size(236, 22); - this.mnuShow.Text = "Show..."; - // - // mnuShowVerifiedCode - // - this.mnuShowVerifiedCode.Checked = true; - this.mnuShowVerifiedCode.CheckState = System.Windows.Forms.CheckState.Checked; - this.mnuShowVerifiedCode.Enabled = false; - this.mnuShowVerifiedCode.Name = "mnuShowVerifiedCode"; - this.mnuShowVerifiedCode.Size = new System.Drawing.Size(199, 22); - this.mnuShowVerifiedCode.Text = "Verified Code"; - // - // mnuShowVerifiedData - // - this.mnuShowVerifiedData.CheckOnClick = true; - this.mnuShowVerifiedData.Image = global::Mesen.GUI.Properties.Resources.VerifiedData; - this.mnuShowVerifiedData.Name = "mnuShowVerifiedData"; - this.mnuShowVerifiedData.Size = new System.Drawing.Size(199, 22); - this.mnuShowVerifiedData.Text = "Verified Data"; - this.mnuShowVerifiedData.Click += new System.EventHandler(this.mnuShowVerifiedData_Click); - // - // mnuShowUnidentifiedData - // - this.mnuShowUnidentifiedData.CheckOnClick = true; - this.mnuShowUnidentifiedData.Image = global::Mesen.GUI.Properties.Resources.UnidentifiedData; - this.mnuShowUnidentifiedData.Name = "mnuShowUnidentifiedData"; - this.mnuShowUnidentifiedData.Size = new System.Drawing.Size(199, 22); - this.mnuShowUnidentifiedData.Text = "Unidentified Code/Data"; - this.mnuShowUnidentifiedData.Click += new System.EventHandler(this.mnuShowUnidentifiedData_Click); - // - // toolStripMenuItem7 - // - this.toolStripMenuItem7.Name = "toolStripMenuItem7"; - this.toolStripMenuItem7.Size = new System.Drawing.Size(233, 6); - // - // mnuDisplayOpCodesInLowerCase - // - this.mnuDisplayOpCodesInLowerCase.CheckOnClick = true; - this.mnuDisplayOpCodesInLowerCase.Name = "mnuDisplayOpCodesInLowerCase"; - this.mnuDisplayOpCodesInLowerCase.Size = new System.Drawing.Size(236, 22); - this.mnuDisplayOpCodesInLowerCase.Text = "Display OP codes in lower case"; - this.mnuDisplayOpCodesInLowerCase.Click += new System.EventHandler(this.mnuDisplayOpCodesInLowerCase_Click); - // - // mnuShowEffectiveAddresses - // - this.mnuShowEffectiveAddresses.CheckOnClick = true; - this.mnuShowEffectiveAddresses.Name = "mnuShowEffectiveAddresses"; - this.mnuShowEffectiveAddresses.Size = new System.Drawing.Size(236, 22); - this.mnuShowEffectiveAddresses.Text = "Show Effective Addresses"; - this.mnuShowEffectiveAddresses.Click += new System.EventHandler(this.mnuShowEffectiveAddresses_Click); - // - // mnuShowMemoryValues - // - this.mnuShowMemoryValues.CheckOnClick = true; - this.mnuShowMemoryValues.Name = "mnuShowMemoryValues"; - this.mnuShowMemoryValues.Size = new System.Drawing.Size(236, 22); - this.mnuShowMemoryValues.Text = "Show Memory Values"; - this.mnuShowMemoryValues.Click += new System.EventHandler(this.mnuShowMemoryValues_Click); - // - // mnuBreakOptions - // - this.mnuBreakOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuShow.Name = "mnuShow"; + this.mnuShow.Size = new System.Drawing.Size(247, 22); + this.mnuShow.Text = "Show..."; + // + // mnuShowVerifiedCode + // + this.mnuShowVerifiedCode.Checked = true; + this.mnuShowVerifiedCode.CheckState = System.Windows.Forms.CheckState.Checked; + this.mnuShowVerifiedCode.Enabled = false; + this.mnuShowVerifiedCode.Name = "mnuShowVerifiedCode"; + this.mnuShowVerifiedCode.Size = new System.Drawing.Size(210, 22); + this.mnuShowVerifiedCode.Text = "Verified Code"; + // + // mnuShowVerifiedData + // + this.mnuShowVerifiedData.CheckOnClick = true; + this.mnuShowVerifiedData.Image = global::Mesen.GUI.Properties.Resources.VerifiedData; + this.mnuShowVerifiedData.Name = "mnuShowVerifiedData"; + this.mnuShowVerifiedData.Size = new System.Drawing.Size(210, 22); + this.mnuShowVerifiedData.Text = "Verified Data"; + this.mnuShowVerifiedData.Click += new System.EventHandler(this.mnuShowVerifiedData_Click); + // + // mnuShowUnidentifiedData + // + this.mnuShowUnidentifiedData.CheckOnClick = true; + this.mnuShowUnidentifiedData.Image = global::Mesen.GUI.Properties.Resources.UnidentifiedData; + this.mnuShowUnidentifiedData.Name = "mnuShowUnidentifiedData"; + this.mnuShowUnidentifiedData.Size = new System.Drawing.Size(210, 22); + this.mnuShowUnidentifiedData.Text = "Unidentified Code/Data"; + this.mnuShowUnidentifiedData.Click += new System.EventHandler(this.mnuShowUnidentifiedData_Click); + // + // toolStripMenuItem7 + // + this.toolStripMenuItem7.Name = "toolStripMenuItem7"; + this.toolStripMenuItem7.Size = new System.Drawing.Size(244, 6); + // + // mnuDisplayOpCodesInLowerCase + // + this.mnuDisplayOpCodesInLowerCase.CheckOnClick = true; + this.mnuDisplayOpCodesInLowerCase.Name = "mnuDisplayOpCodesInLowerCase"; + this.mnuDisplayOpCodesInLowerCase.Size = new System.Drawing.Size(247, 22); + this.mnuDisplayOpCodesInLowerCase.Text = "Display OP codes in lower case"; + this.mnuDisplayOpCodesInLowerCase.Click += new System.EventHandler(this.mnuDisplayOpCodesInLowerCase_Click); + // + // mnuShowEffectiveAddresses + // + this.mnuShowEffectiveAddresses.CheckOnClick = true; + this.mnuShowEffectiveAddresses.Name = "mnuShowEffectiveAddresses"; + this.mnuShowEffectiveAddresses.Size = new System.Drawing.Size(247, 22); + this.mnuShowEffectiveAddresses.Text = "Show Effective Addresses"; + this.mnuShowEffectiveAddresses.Click += new System.EventHandler(this.mnuShowEffectiveAddresses_Click); + // + // mnuShowMemoryValues + // + this.mnuShowMemoryValues.CheckOnClick = true; + this.mnuShowMemoryValues.Name = "mnuShowMemoryValues"; + this.mnuShowMemoryValues.Size = new System.Drawing.Size(247, 22); + this.mnuShowMemoryValues.Text = "Show Memory Values"; + this.mnuShowMemoryValues.Click += new System.EventHandler(this.mnuShowMemoryValues_Click); + // + // mnuBreakOptions + // + this.mnuBreakOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuBreakOnReset, this.mnuBreakOnUnofficialOpcodes, this.mnuBreakOnBrk, this.mnuBreakOnCrash, + this.mnuBreakOnUnlogged, this.sepBreakNsfOptions, this.mnuBreakOnInit, this.mnuBreakOnPlay, @@ -1181,499 +1183,499 @@ namespace Mesen.GUI.Debugger this.mnuBringToFrontOnPause, this.toolStripMenuItem28, this.mnuEnableSubInstructionBreakpoints}); - this.mnuBreakOptions.Name = "mnuBreakOptions"; - this.mnuBreakOptions.Size = new System.Drawing.Size(266, 22); - this.mnuBreakOptions.Text = "Break Options"; - this.mnuBreakOptions.DropDownOpening += new System.EventHandler(this.mnuBreakOptions_DropDownOpening); - // - // mnuBreakOnReset - // - this.mnuBreakOnReset.CheckOnClick = true; - this.mnuBreakOnReset.Name = "mnuBreakOnReset"; - this.mnuBreakOnReset.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnReset.Text = "Break on power/reset"; - this.mnuBreakOnReset.Click += new System.EventHandler(this.mnuBreakOnReset_Click); - // - // mnuBreakOnUnofficialOpcodes - // - this.mnuBreakOnUnofficialOpcodes.CheckOnClick = true; - this.mnuBreakOnUnofficialOpcodes.Name = "mnuBreakOnUnofficialOpcodes"; - this.mnuBreakOnUnofficialOpcodes.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnUnofficialOpcodes.Text = "Break on unofficial opcodes"; - this.mnuBreakOnUnofficialOpcodes.Click += new System.EventHandler(this.mnuBreakOnUnofficialOpcodes_Click); - // - // mnuBreakOnBrk - // - this.mnuBreakOnBrk.CheckOnClick = true; - this.mnuBreakOnBrk.Name = "mnuBreakOnBrk"; - this.mnuBreakOnBrk.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnBrk.Text = "Break on BRK"; - this.mnuBreakOnBrk.Click += new System.EventHandler(this.mnuBreakOnBrk_Click); - // - // mnuBreakOnCrash - // - this.mnuBreakOnCrash.CheckOnClick = true; - this.mnuBreakOnCrash.Name = "mnuBreakOnCrash"; - this.mnuBreakOnCrash.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnCrash.Text = "Break on CPU crash"; - this.mnuBreakOnCrash.Click += new System.EventHandler(this.mnuBreakOnCrash_Click); - // - // sepBreakNsfOptions - // - this.sepBreakNsfOptions.Name = "sepBreakNsfOptions"; - this.sepBreakNsfOptions.Size = new System.Drawing.Size(258, 6); - // - // mnuBreakOnInit - // - this.mnuBreakOnInit.CheckOnClick = true; - this.mnuBreakOnInit.Name = "mnuBreakOnInit"; - this.mnuBreakOnInit.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnInit.Text = "Break on Init (NSF)"; - this.mnuBreakOnInit.Click += new System.EventHandler(this.mnuBreakOnInit_Click); - // - // mnuBreakOnPlay - // - this.mnuBreakOnPlay.CheckOnClick = true; - this.mnuBreakOnPlay.Name = "mnuBreakOnPlay"; - this.mnuBreakOnPlay.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnPlay.Text = "Break on Play (NSF)"; - this.mnuBreakOnPlay.Click += new System.EventHandler(this.mnuBreakOnPlay_Click); - // - // toolStripMenuItem26 - // - this.toolStripMenuItem26.Name = "toolStripMenuItem26"; - this.toolStripMenuItem26.Size = new System.Drawing.Size(258, 6); - // - // mnuBreakOnBusConflict - // - this.mnuBreakOnBusConflict.CheckOnClick = true; - this.mnuBreakOnBusConflict.Name = "mnuBreakOnBusConflict"; - this.mnuBreakOnBusConflict.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnBusConflict.Text = "Break on bus conflict"; - this.mnuBreakOnBusConflict.Click += new System.EventHandler(this.mnuBreakOnBusConflict_Click); - // - // mnuBreakOnDecayedOamRead - // - this.mnuBreakOnDecayedOamRead.CheckOnClick = true; - this.mnuBreakOnDecayedOamRead.Name = "mnuBreakOnDecayedOamRead"; - this.mnuBreakOnDecayedOamRead.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnDecayedOamRead.Text = "Break on decayed OAM read"; - this.mnuBreakOnDecayedOamRead.Click += new System.EventHandler(this.mnuBreakOnDecayedOamRead_Click); - // - // mnuBreakOnPpu2006ScrollGlitch - // - this.mnuBreakOnPpu2006ScrollGlitch.CheckOnClick = true; - this.mnuBreakOnPpu2006ScrollGlitch.Name = "mnuBreakOnPpu2006ScrollGlitch"; - this.mnuBreakOnPpu2006ScrollGlitch.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnPpu2006ScrollGlitch.Text = "Break on PPU $2006 scroll glitch"; - this.mnuBreakOnPpu2006ScrollGlitch.Click += new System.EventHandler(this.mnuBreakOnPpu2006ScrollGlitch_Click); - // - // mnuBreakOnUninitMemoryRead - // - this.mnuBreakOnUninitMemoryRead.CheckOnClick = true; - this.mnuBreakOnUninitMemoryRead.Name = "mnuBreakOnUninitMemoryRead"; - this.mnuBreakOnUninitMemoryRead.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnUninitMemoryRead.Text = "Break on uninitialized memory read"; - this.mnuBreakOnUninitMemoryRead.Click += new System.EventHandler(this.mnuBreakOnUninitMemoryRead_Click); - // - // toolStripMenuItem15 - // - this.toolStripMenuItem15.Name = "toolStripMenuItem15"; - this.toolStripMenuItem15.Size = new System.Drawing.Size(258, 6); - // - // mnuBreakOnOpen - // - this.mnuBreakOnOpen.CheckOnClick = true; - this.mnuBreakOnOpen.Name = "mnuBreakOnOpen"; - this.mnuBreakOnOpen.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnOpen.Text = "Break when debugger is opened"; - this.mnuBreakOnOpen.Click += new System.EventHandler(this.mnuBreakOnOpen_Click); - // - // mnuBreakOnDebuggerFocus - // - this.mnuBreakOnDebuggerFocus.CheckOnClick = true; - this.mnuBreakOnDebuggerFocus.Name = "mnuBreakOnDebuggerFocus"; - this.mnuBreakOnDebuggerFocus.Size = new System.Drawing.Size(261, 22); - this.mnuBreakOnDebuggerFocus.Text = "Break on debugger focus"; - this.mnuBreakOnDebuggerFocus.Click += new System.EventHandler(this.mnuBreakOnDebuggerFocus_Click); - // - // toolStripMenuItem20 - // - this.toolStripMenuItem20.Name = "toolStripMenuItem20"; - this.toolStripMenuItem20.Size = new System.Drawing.Size(258, 6); - // - // mnuBringToFrontOnBreak - // - this.mnuBringToFrontOnBreak.CheckOnClick = true; - this.mnuBringToFrontOnBreak.Name = "mnuBringToFrontOnBreak"; - this.mnuBringToFrontOnBreak.Size = new System.Drawing.Size(261, 22); - this.mnuBringToFrontOnBreak.Text = "Bring debugger to front on break"; - this.mnuBringToFrontOnBreak.Click += new System.EventHandler(this.mnuBringToFrontOnBreak_Click); - // - // mnuBringToFrontOnPause - // - this.mnuBringToFrontOnPause.CheckOnClick = true; - this.mnuBringToFrontOnPause.Name = "mnuBringToFrontOnPause"; - this.mnuBringToFrontOnPause.Size = new System.Drawing.Size(261, 22); - this.mnuBringToFrontOnPause.Text = "Bring debugger to front on pause"; - this.mnuBringToFrontOnPause.Click += new System.EventHandler(this.mnuBringToFrontOnPause_Click); - // - // toolStripMenuItem28 - // - this.toolStripMenuItem28.Name = "toolStripMenuItem28"; - this.toolStripMenuItem28.Size = new System.Drawing.Size(258, 6); - // - // mnuEnableSubInstructionBreakpoints - // - this.mnuEnableSubInstructionBreakpoints.CheckOnClick = true; - this.mnuEnableSubInstructionBreakpoints.Name = "mnuEnableSubInstructionBreakpoints"; - this.mnuEnableSubInstructionBreakpoints.Size = new System.Drawing.Size(261, 22); - this.mnuEnableSubInstructionBreakpoints.Text = "Enable sub-instruction breakpoints"; - this.mnuEnableSubInstructionBreakpoints.Click += new System.EventHandler(this.mnuBreakOnFirstCycle_Click); - // - // toolStripMenuItem12 - // - this.toolStripMenuItem12.Name = "toolStripMenuItem12"; - this.toolStripMenuItem12.Size = new System.Drawing.Size(263, 6); - // - // mnuShowOptions - // - this.mnuShowOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuBreakOptions.Name = "mnuBreakOptions"; + this.mnuBreakOptions.Size = new System.Drawing.Size(277, 22); + this.mnuBreakOptions.Text = "Break Options"; + this.mnuBreakOptions.DropDownOpening += new System.EventHandler(this.mnuBreakOptions_DropDownOpening); + // + // mnuBreakOnReset + // + this.mnuBreakOnReset.CheckOnClick = true; + this.mnuBreakOnReset.Name = "mnuBreakOnReset"; + this.mnuBreakOnReset.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnReset.Text = "Break on power/reset"; + this.mnuBreakOnReset.Click += new System.EventHandler(this.mnuBreakOnReset_Click); + // + // mnuBreakOnUnofficialOpcodes + // + this.mnuBreakOnUnofficialOpcodes.CheckOnClick = true; + this.mnuBreakOnUnofficialOpcodes.Name = "mnuBreakOnUnofficialOpcodes"; + this.mnuBreakOnUnofficialOpcodes.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnUnofficialOpcodes.Text = "Break on unofficial opcodes"; + this.mnuBreakOnUnofficialOpcodes.Click += new System.EventHandler(this.mnuBreakOnUnofficialOpcodes_Click); + // + // mnuBreakOnBrk + // + this.mnuBreakOnBrk.CheckOnClick = true; + this.mnuBreakOnBrk.Name = "mnuBreakOnBrk"; + this.mnuBreakOnBrk.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnBrk.Text = "Break on BRK"; + this.mnuBreakOnBrk.Click += new System.EventHandler(this.mnuBreakOnBrk_Click); + // + // mnuBreakOnCrash + // + this.mnuBreakOnCrash.CheckOnClick = true; + this.mnuBreakOnCrash.Name = "mnuBreakOnCrash"; + this.mnuBreakOnCrash.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnCrash.Text = "Break on CPU crash"; + this.mnuBreakOnCrash.Click += new System.EventHandler(this.mnuBreakOnCrash_Click); + // + // sepBreakNsfOptions + // + this.sepBreakNsfOptions.Name = "sepBreakNsfOptions"; + this.sepBreakNsfOptions.Size = new System.Drawing.Size(270, 6); + // + // mnuBreakOnInit + // + this.mnuBreakOnInit.CheckOnClick = true; + this.mnuBreakOnInit.Name = "mnuBreakOnInit"; + this.mnuBreakOnInit.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnInit.Text = "Break on Init (NSF)"; + this.mnuBreakOnInit.Click += new System.EventHandler(this.mnuBreakOnInit_Click); + // + // mnuBreakOnPlay + // + this.mnuBreakOnPlay.CheckOnClick = true; + this.mnuBreakOnPlay.Name = "mnuBreakOnPlay"; + this.mnuBreakOnPlay.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnPlay.Text = "Break on Play (NSF)"; + this.mnuBreakOnPlay.Click += new System.EventHandler(this.mnuBreakOnPlay_Click); + // + // toolStripMenuItem26 + // + this.toolStripMenuItem26.Name = "toolStripMenuItem26"; + this.toolStripMenuItem26.Size = new System.Drawing.Size(270, 6); + // + // mnuBreakOnBusConflict + // + this.mnuBreakOnBusConflict.CheckOnClick = true; + this.mnuBreakOnBusConflict.Name = "mnuBreakOnBusConflict"; + this.mnuBreakOnBusConflict.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnBusConflict.Text = "Break on bus conflict"; + this.mnuBreakOnBusConflict.Click += new System.EventHandler(this.mnuBreakOnBusConflict_Click); + // + // mnuBreakOnDecayedOamRead + // + this.mnuBreakOnDecayedOamRead.CheckOnClick = true; + this.mnuBreakOnDecayedOamRead.Name = "mnuBreakOnDecayedOamRead"; + this.mnuBreakOnDecayedOamRead.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnDecayedOamRead.Text = "Break on decayed OAM read"; + this.mnuBreakOnDecayedOamRead.Click += new System.EventHandler(this.mnuBreakOnDecayedOamRead_Click); + // + // mnuBreakOnPpu2006ScrollGlitch + // + this.mnuBreakOnPpu2006ScrollGlitch.CheckOnClick = true; + this.mnuBreakOnPpu2006ScrollGlitch.Name = "mnuBreakOnPpu2006ScrollGlitch"; + this.mnuBreakOnPpu2006ScrollGlitch.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnPpu2006ScrollGlitch.Text = "Break on PPU $2006 scroll glitch"; + this.mnuBreakOnPpu2006ScrollGlitch.Click += new System.EventHandler(this.mnuBreakOnPpu2006ScrollGlitch_Click); + // + // mnuBreakOnUninitMemoryRead + // + this.mnuBreakOnUninitMemoryRead.CheckOnClick = true; + this.mnuBreakOnUninitMemoryRead.Name = "mnuBreakOnUninitMemoryRead"; + this.mnuBreakOnUninitMemoryRead.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnUninitMemoryRead.Text = "Break on uninitialized memory read"; + this.mnuBreakOnUninitMemoryRead.Click += new System.EventHandler(this.mnuBreakOnUninitMemoryRead_Click); + // + // toolStripMenuItem15 + // + this.toolStripMenuItem15.Name = "toolStripMenuItem15"; + this.toolStripMenuItem15.Size = new System.Drawing.Size(270, 6); + // + // mnuBreakOnOpen + // + this.mnuBreakOnOpen.CheckOnClick = true; + this.mnuBreakOnOpen.Name = "mnuBreakOnOpen"; + this.mnuBreakOnOpen.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnOpen.Text = "Break when debugger is opened"; + this.mnuBreakOnOpen.Click += new System.EventHandler(this.mnuBreakOnOpen_Click); + // + // mnuBreakOnDebuggerFocus + // + this.mnuBreakOnDebuggerFocus.CheckOnClick = true; + this.mnuBreakOnDebuggerFocus.Name = "mnuBreakOnDebuggerFocus"; + this.mnuBreakOnDebuggerFocus.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnDebuggerFocus.Text = "Break on debugger focus"; + this.mnuBreakOnDebuggerFocus.Click += new System.EventHandler(this.mnuBreakOnDebuggerFocus_Click); + // + // toolStripMenuItem20 + // + this.toolStripMenuItem20.Name = "toolStripMenuItem20"; + this.toolStripMenuItem20.Size = new System.Drawing.Size(270, 6); + // + // mnuBringToFrontOnBreak + // + this.mnuBringToFrontOnBreak.CheckOnClick = true; + this.mnuBringToFrontOnBreak.Name = "mnuBringToFrontOnBreak"; + this.mnuBringToFrontOnBreak.Size = new System.Drawing.Size(273, 22); + this.mnuBringToFrontOnBreak.Text = "Bring debugger to front on break"; + this.mnuBringToFrontOnBreak.Click += new System.EventHandler(this.mnuBringToFrontOnBreak_Click); + // + // mnuBringToFrontOnPause + // + this.mnuBringToFrontOnPause.CheckOnClick = true; + this.mnuBringToFrontOnPause.Name = "mnuBringToFrontOnPause"; + this.mnuBringToFrontOnPause.Size = new System.Drawing.Size(273, 22); + this.mnuBringToFrontOnPause.Text = "Bring debugger to front on pause"; + this.mnuBringToFrontOnPause.Click += new System.EventHandler(this.mnuBringToFrontOnPause_Click); + // + // toolStripMenuItem28 + // + this.toolStripMenuItem28.Name = "toolStripMenuItem28"; + this.toolStripMenuItem28.Size = new System.Drawing.Size(270, 6); + // + // mnuEnableSubInstructionBreakpoints + // + this.mnuEnableSubInstructionBreakpoints.CheckOnClick = true; + this.mnuEnableSubInstructionBreakpoints.Name = "mnuEnableSubInstructionBreakpoints"; + this.mnuEnableSubInstructionBreakpoints.Size = new System.Drawing.Size(273, 22); + this.mnuEnableSubInstructionBreakpoints.Text = "Enable sub-instruction breakpoints"; + this.mnuEnableSubInstructionBreakpoints.Click += new System.EventHandler(this.mnuBreakOnFirstCycle_Click); + // + // toolStripMenuItem12 + // + this.toolStripMenuItem12.Name = "toolStripMenuItem12"; + this.toolStripMenuItem12.Size = new System.Drawing.Size(274, 6); + // + // mnuShowOptions + // + this.mnuShowOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuShowToolbar, this.mnuShowCpuMemoryMapping, this.mnuShowPpuMemoryMapping, this.mnuShowFunctionLabelLists, this.mnuShowBottomPanel}); - this.mnuShowOptions.Image = global::Mesen.GUI.Properties.Resources.DipSwitches; - this.mnuShowOptions.Name = "mnuShowOptions"; - this.mnuShowOptions.Size = new System.Drawing.Size(266, 22); - this.mnuShowOptions.Text = "Show..."; - // - // mnuShowToolbar - // - this.mnuShowToolbar.CheckOnClick = true; - this.mnuShowToolbar.Name = "mnuShowToolbar"; - this.mnuShowToolbar.Size = new System.Drawing.Size(263, 22); - this.mnuShowToolbar.Text = "Show Toolbar"; - this.mnuShowToolbar.Click += new System.EventHandler(this.mnuShowToolbar_Click); - // - // mnuShowCpuMemoryMapping - // - this.mnuShowCpuMemoryMapping.CheckOnClick = true; - this.mnuShowCpuMemoryMapping.Name = "mnuShowCpuMemoryMapping"; - this.mnuShowCpuMemoryMapping.Size = new System.Drawing.Size(263, 22); - this.mnuShowCpuMemoryMapping.Text = "Show CPU Memory Mapping"; - this.mnuShowCpuMemoryMapping.Click += new System.EventHandler(this.mnuShowCpuMemoryMapping_Click); - // - // mnuShowPpuMemoryMapping - // - this.mnuShowPpuMemoryMapping.CheckOnClick = true; - this.mnuShowPpuMemoryMapping.Name = "mnuShowPpuMemoryMapping"; - this.mnuShowPpuMemoryMapping.Size = new System.Drawing.Size(263, 22); - this.mnuShowPpuMemoryMapping.Text = "Show PPU Memory Mapping"; - this.mnuShowPpuMemoryMapping.Click += new System.EventHandler(this.mnuShowPpuMemoryMapping_Click); - // - // mnuShowFunctionLabelLists - // - this.mnuShowFunctionLabelLists.CheckOnClick = true; - this.mnuShowFunctionLabelLists.Name = "mnuShowFunctionLabelLists"; - this.mnuShowFunctionLabelLists.Size = new System.Drawing.Size(263, 22); - this.mnuShowFunctionLabelLists.Text = "Show Function/Label Lists"; - this.mnuShowFunctionLabelLists.Click += new System.EventHandler(this.mnuShowFunctionLabelLists_Click); - // - // mnuShowBottomPanel - // - this.mnuShowBottomPanel.CheckOnClick = true; - this.mnuShowBottomPanel.Name = "mnuShowBottomPanel"; - this.mnuShowBottomPanel.Size = new System.Drawing.Size(263, 22); - this.mnuShowBottomPanel.Text = "Show Watch/Breakpoints/Call Stack"; - this.mnuShowBottomPanel.Click += new System.EventHandler(this.mnuShowBottomPanel_Click); - // - // mnuTooltipOptions - // - this.mnuTooltipOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuShowOptions.Image = global::Mesen.GUI.Properties.Resources.DipSwitches; + this.mnuShowOptions.Name = "mnuShowOptions"; + this.mnuShowOptions.Size = new System.Drawing.Size(277, 22); + this.mnuShowOptions.Text = "Show..."; + // + // mnuShowToolbar + // + this.mnuShowToolbar.CheckOnClick = true; + this.mnuShowToolbar.Name = "mnuShowToolbar"; + this.mnuShowToolbar.Size = new System.Drawing.Size(274, 22); + this.mnuShowToolbar.Text = "Show Toolbar"; + this.mnuShowToolbar.Click += new System.EventHandler(this.mnuShowToolbar_Click); + // + // mnuShowCpuMemoryMapping + // + this.mnuShowCpuMemoryMapping.CheckOnClick = true; + this.mnuShowCpuMemoryMapping.Name = "mnuShowCpuMemoryMapping"; + this.mnuShowCpuMemoryMapping.Size = new System.Drawing.Size(274, 22); + this.mnuShowCpuMemoryMapping.Text = "Show CPU Memory Mapping"; + this.mnuShowCpuMemoryMapping.Click += new System.EventHandler(this.mnuShowCpuMemoryMapping_Click); + // + // mnuShowPpuMemoryMapping + // + this.mnuShowPpuMemoryMapping.CheckOnClick = true; + this.mnuShowPpuMemoryMapping.Name = "mnuShowPpuMemoryMapping"; + this.mnuShowPpuMemoryMapping.Size = new System.Drawing.Size(274, 22); + this.mnuShowPpuMemoryMapping.Text = "Show PPU Memory Mapping"; + this.mnuShowPpuMemoryMapping.Click += new System.EventHandler(this.mnuShowPpuMemoryMapping_Click); + // + // mnuShowFunctionLabelLists + // + this.mnuShowFunctionLabelLists.CheckOnClick = true; + this.mnuShowFunctionLabelLists.Name = "mnuShowFunctionLabelLists"; + this.mnuShowFunctionLabelLists.Size = new System.Drawing.Size(274, 22); + this.mnuShowFunctionLabelLists.Text = "Show Function/Label Lists"; + this.mnuShowFunctionLabelLists.Click += new System.EventHandler(this.mnuShowFunctionLabelLists_Click); + // + // mnuShowBottomPanel + // + this.mnuShowBottomPanel.CheckOnClick = true; + this.mnuShowBottomPanel.Name = "mnuShowBottomPanel"; + this.mnuShowBottomPanel.Size = new System.Drawing.Size(274, 22); + this.mnuShowBottomPanel.Text = "Show Watch/Breakpoints/Call Stack"; + this.mnuShowBottomPanel.Click += new System.EventHandler(this.mnuShowBottomPanel_Click); + // + // mnuTooltipOptions + // + this.mnuTooltipOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuShowCodePreview, this.mnuShowOpCodeTooltips, this.toolStripMenuItem18, this.mnuOnlyShowTooltipOnShift}); - this.mnuTooltipOptions.Image = global::Mesen.GUI.Properties.Resources.Comment; - this.mnuTooltipOptions.Name = "mnuTooltipOptions"; - this.mnuTooltipOptions.Size = new System.Drawing.Size(266, 22); - this.mnuTooltipOptions.Text = "Tooltip Options"; - // - // mnuShowCodePreview - // - this.mnuShowCodePreview.CheckOnClick = true; - this.mnuShowCodePreview.Name = "mnuShowCodePreview"; - this.mnuShowCodePreview.Size = new System.Drawing.Size(307, 22); - this.mnuShowCodePreview.Text = "Show Code Preview in Tooltips"; - this.mnuShowCodePreview.CheckedChanged += new System.EventHandler(this.mnuShowCodePreview_CheckedChanged); - // - // mnuShowOpCodeTooltips - // - this.mnuShowOpCodeTooltips.CheckOnClick = true; - this.mnuShowOpCodeTooltips.Name = "mnuShowOpCodeTooltips"; - this.mnuShowOpCodeTooltips.Size = new System.Drawing.Size(307, 22); - this.mnuShowOpCodeTooltips.Text = "Show OP Code Info Tooltips"; - this.mnuShowOpCodeTooltips.CheckedChanged += new System.EventHandler(this.mnuShowOpCodeTooltips_CheckedChanged); - // - // toolStripMenuItem18 - // - this.toolStripMenuItem18.Name = "toolStripMenuItem18"; - this.toolStripMenuItem18.Size = new System.Drawing.Size(304, 6); - // - // mnuOnlyShowTooltipOnShift - // - this.mnuOnlyShowTooltipOnShift.CheckOnClick = true; - this.mnuOnlyShowTooltipOnShift.Name = "mnuOnlyShowTooltipOnShift"; - this.mnuOnlyShowTooltipOnShift.Size = new System.Drawing.Size(307, 22); - this.mnuOnlyShowTooltipOnShift.Text = "Only show tooltips when Shift key is pressed"; - this.mnuOnlyShowTooltipOnShift.CheckedChanged += new System.EventHandler(this.mnuTooltipShowOnShift_CheckedChanged); - // - // mnuCopyOptions - // - this.mnuCopyOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuTooltipOptions.Image = global::Mesen.GUI.Properties.Resources.Comment; + this.mnuTooltipOptions.Name = "mnuTooltipOptions"; + this.mnuTooltipOptions.Size = new System.Drawing.Size(277, 22); + this.mnuTooltipOptions.Text = "Tooltip Options"; + // + // mnuShowCodePreview + // + this.mnuShowCodePreview.CheckOnClick = true; + this.mnuShowCodePreview.Name = "mnuShowCodePreview"; + this.mnuShowCodePreview.Size = new System.Drawing.Size(319, 22); + this.mnuShowCodePreview.Text = "Show Code Preview in Tooltips"; + this.mnuShowCodePreview.CheckedChanged += new System.EventHandler(this.mnuShowCodePreview_CheckedChanged); + // + // mnuShowOpCodeTooltips + // + this.mnuShowOpCodeTooltips.CheckOnClick = true; + this.mnuShowOpCodeTooltips.Name = "mnuShowOpCodeTooltips"; + this.mnuShowOpCodeTooltips.Size = new System.Drawing.Size(319, 22); + this.mnuShowOpCodeTooltips.Text = "Show OP Code Info Tooltips"; + this.mnuShowOpCodeTooltips.CheckedChanged += new System.EventHandler(this.mnuShowOpCodeTooltips_CheckedChanged); + // + // toolStripMenuItem18 + // + this.toolStripMenuItem18.Name = "toolStripMenuItem18"; + this.toolStripMenuItem18.Size = new System.Drawing.Size(316, 6); + // + // mnuOnlyShowTooltipOnShift + // + this.mnuOnlyShowTooltipOnShift.CheckOnClick = true; + this.mnuOnlyShowTooltipOnShift.Name = "mnuOnlyShowTooltipOnShift"; + this.mnuOnlyShowTooltipOnShift.Size = new System.Drawing.Size(319, 22); + this.mnuOnlyShowTooltipOnShift.Text = "Only show tooltips when Shift key is pressed"; + this.mnuOnlyShowTooltipOnShift.CheckedChanged += new System.EventHandler(this.mnuTooltipShowOnShift_CheckedChanged); + // + // mnuCopyOptions + // + this.mnuCopyOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuCopyAddresses, this.mnuCopyByteCode, this.mnuCopyComments}); - this.mnuCopyOptions.Image = global::Mesen.GUI.Properties.Resources.Copy; - this.mnuCopyOptions.Name = "mnuCopyOptions"; - this.mnuCopyOptions.Size = new System.Drawing.Size(266, 22); - this.mnuCopyOptions.Text = "Copy Options"; - // - // mnuCopyAddresses - // - this.mnuCopyAddresses.CheckOnClick = true; - this.mnuCopyAddresses.Name = "mnuCopyAddresses"; - this.mnuCopyAddresses.Size = new System.Drawing.Size(164, 22); - this.mnuCopyAddresses.Text = "Copy Addresses"; - this.mnuCopyAddresses.Click += new System.EventHandler(this.mnuCopyAddresses_Click); - // - // mnuCopyByteCode - // - this.mnuCopyByteCode.CheckOnClick = true; - this.mnuCopyByteCode.Name = "mnuCopyByteCode"; - this.mnuCopyByteCode.Size = new System.Drawing.Size(164, 22); - this.mnuCopyByteCode.Text = "Copy Byte Code"; - this.mnuCopyByteCode.Click += new System.EventHandler(this.mnuCopyByteCode_Click); - // - // mnuCopyComments - // - this.mnuCopyComments.CheckOnClick = true; - this.mnuCopyComments.Name = "mnuCopyComments"; - this.mnuCopyComments.Size = new System.Drawing.Size(164, 22); - this.mnuCopyComments.Text = "Copy Comments"; - this.mnuCopyComments.Click += new System.EventHandler(this.mnuCopyComments_Click); - // - // fontSizeToolStripMenuItem - // - this.fontSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuCopyOptions.Image = global::Mesen.GUI.Properties.Resources.Copy; + this.mnuCopyOptions.Name = "mnuCopyOptions"; + this.mnuCopyOptions.Size = new System.Drawing.Size(277, 22); + this.mnuCopyOptions.Text = "Copy Options"; + // + // mnuCopyAddresses + // + this.mnuCopyAddresses.CheckOnClick = true; + this.mnuCopyAddresses.Name = "mnuCopyAddresses"; + this.mnuCopyAddresses.Size = new System.Drawing.Size(168, 22); + this.mnuCopyAddresses.Text = "Copy Addresses"; + this.mnuCopyAddresses.Click += new System.EventHandler(this.mnuCopyAddresses_Click); + // + // mnuCopyByteCode + // + this.mnuCopyByteCode.CheckOnClick = true; + this.mnuCopyByteCode.Name = "mnuCopyByteCode"; + this.mnuCopyByteCode.Size = new System.Drawing.Size(168, 22); + this.mnuCopyByteCode.Text = "Copy Byte Code"; + this.mnuCopyByteCode.Click += new System.EventHandler(this.mnuCopyByteCode_Click); + // + // mnuCopyComments + // + this.mnuCopyComments.CheckOnClick = true; + this.mnuCopyComments.Name = "mnuCopyComments"; + this.mnuCopyComments.Size = new System.Drawing.Size(168, 22); + this.mnuCopyComments.Text = "Copy Comments"; + this.mnuCopyComments.Click += new System.EventHandler(this.mnuCopyComments_Click); + // + // fontSizeToolStripMenuItem + // + this.fontSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuIncreaseFontSize, this.mnuDecreaseFontSize, this.mnuResetFontSize, this.toolStripMenuItem21, this.mnuSelectFont}); - this.fontSizeToolStripMenuItem.Image = global::Mesen.GUI.Properties.Resources.Font; - this.fontSizeToolStripMenuItem.Name = "fontSizeToolStripMenuItem"; - this.fontSizeToolStripMenuItem.Size = new System.Drawing.Size(266, 22); - this.fontSizeToolStripMenuItem.Text = "Font Options"; - // - // mnuIncreaseFontSize - // - this.mnuIncreaseFontSize.Name = "mnuIncreaseFontSize"; - this.mnuIncreaseFontSize.ShortcutKeyDisplayString = ""; - this.mnuIncreaseFontSize.Size = new System.Drawing.Size(157, 22); - this.mnuIncreaseFontSize.Text = "Increase Size"; - this.mnuIncreaseFontSize.Click += new System.EventHandler(this.mnuIncreaseFontSize_Click); - // - // mnuDecreaseFontSize - // - this.mnuDecreaseFontSize.Name = "mnuDecreaseFontSize"; - this.mnuDecreaseFontSize.ShortcutKeyDisplayString = ""; - this.mnuDecreaseFontSize.Size = new System.Drawing.Size(157, 22); - this.mnuDecreaseFontSize.Text = "Decrease Size"; - this.mnuDecreaseFontSize.Click += new System.EventHandler(this.mnuDecreaseFontSize_Click); - // - // mnuResetFontSize - // - this.mnuResetFontSize.Name = "mnuResetFontSize"; - this.mnuResetFontSize.ShortcutKeyDisplayString = ""; - this.mnuResetFontSize.Size = new System.Drawing.Size(157, 22); - this.mnuResetFontSize.Text = "Reset to Default"; - this.mnuResetFontSize.Click += new System.EventHandler(this.mnuResetFontSize_Click); - // - // toolStripMenuItem21 - // - this.toolStripMenuItem21.Name = "toolStripMenuItem21"; - this.toolStripMenuItem21.Size = new System.Drawing.Size(154, 6); - // - // mnuSelectFont - // - this.mnuSelectFont.Name = "mnuSelectFont"; - this.mnuSelectFont.Size = new System.Drawing.Size(157, 22); - this.mnuSelectFont.Text = "Select Font..."; - this.mnuSelectFont.Click += new System.EventHandler(this.mnuSelectFont_Click); - // - // mnuConfigureColors - // - this.mnuConfigureColors.Image = global::Mesen.GUI.Properties.Resources.PipetteSmall; - this.mnuConfigureColors.Name = "mnuConfigureColors"; - this.mnuConfigureColors.Size = new System.Drawing.Size(266, 22); - this.mnuConfigureColors.Text = "Configure Colors"; - this.mnuConfigureColors.Click += new System.EventHandler(this.mnuConfigureColors_Click); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(263, 6); - // - // mnuSplitView - // - this.mnuSplitView.CheckOnClick = true; - this.mnuSplitView.Image = global::Mesen.GUI.Properties.Resources.SplitView; - this.mnuSplitView.Name = "mnuSplitView"; - this.mnuSplitView.Size = new System.Drawing.Size(266, 22); - this.mnuSplitView.Text = "Split View"; - this.mnuSplitView.Click += new System.EventHandler(this.mnuSplitView_Click); - // - // mnuUseVerticalLayout - // - this.mnuUseVerticalLayout.CheckOnClick = true; - this.mnuUseVerticalLayout.Image = global::Mesen.GUI.Properties.Resources.VerticalLayout; - this.mnuUseVerticalLayout.Name = "mnuUseVerticalLayout"; - this.mnuUseVerticalLayout.Size = new System.Drawing.Size(266, 22); - this.mnuUseVerticalLayout.Text = "Use Vertical Layout"; - this.mnuUseVerticalLayout.CheckedChanged += new System.EventHandler(this.mnuUseVerticalLayout_CheckedChanged); - // - // toolStripMenuItem11 - // - this.toolStripMenuItem11.Name = "toolStripMenuItem11"; - this.toolStripMenuItem11.Size = new System.Drawing.Size(263, 6); - // - // mnuAutoCreateJumpLabels - // - this.mnuAutoCreateJumpLabels.CheckOnClick = true; - this.mnuAutoCreateJumpLabels.Name = "mnuAutoCreateJumpLabels"; - this.mnuAutoCreateJumpLabels.Size = new System.Drawing.Size(266, 22); - this.mnuAutoCreateJumpLabels.Text = "Auto-create jump labels"; - this.mnuAutoCreateJumpLabels.Click += new System.EventHandler(this.mnuAutoCreateJumpLabels_Click); - // - // toolStripMenuItem25 - // - this.toolStripMenuItem25.Name = "toolStripMenuItem25"; - this.toolStripMenuItem25.Size = new System.Drawing.Size(263, 6); - // - // mnuHidePauseIcon - // - this.mnuHidePauseIcon.CheckOnClick = true; - this.mnuHidePauseIcon.Name = "mnuHidePauseIcon"; - this.mnuHidePauseIcon.Size = new System.Drawing.Size(266, 22); - this.mnuHidePauseIcon.Text = "Hide Pause Icon"; - this.mnuHidePauseIcon.Click += new System.EventHandler(this.mnuHidePauseIcon_Click); - // - // mnuPpuPartialDraw - // - this.mnuPpuPartialDraw.CheckOnClick = true; - this.mnuPpuPartialDraw.Name = "mnuPpuPartialDraw"; - this.mnuPpuPartialDraw.Size = new System.Drawing.Size(266, 22); - this.mnuPpuPartialDraw.Text = "Draw Partial Frame"; - this.mnuPpuPartialDraw.Click += new System.EventHandler(this.mnuPpuPartialDraw_Click); - // - // mnuPpuShowPreviousFrame - // - this.mnuPpuShowPreviousFrame.CheckOnClick = true; - this.mnuPpuShowPreviousFrame.Name = "mnuPpuShowPreviousFrame"; - this.mnuPpuShowPreviousFrame.Size = new System.Drawing.Size(266, 22); - this.mnuPpuShowPreviousFrame.Text = "Show previous frame behind current"; - this.mnuPpuShowPreviousFrame.Click += new System.EventHandler(this.mnuShowPreviousFrame_Click); - // - // toolStripMenuItem19 - // - this.toolStripMenuItem19.Name = "toolStripMenuItem19"; - this.toolStripMenuItem19.Size = new System.Drawing.Size(263, 6); - // - // mnuShowBreakNotifications - // - this.mnuShowBreakNotifications.CheckOnClick = true; - this.mnuShowBreakNotifications.Name = "mnuShowBreakNotifications"; - this.mnuShowBreakNotifications.Size = new System.Drawing.Size(266, 22); - this.mnuShowBreakNotifications.Text = "Show break notifications"; - this.mnuShowBreakNotifications.Click += new System.EventHandler(this.mnuShowBreakNotifications_Click); - // - // mnuShowInstructionProgression - // - this.mnuShowInstructionProgression.CheckOnClick = true; - this.mnuShowInstructionProgression.Name = "mnuShowInstructionProgression"; - this.mnuShowInstructionProgression.Size = new System.Drawing.Size(266, 22); - this.mnuShowInstructionProgression.Text = "Show instruction progression"; - this.mnuShowInstructionProgression.Click += new System.EventHandler(this.mnuShowInstructionProgression_Click); - // - // mnuShowSelectionLength - // - this.mnuShowSelectionLength.CheckOnClick = true; - this.mnuShowSelectionLength.Name = "mnuShowSelectionLength"; - this.mnuShowSelectionLength.Size = new System.Drawing.Size(266, 22); - this.mnuShowSelectionLength.Text = "Show selection length"; - this.mnuShowSelectionLength.Click += new System.EventHandler(this.mnuShowSelectionLength_Click); - // - // toolStripMenuItem27 - // - this.toolStripMenuItem27.Name = "toolStripMenuItem27"; - this.toolStripMenuItem27.Size = new System.Drawing.Size(263, 6); - // - // mnuAlwaysScrollToCenter - // - this.mnuAlwaysScrollToCenter.CheckOnClick = true; - this.mnuAlwaysScrollToCenter.Name = "mnuAlwaysScrollToCenter"; - this.mnuAlwaysScrollToCenter.Size = new System.Drawing.Size(266, 22); - this.mnuAlwaysScrollToCenter.Text = "Keep active statement in the center"; - this.mnuAlwaysScrollToCenter.Click += new System.EventHandler(this.mnuAlwaysScrollToCenter_Click); - // - // mnuRefreshWhileRunning - // - this.mnuRefreshWhileRunning.CheckOnClick = true; - this.mnuRefreshWhileRunning.Name = "mnuRefreshWhileRunning"; - this.mnuRefreshWhileRunning.Size = new System.Drawing.Size(266, 22); - this.mnuRefreshWhileRunning.Text = "Refresh UI while running"; - this.mnuRefreshWhileRunning.Click += new System.EventHandler(this.mnuRefreshWhileRunning_Click); - // - // toolStripMenuItem6 - // - this.toolStripMenuItem6.Name = "toolStripMenuItem6"; - this.toolStripMenuItem6.Size = new System.Drawing.Size(263, 6); - // - // mnuReloadRomOnPowerCycle - // - this.mnuReloadRomOnPowerCycle.CheckOnClick = true; - this.mnuReloadRomOnPowerCycle.Name = "mnuReloadRomOnPowerCycle"; - this.mnuReloadRomOnPowerCycle.Size = new System.Drawing.Size(266, 22); - this.mnuReloadRomOnPowerCycle.Text = "Reload ROM on Power Cycle"; - this.mnuReloadRomOnPowerCycle.Click += new System.EventHandler(this.mnuReloadRomOnPowerCycle_Click); - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(263, 6); - // - // mnuConfigureExternalEditor - // - this.mnuConfigureExternalEditor.Image = global::Mesen.GUI.Properties.Resources.Edit; - this.mnuConfigureExternalEditor.Name = "mnuConfigureExternalEditor"; - this.mnuConfigureExternalEditor.Size = new System.Drawing.Size(266, 22); - this.mnuConfigureExternalEditor.Text = "Configure external code editor..."; - this.mnuConfigureExternalEditor.Click += new System.EventHandler(this.mnuConfigureExternalEditor_Click); - // - // mnuPreferences - // - this.mnuPreferences.Image = global::Mesen.GUI.Properties.Resources.Cog; - this.mnuPreferences.Name = "mnuPreferences"; - this.mnuPreferences.Size = new System.Drawing.Size(266, 22); - this.mnuPreferences.Text = "Configure shortcut keys..."; - this.mnuPreferences.Click += new System.EventHandler(this.mnuPreferences_Click); - // - // toolsToolStripMenuItem - // - this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.fontSizeToolStripMenuItem.Image = global::Mesen.GUI.Properties.Resources.Font; + this.fontSizeToolStripMenuItem.Name = "fontSizeToolStripMenuItem"; + this.fontSizeToolStripMenuItem.Size = new System.Drawing.Size(277, 22); + this.fontSizeToolStripMenuItem.Text = "Font Options"; + // + // mnuIncreaseFontSize + // + this.mnuIncreaseFontSize.Name = "mnuIncreaseFontSize"; + this.mnuIncreaseFontSize.ShortcutKeyDisplayString = ""; + this.mnuIncreaseFontSize.Size = new System.Drawing.Size(164, 22); + this.mnuIncreaseFontSize.Text = "Increase Size"; + this.mnuIncreaseFontSize.Click += new System.EventHandler(this.mnuIncreaseFontSize_Click); + // + // mnuDecreaseFontSize + // + this.mnuDecreaseFontSize.Name = "mnuDecreaseFontSize"; + this.mnuDecreaseFontSize.ShortcutKeyDisplayString = ""; + this.mnuDecreaseFontSize.Size = new System.Drawing.Size(164, 22); + this.mnuDecreaseFontSize.Text = "Decrease Size"; + this.mnuDecreaseFontSize.Click += new System.EventHandler(this.mnuDecreaseFontSize_Click); + // + // mnuResetFontSize + // + this.mnuResetFontSize.Name = "mnuResetFontSize"; + this.mnuResetFontSize.ShortcutKeyDisplayString = ""; + this.mnuResetFontSize.Size = new System.Drawing.Size(164, 22); + this.mnuResetFontSize.Text = "Reset to Default"; + this.mnuResetFontSize.Click += new System.EventHandler(this.mnuResetFontSize_Click); + // + // toolStripMenuItem21 + // + this.toolStripMenuItem21.Name = "toolStripMenuItem21"; + this.toolStripMenuItem21.Size = new System.Drawing.Size(161, 6); + // + // mnuSelectFont + // + this.mnuSelectFont.Name = "mnuSelectFont"; + this.mnuSelectFont.Size = new System.Drawing.Size(164, 22); + this.mnuSelectFont.Text = "Select Font..."; + this.mnuSelectFont.Click += new System.EventHandler(this.mnuSelectFont_Click); + // + // mnuConfigureColors + // + this.mnuConfigureColors.Image = global::Mesen.GUI.Properties.Resources.PipetteSmall; + this.mnuConfigureColors.Name = "mnuConfigureColors"; + this.mnuConfigureColors.Size = new System.Drawing.Size(277, 22); + this.mnuConfigureColors.Text = "Configure Colors"; + this.mnuConfigureColors.Click += new System.EventHandler(this.mnuConfigureColors_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(274, 6); + // + // mnuSplitView + // + this.mnuSplitView.CheckOnClick = true; + this.mnuSplitView.Image = global::Mesen.GUI.Properties.Resources.SplitView; + this.mnuSplitView.Name = "mnuSplitView"; + this.mnuSplitView.Size = new System.Drawing.Size(277, 22); + this.mnuSplitView.Text = "Split View"; + this.mnuSplitView.Click += new System.EventHandler(this.mnuSplitView_Click); + // + // mnuUseVerticalLayout + // + this.mnuUseVerticalLayout.CheckOnClick = true; + this.mnuUseVerticalLayout.Image = global::Mesen.GUI.Properties.Resources.VerticalLayout; + this.mnuUseVerticalLayout.Name = "mnuUseVerticalLayout"; + this.mnuUseVerticalLayout.Size = new System.Drawing.Size(277, 22); + this.mnuUseVerticalLayout.Text = "Use Vertical Layout"; + this.mnuUseVerticalLayout.CheckedChanged += new System.EventHandler(this.mnuUseVerticalLayout_CheckedChanged); + // + // toolStripMenuItem11 + // + this.toolStripMenuItem11.Name = "toolStripMenuItem11"; + this.toolStripMenuItem11.Size = new System.Drawing.Size(274, 6); + // + // mnuAutoCreateJumpLabels + // + this.mnuAutoCreateJumpLabels.CheckOnClick = true; + this.mnuAutoCreateJumpLabels.Name = "mnuAutoCreateJumpLabels"; + this.mnuAutoCreateJumpLabels.Size = new System.Drawing.Size(277, 22); + this.mnuAutoCreateJumpLabels.Text = "Auto-create jump labels"; + this.mnuAutoCreateJumpLabels.Click += new System.EventHandler(this.mnuAutoCreateJumpLabels_Click); + // + // toolStripMenuItem25 + // + this.toolStripMenuItem25.Name = "toolStripMenuItem25"; + this.toolStripMenuItem25.Size = new System.Drawing.Size(274, 6); + // + // mnuHidePauseIcon + // + this.mnuHidePauseIcon.CheckOnClick = true; + this.mnuHidePauseIcon.Name = "mnuHidePauseIcon"; + this.mnuHidePauseIcon.Size = new System.Drawing.Size(277, 22); + this.mnuHidePauseIcon.Text = "Hide Pause Icon"; + this.mnuHidePauseIcon.Click += new System.EventHandler(this.mnuHidePauseIcon_Click); + // + // mnuPpuPartialDraw + // + this.mnuPpuPartialDraw.CheckOnClick = true; + this.mnuPpuPartialDraw.Name = "mnuPpuPartialDraw"; + this.mnuPpuPartialDraw.Size = new System.Drawing.Size(277, 22); + this.mnuPpuPartialDraw.Text = "Draw Partial Frame"; + this.mnuPpuPartialDraw.Click += new System.EventHandler(this.mnuPpuPartialDraw_Click); + // + // mnuPpuShowPreviousFrame + // + this.mnuPpuShowPreviousFrame.CheckOnClick = true; + this.mnuPpuShowPreviousFrame.Name = "mnuPpuShowPreviousFrame"; + this.mnuPpuShowPreviousFrame.Size = new System.Drawing.Size(277, 22); + this.mnuPpuShowPreviousFrame.Text = "Show previous frame behind current"; + this.mnuPpuShowPreviousFrame.Click += new System.EventHandler(this.mnuShowPreviousFrame_Click); + // + // toolStripMenuItem19 + // + this.toolStripMenuItem19.Name = "toolStripMenuItem19"; + this.toolStripMenuItem19.Size = new System.Drawing.Size(274, 6); + // + // mnuShowBreakNotifications + // + this.mnuShowBreakNotifications.CheckOnClick = true; + this.mnuShowBreakNotifications.Name = "mnuShowBreakNotifications"; + this.mnuShowBreakNotifications.Size = new System.Drawing.Size(277, 22); + this.mnuShowBreakNotifications.Text = "Show break notifications"; + this.mnuShowBreakNotifications.Click += new System.EventHandler(this.mnuShowBreakNotifications_Click); + // + // mnuShowInstructionProgression + // + this.mnuShowInstructionProgression.CheckOnClick = true; + this.mnuShowInstructionProgression.Name = "mnuShowInstructionProgression"; + this.mnuShowInstructionProgression.Size = new System.Drawing.Size(277, 22); + this.mnuShowInstructionProgression.Text = "Show instruction progression"; + this.mnuShowInstructionProgression.Click += new System.EventHandler(this.mnuShowInstructionProgression_Click); + // + // mnuShowSelectionLength + // + this.mnuShowSelectionLength.CheckOnClick = true; + this.mnuShowSelectionLength.Name = "mnuShowSelectionLength"; + this.mnuShowSelectionLength.Size = new System.Drawing.Size(277, 22); + this.mnuShowSelectionLength.Text = "Show selection length"; + this.mnuShowSelectionLength.Click += new System.EventHandler(this.mnuShowSelectionLength_Click); + // + // toolStripMenuItem27 + // + this.toolStripMenuItem27.Name = "toolStripMenuItem27"; + this.toolStripMenuItem27.Size = new System.Drawing.Size(274, 6); + // + // mnuAlwaysScrollToCenter + // + this.mnuAlwaysScrollToCenter.CheckOnClick = true; + this.mnuAlwaysScrollToCenter.Name = "mnuAlwaysScrollToCenter"; + this.mnuAlwaysScrollToCenter.Size = new System.Drawing.Size(277, 22); + this.mnuAlwaysScrollToCenter.Text = "Keep active statement in the center"; + this.mnuAlwaysScrollToCenter.Click += new System.EventHandler(this.mnuAlwaysScrollToCenter_Click); + // + // mnuRefreshWhileRunning + // + this.mnuRefreshWhileRunning.CheckOnClick = true; + this.mnuRefreshWhileRunning.Name = "mnuRefreshWhileRunning"; + this.mnuRefreshWhileRunning.Size = new System.Drawing.Size(277, 22); + this.mnuRefreshWhileRunning.Text = "Refresh UI while running"; + this.mnuRefreshWhileRunning.Click += new System.EventHandler(this.mnuRefreshWhileRunning_Click); + // + // toolStripMenuItem6 + // + this.toolStripMenuItem6.Name = "toolStripMenuItem6"; + this.toolStripMenuItem6.Size = new System.Drawing.Size(274, 6); + // + // mnuReloadRomOnPowerCycle + // + this.mnuReloadRomOnPowerCycle.CheckOnClick = true; + this.mnuReloadRomOnPowerCycle.Name = "mnuReloadRomOnPowerCycle"; + this.mnuReloadRomOnPowerCycle.Size = new System.Drawing.Size(277, 22); + this.mnuReloadRomOnPowerCycle.Text = "Reload ROM on Power Cycle"; + this.mnuReloadRomOnPowerCycle.Click += new System.EventHandler(this.mnuReloadRomOnPowerCycle_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(274, 6); + // + // mnuConfigureExternalEditor + // + this.mnuConfigureExternalEditor.Image = global::Mesen.GUI.Properties.Resources.Edit; + this.mnuConfigureExternalEditor.Name = "mnuConfigureExternalEditor"; + this.mnuConfigureExternalEditor.Size = new System.Drawing.Size(277, 22); + this.mnuConfigureExternalEditor.Text = "Configure external code editor..."; + this.mnuConfigureExternalEditor.Click += new System.EventHandler(this.mnuConfigureExternalEditor_Click); + // + // mnuPreferences + // + this.mnuPreferences.Image = global::Mesen.GUI.Properties.Resources.Cog; + this.mnuPreferences.Name = "mnuPreferences"; + this.mnuPreferences.Size = new System.Drawing.Size(277, 22); + this.mnuPreferences.Text = "Configure shortcut keys..."; + this.mnuPreferences.Click += new System.EventHandler(this.mnuPreferences_Click); + // + // toolsToolStripMenuItem + // + this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuApuViewer, this.mnuAssembler, this.mnuEventViewer, @@ -1690,156 +1692,156 @@ namespace Mesen.GUI.Debugger this.mnuEditHeader, this.toolStripMenuItem30, this.mnuCodeDataLogger}); - this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20); - this.toolsToolStripMenuItem.Text = "Tools"; - // - // mnuApuViewer - // - this.mnuApuViewer.Image = global::Mesen.GUI.Properties.Resources.Audio; - this.mnuApuViewer.Name = "mnuApuViewer"; - this.mnuApuViewer.Size = new System.Drawing.Size(194, 22); - this.mnuApuViewer.Text = "APU Viewer"; - this.mnuApuViewer.Click += new System.EventHandler(this.mnuApuViewer_Click); - // - // mnuAssembler - // - this.mnuAssembler.Image = global::Mesen.GUI.Properties.Resources.Chip; - this.mnuAssembler.Name = "mnuAssembler"; - this.mnuAssembler.Size = new System.Drawing.Size(194, 22); - this.mnuAssembler.Text = "Assembler"; - this.mnuAssembler.Click += new System.EventHandler(this.mnuAssembler_Click); - // - // mnuEventViewer - // - this.mnuEventViewer.Image = global::Mesen.GUI.Properties.Resources.NesEventViewer; - this.mnuEventViewer.Name = "mnuEventViewer"; - this.mnuEventViewer.Size = new System.Drawing.Size(194, 22); - this.mnuEventViewer.Text = "Event Viewer"; - this.mnuEventViewer.Click += new System.EventHandler(this.mnuEventViewer_Click); - // - // mnuMemoryViewer - // - this.mnuMemoryViewer.Image = global::Mesen.GUI.Properties.Resources.CheatCode; - this.mnuMemoryViewer.Name = "mnuMemoryViewer"; - this.mnuMemoryViewer.Size = new System.Drawing.Size(194, 22); - this.mnuMemoryViewer.Text = "Memory Tools"; - this.mnuMemoryViewer.Click += new System.EventHandler(this.mnuMemoryViewer_Click); - // - // mnuProfiler - // - this.mnuProfiler.Image = global::Mesen.GUI.Properties.Resources.Speed; - this.mnuProfiler.Name = "mnuProfiler"; - this.mnuProfiler.Size = new System.Drawing.Size(194, 22); - this.mnuProfiler.Text = "Performance Profiler"; - this.mnuProfiler.Click += new System.EventHandler(this.mnuProfiler_Click); - // - // mnuPpuViewer - // - this.mnuPpuViewer.Image = global::Mesen.GUI.Properties.Resources.Video; - this.mnuPpuViewer.Name = "mnuPpuViewer"; - this.mnuPpuViewer.Size = new System.Drawing.Size(194, 22); - this.mnuPpuViewer.Text = "PPU Viewer"; - this.mnuPpuViewer.Click += new System.EventHandler(this.mnuNametableViewer_Click); - // - // mnuScriptWindow - // - this.mnuScriptWindow.Image = global::Mesen.GUI.Properties.Resources.Script; - this.mnuScriptWindow.Name = "mnuScriptWindow"; - this.mnuScriptWindow.Size = new System.Drawing.Size(194, 22); - this.mnuScriptWindow.Text = "Script Window"; - this.mnuScriptWindow.Click += new System.EventHandler(this.mnuScriptWindow_Click); - // - // mnuTextHooker - // - this.mnuTextHooker.Image = global::Mesen.GUI.Properties.Resources.Font; - this.mnuTextHooker.Name = "mnuTextHooker"; - this.mnuTextHooker.Size = new System.Drawing.Size(194, 22); - this.mnuTextHooker.Text = "Text Hooker"; - this.mnuTextHooker.Click += new System.EventHandler(this.mnuTextHooker_Click); - // - // mnuTraceLogger - // - this.mnuTraceLogger.Image = global::Mesen.GUI.Properties.Resources.LogWindow; - this.mnuTraceLogger.Name = "mnuTraceLogger"; - this.mnuTraceLogger.Size = new System.Drawing.Size(194, 22); - this.mnuTraceLogger.Text = "Trace Logger"; - this.mnuTraceLogger.Click += new System.EventHandler(this.mnuTraceLogger_Click); - // - // mnuWatchWindow - // - this.mnuWatchWindow.Image = global::Mesen.GUI.Properties.Resources.Find; - this.mnuWatchWindow.Name = "mnuWatchWindow"; - this.mnuWatchWindow.Size = new System.Drawing.Size(194, 22); - this.mnuWatchWindow.Text = "Watch Window"; - this.mnuWatchWindow.Click += new System.EventHandler(this.mnuWatchWindow_Click); - // - // toolStripMenuItem13 - // - this.toolStripMenuItem13.Name = "toolStripMenuItem13"; - this.toolStripMenuItem13.Size = new System.Drawing.Size(191, 6); - // - // pPUViewerCompactToolStripMenuItem - // - this.pPUViewerCompactToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; + this.toolsToolStripMenuItem.Size = new System.Drawing.Size(50, 20); + this.toolsToolStripMenuItem.Text = "Tools"; + // + // mnuApuViewer + // + this.mnuApuViewer.Image = global::Mesen.GUI.Properties.Resources.Audio; + this.mnuApuViewer.Name = "mnuApuViewer"; + this.mnuApuViewer.Size = new System.Drawing.Size(201, 22); + this.mnuApuViewer.Text = "APU Viewer"; + this.mnuApuViewer.Click += new System.EventHandler(this.mnuApuViewer_Click); + // + // mnuAssembler + // + this.mnuAssembler.Image = global::Mesen.GUI.Properties.Resources.Chip; + this.mnuAssembler.Name = "mnuAssembler"; + this.mnuAssembler.Size = new System.Drawing.Size(201, 22); + this.mnuAssembler.Text = "Assembler"; + this.mnuAssembler.Click += new System.EventHandler(this.mnuAssembler_Click); + // + // mnuEventViewer + // + this.mnuEventViewer.Image = global::Mesen.GUI.Properties.Resources.NesEventViewer; + this.mnuEventViewer.Name = "mnuEventViewer"; + this.mnuEventViewer.Size = new System.Drawing.Size(201, 22); + this.mnuEventViewer.Text = "Event Viewer"; + this.mnuEventViewer.Click += new System.EventHandler(this.mnuEventViewer_Click); + // + // mnuMemoryViewer + // + this.mnuMemoryViewer.Image = global::Mesen.GUI.Properties.Resources.CheatCode; + this.mnuMemoryViewer.Name = "mnuMemoryViewer"; + this.mnuMemoryViewer.Size = new System.Drawing.Size(201, 22); + this.mnuMemoryViewer.Text = "Memory Tools"; + this.mnuMemoryViewer.Click += new System.EventHandler(this.mnuMemoryViewer_Click); + // + // mnuProfiler + // + this.mnuProfiler.Image = global::Mesen.GUI.Properties.Resources.Speed; + this.mnuProfiler.Name = "mnuProfiler"; + this.mnuProfiler.Size = new System.Drawing.Size(201, 22); + this.mnuProfiler.Text = "Performance Profiler"; + this.mnuProfiler.Click += new System.EventHandler(this.mnuProfiler_Click); + // + // mnuPpuViewer + // + this.mnuPpuViewer.Image = global::Mesen.GUI.Properties.Resources.Video; + this.mnuPpuViewer.Name = "mnuPpuViewer"; + this.mnuPpuViewer.Size = new System.Drawing.Size(201, 22); + this.mnuPpuViewer.Text = "PPU Viewer"; + this.mnuPpuViewer.Click += new System.EventHandler(this.mnuNametableViewer_Click); + // + // mnuScriptWindow + // + this.mnuScriptWindow.Image = global::Mesen.GUI.Properties.Resources.Script; + this.mnuScriptWindow.Name = "mnuScriptWindow"; + this.mnuScriptWindow.Size = new System.Drawing.Size(201, 22); + this.mnuScriptWindow.Text = "Script Window"; + this.mnuScriptWindow.Click += new System.EventHandler(this.mnuScriptWindow_Click); + // + // mnuTextHooker + // + this.mnuTextHooker.Image = global::Mesen.GUI.Properties.Resources.Font; + this.mnuTextHooker.Name = "mnuTextHooker"; + this.mnuTextHooker.Size = new System.Drawing.Size(201, 22); + this.mnuTextHooker.Text = "Text Hooker"; + this.mnuTextHooker.Click += new System.EventHandler(this.mnuTextHooker_Click); + // + // mnuTraceLogger + // + this.mnuTraceLogger.Image = global::Mesen.GUI.Properties.Resources.LogWindow; + this.mnuTraceLogger.Name = "mnuTraceLogger"; + this.mnuTraceLogger.Size = new System.Drawing.Size(201, 22); + this.mnuTraceLogger.Text = "Trace Logger"; + this.mnuTraceLogger.Click += new System.EventHandler(this.mnuTraceLogger_Click); + // + // mnuWatchWindow + // + this.mnuWatchWindow.Image = global::Mesen.GUI.Properties.Resources.Find; + this.mnuWatchWindow.Name = "mnuWatchWindow"; + this.mnuWatchWindow.Size = new System.Drawing.Size(201, 22); + this.mnuWatchWindow.Text = "Watch Window"; + this.mnuWatchWindow.Click += new System.EventHandler(this.mnuWatchWindow_Click); + // + // toolStripMenuItem13 + // + this.toolStripMenuItem13.Name = "toolStripMenuItem13"; + this.toolStripMenuItem13.Size = new System.Drawing.Size(198, 6); + // + // pPUViewerCompactToolStripMenuItem + // + this.pPUViewerCompactToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuOpenNametableViewer, this.mnuOpenChrViewer, this.mnuOpenSpriteViewer, this.mnuOpenPaletteViewer}); - this.pPUViewerCompactToolStripMenuItem.Image = global::Mesen.GUI.Properties.Resources.VideoFilter; - this.pPUViewerCompactToolStripMenuItem.Name = "pPUViewerCompactToolStripMenuItem"; - this.pPUViewerCompactToolStripMenuItem.Size = new System.Drawing.Size(194, 22); - this.pPUViewerCompactToolStripMenuItem.Text = "PPU Viewer (Compact)"; - // - // mnuOpenNametableViewer - // - this.mnuOpenNametableViewer.Name = "mnuOpenNametableViewer"; - this.mnuOpenNametableViewer.Size = new System.Drawing.Size(170, 22); - this.mnuOpenNametableViewer.Text = "Nametable Viewer"; - this.mnuOpenNametableViewer.Click += new System.EventHandler(this.mnuOpenNametableViewer_Click); - // - // mnuOpenChrViewer - // - this.mnuOpenChrViewer.Name = "mnuOpenChrViewer"; - this.mnuOpenChrViewer.Size = new System.Drawing.Size(170, 22); - this.mnuOpenChrViewer.Text = "CHR Viewer"; - this.mnuOpenChrViewer.Click += new System.EventHandler(this.mnuOpenChrViewer_Click); - // - // mnuOpenSpriteViewer - // - this.mnuOpenSpriteViewer.Name = "mnuOpenSpriteViewer"; - this.mnuOpenSpriteViewer.Size = new System.Drawing.Size(170, 22); - this.mnuOpenSpriteViewer.Text = "Sprite Viewer"; - this.mnuOpenSpriteViewer.Click += new System.EventHandler(this.mnuOpenSpriteViewer_Click); - // - // mnuOpenPaletteViewer - // - this.mnuOpenPaletteViewer.Name = "mnuOpenPaletteViewer"; - this.mnuOpenPaletteViewer.Size = new System.Drawing.Size(170, 22); - this.mnuOpenPaletteViewer.Text = "Palette Viewer"; - this.mnuOpenPaletteViewer.Click += new System.EventHandler(this.mnuOpenPaletteViewer_Click); - // - // toolStripMenuItem17 - // - this.toolStripMenuItem17.Name = "toolStripMenuItem17"; - this.toolStripMenuItem17.Size = new System.Drawing.Size(191, 6); - // - // mnuEditHeader - // - this.mnuEditHeader.Image = global::Mesen.GUI.Properties.Resources.Edit; - this.mnuEditHeader.Name = "mnuEditHeader"; - this.mnuEditHeader.Size = new System.Drawing.Size(194, 22); - this.mnuEditHeader.Text = "Edit iNES Header"; - this.mnuEditHeader.Click += new System.EventHandler(this.mnuEditHeader_Click); - // - // toolStripMenuItem30 - // - this.toolStripMenuItem30.Name = "toolStripMenuItem30"; - this.toolStripMenuItem30.Size = new System.Drawing.Size(191, 6); - // - // mnuCodeDataLogger - // - this.mnuCodeDataLogger.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.pPUViewerCompactToolStripMenuItem.Image = global::Mesen.GUI.Properties.Resources.VideoFilter; + this.pPUViewerCompactToolStripMenuItem.Name = "pPUViewerCompactToolStripMenuItem"; + this.pPUViewerCompactToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.pPUViewerCompactToolStripMenuItem.Text = "PPU Viewer (Compact)"; + // + // mnuOpenNametableViewer + // + this.mnuOpenNametableViewer.Name = "mnuOpenNametableViewer"; + this.mnuOpenNametableViewer.Size = new System.Drawing.Size(179, 22); + this.mnuOpenNametableViewer.Text = "Nametable Viewer"; + this.mnuOpenNametableViewer.Click += new System.EventHandler(this.mnuOpenNametableViewer_Click); + // + // mnuOpenChrViewer + // + this.mnuOpenChrViewer.Name = "mnuOpenChrViewer"; + this.mnuOpenChrViewer.Size = new System.Drawing.Size(179, 22); + this.mnuOpenChrViewer.Text = "CHR Viewer"; + this.mnuOpenChrViewer.Click += new System.EventHandler(this.mnuOpenChrViewer_Click); + // + // mnuOpenSpriteViewer + // + this.mnuOpenSpriteViewer.Name = "mnuOpenSpriteViewer"; + this.mnuOpenSpriteViewer.Size = new System.Drawing.Size(179, 22); + this.mnuOpenSpriteViewer.Text = "Sprite Viewer"; + this.mnuOpenSpriteViewer.Click += new System.EventHandler(this.mnuOpenSpriteViewer_Click); + // + // mnuOpenPaletteViewer + // + this.mnuOpenPaletteViewer.Name = "mnuOpenPaletteViewer"; + this.mnuOpenPaletteViewer.Size = new System.Drawing.Size(179, 22); + this.mnuOpenPaletteViewer.Text = "Palette Viewer"; + this.mnuOpenPaletteViewer.Click += new System.EventHandler(this.mnuOpenPaletteViewer_Click); + // + // toolStripMenuItem17 + // + this.toolStripMenuItem17.Name = "toolStripMenuItem17"; + this.toolStripMenuItem17.Size = new System.Drawing.Size(198, 6); + // + // mnuEditHeader + // + this.mnuEditHeader.Image = global::Mesen.GUI.Properties.Resources.Edit; + this.mnuEditHeader.Name = "mnuEditHeader"; + this.mnuEditHeader.Size = new System.Drawing.Size(201, 22); + this.mnuEditHeader.Text = "Edit iNES Header"; + this.mnuEditHeader.Click += new System.EventHandler(this.mnuEditHeader_Click); + // + // toolStripMenuItem30 + // + this.toolStripMenuItem30.Name = "toolStripMenuItem30"; + this.toolStripMenuItem30.Size = new System.Drawing.Size(198, 6); + // + // mnuCodeDataLogger + // + this.mnuCodeDataLogger.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.autoLoadsaveCDLFileToolStripMenuItem, this.toolStripMenuItem4, this.mnuLoadCdlFile, @@ -1847,80 +1849,80 @@ namespace Mesen.GUI.Debugger this.mnuResetCdlLog, this.toolStripMenuItem5, this.mnuCdlGenerateRom}); - this.mnuCodeDataLogger.Name = "mnuCodeDataLogger"; - this.mnuCodeDataLogger.Size = new System.Drawing.Size(194, 22); - this.mnuCodeDataLogger.Text = "Code/Data Logger"; - // - // autoLoadsaveCDLFileToolStripMenuItem - // - this.autoLoadsaveCDLFileToolStripMenuItem.Checked = true; - this.autoLoadsaveCDLFileToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; - this.autoLoadsaveCDLFileToolStripMenuItem.Enabled = false; - this.autoLoadsaveCDLFileToolStripMenuItem.Name = "autoLoadsaveCDLFileToolStripMenuItem"; - this.autoLoadsaveCDLFileToolStripMenuItem.Size = new System.Drawing.Size(193, 22); - this.autoLoadsaveCDLFileToolStripMenuItem.Text = "Auto load/save log file"; - // - // toolStripMenuItem4 - // - this.toolStripMenuItem4.Name = "toolStripMenuItem4"; - this.toolStripMenuItem4.Size = new System.Drawing.Size(190, 6); - // - // mnuLoadCdlFile - // - this.mnuLoadCdlFile.Image = global::Mesen.GUI.Properties.Resources.FolderOpen; - this.mnuLoadCdlFile.Name = "mnuLoadCdlFile"; - this.mnuLoadCdlFile.Size = new System.Drawing.Size(193, 22); - this.mnuLoadCdlFile.Text = "Load CDL file..."; - this.mnuLoadCdlFile.Click += new System.EventHandler(this.mnuLoadCdlFile_Click); - // - // mnuSaveAsCdlFile - // - this.mnuSaveAsCdlFile.Image = global::Mesen.GUI.Properties.Resources.Floppy; - this.mnuSaveAsCdlFile.Name = "mnuSaveAsCdlFile"; - this.mnuSaveAsCdlFile.Size = new System.Drawing.Size(193, 22); - this.mnuSaveAsCdlFile.Text = "Save as CDL file..."; - this.mnuSaveAsCdlFile.Click += new System.EventHandler(this.mnuSaveAsCdlFile_Click); - // - // mnuResetCdlLog - // - this.mnuResetCdlLog.Image = global::Mesen.GUI.Properties.Resources.Reset; - this.mnuResetCdlLog.Name = "mnuResetCdlLog"; - this.mnuResetCdlLog.Size = new System.Drawing.Size(193, 22); - this.mnuResetCdlLog.Text = "Reset log"; - this.mnuResetCdlLog.Click += new System.EventHandler(this.mnuResetCdlLog_Click); - // - // toolStripMenuItem5 - // - this.toolStripMenuItem5.Name = "toolStripMenuItem5"; - this.toolStripMenuItem5.Size = new System.Drawing.Size(190, 6); - // - // mnuCdlGenerateRom - // - this.mnuCdlGenerateRom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuCodeDataLogger.Name = "mnuCodeDataLogger"; + this.mnuCodeDataLogger.Size = new System.Drawing.Size(201, 22); + this.mnuCodeDataLogger.Text = "Code/Data Logger"; + // + // autoLoadsaveCDLFileToolStripMenuItem + // + this.autoLoadsaveCDLFileToolStripMenuItem.Checked = true; + this.autoLoadsaveCDLFileToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.autoLoadsaveCDLFileToolStripMenuItem.Enabled = false; + this.autoLoadsaveCDLFileToolStripMenuItem.Name = "autoLoadsaveCDLFileToolStripMenuItem"; + this.autoLoadsaveCDLFileToolStripMenuItem.Size = new System.Drawing.Size(202, 22); + this.autoLoadsaveCDLFileToolStripMenuItem.Text = "Auto load/save log file"; + // + // toolStripMenuItem4 + // + this.toolStripMenuItem4.Name = "toolStripMenuItem4"; + this.toolStripMenuItem4.Size = new System.Drawing.Size(199, 6); + // + // mnuLoadCdlFile + // + this.mnuLoadCdlFile.Image = global::Mesen.GUI.Properties.Resources.FolderOpen; + this.mnuLoadCdlFile.Name = "mnuLoadCdlFile"; + this.mnuLoadCdlFile.Size = new System.Drawing.Size(202, 22); + this.mnuLoadCdlFile.Text = "Load CDL file..."; + this.mnuLoadCdlFile.Click += new System.EventHandler(this.mnuLoadCdlFile_Click); + // + // mnuSaveAsCdlFile + // + this.mnuSaveAsCdlFile.Image = global::Mesen.GUI.Properties.Resources.Floppy; + this.mnuSaveAsCdlFile.Name = "mnuSaveAsCdlFile"; + this.mnuSaveAsCdlFile.Size = new System.Drawing.Size(202, 22); + this.mnuSaveAsCdlFile.Text = "Save as CDL file..."; + this.mnuSaveAsCdlFile.Click += new System.EventHandler(this.mnuSaveAsCdlFile_Click); + // + // mnuResetCdlLog + // + this.mnuResetCdlLog.Image = global::Mesen.GUI.Properties.Resources.Reset; + this.mnuResetCdlLog.Name = "mnuResetCdlLog"; + this.mnuResetCdlLog.Size = new System.Drawing.Size(202, 22); + this.mnuResetCdlLog.Text = "Reset log"; + this.mnuResetCdlLog.Click += new System.EventHandler(this.mnuResetCdlLog_Click); + // + // toolStripMenuItem5 + // + this.toolStripMenuItem5.Name = "toolStripMenuItem5"; + this.toolStripMenuItem5.Size = new System.Drawing.Size(199, 6); + // + // mnuCdlGenerateRom + // + this.mnuCdlGenerateRom.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuCdlStripUnusedData, this.mnuCdlStripUsedData}); - this.mnuCdlGenerateRom.Image = global::Mesen.GUI.Properties.Resources.Copy; - this.mnuCdlGenerateRom.Name = "mnuCdlGenerateRom"; - this.mnuCdlGenerateRom.Size = new System.Drawing.Size(193, 22); - this.mnuCdlGenerateRom.Text = "Generate ROM"; - // - // mnuCdlStripUnusedData - // - this.mnuCdlStripUnusedData.Name = "mnuCdlStripUnusedData"; - this.mnuCdlStripUnusedData.Size = new System.Drawing.Size(166, 22); - this.mnuCdlStripUnusedData.Text = "Strip unused data"; - this.mnuCdlStripUnusedData.Click += new System.EventHandler(this.mnuCdlStripUnusedData_Click); - // - // mnuCdlStripUsedData - // - this.mnuCdlStripUsedData.Name = "mnuCdlStripUsedData"; - this.mnuCdlStripUsedData.Size = new System.Drawing.Size(166, 22); - this.mnuCdlStripUsedData.Text = "Strip used data"; - this.mnuCdlStripUsedData.Click += new System.EventHandler(this.mnuCdlStripUsedData_Click); - // - // statusStrip - // - this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuCdlGenerateRom.Image = global::Mesen.GUI.Properties.Resources.Copy; + this.mnuCdlGenerateRom.Name = "mnuCdlGenerateRom"; + this.mnuCdlGenerateRom.Size = new System.Drawing.Size(202, 22); + this.mnuCdlGenerateRom.Text = "Generate ROM"; + // + // mnuCdlStripUnusedData + // + this.mnuCdlStripUnusedData.Name = "mnuCdlStripUnusedData"; + this.mnuCdlStripUnusedData.Size = new System.Drawing.Size(173, 22); + this.mnuCdlStripUnusedData.Text = "Strip unused data"; + this.mnuCdlStripUnusedData.Click += new System.EventHandler(this.mnuCdlStripUnusedData_Click); + // + // mnuCdlStripUsedData + // + this.mnuCdlStripUsedData.Name = "mnuCdlStripUsedData"; + this.mnuCdlStripUsedData.Size = new System.Drawing.Size(173, 22); + this.mnuCdlStripUsedData.Text = "Strip used data"; + this.mnuCdlStripUsedData.Click += new System.EventHandler(this.mnuCdlStripUsedData_Click); + // + // statusStrip + // + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.lblPrgAnalysis, this.lblPrgAnalysisResult, this.lblChrAnalysis, @@ -1928,131 +1930,141 @@ namespace Mesen.GUI.Debugger this.toolStripStatusLabel1, this.lblCyclesElapsedCount, this.lblCyclesElapsed}); - this.statusStrip.Location = new System.Drawing.Point(0, 660); - this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(1075, 24); - this.statusStrip.TabIndex = 3; - this.statusStrip.Text = "statusStrip1"; - // - // lblPrgAnalysis - // - this.lblPrgAnalysis.BorderStyle = System.Windows.Forms.Border3DStyle.Etched; - this.lblPrgAnalysis.Name = "lblPrgAnalysis"; - this.lblPrgAnalysis.Size = new System.Drawing.Size(76, 19); - this.lblPrgAnalysis.Text = "PRG analysis:"; - // - // lblPrgAnalysisResult - // - this.lblPrgAnalysisResult.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right; - this.lblPrgAnalysisResult.BorderStyle = System.Windows.Forms.Border3DStyle.Etched; - this.lblPrgAnalysisResult.Name = "lblPrgAnalysisResult"; - this.lblPrgAnalysisResult.Size = new System.Drawing.Size(235, 19); - this.lblPrgAnalysisResult.Text = "xx% (Code: xx%, Data: xx%, Unknown: xx%)"; - // - // lblChrAnalysis - // - this.lblChrAnalysis.Name = "lblChrAnalysis"; - this.lblChrAnalysis.Size = new System.Drawing.Size(78, 19); - this.lblChrAnalysis.Text = "CHR analysis:"; - // - // lblChrAnalysisResult - // - this.lblChrAnalysisResult.Name = "lblChrAnalysisResult"; - this.lblChrAnalysisResult.Size = new System.Drawing.Size(239, 19); - this.lblChrAnalysisResult.Text = "xx% (Drawn: xx%, Read: xx%, Unknown: xx%)"; - // - // toolStripStatusLabel1 - // - this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; - this.toolStripStatusLabel1.Size = new System.Drawing.Size(340, 19); - this.toolStripStatusLabel1.Spring = true; - // - // lblCyclesElapsedCount - // - this.lblCyclesElapsedCount.Name = "lblCyclesElapsedCount"; - this.lblCyclesElapsedCount.Size = new System.Drawing.Size(13, 19); - this.lblCyclesElapsedCount.Text = "0"; - // - // lblCyclesElapsed - // - this.lblCyclesElapsed.Margin = new System.Windows.Forms.Padding(-3, 3, 0, 2); - this.lblCyclesElapsed.Name = "lblCyclesElapsed"; - this.lblCyclesElapsed.Size = new System.Drawing.Size(82, 19); - this.lblCyclesElapsed.Text = "cycles elapsed"; - // - // ctrlPpuMemoryMapping - // - this.ctrlPpuMemoryMapping.Dock = System.Windows.Forms.DockStyle.Bottom; - this.ctrlPpuMemoryMapping.Location = new System.Drawing.Point(0, 627); - this.ctrlPpuMemoryMapping.Name = "ctrlPpuMemoryMapping"; - this.ctrlPpuMemoryMapping.Size = new System.Drawing.Size(1075, 33); - this.ctrlPpuMemoryMapping.TabIndex = 5; - this.ctrlPpuMemoryMapping.Text = "ctrlMemoryMapping1"; - this.ctrlPpuMemoryMapping.Visible = false; - // - // ctrlCpuMemoryMapping - // - this.ctrlCpuMemoryMapping.Dock = System.Windows.Forms.DockStyle.Bottom; - this.ctrlCpuMemoryMapping.Location = new System.Drawing.Point(0, 594); - this.ctrlCpuMemoryMapping.Name = "ctrlCpuMemoryMapping"; - this.ctrlCpuMemoryMapping.Size = new System.Drawing.Size(1075, 33); - this.ctrlCpuMemoryMapping.TabIndex = 4; - this.ctrlCpuMemoryMapping.Text = "ctrlMemoryMapping1"; - this.ctrlCpuMemoryMapping.Visible = false; - // - // tsToolbar - // - this.tsToolbar.Location = new System.Drawing.Point(0, 24); - this.tsToolbar.Name = "tsToolbar"; - this.tsToolbar.Size = new System.Drawing.Size(1075, 25); - this.tsToolbar.TabIndex = 6; - this.tsToolbar.Text = "toolStrip1"; - this.tsToolbar.Visible = false; - // - // frmDebugger - // - this.AllowDrop = true; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1075, 684); - this.Controls.Add(this.splitContainer); - this.Controls.Add(this.ctrlCpuMemoryMapping); - this.Controls.Add(this.ctrlPpuMemoryMapping); - this.Controls.Add(this.statusStrip); - this.Controls.Add(this.tsToolbar); - this.Controls.Add(this.menuStrip); - this.MainMenuStrip = this.menuStrip; - this.MinimumSize = new System.Drawing.Size(850, 685); - this.Name = "frmDebugger"; - this.Text = "Debugger"; - this.DragDrop += new System.Windows.Forms.DragEventHandler(this.frmDebugger_DragDrop); - this.DragEnter += new System.Windows.Forms.DragEventHandler(this.frmDebugger_DragEnter); - this.splitContainer.Panel1.ResumeLayout(false); - this.splitContainer.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); - this.splitContainer.ResumeLayout(false); - this.ctrlSplitContainerTop.Panel1.ResumeLayout(false); - this.ctrlSplitContainerTop.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.ctrlSplitContainerTop)).EndInit(); - this.ctrlSplitContainerTop.ResumeLayout(false); - this.tlpTop.ResumeLayout(false); - this.panel1.ResumeLayout(false); - this.panel2.ResumeLayout(false); - this.tableLayoutPanel1.ResumeLayout(false); - this.tlpFunctionLabelLists.ResumeLayout(false); - this.grpLabels.ResumeLayout(false); - this.grpFunctions.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.picWatchHelp)).EndInit(); - this.tableLayoutPanel10.ResumeLayout(false); - this.grpWatch.ResumeLayout(false); - this.grpBreakpoints.ResumeLayout(false); - this.grpCallstack.ResumeLayout(false); - this.menuStrip.ResumeLayout(false); - this.menuStrip.PerformLayout(); - this.statusStrip.ResumeLayout(false); - this.statusStrip.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.statusStrip.Location = new System.Drawing.Point(0, 660); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(1075, 24); + this.statusStrip.TabIndex = 3; + this.statusStrip.Text = "statusStrip1"; + // + // lblPrgAnalysis + // + this.lblPrgAnalysis.BorderStyle = System.Windows.Forms.Border3DStyle.Etched; + this.lblPrgAnalysis.Name = "lblPrgAnalysis"; + this.lblPrgAnalysis.Size = new System.Drawing.Size(80, 19); + this.lblPrgAnalysis.Text = "PRG analysis:"; + // + // lblPrgAnalysisResult + // + this.lblPrgAnalysisResult.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right; + this.lblPrgAnalysisResult.BorderStyle = System.Windows.Forms.Border3DStyle.Etched; + this.lblPrgAnalysisResult.Name = "lblPrgAnalysisResult"; + this.lblPrgAnalysisResult.Size = new System.Drawing.Size(255, 19); + this.lblPrgAnalysisResult.Text = "xx% (Code: xx%, Data: xx%, Unknown: xx%)"; + // + // lblChrAnalysis + // + this.lblChrAnalysis.Name = "lblChrAnalysis"; + this.lblChrAnalysis.Size = new System.Drawing.Size(81, 19); + this.lblChrAnalysis.Text = "CHR analysis:"; + // + // lblChrAnalysisResult + // + this.lblChrAnalysisResult.Name = "lblChrAnalysisResult"; + this.lblChrAnalysisResult.Size = new System.Drawing.Size(259, 19); + this.lblChrAnalysisResult.Text = "xx% (Drawn: xx%, Read: xx%, Unknown: xx%)"; + // + // toolStripStatusLabel1 + // + this.toolStripStatusLabel1.Name = "toolStripStatusLabel1"; + this.toolStripStatusLabel1.Size = new System.Drawing.Size(286, 19); + this.toolStripStatusLabel1.Spring = true; + // + // lblCyclesElapsedCount + // + this.lblCyclesElapsedCount.Name = "lblCyclesElapsedCount"; + this.lblCyclesElapsedCount.Size = new System.Drawing.Size(14, 19); + this.lblCyclesElapsedCount.Text = "0"; + // + // lblCyclesElapsed + // + this.lblCyclesElapsed.Margin = new System.Windows.Forms.Padding(-3, 3, 0, 2); + this.lblCyclesElapsed.Name = "lblCyclesElapsed"; + this.lblCyclesElapsed.Size = new System.Drawing.Size(88, 19); + this.lblCyclesElapsed.Text = "cycles elapsed"; + // + // ctrlPpuMemoryMapping + // + this.ctrlPpuMemoryMapping.Dock = System.Windows.Forms.DockStyle.Bottom; + this.ctrlPpuMemoryMapping.Location = new System.Drawing.Point(0, 627); + this.ctrlPpuMemoryMapping.Name = "ctrlPpuMemoryMapping"; + this.ctrlPpuMemoryMapping.Size = new System.Drawing.Size(1075, 33); + this.ctrlPpuMemoryMapping.TabIndex = 5; + this.ctrlPpuMemoryMapping.Text = "ctrlMemoryMapping1"; + this.ctrlPpuMemoryMapping.Visible = false; + // + // ctrlCpuMemoryMapping + // + this.ctrlCpuMemoryMapping.Dock = System.Windows.Forms.DockStyle.Bottom; + this.ctrlCpuMemoryMapping.Location = new System.Drawing.Point(0, 594); + this.ctrlCpuMemoryMapping.Name = "ctrlCpuMemoryMapping"; + this.ctrlCpuMemoryMapping.Size = new System.Drawing.Size(1075, 33); + this.ctrlCpuMemoryMapping.TabIndex = 4; + this.ctrlCpuMemoryMapping.Text = "ctrlMemoryMapping1"; + this.ctrlCpuMemoryMapping.Visible = false; + // + // tsToolbar + // + this.tsToolbar.Location = new System.Drawing.Point(0, 24); + this.tsToolbar.Name = "tsToolbar"; + this.tsToolbar.Size = new System.Drawing.Size(1075, 25); + this.tsToolbar.TabIndex = 6; + this.tsToolbar.Text = "toolStrip1"; + this.tsToolbar.Visible = false; + // + // mnuBreakOnUnlogged + // + this.mnuBreakOnUnlogged.CheckOnClick = true; + this.mnuBreakOnUnlogged.Name = "mnuBreakOnUnlogged"; + this.mnuBreakOnUnlogged.Size = new System.Drawing.Size(273, 22); + this.mnuBreakOnUnlogged.Text = "Break on unlogged code"; + this.mnuBreakOnUnlogged.Click += new System.EventHandler(this.mnuBreakOnUnlogged_Click); + + // + // frmDebugger + // + this.AllowDrop = true; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1075, 684); + this.Controls.Add(this.splitContainer); + this.Controls.Add(this.ctrlCpuMemoryMapping); + this.Controls.Add(this.ctrlPpuMemoryMapping); + this.Controls.Add(this.statusStrip); + this.Controls.Add(this.tsToolbar); + this.Controls.Add(this.menuStrip); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.MainMenuStrip = this.menuStrip; + this.MinimumSize = new System.Drawing.Size(850, 685); + this.Name = "frmDebugger"; + this.Text = "Debugger"; + this.DragDrop += new System.Windows.Forms.DragEventHandler(this.frmDebugger_DragDrop); + this.DragEnter += new System.Windows.Forms.DragEventHandler(this.frmDebugger_DragEnter); + this.splitContainer.Panel1.ResumeLayout(false); + this.splitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); + this.splitContainer.ResumeLayout(false); + this.ctrlSplitContainerTop.Panel1.ResumeLayout(false); + this.ctrlSplitContainerTop.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.ctrlSplitContainerTop)).EndInit(); + this.ctrlSplitContainerTop.ResumeLayout(false); + this.tlpTop.ResumeLayout(false); + this.panel1.ResumeLayout(false); + this.panel2.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + this.tlpFunctionLabelLists.ResumeLayout(false); + this.grpLabels.ResumeLayout(false); + this.grpFunctions.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.picWatchHelp)).EndInit(); + this.tableLayoutPanel10.ResumeLayout(false); + this.grpWatch.ResumeLayout(false); + this.grpBreakpoints.ResumeLayout(false); + this.grpCallstack.ResumeLayout(false); + this.menuStrip.ResumeLayout(false); + this.menuStrip.PerformLayout(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -2255,5 +2267,6 @@ namespace Mesen.GUI.Debugger private System.Windows.Forms.ToolStripMenuItem mnuGoToAddress; private System.Windows.Forms.ToolStripMenuItem mnuReloadRomOnPowerCycle; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripMenuItem mnuBreakOnUnlogged; } } \ No newline at end of file diff --git a/GUI.NET/Debugger/frmDebugger.cs b/GUI.NET/Debugger/frmDebugger.cs index d280e2b5..da7f253d 100644 --- a/GUI.NET/Debugger/frmDebugger.cs +++ b/GUI.NET/Debugger/frmDebugger.cs @@ -108,6 +108,7 @@ namespace Mesen.GUI.Debugger this.mnuBreakOnPlay.Checked = ConfigManager.Config.DebugInfo.BreakOnPlay; this.mnuBreakOnOpen.Checked = ConfigManager.Config.DebugInfo.BreakOnOpen; this.mnuBreakOnUnofficialOpcodes.Checked = ConfigManager.Config.DebugInfo.BreakOnUnofficialOpcodes; + this.mnuBreakOnUnlogged.Checked = ConfigManager.Config.DebugInfo.BreakOnUnlogged; this.mnuBreakOnBrk.Checked = ConfigManager.Config.DebugInfo.BreakOnBrk; this.mnuBreakOnUninitMemoryRead.Checked = ConfigManager.Config.DebugInfo.BreakOnUninitMemoryRead; this.mnuBreakOnBusConflict.Checked = ConfigManager.Config.DebugInfo.BreakOnBusConflict; @@ -426,6 +427,7 @@ namespace Mesen.GUI.Debugger SetFlag(DebuggerFlags.ShowVerifiedData, config.ShowVerifiedData); SetFlag(DebuggerFlags.ShowUnidentifiedData, config.ShowUnidentifiedData); SetFlag(DebuggerFlags.BreakOnUnofficialOpCode, config.BreakOnUnofficialOpcodes); + SetFlag(DebuggerFlags.BreakOnUnlogged, config.BreakOnUnlogged); SetFlag(DebuggerFlags.BreakOnBrk, config.BreakOnBrk); SetFlag(DebuggerFlags.BreakOnUninitMemoryRead, config.BreakOnUninitMemoryRead); SetFlag(DebuggerFlags.BreakOnDecayedOamRead, config.BreakOnDecayedOamRead); @@ -1178,6 +1180,13 @@ namespace Mesen.GUI.Debugger UpdateDebuggerFlags(); } + private void mnuBreakOnUnlogged_Click(object sender, EventArgs e) + { + ConfigManager.Config.DebugInfo.BreakOnUnlogged = mnuBreakOnUnlogged.Checked; + ConfigManager.ApplyChanges(); + UpdateDebuggerFlags(); + } + private void mnuBreakOnBrk_Click(object sender, EventArgs e) { ConfigManager.Config.DebugInfo.BreakOnBrk = mnuBreakOnBrk.Checked; diff --git a/GUI.NET/Debugger/frmDebugger.resx b/GUI.NET/Debugger/frmDebugger.resx index 7435e7b0..1c762083 100644 --- a/GUI.NET/Debugger/frmDebugger.resx +++ b/GUI.NET/Debugger/frmDebugger.resx @@ -121,12 +121,12 @@ 17, 17 - 107, 17 + 110, 17 - 215, 17 + 222, 17 - 324, 17 + 335, 17 \ No newline at end of file diff --git a/GUI.NET/Dependencies/resources.ca.xml b/GUI.NET/Dependencies/resources.ca.xml index bf2bc39a..9a258191 100644 --- a/GUI.NET/Dependencies/resources.ca.xml +++ b/GUI.NET/Dependencies/resources.ca.xml @@ -244,7 +244,8 @@ Fes servir els paquets d'alta resolució d'HDNes Fes servir el mode de pantalla completa exclusiva Fullscreen Resolution: - Requested Refresh Rate: + Requested Refresh Rate NTSC: + PAL / Dendy: Sobreescaneig Global Game-Specific diff --git a/GUI.NET/Dependencies/resources.en.xml b/GUI.NET/Dependencies/resources.en.xml index f02a978c..19cb2583 100644 --- a/GUI.NET/Dependencies/resources.en.xml +++ b/GUI.NET/Dependencies/resources.en.xml @@ -244,7 +244,8 @@ Use HDNes HD packs Use exclusive fullscreen mode Fullscreen Resolution: - Requested Refresh Rate: + Requested Refresh Rate NTSC: + PAL / Dendy: Overscan Global Game-Specific @@ -1361,6 +1362,7 @@ PPU Step BRK Unofficial OP code + Unlogged code Reset event Debugger focused Uninitialized memory read diff --git a/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs b/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs index 5f4177eb..9a07ee71 100644 --- a/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs +++ b/GUI.NET/Forms/Config/frmVideoConfig.Designer.cs @@ -29,249 +29,251 @@ namespace Mesen.GUI.Forms.Config /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVideoConfig)); - this.tlpMain = new System.Windows.Forms.TableLayoutPanel(); - this.flpResolution = new System.Windows.Forms.FlowLayoutPanel(); - this.lblFullscreenResolution = new System.Windows.Forms.Label(); - this.cboFullscreenResolution = new System.Windows.Forms.ComboBox(); - this.chkUseExclusiveFullscreen = new System.Windows.Forms.CheckBox(); - this.lblVideoScale = new System.Windows.Forms.Label(); - this.chkVerticalSync = new System.Windows.Forms.CheckBox(); - this.lblDisplayRatio = new System.Windows.Forms.Label(); - this.flowLayoutPanel7 = new System.Windows.Forms.FlowLayoutPanel(); - this.chkUseHdPacks = new System.Windows.Forms.CheckBox(); - this.picHdNesTooltip = new System.Windows.Forms.PictureBox(); - this.nudScale = new Mesen.GUI.Controls.MesenNumericUpDown(); - this.flowLayoutPanel6 = new System.Windows.Forms.FlowLayoutPanel(); - this.cboAspectRatio = new System.Windows.Forms.ComboBox(); - this.lblCustomRatio = new System.Windows.Forms.Label(); - this.nudCustomRatio = new Mesen.GUI.Controls.MesenNumericUpDown(); - this.chkFullscreenForceIntegerScale = new System.Windows.Forms.CheckBox(); - this.chkShowFps = new System.Windows.Forms.CheckBox(); - this.chkIntegerFpsMode = new System.Windows.Forms.CheckBox(); - this.flpRefreshRate = new System.Windows.Forms.FlowLayoutPanel(); - this.lblRequestedRefreshRate = new System.Windows.Forms.Label(); - this.cboRefreshRate = new System.Windows.Forms.ComboBox(); - this.tabMain = new System.Windows.Forms.TabControl(); - this.tpgGeneral = new System.Windows.Forms.TabPage(); - this.tpgPicture = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); - this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); - this.btnSelectPreset = new System.Windows.Forms.Button(); - this.btnResetPictureSettings = new System.Windows.Forms.Button(); - this.grpNtscFilter = new System.Windows.Forms.GroupBox(); - this.tlpNtscFilter2 = new System.Windows.Forms.TableLayoutPanel(); - this.trkYFilterLength = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkIFilterLength = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkQFilterLength = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.tlpNtscFilter1 = new System.Windows.Forms.TableLayoutPanel(); - this.trkArtifacts = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkBleed = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkFringing = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkGamma = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkResolution = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkSharpness = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); - this.chkMergeFields = new System.Windows.Forms.CheckBox(); - this.chkVerticalBlend = new System.Windows.Forms.CheckBox(); - this.grpCommon = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); - this.chkBilinearInterpolation = new System.Windows.Forms.CheckBox(); - this.trkBrightness = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkContrast = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkHue = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.trkSaturation = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.grpScanlines = new System.Windows.Forms.GroupBox(); - this.trkScanlines = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); - this.tableLayoutPanel8 = new System.Windows.Forms.TableLayoutPanel(); - this.cboFilter = new System.Windows.Forms.ComboBox(); - this.lblVideoFilter = new System.Windows.Forms.Label(); - this.tpgOverscan = new System.Windows.Forms.TabPage(); - this.tabOverscan = new System.Windows.Forms.TabControl(); - this.tpgOverscanGlobal = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.picOverscan = new System.Windows.Forms.PictureBox(); - this.tableLayoutPanel11 = new System.Windows.Forms.TableLayoutPanel(); - this.nudOverscanTop = new Mesen.GUI.Controls.MesenNumericUpDown(); - this.lblTop = new System.Windows.Forms.Label(); - this.tableLayoutPanel12 = new System.Windows.Forms.TableLayoutPanel(); - this.nudOverscanBottom = new Mesen.GUI.Controls.MesenNumericUpDown(); - this.lblBottom = new System.Windows.Forms.Label(); - this.tableLayoutPanel13 = new System.Windows.Forms.TableLayoutPanel(); - this.nudOverscanRight = new Mesen.GUI.Controls.MesenNumericUpDown(); - this.lblRight = new System.Windows.Forms.Label(); - this.tableLayoutPanel14 = new System.Windows.Forms.TableLayoutPanel(); - this.nudOverscanLeft = new Mesen.GUI.Controls.MesenNumericUpDown(); - this.lblLeft = new System.Windows.Forms.Label(); - this.tpgOverscanGameSpecific = new System.Windows.Forms.TabPage(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.tableLayoutPanel10 = new System.Windows.Forms.TableLayoutPanel(); - this.picGameSpecificOverscan = new System.Windows.Forms.PictureBox(); - this.tableLayoutPanel15 = new System.Windows.Forms.TableLayoutPanel(); - this.nudGameSpecificOverscanTop = new Mesen.GUI.Controls.MesenNumericUpDown(); - this.lblGameSpecificOverscanTop = new System.Windows.Forms.Label(); - this.tableLayoutPanel16 = new System.Windows.Forms.TableLayoutPanel(); - this.nudGameSpecificOverscanBottom = new Mesen.GUI.Controls.MesenNumericUpDown(); - this.lblGameSpecificOverscanBottom = new System.Windows.Forms.Label(); - this.tableLayoutPanel17 = new System.Windows.Forms.TableLayoutPanel(); - this.nudGameSpecificOverscanRight = new Mesen.GUI.Controls.MesenNumericUpDown(); - this.lblGameSpecificOverscanRight = new System.Windows.Forms.Label(); - this.tableLayoutPanel18 = new System.Windows.Forms.TableLayoutPanel(); - this.nudGameSpecificOverscanLeft = new Mesen.GUI.Controls.MesenNumericUpDown(); - this.lblGameSpecificOverscanLeft = new System.Windows.Forms.Label(); - this.chkEnableGameSpecificOverscan = new System.Windows.Forms.CheckBox(); - this.imageList = new System.Windows.Forms.ImageList(this.components); - this.tpgPalette = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); - this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); - this.btnExportPalette = new System.Windows.Forms.Button(); - this.btnSelectPalette = new System.Windows.Forms.Button(); - this.btnLoadPalFile = new System.Windows.Forms.Button(); - this.chkShowColorIndexes = new System.Windows.Forms.CheckBox(); - this.chkUseCustomVsPalette = new System.Windows.Forms.CheckBox(); - this.ctrlPaletteDisplay = new Mesen.GUI.Debugger.ctrlPaletteDisplay(); - this.tpgAdvanced = new System.Windows.Forms.TabPage(); - this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel(); - this.chkDisableBackground = new Mesen.GUI.Controls.ctrlRiskyOption(); - this.chkDisableSprites = new Mesen.GUI.Controls.ctrlRiskyOption(); - this.chkForceBackgroundFirstColumn = new Mesen.GUI.Controls.ctrlRiskyOption(); - this.chkForceSpritesFirstColumn = new Mesen.GUI.Controls.ctrlRiskyOption(); - this.lblScreenRotation = new System.Windows.Forms.Label(); - this.cboScreenRotation = new System.Windows.Forms.ComboBox(); - this.chkRemoveSpriteLimit = new System.Windows.Forms.CheckBox(); - this.chkAdaptiveSpriteLimit = new System.Windows.Forms.CheckBox(); - this.contextPicturePresets = new System.Windows.Forms.ContextMenuStrip(this.components); - this.mnuPresetComposite = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPresetSVideo = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPresetRgb = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPresetMonochrome = new System.Windows.Forms.ToolStripMenuItem(); - this.colorDialog = new System.Windows.Forms.ColorDialog(); - this.contextPaletteList = new System.Windows.Forms.ContextMenuStrip(this.components); - this.mnuDefaultPalette = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuPaletteCompositeDirect = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPaletteNesClassic = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPaletteNestopiaRgb = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPaletteOriginalHardware = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPalettePvmStyle = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPaletteSonyCxa2025As = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPaletteUnsaturated = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuPaletteYuv = new System.Windows.Forms.ToolStripMenuItem(); - this.tlpMain.SuspendLayout(); - this.flpResolution.SuspendLayout(); - this.flowLayoutPanel7.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picHdNesTooltip)).BeginInit(); - this.flowLayoutPanel6.SuspendLayout(); - this.flpRefreshRate.SuspendLayout(); - this.tabMain.SuspendLayout(); - this.tpgGeneral.SuspendLayout(); - this.tpgPicture.SuspendLayout(); - this.tableLayoutPanel5.SuspendLayout(); - this.tableLayoutPanel7.SuspendLayout(); - this.grpNtscFilter.SuspendLayout(); - this.tlpNtscFilter2.SuspendLayout(); - this.tlpNtscFilter1.SuspendLayout(); - this.tableLayoutPanel6.SuspendLayout(); - this.grpCommon.SuspendLayout(); - this.tableLayoutPanel4.SuspendLayout(); - this.grpScanlines.SuspendLayout(); - this.tableLayoutPanel8.SuspendLayout(); - this.tpgOverscan.SuspendLayout(); - this.tabOverscan.SuspendLayout(); - this.tpgOverscanGlobal.SuspendLayout(); - this.tableLayoutPanel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picOverscan)).BeginInit(); - this.tableLayoutPanel11.SuspendLayout(); - this.tableLayoutPanel12.SuspendLayout(); - this.tableLayoutPanel13.SuspendLayout(); - this.tableLayoutPanel14.SuspendLayout(); - this.tpgOverscanGameSpecific.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.tableLayoutPanel10.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picGameSpecificOverscan)).BeginInit(); - this.tableLayoutPanel15.SuspendLayout(); - this.tableLayoutPanel16.SuspendLayout(); - this.tableLayoutPanel17.SuspendLayout(); - this.tableLayoutPanel18.SuspendLayout(); - this.tpgPalette.SuspendLayout(); - this.tableLayoutPanel3.SuspendLayout(); - this.tableLayoutPanel2.SuspendLayout(); - this.tpgAdvanced.SuspendLayout(); - this.tableLayoutPanel9.SuspendLayout(); - this.contextPicturePresets.SuspendLayout(); - this.contextPaletteList.SuspendLayout(); - this.SuspendLayout(); - // - // baseConfigPanel - // - this.baseConfigPanel.Location = new System.Drawing.Point(0, 428); - this.baseConfigPanel.Size = new System.Drawing.Size(535, 29); - // - // tlpMain - // - this.tlpMain.ColumnCount = 2; - this.tlpMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tlpMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpMain.Controls.Add(this.flpResolution, 0, 5); - this.tlpMain.Controls.Add(this.chkUseExclusiveFullscreen, 0, 4); - this.tlpMain.Controls.Add(this.lblVideoScale, 0, 0); - this.tlpMain.Controls.Add(this.chkVerticalSync, 0, 3); - this.tlpMain.Controls.Add(this.lblDisplayRatio, 0, 1); - this.tlpMain.Controls.Add(this.flowLayoutPanel7, 0, 8); - this.tlpMain.Controls.Add(this.nudScale, 1, 0); - this.tlpMain.Controls.Add(this.flowLayoutPanel6, 1, 1); - this.tlpMain.Controls.Add(this.chkFullscreenForceIntegerScale, 0, 7); - this.tlpMain.Controls.Add(this.chkShowFps, 0, 9); - this.tlpMain.Controls.Add(this.chkIntegerFpsMode, 0, 2); - this.tlpMain.Controls.Add(this.flpRefreshRate, 0, 6); - this.tlpMain.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpMain.Location = new System.Drawing.Point(3, 3); - this.tlpMain.Margin = new System.Windows.Forms.Padding(0); - this.tlpMain.Name = "tlpMain"; - this.tlpMain.RowCount = 11; - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpMain.Size = new System.Drawing.Size(521, 396); - this.tlpMain.TabIndex = 1; - // - // flpResolution - // - this.tlpMain.SetColumnSpan(this.flpResolution, 2); - this.flpResolution.Controls.Add(this.lblFullscreenResolution); - this.flpResolution.Controls.Add(this.cboFullscreenResolution); - this.flpResolution.Dock = System.Windows.Forms.DockStyle.Fill; - this.flpResolution.Location = new System.Drawing.Point(30, 116); - this.flpResolution.Margin = new System.Windows.Forms.Padding(30, 0, 0, 0); - this.flpResolution.Name = "flpResolution"; - this.flpResolution.Size = new System.Drawing.Size(491, 27); - this.flpResolution.TabIndex = 27; - this.flpResolution.Visible = false; - // - // lblFullscreenResolution - // - this.lblFullscreenResolution.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.lblFullscreenResolution.AutoSize = true; - this.lblFullscreenResolution.Location = new System.Drawing.Point(3, 7); - this.lblFullscreenResolution.Name = "lblFullscreenResolution"; - this.lblFullscreenResolution.Size = new System.Drawing.Size(111, 13); - this.lblFullscreenResolution.TabIndex = 17; - this.lblFullscreenResolution.Text = "Fullscreen Resolution:"; - // - // cboFullscreenResolution - // - this.cboFullscreenResolution.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboFullscreenResolution.FormattingEnabled = true; - this.cboFullscreenResolution.Items.AddRange(new object[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmVideoConfig)); + this.tlpMain = new System.Windows.Forms.TableLayoutPanel(); + this.flpResolution = new System.Windows.Forms.FlowLayoutPanel(); + this.lblFullscreenResolution = new System.Windows.Forms.Label(); + this.cboFullscreenResolution = new System.Windows.Forms.ComboBox(); + this.chkUseExclusiveFullscreen = new System.Windows.Forms.CheckBox(); + this.lblVideoScale = new System.Windows.Forms.Label(); + this.chkVerticalSync = new System.Windows.Forms.CheckBox(); + this.lblDisplayRatio = new System.Windows.Forms.Label(); + this.flowLayoutPanel7 = new System.Windows.Forms.FlowLayoutPanel(); + this.chkUseHdPacks = new System.Windows.Forms.CheckBox(); + this.picHdNesTooltip = new System.Windows.Forms.PictureBox(); + this.nudScale = new Mesen.GUI.Controls.MesenNumericUpDown(); + this.flowLayoutPanel6 = new System.Windows.Forms.FlowLayoutPanel(); + this.cboAspectRatio = new System.Windows.Forms.ComboBox(); + this.lblCustomRatio = new System.Windows.Forms.Label(); + this.nudCustomRatio = new Mesen.GUI.Controls.MesenNumericUpDown(); + this.chkFullscreenForceIntegerScale = new System.Windows.Forms.CheckBox(); + this.chkShowFps = new System.Windows.Forms.CheckBox(); + this.chkIntegerFpsMode = new System.Windows.Forms.CheckBox(); + this.flpRefreshRate = new System.Windows.Forms.FlowLayoutPanel(); + this.lblRequestedRefreshRate = new System.Windows.Forms.Label(); + this.cboRefreshRate = new System.Windows.Forms.ComboBox(); + this.lblRequestedRefreshRate2 = new System.Windows.Forms.Label(); + this.cboRefreshRate2 = new System.Windows.Forms.ComboBox(); + this.tabMain = new System.Windows.Forms.TabControl(); + this.tpgGeneral = new System.Windows.Forms.TabPage(); + this.tpgPicture = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel7 = new System.Windows.Forms.TableLayoutPanel(); + this.btnSelectPreset = new System.Windows.Forms.Button(); + this.btnResetPictureSettings = new System.Windows.Forms.Button(); + this.grpNtscFilter = new System.Windows.Forms.GroupBox(); + this.tlpNtscFilter2 = new System.Windows.Forms.TableLayoutPanel(); + this.trkYFilterLength = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkIFilterLength = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkQFilterLength = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.tlpNtscFilter1 = new System.Windows.Forms.TableLayoutPanel(); + this.trkArtifacts = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkBleed = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkFringing = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkGamma = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkResolution = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkSharpness = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.tableLayoutPanel6 = new System.Windows.Forms.TableLayoutPanel(); + this.chkMergeFields = new System.Windows.Forms.CheckBox(); + this.chkVerticalBlend = new System.Windows.Forms.CheckBox(); + this.grpCommon = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel4 = new System.Windows.Forms.TableLayoutPanel(); + this.chkBilinearInterpolation = new System.Windows.Forms.CheckBox(); + this.trkBrightness = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkContrast = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkHue = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.trkSaturation = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.grpScanlines = new System.Windows.Forms.GroupBox(); + this.trkScanlines = new Mesen.GUI.Controls.ctrlHorizontalTrackbar(); + this.tableLayoutPanel8 = new System.Windows.Forms.TableLayoutPanel(); + this.cboFilter = new System.Windows.Forms.ComboBox(); + this.lblVideoFilter = new System.Windows.Forms.Label(); + this.tpgOverscan = new System.Windows.Forms.TabPage(); + this.tabOverscan = new System.Windows.Forms.TabControl(); + this.tpgOverscanGlobal = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.picOverscan = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel11 = new System.Windows.Forms.TableLayoutPanel(); + this.nudOverscanTop = new Mesen.GUI.Controls.MesenNumericUpDown(); + this.lblTop = new System.Windows.Forms.Label(); + this.tableLayoutPanel12 = new System.Windows.Forms.TableLayoutPanel(); + this.nudOverscanBottom = new Mesen.GUI.Controls.MesenNumericUpDown(); + this.lblBottom = new System.Windows.Forms.Label(); + this.tableLayoutPanel13 = new System.Windows.Forms.TableLayoutPanel(); + this.nudOverscanRight = new Mesen.GUI.Controls.MesenNumericUpDown(); + this.lblRight = new System.Windows.Forms.Label(); + this.tableLayoutPanel14 = new System.Windows.Forms.TableLayoutPanel(); + this.nudOverscanLeft = new Mesen.GUI.Controls.MesenNumericUpDown(); + this.lblLeft = new System.Windows.Forms.Label(); + this.tpgOverscanGameSpecific = new System.Windows.Forms.TabPage(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.tableLayoutPanel10 = new System.Windows.Forms.TableLayoutPanel(); + this.picGameSpecificOverscan = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel15 = new System.Windows.Forms.TableLayoutPanel(); + this.nudGameSpecificOverscanTop = new Mesen.GUI.Controls.MesenNumericUpDown(); + this.lblGameSpecificOverscanTop = new System.Windows.Forms.Label(); + this.tableLayoutPanel16 = new System.Windows.Forms.TableLayoutPanel(); + this.nudGameSpecificOverscanBottom = new Mesen.GUI.Controls.MesenNumericUpDown(); + this.lblGameSpecificOverscanBottom = new System.Windows.Forms.Label(); + this.tableLayoutPanel17 = new System.Windows.Forms.TableLayoutPanel(); + this.nudGameSpecificOverscanRight = new Mesen.GUI.Controls.MesenNumericUpDown(); + this.lblGameSpecificOverscanRight = new System.Windows.Forms.Label(); + this.tableLayoutPanel18 = new System.Windows.Forms.TableLayoutPanel(); + this.nudGameSpecificOverscanLeft = new Mesen.GUI.Controls.MesenNumericUpDown(); + this.lblGameSpecificOverscanLeft = new System.Windows.Forms.Label(); + this.chkEnableGameSpecificOverscan = new System.Windows.Forms.CheckBox(); + this.imageList = new System.Windows.Forms.ImageList(this.components); + this.tpgPalette = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.btnExportPalette = new System.Windows.Forms.Button(); + this.btnSelectPalette = new System.Windows.Forms.Button(); + this.btnLoadPalFile = new System.Windows.Forms.Button(); + this.chkShowColorIndexes = new System.Windows.Forms.CheckBox(); + this.chkUseCustomVsPalette = new System.Windows.Forms.CheckBox(); + this.ctrlPaletteDisplay = new Mesen.GUI.Debugger.ctrlPaletteDisplay(); + this.tpgAdvanced = new System.Windows.Forms.TabPage(); + this.tableLayoutPanel9 = new System.Windows.Forms.TableLayoutPanel(); + this.chkDisableBackground = new Mesen.GUI.Controls.ctrlRiskyOption(); + this.chkDisableSprites = new Mesen.GUI.Controls.ctrlRiskyOption(); + this.chkForceBackgroundFirstColumn = new Mesen.GUI.Controls.ctrlRiskyOption(); + this.chkForceSpritesFirstColumn = new Mesen.GUI.Controls.ctrlRiskyOption(); + this.lblScreenRotation = new System.Windows.Forms.Label(); + this.cboScreenRotation = new System.Windows.Forms.ComboBox(); + this.chkRemoveSpriteLimit = new System.Windows.Forms.CheckBox(); + this.chkAdaptiveSpriteLimit = new System.Windows.Forms.CheckBox(); + this.contextPicturePresets = new System.Windows.Forms.ContextMenuStrip(this.components); + this.mnuPresetComposite = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPresetSVideo = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPresetRgb = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPresetMonochrome = new System.Windows.Forms.ToolStripMenuItem(); + this.colorDialog = new System.Windows.Forms.ColorDialog(); + this.contextPaletteList = new System.Windows.Forms.ContextMenuStrip(this.components); + this.mnuDefaultPalette = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuPaletteCompositeDirect = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPaletteNesClassic = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPaletteNestopiaRgb = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPaletteOriginalHardware = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPalettePvmStyle = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPaletteSonyCxa2025As = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPaletteUnsaturated = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuPaletteYuv = new System.Windows.Forms.ToolStripMenuItem(); + this.tlpMain.SuspendLayout(); + this.flpResolution.SuspendLayout(); + this.flowLayoutPanel7.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picHdNesTooltip)).BeginInit(); + this.flowLayoutPanel6.SuspendLayout(); + this.flpRefreshRate.SuspendLayout(); + this.tabMain.SuspendLayout(); + this.tpgGeneral.SuspendLayout(); + this.tpgPicture.SuspendLayout(); + this.tableLayoutPanel5.SuspendLayout(); + this.tableLayoutPanel7.SuspendLayout(); + this.grpNtscFilter.SuspendLayout(); + this.tlpNtscFilter2.SuspendLayout(); + this.tlpNtscFilter1.SuspendLayout(); + this.tableLayoutPanel6.SuspendLayout(); + this.grpCommon.SuspendLayout(); + this.tableLayoutPanel4.SuspendLayout(); + this.grpScanlines.SuspendLayout(); + this.tableLayoutPanel8.SuspendLayout(); + this.tpgOverscan.SuspendLayout(); + this.tabOverscan.SuspendLayout(); + this.tpgOverscanGlobal.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picOverscan)).BeginInit(); + this.tableLayoutPanel11.SuspendLayout(); + this.tableLayoutPanel12.SuspendLayout(); + this.tableLayoutPanel13.SuspendLayout(); + this.tableLayoutPanel14.SuspendLayout(); + this.tpgOverscanGameSpecific.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.tableLayoutPanel10.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picGameSpecificOverscan)).BeginInit(); + this.tableLayoutPanel15.SuspendLayout(); + this.tableLayoutPanel16.SuspendLayout(); + this.tableLayoutPanel17.SuspendLayout(); + this.tableLayoutPanel18.SuspendLayout(); + this.tpgPalette.SuspendLayout(); + this.tableLayoutPanel3.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); + this.tpgAdvanced.SuspendLayout(); + this.tableLayoutPanel9.SuspendLayout(); + this.contextPicturePresets.SuspendLayout(); + this.contextPaletteList.SuspendLayout(); + this.SuspendLayout(); + // + // baseConfigPanel + // + this.baseConfigPanel.Location = new System.Drawing.Point(0, 428); + this.baseConfigPanel.Size = new System.Drawing.Size(535, 29); + // + // tlpMain + // + this.tlpMain.ColumnCount = 2; + this.tlpMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpMain.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpMain.Controls.Add(this.flpResolution, 0, 5); + this.tlpMain.Controls.Add(this.chkUseExclusiveFullscreen, 0, 4); + this.tlpMain.Controls.Add(this.lblVideoScale, 0, 0); + this.tlpMain.Controls.Add(this.chkVerticalSync, 0, 3); + this.tlpMain.Controls.Add(this.lblDisplayRatio, 0, 1); + this.tlpMain.Controls.Add(this.flowLayoutPanel7, 0, 8); + this.tlpMain.Controls.Add(this.nudScale, 1, 0); + this.tlpMain.Controls.Add(this.flowLayoutPanel6, 1, 1); + this.tlpMain.Controls.Add(this.chkFullscreenForceIntegerScale, 0, 7); + this.tlpMain.Controls.Add(this.chkShowFps, 0, 9); + this.tlpMain.Controls.Add(this.chkIntegerFpsMode, 0, 2); + this.tlpMain.Controls.Add(this.flpRefreshRate, 0, 6); + this.tlpMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpMain.Location = new System.Drawing.Point(3, 3); + this.tlpMain.Margin = new System.Windows.Forms.Padding(0); + this.tlpMain.Name = "tlpMain"; + this.tlpMain.RowCount = 11; + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpMain.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpMain.Size = new System.Drawing.Size(521, 396); + this.tlpMain.TabIndex = 1; + // + // flpResolution + // + this.tlpMain.SetColumnSpan(this.flpResolution, 2); + this.flpResolution.Controls.Add(this.lblFullscreenResolution); + this.flpResolution.Controls.Add(this.cboFullscreenResolution); + this.flpResolution.Dock = System.Windows.Forms.DockStyle.Fill; + this.flpResolution.Location = new System.Drawing.Point(30, 116); + this.flpResolution.Margin = new System.Windows.Forms.Padding(30, 0, 0, 0); + this.flpResolution.Name = "flpResolution"; + this.flpResolution.Size = new System.Drawing.Size(491, 27); + this.flpResolution.TabIndex = 27; + this.flpResolution.Visible = false; + // + // lblFullscreenResolution + // + this.lblFullscreenResolution.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblFullscreenResolution.AutoSize = true; + this.lblFullscreenResolution.Location = new System.Drawing.Point(3, 7); + this.lblFullscreenResolution.Name = "lblFullscreenResolution"; + this.lblFullscreenResolution.Size = new System.Drawing.Size(111, 13); + this.lblFullscreenResolution.TabIndex = 17; + this.lblFullscreenResolution.Text = "Fullscreen Resolution:"; + // + // cboFullscreenResolution + // + this.cboFullscreenResolution.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboFullscreenResolution.FormattingEnabled = true; + this.cboFullscreenResolution.Items.AddRange(new object[] { "3840x2160", "2560x1440", "2160x1200", @@ -293,1689 +295,1720 @@ namespace Mesen.GUI.Forms.Config "1024x768", "800x600", "640x480"}); - this.cboFullscreenResolution.Location = new System.Drawing.Point(120, 3); - this.cboFullscreenResolution.Name = "cboFullscreenResolution"; - this.cboFullscreenResolution.Size = new System.Drawing.Size(85, 21); - this.cboFullscreenResolution.TabIndex = 25; - // - // chkUseExclusiveFullscreen - // - this.chkUseExclusiveFullscreen.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkUseExclusiveFullscreen.AutoSize = true; - this.tlpMain.SetColumnSpan(this.chkUseExclusiveFullscreen, 2); - this.chkUseExclusiveFullscreen.Location = new System.Drawing.Point(3, 96); - this.chkUseExclusiveFullscreen.Name = "chkUseExclusiveFullscreen"; - this.chkUseExclusiveFullscreen.Size = new System.Drawing.Size(169, 17); - this.chkUseExclusiveFullscreen.TabIndex = 24; - this.chkUseExclusiveFullscreen.Text = "Use exclusive fullscreen mode"; - this.chkUseExclusiveFullscreen.UseVisualStyleBackColor = true; - this.chkUseExclusiveFullscreen.CheckedChanged += new System.EventHandler(this.chkUseExclusiveFullscreen_CheckedChanged); - // - // lblVideoScale - // - this.lblVideoScale.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblVideoScale.AutoSize = true; - this.lblVideoScale.Location = new System.Drawing.Point(3, 4); - this.lblVideoScale.Name = "lblVideoScale"; - this.lblVideoScale.Size = new System.Drawing.Size(37, 13); - this.lblVideoScale.TabIndex = 11; - this.lblVideoScale.Text = "Scale:"; - // - // chkVerticalSync - // - this.chkVerticalSync.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkVerticalSync.AutoSize = true; - this.tlpMain.SetColumnSpan(this.chkVerticalSync, 2); - this.chkVerticalSync.Location = new System.Drawing.Point(3, 73); - this.chkVerticalSync.Name = "chkVerticalSync"; - this.chkVerticalSync.Size = new System.Drawing.Size(121, 17); - this.chkVerticalSync.TabIndex = 15; - this.chkVerticalSync.Text = "Enable vertical sync"; - this.chkVerticalSync.UseVisualStyleBackColor = true; - // - // lblDisplayRatio - // - this.lblDisplayRatio.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblDisplayRatio.AutoSize = true; - this.lblDisplayRatio.Location = new System.Drawing.Point(3, 27); - this.lblDisplayRatio.Name = "lblDisplayRatio"; - this.lblDisplayRatio.Size = new System.Drawing.Size(71, 13); - this.lblDisplayRatio.TabIndex = 17; - this.lblDisplayRatio.Text = "Aspect Ratio:"; - // - // flowLayoutPanel7 - // - this.tlpMain.SetColumnSpan(this.flowLayoutPanel7, 2); - this.flowLayoutPanel7.Controls.Add(this.chkUseHdPacks); - this.flowLayoutPanel7.Controls.Add(this.picHdNesTooltip); - this.flowLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel7.Location = new System.Drawing.Point(0, 193); - this.flowLayoutPanel7.Margin = new System.Windows.Forms.Padding(0); - this.flowLayoutPanel7.Name = "flowLayoutPanel7"; - this.flowLayoutPanel7.Size = new System.Drawing.Size(521, 23); - this.flowLayoutPanel7.TabIndex = 20; - // - // chkUseHdPacks - // - this.chkUseHdPacks.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkUseHdPacks.AutoSize = true; - this.chkUseHdPacks.Location = new System.Drawing.Point(3, 3); - this.chkUseHdPacks.Name = "chkUseHdPacks"; - this.chkUseHdPacks.Size = new System.Drawing.Size(134, 17); - this.chkUseHdPacks.TabIndex = 19; - this.chkUseHdPacks.Text = "Use HDNes HD packs"; - this.chkUseHdPacks.UseVisualStyleBackColor = true; - // - // picHdNesTooltip - // - this.picHdNesTooltip.BackgroundImage = global::Mesen.GUI.Properties.Resources.Help; - this.picHdNesTooltip.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; - this.picHdNesTooltip.Location = new System.Drawing.Point(143, 3); - this.picHdNesTooltip.Name = "picHdNesTooltip"; - this.picHdNesTooltip.Size = new System.Drawing.Size(17, 17); - this.picHdNesTooltip.TabIndex = 21; - this.picHdNesTooltip.TabStop = false; - // - // nudScale - // - this.nudScale.DecimalPlaces = 2; - this.nudScale.Increment = new decimal(new int[] { + this.cboFullscreenResolution.Location = new System.Drawing.Point(120, 3); + this.cboFullscreenResolution.Name = "cboFullscreenResolution"; + this.cboFullscreenResolution.Size = new System.Drawing.Size(85, 21); + this.cboFullscreenResolution.TabIndex = 25; + // + // chkUseExclusiveFullscreen + // + this.chkUseExclusiveFullscreen.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkUseExclusiveFullscreen.AutoSize = true; + this.tlpMain.SetColumnSpan(this.chkUseExclusiveFullscreen, 2); + this.chkUseExclusiveFullscreen.Location = new System.Drawing.Point(3, 96); + this.chkUseExclusiveFullscreen.Name = "chkUseExclusiveFullscreen"; + this.chkUseExclusiveFullscreen.Size = new System.Drawing.Size(169, 17); + this.chkUseExclusiveFullscreen.TabIndex = 24; + this.chkUseExclusiveFullscreen.Text = "Use exclusive fullscreen mode"; + this.chkUseExclusiveFullscreen.UseVisualStyleBackColor = true; + this.chkUseExclusiveFullscreen.CheckedChanged += new System.EventHandler(this.chkUseExclusiveFullscreen_CheckedChanged); + // + // lblVideoScale + // + this.lblVideoScale.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblVideoScale.AutoSize = true; + this.lblVideoScale.Location = new System.Drawing.Point(3, 4); + this.lblVideoScale.Name = "lblVideoScale"; + this.lblVideoScale.Size = new System.Drawing.Size(37, 13); + this.lblVideoScale.TabIndex = 11; + this.lblVideoScale.Text = "Scale:"; + // + // chkVerticalSync + // + this.chkVerticalSync.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkVerticalSync.AutoSize = true; + this.tlpMain.SetColumnSpan(this.chkVerticalSync, 2); + this.chkVerticalSync.Location = new System.Drawing.Point(3, 73); + this.chkVerticalSync.Name = "chkVerticalSync"; + this.chkVerticalSync.Size = new System.Drawing.Size(121, 17); + this.chkVerticalSync.TabIndex = 15; + this.chkVerticalSync.Text = "Enable vertical sync"; + this.chkVerticalSync.UseVisualStyleBackColor = true; + // + // lblDisplayRatio + // + this.lblDisplayRatio.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblDisplayRatio.AutoSize = true; + this.lblDisplayRatio.Location = new System.Drawing.Point(3, 27); + this.lblDisplayRatio.Name = "lblDisplayRatio"; + this.lblDisplayRatio.Size = new System.Drawing.Size(71, 13); + this.lblDisplayRatio.TabIndex = 17; + this.lblDisplayRatio.Text = "Aspect Ratio:"; + // + // flowLayoutPanel7 + // + this.tlpMain.SetColumnSpan(this.flowLayoutPanel7, 2); + this.flowLayoutPanel7.Controls.Add(this.chkUseHdPacks); + this.flowLayoutPanel7.Controls.Add(this.picHdNesTooltip); + this.flowLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel7.Location = new System.Drawing.Point(0, 193); + this.flowLayoutPanel7.Margin = new System.Windows.Forms.Padding(0); + this.flowLayoutPanel7.Name = "flowLayoutPanel7"; + this.flowLayoutPanel7.Size = new System.Drawing.Size(521, 23); + this.flowLayoutPanel7.TabIndex = 20; + // + // chkUseHdPacks + // + this.chkUseHdPacks.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkUseHdPacks.AutoSize = true; + this.chkUseHdPacks.Location = new System.Drawing.Point(3, 3); + this.chkUseHdPacks.Name = "chkUseHdPacks"; + this.chkUseHdPacks.Size = new System.Drawing.Size(134, 17); + this.chkUseHdPacks.TabIndex = 19; + this.chkUseHdPacks.Text = "Use HDNes HD packs"; + this.chkUseHdPacks.UseVisualStyleBackColor = true; + // + // picHdNesTooltip + // + this.picHdNesTooltip.BackgroundImage = global::Mesen.GUI.Properties.Resources.Help; + this.picHdNesTooltip.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; + this.picHdNesTooltip.Location = new System.Drawing.Point(143, 3); + this.picHdNesTooltip.Name = "picHdNesTooltip"; + this.picHdNesTooltip.Size = new System.Drawing.Size(17, 17); + this.picHdNesTooltip.TabIndex = 21; + this.picHdNesTooltip.TabStop = false; + // + // nudScale + // + this.nudScale.DecimalPlaces = 2; + this.nudScale.Increment = new decimal(new int[] { 1, 0, 0, 0}); - this.nudScale.Location = new System.Drawing.Point(77, 0); - this.nudScale.Margin = new System.Windows.Forms.Padding(0); - this.nudScale.Maximum = new decimal(new int[] { + this.nudScale.IsHex = false; + this.nudScale.Location = new System.Drawing.Point(77, 0); + this.nudScale.Margin = new System.Windows.Forms.Padding(0); + this.nudScale.Maximum = new decimal(new int[] { 10, 0, 0, 0}); - this.nudScale.MaximumSize = new System.Drawing.Size(10000, 20); - this.nudScale.Minimum = new decimal(new int[] { + this.nudScale.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudScale.Minimum = new decimal(new int[] { 5, 0, 0, 65536}); - this.nudScale.MinimumSize = new System.Drawing.Size(0, 21); - this.nudScale.Name = "nudScale"; - this.nudScale.Size = new System.Drawing.Size(48, 21); - this.nudScale.TabIndex = 21; - this.nudScale.Value = new decimal(new int[] { + this.nudScale.MinimumSize = new System.Drawing.Size(0, 21); + this.nudScale.Name = "nudScale"; + this.nudScale.Size = new System.Drawing.Size(48, 21); + this.nudScale.TabIndex = 21; + this.nudScale.Value = new decimal(new int[] { 1, 0, 0, 0}); - // - // flowLayoutPanel6 - // - this.flowLayoutPanel6.Controls.Add(this.cboAspectRatio); - this.flowLayoutPanel6.Controls.Add(this.lblCustomRatio); - this.flowLayoutPanel6.Controls.Add(this.nudCustomRatio); - this.flowLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.flowLayoutPanel6.Location = new System.Drawing.Point(77, 21); - this.flowLayoutPanel6.Margin = new System.Windows.Forms.Padding(0); - this.flowLayoutPanel6.Name = "flowLayoutPanel6"; - this.flowLayoutPanel6.Size = new System.Drawing.Size(444, 26); - this.flowLayoutPanel6.TabIndex = 22; - // - // cboAspectRatio - // - this.cboAspectRatio.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboAspectRatio.FormattingEnabled = true; - this.cboAspectRatio.Items.AddRange(new object[] { + // + // flowLayoutPanel6 + // + this.flowLayoutPanel6.Controls.Add(this.cboAspectRatio); + this.flowLayoutPanel6.Controls.Add(this.lblCustomRatio); + this.flowLayoutPanel6.Controls.Add(this.nudCustomRatio); + this.flowLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.flowLayoutPanel6.Location = new System.Drawing.Point(77, 21); + this.flowLayoutPanel6.Margin = new System.Windows.Forms.Padding(0); + this.flowLayoutPanel6.Name = "flowLayoutPanel6"; + this.flowLayoutPanel6.Size = new System.Drawing.Size(444, 26); + this.flowLayoutPanel6.TabIndex = 22; + // + // cboAspectRatio + // + this.cboAspectRatio.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboAspectRatio.FormattingEnabled = true; + this.cboAspectRatio.Items.AddRange(new object[] { "Auto", "NTSC (8:7)", "PAL (18:13)", "Standard (4:3)", "Widescreen (16:9)"}); - this.cboAspectRatio.Location = new System.Drawing.Point(3, 3); - this.cboAspectRatio.Name = "cboAspectRatio"; - this.cboAspectRatio.Size = new System.Drawing.Size(197, 21); - this.cboAspectRatio.TabIndex = 16; - this.cboAspectRatio.SelectedIndexChanged += new System.EventHandler(this.cboAspectRatio_SelectedIndexChanged); - // - // lblCustomRatio - // - this.lblCustomRatio.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblCustomRatio.AutoSize = true; - this.lblCustomRatio.Location = new System.Drawing.Point(206, 7); - this.lblCustomRatio.Name = "lblCustomRatio"; - this.lblCustomRatio.Size = new System.Drawing.Size(76, 13); - this.lblCustomRatio.TabIndex = 17; - this.lblCustomRatio.Text = "Custom Ratio: "; - this.lblCustomRatio.Visible = false; - // - // nudCustomRatio - // - this.nudCustomRatio.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.nudCustomRatio.DecimalPlaces = 3; - this.nudCustomRatio.Increment = new decimal(new int[] { + this.cboAspectRatio.Location = new System.Drawing.Point(3, 3); + this.cboAspectRatio.Name = "cboAspectRatio"; + this.cboAspectRatio.Size = new System.Drawing.Size(197, 21); + this.cboAspectRatio.TabIndex = 16; + this.cboAspectRatio.SelectedIndexChanged += new System.EventHandler(this.cboAspectRatio_SelectedIndexChanged); + // + // lblCustomRatio + // + this.lblCustomRatio.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblCustomRatio.AutoSize = true; + this.lblCustomRatio.Location = new System.Drawing.Point(206, 7); + this.lblCustomRatio.Name = "lblCustomRatio"; + this.lblCustomRatio.Size = new System.Drawing.Size(76, 13); + this.lblCustomRatio.TabIndex = 17; + this.lblCustomRatio.Text = "Custom Ratio: "; + this.lblCustomRatio.Visible = false; + // + // nudCustomRatio + // + this.nudCustomRatio.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.nudCustomRatio.DecimalPlaces = 3; + this.nudCustomRatio.Increment = new decimal(new int[] { 1, 0, 0, 65536}); - this.nudCustomRatio.Location = new System.Drawing.Point(285, 3); - this.nudCustomRatio.Margin = new System.Windows.Forms.Padding(0); - this.nudCustomRatio.Maximum = new decimal(new int[] { + this.nudCustomRatio.IsHex = false; + this.nudCustomRatio.Location = new System.Drawing.Point(285, 3); + this.nudCustomRatio.Margin = new System.Windows.Forms.Padding(0); + this.nudCustomRatio.Maximum = new decimal(new int[] { 5, 0, 0, 0}); - this.nudCustomRatio.MaximumSize = new System.Drawing.Size(10000, 20); - this.nudCustomRatio.Minimum = new decimal(new int[] { + this.nudCustomRatio.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudCustomRatio.Minimum = new decimal(new int[] { 1, 0, 0, 65536}); - this.nudCustomRatio.MinimumSize = new System.Drawing.Size(0, 21); - this.nudCustomRatio.Name = "nudCustomRatio"; - this.nudCustomRatio.Size = new System.Drawing.Size(48, 21); - this.nudCustomRatio.TabIndex = 22; - this.nudCustomRatio.Value = new decimal(new int[] { + this.nudCustomRatio.MinimumSize = new System.Drawing.Size(0, 21); + this.nudCustomRatio.Name = "nudCustomRatio"; + this.nudCustomRatio.Size = new System.Drawing.Size(48, 21); + this.nudCustomRatio.TabIndex = 22; + this.nudCustomRatio.Value = new decimal(new int[] { 1, 0, 0, 65536}); - this.nudCustomRatio.Visible = false; - // - // chkFullscreenForceIntegerScale - // - this.chkFullscreenForceIntegerScale.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkFullscreenForceIntegerScale.AutoSize = true; - this.tlpMain.SetColumnSpan(this.chkFullscreenForceIntegerScale, 2); - this.chkFullscreenForceIntegerScale.Location = new System.Drawing.Point(3, 173); - this.chkFullscreenForceIntegerScale.Name = "chkFullscreenForceIntegerScale"; - this.chkFullscreenForceIntegerScale.Size = new System.Drawing.Size(289, 17); - this.chkFullscreenForceIntegerScale.TabIndex = 23; - this.chkFullscreenForceIntegerScale.Text = "Use integer scale values when entering fullscreen mode"; - this.chkFullscreenForceIntegerScale.UseVisualStyleBackColor = true; - // - // chkShowFps - // - this.chkShowFps.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkShowFps.AutoSize = true; - this.tlpMain.SetColumnSpan(this.chkShowFps, 2); - this.chkShowFps.Location = new System.Drawing.Point(3, 219); - this.chkShowFps.Name = "chkShowFps"; - this.chkShowFps.Size = new System.Drawing.Size(76, 17); - this.chkShowFps.TabIndex = 9; - this.chkShowFps.Text = "Show FPS"; - this.chkShowFps.UseVisualStyleBackColor = true; - // - // chkIntegerFpsMode - // - this.chkIntegerFpsMode.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkIntegerFpsMode.AutoSize = true; - this.tlpMain.SetColumnSpan(this.chkIntegerFpsMode, 2); - this.chkIntegerFpsMode.Location = new System.Drawing.Point(3, 50); - this.chkIntegerFpsMode.Name = "chkIntegerFpsMode"; - this.chkIntegerFpsMode.Size = new System.Drawing.Size(308, 17); - this.chkIntegerFpsMode.TabIndex = 24; - this.chkIntegerFpsMode.Text = "Enable integer FPS mode (e.g: run at 60 fps instead of 60.1)"; - this.chkIntegerFpsMode.UseVisualStyleBackColor = true; - // - // flpRefreshRate - // - this.tlpMain.SetColumnSpan(this.flpRefreshRate, 2); - this.flpRefreshRate.Controls.Add(this.lblRequestedRefreshRate); - this.flpRefreshRate.Controls.Add(this.cboRefreshRate); - this.flpRefreshRate.Dock = System.Windows.Forms.DockStyle.Fill; - this.flpRefreshRate.Location = new System.Drawing.Point(30, 143); - this.flpRefreshRate.Margin = new System.Windows.Forms.Padding(30, 0, 0, 0); - this.flpRefreshRate.Name = "flpRefreshRate"; - this.flpRefreshRate.Size = new System.Drawing.Size(491, 27); - this.flpRefreshRate.TabIndex = 26; - this.flpRefreshRate.Visible = false; - // - // lblRequestedRefreshRate - // - this.lblRequestedRefreshRate.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.lblRequestedRefreshRate.AutoSize = true; - this.lblRequestedRefreshRate.Location = new System.Drawing.Point(3, 7); - this.lblRequestedRefreshRate.Name = "lblRequestedRefreshRate"; - this.lblRequestedRefreshRate.Size = new System.Drawing.Size(128, 13); - this.lblRequestedRefreshRate.TabIndex = 17; - this.lblRequestedRefreshRate.Text = "Requested Refresh Rate:"; - // - // cboRefreshRate - // - this.cboRefreshRate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboRefreshRate.FormattingEnabled = true; - this.cboRefreshRate.Location = new System.Drawing.Point(137, 3); - this.cboRefreshRate.Name = "cboRefreshRate"; - this.cboRefreshRate.Size = new System.Drawing.Size(68, 21); - this.cboRefreshRate.TabIndex = 25; - // - // tabMain - // - this.tabMain.Controls.Add(this.tpgGeneral); - this.tabMain.Controls.Add(this.tpgPicture); - this.tabMain.Controls.Add(this.tpgOverscan); - this.tabMain.Controls.Add(this.tpgPalette); - this.tabMain.Controls.Add(this.tpgAdvanced); - this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabMain.Location = new System.Drawing.Point(0, 0); - this.tabMain.Name = "tabMain"; - this.tabMain.SelectedIndex = 0; - this.tabMain.Size = new System.Drawing.Size(535, 428); - this.tabMain.TabIndex = 2; - // - // tpgGeneral - // - this.tpgGeneral.Controls.Add(this.tlpMain); - this.tpgGeneral.Location = new System.Drawing.Point(4, 22); - this.tpgGeneral.Name = "tpgGeneral"; - this.tpgGeneral.Padding = new System.Windows.Forms.Padding(3); - this.tpgGeneral.Size = new System.Drawing.Size(527, 402); - this.tpgGeneral.TabIndex = 0; - this.tpgGeneral.Text = "General"; - this.tpgGeneral.UseVisualStyleBackColor = true; - // - // tpgPicture - // - this.tpgPicture.Controls.Add(this.tableLayoutPanel5); - this.tpgPicture.Location = new System.Drawing.Point(4, 22); - this.tpgPicture.Name = "tpgPicture"; - this.tpgPicture.Padding = new System.Windows.Forms.Padding(3); - this.tpgPicture.Size = new System.Drawing.Size(527, 402); - this.tpgPicture.TabIndex = 3; - this.tpgPicture.Text = "Picture"; - this.tpgPicture.UseVisualStyleBackColor = true; - // - // tableLayoutPanel5 - // - this.tableLayoutPanel5.ColumnCount = 2; - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel7, 0, 3); - this.tableLayoutPanel5.Controls.Add(this.grpNtscFilter, 1, 1); - this.tableLayoutPanel5.Controls.Add(this.grpCommon, 0, 1); - this.tableLayoutPanel5.Controls.Add(this.grpScanlines, 0, 2); - this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel8, 0, 0); - this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 3); - this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel5.Name = "tableLayoutPanel5"; - this.tableLayoutPanel5.RowCount = 4; - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel5.Size = new System.Drawing.Size(521, 396); - this.tableLayoutPanel5.TabIndex = 5; - // - // tableLayoutPanel7 - // - this.tableLayoutPanel7.ColumnCount = 2; - this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 36.92308F)); - this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 63.07692F)); - this.tableLayoutPanel7.Controls.Add(this.btnSelectPreset, 1, 0); - this.tableLayoutPanel7.Controls.Add(this.btnResetPictureSettings, 0, 0); - this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel7.Location = new System.Drawing.Point(0, 341); - this.tableLayoutPanel7.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel7.Name = "tableLayoutPanel7"; - this.tableLayoutPanel7.RowCount = 1; - this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel7.Size = new System.Drawing.Size(260, 55); - this.tableLayoutPanel7.TabIndex = 3; - // - // btnSelectPreset - // - this.btnSelectPreset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnSelectPreset.AutoSize = true; - this.btnSelectPreset.Image = global::Mesen.GUI.Properties.Resources.DownArrow; - this.btnSelectPreset.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; - this.btnSelectPreset.Location = new System.Drawing.Point(158, 29); - this.btnSelectPreset.Name = "btnSelectPreset"; - this.btnSelectPreset.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0); - this.btnSelectPreset.Size = new System.Drawing.Size(99, 23); - this.btnSelectPreset.TabIndex = 3; - this.btnSelectPreset.Text = "Select Preset..."; - this.btnSelectPreset.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; - this.btnSelectPreset.UseVisualStyleBackColor = true; - this.btnSelectPreset.Click += new System.EventHandler(this.btnSelectPreset_Click); - // - // btnResetPictureSettings - // - this.btnResetPictureSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.btnResetPictureSettings.AutoSize = true; - this.btnResetPictureSettings.Location = new System.Drawing.Point(3, 29); - this.btnResetPictureSettings.Name = "btnResetPictureSettings"; - this.btnResetPictureSettings.Size = new System.Drawing.Size(75, 23); - this.btnResetPictureSettings.TabIndex = 3; - this.btnResetPictureSettings.Text = "Reset"; - this.btnResetPictureSettings.UseVisualStyleBackColor = true; - this.btnResetPictureSettings.Click += new System.EventHandler(this.btnResetPictureSettings_Click); - // - // grpNtscFilter - // - this.grpNtscFilter.Controls.Add(this.tlpNtscFilter2); - this.grpNtscFilter.Controls.Add(this.tlpNtscFilter1); - this.grpNtscFilter.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpNtscFilter.Location = new System.Drawing.Point(262, 27); - this.grpNtscFilter.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); - this.grpNtscFilter.Name = "grpNtscFilter"; - this.tableLayoutPanel5.SetRowSpan(this.grpNtscFilter, 3); - this.grpNtscFilter.Size = new System.Drawing.Size(259, 369); - this.grpNtscFilter.TabIndex = 4; - this.grpNtscFilter.TabStop = false; - this.grpNtscFilter.Text = "NTSC Filter"; - // - // tlpNtscFilter2 - // - this.tlpNtscFilter2.ColumnCount = 1; - this.tlpNtscFilter2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpNtscFilter2.Controls.Add(this.trkYFilterLength, 0, 0); - this.tlpNtscFilter2.Controls.Add(this.trkIFilterLength, 0, 1); - this.tlpNtscFilter2.Controls.Add(this.trkQFilterLength, 0, 2); - this.tlpNtscFilter2.Dock = System.Windows.Forms.DockStyle.Top; - this.tlpNtscFilter2.Location = new System.Drawing.Point(3, 16); - this.tlpNtscFilter2.Margin = new System.Windows.Forms.Padding(0); - this.tlpNtscFilter2.Name = "tlpNtscFilter2"; - this.tlpNtscFilter2.RowCount = 7; - this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpNtscFilter2.Size = new System.Drawing.Size(253, 298); - this.tlpNtscFilter2.TabIndex = 6; - // - // trkYFilterLength - // - this.trkYFilterLength.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkYFilterLength.Location = new System.Drawing.Point(0, 0); - this.trkYFilterLength.Margin = new System.Windows.Forms.Padding(0); - this.trkYFilterLength.Maximum = 400; - this.trkYFilterLength.MaximumSize = new System.Drawing.Size(0, 60); - this.trkYFilterLength.Minimum = -50; - this.trkYFilterLength.MinimumSize = new System.Drawing.Size(206, 50); - this.trkYFilterLength.Name = "trkYFilterLength"; - this.trkYFilterLength.Size = new System.Drawing.Size(253, 50); - this.trkYFilterLength.TabIndex = 24; - this.trkYFilterLength.Text = "Y Filter (Horizontal Blur)"; - this.trkYFilterLength.Value = 0; - // - // trkIFilterLength - // - this.trkIFilterLength.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkIFilterLength.Location = new System.Drawing.Point(0, 50); - this.trkIFilterLength.Margin = new System.Windows.Forms.Padding(0); - this.trkIFilterLength.Maximum = 400; - this.trkIFilterLength.MaximumSize = new System.Drawing.Size(400, 55); - this.trkIFilterLength.Minimum = 0; - this.trkIFilterLength.MinimumSize = new System.Drawing.Size(206, 50); - this.trkIFilterLength.Name = "trkIFilterLength"; - this.trkIFilterLength.Size = new System.Drawing.Size(253, 50); - this.trkIFilterLength.TabIndex = 25; - this.trkIFilterLength.Text = "I Filter (Horizontal Bleed)"; - this.trkIFilterLength.Value = 0; - // - // trkQFilterLength - // - this.trkQFilterLength.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkQFilterLength.Location = new System.Drawing.Point(0, 100); - this.trkQFilterLength.Margin = new System.Windows.Forms.Padding(0); - this.trkQFilterLength.Maximum = 400; - this.trkQFilterLength.MaximumSize = new System.Drawing.Size(0, 41); - this.trkQFilterLength.Minimum = 0; - this.trkQFilterLength.MinimumSize = new System.Drawing.Size(206, 50); - this.trkQFilterLength.Name = "trkQFilterLength"; - this.trkQFilterLength.Size = new System.Drawing.Size(253, 50); - this.trkQFilterLength.TabIndex = 26; - this.trkQFilterLength.Text = "Q Filter (Horizontal Bleed)"; - this.trkQFilterLength.Value = 0; - // - // tlpNtscFilter1 - // - this.tlpNtscFilter1.ColumnCount = 1; - this.tlpNtscFilter1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpNtscFilter1.Controls.Add(this.trkArtifacts, 0, 0); - this.tlpNtscFilter1.Controls.Add(this.trkBleed, 0, 1); - this.tlpNtscFilter1.Controls.Add(this.trkFringing, 0, 2); - this.tlpNtscFilter1.Controls.Add(this.trkGamma, 0, 3); - this.tlpNtscFilter1.Controls.Add(this.trkResolution, 0, 4); - this.tlpNtscFilter1.Controls.Add(this.trkSharpness, 0, 5); - this.tlpNtscFilter1.Controls.Add(this.tableLayoutPanel6, 0, 6); - this.tlpNtscFilter1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tlpNtscFilter1.Location = new System.Drawing.Point(3, 16); - this.tlpNtscFilter1.Margin = new System.Windows.Forms.Padding(0); - this.tlpNtscFilter1.Name = "tlpNtscFilter1"; - this.tlpNtscFilter1.RowCount = 7; - this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpNtscFilter1.Size = new System.Drawing.Size(253, 350); - this.tlpNtscFilter1.TabIndex = 5; - // - // trkArtifacts - // - this.trkArtifacts.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkArtifacts.Location = new System.Drawing.Point(0, 0); - this.trkArtifacts.Margin = new System.Windows.Forms.Padding(0); - this.trkArtifacts.Maximum = 100; - this.trkArtifacts.MaximumSize = new System.Drawing.Size(0, 60); - this.trkArtifacts.Minimum = -100; - this.trkArtifacts.MinimumSize = new System.Drawing.Size(206, 50); - this.trkArtifacts.Name = "trkArtifacts"; - this.trkArtifacts.Size = new System.Drawing.Size(253, 50); - this.trkArtifacts.TabIndex = 24; - this.trkArtifacts.Text = "Artifacts"; - this.trkArtifacts.Value = 0; - // - // trkBleed - // - this.trkBleed.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBleed.Location = new System.Drawing.Point(0, 50); - this.trkBleed.Margin = new System.Windows.Forms.Padding(0); - this.trkBleed.Maximum = 100; - this.trkBleed.MaximumSize = new System.Drawing.Size(400, 55); - this.trkBleed.Minimum = -100; - this.trkBleed.MinimumSize = new System.Drawing.Size(206, 50); - this.trkBleed.Name = "trkBleed"; - this.trkBleed.Size = new System.Drawing.Size(253, 50); - this.trkBleed.TabIndex = 25; - this.trkBleed.Text = "Bleed"; - this.trkBleed.Value = 0; - // - // trkFringing - // - this.trkFringing.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkFringing.Location = new System.Drawing.Point(0, 100); - this.trkFringing.Margin = new System.Windows.Forms.Padding(0); - this.trkFringing.Maximum = 100; - this.trkFringing.MaximumSize = new System.Drawing.Size(0, 41); - this.trkFringing.Minimum = -100; - this.trkFringing.MinimumSize = new System.Drawing.Size(206, 50); - this.trkFringing.Name = "trkFringing"; - this.trkFringing.Size = new System.Drawing.Size(253, 50); - this.trkFringing.TabIndex = 26; - this.trkFringing.Text = "Fringing"; - this.trkFringing.Value = 0; - // - // trkGamma - // - this.trkGamma.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkGamma.Location = new System.Drawing.Point(0, 150); - this.trkGamma.Margin = new System.Windows.Forms.Padding(0); - this.trkGamma.Maximum = 100; - this.trkGamma.MaximumSize = new System.Drawing.Size(0, 41); - this.trkGamma.Minimum = -100; - this.trkGamma.MinimumSize = new System.Drawing.Size(206, 50); - this.trkGamma.Name = "trkGamma"; - this.trkGamma.Size = new System.Drawing.Size(253, 50); - this.trkGamma.TabIndex = 27; - this.trkGamma.Text = "Gamma"; - this.trkGamma.Value = 0; - // - // trkResolution - // - this.trkResolution.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkResolution.Location = new System.Drawing.Point(0, 200); - this.trkResolution.Margin = new System.Windows.Forms.Padding(0); - this.trkResolution.Maximum = 100; - this.trkResolution.MaximumSize = new System.Drawing.Size(0, 41); - this.trkResolution.Minimum = -100; - this.trkResolution.MinimumSize = new System.Drawing.Size(206, 50); - this.trkResolution.Name = "trkResolution"; - this.trkResolution.Size = new System.Drawing.Size(253, 50); - this.trkResolution.TabIndex = 28; - this.trkResolution.Text = "Resolution"; - this.trkResolution.Value = 0; - // - // trkSharpness - // - this.trkSharpness.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkSharpness.Location = new System.Drawing.Point(0, 250); - this.trkSharpness.Margin = new System.Windows.Forms.Padding(0); - this.trkSharpness.Maximum = 100; - this.trkSharpness.MaximumSize = new System.Drawing.Size(0, 41); - this.trkSharpness.Minimum = -100; - this.trkSharpness.MinimumSize = new System.Drawing.Size(206, 50); - this.trkSharpness.Name = "trkSharpness"; - this.trkSharpness.Size = new System.Drawing.Size(253, 50); - this.trkSharpness.TabIndex = 29; - this.trkSharpness.Text = "Sharpness"; - this.trkSharpness.Value = 0; - // - // tableLayoutPanel6 - // - this.tableLayoutPanel6.ColumnCount = 2; - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel6.Controls.Add(this.chkMergeFields, 0, 0); - this.tableLayoutPanel6.Controls.Add(this.chkVerticalBlend, 0, 1); - this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel6.Location = new System.Drawing.Point(0, 300); - this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel6.Name = "tableLayoutPanel6"; - this.tableLayoutPanel6.RowCount = 2; - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel6.Size = new System.Drawing.Size(253, 50); - this.tableLayoutPanel6.TabIndex = 30; - // - // chkMergeFields - // - this.chkMergeFields.AutoSize = true; - this.chkMergeFields.Location = new System.Drawing.Point(3, 3); - this.chkMergeFields.Name = "chkMergeFields"; - this.chkMergeFields.Size = new System.Drawing.Size(86, 17); - this.chkMergeFields.TabIndex = 30; - this.chkMergeFields.Text = "Merge Fields"; - this.chkMergeFields.UseVisualStyleBackColor = true; - // - // chkVerticalBlend - // - this.chkVerticalBlend.AutoSize = true; - this.chkVerticalBlend.Location = new System.Drawing.Point(3, 28); - this.chkVerticalBlend.Name = "chkVerticalBlend"; - this.chkVerticalBlend.Size = new System.Drawing.Size(134, 17); - this.chkVerticalBlend.TabIndex = 31; - this.chkVerticalBlend.Text = "Apply Vertical Blending"; - this.chkVerticalBlend.UseVisualStyleBackColor = true; - // - // grpCommon - // - this.grpCommon.Controls.Add(this.tableLayoutPanel4); - this.grpCommon.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpCommon.Location = new System.Drawing.Point(0, 27); - this.grpCommon.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0); - this.grpCommon.Name = "grpCommon"; - this.grpCommon.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.grpCommon.Size = new System.Drawing.Size(258, 242); - this.grpCommon.TabIndex = 3; - this.grpCommon.TabStop = false; - this.grpCommon.Text = "Common Settings"; - // - // tableLayoutPanel4 - // - this.tableLayoutPanel4.ColumnCount = 1; - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel4.Controls.Add(this.chkBilinearInterpolation, 0, 4); - this.tableLayoutPanel4.Controls.Add(this.trkBrightness, 0, 0); - this.tableLayoutPanel4.Controls.Add(this.trkContrast, 0, 1); - this.tableLayoutPanel4.Controls.Add(this.trkHue, 0, 2); - this.tableLayoutPanel4.Controls.Add(this.trkSaturation, 0, 3); - this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 15); - this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel4.Name = "tableLayoutPanel4"; - this.tableLayoutPanel4.RowCount = 5; - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel4.Size = new System.Drawing.Size(252, 225); - this.tableLayoutPanel4.TabIndex = 4; - // - // chkBilinearInterpolation - // - this.chkBilinearInterpolation.AutoSize = true; - this.tableLayoutPanel4.SetColumnSpan(this.chkBilinearInterpolation, 2); - this.chkBilinearInterpolation.Location = new System.Drawing.Point(3, 203); - this.chkBilinearInterpolation.Name = "chkBilinearInterpolation"; - this.chkBilinearInterpolation.Size = new System.Drawing.Size(206, 17); - this.chkBilinearInterpolation.TabIndex = 28; - this.chkBilinearInterpolation.Text = "Use bilinear interpolation when scaling"; - this.chkBilinearInterpolation.UseVisualStyleBackColor = true; - // - // trkBrightness - // - this.trkBrightness.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkBrightness.Location = new System.Drawing.Point(0, 0); - this.trkBrightness.Margin = new System.Windows.Forms.Padding(0); - this.trkBrightness.Maximum = 100; - this.trkBrightness.MaximumSize = new System.Drawing.Size(0, 60); - this.trkBrightness.Minimum = -100; - this.trkBrightness.MinimumSize = new System.Drawing.Size(206, 50); - this.trkBrightness.Name = "trkBrightness"; - this.trkBrightness.Size = new System.Drawing.Size(252, 50); - this.trkBrightness.TabIndex = 24; - this.trkBrightness.Text = "Brightness"; - this.trkBrightness.Value = 0; - // - // trkContrast - // - this.trkContrast.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkContrast.Location = new System.Drawing.Point(0, 50); - this.trkContrast.Margin = new System.Windows.Forms.Padding(0); - this.trkContrast.Maximum = 100; - this.trkContrast.MaximumSize = new System.Drawing.Size(400, 55); - this.trkContrast.Minimum = -100; - this.trkContrast.MinimumSize = new System.Drawing.Size(206, 50); - this.trkContrast.Name = "trkContrast"; - this.trkContrast.Size = new System.Drawing.Size(252, 50); - this.trkContrast.TabIndex = 25; - this.trkContrast.Text = "Contrast"; - this.trkContrast.Value = 0; - // - // trkHue - // - this.trkHue.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkHue.Location = new System.Drawing.Point(0, 100); - this.trkHue.Margin = new System.Windows.Forms.Padding(0); - this.trkHue.Maximum = 100; - this.trkHue.MaximumSize = new System.Drawing.Size(0, 41); - this.trkHue.Minimum = -100; - this.trkHue.MinimumSize = new System.Drawing.Size(206, 50); - this.trkHue.Name = "trkHue"; - this.trkHue.Size = new System.Drawing.Size(252, 50); - this.trkHue.TabIndex = 26; - this.trkHue.Text = "Hue"; - this.trkHue.Value = 0; - // - // trkSaturation - // - this.trkSaturation.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkSaturation.Location = new System.Drawing.Point(0, 150); - this.trkSaturation.Margin = new System.Windows.Forms.Padding(0); - this.trkSaturation.Maximum = 100; - this.trkSaturation.MaximumSize = new System.Drawing.Size(0, 41); - this.trkSaturation.Minimum = -100; - this.trkSaturation.MinimumSize = new System.Drawing.Size(206, 50); - this.trkSaturation.Name = "trkSaturation"; - this.trkSaturation.Size = new System.Drawing.Size(252, 50); - this.trkSaturation.TabIndex = 27; - this.trkSaturation.Text = "Saturation"; - this.trkSaturation.Value = 0; - // - // grpScanlines - // - this.grpScanlines.Controls.Add(this.trkScanlines); - this.grpScanlines.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpScanlines.Location = new System.Drawing.Point(0, 269); - this.grpScanlines.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0); - this.grpScanlines.Name = "grpScanlines"; - this.grpScanlines.Size = new System.Drawing.Size(258, 72); - this.grpScanlines.TabIndex = 5; - this.grpScanlines.TabStop = false; - this.grpScanlines.Text = "Scanlines"; - // - // trkScanlines - // - this.trkScanlines.Dock = System.Windows.Forms.DockStyle.Fill; - this.trkScanlines.Location = new System.Drawing.Point(3, 16); - this.trkScanlines.Margin = new System.Windows.Forms.Padding(0); - this.trkScanlines.Maximum = 100; - this.trkScanlines.MaximumSize = new System.Drawing.Size(0, 41); - this.trkScanlines.Minimum = 0; - this.trkScanlines.MinimumSize = new System.Drawing.Size(206, 50); - this.trkScanlines.Name = "trkScanlines"; - this.trkScanlines.Size = new System.Drawing.Size(252, 50); - this.trkScanlines.TabIndex = 28; - this.trkScanlines.Text = "Scanlines"; - this.trkScanlines.Value = 0; - // - // tableLayoutPanel8 - // - this.tableLayoutPanel8.ColumnCount = 2; - this.tableLayoutPanel5.SetColumnSpan(this.tableLayoutPanel8, 2); - this.tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel8.Controls.Add(this.cboFilter, 1, 0); - this.tableLayoutPanel8.Controls.Add(this.lblVideoFilter, 0, 0); - this.tableLayoutPanel8.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel8.Location = new System.Drawing.Point(0, 0); - this.tableLayoutPanel8.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel8.Name = "tableLayoutPanel8"; - this.tableLayoutPanel8.RowCount = 1; - this.tableLayoutPanel8.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel8.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27F)); - this.tableLayoutPanel8.Size = new System.Drawing.Size(521, 27); - this.tableLayoutPanel8.TabIndex = 6; - // - // cboFilter - // - this.cboFilter.Dock = System.Windows.Forms.DockStyle.Fill; - this.cboFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboFilter.FormattingEnabled = true; - this.cboFilter.Items.AddRange(new object[] { + this.nudCustomRatio.Visible = false; + // + // chkFullscreenForceIntegerScale + // + this.chkFullscreenForceIntegerScale.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkFullscreenForceIntegerScale.AutoSize = true; + this.tlpMain.SetColumnSpan(this.chkFullscreenForceIntegerScale, 2); + this.chkFullscreenForceIntegerScale.Location = new System.Drawing.Point(3, 173); + this.chkFullscreenForceIntegerScale.Name = "chkFullscreenForceIntegerScale"; + this.chkFullscreenForceIntegerScale.Size = new System.Drawing.Size(289, 17); + this.chkFullscreenForceIntegerScale.TabIndex = 23; + this.chkFullscreenForceIntegerScale.Text = "Use integer scale values when entering fullscreen mode"; + this.chkFullscreenForceIntegerScale.UseVisualStyleBackColor = true; + // + // chkShowFps + // + this.chkShowFps.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkShowFps.AutoSize = true; + this.tlpMain.SetColumnSpan(this.chkShowFps, 2); + this.chkShowFps.Location = new System.Drawing.Point(3, 219); + this.chkShowFps.Name = "chkShowFps"; + this.chkShowFps.Size = new System.Drawing.Size(76, 17); + this.chkShowFps.TabIndex = 9; + this.chkShowFps.Text = "Show FPS"; + this.chkShowFps.UseVisualStyleBackColor = true; + // + // chkIntegerFpsMode + // + this.chkIntegerFpsMode.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkIntegerFpsMode.AutoSize = true; + this.tlpMain.SetColumnSpan(this.chkIntegerFpsMode, 2); + this.chkIntegerFpsMode.Location = new System.Drawing.Point(3, 50); + this.chkIntegerFpsMode.Name = "chkIntegerFpsMode"; + this.chkIntegerFpsMode.Size = new System.Drawing.Size(308, 17); + this.chkIntegerFpsMode.TabIndex = 24; + this.chkIntegerFpsMode.Text = "Enable integer FPS mode (e.g: run at 60 fps instead of 60.1)"; + this.chkIntegerFpsMode.UseVisualStyleBackColor = true; + // + // flpRefreshRate + // + this.tlpMain.SetColumnSpan(this.flpRefreshRate, 2); + this.flpRefreshRate.Controls.Add(this.lblRequestedRefreshRate); + this.flpRefreshRate.Controls.Add(this.cboRefreshRate); + this.flpRefreshRate.Controls.Add(this.lblRequestedRefreshRate2); + this.flpRefreshRate.Controls.Add(this.cboRefreshRate2); + this.flpRefreshRate.Dock = System.Windows.Forms.DockStyle.Fill; + this.flpRefreshRate.Location = new System.Drawing.Point(30, 143); + this.flpRefreshRate.Margin = new System.Windows.Forms.Padding(30, 0, 0, 0); + this.flpRefreshRate.Name = "flpRefreshRate"; + this.flpRefreshRate.Size = new System.Drawing.Size(491, 27); + this.flpRefreshRate.TabIndex = 26; + this.flpRefreshRate.Visible = false; + // + // lblRequestedRefreshRate + // + this.lblRequestedRefreshRate.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblRequestedRefreshRate.AutoSize = true; + this.lblRequestedRefreshRate.Location = new System.Drawing.Point(3, 7); + this.lblRequestedRefreshRate.Name = "lblRequestedRefreshRate"; + this.lblRequestedRefreshRate.Size = new System.Drawing.Size(160, 13); + this.lblRequestedRefreshRate.TabIndex = 17; + this.lblRequestedRefreshRate.Text = "Requested Refresh Rate NTSC:"; + // + // cboRefreshRate + // + this.cboRefreshRate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboRefreshRate.FormattingEnabled = true; + this.cboRefreshRate.Location = new System.Drawing.Point(169, 3); + this.cboRefreshRate.Name = "cboRefreshRate"; + this.cboRefreshRate.Size = new System.Drawing.Size(68, 21); + this.cboRefreshRate.TabIndex = 25; + // + // lblRequestedRefreshRate2 + // + this.lblRequestedRefreshRate2.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblRequestedRefreshRate2.AutoSize = true; + this.lblRequestedRefreshRate2.Location = new System.Drawing.Point(243, 7); + this.lblRequestedRefreshRate2.Name = "lblRequestedRefreshRate2"; + this.lblRequestedRefreshRate2.Size = new System.Drawing.Size(72, 13); + this.lblRequestedRefreshRate2.TabIndex = 26; + this.lblRequestedRefreshRate2.Text = "PAL / Dendy:"; + // + // cboRefreshRate2 + // + this.cboRefreshRate2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboRefreshRate2.FormattingEnabled = true; + this.cboRefreshRate2.Location = new System.Drawing.Point(321, 3); + this.cboRefreshRate2.Name = "cboRefreshRate2"; + this.cboRefreshRate2.Size = new System.Drawing.Size(68, 21); + this.cboRefreshRate2.TabIndex = 27; + // + // tabMain + // + this.tabMain.Controls.Add(this.tpgGeneral); + this.tabMain.Controls.Add(this.tpgPicture); + this.tabMain.Controls.Add(this.tpgOverscan); + this.tabMain.Controls.Add(this.tpgPalette); + this.tabMain.Controls.Add(this.tpgAdvanced); + this.tabMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabMain.Location = new System.Drawing.Point(0, 0); + this.tabMain.Name = "tabMain"; + this.tabMain.SelectedIndex = 0; + this.tabMain.Size = new System.Drawing.Size(535, 428); + this.tabMain.TabIndex = 2; + // + // tpgGeneral + // + this.tpgGeneral.Controls.Add(this.tlpMain); + this.tpgGeneral.Location = new System.Drawing.Point(4, 22); + this.tpgGeneral.Name = "tpgGeneral"; + this.tpgGeneral.Padding = new System.Windows.Forms.Padding(3); + this.tpgGeneral.Size = new System.Drawing.Size(527, 402); + this.tpgGeneral.TabIndex = 0; + this.tpgGeneral.Text = "General"; + this.tpgGeneral.UseVisualStyleBackColor = true; + // + // tpgPicture + // + this.tpgPicture.Controls.Add(this.tableLayoutPanel5); + this.tpgPicture.Location = new System.Drawing.Point(4, 22); + this.tpgPicture.Name = "tpgPicture"; + this.tpgPicture.Padding = new System.Windows.Forms.Padding(3); + this.tpgPicture.Size = new System.Drawing.Size(527, 402); + this.tpgPicture.TabIndex = 3; + this.tpgPicture.Text = "Picture"; + this.tpgPicture.UseVisualStyleBackColor = true; + // + // tableLayoutPanel5 + // + this.tableLayoutPanel5.ColumnCount = 2; + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel5.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel7, 0, 3); + this.tableLayoutPanel5.Controls.Add(this.grpNtscFilter, 1, 1); + this.tableLayoutPanel5.Controls.Add(this.grpCommon, 0, 1); + this.tableLayoutPanel5.Controls.Add(this.grpScanlines, 0, 2); + this.tableLayoutPanel5.Controls.Add(this.tableLayoutPanel8, 0, 0); + this.tableLayoutPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel5.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel5.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel5.Name = "tableLayoutPanel5"; + this.tableLayoutPanel5.RowCount = 4; + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel5.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel5.Size = new System.Drawing.Size(521, 396); + this.tableLayoutPanel5.TabIndex = 5; + // + // tableLayoutPanel7 + // + this.tableLayoutPanel7.ColumnCount = 2; + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 36.92308F)); + this.tableLayoutPanel7.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 63.07692F)); + this.tableLayoutPanel7.Controls.Add(this.btnSelectPreset, 1, 0); + this.tableLayoutPanel7.Controls.Add(this.btnResetPictureSettings, 0, 0); + this.tableLayoutPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel7.Location = new System.Drawing.Point(0, 341); + this.tableLayoutPanel7.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel7.Name = "tableLayoutPanel7"; + this.tableLayoutPanel7.RowCount = 1; + this.tableLayoutPanel7.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel7.Size = new System.Drawing.Size(260, 55); + this.tableLayoutPanel7.TabIndex = 3; + // + // btnSelectPreset + // + this.btnSelectPreset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnSelectPreset.AutoSize = true; + this.btnSelectPreset.Image = global::Mesen.GUI.Properties.Resources.DownArrow; + this.btnSelectPreset.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; + this.btnSelectPreset.Location = new System.Drawing.Point(158, 29); + this.btnSelectPreset.Name = "btnSelectPreset"; + this.btnSelectPreset.Padding = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.btnSelectPreset.Size = new System.Drawing.Size(99, 23); + this.btnSelectPreset.TabIndex = 3; + this.btnSelectPreset.Text = "Select Preset..."; + this.btnSelectPreset.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; + this.btnSelectPreset.UseVisualStyleBackColor = true; + this.btnSelectPreset.Click += new System.EventHandler(this.btnSelectPreset_Click); + // + // btnResetPictureSettings + // + this.btnResetPictureSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.btnResetPictureSettings.AutoSize = true; + this.btnResetPictureSettings.Location = new System.Drawing.Point(3, 29); + this.btnResetPictureSettings.Name = "btnResetPictureSettings"; + this.btnResetPictureSettings.Size = new System.Drawing.Size(75, 23); + this.btnResetPictureSettings.TabIndex = 3; + this.btnResetPictureSettings.Text = "Reset"; + this.btnResetPictureSettings.UseVisualStyleBackColor = true; + this.btnResetPictureSettings.Click += new System.EventHandler(this.btnResetPictureSettings_Click); + // + // grpNtscFilter + // + this.grpNtscFilter.Controls.Add(this.tlpNtscFilter2); + this.grpNtscFilter.Controls.Add(this.tlpNtscFilter1); + this.grpNtscFilter.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpNtscFilter.Location = new System.Drawing.Point(262, 27); + this.grpNtscFilter.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0); + this.grpNtscFilter.Name = "grpNtscFilter"; + this.tableLayoutPanel5.SetRowSpan(this.grpNtscFilter, 3); + this.grpNtscFilter.Size = new System.Drawing.Size(259, 369); + this.grpNtscFilter.TabIndex = 4; + this.grpNtscFilter.TabStop = false; + this.grpNtscFilter.Text = "NTSC Filter"; + // + // tlpNtscFilter2 + // + this.tlpNtscFilter2.ColumnCount = 1; + this.tlpNtscFilter2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpNtscFilter2.Controls.Add(this.trkYFilterLength, 0, 0); + this.tlpNtscFilter2.Controls.Add(this.trkIFilterLength, 0, 1); + this.tlpNtscFilter2.Controls.Add(this.trkQFilterLength, 0, 2); + this.tlpNtscFilter2.Dock = System.Windows.Forms.DockStyle.Top; + this.tlpNtscFilter2.Location = new System.Drawing.Point(3, 16); + this.tlpNtscFilter2.Margin = new System.Windows.Forms.Padding(0); + this.tlpNtscFilter2.Name = "tlpNtscFilter2"; + this.tlpNtscFilter2.RowCount = 7; + this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpNtscFilter2.Size = new System.Drawing.Size(253, 298); + this.tlpNtscFilter2.TabIndex = 6; + // + // trkYFilterLength + // + this.trkYFilterLength.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkYFilterLength.Location = new System.Drawing.Point(0, 0); + this.trkYFilterLength.Margin = new System.Windows.Forms.Padding(0); + this.trkYFilterLength.Maximum = 400; + this.trkYFilterLength.MaximumSize = new System.Drawing.Size(0, 60); + this.trkYFilterLength.Minimum = -50; + this.trkYFilterLength.MinimumSize = new System.Drawing.Size(206, 50); + this.trkYFilterLength.Name = "trkYFilterLength"; + this.trkYFilterLength.Size = new System.Drawing.Size(253, 50); + this.trkYFilterLength.TabIndex = 24; + this.trkYFilterLength.Text = "Y Filter (Horizontal Blur)"; + this.trkYFilterLength.Value = 0; + // + // trkIFilterLength + // + this.trkIFilterLength.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkIFilterLength.Location = new System.Drawing.Point(0, 50); + this.trkIFilterLength.Margin = new System.Windows.Forms.Padding(0); + this.trkIFilterLength.Maximum = 400; + this.trkIFilterLength.MaximumSize = new System.Drawing.Size(400, 55); + this.trkIFilterLength.Minimum = 0; + this.trkIFilterLength.MinimumSize = new System.Drawing.Size(206, 50); + this.trkIFilterLength.Name = "trkIFilterLength"; + this.trkIFilterLength.Size = new System.Drawing.Size(253, 50); + this.trkIFilterLength.TabIndex = 25; + this.trkIFilterLength.Text = "I Filter (Horizontal Bleed)"; + this.trkIFilterLength.Value = 0; + // + // trkQFilterLength + // + this.trkQFilterLength.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkQFilterLength.Location = new System.Drawing.Point(0, 100); + this.trkQFilterLength.Margin = new System.Windows.Forms.Padding(0); + this.trkQFilterLength.Maximum = 400; + this.trkQFilterLength.MaximumSize = new System.Drawing.Size(0, 41); + this.trkQFilterLength.Minimum = 0; + this.trkQFilterLength.MinimumSize = new System.Drawing.Size(206, 50); + this.trkQFilterLength.Name = "trkQFilterLength"; + this.trkQFilterLength.Size = new System.Drawing.Size(253, 50); + this.trkQFilterLength.TabIndex = 26; + this.trkQFilterLength.Text = "Q Filter (Horizontal Bleed)"; + this.trkQFilterLength.Value = 0; + // + // tlpNtscFilter1 + // + this.tlpNtscFilter1.ColumnCount = 1; + this.tlpNtscFilter1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpNtscFilter1.Controls.Add(this.trkArtifacts, 0, 0); + this.tlpNtscFilter1.Controls.Add(this.trkBleed, 0, 1); + this.tlpNtscFilter1.Controls.Add(this.trkFringing, 0, 2); + this.tlpNtscFilter1.Controls.Add(this.trkGamma, 0, 3); + this.tlpNtscFilter1.Controls.Add(this.trkResolution, 0, 4); + this.tlpNtscFilter1.Controls.Add(this.trkSharpness, 0, 5); + this.tlpNtscFilter1.Controls.Add(this.tableLayoutPanel6, 0, 6); + this.tlpNtscFilter1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpNtscFilter1.Location = new System.Drawing.Point(3, 16); + this.tlpNtscFilter1.Margin = new System.Windows.Forms.Padding(0); + this.tlpNtscFilter1.Name = "tlpNtscFilter1"; + this.tlpNtscFilter1.RowCount = 7; + this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tlpNtscFilter1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpNtscFilter1.Size = new System.Drawing.Size(253, 350); + this.tlpNtscFilter1.TabIndex = 5; + // + // trkArtifacts + // + this.trkArtifacts.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkArtifacts.Location = new System.Drawing.Point(0, 0); + this.trkArtifacts.Margin = new System.Windows.Forms.Padding(0); + this.trkArtifacts.Maximum = 100; + this.trkArtifacts.MaximumSize = new System.Drawing.Size(0, 60); + this.trkArtifacts.Minimum = -100; + this.trkArtifacts.MinimumSize = new System.Drawing.Size(206, 50); + this.trkArtifacts.Name = "trkArtifacts"; + this.trkArtifacts.Size = new System.Drawing.Size(253, 50); + this.trkArtifacts.TabIndex = 24; + this.trkArtifacts.Text = "Artifacts"; + this.trkArtifacts.Value = 0; + // + // trkBleed + // + this.trkBleed.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkBleed.Location = new System.Drawing.Point(0, 50); + this.trkBleed.Margin = new System.Windows.Forms.Padding(0); + this.trkBleed.Maximum = 100; + this.trkBleed.MaximumSize = new System.Drawing.Size(400, 55); + this.trkBleed.Minimum = -100; + this.trkBleed.MinimumSize = new System.Drawing.Size(206, 50); + this.trkBleed.Name = "trkBleed"; + this.trkBleed.Size = new System.Drawing.Size(253, 50); + this.trkBleed.TabIndex = 25; + this.trkBleed.Text = "Bleed"; + this.trkBleed.Value = 0; + // + // trkFringing + // + this.trkFringing.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkFringing.Location = new System.Drawing.Point(0, 100); + this.trkFringing.Margin = new System.Windows.Forms.Padding(0); + this.trkFringing.Maximum = 100; + this.trkFringing.MaximumSize = new System.Drawing.Size(0, 41); + this.trkFringing.Minimum = -100; + this.trkFringing.MinimumSize = new System.Drawing.Size(206, 50); + this.trkFringing.Name = "trkFringing"; + this.trkFringing.Size = new System.Drawing.Size(253, 50); + this.trkFringing.TabIndex = 26; + this.trkFringing.Text = "Fringing"; + this.trkFringing.Value = 0; + // + // trkGamma + // + this.trkGamma.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkGamma.Location = new System.Drawing.Point(0, 150); + this.trkGamma.Margin = new System.Windows.Forms.Padding(0); + this.trkGamma.Maximum = 100; + this.trkGamma.MaximumSize = new System.Drawing.Size(0, 41); + this.trkGamma.Minimum = -100; + this.trkGamma.MinimumSize = new System.Drawing.Size(206, 50); + this.trkGamma.Name = "trkGamma"; + this.trkGamma.Size = new System.Drawing.Size(253, 50); + this.trkGamma.TabIndex = 27; + this.trkGamma.Text = "Gamma"; + this.trkGamma.Value = 0; + // + // trkResolution + // + this.trkResolution.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkResolution.Location = new System.Drawing.Point(0, 200); + this.trkResolution.Margin = new System.Windows.Forms.Padding(0); + this.trkResolution.Maximum = 100; + this.trkResolution.MaximumSize = new System.Drawing.Size(0, 41); + this.trkResolution.Minimum = -100; + this.trkResolution.MinimumSize = new System.Drawing.Size(206, 50); + this.trkResolution.Name = "trkResolution"; + this.trkResolution.Size = new System.Drawing.Size(253, 50); + this.trkResolution.TabIndex = 28; + this.trkResolution.Text = "Resolution"; + this.trkResolution.Value = 0; + // + // trkSharpness + // + this.trkSharpness.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkSharpness.Location = new System.Drawing.Point(0, 250); + this.trkSharpness.Margin = new System.Windows.Forms.Padding(0); + this.trkSharpness.Maximum = 100; + this.trkSharpness.MaximumSize = new System.Drawing.Size(0, 41); + this.trkSharpness.Minimum = -100; + this.trkSharpness.MinimumSize = new System.Drawing.Size(206, 50); + this.trkSharpness.Name = "trkSharpness"; + this.trkSharpness.Size = new System.Drawing.Size(253, 50); + this.trkSharpness.TabIndex = 29; + this.trkSharpness.Text = "Sharpness"; + this.trkSharpness.Value = 0; + // + // tableLayoutPanel6 + // + this.tableLayoutPanel6.ColumnCount = 2; + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel6.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel6.Controls.Add(this.chkMergeFields, 0, 0); + this.tableLayoutPanel6.Controls.Add(this.chkVerticalBlend, 0, 1); + this.tableLayoutPanel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel6.Location = new System.Drawing.Point(0, 300); + this.tableLayoutPanel6.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel6.Name = "tableLayoutPanel6"; + this.tableLayoutPanel6.RowCount = 2; + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel6.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel6.Size = new System.Drawing.Size(253, 50); + this.tableLayoutPanel6.TabIndex = 30; + // + // chkMergeFields + // + this.chkMergeFields.AutoSize = true; + this.chkMergeFields.Location = new System.Drawing.Point(3, 3); + this.chkMergeFields.Name = "chkMergeFields"; + this.chkMergeFields.Size = new System.Drawing.Size(86, 17); + this.chkMergeFields.TabIndex = 30; + this.chkMergeFields.Text = "Merge Fields"; + this.chkMergeFields.UseVisualStyleBackColor = true; + // + // chkVerticalBlend + // + this.chkVerticalBlend.AutoSize = true; + this.chkVerticalBlend.Location = new System.Drawing.Point(3, 28); + this.chkVerticalBlend.Name = "chkVerticalBlend"; + this.chkVerticalBlend.Size = new System.Drawing.Size(134, 17); + this.chkVerticalBlend.TabIndex = 31; + this.chkVerticalBlend.Text = "Apply Vertical Blending"; + this.chkVerticalBlend.UseVisualStyleBackColor = true; + // + // grpCommon + // + this.grpCommon.Controls.Add(this.tableLayoutPanel4); + this.grpCommon.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpCommon.Location = new System.Drawing.Point(0, 27); + this.grpCommon.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0); + this.grpCommon.Name = "grpCommon"; + this.grpCommon.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.grpCommon.Size = new System.Drawing.Size(258, 242); + this.grpCommon.TabIndex = 3; + this.grpCommon.TabStop = false; + this.grpCommon.Text = "Common Settings"; + // + // tableLayoutPanel4 + // + this.tableLayoutPanel4.ColumnCount = 1; + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel4.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel4.Controls.Add(this.chkBilinearInterpolation, 0, 4); + this.tableLayoutPanel4.Controls.Add(this.trkBrightness, 0, 0); + this.tableLayoutPanel4.Controls.Add(this.trkContrast, 0, 1); + this.tableLayoutPanel4.Controls.Add(this.trkHue, 0, 2); + this.tableLayoutPanel4.Controls.Add(this.trkSaturation, 0, 3); + this.tableLayoutPanel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel4.Location = new System.Drawing.Point(3, 15); + this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel4.Name = "tableLayoutPanel4"; + this.tableLayoutPanel4.RowCount = 5; + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel4.Size = new System.Drawing.Size(252, 225); + this.tableLayoutPanel4.TabIndex = 4; + // + // chkBilinearInterpolation + // + this.chkBilinearInterpolation.AutoSize = true; + this.tableLayoutPanel4.SetColumnSpan(this.chkBilinearInterpolation, 2); + this.chkBilinearInterpolation.Location = new System.Drawing.Point(3, 203); + this.chkBilinearInterpolation.Name = "chkBilinearInterpolation"; + this.chkBilinearInterpolation.Size = new System.Drawing.Size(206, 17); + this.chkBilinearInterpolation.TabIndex = 28; + this.chkBilinearInterpolation.Text = "Use bilinear interpolation when scaling"; + this.chkBilinearInterpolation.UseVisualStyleBackColor = true; + // + // trkBrightness + // + this.trkBrightness.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkBrightness.Location = new System.Drawing.Point(0, 0); + this.trkBrightness.Margin = new System.Windows.Forms.Padding(0); + this.trkBrightness.Maximum = 100; + this.trkBrightness.MaximumSize = new System.Drawing.Size(0, 60); + this.trkBrightness.Minimum = -100; + this.trkBrightness.MinimumSize = new System.Drawing.Size(206, 50); + this.trkBrightness.Name = "trkBrightness"; + this.trkBrightness.Size = new System.Drawing.Size(252, 50); + this.trkBrightness.TabIndex = 24; + this.trkBrightness.Text = "Brightness"; + this.trkBrightness.Value = 0; + // + // trkContrast + // + this.trkContrast.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkContrast.Location = new System.Drawing.Point(0, 50); + this.trkContrast.Margin = new System.Windows.Forms.Padding(0); + this.trkContrast.Maximum = 100; + this.trkContrast.MaximumSize = new System.Drawing.Size(400, 55); + this.trkContrast.Minimum = -100; + this.trkContrast.MinimumSize = new System.Drawing.Size(206, 50); + this.trkContrast.Name = "trkContrast"; + this.trkContrast.Size = new System.Drawing.Size(252, 50); + this.trkContrast.TabIndex = 25; + this.trkContrast.Text = "Contrast"; + this.trkContrast.Value = 0; + // + // trkHue + // + this.trkHue.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkHue.Location = new System.Drawing.Point(0, 100); + this.trkHue.Margin = new System.Windows.Forms.Padding(0); + this.trkHue.Maximum = 100; + this.trkHue.MaximumSize = new System.Drawing.Size(0, 41); + this.trkHue.Minimum = -100; + this.trkHue.MinimumSize = new System.Drawing.Size(206, 50); + this.trkHue.Name = "trkHue"; + this.trkHue.Size = new System.Drawing.Size(252, 50); + this.trkHue.TabIndex = 26; + this.trkHue.Text = "Hue"; + this.trkHue.Value = 0; + // + // trkSaturation + // + this.trkSaturation.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkSaturation.Location = new System.Drawing.Point(0, 150); + this.trkSaturation.Margin = new System.Windows.Forms.Padding(0); + this.trkSaturation.Maximum = 100; + this.trkSaturation.MaximumSize = new System.Drawing.Size(0, 41); + this.trkSaturation.Minimum = -100; + this.trkSaturation.MinimumSize = new System.Drawing.Size(206, 50); + this.trkSaturation.Name = "trkSaturation"; + this.trkSaturation.Size = new System.Drawing.Size(252, 50); + this.trkSaturation.TabIndex = 27; + this.trkSaturation.Text = "Saturation"; + this.trkSaturation.Value = 0; + // + // grpScanlines + // + this.grpScanlines.Controls.Add(this.trkScanlines); + this.grpScanlines.Dock = System.Windows.Forms.DockStyle.Fill; + this.grpScanlines.Location = new System.Drawing.Point(0, 269); + this.grpScanlines.Margin = new System.Windows.Forms.Padding(0, 0, 2, 0); + this.grpScanlines.Name = "grpScanlines"; + this.grpScanlines.Size = new System.Drawing.Size(258, 72); + this.grpScanlines.TabIndex = 5; + this.grpScanlines.TabStop = false; + this.grpScanlines.Text = "Scanlines"; + // + // trkScanlines + // + this.trkScanlines.Dock = System.Windows.Forms.DockStyle.Fill; + this.trkScanlines.Location = new System.Drawing.Point(3, 16); + this.trkScanlines.Margin = new System.Windows.Forms.Padding(0); + this.trkScanlines.Maximum = 100; + this.trkScanlines.MaximumSize = new System.Drawing.Size(0, 41); + this.trkScanlines.Minimum = 0; + this.trkScanlines.MinimumSize = new System.Drawing.Size(206, 50); + this.trkScanlines.Name = "trkScanlines"; + this.trkScanlines.Size = new System.Drawing.Size(252, 50); + this.trkScanlines.TabIndex = 28; + this.trkScanlines.Text = "Scanlines"; + this.trkScanlines.Value = 0; + // + // tableLayoutPanel8 + // + this.tableLayoutPanel8.ColumnCount = 2; + this.tableLayoutPanel5.SetColumnSpan(this.tableLayoutPanel8, 2); + this.tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel8.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel8.Controls.Add(this.cboFilter, 1, 0); + this.tableLayoutPanel8.Controls.Add(this.lblVideoFilter, 0, 0); + this.tableLayoutPanel8.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel8.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel8.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel8.Name = "tableLayoutPanel8"; + this.tableLayoutPanel8.RowCount = 1; + this.tableLayoutPanel8.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel8.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 27F)); + this.tableLayoutPanel8.Size = new System.Drawing.Size(521, 27); + this.tableLayoutPanel8.TabIndex = 6; + // + // cboFilter + // + this.cboFilter.Dock = System.Windows.Forms.DockStyle.Fill; + this.cboFilter.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboFilter.FormattingEnabled = true; + this.cboFilter.Items.AddRange(new object[] { "None", "NTSC"}); - this.cboFilter.Location = new System.Drawing.Point(41, 3); - this.cboFilter.Name = "cboFilter"; - this.cboFilter.Size = new System.Drawing.Size(477, 21); - this.cboFilter.TabIndex = 15; - // - // lblVideoFilter - // - this.lblVideoFilter.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblVideoFilter.AutoSize = true; - this.lblVideoFilter.Location = new System.Drawing.Point(3, 7); - this.lblVideoFilter.Name = "lblVideoFilter"; - this.lblVideoFilter.Size = new System.Drawing.Size(32, 13); - this.lblVideoFilter.TabIndex = 13; - this.lblVideoFilter.Text = "Filter:"; - // - // tpgOverscan - // - this.tpgOverscan.Controls.Add(this.tabOverscan); - this.tpgOverscan.Location = new System.Drawing.Point(4, 22); - this.tpgOverscan.Name = "tpgOverscan"; - this.tpgOverscan.Padding = new System.Windows.Forms.Padding(3); - this.tpgOverscan.Size = new System.Drawing.Size(527, 402); - this.tpgOverscan.TabIndex = 1; - this.tpgOverscan.Text = "Overscan"; - this.tpgOverscan.UseVisualStyleBackColor = true; - // - // tabOverscan - // - this.tabOverscan.Controls.Add(this.tpgOverscanGlobal); - this.tabOverscan.Controls.Add(this.tpgOverscanGameSpecific); - this.tabOverscan.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabOverscan.ImageList = this.imageList; - this.tabOverscan.Location = new System.Drawing.Point(3, 3); - this.tabOverscan.Name = "tabOverscan"; - this.tabOverscan.SelectedIndex = 0; - this.tabOverscan.Size = new System.Drawing.Size(521, 396); - this.tabOverscan.TabIndex = 1; - // - // tpgOverscanGlobal - // - this.tpgOverscanGlobal.Controls.Add(this.tableLayoutPanel1); - this.tpgOverscanGlobal.Location = new System.Drawing.Point(4, 23); - this.tpgOverscanGlobal.Name = "tpgOverscanGlobal"; - this.tpgOverscanGlobal.Padding = new System.Windows.Forms.Padding(3); - this.tpgOverscanGlobal.Size = new System.Drawing.Size(513, 369); - this.tpgOverscanGlobal.TabIndex = 0; - this.tpgOverscanGlobal.Text = "Global"; - this.tpgOverscanGlobal.UseVisualStyleBackColor = true; - // - // tableLayoutPanel1 - // - this.tableLayoutPanel1.ColumnCount = 3; - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 262F)); - this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.Controls.Add(this.picOverscan, 1, 1); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel11, 1, 0); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel12, 1, 2); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel13, 2, 1); - this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel14, 0, 1); - this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3); - this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 3; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 246F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(507, 363); - this.tableLayoutPanel1.TabIndex = 0; - // - // picOverscan - // - this.picOverscan.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picOverscan.Dock = System.Windows.Forms.DockStyle.Fill; - this.picOverscan.Location = new System.Drawing.Point(125, 61); - this.picOverscan.Name = "picOverscan"; - this.picOverscan.Size = new System.Drawing.Size(256, 240); - this.picOverscan.TabIndex = 1; - this.picOverscan.TabStop = false; - // - // tableLayoutPanel11 - // - this.tableLayoutPanel11.ColumnCount = 1; - this.tableLayoutPanel11.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel11.Controls.Add(this.nudOverscanTop, 0, 1); - this.tableLayoutPanel11.Controls.Add(this.lblTop, 0, 0); - this.tableLayoutPanel11.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel11.Location = new System.Drawing.Point(122, 0); - this.tableLayoutPanel11.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel11.Name = "tableLayoutPanel11"; - this.tableLayoutPanel11.RowCount = 2; - this.tableLayoutPanel11.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel11.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel11.Size = new System.Drawing.Size(262, 58); - this.tableLayoutPanel11.TabIndex = 4; - // - // nudOverscanTop - // - this.nudOverscanTop.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.nudOverscanTop.DecimalPlaces = 0; - this.nudOverscanTop.Increment = new decimal(new int[] { + this.cboFilter.Location = new System.Drawing.Point(41, 3); + this.cboFilter.Name = "cboFilter"; + this.cboFilter.Size = new System.Drawing.Size(477, 21); + this.cboFilter.TabIndex = 15; + // + // lblVideoFilter + // + this.lblVideoFilter.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblVideoFilter.AutoSize = true; + this.lblVideoFilter.Location = new System.Drawing.Point(3, 7); + this.lblVideoFilter.Name = "lblVideoFilter"; + this.lblVideoFilter.Size = new System.Drawing.Size(32, 13); + this.lblVideoFilter.TabIndex = 13; + this.lblVideoFilter.Text = "Filter:"; + // + // tpgOverscan + // + this.tpgOverscan.Controls.Add(this.tabOverscan); + this.tpgOverscan.Location = new System.Drawing.Point(4, 22); + this.tpgOverscan.Name = "tpgOverscan"; + this.tpgOverscan.Padding = new System.Windows.Forms.Padding(3); + this.tpgOverscan.Size = new System.Drawing.Size(527, 402); + this.tpgOverscan.TabIndex = 1; + this.tpgOverscan.Text = "Overscan"; + this.tpgOverscan.UseVisualStyleBackColor = true; + // + // tabOverscan + // + this.tabOverscan.Controls.Add(this.tpgOverscanGlobal); + this.tabOverscan.Controls.Add(this.tpgOverscanGameSpecific); + this.tabOverscan.Dock = System.Windows.Forms.DockStyle.Fill; + this.tabOverscan.ImageList = this.imageList; + this.tabOverscan.Location = new System.Drawing.Point(3, 3); + this.tabOverscan.Name = "tabOverscan"; + this.tabOverscan.SelectedIndex = 0; + this.tabOverscan.Size = new System.Drawing.Size(521, 396); + this.tabOverscan.TabIndex = 1; + // + // tpgOverscanGlobal + // + this.tpgOverscanGlobal.Controls.Add(this.tableLayoutPanel1); + this.tpgOverscanGlobal.Location = new System.Drawing.Point(4, 23); + this.tpgOverscanGlobal.Name = "tpgOverscanGlobal"; + this.tpgOverscanGlobal.Padding = new System.Windows.Forms.Padding(3); + this.tpgOverscanGlobal.Size = new System.Drawing.Size(513, 369); + this.tpgOverscanGlobal.TabIndex = 0; + this.tpgOverscanGlobal.Text = "Global"; + this.tpgOverscanGlobal.UseVisualStyleBackColor = true; + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 3; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 262F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.picOverscan, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel11, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel12, 1, 2); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel13, 2, 1); + this.tableLayoutPanel1.Controls.Add(this.tableLayoutPanel14, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 3; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 246F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(507, 363); + this.tableLayoutPanel1.TabIndex = 0; + // + // picOverscan + // + this.picOverscan.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.picOverscan.Dock = System.Windows.Forms.DockStyle.Fill; + this.picOverscan.Location = new System.Drawing.Point(125, 61); + this.picOverscan.Name = "picOverscan"; + this.picOverscan.Size = new System.Drawing.Size(256, 240); + this.picOverscan.TabIndex = 1; + this.picOverscan.TabStop = false; + // + // tableLayoutPanel11 + // + this.tableLayoutPanel11.ColumnCount = 1; + this.tableLayoutPanel11.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel11.Controls.Add(this.nudOverscanTop, 0, 1); + this.tableLayoutPanel11.Controls.Add(this.lblTop, 0, 0); + this.tableLayoutPanel11.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel11.Location = new System.Drawing.Point(122, 0); + this.tableLayoutPanel11.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel11.Name = "tableLayoutPanel11"; + this.tableLayoutPanel11.RowCount = 2; + this.tableLayoutPanel11.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel11.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel11.Size = new System.Drawing.Size(262, 58); + this.tableLayoutPanel11.TabIndex = 4; + // + // nudOverscanTop + // + this.nudOverscanTop.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.nudOverscanTop.DecimalPlaces = 0; + this.nudOverscanTop.Increment = new decimal(new int[] { 1, 0, 0, 0}); - this.nudOverscanTop.Location = new System.Drawing.Point(110, 37); - this.nudOverscanTop.Margin = new System.Windows.Forms.Padding(0); - this.nudOverscanTop.Maximum = new decimal(new int[] { + this.nudOverscanTop.IsHex = false; + this.nudOverscanTop.Location = new System.Drawing.Point(110, 37); + this.nudOverscanTop.Margin = new System.Windows.Forms.Padding(0); + this.nudOverscanTop.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudOverscanTop.MaximumSize = new System.Drawing.Size(10000, 20); - this.nudOverscanTop.Minimum = new decimal(new int[] { + this.nudOverscanTop.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudOverscanTop.Minimum = new decimal(new int[] { 0, 0, 0, 0}); - this.nudOverscanTop.MinimumSize = new System.Drawing.Size(0, 21); - this.nudOverscanTop.Name = "nudOverscanTop"; - this.nudOverscanTop.Size = new System.Drawing.Size(41, 21); - this.nudOverscanTop.TabIndex = 2; - this.nudOverscanTop.Value = new decimal(new int[] { + this.nudOverscanTop.MinimumSize = new System.Drawing.Size(0, 21); + this.nudOverscanTop.Name = "nudOverscanTop"; + this.nudOverscanTop.Size = new System.Drawing.Size(41, 21); + this.nudOverscanTop.TabIndex = 2; + this.nudOverscanTop.Value = new decimal(new int[] { 0, 0, 0, 0}); - this.nudOverscanTop.ValueChanged += new System.EventHandler(this.nudOverscan_ValueChanged); - // - // lblTop - // - this.lblTop.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.lblTop.AutoSize = true; - this.lblTop.Location = new System.Drawing.Point(118, 24); - this.lblTop.Name = "lblTop"; - this.lblTop.Size = new System.Drawing.Size(26, 13); - this.lblTop.TabIndex = 0; - this.lblTop.Text = "Top"; - this.lblTop.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // tableLayoutPanel12 - // - this.tableLayoutPanel12.ColumnCount = 1; - this.tableLayoutPanel12.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel12.Controls.Add(this.nudOverscanBottom, 0, 1); - this.tableLayoutPanel12.Controls.Add(this.lblBottom, 0, 0); - this.tableLayoutPanel12.Location = new System.Drawing.Point(122, 304); - this.tableLayoutPanel12.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel12.Name = "tableLayoutPanel12"; - this.tableLayoutPanel12.RowCount = 2; - this.tableLayoutPanel12.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel12.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel12.Size = new System.Drawing.Size(262, 58); - this.tableLayoutPanel12.TabIndex = 5; - // - // nudOverscanBottom - // - this.nudOverscanBottom.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.nudOverscanBottom.DecimalPlaces = 0; - this.nudOverscanBottom.Increment = new decimal(new int[] { + this.nudOverscanTop.ValueChanged += new System.EventHandler(this.nudOverscan_ValueChanged); + // + // lblTop + // + this.lblTop.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.lblTop.AutoSize = true; + this.lblTop.Location = new System.Drawing.Point(118, 24); + this.lblTop.Name = "lblTop"; + this.lblTop.Size = new System.Drawing.Size(26, 13); + this.lblTop.TabIndex = 0; + this.lblTop.Text = "Top"; + this.lblTop.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // tableLayoutPanel12 + // + this.tableLayoutPanel12.ColumnCount = 1; + this.tableLayoutPanel12.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel12.Controls.Add(this.nudOverscanBottom, 0, 1); + this.tableLayoutPanel12.Controls.Add(this.lblBottom, 0, 0); + this.tableLayoutPanel12.Location = new System.Drawing.Point(122, 304); + this.tableLayoutPanel12.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel12.Name = "tableLayoutPanel12"; + this.tableLayoutPanel12.RowCount = 2; + this.tableLayoutPanel12.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel12.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel12.Size = new System.Drawing.Size(262, 58); + this.tableLayoutPanel12.TabIndex = 5; + // + // nudOverscanBottom + // + this.nudOverscanBottom.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.nudOverscanBottom.DecimalPlaces = 0; + this.nudOverscanBottom.Increment = new decimal(new int[] { 1, 0, 0, 0}); - this.nudOverscanBottom.Location = new System.Drawing.Point(110, 13); - this.nudOverscanBottom.Margin = new System.Windows.Forms.Padding(0); - this.nudOverscanBottom.Maximum = new decimal(new int[] { + this.nudOverscanBottom.IsHex = false; + this.nudOverscanBottom.Location = new System.Drawing.Point(110, 13); + this.nudOverscanBottom.Margin = new System.Windows.Forms.Padding(0); + this.nudOverscanBottom.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudOverscanBottom.MaximumSize = new System.Drawing.Size(10000, 20); - this.nudOverscanBottom.Minimum = new decimal(new int[] { + this.nudOverscanBottom.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudOverscanBottom.Minimum = new decimal(new int[] { 0, 0, 0, 0}); - this.nudOverscanBottom.MinimumSize = new System.Drawing.Size(0, 21); - this.nudOverscanBottom.Name = "nudOverscanBottom"; - this.nudOverscanBottom.Size = new System.Drawing.Size(41, 21); - this.nudOverscanBottom.TabIndex = 2; - this.nudOverscanBottom.Value = new decimal(new int[] { + this.nudOverscanBottom.MinimumSize = new System.Drawing.Size(0, 21); + this.nudOverscanBottom.Name = "nudOverscanBottom"; + this.nudOverscanBottom.Size = new System.Drawing.Size(41, 21); + this.nudOverscanBottom.TabIndex = 2; + this.nudOverscanBottom.Value = new decimal(new int[] { 0, 0, 0, 0}); - this.nudOverscanBottom.ValueChanged += new System.EventHandler(this.nudOverscan_ValueChanged); - // - // lblBottom - // - this.lblBottom.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.lblBottom.AutoSize = true; - this.lblBottom.Location = new System.Drawing.Point(111, 0); - this.lblBottom.Name = "lblBottom"; - this.lblBottom.Size = new System.Drawing.Size(40, 13); - this.lblBottom.TabIndex = 0; - this.lblBottom.Text = "Bottom"; - this.lblBottom.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // tableLayoutPanel13 - // - this.tableLayoutPanel13.ColumnCount = 2; - this.tableLayoutPanel13.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel13.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel13.Controls.Add(this.nudOverscanRight, 0, 2); - this.tableLayoutPanel13.Controls.Add(this.lblRight, 0, 1); - this.tableLayoutPanel13.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel13.Location = new System.Drawing.Point(384, 58); - this.tableLayoutPanel13.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel13.Name = "tableLayoutPanel13"; - this.tableLayoutPanel13.RowCount = 4; - this.tableLayoutPanel13.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel13.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel13.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel13.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel13.Size = new System.Drawing.Size(123, 246); - this.tableLayoutPanel13.TabIndex = 6; - // - // nudOverscanRight - // - this.nudOverscanRight.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.nudOverscanRight.DecimalPlaces = 0; - this.nudOverscanRight.Increment = new decimal(new int[] { + this.nudOverscanBottom.ValueChanged += new System.EventHandler(this.nudOverscan_ValueChanged); + // + // lblBottom + // + this.lblBottom.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.lblBottom.AutoSize = true; + this.lblBottom.Location = new System.Drawing.Point(111, 0); + this.lblBottom.Name = "lblBottom"; + this.lblBottom.Size = new System.Drawing.Size(40, 13); + this.lblBottom.TabIndex = 0; + this.lblBottom.Text = "Bottom"; + this.lblBottom.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // tableLayoutPanel13 + // + this.tableLayoutPanel13.ColumnCount = 2; + this.tableLayoutPanel13.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel13.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel13.Controls.Add(this.nudOverscanRight, 0, 2); + this.tableLayoutPanel13.Controls.Add(this.lblRight, 0, 1); + this.tableLayoutPanel13.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel13.Location = new System.Drawing.Point(384, 58); + this.tableLayoutPanel13.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel13.Name = "tableLayoutPanel13"; + this.tableLayoutPanel13.RowCount = 4; + this.tableLayoutPanel13.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel13.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel13.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel13.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel13.Size = new System.Drawing.Size(123, 246); + this.tableLayoutPanel13.TabIndex = 6; + // + // nudOverscanRight + // + this.nudOverscanRight.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.nudOverscanRight.DecimalPlaces = 0; + this.nudOverscanRight.Increment = new decimal(new int[] { 1, 0, 0, 0}); - this.nudOverscanRight.Location = new System.Drawing.Point(0, 119); - this.nudOverscanRight.Margin = new System.Windows.Forms.Padding(0); - this.nudOverscanRight.Maximum = new decimal(new int[] { + this.nudOverscanRight.IsHex = false; + this.nudOverscanRight.Location = new System.Drawing.Point(0, 119); + this.nudOverscanRight.Margin = new System.Windows.Forms.Padding(0); + this.nudOverscanRight.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudOverscanRight.MaximumSize = new System.Drawing.Size(10000, 20); - this.nudOverscanRight.Minimum = new decimal(new int[] { + this.nudOverscanRight.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudOverscanRight.Minimum = new decimal(new int[] { 0, 0, 0, 0}); - this.nudOverscanRight.MinimumSize = new System.Drawing.Size(0, 21); - this.nudOverscanRight.Name = "nudOverscanRight"; - this.nudOverscanRight.Size = new System.Drawing.Size(41, 21); - this.nudOverscanRight.TabIndex = 1; - this.nudOverscanRight.Value = new decimal(new int[] { + this.nudOverscanRight.MinimumSize = new System.Drawing.Size(0, 21); + this.nudOverscanRight.Name = "nudOverscanRight"; + this.nudOverscanRight.Size = new System.Drawing.Size(41, 21); + this.nudOverscanRight.TabIndex = 1; + this.nudOverscanRight.Value = new decimal(new int[] { 0, 0, 0, 0}); - this.nudOverscanRight.ValueChanged += new System.EventHandler(this.nudOverscan_ValueChanged); - // - // lblRight - // - this.lblRight.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.lblRight.AutoSize = true; - this.lblRight.Location = new System.Drawing.Point(4, 106); - this.lblRight.Name = "lblRight"; - this.lblRight.Size = new System.Drawing.Size(32, 13); - this.lblRight.TabIndex = 0; - this.lblRight.Text = "Right"; - this.lblRight.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // tableLayoutPanel14 - // - this.tableLayoutPanel14.ColumnCount = 2; - this.tableLayoutPanel14.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel14.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel14.Controls.Add(this.nudOverscanLeft, 1, 2); - this.tableLayoutPanel14.Controls.Add(this.lblLeft, 1, 1); - this.tableLayoutPanel14.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel14.Location = new System.Drawing.Point(0, 58); - this.tableLayoutPanel14.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel14.Name = "tableLayoutPanel14"; - this.tableLayoutPanel14.RowCount = 4; - this.tableLayoutPanel14.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel14.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel14.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel14.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel14.Size = new System.Drawing.Size(122, 246); - this.tableLayoutPanel14.TabIndex = 7; - // - // nudOverscanLeft - // - this.nudOverscanLeft.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.nudOverscanLeft.DecimalPlaces = 0; - this.nudOverscanLeft.Increment = new decimal(new int[] { + this.nudOverscanRight.ValueChanged += new System.EventHandler(this.nudOverscan_ValueChanged); + // + // lblRight + // + this.lblRight.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.lblRight.AutoSize = true; + this.lblRight.Location = new System.Drawing.Point(4, 106); + this.lblRight.Name = "lblRight"; + this.lblRight.Size = new System.Drawing.Size(32, 13); + this.lblRight.TabIndex = 0; + this.lblRight.Text = "Right"; + this.lblRight.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // tableLayoutPanel14 + // + this.tableLayoutPanel14.ColumnCount = 2; + this.tableLayoutPanel14.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel14.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel14.Controls.Add(this.nudOverscanLeft, 1, 2); + this.tableLayoutPanel14.Controls.Add(this.lblLeft, 1, 1); + this.tableLayoutPanel14.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel14.Location = new System.Drawing.Point(0, 58); + this.tableLayoutPanel14.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel14.Name = "tableLayoutPanel14"; + this.tableLayoutPanel14.RowCount = 4; + this.tableLayoutPanel14.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel14.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel14.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel14.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel14.Size = new System.Drawing.Size(122, 246); + this.tableLayoutPanel14.TabIndex = 7; + // + // nudOverscanLeft + // + this.nudOverscanLeft.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.nudOverscanLeft.DecimalPlaces = 0; + this.nudOverscanLeft.Increment = new decimal(new int[] { 1, 0, 0, 0}); - this.nudOverscanLeft.Location = new System.Drawing.Point(81, 119); - this.nudOverscanLeft.Margin = new System.Windows.Forms.Padding(0); - this.nudOverscanLeft.Maximum = new decimal(new int[] { + this.nudOverscanLeft.IsHex = false; + this.nudOverscanLeft.Location = new System.Drawing.Point(81, 119); + this.nudOverscanLeft.Margin = new System.Windows.Forms.Padding(0); + this.nudOverscanLeft.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudOverscanLeft.MaximumSize = new System.Drawing.Size(10000, 20); - this.nudOverscanLeft.Minimum = new decimal(new int[] { + this.nudOverscanLeft.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudOverscanLeft.Minimum = new decimal(new int[] { 0, 0, 0, 0}); - this.nudOverscanLeft.MinimumSize = new System.Drawing.Size(0, 21); - this.nudOverscanLeft.Name = "nudOverscanLeft"; - this.nudOverscanLeft.Size = new System.Drawing.Size(41, 21); - this.nudOverscanLeft.TabIndex = 2; - this.nudOverscanLeft.Value = new decimal(new int[] { + this.nudOverscanLeft.MinimumSize = new System.Drawing.Size(0, 21); + this.nudOverscanLeft.Name = "nudOverscanLeft"; + this.nudOverscanLeft.Size = new System.Drawing.Size(41, 21); + this.nudOverscanLeft.TabIndex = 2; + this.nudOverscanLeft.Value = new decimal(new int[] { 0, 0, 0, 0}); - this.nudOverscanLeft.ValueChanged += new System.EventHandler(this.nudOverscan_ValueChanged); - // - // lblLeft - // - this.lblLeft.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.lblLeft.AutoSize = true; - this.lblLeft.Location = new System.Drawing.Point(89, 106); - this.lblLeft.Name = "lblLeft"; - this.lblLeft.Size = new System.Drawing.Size(25, 13); - this.lblLeft.TabIndex = 0; - this.lblLeft.Text = "Left"; - this.lblLeft.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // tpgOverscanGameSpecific - // - this.tpgOverscanGameSpecific.Controls.Add(this.groupBox1); - this.tpgOverscanGameSpecific.Location = new System.Drawing.Point(4, 23); - this.tpgOverscanGameSpecific.Name = "tpgOverscanGameSpecific"; - this.tpgOverscanGameSpecific.Padding = new System.Windows.Forms.Padding(3); - this.tpgOverscanGameSpecific.Size = new System.Drawing.Size(513, 369); - this.tpgOverscanGameSpecific.TabIndex = 1; - this.tpgOverscanGameSpecific.Text = "Game-Specific"; - this.tpgOverscanGameSpecific.UseVisualStyleBackColor = true; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.tableLayoutPanel10); - this.groupBox1.Controls.Add(this.chkEnableGameSpecificOverscan); - this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(3, 3); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 5, 3, 3); - this.groupBox1.Size = new System.Drawing.Size(507, 363); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - // - // tableLayoutPanel10 - // - this.tableLayoutPanel10.ColumnCount = 3; - this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 262F)); - this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel10.Controls.Add(this.picGameSpecificOverscan, 1, 1); - this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel15, 1, 0); - this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel16, 1, 2); - this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel17, 2, 1); - this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel18, 0, 1); - this.tableLayoutPanel10.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel10.Location = new System.Drawing.Point(3, 18); - this.tableLayoutPanel10.Name = "tableLayoutPanel10"; - this.tableLayoutPanel10.RowCount = 3; - this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 246F)); - this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel10.Size = new System.Drawing.Size(501, 342); - this.tableLayoutPanel10.TabIndex = 1; - // - // picGameSpecificOverscan - // - this.picGameSpecificOverscan.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.picGameSpecificOverscan.Dock = System.Windows.Forms.DockStyle.Fill; - this.picGameSpecificOverscan.Location = new System.Drawing.Point(122, 51); - this.picGameSpecificOverscan.Name = "picGameSpecificOverscan"; - this.picGameSpecificOverscan.Size = new System.Drawing.Size(256, 240); - this.picGameSpecificOverscan.TabIndex = 1; - this.picGameSpecificOverscan.TabStop = false; - // - // tableLayoutPanel15 - // - this.tableLayoutPanel15.ColumnCount = 1; - this.tableLayoutPanel15.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel15.Controls.Add(this.nudGameSpecificOverscanTop, 0, 1); - this.tableLayoutPanel15.Controls.Add(this.lblGameSpecificOverscanTop, 0, 0); - this.tableLayoutPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel15.Location = new System.Drawing.Point(119, 0); - this.tableLayoutPanel15.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel15.Name = "tableLayoutPanel15"; - this.tableLayoutPanel15.RowCount = 2; - this.tableLayoutPanel15.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel15.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel15.Size = new System.Drawing.Size(262, 48); - this.tableLayoutPanel15.TabIndex = 4; - // - // nudGameSpecificOverscanTop - // - this.nudGameSpecificOverscanTop.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.nudGameSpecificOverscanTop.DecimalPlaces = 0; - this.nudGameSpecificOverscanTop.Increment = new decimal(new int[] { + this.nudOverscanLeft.ValueChanged += new System.EventHandler(this.nudOverscan_ValueChanged); + // + // lblLeft + // + this.lblLeft.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.lblLeft.AutoSize = true; + this.lblLeft.Location = new System.Drawing.Point(89, 106); + this.lblLeft.Name = "lblLeft"; + this.lblLeft.Size = new System.Drawing.Size(25, 13); + this.lblLeft.TabIndex = 0; + this.lblLeft.Text = "Left"; + this.lblLeft.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // tpgOverscanGameSpecific + // + this.tpgOverscanGameSpecific.Controls.Add(this.groupBox1); + this.tpgOverscanGameSpecific.Location = new System.Drawing.Point(4, 23); + this.tpgOverscanGameSpecific.Name = "tpgOverscanGameSpecific"; + this.tpgOverscanGameSpecific.Padding = new System.Windows.Forms.Padding(3); + this.tpgOverscanGameSpecific.Size = new System.Drawing.Size(513, 369); + this.tpgOverscanGameSpecific.TabIndex = 1; + this.tpgOverscanGameSpecific.Text = "Game-Specific"; + this.tpgOverscanGameSpecific.UseVisualStyleBackColor = true; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.tableLayoutPanel10); + this.groupBox1.Controls.Add(this.chkEnableGameSpecificOverscan); + this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.groupBox1.Location = new System.Drawing.Point(3, 3); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Padding = new System.Windows.Forms.Padding(3, 5, 3, 3); + this.groupBox1.Size = new System.Drawing.Size(507, 363); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + // + // tableLayoutPanel10 + // + this.tableLayoutPanel10.ColumnCount = 3; + this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 262F)); + this.tableLayoutPanel10.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel10.Controls.Add(this.picGameSpecificOverscan, 1, 1); + this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel15, 1, 0); + this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel16, 1, 2); + this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel17, 2, 1); + this.tableLayoutPanel10.Controls.Add(this.tableLayoutPanel18, 0, 1); + this.tableLayoutPanel10.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel10.Location = new System.Drawing.Point(3, 18); + this.tableLayoutPanel10.Name = "tableLayoutPanel10"; + this.tableLayoutPanel10.RowCount = 3; + this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 246F)); + this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel10.Size = new System.Drawing.Size(501, 342); + this.tableLayoutPanel10.TabIndex = 1; + // + // picGameSpecificOverscan + // + this.picGameSpecificOverscan.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.picGameSpecificOverscan.Dock = System.Windows.Forms.DockStyle.Fill; + this.picGameSpecificOverscan.Location = new System.Drawing.Point(122, 51); + this.picGameSpecificOverscan.Name = "picGameSpecificOverscan"; + this.picGameSpecificOverscan.Size = new System.Drawing.Size(256, 240); + this.picGameSpecificOverscan.TabIndex = 1; + this.picGameSpecificOverscan.TabStop = false; + // + // tableLayoutPanel15 + // + this.tableLayoutPanel15.ColumnCount = 1; + this.tableLayoutPanel15.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel15.Controls.Add(this.nudGameSpecificOverscanTop, 0, 1); + this.tableLayoutPanel15.Controls.Add(this.lblGameSpecificOverscanTop, 0, 0); + this.tableLayoutPanel15.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel15.Location = new System.Drawing.Point(119, 0); + this.tableLayoutPanel15.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel15.Name = "tableLayoutPanel15"; + this.tableLayoutPanel15.RowCount = 2; + this.tableLayoutPanel15.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel15.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel15.Size = new System.Drawing.Size(262, 48); + this.tableLayoutPanel15.TabIndex = 4; + // + // nudGameSpecificOverscanTop + // + this.nudGameSpecificOverscanTop.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.nudGameSpecificOverscanTop.DecimalPlaces = 0; + this.nudGameSpecificOverscanTop.Increment = new decimal(new int[] { 1, 0, 0, 0}); - this.nudGameSpecificOverscanTop.Location = new System.Drawing.Point(110, 27); - this.nudGameSpecificOverscanTop.Margin = new System.Windows.Forms.Padding(0); - this.nudGameSpecificOverscanTop.Maximum = new decimal(new int[] { + this.nudGameSpecificOverscanTop.IsHex = false; + this.nudGameSpecificOverscanTop.Location = new System.Drawing.Point(110, 27); + this.nudGameSpecificOverscanTop.Margin = new System.Windows.Forms.Padding(0); + this.nudGameSpecificOverscanTop.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudGameSpecificOverscanTop.MaximumSize = new System.Drawing.Size(10000, 20); - this.nudGameSpecificOverscanTop.Minimum = new decimal(new int[] { + this.nudGameSpecificOverscanTop.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudGameSpecificOverscanTop.Minimum = new decimal(new int[] { 0, 0, 0, 0}); - this.nudGameSpecificOverscanTop.MinimumSize = new System.Drawing.Size(0, 21); - this.nudGameSpecificOverscanTop.Name = "nudGameSpecificOverscanTop"; - this.nudGameSpecificOverscanTop.Size = new System.Drawing.Size(41, 21); - this.nudGameSpecificOverscanTop.TabIndex = 2; - this.nudGameSpecificOverscanTop.Value = new decimal(new int[] { + this.nudGameSpecificOverscanTop.MinimumSize = new System.Drawing.Size(0, 21); + this.nudGameSpecificOverscanTop.Name = "nudGameSpecificOverscanTop"; + this.nudGameSpecificOverscanTop.Size = new System.Drawing.Size(41, 21); + this.nudGameSpecificOverscanTop.TabIndex = 2; + this.nudGameSpecificOverscanTop.Value = new decimal(new int[] { 0, 0, 0, 0}); - // - // lblGameSpecificOverscanTop - // - this.lblGameSpecificOverscanTop.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this.lblGameSpecificOverscanTop.AutoSize = true; - this.lblGameSpecificOverscanTop.Location = new System.Drawing.Point(118, 14); - this.lblGameSpecificOverscanTop.Name = "lblGameSpecificOverscanTop"; - this.lblGameSpecificOverscanTop.Size = new System.Drawing.Size(26, 13); - this.lblGameSpecificOverscanTop.TabIndex = 0; - this.lblGameSpecificOverscanTop.Text = "Top"; - this.lblGameSpecificOverscanTop.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // tableLayoutPanel16 - // - this.tableLayoutPanel16.ColumnCount = 1; - this.tableLayoutPanel16.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel16.Controls.Add(this.nudGameSpecificOverscanBottom, 0, 1); - this.tableLayoutPanel16.Controls.Add(this.lblGameSpecificOverscanBottom, 0, 0); - this.tableLayoutPanel16.Location = new System.Drawing.Point(119, 294); - this.tableLayoutPanel16.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel16.Name = "tableLayoutPanel16"; - this.tableLayoutPanel16.RowCount = 2; - this.tableLayoutPanel16.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel16.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel16.Size = new System.Drawing.Size(262, 48); - this.tableLayoutPanel16.TabIndex = 5; - // - // nudGameSpecificOverscanBottom - // - this.nudGameSpecificOverscanBottom.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.nudGameSpecificOverscanBottom.DecimalPlaces = 0; - this.nudGameSpecificOverscanBottom.Increment = new decimal(new int[] { + // + // lblGameSpecificOverscanTop + // + this.lblGameSpecificOverscanTop.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this.lblGameSpecificOverscanTop.AutoSize = true; + this.lblGameSpecificOverscanTop.Location = new System.Drawing.Point(118, 14); + this.lblGameSpecificOverscanTop.Name = "lblGameSpecificOverscanTop"; + this.lblGameSpecificOverscanTop.Size = new System.Drawing.Size(26, 13); + this.lblGameSpecificOverscanTop.TabIndex = 0; + this.lblGameSpecificOverscanTop.Text = "Top"; + this.lblGameSpecificOverscanTop.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // tableLayoutPanel16 + // + this.tableLayoutPanel16.ColumnCount = 1; + this.tableLayoutPanel16.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel16.Controls.Add(this.nudGameSpecificOverscanBottom, 0, 1); + this.tableLayoutPanel16.Controls.Add(this.lblGameSpecificOverscanBottom, 0, 0); + this.tableLayoutPanel16.Location = new System.Drawing.Point(119, 294); + this.tableLayoutPanel16.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel16.Name = "tableLayoutPanel16"; + this.tableLayoutPanel16.RowCount = 2; + this.tableLayoutPanel16.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel16.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel16.Size = new System.Drawing.Size(262, 48); + this.tableLayoutPanel16.TabIndex = 5; + // + // nudGameSpecificOverscanBottom + // + this.nudGameSpecificOverscanBottom.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.nudGameSpecificOverscanBottom.DecimalPlaces = 0; + this.nudGameSpecificOverscanBottom.Increment = new decimal(new int[] { 1, 0, 0, 0}); - this.nudGameSpecificOverscanBottom.Location = new System.Drawing.Point(110, 13); - this.nudGameSpecificOverscanBottom.Margin = new System.Windows.Forms.Padding(0); - this.nudGameSpecificOverscanBottom.Maximum = new decimal(new int[] { + this.nudGameSpecificOverscanBottom.IsHex = false; + this.nudGameSpecificOverscanBottom.Location = new System.Drawing.Point(110, 13); + this.nudGameSpecificOverscanBottom.Margin = new System.Windows.Forms.Padding(0); + this.nudGameSpecificOverscanBottom.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudGameSpecificOverscanBottom.MaximumSize = new System.Drawing.Size(10000, 20); - this.nudGameSpecificOverscanBottom.Minimum = new decimal(new int[] { + this.nudGameSpecificOverscanBottom.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudGameSpecificOverscanBottom.Minimum = new decimal(new int[] { 0, 0, 0, 0}); - this.nudGameSpecificOverscanBottom.MinimumSize = new System.Drawing.Size(0, 21); - this.nudGameSpecificOverscanBottom.Name = "nudGameSpecificOverscanBottom"; - this.nudGameSpecificOverscanBottom.Size = new System.Drawing.Size(41, 21); - this.nudGameSpecificOverscanBottom.TabIndex = 2; - this.nudGameSpecificOverscanBottom.Value = new decimal(new int[] { + this.nudGameSpecificOverscanBottom.MinimumSize = new System.Drawing.Size(0, 21); + this.nudGameSpecificOverscanBottom.Name = "nudGameSpecificOverscanBottom"; + this.nudGameSpecificOverscanBottom.Size = new System.Drawing.Size(41, 21); + this.nudGameSpecificOverscanBottom.TabIndex = 2; + this.nudGameSpecificOverscanBottom.Value = new decimal(new int[] { 0, 0, 0, 0}); - // - // lblGameSpecificOverscanBottom - // - this.lblGameSpecificOverscanBottom.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.lblGameSpecificOverscanBottom.AutoSize = true; - this.lblGameSpecificOverscanBottom.Location = new System.Drawing.Point(111, 0); - this.lblGameSpecificOverscanBottom.Name = "lblGameSpecificOverscanBottom"; - this.lblGameSpecificOverscanBottom.Size = new System.Drawing.Size(40, 13); - this.lblGameSpecificOverscanBottom.TabIndex = 0; - this.lblGameSpecificOverscanBottom.Text = "Bottom"; - this.lblGameSpecificOverscanBottom.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // tableLayoutPanel17 - // - this.tableLayoutPanel17.ColumnCount = 2; - this.tableLayoutPanel17.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel17.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel17.Controls.Add(this.nudGameSpecificOverscanRight, 0, 2); - this.tableLayoutPanel17.Controls.Add(this.lblGameSpecificOverscanRight, 0, 1); - this.tableLayoutPanel17.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel17.Location = new System.Drawing.Point(381, 48); - this.tableLayoutPanel17.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel17.Name = "tableLayoutPanel17"; - this.tableLayoutPanel17.RowCount = 4; - this.tableLayoutPanel17.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel17.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel17.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel17.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel17.Size = new System.Drawing.Size(120, 246); - this.tableLayoutPanel17.TabIndex = 6; - // - // nudGameSpecificOverscanRight - // - this.nudGameSpecificOverscanRight.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.nudGameSpecificOverscanRight.DecimalPlaces = 0; - this.nudGameSpecificOverscanRight.Increment = new decimal(new int[] { + // + // lblGameSpecificOverscanBottom + // + this.lblGameSpecificOverscanBottom.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.lblGameSpecificOverscanBottom.AutoSize = true; + this.lblGameSpecificOverscanBottom.Location = new System.Drawing.Point(111, 0); + this.lblGameSpecificOverscanBottom.Name = "lblGameSpecificOverscanBottom"; + this.lblGameSpecificOverscanBottom.Size = new System.Drawing.Size(40, 13); + this.lblGameSpecificOverscanBottom.TabIndex = 0; + this.lblGameSpecificOverscanBottom.Text = "Bottom"; + this.lblGameSpecificOverscanBottom.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // tableLayoutPanel17 + // + this.tableLayoutPanel17.ColumnCount = 2; + this.tableLayoutPanel17.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel17.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel17.Controls.Add(this.nudGameSpecificOverscanRight, 0, 2); + this.tableLayoutPanel17.Controls.Add(this.lblGameSpecificOverscanRight, 0, 1); + this.tableLayoutPanel17.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel17.Location = new System.Drawing.Point(381, 48); + this.tableLayoutPanel17.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel17.Name = "tableLayoutPanel17"; + this.tableLayoutPanel17.RowCount = 4; + this.tableLayoutPanel17.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel17.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel17.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel17.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel17.Size = new System.Drawing.Size(120, 246); + this.tableLayoutPanel17.TabIndex = 6; + // + // nudGameSpecificOverscanRight + // + this.nudGameSpecificOverscanRight.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.nudGameSpecificOverscanRight.DecimalPlaces = 0; + this.nudGameSpecificOverscanRight.Increment = new decimal(new int[] { 1, 0, 0, 0}); - this.nudGameSpecificOverscanRight.Location = new System.Drawing.Point(0, 119); - this.nudGameSpecificOverscanRight.Margin = new System.Windows.Forms.Padding(0); - this.nudGameSpecificOverscanRight.Maximum = new decimal(new int[] { + this.nudGameSpecificOverscanRight.IsHex = false; + this.nudGameSpecificOverscanRight.Location = new System.Drawing.Point(0, 119); + this.nudGameSpecificOverscanRight.Margin = new System.Windows.Forms.Padding(0); + this.nudGameSpecificOverscanRight.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudGameSpecificOverscanRight.MaximumSize = new System.Drawing.Size(10000, 20); - this.nudGameSpecificOverscanRight.Minimum = new decimal(new int[] { + this.nudGameSpecificOverscanRight.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudGameSpecificOverscanRight.Minimum = new decimal(new int[] { 0, 0, 0, 0}); - this.nudGameSpecificOverscanRight.MinimumSize = new System.Drawing.Size(0, 21); - this.nudGameSpecificOverscanRight.Name = "nudGameSpecificOverscanRight"; - this.nudGameSpecificOverscanRight.Size = new System.Drawing.Size(41, 21); - this.nudGameSpecificOverscanRight.TabIndex = 1; - this.nudGameSpecificOverscanRight.Value = new decimal(new int[] { + this.nudGameSpecificOverscanRight.MinimumSize = new System.Drawing.Size(0, 21); + this.nudGameSpecificOverscanRight.Name = "nudGameSpecificOverscanRight"; + this.nudGameSpecificOverscanRight.Size = new System.Drawing.Size(41, 21); + this.nudGameSpecificOverscanRight.TabIndex = 1; + this.nudGameSpecificOverscanRight.Value = new decimal(new int[] { 0, 0, 0, 0}); - // - // lblGameSpecificOverscanRight - // - this.lblGameSpecificOverscanRight.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.lblGameSpecificOverscanRight.AutoSize = true; - this.lblGameSpecificOverscanRight.Location = new System.Drawing.Point(4, 106); - this.lblGameSpecificOverscanRight.Name = "lblGameSpecificOverscanRight"; - this.lblGameSpecificOverscanRight.Size = new System.Drawing.Size(32, 13); - this.lblGameSpecificOverscanRight.TabIndex = 0; - this.lblGameSpecificOverscanRight.Text = "Right"; - this.lblGameSpecificOverscanRight.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // tableLayoutPanel18 - // - this.tableLayoutPanel18.ColumnCount = 2; - this.tableLayoutPanel18.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel18.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel18.Controls.Add(this.nudGameSpecificOverscanLeft, 1, 2); - this.tableLayoutPanel18.Controls.Add(this.lblGameSpecificOverscanLeft, 1, 1); - this.tableLayoutPanel18.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel18.Location = new System.Drawing.Point(0, 48); - this.tableLayoutPanel18.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel18.Name = "tableLayoutPanel18"; - this.tableLayoutPanel18.RowCount = 4; - this.tableLayoutPanel18.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel18.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel18.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel18.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel18.Size = new System.Drawing.Size(119, 246); - this.tableLayoutPanel18.TabIndex = 7; - // - // nudGameSpecificOverscanLeft - // - this.nudGameSpecificOverscanLeft.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.nudGameSpecificOverscanLeft.DecimalPlaces = 0; - this.nudGameSpecificOverscanLeft.Increment = new decimal(new int[] { + // + // lblGameSpecificOverscanRight + // + this.lblGameSpecificOverscanRight.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.lblGameSpecificOverscanRight.AutoSize = true; + this.lblGameSpecificOverscanRight.Location = new System.Drawing.Point(4, 106); + this.lblGameSpecificOverscanRight.Name = "lblGameSpecificOverscanRight"; + this.lblGameSpecificOverscanRight.Size = new System.Drawing.Size(32, 13); + this.lblGameSpecificOverscanRight.TabIndex = 0; + this.lblGameSpecificOverscanRight.Text = "Right"; + this.lblGameSpecificOverscanRight.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // tableLayoutPanel18 + // + this.tableLayoutPanel18.ColumnCount = 2; + this.tableLayoutPanel18.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel18.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel18.Controls.Add(this.nudGameSpecificOverscanLeft, 1, 2); + this.tableLayoutPanel18.Controls.Add(this.lblGameSpecificOverscanLeft, 1, 1); + this.tableLayoutPanel18.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel18.Location = new System.Drawing.Point(0, 48); + this.tableLayoutPanel18.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel18.Name = "tableLayoutPanel18"; + this.tableLayoutPanel18.RowCount = 4; + this.tableLayoutPanel18.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel18.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel18.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel18.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel18.Size = new System.Drawing.Size(119, 246); + this.tableLayoutPanel18.TabIndex = 7; + // + // nudGameSpecificOverscanLeft + // + this.nudGameSpecificOverscanLeft.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.nudGameSpecificOverscanLeft.DecimalPlaces = 0; + this.nudGameSpecificOverscanLeft.Increment = new decimal(new int[] { 1, 0, 0, 0}); - this.nudGameSpecificOverscanLeft.Location = new System.Drawing.Point(78, 119); - this.nudGameSpecificOverscanLeft.Margin = new System.Windows.Forms.Padding(0); - this.nudGameSpecificOverscanLeft.Maximum = new decimal(new int[] { + this.nudGameSpecificOverscanLeft.IsHex = false; + this.nudGameSpecificOverscanLeft.Location = new System.Drawing.Point(78, 119); + this.nudGameSpecificOverscanLeft.Margin = new System.Windows.Forms.Padding(0); + this.nudGameSpecificOverscanLeft.Maximum = new decimal(new int[] { 100, 0, 0, 0}); - this.nudGameSpecificOverscanLeft.MaximumSize = new System.Drawing.Size(10000, 20); - this.nudGameSpecificOverscanLeft.Minimum = new decimal(new int[] { + this.nudGameSpecificOverscanLeft.MaximumSize = new System.Drawing.Size(10000, 20); + this.nudGameSpecificOverscanLeft.Minimum = new decimal(new int[] { 0, 0, 0, 0}); - this.nudGameSpecificOverscanLeft.MinimumSize = new System.Drawing.Size(0, 21); - this.nudGameSpecificOverscanLeft.Name = "nudGameSpecificOverscanLeft"; - this.nudGameSpecificOverscanLeft.Size = new System.Drawing.Size(41, 21); - this.nudGameSpecificOverscanLeft.TabIndex = 2; - this.nudGameSpecificOverscanLeft.Value = new decimal(new int[] { + this.nudGameSpecificOverscanLeft.MinimumSize = new System.Drawing.Size(0, 21); + this.nudGameSpecificOverscanLeft.Name = "nudGameSpecificOverscanLeft"; + this.nudGameSpecificOverscanLeft.Size = new System.Drawing.Size(41, 21); + this.nudGameSpecificOverscanLeft.TabIndex = 2; + this.nudGameSpecificOverscanLeft.Value = new decimal(new int[] { 0, 0, 0, 0}); - // - // lblGameSpecificOverscanLeft - // - this.lblGameSpecificOverscanLeft.Anchor = System.Windows.Forms.AnchorStyles.Top; - this.lblGameSpecificOverscanLeft.AutoSize = true; - this.lblGameSpecificOverscanLeft.Location = new System.Drawing.Point(86, 106); - this.lblGameSpecificOverscanLeft.Name = "lblGameSpecificOverscanLeft"; - this.lblGameSpecificOverscanLeft.Size = new System.Drawing.Size(25, 13); - this.lblGameSpecificOverscanLeft.TabIndex = 0; - this.lblGameSpecificOverscanLeft.Text = "Left"; - this.lblGameSpecificOverscanLeft.TextAlign = System.Drawing.ContentAlignment.TopCenter; - // - // chkEnableGameSpecificOverscan - // - this.chkEnableGameSpecificOverscan.AutoSize = true; - this.chkEnableGameSpecificOverscan.BackColor = System.Drawing.SystemColors.ControlLightLight; - this.chkEnableGameSpecificOverscan.Location = new System.Drawing.Point(6, -1); - this.chkEnableGameSpecificOverscan.Name = "chkEnableGameSpecificOverscan"; - this.chkEnableGameSpecificOverscan.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); - this.chkEnableGameSpecificOverscan.Size = new System.Drawing.Size(218, 17); - this.chkEnableGameSpecificOverscan.TabIndex = 0; - this.chkEnableGameSpecificOverscan.Text = "Enable game-specific overscan settings"; - this.chkEnableGameSpecificOverscan.UseVisualStyleBackColor = false; - this.chkEnableGameSpecificOverscan.CheckedChanged += new System.EventHandler(this.chkEnableGameSpecificOverscan_CheckedChanged); - // - // imageList - // - this.imageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList.ImageStream"))); - this.imageList.TransparentColor = System.Drawing.Color.Transparent; - this.imageList.Images.SetKeyName(0, "Exclamation.png"); - // - // tpgPalette - // - this.tpgPalette.Controls.Add(this.tableLayoutPanel3); - this.tpgPalette.Location = new System.Drawing.Point(4, 22); - this.tpgPalette.Name = "tpgPalette"; - this.tpgPalette.Padding = new System.Windows.Forms.Padding(3); - this.tpgPalette.Size = new System.Drawing.Size(527, 402); - this.tpgPalette.TabIndex = 2; - this.tpgPalette.Text = "Palette"; - this.tpgPalette.UseVisualStyleBackColor = true; - // - // tableLayoutPanel3 - // - this.tableLayoutPanel3.ColumnCount = 2; - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel2, 1, 0); - this.tableLayoutPanel3.Controls.Add(this.chkUseCustomVsPalette, 0, 1); - this.tableLayoutPanel3.Controls.Add(this.ctrlPaletteDisplay, 0, 0); - this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 3); - this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 2; - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(521, 396); - this.tableLayoutPanel3.TabIndex = 4; - // - // tableLayoutPanel2 - // - this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + // + // lblGameSpecificOverscanLeft + // + this.lblGameSpecificOverscanLeft.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.lblGameSpecificOverscanLeft.AutoSize = true; + this.lblGameSpecificOverscanLeft.Location = new System.Drawing.Point(86, 106); + this.lblGameSpecificOverscanLeft.Name = "lblGameSpecificOverscanLeft"; + this.lblGameSpecificOverscanLeft.Size = new System.Drawing.Size(25, 13); + this.lblGameSpecificOverscanLeft.TabIndex = 0; + this.lblGameSpecificOverscanLeft.Text = "Left"; + this.lblGameSpecificOverscanLeft.TextAlign = System.Drawing.ContentAlignment.TopCenter; + // + // chkEnableGameSpecificOverscan + // + this.chkEnableGameSpecificOverscan.AutoSize = true; + this.chkEnableGameSpecificOverscan.BackColor = System.Drawing.SystemColors.ControlLightLight; + this.chkEnableGameSpecificOverscan.Location = new System.Drawing.Point(6, -1); + this.chkEnableGameSpecificOverscan.Name = "chkEnableGameSpecificOverscan"; + this.chkEnableGameSpecificOverscan.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0); + this.chkEnableGameSpecificOverscan.Size = new System.Drawing.Size(218, 17); + this.chkEnableGameSpecificOverscan.TabIndex = 0; + this.chkEnableGameSpecificOverscan.Text = "Enable game-specific overscan settings"; + this.chkEnableGameSpecificOverscan.UseVisualStyleBackColor = false; + this.chkEnableGameSpecificOverscan.CheckedChanged += new System.EventHandler(this.chkEnableGameSpecificOverscan_CheckedChanged); + // + // imageList + // + this.imageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList.ImageStream"))); + this.imageList.TransparentColor = System.Drawing.Color.Transparent; + this.imageList.Images.SetKeyName(0, "Exclamation.png"); + // + // tpgPalette + // + this.tpgPalette.Controls.Add(this.tableLayoutPanel3); + this.tpgPalette.Location = new System.Drawing.Point(4, 22); + this.tpgPalette.Name = "tpgPalette"; + this.tpgPalette.Padding = new System.Windows.Forms.Padding(3); + this.tpgPalette.Size = new System.Drawing.Size(527, 402); + this.tpgPalette.TabIndex = 2; + this.tpgPalette.Text = "Palette"; + this.tpgPalette.UseVisualStyleBackColor = true; + // + // tableLayoutPanel3 + // + this.tableLayoutPanel3.ColumnCount = 2; + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel3.Controls.Add(this.tableLayoutPanel2, 1, 0); + this.tableLayoutPanel3.Controls.Add(this.chkUseCustomVsPalette, 0, 1); + this.tableLayoutPanel3.Controls.Add(this.ctrlPaletteDisplay, 0, 0); + this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel3.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel3.Name = "tableLayoutPanel3"; + this.tableLayoutPanel3.RowCount = 2; + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(521, 396); + this.tableLayoutPanel3.TabIndex = 4; + // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel2.ColumnCount = 1; - this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Controls.Add(this.btnExportPalette, 0, 2); - this.tableLayoutPanel2.Controls.Add(this.btnSelectPalette, 0, 0); - this.tableLayoutPanel2.Controls.Add(this.btnLoadPalFile, 0, 1); - this.tableLayoutPanel2.Controls.Add(this.chkShowColorIndexes, 0, 3); - this.tableLayoutPanel2.Location = new System.Drawing.Point(344, 0); - this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); - this.tableLayoutPanel2.Name = "tableLayoutPanel2"; - this.tableLayoutPanel2.RowCount = 4; - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel2.Size = new System.Drawing.Size(181, 344); - this.tableLayoutPanel2.TabIndex = 1; - // - // btnExportPalette - // - this.btnExportPalette.AutoSize = true; - this.btnExportPalette.Dock = System.Windows.Forms.DockStyle.Top; - this.btnExportPalette.Location = new System.Drawing.Point(3, 61); - this.btnExportPalette.Name = "btnExportPalette"; - this.btnExportPalette.Size = new System.Drawing.Size(175, 23); - this.btnExportPalette.TabIndex = 3; - this.btnExportPalette.Text = "Export Palette"; - this.btnExportPalette.UseVisualStyleBackColor = true; - this.btnExportPalette.Click += new System.EventHandler(this.btnExportPalette_Click); - // - // btnSelectPalette - // - this.btnSelectPalette.AutoSize = true; - this.btnSelectPalette.Dock = System.Windows.Forms.DockStyle.Top; - this.btnSelectPalette.Image = global::Mesen.GUI.Properties.Resources.DownArrow; - this.btnSelectPalette.Location = new System.Drawing.Point(3, 3); - this.btnSelectPalette.Name = "btnSelectPalette"; - this.btnSelectPalette.Size = new System.Drawing.Size(175, 23); - this.btnSelectPalette.TabIndex = 2; - this.btnSelectPalette.Text = "Load Preset Palette..."; - this.btnSelectPalette.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; - this.btnSelectPalette.UseVisualStyleBackColor = true; - this.btnSelectPalette.Click += new System.EventHandler(this.btnSelectPalette_Click); - // - // btnLoadPalFile - // - this.btnLoadPalFile.AutoSize = true; - this.btnLoadPalFile.Dock = System.Windows.Forms.DockStyle.Top; - this.btnLoadPalFile.Location = new System.Drawing.Point(3, 32); - this.btnLoadPalFile.Name = "btnLoadPalFile"; - this.btnLoadPalFile.Size = new System.Drawing.Size(175, 23); - this.btnLoadPalFile.TabIndex = 0; - this.btnLoadPalFile.Text = "Load Palette File"; - this.btnLoadPalFile.UseVisualStyleBackColor = true; - this.btnLoadPalFile.Click += new System.EventHandler(this.btnLoadPalFile_Click); - // - // chkShowColorIndexes - // - this.chkShowColorIndexes.AutoSize = true; - this.chkShowColorIndexes.Location = new System.Drawing.Point(3, 90); - this.chkShowColorIndexes.Name = "chkShowColorIndexes"; - this.chkShowColorIndexes.Size = new System.Drawing.Size(118, 17); - this.chkShowColorIndexes.TabIndex = 4; - this.chkShowColorIndexes.Text = "Show color indexes"; - this.chkShowColorIndexes.UseVisualStyleBackColor = true; - this.chkShowColorIndexes.CheckedChanged += new System.EventHandler(this.chkShowColorIndexes_CheckedChanged); - // - // chkUseCustomVsPalette - // - this.chkUseCustomVsPalette.AutoSize = true; - this.tableLayoutPanel3.SetColumnSpan(this.chkUseCustomVsPalette, 2); - this.chkUseCustomVsPalette.Location = new System.Drawing.Point(3, 347); - this.chkUseCustomVsPalette.Name = "chkUseCustomVsPalette"; - this.chkUseCustomVsPalette.Size = new System.Drawing.Size(202, 17); - this.chkUseCustomVsPalette.TabIndex = 2; - this.chkUseCustomVsPalette.Text = "Use this palette for VS System games"; - this.chkUseCustomVsPalette.UseVisualStyleBackColor = true; - // - // ctrlPaletteDisplay - // - this.ctrlPaletteDisplay.Location = new System.Drawing.Point(3, 3); - this.ctrlPaletteDisplay.Name = "ctrlPaletteDisplay"; - this.ctrlPaletteDisplay.Size = new System.Drawing.Size(338, 338); - this.ctrlPaletteDisplay.TabIndex = 3; - this.ctrlPaletteDisplay.ColorClick += new Mesen.GUI.Debugger.ctrlPaletteDisplay.PaletteClickHandler(this.ctrlPaletteDisplay_ColorClick); - // - // tpgAdvanced - // - this.tpgAdvanced.Controls.Add(this.tableLayoutPanel9); - this.tpgAdvanced.Location = new System.Drawing.Point(4, 22); - this.tpgAdvanced.Name = "tpgAdvanced"; - this.tpgAdvanced.Padding = new System.Windows.Forms.Padding(3); - this.tpgAdvanced.Size = new System.Drawing.Size(527, 402); - this.tpgAdvanced.TabIndex = 4; - this.tpgAdvanced.Text = "Advanced"; - this.tpgAdvanced.UseVisualStyleBackColor = true; - // - // tableLayoutPanel9 - // - this.tableLayoutPanel9.ColumnCount = 2; - this.tableLayoutPanel9.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); - this.tableLayoutPanel9.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel9.Controls.Add(this.chkDisableBackground, 0, 3); - this.tableLayoutPanel9.Controls.Add(this.chkDisableSprites, 0, 4); - this.tableLayoutPanel9.Controls.Add(this.chkForceBackgroundFirstColumn, 0, 5); - this.tableLayoutPanel9.Controls.Add(this.chkForceSpritesFirstColumn, 0, 6); - this.tableLayoutPanel9.Controls.Add(this.lblScreenRotation, 0, 7); - this.tableLayoutPanel9.Controls.Add(this.cboScreenRotation, 1, 7); - this.tableLayoutPanel9.Controls.Add(this.chkRemoveSpriteLimit, 0, 0); - this.tableLayoutPanel9.Controls.Add(this.chkAdaptiveSpriteLimit, 0, 1); - this.tableLayoutPanel9.Dock = System.Windows.Forms.DockStyle.Fill; - this.tableLayoutPanel9.Location = new System.Drawing.Point(3, 3); - this.tableLayoutPanel9.Name = "tableLayoutPanel9"; - this.tableLayoutPanel9.RowCount = 9; - this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel9.Size = new System.Drawing.Size(521, 396); - this.tableLayoutPanel9.TabIndex = 0; - // - // chkDisableBackground - // - this.chkDisableBackground.Checked = false; - this.tableLayoutPanel9.SetColumnSpan(this.chkDisableBackground, 2); - this.chkDisableBackground.Dock = System.Windows.Forms.DockStyle.Fill; - this.chkDisableBackground.Location = new System.Drawing.Point(0, 46); - this.chkDisableBackground.MinimumSize = new System.Drawing.Size(0, 21); - this.chkDisableBackground.Name = "chkDisableBackground"; - this.chkDisableBackground.Size = new System.Drawing.Size(521, 23); - this.chkDisableBackground.TabIndex = 0; - this.chkDisableBackground.Text = "Disable background"; - // - // chkDisableSprites - // - this.chkDisableSprites.Checked = false; - this.tableLayoutPanel9.SetColumnSpan(this.chkDisableSprites, 2); - this.chkDisableSprites.Dock = System.Windows.Forms.DockStyle.Fill; - this.chkDisableSprites.Location = new System.Drawing.Point(0, 69); - this.chkDisableSprites.MinimumSize = new System.Drawing.Size(0, 21); - this.chkDisableSprites.Name = "chkDisableSprites"; - this.chkDisableSprites.Size = new System.Drawing.Size(521, 23); - this.chkDisableSprites.TabIndex = 1; - this.chkDisableSprites.Text = "Disable sprites"; - // - // chkForceBackgroundFirstColumn - // - this.chkForceBackgroundFirstColumn.Checked = false; - this.tableLayoutPanel9.SetColumnSpan(this.chkForceBackgroundFirstColumn, 2); - this.chkForceBackgroundFirstColumn.Dock = System.Windows.Forms.DockStyle.Fill; - this.chkForceBackgroundFirstColumn.Location = new System.Drawing.Point(0, 92); - this.chkForceBackgroundFirstColumn.MinimumSize = new System.Drawing.Size(0, 21); - this.chkForceBackgroundFirstColumn.Name = "chkForceBackgroundFirstColumn"; - this.chkForceBackgroundFirstColumn.Size = new System.Drawing.Size(521, 23); - this.chkForceBackgroundFirstColumn.TabIndex = 2; - this.chkForceBackgroundFirstColumn.Text = "Force background display in first column"; - // - // chkForceSpritesFirstColumn - // - this.chkForceSpritesFirstColumn.Checked = false; - this.tableLayoutPanel9.SetColumnSpan(this.chkForceSpritesFirstColumn, 2); - this.chkForceSpritesFirstColumn.Dock = System.Windows.Forms.DockStyle.Fill; - this.chkForceSpritesFirstColumn.Location = new System.Drawing.Point(0, 115); - this.chkForceSpritesFirstColumn.MinimumSize = new System.Drawing.Size(0, 21); - this.chkForceSpritesFirstColumn.Name = "chkForceSpritesFirstColumn"; - this.chkForceSpritesFirstColumn.Size = new System.Drawing.Size(521, 23); - this.chkForceSpritesFirstColumn.TabIndex = 3; - this.chkForceSpritesFirstColumn.Text = "Force sprite display in first column"; - // - // lblScreenRotation - // - this.lblScreenRotation.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.lblScreenRotation.AutoSize = true; - this.lblScreenRotation.Location = new System.Drawing.Point(3, 145); - this.lblScreenRotation.Name = "lblScreenRotation"; - this.lblScreenRotation.Size = new System.Drawing.Size(87, 13); - this.lblScreenRotation.TabIndex = 4; - this.lblScreenRotation.Text = "Screen Rotation:"; - // - // cboScreenRotation - // - this.cboScreenRotation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cboScreenRotation.FormattingEnabled = true; - this.cboScreenRotation.Location = new System.Drawing.Point(96, 141); - this.cboScreenRotation.Name = "cboScreenRotation"; - this.cboScreenRotation.Size = new System.Drawing.Size(77, 21); - this.cboScreenRotation.TabIndex = 5; - // - // chkRemoveSpriteLimit - // - this.chkRemoveSpriteLimit.AutoSize = true; - this.tableLayoutPanel9.SetColumnSpan(this.chkRemoveSpriteLimit, 2); - this.chkRemoveSpriteLimit.Location = new System.Drawing.Point(3, 3); - this.chkRemoveSpriteLimit.Name = "chkRemoveSpriteLimit"; - this.chkRemoveSpriteLimit.Size = new System.Drawing.Size(205, 17); - this.chkRemoveSpriteLimit.TabIndex = 6; - this.chkRemoveSpriteLimit.Text = "Remove sprite limit (Reduces flashing)"; - this.chkRemoveSpriteLimit.UseVisualStyleBackColor = true; - this.chkRemoveSpriteLimit.CheckedChanged += new System.EventHandler(this.chkRemoveSpriteLimit_CheckedChanged); - // - // chkAdaptiveSpriteLimit - // - this.chkAdaptiveSpriteLimit.AutoSize = true; - this.tableLayoutPanel9.SetColumnSpan(this.chkAdaptiveSpriteLimit, 2); - this.chkAdaptiveSpriteLimit.Enabled = false; - this.chkAdaptiveSpriteLimit.Location = new System.Drawing.Point(18, 26); - this.chkAdaptiveSpriteLimit.Margin = new System.Windows.Forms.Padding(18, 3, 3, 3); - this.chkAdaptiveSpriteLimit.Name = "chkAdaptiveSpriteLimit"; - this.chkAdaptiveSpriteLimit.Size = new System.Drawing.Size(442, 17); - this.chkAdaptiveSpriteLimit.TabIndex = 11; - this.chkAdaptiveSpriteLimit.Text = "Automatically re-enable sprite limit as needed to prevent graphical glitches when" + + this.tableLayoutPanel2.ColumnCount = 1; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Controls.Add(this.btnExportPalette, 0, 2); + this.tableLayoutPanel2.Controls.Add(this.btnSelectPalette, 0, 0); + this.tableLayoutPanel2.Controls.Add(this.btnLoadPalFile, 0, 1); + this.tableLayoutPanel2.Controls.Add(this.chkShowColorIndexes, 0, 3); + this.tableLayoutPanel2.Location = new System.Drawing.Point(344, 0); + this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 4; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(181, 344); + this.tableLayoutPanel2.TabIndex = 1; + // + // btnExportPalette + // + this.btnExportPalette.AutoSize = true; + this.btnExportPalette.Dock = System.Windows.Forms.DockStyle.Top; + this.btnExportPalette.Location = new System.Drawing.Point(3, 61); + this.btnExportPalette.Name = "btnExportPalette"; + this.btnExportPalette.Size = new System.Drawing.Size(175, 23); + this.btnExportPalette.TabIndex = 3; + this.btnExportPalette.Text = "Export Palette"; + this.btnExportPalette.UseVisualStyleBackColor = true; + this.btnExportPalette.Click += new System.EventHandler(this.btnExportPalette_Click); + // + // btnSelectPalette + // + this.btnSelectPalette.AutoSize = true; + this.btnSelectPalette.Dock = System.Windows.Forms.DockStyle.Top; + this.btnSelectPalette.Image = global::Mesen.GUI.Properties.Resources.DownArrow; + this.btnSelectPalette.Location = new System.Drawing.Point(3, 3); + this.btnSelectPalette.Name = "btnSelectPalette"; + this.btnSelectPalette.Size = new System.Drawing.Size(175, 23); + this.btnSelectPalette.TabIndex = 2; + this.btnSelectPalette.Text = "Load Preset Palette..."; + this.btnSelectPalette.TextImageRelation = System.Windows.Forms.TextImageRelation.TextBeforeImage; + this.btnSelectPalette.UseVisualStyleBackColor = true; + this.btnSelectPalette.Click += new System.EventHandler(this.btnSelectPalette_Click); + // + // btnLoadPalFile + // + this.btnLoadPalFile.AutoSize = true; + this.btnLoadPalFile.Dock = System.Windows.Forms.DockStyle.Top; + this.btnLoadPalFile.Location = new System.Drawing.Point(3, 32); + this.btnLoadPalFile.Name = "btnLoadPalFile"; + this.btnLoadPalFile.Size = new System.Drawing.Size(175, 23); + this.btnLoadPalFile.TabIndex = 0; + this.btnLoadPalFile.Text = "Load Palette File"; + this.btnLoadPalFile.UseVisualStyleBackColor = true; + this.btnLoadPalFile.Click += new System.EventHandler(this.btnLoadPalFile_Click); + // + // chkShowColorIndexes + // + this.chkShowColorIndexes.AutoSize = true; + this.chkShowColorIndexes.Location = new System.Drawing.Point(3, 90); + this.chkShowColorIndexes.Name = "chkShowColorIndexes"; + this.chkShowColorIndexes.Size = new System.Drawing.Size(118, 17); + this.chkShowColorIndexes.TabIndex = 4; + this.chkShowColorIndexes.Text = "Show color indexes"; + this.chkShowColorIndexes.UseVisualStyleBackColor = true; + this.chkShowColorIndexes.CheckedChanged += new System.EventHandler(this.chkShowColorIndexes_CheckedChanged); + // + // chkUseCustomVsPalette + // + this.chkUseCustomVsPalette.AutoSize = true; + this.tableLayoutPanel3.SetColumnSpan(this.chkUseCustomVsPalette, 2); + this.chkUseCustomVsPalette.Location = new System.Drawing.Point(3, 347); + this.chkUseCustomVsPalette.Name = "chkUseCustomVsPalette"; + this.chkUseCustomVsPalette.Size = new System.Drawing.Size(202, 17); + this.chkUseCustomVsPalette.TabIndex = 2; + this.chkUseCustomVsPalette.Text = "Use this palette for VS System games"; + this.chkUseCustomVsPalette.UseVisualStyleBackColor = true; + // + // ctrlPaletteDisplay + // + this.ctrlPaletteDisplay.Location = new System.Drawing.Point(3, 3); + this.ctrlPaletteDisplay.Name = "ctrlPaletteDisplay"; + this.ctrlPaletteDisplay.Size = new System.Drawing.Size(338, 338); + this.ctrlPaletteDisplay.TabIndex = 3; + this.ctrlPaletteDisplay.ColorClick += new Mesen.GUI.Debugger.ctrlPaletteDisplay.PaletteClickHandler(this.ctrlPaletteDisplay_ColorClick); + // + // tpgAdvanced + // + this.tpgAdvanced.Controls.Add(this.tableLayoutPanel9); + this.tpgAdvanced.Location = new System.Drawing.Point(4, 22); + this.tpgAdvanced.Name = "tpgAdvanced"; + this.tpgAdvanced.Padding = new System.Windows.Forms.Padding(3); + this.tpgAdvanced.Size = new System.Drawing.Size(527, 402); + this.tpgAdvanced.TabIndex = 4; + this.tpgAdvanced.Text = "Advanced"; + this.tpgAdvanced.UseVisualStyleBackColor = true; + // + // tableLayoutPanel9 + // + this.tableLayoutPanel9.ColumnCount = 2; + this.tableLayoutPanel9.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel9.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel9.Controls.Add(this.chkDisableBackground, 0, 3); + this.tableLayoutPanel9.Controls.Add(this.chkDisableSprites, 0, 4); + this.tableLayoutPanel9.Controls.Add(this.chkForceBackgroundFirstColumn, 0, 5); + this.tableLayoutPanel9.Controls.Add(this.chkForceSpritesFirstColumn, 0, 6); + this.tableLayoutPanel9.Controls.Add(this.lblScreenRotation, 0, 7); + this.tableLayoutPanel9.Controls.Add(this.cboScreenRotation, 1, 7); + this.tableLayoutPanel9.Controls.Add(this.chkRemoveSpriteLimit, 0, 0); + this.tableLayoutPanel9.Controls.Add(this.chkAdaptiveSpriteLimit, 0, 1); + this.tableLayoutPanel9.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel9.Location = new System.Drawing.Point(3, 3); + this.tableLayoutPanel9.Name = "tableLayoutPanel9"; + this.tableLayoutPanel9.RowCount = 9; + this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle()); + this.tableLayoutPanel9.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel9.Size = new System.Drawing.Size(521, 396); + this.tableLayoutPanel9.TabIndex = 0; + // + // chkDisableBackground + // + this.chkDisableBackground.Checked = false; + this.tableLayoutPanel9.SetColumnSpan(this.chkDisableBackground, 2); + this.chkDisableBackground.Dock = System.Windows.Forms.DockStyle.Fill; + this.chkDisableBackground.Location = new System.Drawing.Point(0, 46); + this.chkDisableBackground.MinimumSize = new System.Drawing.Size(0, 21); + this.chkDisableBackground.Name = "chkDisableBackground"; + this.chkDisableBackground.Size = new System.Drawing.Size(521, 23); + this.chkDisableBackground.TabIndex = 0; + this.chkDisableBackground.Text = "Disable background"; + // + // chkDisableSprites + // + this.chkDisableSprites.Checked = false; + this.tableLayoutPanel9.SetColumnSpan(this.chkDisableSprites, 2); + this.chkDisableSprites.Dock = System.Windows.Forms.DockStyle.Fill; + this.chkDisableSprites.Location = new System.Drawing.Point(0, 69); + this.chkDisableSprites.MinimumSize = new System.Drawing.Size(0, 21); + this.chkDisableSprites.Name = "chkDisableSprites"; + this.chkDisableSprites.Size = new System.Drawing.Size(521, 23); + this.chkDisableSprites.TabIndex = 1; + this.chkDisableSprites.Text = "Disable sprites"; + // + // chkForceBackgroundFirstColumn + // + this.chkForceBackgroundFirstColumn.Checked = false; + this.tableLayoutPanel9.SetColumnSpan(this.chkForceBackgroundFirstColumn, 2); + this.chkForceBackgroundFirstColumn.Dock = System.Windows.Forms.DockStyle.Fill; + this.chkForceBackgroundFirstColumn.Location = new System.Drawing.Point(0, 92); + this.chkForceBackgroundFirstColumn.MinimumSize = new System.Drawing.Size(0, 21); + this.chkForceBackgroundFirstColumn.Name = "chkForceBackgroundFirstColumn"; + this.chkForceBackgroundFirstColumn.Size = new System.Drawing.Size(521, 23); + this.chkForceBackgroundFirstColumn.TabIndex = 2; + this.chkForceBackgroundFirstColumn.Text = "Force background display in first column"; + // + // chkForceSpritesFirstColumn + // + this.chkForceSpritesFirstColumn.Checked = false; + this.tableLayoutPanel9.SetColumnSpan(this.chkForceSpritesFirstColumn, 2); + this.chkForceSpritesFirstColumn.Dock = System.Windows.Forms.DockStyle.Fill; + this.chkForceSpritesFirstColumn.Location = new System.Drawing.Point(0, 115); + this.chkForceSpritesFirstColumn.MinimumSize = new System.Drawing.Size(0, 21); + this.chkForceSpritesFirstColumn.Name = "chkForceSpritesFirstColumn"; + this.chkForceSpritesFirstColumn.Size = new System.Drawing.Size(521, 23); + this.chkForceSpritesFirstColumn.TabIndex = 3; + this.chkForceSpritesFirstColumn.Text = "Force sprite display in first column"; + // + // lblScreenRotation + // + this.lblScreenRotation.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblScreenRotation.AutoSize = true; + this.lblScreenRotation.Location = new System.Drawing.Point(3, 145); + this.lblScreenRotation.Name = "lblScreenRotation"; + this.lblScreenRotation.Size = new System.Drawing.Size(87, 13); + this.lblScreenRotation.TabIndex = 4; + this.lblScreenRotation.Text = "Screen Rotation:"; + // + // cboScreenRotation + // + this.cboScreenRotation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cboScreenRotation.FormattingEnabled = true; + this.cboScreenRotation.Location = new System.Drawing.Point(96, 141); + this.cboScreenRotation.Name = "cboScreenRotation"; + this.cboScreenRotation.Size = new System.Drawing.Size(77, 21); + this.cboScreenRotation.TabIndex = 5; + // + // chkRemoveSpriteLimit + // + this.chkRemoveSpriteLimit.AutoSize = true; + this.tableLayoutPanel9.SetColumnSpan(this.chkRemoveSpriteLimit, 2); + this.chkRemoveSpriteLimit.Location = new System.Drawing.Point(3, 3); + this.chkRemoveSpriteLimit.Name = "chkRemoveSpriteLimit"; + this.chkRemoveSpriteLimit.Size = new System.Drawing.Size(205, 17); + this.chkRemoveSpriteLimit.TabIndex = 6; + this.chkRemoveSpriteLimit.Text = "Remove sprite limit (Reduces flashing)"; + this.chkRemoveSpriteLimit.UseVisualStyleBackColor = true; + this.chkRemoveSpriteLimit.CheckedChanged += new System.EventHandler(this.chkRemoveSpriteLimit_CheckedChanged); + // + // chkAdaptiveSpriteLimit + // + this.chkAdaptiveSpriteLimit.AutoSize = true; + this.tableLayoutPanel9.SetColumnSpan(this.chkAdaptiveSpriteLimit, 2); + this.chkAdaptiveSpriteLimit.Enabled = false; + this.chkAdaptiveSpriteLimit.Location = new System.Drawing.Point(18, 26); + this.chkAdaptiveSpriteLimit.Margin = new System.Windows.Forms.Padding(18, 3, 3, 3); + this.chkAdaptiveSpriteLimit.Name = "chkAdaptiveSpriteLimit"; + this.chkAdaptiveSpriteLimit.Size = new System.Drawing.Size(442, 17); + this.chkAdaptiveSpriteLimit.TabIndex = 11; + this.chkAdaptiveSpriteLimit.Text = "Automatically re-enable sprite limit as needed to prevent graphical glitches when" + " possible"; - this.chkAdaptiveSpriteLimit.UseVisualStyleBackColor = true; - // - // contextPicturePresets - // - this.contextPicturePresets.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.chkAdaptiveSpriteLimit.UseVisualStyleBackColor = true; + // + // contextPicturePresets + // + this.contextPicturePresets.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuPresetComposite, this.mnuPresetSVideo, this.mnuPresetRgb, this.mnuPresetMonochrome}); - this.contextPicturePresets.Name = "contextPicturePresets"; - this.contextPicturePresets.Size = new System.Drawing.Size(148, 92); - // - // mnuPresetComposite - // - this.mnuPresetComposite.Name = "mnuPresetComposite"; - this.mnuPresetComposite.Size = new System.Drawing.Size(147, 22); - this.mnuPresetComposite.Text = "Composite"; - this.mnuPresetComposite.Click += new System.EventHandler(this.mnuPresetComposite_Click); - // - // mnuPresetSVideo - // - this.mnuPresetSVideo.Name = "mnuPresetSVideo"; - this.mnuPresetSVideo.Size = new System.Drawing.Size(147, 22); - this.mnuPresetSVideo.Text = "S-Video"; - this.mnuPresetSVideo.Click += new System.EventHandler(this.mnuPresetSVideo_Click); - // - // mnuPresetRgb - // - this.mnuPresetRgb.Name = "mnuPresetRgb"; - this.mnuPresetRgb.Size = new System.Drawing.Size(147, 22); - this.mnuPresetRgb.Text = "RGB"; - this.mnuPresetRgb.Click += new System.EventHandler(this.mnuPresetRgb_Click); - // - // mnuPresetMonochrome - // - this.mnuPresetMonochrome.Name = "mnuPresetMonochrome"; - this.mnuPresetMonochrome.Size = new System.Drawing.Size(147, 22); - this.mnuPresetMonochrome.Text = "Monochrome"; - this.mnuPresetMonochrome.Click += new System.EventHandler(this.mnuPresetMonochrome_Click); - // - // contextPaletteList - // - this.contextPaletteList.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.contextPicturePresets.Name = "contextPicturePresets"; + this.contextPicturePresets.Size = new System.Drawing.Size(153, 92); + // + // mnuPresetComposite + // + this.mnuPresetComposite.Name = "mnuPresetComposite"; + this.mnuPresetComposite.Size = new System.Drawing.Size(152, 22); + this.mnuPresetComposite.Text = "Composite"; + this.mnuPresetComposite.Click += new System.EventHandler(this.mnuPresetComposite_Click); + // + // mnuPresetSVideo + // + this.mnuPresetSVideo.Name = "mnuPresetSVideo"; + this.mnuPresetSVideo.Size = new System.Drawing.Size(152, 22); + this.mnuPresetSVideo.Text = "S-Video"; + this.mnuPresetSVideo.Click += new System.EventHandler(this.mnuPresetSVideo_Click); + // + // mnuPresetRgb + // + this.mnuPresetRgb.Name = "mnuPresetRgb"; + this.mnuPresetRgb.Size = new System.Drawing.Size(152, 22); + this.mnuPresetRgb.Text = "RGB"; + this.mnuPresetRgb.Click += new System.EventHandler(this.mnuPresetRgb_Click); + // + // mnuPresetMonochrome + // + this.mnuPresetMonochrome.Name = "mnuPresetMonochrome"; + this.mnuPresetMonochrome.Size = new System.Drawing.Size(152, 22); + this.mnuPresetMonochrome.Text = "Monochrome"; + this.mnuPresetMonochrome.Click += new System.EventHandler(this.mnuPresetMonochrome_Click); + // + // contextPaletteList + // + this.contextPaletteList.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuDefaultPalette, this.toolStripMenuItem1, this.mnuPaletteCompositeDirect, @@ -1986,157 +2019,158 @@ namespace Mesen.GUI.Forms.Config this.mnuPaletteSonyCxa2025As, this.mnuPaletteUnsaturated, this.mnuPaletteYuv}); - this.contextPaletteList.Name = "contextPicturePresets"; - this.contextPaletteList.Size = new System.Drawing.Size(255, 208); - this.contextPaletteList.Opening += new System.ComponentModel.CancelEventHandler(this.contextPaletteList_Opening); - // - // mnuDefaultPalette - // - this.mnuDefaultPalette.Name = "mnuDefaultPalette"; - this.mnuDefaultPalette.Size = new System.Drawing.Size(254, 22); - this.mnuDefaultPalette.Text = "Default (NTSC)"; - this.mnuDefaultPalette.Click += new System.EventHandler(this.mnuDefaultPalette_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(251, 6); - // - // mnuPaletteCompositeDirect - // - this.mnuPaletteCompositeDirect.Name = "mnuPaletteCompositeDirect"; - this.mnuPaletteCompositeDirect.Size = new System.Drawing.Size(254, 22); - this.mnuPaletteCompositeDirect.Text = "Composite Direct (by FirebrandX)"; - this.mnuPaletteCompositeDirect.Click += new System.EventHandler(this.mnuPaletteCompositeDirect_Click); - // - // mnuPaletteNesClassic - // - this.mnuPaletteNesClassic.Name = "mnuPaletteNesClassic"; - this.mnuPaletteNesClassic.Size = new System.Drawing.Size(254, 22); - this.mnuPaletteNesClassic.Text = "NES Classic (by FirebrandX)"; - this.mnuPaletteNesClassic.Click += new System.EventHandler(this.mnuPaletteNesClassic_Click); - // - // mnuPaletteNestopiaRgb - // - this.mnuPaletteNestopiaRgb.Name = "mnuPaletteNestopiaRgb"; - this.mnuPaletteNestopiaRgb.Size = new System.Drawing.Size(254, 22); - this.mnuPaletteNestopiaRgb.Text = "Nestopia (RGB)"; - this.mnuPaletteNestopiaRgb.Click += new System.EventHandler(this.mnuPaletteNestopiaRgb_Click); - // - // mnuPaletteOriginalHardware - // - this.mnuPaletteOriginalHardware.Name = "mnuPaletteOriginalHardware"; - this.mnuPaletteOriginalHardware.Size = new System.Drawing.Size(254, 22); - this.mnuPaletteOriginalHardware.Text = "Original Hardware (by FirebrandX)"; - this.mnuPaletteOriginalHardware.Click += new System.EventHandler(this.mnuPaletteOriginalHardware_Click); - // - // mnuPalettePvmStyle - // - this.mnuPalettePvmStyle.Name = "mnuPalettePvmStyle"; - this.mnuPalettePvmStyle.Size = new System.Drawing.Size(254, 22); - this.mnuPalettePvmStyle.Text = "PVM Style (by FirebrandX)"; - this.mnuPalettePvmStyle.Click += new System.EventHandler(this.mnuPalettePvmStyle_Click); - // - // mnuPaletteSonyCxa2025As - // - this.mnuPaletteSonyCxa2025As.Name = "mnuPaletteSonyCxa2025As"; - this.mnuPaletteSonyCxa2025As.Size = new System.Drawing.Size(254, 22); - this.mnuPaletteSonyCxa2025As.Text = "Sony CXA2025AS"; - this.mnuPaletteSonyCxa2025As.Click += new System.EventHandler(this.mnuPaletteSonyCxa2025As_Click); - // - // mnuPaletteUnsaturated - // - this.mnuPaletteUnsaturated.Name = "mnuPaletteUnsaturated"; - this.mnuPaletteUnsaturated.Size = new System.Drawing.Size(254, 22); - this.mnuPaletteUnsaturated.Text = "Unsaturated v6 (by FirebrandX)"; - this.mnuPaletteUnsaturated.Click += new System.EventHandler(this.mnuPaletteUnsaturated_Click); - // - // mnuPaletteYuv - // - this.mnuPaletteYuv.Name = "mnuPaletteYuv"; - this.mnuPaletteYuv.Size = new System.Drawing.Size(254, 22); - this.mnuPaletteYuv.Text = "YUV v3 (by FirebrandX)"; - this.mnuPaletteYuv.Click += new System.EventHandler(this.mnuPaletteYuv_Click); - // - // frmVideoConfig - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(535, 457); - this.Controls.Add(this.tabMain); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "frmVideoConfig"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "Video Options"; - this.Controls.SetChildIndex(this.baseConfigPanel, 0); - this.Controls.SetChildIndex(this.tabMain, 0); - this.tlpMain.ResumeLayout(false); - this.tlpMain.PerformLayout(); - this.flpResolution.ResumeLayout(false); - this.flpResolution.PerformLayout(); - this.flowLayoutPanel7.ResumeLayout(false); - this.flowLayoutPanel7.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.picHdNesTooltip)).EndInit(); - this.flowLayoutPanel6.ResumeLayout(false); - this.flowLayoutPanel6.PerformLayout(); - this.flpRefreshRate.ResumeLayout(false); - this.flpRefreshRate.PerformLayout(); - this.tabMain.ResumeLayout(false); - this.tpgGeneral.ResumeLayout(false); - this.tpgPicture.ResumeLayout(false); - this.tableLayoutPanel5.ResumeLayout(false); - this.tableLayoutPanel7.ResumeLayout(false); - this.tableLayoutPanel7.PerformLayout(); - this.grpNtscFilter.ResumeLayout(false); - this.tlpNtscFilter2.ResumeLayout(false); - this.tlpNtscFilter1.ResumeLayout(false); - this.tableLayoutPanel6.ResumeLayout(false); - this.tableLayoutPanel6.PerformLayout(); - this.grpCommon.ResumeLayout(false); - this.tableLayoutPanel4.ResumeLayout(false); - this.tableLayoutPanel4.PerformLayout(); - this.grpScanlines.ResumeLayout(false); - this.tableLayoutPanel8.ResumeLayout(false); - this.tableLayoutPanel8.PerformLayout(); - this.tpgOverscan.ResumeLayout(false); - this.tabOverscan.ResumeLayout(false); - this.tpgOverscanGlobal.ResumeLayout(false); - this.tableLayoutPanel1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.picOverscan)).EndInit(); - this.tableLayoutPanel11.ResumeLayout(false); - this.tableLayoutPanel11.PerformLayout(); - this.tableLayoutPanel12.ResumeLayout(false); - this.tableLayoutPanel12.PerformLayout(); - this.tableLayoutPanel13.ResumeLayout(false); - this.tableLayoutPanel13.PerformLayout(); - this.tableLayoutPanel14.ResumeLayout(false); - this.tableLayoutPanel14.PerformLayout(); - this.tpgOverscanGameSpecific.ResumeLayout(false); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.tableLayoutPanel10.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.picGameSpecificOverscan)).EndInit(); - this.tableLayoutPanel15.ResumeLayout(false); - this.tableLayoutPanel15.PerformLayout(); - this.tableLayoutPanel16.ResumeLayout(false); - this.tableLayoutPanel16.PerformLayout(); - this.tableLayoutPanel17.ResumeLayout(false); - this.tableLayoutPanel17.PerformLayout(); - this.tableLayoutPanel18.ResumeLayout(false); - this.tableLayoutPanel18.PerformLayout(); - this.tpgPalette.ResumeLayout(false); - this.tableLayoutPanel3.ResumeLayout(false); - this.tableLayoutPanel3.PerformLayout(); - this.tableLayoutPanel2.ResumeLayout(false); - this.tableLayoutPanel2.PerformLayout(); - this.tpgAdvanced.ResumeLayout(false); - this.tableLayoutPanel9.ResumeLayout(false); - this.tableLayoutPanel9.PerformLayout(); - this.contextPicturePresets.ResumeLayout(false); - this.contextPaletteList.ResumeLayout(false); - this.ResumeLayout(false); + this.contextPaletteList.Name = "contextPicturePresets"; + this.contextPaletteList.Size = new System.Drawing.Size(268, 208); + this.contextPaletteList.Opening += new System.ComponentModel.CancelEventHandler(this.contextPaletteList_Opening); + // + // mnuDefaultPalette + // + this.mnuDefaultPalette.Name = "mnuDefaultPalette"; + this.mnuDefaultPalette.Size = new System.Drawing.Size(267, 22); + this.mnuDefaultPalette.Text = "Default (NTSC)"; + this.mnuDefaultPalette.Click += new System.EventHandler(this.mnuDefaultPalette_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(264, 6); + // + // mnuPaletteCompositeDirect + // + this.mnuPaletteCompositeDirect.Name = "mnuPaletteCompositeDirect"; + this.mnuPaletteCompositeDirect.Size = new System.Drawing.Size(267, 22); + this.mnuPaletteCompositeDirect.Text = "Composite Direct (by FirebrandX)"; + this.mnuPaletteCompositeDirect.Click += new System.EventHandler(this.mnuPaletteCompositeDirect_Click); + // + // mnuPaletteNesClassic + // + this.mnuPaletteNesClassic.Name = "mnuPaletteNesClassic"; + this.mnuPaletteNesClassic.Size = new System.Drawing.Size(267, 22); + this.mnuPaletteNesClassic.Text = "NES Classic (by FirebrandX)"; + this.mnuPaletteNesClassic.Click += new System.EventHandler(this.mnuPaletteNesClassic_Click); + // + // mnuPaletteNestopiaRgb + // + this.mnuPaletteNestopiaRgb.Name = "mnuPaletteNestopiaRgb"; + this.mnuPaletteNestopiaRgb.Size = new System.Drawing.Size(267, 22); + this.mnuPaletteNestopiaRgb.Text = "Nestopia (RGB)"; + this.mnuPaletteNestopiaRgb.Click += new System.EventHandler(this.mnuPaletteNestopiaRgb_Click); + // + // mnuPaletteOriginalHardware + // + this.mnuPaletteOriginalHardware.Name = "mnuPaletteOriginalHardware"; + this.mnuPaletteOriginalHardware.Size = new System.Drawing.Size(267, 22); + this.mnuPaletteOriginalHardware.Text = "Original Hardware (by FirebrandX)"; + this.mnuPaletteOriginalHardware.Click += new System.EventHandler(this.mnuPaletteOriginalHardware_Click); + // + // mnuPalettePvmStyle + // + this.mnuPalettePvmStyle.Name = "mnuPalettePvmStyle"; + this.mnuPalettePvmStyle.Size = new System.Drawing.Size(267, 22); + this.mnuPalettePvmStyle.Text = "PVM Style (by FirebrandX)"; + this.mnuPalettePvmStyle.Click += new System.EventHandler(this.mnuPalettePvmStyle_Click); + // + // mnuPaletteSonyCxa2025As + // + this.mnuPaletteSonyCxa2025As.Name = "mnuPaletteSonyCxa2025As"; + this.mnuPaletteSonyCxa2025As.Size = new System.Drawing.Size(267, 22); + this.mnuPaletteSonyCxa2025As.Text = "Sony CXA2025AS"; + this.mnuPaletteSonyCxa2025As.Click += new System.EventHandler(this.mnuPaletteSonyCxa2025As_Click); + // + // mnuPaletteUnsaturated + // + this.mnuPaletteUnsaturated.Name = "mnuPaletteUnsaturated"; + this.mnuPaletteUnsaturated.Size = new System.Drawing.Size(267, 22); + this.mnuPaletteUnsaturated.Text = "Unsaturated v6 (by FirebrandX)"; + this.mnuPaletteUnsaturated.Click += new System.EventHandler(this.mnuPaletteUnsaturated_Click); + // + // mnuPaletteYuv + // + this.mnuPaletteYuv.Name = "mnuPaletteYuv"; + this.mnuPaletteYuv.Size = new System.Drawing.Size(267, 22); + this.mnuPaletteYuv.Text = "YUV v3 (by FirebrandX)"; + this.mnuPaletteYuv.Click += new System.EventHandler(this.mnuPaletteYuv_Click); + // + // frmVideoConfig + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(535, 457); + this.Controls.Add(this.tabMain); + this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "frmVideoConfig"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "Video Options"; + this.Controls.SetChildIndex(this.baseConfigPanel, 0); + this.Controls.SetChildIndex(this.tabMain, 0); + this.tlpMain.ResumeLayout(false); + this.tlpMain.PerformLayout(); + this.flpResolution.ResumeLayout(false); + this.flpResolution.PerformLayout(); + this.flowLayoutPanel7.ResumeLayout(false); + this.flowLayoutPanel7.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.picHdNesTooltip)).EndInit(); + this.flowLayoutPanel6.ResumeLayout(false); + this.flowLayoutPanel6.PerformLayout(); + this.flpRefreshRate.ResumeLayout(false); + this.flpRefreshRate.PerformLayout(); + this.tabMain.ResumeLayout(false); + this.tpgGeneral.ResumeLayout(false); + this.tpgPicture.ResumeLayout(false); + this.tableLayoutPanel5.ResumeLayout(false); + this.tableLayoutPanel7.ResumeLayout(false); + this.tableLayoutPanel7.PerformLayout(); + this.grpNtscFilter.ResumeLayout(false); + this.tlpNtscFilter2.ResumeLayout(false); + this.tlpNtscFilter1.ResumeLayout(false); + this.tableLayoutPanel6.ResumeLayout(false); + this.tableLayoutPanel6.PerformLayout(); + this.grpCommon.ResumeLayout(false); + this.tableLayoutPanel4.ResumeLayout(false); + this.tableLayoutPanel4.PerformLayout(); + this.grpScanlines.ResumeLayout(false); + this.tableLayoutPanel8.ResumeLayout(false); + this.tableLayoutPanel8.PerformLayout(); + this.tpgOverscan.ResumeLayout(false); + this.tabOverscan.ResumeLayout(false); + this.tpgOverscanGlobal.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.picOverscan)).EndInit(); + this.tableLayoutPanel11.ResumeLayout(false); + this.tableLayoutPanel11.PerformLayout(); + this.tableLayoutPanel12.ResumeLayout(false); + this.tableLayoutPanel12.PerformLayout(); + this.tableLayoutPanel13.ResumeLayout(false); + this.tableLayoutPanel13.PerformLayout(); + this.tableLayoutPanel14.ResumeLayout(false); + this.tableLayoutPanel14.PerformLayout(); + this.tpgOverscanGameSpecific.ResumeLayout(false); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.tableLayoutPanel10.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.picGameSpecificOverscan)).EndInit(); + this.tableLayoutPanel15.ResumeLayout(false); + this.tableLayoutPanel15.PerformLayout(); + this.tableLayoutPanel16.ResumeLayout(false); + this.tableLayoutPanel16.PerformLayout(); + this.tableLayoutPanel17.ResumeLayout(false); + this.tableLayoutPanel17.PerformLayout(); + this.tableLayoutPanel18.ResumeLayout(false); + this.tableLayoutPanel18.PerformLayout(); + this.tpgPalette.ResumeLayout(false); + this.tableLayoutPanel3.ResumeLayout(false); + this.tableLayoutPanel3.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); + this.tpgAdvanced.ResumeLayout(false); + this.tableLayoutPanel9.ResumeLayout(false); + this.tableLayoutPanel9.PerformLayout(); + this.contextPicturePresets.ResumeLayout(false); + this.contextPaletteList.ResumeLayout(false); + this.ResumeLayout(false); } @@ -2269,5 +2303,7 @@ namespace Mesen.GUI.Forms.Config private System.Windows.Forms.FlowLayoutPanel flpResolution; private System.Windows.Forms.Label lblFullscreenResolution; private System.Windows.Forms.ComboBox cboFullscreenResolution; + private System.Windows.Forms.Label lblRequestedRefreshRate2; + private System.Windows.Forms.ComboBox cboRefreshRate2; } } \ No newline at end of file diff --git a/GUI.NET/Forms/Config/frmVideoConfig.cs b/GUI.NET/Forms/Config/frmVideoConfig.cs index 1947916a..f893e3b2 100644 --- a/GUI.NET/Forms/Config/frmVideoConfig.cs +++ b/GUI.NET/Forms/Config/frmVideoConfig.cs @@ -36,6 +36,7 @@ namespace Mesen.GUI.Forms.Config AddBinding("FullscreenForceIntegerScale", chkFullscreenForceIntegerScale); AddBinding("UseExclusiveFullscreen", chkUseExclusiveFullscreen); AddBinding("ExclusiveFullscreenRefreshRate", cboRefreshRate); + AddBinding("ExclusiveFullscreenRefreshRate2", cboRefreshRate2); AddBinding("VideoScale", nudScale); AddBinding("AspectRatio", cboAspectRatio); diff --git a/GUI.NET/Forms/Config/frmVideoConfig.resx b/GUI.NET/Forms/Config/frmVideoConfig.resx index 8a01bf0f..015d70f0 100644 --- a/GUI.NET/Forms/Config/frmVideoConfig.resx +++ b/GUI.NET/Forms/Config/frmVideoConfig.resx @@ -121,14 +121,14 @@ 17, 17 - 537, 17 + 561, 17 AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACs - BQAAAk1TRnQBSQFMAwEBAAFIAQABSAEAARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA + BQAAAk1TRnQBSQFMAwEBAAFYAQABWAEAARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA ARADAAEBAQABGAYAAQweAAH5AvgB1QHBAbsBqAFyAWEBkAFHATABkAFHATABpgFuAVwB0gG8AbUB+AL2 pQAB1QHAAbkBlgFNATIBqgFaASwBuwFkASsBwAFpASkBwAFpASkBuwFlASwBqwFbAS0BmAFMATAB0wG9 AbWfAAHRAbgBrwGlAVgBMgHAAW0BLgHCAW0BLQHCAW0BLQHCAW0BLQHCAW0BLQHCAW0BLQHCAW0BLQHA @@ -156,12 +156,12 @@ - 221, 17 + 229, 17 - 107, 17 + 110, 17 - 389, 17 + 406, 17 \ No newline at end of file diff --git a/GUI.NET/InteropEmu.cs b/GUI.NET/InteropEmu.cs index d9a56f4a..97ee7a01 100644 --- a/GUI.NET/InteropEmu.cs +++ b/GUI.NET/InteropEmu.cs @@ -226,6 +226,7 @@ namespace Mesen.GUI [DllImport(DLLPath)] public static extern void SetVideoScale(double scale, ConsoleId consoleId = ConsoleId.Master); [DllImport(DLLPath)] public static extern void SetScreenRotation(UInt32 angle); [DllImport(DLLPath)] public static extern void SetExclusiveRefreshRate(UInt32 refreshRate); + [DllImport(DLLPath)] public static extern void SetExclusiveRefreshRate2(UInt32 refreshRate); [DllImport(DLLPath)] public static extern void SetVideoAspectRatio(VideoAspectRatio aspectRatio, double customRatio); [DllImport(DLLPath)] public static extern void SetVideoFilter(VideoFilterType filter); [DllImport(DLLPath)] public static extern void SetVideoResizeFilter(VideoResizeFilter filter); @@ -1733,6 +1734,7 @@ namespace Mesen.GUI BreakOnPpu2006ScrollGlitch = 0x20000, BreakOnBusConflict = 0x40000, + BreakOnUnlogged = 0x80000, } public struct InteropRomInfo diff --git a/InteropDLL/ConsoleWrapper.cpp b/InteropDLL/ConsoleWrapper.cpp index abcb628f..02b721ac 100644 --- a/InteropDLL/ConsoleWrapper.cpp +++ b/InteropDLL/ConsoleWrapper.cpp @@ -654,6 +654,7 @@ namespace InteropEmu { DllExport void __stdcall SetVideoScale(double scale, ConsoleId consoleId) { GetConsoleById(consoleId)->GetSettings()->SetVideoScale(scale); } DllExport void __stdcall SetScreenRotation(uint32_t angle) { _settings->SetScreenRotation(angle); } DllExport void __stdcall SetExclusiveRefreshRate(uint32_t angle) { _settings->SetExclusiveRefreshRate(angle); } + DllExport void __stdcall SetExclusiveRefreshRate2(uint32_t angle) { _settings->SetExclusiveRefreshRate2(angle); } DllExport void __stdcall SetVideoAspectRatio(VideoAspectRatio aspectRatio, double customRatio) { _settings->SetVideoAspectRatio(aspectRatio, customRatio); } DllExport void __stdcall SetVideoFilter(VideoFilterType filter) { _settings->SetVideoFilterType(filter); } DllExport void __stdcall SetVideoResizeFilter(VideoResizeFilter filter) { _settings->SetVideoResizeFilter(filter); } diff --git a/Libretro/libretro.cpp b/Libretro/libretro.cpp index b2623ae6..02ad84cb 100644 --- a/Libretro/libretro.cpp +++ b/Libretro/libretro.cpp @@ -242,8 +242,18 @@ extern "C" { { 0 }, }; + static const struct retro_system_content_info_override content_overrides[] = { + { + "nes|fds|unf|unif", /* extensions */ + false, /* need_fullpath */ + false /* persistent_data */ + }, + { NULL, false, false } + }; + retroEnv(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars); retroEnv(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); + retroEnv(RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE, (void*)content_overrides); } RETRO_API void retro_set_video_refresh(retro_video_refresh_t sendFrame) @@ -1034,7 +1044,43 @@ extern "C" { _console->GetSettings()->SetControllerType(2, ControllerType::None); _console->GetSettings()->SetControllerType(3, ControllerType::None); - VirtualFile romData(game->data, game->size, game->path); + // Attempt to fetch extended game info + const struct retro_game_info_ext *gameExt = NULL; + const void *gameData = NULL; + size_t gameSize = 0; + string gamePath(""); + if (retroEnv(RETRO_ENVIRONMENT_GET_GAME_INFO_EXT, &gameExt)) { + gameData = gameExt->data; + gameSize = gameExt->size; + if (gameExt->file_in_archive) { + // We don't have a 'physical' file in this + // case, but the core still needs a filename + // in order to detect associated content + // (i.e. HdPacks). We therefore fake it, using + // the content directory, canonical content + // name, and content file extension +#if defined(_WIN32) + char slash = '\\'; +#else + char slash = '/'; +#endif + gamePath = string(gameExt->dir) + + string(1, slash) + + string(gameExt->name) + + "." + + string(gameExt->ext); + } else { + gamePath = gameExt->full_path; + } + } else { + // No extended game info; all we have is the + // content fullpath from the retro_game_info + // struct + gamePath = game->path; + } + + // Load content + VirtualFile romData(gameData, gameSize, gamePath); bool result = _console->Initialize(romData); if(result) { @@ -1084,7 +1130,9 @@ extern "C" { info->library_name = "Mesen"; info->library_version = _mesenVersion.c_str(); - info->need_fullpath = false; + // need_fullpath is required since HdPacks are + // identified via the rom file name + info->need_fullpath = true; info->valid_extensions = "nes|fds|unf|unif"; info->block_extract = false; } diff --git a/Libretro/libretro.h b/Libretro/libretro.h index 315123c9..352a8d1c 100644 --- a/Libretro/libretro.h +++ b/Libretro/libretro.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2017 The RetroArch team +/* Copyright (C) 2010-2020 The RetroArch team * * --------------------------------------------------------------------------------------- * The following license statement only applies to this libretro API header (libretro.h). @@ -32,7 +32,7 @@ extern "C" { #endif #ifndef __cplusplus -#if defined(_MSC_VER) && !defined(SN_TARGET_PS3) +#if defined(_MSC_VER) && _MSC_VER < 1800 && !defined(SN_TARGET_PS3) /* Hack applied for MSVC when compiling in C89 mode * as it isn't C99-compliant. */ #define bool unsigned char @@ -128,7 +128,8 @@ extern "C" { /* LIGHTGUN device is similar to Guncon-2 for PlayStation 2. * It reports X/Y coordinates in screen space (similar to the pointer) - * in the range [-0x8000, 0x7fff] in both axes, with zero being center. + * in the range [-0x8000, 0x7fff] in both axes, with zero being center and + * -0x8000 being out of bounds. * As well as reporting on/off screen state. It features a trigger, * start/select buttons, auxiliary action buttons and a * directional pad. A forced off-screen shot can be requested for @@ -139,7 +140,8 @@ extern "C" { /* The ANALOG device is an extension to JOYPAD (RetroPad). * Similar to DualShock2 it adds two analog sticks and all buttons can * be analog. This is treated as a separate device type as it returns - * axis values in the full analog range of [-0x8000, 0x7fff]. + * axis values in the full analog range of [-0x7fff, 0x7fff], + * although some devices may return -0x8000. * Positive X axis is right. Positive Y axis is down. * Buttons are returned in the range [0, 0x7fff]. * Only use ANALOG type when polling for analog values. @@ -200,6 +202,8 @@ extern "C" { #define RETRO_DEVICE_ID_JOYPAD_L3 14 #define RETRO_DEVICE_ID_JOYPAD_R3 15 +#define RETRO_DEVICE_ID_JOYPAD_MASK 256 + /* Index / Id values for ANALOG device. */ #define RETRO_DEVICE_INDEX_ANALOG_LEFT 0 #define RETRO_DEVICE_INDEX_ANALOG_RIGHT 1 @@ -246,6 +250,7 @@ extern "C" { #define RETRO_DEVICE_ID_POINTER_X 0 #define RETRO_DEVICE_ID_POINTER_Y 1 #define RETRO_DEVICE_ID_POINTER_PRESSED 2 +#define RETRO_DEVICE_ID_POINTER_COUNT 3 /* Returned from retro_get_region(). */ #define RETRO_REGION_NTSC 0 @@ -270,6 +275,14 @@ enum retro_language RETRO_LANGUAGE_ESPERANTO = 13, RETRO_LANGUAGE_POLISH = 14, RETRO_LANGUAGE_VIETNAMESE = 15, + RETRO_LANGUAGE_ARABIC = 16, + RETRO_LANGUAGE_GREEK = 17, + RETRO_LANGUAGE_TURKISH = 18, + RETRO_LANGUAGE_SLOVAK = 19, + RETRO_LANGUAGE_PERSIAN = 20, + RETRO_LANGUAGE_HEBREW = 21, + RETRO_LANGUAGE_ASTURIAN = 22, + RETRO_LANGUAGE_FINNISH = 23, RETRO_LANGUAGE_LAST, /* Ensure sizeof(enum) == sizeof(int) */ @@ -375,6 +388,10 @@ enum retro_key RETROK_x = 120, RETROK_y = 121, RETROK_z = 122, + RETROK_LEFTBRACE = 123, + RETROK_BAR = 124, + RETROK_RIGHTBRACE = 125, + RETROK_TILDE = 126, RETROK_DELETE = 127, RETROK_KP0 = 256, @@ -445,6 +462,7 @@ enum retro_key RETROK_POWER = 320, RETROK_EURO = 321, RETROK_UNDO = 322, + RETROK_OEM_102 = 323, RETROK_LAST, @@ -476,11 +494,13 @@ enum retro_mod /* Environment commands. */ #define RETRO_ENVIRONMENT_SET_ROTATION 1 /* const unsigned * -- * Sets screen rotation of graphics. - * Is only implemented if rotation can be accelerated by hardware. * Valid values are 0, 1, 2, 3, which rotates screen by 0, 90, 180, * 270 degrees counter-clockwise respectively. */ #define RETRO_ENVIRONMENT_GET_OVERSCAN 2 /* bool * -- + * NOTE: As of 2019 this callback is considered deprecated in favor of + * using core options to manage overscan in a more nuanced, core-specific way. + * * Boolean value whether or not the implementation should use overscan, * or crop away overscan. */ @@ -594,8 +614,11 @@ enum retro_mod * GET_VARIABLE. * This allows the frontend to present these variables to * a user dynamically. - * This should be called as early as possible (ideally in - * retro_set_environment). + * This should be called the first time as early as + * possible (ideally in retro_set_environment). + * Afterward it may be called again for the core to communicate + * updated options to the frontend, but the number of core + * options must not change from the number in the initial call. * * 'data' points to an array of retro_variable structs * terminated by a { NULL, NULL } element. @@ -649,6 +672,15 @@ enum retro_mod /* Environment 20 was an obsolete version of SET_AUDIO_CALLBACK. * It was not used by any known core at the time, * and was removed from the API. */ +#define RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK 21 + /* const struct retro_frame_time_callback * -- + * Lets the core know how much time has passed since last + * invocation of retro_run(). + * The frontend can tamper with the timing to fake fast-forward, + * slow-motion, frame stepping, etc. + * In this case the delta time will use the reference value + * in frame_time_callback.. + */ #define RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK 22 /* const struct retro_audio_callback * -- * Sets an interface which is used to notify a libretro core about audio @@ -675,21 +707,15 @@ enum retro_mod * A libretro core using SET_AUDIO_CALLBACK should also make use of * SET_FRAME_TIME_CALLBACK. */ -#define RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK 21 - /* const struct retro_frame_time_callback * -- - * Lets the core know how much time has passed since last - * invocation of retro_run(). - * The frontend can tamper with the timing to fake fast-forward, - * slow-motion, frame stepping, etc. - * In this case the delta time will use the reference value - * in frame_time_callback.. - */ #define RETRO_ENVIRONMENT_GET_RUMBLE_INTERFACE 23 /* struct retro_rumble_interface * -- * Gets an interface which is used by a libretro core to set * state of rumble motors in controllers. * A strong and weak motor is supported, and they can be * controlled indepedently. + * Should be called from either retro_init() or retro_load_game(). + * Should not be called from retro_set_environment(). + * Returns false if rumble functionality is unavailable. */ #define RETRO_ENVIRONMENT_GET_INPUT_DEVICE_CAPABILITIES 24 /* uint64_t * -- @@ -770,17 +796,18 @@ enum retro_mod */ #define RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY 31 /* const char ** -- - * Returns the "save" directory of the frontend. - * This directory can be used to store SRAM, memory cards, - * high scores, etc, if the libretro core + * Returns the "save" directory of the frontend, unless there is no + * save directory available. The save directory should be used to + * store SRAM, memory cards, high scores, etc, if the libretro core * cannot use the regular memory interface (retro_get_memory_data()). * - * NOTE: libretro cores used to check GET_SYSTEM_DIRECTORY for - * similar things before. - * They should still check GET_SYSTEM_DIRECTORY if they want to - * be backwards compatible. - * The path here can be NULL. It should only be non-NULL if the - * frontend user has set a specific save path. + * If the frontend cannot designate a save directory, it will return + * NULL to indicate that the core should attempt to operate without a + * save directory set. + * + * NOTE: early libretro cores used the system directory for save + * files. Cores that need to be backwards-compatible can still check + * GET_SYSTEM_DIRECTORY. */ #define RETRO_ENVIRONMENT_SET_SYSTEM_AV_INFO 32 /* const struct retro_system_av_info * -- @@ -848,26 +875,39 @@ enum retro_mod #define RETRO_ENVIRONMENT_SET_CONTROLLER_INFO 35 /* const struct retro_controller_info * -- * This environment call lets a libretro core tell the frontend - * which controller types are recognized in calls to + * which controller subclasses are recognized in calls to * retro_set_controller_port_device(). * - * Some emulators such as Super Nintendo - * support multiple lightgun types which must be specifically - * selected from. - * It is therefore sometimes necessary for a frontend to be able - * to tell the core about a special kind of input device which is - * not covered by the libretro input API. + * Some emulators such as Super Nintendo support multiple lightgun + * types which must be specifically selected from. It is therefore + * sometimes necessary for a frontend to be able to tell the core + * about a special kind of input device which is not specifcally + * provided by the Libretro API. * - * In order for a frontend to understand the workings of an input device, - * it must be a specialized type - * of the generic device types already defined in the libretro API. + * In order for a frontend to understand the workings of those devices, + * they must be defined as a specialized subclass of the generic device + * types already defined in the libretro API. * - * Which devices are supported can vary per input port. * The core must pass an array of const struct retro_controller_info which - * is terminated with a blanked out struct. Each element of the struct - * corresponds to an ascending port index to - * retro_set_controller_port_device(). - * Even if special device types are set in the libretro core, + * is terminated with a blanked out struct. Each element of the + * retro_controller_info struct corresponds to the ascending port index + * that is passed to retro_set_controller_port_device() when that function + * is called to indicate to the core that the frontend has changed the + * active device subclass. SEE ALSO: retro_set_controller_port_device() + * + * The ascending input port indexes provided by the core in the struct + * are generally presented by frontends as ascending User # or Player #, + * such as Player 1, Player 2, Player 3, etc. Which device subclasses are + * supported can vary per input port. + * + * The first inner element of each entry in the retro_controller_info array + * is a retro_controller_description struct that specifies the names and + * codes of all device subclasses that are available for the corresponding + * User or Player, beginning with the generic Libretro device that the + * subclasses are derived from. The second inner element of each entry is the + * total number of subclasses that are listed in the retro_controller_description. + * + * NOTE: Even if special device types are set in the libretro core, * libretro should only poll input based on the base input device types. */ #define RETRO_ENVIRONMENT_SET_MEMORY_MAPS (36 | RETRO_ENVIRONMENT_EXPERIMENTAL) @@ -946,7 +986,37 @@ enum retro_mod * A frontend must make sure that the pointer obtained from this function is * writeable (and readable). */ - +#define RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE (41 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* const struct retro_hw_render_interface ** -- + * Returns an API specific rendering interface for accessing API specific data. + * Not all HW rendering APIs support or need this. + * The contents of the returned pointer is specific to the rendering API + * being used. See the various headers like libretro_vulkan.h, etc. + * + * GET_HW_RENDER_INTERFACE cannot be called before context_reset has been called. + * Similarly, after context_destroyed callback returns, + * the contents of the HW_RENDER_INTERFACE are invalidated. + */ +#define RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS (42 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* const bool * -- + * If true, the libretro implementation supports achievements + * either via memory descriptors set with RETRO_ENVIRONMENT_SET_MEMORY_MAPS + * or via retro_get_memory_data/retro_get_memory_size. + * + * This must be called before the first call to retro_run. + */ +#define RETRO_ENVIRONMENT_SET_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE (43 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* const struct retro_hw_render_context_negotiation_interface * -- + * Sets an interface which lets the libretro core negotiate with frontend how a context is created. + * The semantics of this interface depends on which API is used in SET_HW_RENDER earlier. + * This interface will be used when the frontend is trying to create a HW rendering context, + * so it will be used after SET_HW_RENDER, but before the context_reset callback. + */ +#define RETRO_ENVIRONMENT_SET_SERIALIZATION_QUIRKS 44 + /* uint64_t * -- + * Sets quirk flags associated with serialization. The frontend will zero any flags it doesn't + * recognize or support. Should be set in either retro_init or retro_load_game, but not both. + */ #define RETRO_ENVIRONMENT_SET_HW_SHARED_CONTEXT (44 | RETRO_ENVIRONMENT_EXPERIMENTAL) /* N/A (null) * -- * The frontend will try to use a 'shared' hardware context (mostly applicable @@ -958,19 +1028,475 @@ enum retro_mod * This will do nothing on its own until SET_HW_RENDER env callbacks are * being used. */ - #define RETRO_ENVIRONMENT_GET_VFS_INTERFACE (45 | RETRO_ENVIRONMENT_EXPERIMENTAL) /* struct retro_vfs_interface_info * -- * Gets access to the VFS interface. * VFS presence needs to be queried prior to load_game or any * get_system/save/other_directory being called to let front end know * core supports VFS before it starts handing out paths. - * It is recomended to do so in retro_set_environment */ + * It is recomended to do so in retro_set_environment + */ +#define RETRO_ENVIRONMENT_GET_LED_INTERFACE (46 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* struct retro_led_interface * -- + * Gets an interface which is used by a libretro core to set + * state of LEDs. + */ +#define RETRO_ENVIRONMENT_GET_AUDIO_VIDEO_ENABLE (47 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* int * -- + * Tells the core if the frontend wants audio or video. + * If disabled, the frontend will discard the audio or video, + * so the core may decide to skip generating a frame or generating audio. + * This is mainly used for increasing performance. + * Bit 0 (value 1): Enable Video + * Bit 1 (value 2): Enable Audio + * Bit 2 (value 4): Use Fast Savestates. + * Bit 3 (value 8): Hard Disable Audio + * Other bits are reserved for future use and will default to zero. + * If video is disabled: + * * The frontend wants the core to not generate any video, + * including presenting frames via hardware acceleration. + * * The frontend's video frame callback will do nothing. + * * After running the frame, the video output of the next frame should be + * no different than if video was enabled, and saving and loading state + * should have no issues. + * If audio is disabled: + * * The frontend wants the core to not generate any audio. + * * The frontend's audio callbacks will do nothing. + * * After running the frame, the audio output of the next frame should be + * no different than if audio was enabled, and saving and loading state + * should have no issues. + * Fast Savestates: + * * Guaranteed to be created by the same binary that will load them. + * * Will not be written to or read from the disk. + * * Suggest that the core assumes loading state will succeed. + * * Suggest that the core updates its memory buffers in-place if possible. + * * Suggest that the core skips clearing memory. + * * Suggest that the core skips resetting the system. + * * Suggest that the core may skip validation steps. + * Hard Disable Audio: + * * Used for a secondary core when running ahead. + * * Indicates that the frontend will never need audio from the core. + * * Suggests that the core may stop synthesizing audio, but this should not + * compromise emulation accuracy. + * * Audio output for the next frame does not matter, and the frontend will + * never need an accurate audio state in the future. + * * State will never be saved when using Hard Disable Audio. + */ +#define RETRO_ENVIRONMENT_GET_MIDI_INTERFACE (48 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* struct retro_midi_interface ** -- + * Returns a MIDI interface that can be used for raw data I/O. + */ + +#define RETRO_ENVIRONMENT_GET_FASTFORWARDING (49 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* bool * -- + * Boolean value that indicates whether or not the frontend is in + * fastforwarding mode. + */ + +#define RETRO_ENVIRONMENT_GET_TARGET_REFRESH_RATE (50 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* float * -- + * Float value that lets us know what target refresh rate + * is curently in use by the frontend. + * + * The core can use the returned value to set an ideal + * refresh rate/framerate. + */ + +#define RETRO_ENVIRONMENT_GET_INPUT_BITMASKS (51 | RETRO_ENVIRONMENT_EXPERIMENTAL) + /* bool * -- + * Boolean value that indicates whether or not the frontend supports + * input bitmasks being returned by retro_input_state_t. The advantage + * of this is that retro_input_state_t has to be only called once to + * grab all button states instead of multiple times. + * + * If it returns true, you can pass RETRO_DEVICE_ID_JOYPAD_MASK as 'id' + * to retro_input_state_t (make sure 'device' is set to RETRO_DEVICE_JOYPAD). + * It will return a bitmask of all the digital buttons. + */ + +#define RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION 52 + /* unsigned * -- + * Unsigned value is the API version number of the core options + * interface supported by the frontend. If callback return false, + * API version is assumed to be 0. + * + * In legacy code, core options are set by passing an array of + * retro_variable structs to RETRO_ENVIRONMENT_SET_VARIABLES. + * This may be still be done regardless of the core options + * interface version. + * + * If version is >= 1 however, core options may instead be set by + * passing an array of retro_core_option_definition structs to + * RETRO_ENVIRONMENT_SET_CORE_OPTIONS, or a 2D array of + * retro_core_option_definition structs to RETRO_ENVIRONMENT_SET_CORE_OPTIONS_INTL. + * This allows the core to additionally set option sublabel information + * and/or provide localisation support. + */ + +#define RETRO_ENVIRONMENT_SET_CORE_OPTIONS 53 + /* const struct retro_core_option_definition ** -- + * Allows an implementation to signal the environment + * which variables it might want to check for later using + * GET_VARIABLE. + * This allows the frontend to present these variables to + * a user dynamically. + * This should only be called if RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION + * returns an API version of >= 1. + * This should be called instead of RETRO_ENVIRONMENT_SET_VARIABLES. + * This should be called the first time as early as + * possible (ideally in retro_set_environment). + * Afterwards it may be called again for the core to communicate + * updated options to the frontend, but the number of core + * options must not change from the number in the initial call. + * + * 'data' points to an array of retro_core_option_definition structs + * terminated by a { NULL, NULL, NULL, {{0}}, NULL } element. + * retro_core_option_definition::key should be namespaced to not collide + * with other implementations' keys. e.g. A core called + * 'foo' should use keys named as 'foo_option'. + * retro_core_option_definition::desc should contain a human readable + * description of the key. + * retro_core_option_definition::info should contain any additional human + * readable information text that a typical user may need to + * understand the functionality of the option. + * retro_core_option_definition::values is an array of retro_core_option_value + * structs terminated by a { NULL, NULL } element. + * > retro_core_option_definition::values[index].value is an expected option + * value. + * > retro_core_option_definition::values[index].label is a human readable + * label used when displaying the value on screen. If NULL, + * the value itself is used. + * retro_core_option_definition::default_value is the default core option + * setting. It must match one of the expected option values in the + * retro_core_option_definition::values array. If it does not, or the + * default value is NULL, the first entry in the + * retro_core_option_definition::values array is treated as the default. + * + * The number of possible options should be very limited, + * and must be less than RETRO_NUM_CORE_OPTION_VALUES_MAX. + * i.e. it should be feasible to cycle through options + * without a keyboard. + * + * Example entry: + * { + * "foo_option", + * "Speed hack coprocessor X", + * "Provides increased performance at the expense of reduced accuracy", + * { + * { "false", NULL }, + * { "true", NULL }, + * { "unstable", "Turbo (Unstable)" }, + * { NULL, NULL }, + * }, + * "false" + * } + * + * Only strings are operated on. The possible values will + * generally be displayed and stored as-is by the frontend. + */ + +#define RETRO_ENVIRONMENT_SET_CORE_OPTIONS_INTL 54 + /* const struct retro_core_options_intl * -- + * Allows an implementation to signal the environment + * which variables it might want to check for later using + * GET_VARIABLE. + * This allows the frontend to present these variables to + * a user dynamically. + * This should only be called if RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION + * returns an API version of >= 1. + * This should be called instead of RETRO_ENVIRONMENT_SET_VARIABLES. + * This should be called the first time as early as + * possible (ideally in retro_set_environment). + * Afterwards it may be called again for the core to communicate + * updated options to the frontend, but the number of core + * options must not change from the number in the initial call. + * + * This is fundamentally the same as RETRO_ENVIRONMENT_SET_CORE_OPTIONS, + * with the addition of localisation support. The description of the + * RETRO_ENVIRONMENT_SET_CORE_OPTIONS callback should be consulted + * for further details. + * + * 'data' points to a retro_core_options_intl struct. + * + * retro_core_options_intl::us is a pointer to an array of + * retro_core_option_definition structs defining the US English + * core options implementation. It must point to a valid array. + * + * retro_core_options_intl::local is a pointer to an array of + * retro_core_option_definition structs defining core options for + * the current frontend language. It may be NULL (in which case + * retro_core_options_intl::us is used by the frontend). Any items + * missing from this array will be read from retro_core_options_intl::us + * instead. + * + * NOTE: Default core option values are always taken from the + * retro_core_options_intl::us array. Any default values in + * retro_core_options_intl::local array will be ignored. + */ + +#define RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY 55 + /* struct retro_core_option_display * -- + * + * Allows an implementation to signal the environment to show + * or hide a variable when displaying core options. This is + * considered a *suggestion*. The frontend is free to ignore + * this callback, and its implementation not considered mandatory. + * + * 'data' points to a retro_core_option_display struct + * + * retro_core_option_display::key is a variable identifier + * which has already been set by SET_VARIABLES/SET_CORE_OPTIONS. + * + * retro_core_option_display::visible is a boolean, specifying + * whether variable should be displayed + * + * Note that all core option variables will be set visible by + * default when calling SET_VARIABLES/SET_CORE_OPTIONS. + */ + +#define RETRO_ENVIRONMENT_GET_PREFERRED_HW_RENDER 56 + /* unsigned * -- + * + * Allows an implementation to ask frontend preferred hardware + * context to use. Core should use this information to deal + * with what specific context to request with SET_HW_RENDER. + * + * 'data' points to an unsigned variable + */ + +#define RETRO_ENVIRONMENT_GET_DISK_CONTROL_INTERFACE_VERSION 57 + /* unsigned * -- + * Unsigned value is the API version number of the disk control + * interface supported by the frontend. If callback return false, + * API version is assumed to be 0. + * + * In legacy code, the disk control interface is defined by passing + * a struct of type retro_disk_control_callback to + * RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE. + * This may be still be done regardless of the disk control + * interface version. + * + * If version is >= 1 however, the disk control interface may + * instead be defined by passing a struct of type + * retro_disk_control_ext_callback to + * RETRO_ENVIRONMENT_SET_DISK_CONTROL_EXT_INTERFACE. + * This allows the core to provide additional information about + * disk images to the frontend and/or enables extra + * disk control functionality by the frontend. + */ + +#define RETRO_ENVIRONMENT_SET_DISK_CONTROL_EXT_INTERFACE 58 + /* const struct retro_disk_control_ext_callback * -- + * Sets an interface which frontend can use to eject and insert + * disk images, and also obtain information about individual + * disk image files registered by the core. + * This is used for games which consist of multiple images and + * must be manually swapped out by the user (e.g. PSX, floppy disk + * based systems). + */ + +#define RETRO_ENVIRONMENT_GET_MESSAGE_INTERFACE_VERSION 59 + /* unsigned * -- + * Unsigned value is the API version number of the message + * interface supported by the frontend. If callback returns + * false, API version is assumed to be 0. + * + * In legacy code, messages may be displayed in an + * implementation-specific manner by passing a struct + * of type retro_message to RETRO_ENVIRONMENT_SET_MESSAGE. + * This may be still be done regardless of the message + * interface version. + * + * If version is >= 1 however, messages may instead be + * displayed by passing a struct of type retro_message_ext + * to RETRO_ENVIRONMENT_SET_MESSAGE_EXT. This allows the + * core to specify message logging level, priority and + * destination (OSD, logging interface or both). + */ + +#define RETRO_ENVIRONMENT_SET_MESSAGE_EXT 60 + /* const struct retro_message_ext * -- + * Sets a message to be displayed in an implementation-specific + * manner for a certain amount of 'frames'. Additionally allows + * the core to specify message logging level, priority and + * destination (OSD, logging interface or both). + * Should not be used for trivial messages, which should simply be + * logged via RETRO_ENVIRONMENT_GET_LOG_INTERFACE (or as a + * fallback, stderr). + */ + +#define RETRO_ENVIRONMENT_GET_INPUT_MAX_USERS 61 + /* unsigned * -- + * Unsigned value is the number of active input devices + * provided by the frontend. This may change between + * frames, but will remain constant for the duration + * of each frame. + * If callback returns true, a core need not poll any + * input device with an index greater than or equal to + * the number of active devices. + * If callback returns false, the number of active input + * devices is unknown. In this case, all input devices + * should be considered active. + */ + +#define RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK 62 + /* const struct retro_audio_buffer_status_callback * -- + * Lets the core know the occupancy level of the frontend + * audio buffer. Can be used by a core to attempt frame + * skipping in order to avoid buffer under-runs. + * A core may pass NULL to disable buffer status reporting + * in the frontend. + */ + +#define RETRO_ENVIRONMENT_SET_MINIMUM_AUDIO_LATENCY 63 + /* const unsigned * -- + * Sets minimum frontend audio latency in milliseconds. + * Resultant audio latency may be larger than set value, + * or smaller if a hardware limit is encountered. A frontend + * is expected to honour requests up to 512 ms. + * + * - If value is less than current frontend + * audio latency, callback has no effect + * - If value is zero, default frontend audio + * latency is set + * + * May be used by a core to increase audio latency and + * therefore decrease the probability of buffer under-runs + * (crackling) when performing 'intensive' operations. + * A core utilising RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK + * to implement audio-buffer-based frame skipping may achieve + * optimal results by setting the audio latency to a 'high' + * (typically 6x or 8x) integer multiple of the expected + * frame time. + * + * WARNING: This can only be called from within retro_run(). + * Calling this can require a full reinitialization of audio + * drivers in the frontend, so it is important to call it very + * sparingly, and usually only with the users explicit consent. + * An eventual driver reinitialize will happen so that audio + * callbacks happening after this call within the same retro_run() + * call will target the newly initialized driver. + */ + +#define RETRO_ENVIRONMENT_SET_FASTFORWARDING_OVERRIDE 64 + /* const struct retro_fastforwarding_override * -- + * Used by a libretro core to override the current + * fastforwarding mode of the frontend. + * If NULL is passed to this function, the frontend + * will return true if fastforwarding override + * functionality is supported (no change in + * fastforwarding state will occur in this case). + */ + +#define RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE 65 + /* const struct retro_system_content_info_override * -- + * Allows an implementation to override 'global' content + * info parameters reported by retro_get_system_info(). + * Overrides also affect subsystem content info parameters + * set via RETRO_ENVIRONMENT_SET_SUBSYSTEM_INFO. + * This function must be called inside retro_set_environment(). + * If callback returns false, content info overrides + * are unsupported by the frontend, and will be ignored. + * If callback returns true, extended game info may be + * retrieved by calling RETRO_ENVIRONMENT_GET_GAME_INFO_EXT + * in retro_load_game() or retro_load_game_special(). + * + * 'data' points to an array of retro_system_content_info_override + * structs terminated by a { NULL, false, false } element. + * If 'data' is NULL, no changes will be made to the frontend; + * a core may therefore pass NULL in order to test whether + * the RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE and + * RETRO_ENVIRONMENT_GET_GAME_INFO_EXT callbacks are supported + * by the frontend. + * + * For struct member descriptions, see the definition of + * struct retro_system_content_info_override. + * + * Example: + * + * - struct retro_system_info: + * { + * "My Core", // library_name + * "v1.0", // library_version + * "m3u|md|cue|iso|chd|sms|gg|sg", // valid_extensions + * true, // need_fullpath + * false // block_extract + * } + * + * - Array of struct retro_system_content_info_override: + * { + * { + * "md|sms|gg", // extensions + * false, // need_fullpath + * true // persistent_data + * }, + * { + * "sg", // extensions + * false, // need_fullpath + * false // persistent_data + * }, + * { NULL, false, false } + * } + * + * Result: + * - Files of type m3u, cue, iso, chd will not be + * loaded by the frontend. Frontend will pass a + * valid path to the core, and core will handle + * loading internally + * - Files of type md, sms, gg will be loaded by + * the frontend. A valid memory buffer will be + * passed to the core. This memory buffer will + * remain valid until retro_deinit() returns + * - Files of type sg will be loaded by the frontend. + * A valid memory buffer will be passed to the core. + * This memory buffer will remain valid until + * retro_load_game() (or retro_load_game_special()) + * returns + * + * NOTE: If an extension is listed multiple times in + * an array of retro_system_content_info_override + * structs, only the first instance will be registered + */ + +#define RETRO_ENVIRONMENT_GET_GAME_INFO_EXT 66 + /* const struct retro_game_info_ext ** -- + * Allows an implementation to fetch extended game + * information, providing additional content path + * and memory buffer status details. + * This function may only be called inside + * retro_load_game() or retro_load_game_special(). + * If callback returns false, extended game information + * is unsupported by the frontend. In this case, only + * regular retro_game_info will be available. + * RETRO_ENVIRONMENT_GET_GAME_INFO_EXT is guaranteed + * to return true if RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE + * returns true. + * + * 'data' points to an array of retro_game_info_ext structs. + * + * For struct member descriptions, see the definition of + * struct retro_game_info_ext. + * + * - If function is called inside retro_load_game(), + * the retro_game_info_ext array is guaranteed to + * have a size of 1 - i.e. the returned pointer may + * be used to access directly the members of the + * first retro_game_info_ext struct, for example: + * + * struct retro_game_info_ext *game_info_ext; + * if (environ_cb(RETRO_ENVIRONMENT_GET_GAME_INFO_EXT, &game_info_ext)) + * printf("Content Directory: %s\n", game_info_ext->dir); + * + * - If the function is called inside retro_load_game_special(), + * the retro_game_info_ext array is guaranteed to have a + * size equal to the num_info argument passed to + * retro_load_game_special() + */ /* VFS functionality */ /* File paths: - * File paths passed as parameters when using this api shall be well formed unix-style, + * File paths passed as parameters when using this API shall be well formed UNIX-style, * using "/" (unquoted forward slash) as directory separator regardless of the platform's native separator. * Paths shall also include at least one forward slash ("game.bin" is an invalid path, use "./game.bin" instead). * Other than the directory separator, cores shall not make assumptions about path format: @@ -988,6 +1514,10 @@ enum retro_mod * Introduced in VFS API v1 */ struct retro_vfs_file_handle; +/* Opaque directory handle + * Introduced in VFS API v3 */ +struct retro_vfs_dir_handle; + /* File open flags * Introduced in VFS API v1 */ #define RETRO_VFS_FILE_ACCESS_READ (1 << 0) /* Read only mode */ @@ -1007,6 +1537,12 @@ struct retro_vfs_file_handle; #define RETRO_VFS_SEEK_POSITION_CURRENT 1 #define RETRO_VFS_SEEK_POSITION_END 2 +/* stat() result flags + * Introduced in VFS API v3 */ +#define RETRO_VFS_STAT_IS_VALID (1 << 0) +#define RETRO_VFS_STAT_IS_DIRECTORY (1 << 1) +#define RETRO_VFS_STAT_IS_CHARACTER_SPECIAL (1 << 2) + /* Get path from opaque handle. Returns the exact same path passed to file_open when getting the handle * Introduced in VFS API v1 */ typedef const char *(RETRO_CALLCONV *retro_vfs_get_path_t)(struct retro_vfs_file_handle *stream); @@ -1016,7 +1552,7 @@ typedef const char *(RETRO_CALLCONV *retro_vfs_get_path_t)(struct retro_vfs_file * Introduced in VFS API v1 */ typedef struct retro_vfs_file_handle *(RETRO_CALLCONV *retro_vfs_open_t)(const char *path, unsigned mode, unsigned hints); -/* Close the file and release its resources. Must be called if open_file returns non-NULL. Returns 0 on succes, -1 on failure. +/* Close the file and release its resources. Must be called if open_file returns non-NULL. Returns 0 on success, -1 on failure. * Whether the call succeeds ot not, the handle passed as parameter becomes invalid and should no longer be used. * Introduced in VFS API v1 */ typedef int (RETRO_CALLCONV *retro_vfs_close_t)(struct retro_vfs_file_handle *stream); @@ -1025,7 +1561,11 @@ typedef int (RETRO_CALLCONV *retro_vfs_close_t)(struct retro_vfs_file_handle *st * Introduced in VFS API v1 */ typedef int64_t (RETRO_CALLCONV *retro_vfs_size_t)(struct retro_vfs_file_handle *stream); -/* Get the current read / write position for the file. Returns - 1 for error. +/* Truncate file to specified size. Returns 0 on success or -1 on error + * Introduced in VFS API v2 */ +typedef int64_t (RETRO_CALLCONV *retro_vfs_truncate_t)(struct retro_vfs_file_handle *stream, int64_t length); + +/* Get the current read / write position for the file. Returns -1 for error. * Introduced in VFS API v1 */ typedef int64_t (RETRO_CALLCONV *retro_vfs_tell_t)(struct retro_vfs_file_handle *stream); @@ -1053,8 +1593,42 @@ typedef int (RETRO_CALLCONV *retro_vfs_remove_t)(const char *path); * Introduced in VFS API v1 */ typedef int (RETRO_CALLCONV *retro_vfs_rename_t)(const char *old_path, const char *new_path); +/* Stat the specified file. Retruns a bitmask of RETRO_VFS_STAT_* flags, none are set if path was not valid. + * Additionally stores file size in given variable, unless NULL is given. + * Introduced in VFS API v3 */ +typedef int (RETRO_CALLCONV *retro_vfs_stat_t)(const char *path, int32_t *size); + +/* Create the specified directory. Returns 0 on success, -1 on unknown failure, -2 if already exists. + * Introduced in VFS API v3 */ +typedef int (RETRO_CALLCONV *retro_vfs_mkdir_t)(const char *dir); + +/* Open the specified directory for listing. Returns the opaque dir handle, or NULL for error. + * Support for the include_hidden argument may vary depending on the platform. + * Introduced in VFS API v3 */ +typedef struct retro_vfs_dir_handle *(RETRO_CALLCONV *retro_vfs_opendir_t)(const char *dir, bool include_hidden); + +/* Read the directory entry at the current position, and move the read pointer to the next position. + * Returns true on success, false if already on the last entry. + * Introduced in VFS API v3 */ +typedef bool (RETRO_CALLCONV *retro_vfs_readdir_t)(struct retro_vfs_dir_handle *dirstream); + +/* Get the name of the last entry read. Returns a string on success, or NULL for error. + * The returned string pointer is valid until the next call to readdir or closedir. + * Introduced in VFS API v3 */ +typedef const char *(RETRO_CALLCONV *retro_vfs_dirent_get_name_t)(struct retro_vfs_dir_handle *dirstream); + +/* Check if the last entry read was a directory. Returns true if it was, false otherwise (or on error). + * Introduced in VFS API v3 */ +typedef bool (RETRO_CALLCONV *retro_vfs_dirent_is_dir_t)(struct retro_vfs_dir_handle *dirstream); + +/* Close the directory and release its resources. Must be called if opendir returns non-NULL. Returns 0 on success, -1 on failure. + * Whether the call succeeds ot not, the handle passed as parameter becomes invalid and should no longer be used. + * Introduced in VFS API v3 */ +typedef int (RETRO_CALLCONV *retro_vfs_closedir_t)(struct retro_vfs_dir_handle *dirstream); + struct retro_vfs_interface { + /* VFS API v1 */ retro_vfs_get_path_t get_path; retro_vfs_open_t open; retro_vfs_close_t close; @@ -1066,6 +1640,16 @@ struct retro_vfs_interface retro_vfs_flush_t flush; retro_vfs_remove_t remove; retro_vfs_rename_t rename; + /* VFS API v2 */ + retro_vfs_truncate_t truncate; + /* VFS API v3 */ + retro_vfs_stat_t stat; + retro_vfs_mkdir_t mkdir; + retro_vfs_opendir_t opendir; + retro_vfs_readdir_t readdir; + retro_vfs_dirent_get_name_t dirent_get_name; + retro_vfs_dirent_is_dir_t dirent_is_dir; + retro_vfs_closedir_t closedir; }; struct retro_vfs_interface_info @@ -1083,8 +1667,13 @@ struct retro_vfs_interface_info enum retro_hw_render_interface_type { - RETRO_HW_RENDER_INTERFACE_VULKAN = 0, - RETRO_HW_RENDER_INTERFACE_DUMMY = INT_MAX + RETRO_HW_RENDER_INTERFACE_VULKAN = 0, + RETRO_HW_RENDER_INTERFACE_D3D9 = 1, + RETRO_HW_RENDER_INTERFACE_D3D10 = 2, + RETRO_HW_RENDER_INTERFACE_D3D11 = 3, + RETRO_HW_RENDER_INTERFACE_D3D12 = 4, + RETRO_HW_RENDER_INTERFACE_GSKIT_PS2 = 5, + RETRO_HW_RENDER_INTERFACE_DUMMY = INT_MAX }; /* Base struct. All retro_hw_render_interface_* types @@ -1094,26 +1683,42 @@ struct retro_hw_render_interface enum retro_hw_render_interface_type interface_type; unsigned interface_version; }; -#define RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE (41 | RETRO_ENVIRONMENT_EXPERIMENTAL) - /* const struct retro_hw_render_interface ** -- - * Returns an API specific rendering interface for accessing API specific data. - * Not all HW rendering APIs support or need this. - * The contents of the returned pointer is specific to the rendering API - * being used. See the various headers like libretro_vulkan.h, etc. - * - * GET_HW_RENDER_INTERFACE cannot be called before context_reset has been called. - * Similarly, after context_destroyed callback returns, - * the contents of the HW_RENDER_INTERFACE are invalidated. - */ -#define RETRO_ENVIRONMENT_SET_SUPPORT_ACHIEVEMENTS (42 | RETRO_ENVIRONMENT_EXPERIMENTAL) - /* const bool * -- - * If true, the libretro implementation supports achievements - * either via memory descriptors set with RETRO_ENVIRONMENT_SET_MEMORY_MAPS - * or via retro_get_memory_data/retro_get_memory_size. - * - * This must be called before the first call to retro_run. - */ +typedef void (RETRO_CALLCONV *retro_set_led_state_t)(int led, int state); +struct retro_led_interface +{ + retro_set_led_state_t set_led_state; +}; + +/* Retrieves the current state of the MIDI input. + * Returns true if it's enabled, false otherwise. */ +typedef bool (RETRO_CALLCONV *retro_midi_input_enabled_t)(void); + +/* Retrieves the current state of the MIDI output. + * Returns true if it's enabled, false otherwise */ +typedef bool (RETRO_CALLCONV *retro_midi_output_enabled_t)(void); + +/* Reads next byte from the input stream. + * Returns true if byte is read, false otherwise. */ +typedef bool (RETRO_CALLCONV *retro_midi_read_t)(uint8_t *byte); + +/* Writes byte to the output stream. + * 'delta_time' is in microseconds and represent time elapsed since previous write. + * Returns true if byte is written, false otherwise. */ +typedef bool (RETRO_CALLCONV *retro_midi_write_t)(uint8_t byte, uint32_t delta_time); + +/* Flushes previously written data. + * Returns true if successful, false otherwise. */ +typedef bool (RETRO_CALLCONV *retro_midi_flush_t)(void); + +struct retro_midi_interface +{ + retro_midi_input_enabled_t input_enabled; + retro_midi_output_enabled_t output_enabled; + retro_midi_read_t read; + retro_midi_write_t write; + retro_midi_flush_t flush; +}; enum retro_hw_render_context_negotiation_interface_type { @@ -1128,13 +1733,6 @@ struct retro_hw_render_context_negotiation_interface enum retro_hw_render_context_negotiation_interface_type interface_type; unsigned interface_version; }; -#define RETRO_ENVIRONMENT_SET_HW_RENDER_CONTEXT_NEGOTIATION_INTERFACE (43 | RETRO_ENVIRONMENT_EXPERIMENTAL) - /* const struct retro_hw_render_context_negotiation_interface * -- - * Sets an interface which lets the libretro core negotiate with frontend how a context is created. - * The semantics of this interface depends on which API is used in SET_HW_RENDER earlier. - * This interface will be used when the frontend is trying to create a HW rendering context, - * so it will be used after SET_HW_RENDER, but before the context_reset callback. - */ /* Serialized state is incomplete in some way. Set if serialization is * usable in typical end-user cases but should not be relied upon to @@ -1160,20 +1758,17 @@ struct retro_hw_render_context_negotiation_interface * dependence */ #define RETRO_SERIALIZATION_QUIRK_PLATFORM_DEPENDENT (1 << 6) -#define RETRO_ENVIRONMENT_SET_SERIALIZATION_QUIRKS 44 - /* uint64_t * -- - * Sets quirk flags associated with serialization. The frontend will zero any flags it doesn't - * recognize or support. Should be set in either retro_init or retro_load_game, but not both. - */ - -#define RETRO_MEMDESC_CONST (1 << 0) /* The frontend will never change this memory area once retro_load_game has returned. */ -#define RETRO_MEMDESC_BIGENDIAN (1 << 1) /* The memory area contains big endian data. Default is little endian. */ -#define RETRO_MEMDESC_ALIGN_2 (1 << 16) /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */ -#define RETRO_MEMDESC_ALIGN_4 (2 << 16) -#define RETRO_MEMDESC_ALIGN_8 (3 << 16) -#define RETRO_MEMDESC_MINSIZE_2 (1 << 24) /* All memory in this region is accessed at least 2 bytes at the time. */ -#define RETRO_MEMDESC_MINSIZE_4 (2 << 24) -#define RETRO_MEMDESC_MINSIZE_8 (3 << 24) +#define RETRO_MEMDESC_CONST (1 << 0) /* The frontend will never change this memory area once retro_load_game has returned. */ +#define RETRO_MEMDESC_BIGENDIAN (1 << 1) /* The memory area contains big endian data. Default is little endian. */ +#define RETRO_MEMDESC_SYSTEM_RAM (1 << 2) /* The memory area is system RAM. This is main RAM of the gaming system. */ +#define RETRO_MEMDESC_SAVE_RAM (1 << 3) /* The memory area is save RAM. This RAM is usually found on a game cartridge, backed up by a battery. */ +#define RETRO_MEMDESC_VIDEO_RAM (1 << 4) /* The memory area is video RAM (VRAM) */ +#define RETRO_MEMDESC_ALIGN_2 (1 << 16) /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */ +#define RETRO_MEMDESC_ALIGN_4 (2 << 16) +#define RETRO_MEMDESC_ALIGN_8 (3 << 16) +#define RETRO_MEMDESC_MINSIZE_2 (1 << 24) /* All memory in this region is accessed at least 2 bytes at the time. */ +#define RETRO_MEMDESC_MINSIZE_4 (2 << 24) +#define RETRO_MEMDESC_MINSIZE_8 (3 << 24) struct retro_memory_descriptor { uint64_t flags; @@ -1574,6 +2169,10 @@ enum retro_sensor_action { RETRO_SENSOR_ACCELEROMETER_ENABLE = 0, RETRO_SENSOR_ACCELEROMETER_DISABLE, + RETRO_SENSOR_GYROSCOPE_ENABLE, + RETRO_SENSOR_GYROSCOPE_DISABLE, + RETRO_SENSOR_ILLUMINANCE_ENABLE, + RETRO_SENSOR_ILLUMINANCE_DISABLE, RETRO_SENSOR_DUMMY = INT_MAX }; @@ -1582,6 +2181,10 @@ enum retro_sensor_action #define RETRO_SENSOR_ACCELEROMETER_X 0 #define RETRO_SENSOR_ACCELEROMETER_Y 1 #define RETRO_SENSOR_ACCELEROMETER_Z 2 +#define RETRO_SENSOR_GYROSCOPE_X 3 +#define RETRO_SENSOR_GYROSCOPE_Y 4 +#define RETRO_SENSOR_GYROSCOPE_Z 5 +#define RETRO_SENSOR_ILLUMINANCE 6 typedef bool (RETRO_CALLCONV *retro_set_sensor_state_t)(unsigned port, enum retro_sensor_action action, unsigned rate); @@ -1779,6 +2382,30 @@ struct retro_frame_time_callback retro_usec_t reference; }; +/* Notifies a libretro core of the current occupancy + * level of the frontend audio buffer. + * + * - active: 'true' if audio buffer is currently + * in use. Will be 'false' if audio is + * disabled in the frontend + * + * - occupancy: Given as a value in the range [0,100], + * corresponding to the occupancy percentage + * of the audio buffer + * + * - underrun_likely: 'true' if the frontend expects an + * audio buffer underrun during the + * next frame (indicates that a core + * should attempt frame skipping) + * + * It will be called right before retro_run() every frame. */ +typedef void (RETRO_CALLCONV *retro_audio_buffer_status_callback_t)( + bool active, unsigned occupancy, bool underrun_likely); +struct retro_audio_buffer_status_callback +{ + retro_audio_buffer_status_callback_t callback; +}; + /* Pass this to retro_video_refresh_t if rendering to hardware. * Passing NULL to retro_video_refresh_t is still a frame dupe as normal. * */ @@ -1822,6 +2449,10 @@ enum retro_hw_context_type /* Vulkan, see RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE. */ RETRO_HW_CONTEXT_VULKAN = 6, + /* Direct3D, set version_major to select the type of interface + * returned by RETRO_ENVIRONMENT_GET_HW_RENDER_INTERFACE */ + RETRO_HW_CONTEXT_DIRECT3D = 7, + RETRO_HW_CONTEXT_DUMMY = INT_MAX }; @@ -1935,7 +2566,8 @@ struct retro_keyboard_callback retro_keyboard_event_t callback; }; -/* Callbacks for RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE. +/* Callbacks for RETRO_ENVIRONMENT_SET_DISK_CONTROL_INTERFACE & + * RETRO_ENVIRONMENT_SET_DISK_CONTROL_EXT_INTERFACE. * Should be set for implementations which can swap out multiple disk * images in runtime. * @@ -1993,6 +2625,53 @@ typedef bool (RETRO_CALLCONV *retro_replace_image_index_t)(unsigned index, * with replace_image_index. */ typedef bool (RETRO_CALLCONV *retro_add_image_index_t)(void); +/* Sets initial image to insert in drive when calling + * core_load_game(). + * Since we cannot pass the initial index when loading + * content (this would require a major API change), this + * is set by the frontend *before* calling the core's + * retro_load_game()/retro_load_game_special() implementation. + * A core should therefore cache the index/path values and handle + * them inside retro_load_game()/retro_load_game_special(). + * - If 'index' is invalid (index >= get_num_images()), the + * core should ignore the set value and instead use 0 + * - 'path' is used purely for error checking - i.e. when + * content is loaded, the core should verify that the + * disk specified by 'index' has the specified file path. + * This is to guard against auto selecting the wrong image + * if (for example) the user should modify an existing M3U + * playlist. We have to let the core handle this because + * set_initial_image() must be called before loading content, + * i.e. the frontend cannot access image paths in advance + * and thus cannot perform the error check itself. + * If set path and content path do not match, the core should + * ignore the set 'index' value and instead use 0 + * Returns 'false' if index or 'path' are invalid, or core + * does not support this functionality + */ +typedef bool (RETRO_CALLCONV *retro_set_initial_image_t)(unsigned index, const char *path); + +/* Fetches the path of the specified disk image file. + * Returns 'false' if index is invalid (index >= get_num_images()) + * or path is otherwise unavailable. + */ +typedef bool (RETRO_CALLCONV *retro_get_image_path_t)(unsigned index, char *path, size_t len); + +/* Fetches a core-provided 'label' for the specified disk + * image file. In the simplest case this may be a file name + * (without extension), but for cores with more complex + * content requirements information may be provided to + * facilitate user disk swapping - for example, a core + * running floppy-disk-based content may uniquely label + * save disks, data disks, level disks, etc. with names + * corresponding to in-game disk change prompts (so the + * frontend can provide better user guidance than a 'dumb' + * disk index value). + * Returns 'false' if index is invalid (index >= get_num_images()) + * or label is otherwise unavailable. + */ +typedef bool (RETRO_CALLCONV *retro_get_image_label_t)(unsigned index, char *label, size_t len); + struct retro_disk_control_callback { retro_set_eject_state_t set_eject_state; @@ -2006,6 +2685,27 @@ struct retro_disk_control_callback retro_add_image_index_t add_image_index; }; +struct retro_disk_control_ext_callback +{ + retro_set_eject_state_t set_eject_state; + retro_get_eject_state_t get_eject_state; + + retro_get_image_index_t get_image_index; + retro_set_image_index_t set_image_index; + retro_get_num_images_t get_num_images; + + retro_replace_image_index_t replace_image_index; + retro_add_image_index_t add_image_index; + + /* NOTE: Frontend will only attempt to record/restore + * last used disk index if both set_initial_image() + * and get_image_path() are implemented */ + retro_set_initial_image_t set_initial_image; /* Optional - may be NULL */ + + retro_get_image_path_t get_image_path; /* Optional - may be NULL */ + retro_get_image_label_t get_image_label; /* Optional - may be NULL */ +}; + enum retro_pixel_format { /* 0RGB1555, native endian. @@ -2036,6 +2736,104 @@ struct retro_message unsigned frames; /* Duration in frames of message. */ }; +enum retro_message_target +{ + RETRO_MESSAGE_TARGET_ALL = 0, + RETRO_MESSAGE_TARGET_OSD, + RETRO_MESSAGE_TARGET_LOG +}; + +enum retro_message_type +{ + RETRO_MESSAGE_TYPE_NOTIFICATION = 0, + RETRO_MESSAGE_TYPE_NOTIFICATION_ALT, + RETRO_MESSAGE_TYPE_STATUS, + RETRO_MESSAGE_TYPE_PROGRESS +}; + +struct retro_message_ext +{ + /* Message string to be displayed/logged */ + const char *msg; + /* Duration (in ms) of message when targeting the OSD */ + unsigned duration; + /* Message priority when targeting the OSD + * > When multiple concurrent messages are sent to + * the frontend and the frontend does not have the + * capacity to display them all, messages with the + * *highest* priority value should be shown + * > There is no upper limit to a message priority + * value (within the bounds of the unsigned data type) + * > In the reference frontend (RetroArch), the same + * priority values are used for frontend-generated + * notifications, which are typically assigned values + * between 0 and 3 depending upon importance */ + unsigned priority; + /* Message logging level (info, warn, error, etc.) */ + enum retro_log_level level; + /* Message destination: OSD, logging interface or both */ + enum retro_message_target target; + /* Message 'type' when targeting the OSD + * > RETRO_MESSAGE_TYPE_NOTIFICATION: Specifies that a + * message should be handled in identical fashion to + * a standard frontend-generated notification + * > RETRO_MESSAGE_TYPE_NOTIFICATION_ALT: Specifies that + * message is a notification that requires user attention + * or action, but that it should be displayed in a manner + * that differs from standard frontend-generated notifications. + * This would typically correspond to messages that should be + * displayed immediately (independently from any internal + * frontend message queue), and/or which should be visually + * distinguishable from frontend-generated notifications. + * For example, a core may wish to inform the user of + * information related to a disk-change event. It is + * expected that the frontend itself may provide a + * notification in this case; if the core sends a + * message of type RETRO_MESSAGE_TYPE_NOTIFICATION, an + * uncomfortable 'double-notification' may occur. A message + * of RETRO_MESSAGE_TYPE_NOTIFICATION_ALT should therefore + * be presented such that visual conflict with regular + * notifications does not occur + * > RETRO_MESSAGE_TYPE_STATUS: Indicates that message + * is not a standard notification. This typically + * corresponds to 'status' indicators, such as a core's + * internal FPS, which are intended to be displayed + * either permanently while a core is running, or in + * a manner that does not suggest user attention or action + * is required. 'Status' type messages should therefore be + * displayed in a different on-screen location and in a manner + * easily distinguishable from both standard frontend-generated + * notifications and messages of type RETRO_MESSAGE_TYPE_NOTIFICATION_ALT + * > RETRO_MESSAGE_TYPE_PROGRESS: Indicates that message reports + * the progress of an internal core task. For example, in cases + * where a core itself handles the loading of content from a file, + * this may correspond to the percentage of the file that has been + * read. Alternatively, an audio/video playback core may use a + * message of type RETRO_MESSAGE_TYPE_PROGRESS to display the current + * playback position as a percentage of the runtime. 'Progress' type + * messages should therefore be displayed as a literal progress bar, + * where: + * - 'retro_message_ext.msg' is the progress bar title/label + * - 'retro_message_ext.progress' determines the length of + * the progress bar + * NOTE: Message type is a *hint*, and may be ignored + * by the frontend. If a frontend lacks support for + * displaying messages via alternate means than standard + * frontend-generated notifications, it will treat *all* + * messages as having the type RETRO_MESSAGE_TYPE_NOTIFICATION */ + enum retro_message_type type; + /* Task progress when targeting the OSD and message is + * of type RETRO_MESSAGE_TYPE_PROGRESS + * > -1: Unmetered/indeterminate + * > 0-100: Current progress percentage + * NOTE: Since message type is a hint, a frontend may ignore + * progress values. Where relevant, a core should therefore + * include progress percentage within the message string, + * such that the message intent remains clear when displayed + * as a standard frontend-generated notification */ + int8_t progress; +}; + /* Describes how the libretro implementation maps a libretro input bind * to its internal input system through a human readable string. * This string can be used to better let a user configure input. */ @@ -2056,7 +2854,7 @@ struct retro_input_descriptor struct retro_system_info { /* All pointers are owned by libretro implementation, and pointers must - * remain valid until retro_deinit() is called. */ + * remain valid until it is unloaded. */ const char *library_name; /* Descriptive name of library. Should not * contain any version numbers, etc. */ @@ -2069,17 +2867,26 @@ struct retro_system_info * Typically used for a GUI to filter * out extensions. */ - /* If true, retro_load_game() is guaranteed to provide a valid pathname - * in retro_game_info::path. - * ::data and ::size are both invalid. + /* Libretro cores that need to have direct access to their content + * files, including cores which use the path of the content files to + * determine the paths of other files, should set need_fullpath to true. * - * If false, ::data and ::size are guaranteed to be valid, but ::path - * might not be valid. + * Cores should strive for setting need_fullpath to false, + * as it allows the frontend to perform patching, etc. * - * This is typically set to true for libretro implementations that must - * load from file. - * Implementations should strive for setting this to false, as it allows - * the frontend to perform patching, etc. */ + * If need_fullpath is true and retro_load_game() is called: + * - retro_game_info::path is guaranteed to have a valid path + * - retro_game_info::data and retro_game_info::size are invalid + * + * If need_fullpath is false and retro_load_game() is called: + * - retro_game_info::path may be NULL + * - retro_game_info::data and retro_game_info::size are guaranteed + * to be valid + * + * See also: + * - RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY + * - RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY + */ bool need_fullpath; /* If true, the frontend is not allowed to extract any archives before @@ -2089,6 +2896,213 @@ struct retro_system_info bool block_extract; }; +/* Defines overrides which modify frontend handling of + * specific content file types. + * An array of retro_system_content_info_override is + * passed to RETRO_ENVIRONMENT_SET_CONTENT_INFO_OVERRIDE + * NOTE: In the following descriptions, references to + * retro_load_game() may be replaced with + * retro_load_game_special() */ +struct retro_system_content_info_override +{ + /* A list of file extensions for which the override + * should apply, delimited by a 'pipe' character + * (e.g. "md|sms|gg") + * Permitted file extensions are limited to those + * included in retro_system_info::valid_extensions + * and/or retro_subsystem_rom_info::valid_extensions */ + const char *extensions; + + /* Overrides the need_fullpath value set in + * retro_system_info and/or retro_subsystem_rom_info. + * To reiterate: + * + * If need_fullpath is true and retro_load_game() is called: + * - retro_game_info::path is guaranteed to contain a valid + * path to an existent file + * - retro_game_info::data and retro_game_info::size are invalid + * + * If need_fullpath is false and retro_load_game() is called: + * - retro_game_info::path may be NULL + * - retro_game_info::data and retro_game_info::size are guaranteed + * to be valid + * + * In addition: + * + * If need_fullpath is true and retro_load_game() is called: + * - retro_game_info_ext::full_path is guaranteed to contain a valid + * path to an existent file + * - retro_game_info_ext::archive_path may be NULL + * - retro_game_info_ext::archive_file may be NULL + * - retro_game_info_ext::dir is guaranteed to contain a valid path + * to the directory in which the content file exists + * - retro_game_info_ext::name is guaranteed to contain the + * basename of the content file, without extension + * - retro_game_info_ext::ext is guaranteed to contain the + * extension of the content file in lower case format + * - retro_game_info_ext::data and retro_game_info_ext::size + * are invalid + * + * If need_fullpath is false and retro_load_game() is called: + * - If retro_game_info_ext::file_in_archive is false: + * - retro_game_info_ext::full_path is guaranteed to contain + * a valid path to an existent file + * - retro_game_info_ext::archive_path may be NULL + * - retro_game_info_ext::archive_file may be NULL + * - retro_game_info_ext::dir is guaranteed to contain a + * valid path to the directory in which the content file exists + * - retro_game_info_ext::name is guaranteed to contain the + * basename of the content file, without extension + * - retro_game_info_ext::ext is guaranteed to contain the + * extension of the content file in lower case format + * - If retro_game_info_ext::file_in_archive is true: + * - retro_game_info_ext::full_path may be NULL + * - retro_game_info_ext::archive_path is guaranteed to + * contain a valid path to an existent compressed file + * inside which the content file is located + * - retro_game_info_ext::archive_file is guaranteed to + * contain a valid path to an existent content file + * inside the compressed file referred to by + * retro_game_info_ext::archive_path + * e.g. for a compressed file '/path/to/foo.zip' + * containing 'bar.sfc' + * > retro_game_info_ext::archive_path will be '/path/to/foo.zip' + * > retro_game_info_ext::archive_file will be 'bar.sfc' + * - retro_game_info_ext::dir is guaranteed to contain a + * valid path to the directory in which the compressed file + * (containing the content file) exists + * - retro_game_info_ext::name is guaranteed to contain + * EITHER + * 1) the basename of the compressed file (containing + * the content file), without extension + * OR + * 2) the basename of the content file inside the + * compressed file, without extension + * In either case, a core should consider 'name' to + * be the canonical name/ID of the the content file + * - retro_game_info_ext::ext is guaranteed to contain the + * extension of the content file inside the compressed file, + * in lower case format + * - retro_game_info_ext::data and retro_game_info_ext::size are + * guaranteed to be valid */ + bool need_fullpath; + + /* If need_fullpath is false, specifies whether the content + * data buffer available in retro_load_game() is 'persistent' + * + * If persistent_data is false and retro_load_game() is called: + * - retro_game_info::data and retro_game_info::size + * are valid only until retro_load_game() returns + * - retro_game_info_ext::data and retro_game_info_ext::size + * are valid only until retro_load_game() returns + * + * If persistent_data is true and retro_load_game() is called: + * - retro_game_info::data and retro_game_info::size + * are valid until retro_deinit() returns + * - retro_game_info_ext::data and retro_game_info_ext::size + * are valid until retro_deinit() returns */ + bool persistent_data; +}; + +/* Similar to retro_game_info, but provides extended + * information about the source content file and + * game memory buffer status. + * And array of retro_game_info_ext is returned by + * RETRO_ENVIRONMENT_GET_GAME_INFO_EXT + * NOTE: In the following descriptions, references to + * retro_load_game() may be replaced with + * retro_load_game_special() */ +struct retro_game_info_ext +{ + /* - If file_in_archive is false, contains a valid + * path to an existent content file (UTF-8 encoded) + * - If file_in_archive is true, may be NULL */ + const char *full_path; + + /* - If file_in_archive is false, may be NULL + * - If file_in_archive is true, contains a valid path + * to an existent compressed file inside which the + * content file is located (UTF-8 encoded) */ + const char *archive_path; + + /* - If file_in_archive is false, may be NULL + * - If file_in_archive is true, contain a valid path + * to an existent content file inside the compressed + * file referred to by archive_path (UTF-8 encoded) + * e.g. for a compressed file '/path/to/foo.zip' + * containing 'bar.sfc' + * > archive_path will be '/path/to/foo.zip' + * > archive_file will be 'bar.sfc' */ + const char *archive_file; + + /* - If file_in_archive is false, contains a valid path + * to the directory in which the content file exists + * (UTF-8 encoded) + * - If file_in_archive is true, contains a valid path + * to the directory in which the compressed file + * (containing the content file) exists (UTF-8 encoded) */ + const char *dir; + + /* Contains the canonical name/ID of the content file + * (UTF-8 encoded). Intended for use when identifying + * 'complementary' content named after the loaded file - + * i.e. companion data of a different format (a CD image + * required by a ROM), texture packs, internally handled + * save files, etc. + * - If file_in_archive is false, contains the basename + * of the content file, without extension + * - If file_in_archive is true, then string is + * implementation specific. A frontend may choose to + * set a name value of: + * EITHER + * 1) the basename of the compressed file (containing + * the content file), without extension + * OR + * 2) the basename of the content file inside the + * compressed file, without extension + * RetroArch sets the 'name' value according to (1). + * A frontend that supports routine loading of + * content from archives containing multiple unrelated + * content files may set the 'name' value according + * to (2). */ + const char *name; + + /* - If file_in_archive is false, contains the extension + * of the content file in lower case format + * - If file_in_archive is true, contains the extension + * of the content file inside the compressed file, + * in lower case format */ + const char *ext; + + /* String of implementation specific meta-data. */ + const char *meta; + + /* Memory buffer of loaded game content. Will be NULL: + * IF + * - retro_system_info::need_fullpath is true and + * retro_system_content_info_override::need_fullpath + * is unset + * OR + * - retro_system_content_info_override::need_fullpath + * is true */ + const void *data; + + /* Size of game content memory buffer, in bytes */ + size_t size; + + /* True if loaded content file is inside a compressed + * archive */ + bool file_in_archive; + + /* - If data is NULL, value is unset/ignored + * - If data is non-NULL: + * - If persistent_data is false, data and size are + * valid only until retro_load_game() returns + * - If persistent_data is true, data and size are + * are valid until retro_deinit() returns */ + bool persistent_data; +}; + struct retro_game_geometry { unsigned base_width; /* Nominal video width of game. */ @@ -2130,6 +3144,76 @@ struct retro_variable const char *value; }; +struct retro_core_option_display +{ + /* Variable to configure in RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY */ + const char *key; + + /* Specifies whether variable should be displayed + * when presenting core options to the user */ + bool visible; +}; + +/* Maximum number of values permitted for a core option + * > Note: We have to set a maximum value due the limitations + * of the C language - i.e. it is not possible to create an + * array of structs each containing a variable sized array, + * so the retro_core_option_definition values array must + * have a fixed size. The size limit of 128 is a balancing + * act - it needs to be large enough to support all 'sane' + * core options, but setting it too large may impact low memory + * platforms. In practise, if a core option has more than + * 128 values then the implementation is likely flawed. + * To quote the above API reference: + * "The number of possible options should be very limited + * i.e. it should be feasible to cycle through options + * without a keyboard." + */ +#define RETRO_NUM_CORE_OPTION_VALUES_MAX 128 + +struct retro_core_option_value +{ + /* Expected option value */ + const char *value; + + /* Human-readable value label. If NULL, value itself + * will be displayed by the frontend */ + const char *label; +}; + +struct retro_core_option_definition +{ + /* Variable to query in RETRO_ENVIRONMENT_GET_VARIABLE. */ + const char *key; + + /* Human-readable core option description (used as menu label) */ + const char *desc; + + /* Human-readable core option information (used as menu sublabel) */ + const char *info; + + /* Array of retro_core_option_value structs, terminated by NULL */ + struct retro_core_option_value values[RETRO_NUM_CORE_OPTION_VALUES_MAX]; + + /* Default core option value. Must match one of the values + * in the retro_core_option_value array, otherwise will be + * ignored */ + const char *default_value; +}; + +struct retro_core_options_intl +{ + /* Pointer to an array of retro_core_option_definition structs + * - US English implementation + * - Must point to a valid array */ + struct retro_core_option_definition *us; + + /* Pointer to an array of retro_core_option_definition structs + * - Implementation for current frontend language + * - May be NULL */ + struct retro_core_option_definition *local; +}; + struct retro_game_info { const char *path; /* Path to game, UTF-8 encoded. @@ -2176,6 +3260,47 @@ struct retro_framebuffer Set by frontend in GET_CURRENT_SOFTWARE_FRAMEBUFFER. */ }; +/* Used by a libretro core to override the current + * fastforwarding mode of the frontend */ +struct retro_fastforwarding_override +{ + /* Specifies the runtime speed multiplier that + * will be applied when 'fastforward' is true. + * For example, a value of 5.0 when running 60 FPS + * content will cap the fast-forward rate at 300 FPS. + * Note that the target multiplier may not be achieved + * if the host hardware has insufficient processing + * power. + * Setting a value of 0.0 (or greater than 0.0 but + * less than 1.0) will result in an uncapped + * fast-forward rate (limited only by hardware + * capacity). + * If the value is negative, it will be ignored + * (i.e. the frontend will use a runtime speed + * multiplier of its own choosing) */ + float ratio; + + /* If true, fastforwarding mode will be enabled. + * If false, fastforwarding mode will be disabled. */ + bool fastforward; + + /* If true, and if supported by the frontend, an + * on-screen notification will be displayed while + * 'fastforward' is true. + * If false, and if supported by the frontend, any + * on-screen fast-forward notifications will be + * suppressed */ + bool notification; + + /* If true, the core will have sole control over + * when fastforwarding mode is enabled/disabled; + * the frontend will not be able to change the + * state set by 'fastforward' until either + * 'inhibit_toggle' is set to false, or the core + * is unloaded */ + bool inhibit_toggle; +}; + /* Callbacks */ /* Environment callback. Gives implementations a way of performing @@ -2264,7 +3389,13 @@ RETRO_API void retro_get_system_av_info(struct retro_system_av_info *info); * will only poll input based on that particular device type. It is only a * hint to the libretro core when a core cannot automatically detect the * appropriate input device type on its own. It is also relevant when a - * core can change its behavior depending on device type. */ + * core can change its behavior depending on device type. + * + * As part of the core's implementation of retro_set_controller_port_device, + * the core should call RETRO_ENVIRONMENT_SET_INPUT_DESCRIPTORS to notify the + * frontend if the descriptions for any controls have changed as a + * result of changing the device type. + */ RETRO_API void retro_set_controller_port_device(unsigned port, unsigned device); /* Resets the current game. */ @@ -2296,7 +3427,9 @@ RETRO_API bool retro_unserialize(const void *data, size_t size); RETRO_API void retro_cheat_reset(void); RETRO_API void retro_cheat_set(unsigned index, bool enabled, const char *code); -/* Loads a game. */ +/* Loads a game. + * Return true to indicate successful loading and false to indicate load failure. + */ RETRO_API bool retro_load_game(const struct retro_game_info *game); /* Loads a "special" kind of game. Should not be used, @@ -2306,7 +3439,7 @@ RETRO_API bool retro_load_game_special( const struct retro_game_info *info, size_t num_info ); -/* Unloads a currently loaded game. */ +/* Unloads the currently loaded game. Called before retro_deinit(void). */ RETRO_API void retro_unload_game(void); /* Gets region of game. */ diff --git a/Windows/Renderer.cpp b/Windows/Renderer.cpp index 0cf7a85b..b0a2f988 100644 --- a/Windows/Renderer.cpp +++ b/Windows/Renderer.cpp @@ -288,7 +288,7 @@ HRESULT Renderer::InitDevice() sd.BufferDesc.Width = _realScreenWidth; sd.BufferDesc.Height = _realScreenHeight; sd.BufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; - sd.BufferDesc.RefreshRate.Numerator = _console->GetSettings()->GetExclusiveRefreshRate(); + sd.BufferDesc.RefreshRate.Numerator = _console->GetSettings()->GetExclusiveRefreshRateByModel(_console->GetModel()); sd.BufferDesc.RefreshRate.Denominator = 1; sd.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; sd.Flags = _fullscreen ? DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH : 0;