NES PPU Viewer - implement Always on Top and Floating Window and refactor

This commit is contained in:
adelikat 2014-01-31 22:58:41 +00:00
parent 284eca0545
commit d87978087d
7 changed files with 1357 additions and 1276 deletions

View File

@ -344,10 +344,8 @@ namespace BizHawk.Client.Common
#endregion #endregion
// NESPPU Settings // NESPPU Settings
public ToolDialogSettings NesPPUSettings = new ToolDialogSettings();
public bool AutoLoadNESPPU = false; public bool AutoLoadNESPPU = false;
public bool NESPPUSaveWindowPosition = true;
public int NESPPUWndx = -1;
public int NESPPUWndy = -1;
public int NESPPURefreshRate = 4; public int NESPPURefreshRate = 4;
// NESDebuger Settings // NESDebuger Settings

View File

@ -1195,7 +1195,7 @@ namespace BizHawk.Client.EmuHawk
private void NESPPUViewerMenuItem_Click(object sender, EventArgs e) private void NESPPUViewerMenuItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<NESPPU>(); GlobalWin.Tools.Load<NesPPU>();
} }
private void NESNametableViewerMenuItem_Click(object sender, EventArgs e) private void NESNametableViewerMenuItem_Click(object sender, EventArgs e)

View File

@ -298,7 +298,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.AutoLoadNESPPU && Global.Emulator is NES) if (Global.Config.AutoLoadNESPPU && Global.Emulator is NES)
{ {
GlobalWin.Tools.Load<NESPPU>(); GlobalWin.Tools.Load<NesPPU>();
} }
if (Global.Config.AutoLoadNESNameTable && Global.Emulator is NES) if (Global.Config.AutoLoadNESNameTable && Global.Emulator is NES)

View File

@ -1,6 +1,6 @@
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
partial class NESPPU partial class NesPPU
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
@ -29,21 +29,21 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NESPPU)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(NesPPU));
this.PatternGroup = new System.Windows.Forms.GroupBox(); this.PatternGroup = new System.Windows.Forms.GroupBox();
this.Table1PaletteLabel = new System.Windows.Forms.Label(); this.Table1PaletteLabel = new System.Windows.Forms.Label();
this.Table0PaletteLabel = new System.Windows.Forms.Label(); this.Table0PaletteLabel = new System.Windows.Forms.Label();
this.PatternView = new BizHawk.Client.EmuHawk.PatternViewer(); this.PatternView = new BizHawk.Client.EmuHawk.PatternViewer();
this.PatternContext = new System.Windows.Forms.ContextMenuStrip(this.components); this.PatternContext = new System.Windows.Forms.ContextMenuStrip(this.components);
this.saveImageToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.PatternSaveImageMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.imageToClipboardToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.PatternImageToClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.refreshToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.PatternRefreshMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.PalettesGroup = new System.Windows.Forms.GroupBox(); this.PalettesGroup = new System.Windows.Forms.GroupBox();
this.PaletteView = new BizHawk.Client.EmuHawk.PaletteViewer(); this.PaletteView = new BizHawk.Client.EmuHawk.PaletteViewer();
this.PaletteContext = new System.Windows.Forms.ContextMenuStrip(this.components); this.PaletteContext = new System.Windows.Forms.ContextMenuStrip(this.components);
this.saveImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PaletteSaveImageMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.imageToClipboardToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.PaletteImageToClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.refreshToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PaletteRefreshMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DetailsBox = new System.Windows.Forms.GroupBox(); this.DetailsBox = new System.Windows.Forms.GroupBox();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.Value5Label = new System.Windows.Forms.Label(); this.Value5Label = new System.Windows.Forms.Label();
@ -57,51 +57,53 @@
this.SpriteViewerBox = new System.Windows.Forms.GroupBox(); this.SpriteViewerBox = new System.Windows.Forms.GroupBox();
this.SpriteView = new BizHawk.Client.EmuHawk.SpriteViewer(); this.SpriteView = new BizHawk.Client.EmuHawk.SpriteViewer();
this.SpriteContext = new System.Windows.Forms.ContextMenuStrip(this.components); this.SpriteContext = new System.Windows.Forms.ContextMenuStrip(this.components);
this.saveImageToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.SpriteSaveImageMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.imageToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SpriteImageToClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.refreshToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.SpriteRefreshMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.txtScanline = new System.Windows.Forms.TextBox(); this.txtScanline = new System.Windows.Forms.TextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.RefreshRate = new System.Windows.Forms.TrackBar(); this.RefreshRate = new System.Windows.Forms.TrackBar();
this.menuStrip1 = new MenuStripEx(); this.NesPPUMenu = new MenuStripEx();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.savePaletteScreenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SavePaletteScreenshotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.savePatternScreenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SavePatternScreenshotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveSpriteScreenshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveSpriteScreenshotMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.savePaletteToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CopyPaletteToClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.copyPatternToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CopyPatternToClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.copySpriteToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CopySpriteToClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.patternToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PatternSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.table0PaletteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.Table0PaletteSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.Table0P0 = new System.Windows.Forms.ToolStripMenuItem(); this.Table0P0MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table0P1 = new System.Windows.Forms.ToolStripMenuItem(); this.Table0P1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table0P2 = new System.Windows.Forms.ToolStripMenuItem(); this.Table0P2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table0P3 = new System.Windows.Forms.ToolStripMenuItem(); this.Table0P3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table0P4 = new System.Windows.Forms.ToolStripMenuItem(); this.Table0P4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table0P5 = new System.Windows.Forms.ToolStripMenuItem(); this.Table0P5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table0P6 = new System.Windows.Forms.ToolStripMenuItem(); this.Table0P6MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table0P7 = new System.Windows.Forms.ToolStripMenuItem(); this.Table0P7MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.table1PaletteToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.Table1PaletteSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.Table1P0 = new System.Windows.Forms.ToolStripMenuItem(); this.Table1P0MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table1P1 = new System.Windows.Forms.ToolStripMenuItem(); this.Table1P1MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table1P2 = new System.Windows.Forms.ToolStripMenuItem(); this.Table1P2MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table1P3 = new System.Windows.Forms.ToolStripMenuItem(); this.Table1P3MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table1P4 = new System.Windows.Forms.ToolStripMenuItem(); this.Table1P4MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table1P5 = new System.Windows.Forms.ToolStripMenuItem(); this.Table1P5MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table1P6 = new System.Windows.Forms.ToolStripMenuItem(); this.Table1P6MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.Table1P7 = new System.Windows.Forms.ToolStripMenuItem(); this.Table1P7MenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SettingsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.autoLoadToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.AutoLoadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveWindowPositionToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.NesPPUStatusBar = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel(); this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
this.messagetimer = new System.Windows.Forms.Timer(this.components); this.Messagetimer = new System.Windows.Forms.Timer(this.components);
this.PatternGroup.SuspendLayout(); this.PatternGroup.SuspendLayout();
this.PatternContext.SuspendLayout(); this.PatternContext.SuspendLayout();
this.PalettesGroup.SuspendLayout(); this.PalettesGroup.SuspendLayout();
@ -113,8 +115,8 @@
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.RefreshRate)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RefreshRate)).BeginInit();
this.menuStrip1.SuspendLayout(); this.NesPPUMenu.SuspendLayout();
this.statusStrip1.SuspendLayout(); this.NesPPUStatusBar.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// PatternGroup // PatternGroup
@ -164,32 +166,32 @@
// PatternContext // PatternContext
// //
this.PatternContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.PatternContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.saveImageToolStripMenuItem1, this.PatternSaveImageMenuItem,
this.imageToClipboardToolStripMenuItem1, this.PatternImageToClipboardMenuItem,
this.refreshToolStripMenuItem1}); this.PatternRefreshMenuItem});
this.PatternContext.Name = "PatternContext"; this.PatternContext.Name = "PatternContext";
this.PatternContext.Size = new System.Drawing.Size(177, 70); this.PatternContext.Size = new System.Drawing.Size(177, 70);
// //
// saveImageToolStripMenuItem1 // PatternSaveImageMenuItem
// //
this.saveImageToolStripMenuItem1.Name = "saveImageToolStripMenuItem1"; this.PatternSaveImageMenuItem.Name = "PatternSaveImageMenuItem";
this.saveImageToolStripMenuItem1.Size = new System.Drawing.Size(176, 22); this.PatternSaveImageMenuItem.Size = new System.Drawing.Size(176, 22);
this.saveImageToolStripMenuItem1.Text = "&Save Image..."; this.PatternSaveImageMenuItem.Text = "&Save Image...";
this.saveImageToolStripMenuItem1.Click += new System.EventHandler(this.saveImageToolStripMenuItem1_Click); this.PatternSaveImageMenuItem.Click += new System.EventHandler(this.SavePatternScreenshotMenuItem_Click);
// //
// imageToClipboardToolStripMenuItem1 // PatternImageToClipboardMenuItem
// //
this.imageToClipboardToolStripMenuItem1.Name = "imageToClipboardToolStripMenuItem1"; this.PatternImageToClipboardMenuItem.Name = "PatternImageToClipboardMenuItem";
this.imageToClipboardToolStripMenuItem1.Size = new System.Drawing.Size(176, 22); this.PatternImageToClipboardMenuItem.Size = new System.Drawing.Size(176, 22);
this.imageToClipboardToolStripMenuItem1.Text = "Image to &Clipboard"; this.PatternImageToClipboardMenuItem.Text = "Image to &Clipboard";
this.imageToClipboardToolStripMenuItem1.Click += new System.EventHandler(this.imageToClipboardToolStripMenuItem1_Click); this.PatternImageToClipboardMenuItem.Click += new System.EventHandler(this.CopyPatternToClipboardMenuItem_Click);
// //
// refreshToolStripMenuItem1 // PatternRefreshMenuItem
// //
this.refreshToolStripMenuItem1.Name = "refreshToolStripMenuItem1"; this.PatternRefreshMenuItem.Name = "PatternRefreshMenuItem";
this.refreshToolStripMenuItem1.Size = new System.Drawing.Size(176, 22); this.PatternRefreshMenuItem.Size = new System.Drawing.Size(176, 22);
this.refreshToolStripMenuItem1.Text = "&Refresh"; this.PatternRefreshMenuItem.Text = "&Refresh";
this.refreshToolStripMenuItem1.Click += new System.EventHandler(this.refreshToolStripMenuItem1_Click); this.PatternRefreshMenuItem.Click += new System.EventHandler(this.PatternRefreshMenuItem_Click);
// //
// PalettesGroup // PalettesGroup
// //
@ -218,32 +220,32 @@
// PaletteContext // PaletteContext
// //
this.PaletteContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.PaletteContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.saveImageToolStripMenuItem, this.PaletteSaveImageMenuItem,
this.imageToClipboardToolStripMenuItem2, this.PaletteImageToClipboardMenuItem,
this.refreshToolStripMenuItem}); this.PaletteRefreshMenuItem});
this.PaletteContext.Name = "PaletteContext"; this.PaletteContext.Name = "PaletteContext";
this.PaletteContext.Size = new System.Drawing.Size(177, 70); this.PaletteContext.Size = new System.Drawing.Size(177, 70);
// //
// saveImageToolStripMenuItem // PaletteSaveImageMenuItem
// //
this.saveImageToolStripMenuItem.Name = "saveImageToolStripMenuItem"; this.PaletteSaveImageMenuItem.Name = "PaletteSaveImageMenuItem";
this.saveImageToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.PaletteSaveImageMenuItem.Size = new System.Drawing.Size(176, 22);
this.saveImageToolStripMenuItem.Text = "&Save Image..."; this.PaletteSaveImageMenuItem.Text = "&Save Image...";
this.saveImageToolStripMenuItem.Click += new System.EventHandler(this.saveImageToolStripMenuItem_Click); this.PaletteSaveImageMenuItem.Click += new System.EventHandler(this.SavePaletteScreenshotMenuItem_Click);
// //
// imageToClipboardToolStripMenuItem2 // PaletteImageToClipboardMenuItem
// //
this.imageToClipboardToolStripMenuItem2.Name = "imageToClipboardToolStripMenuItem2"; this.PaletteImageToClipboardMenuItem.Name = "PaletteImageToClipboardMenuItem";
this.imageToClipboardToolStripMenuItem2.Size = new System.Drawing.Size(176, 22); this.PaletteImageToClipboardMenuItem.Size = new System.Drawing.Size(176, 22);
this.imageToClipboardToolStripMenuItem2.Text = "Image to &Clipboard"; this.PaletteImageToClipboardMenuItem.Text = "Image to &Clipboard";
this.imageToClipboardToolStripMenuItem2.Click += new System.EventHandler(this.imageToClipboardToolStripMenuItem2_Click); this.PaletteImageToClipboardMenuItem.Click += new System.EventHandler(this.CopyPaletteToClipboardMenuItem_Click);
// //
// refreshToolStripMenuItem // PaletteRefreshMenuItem
// //
this.refreshToolStripMenuItem.Name = "refreshToolStripMenuItem"; this.PaletteRefreshMenuItem.Name = "PaletteRefreshMenuItem";
this.refreshToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.PaletteRefreshMenuItem.Size = new System.Drawing.Size(176, 22);
this.refreshToolStripMenuItem.Text = "&Refresh"; this.PaletteRefreshMenuItem.Text = "&Refresh";
this.refreshToolStripMenuItem.Click += new System.EventHandler(this.refreshToolStripMenuItem_Click); this.PaletteRefreshMenuItem.Click += new System.EventHandler(this.PaletteRefreshMenuItem_Click);
// //
// DetailsBox // DetailsBox
// //
@ -371,32 +373,32 @@
// SpriteContext // SpriteContext
// //
this.SpriteContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SpriteContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.saveImageToolStripMenuItem2, this.SpriteSaveImageMenuItem,
this.imageToClipboardToolStripMenuItem, this.SpriteImageToClipboardMenuItem,
this.refreshToolStripMenuItem2}); this.SpriteRefreshMenuItem});
this.SpriteContext.Name = "SpriteContext"; this.SpriteContext.Name = "SpriteContext";
this.SpriteContext.Size = new System.Drawing.Size(177, 70); this.SpriteContext.Size = new System.Drawing.Size(177, 70);
// //
// saveImageToolStripMenuItem2 // SpriteSaveImageMenuItem
// //
this.saveImageToolStripMenuItem2.Name = "saveImageToolStripMenuItem2"; this.SpriteSaveImageMenuItem.Name = "SpriteSaveImageMenuItem";
this.saveImageToolStripMenuItem2.Size = new System.Drawing.Size(176, 22); this.SpriteSaveImageMenuItem.Size = new System.Drawing.Size(176, 22);
this.saveImageToolStripMenuItem2.Text = "&Save Image..."; this.SpriteSaveImageMenuItem.Text = "&Save Image...";
this.saveImageToolStripMenuItem2.Click += new System.EventHandler(this.saveImageToolStripMenuItem2_Click); this.SpriteSaveImageMenuItem.Click += new System.EventHandler(this.SaveSpriteScreenshotMenuItem_Click);
// //
// imageToClipboardToolStripMenuItem // SpriteImageToClipboardMenuItem
// //
this.imageToClipboardToolStripMenuItem.Name = "imageToClipboardToolStripMenuItem"; this.SpriteImageToClipboardMenuItem.Name = "SpriteImageToClipboardMenuItem";
this.imageToClipboardToolStripMenuItem.Size = new System.Drawing.Size(176, 22); this.SpriteImageToClipboardMenuItem.Size = new System.Drawing.Size(176, 22);
this.imageToClipboardToolStripMenuItem.Text = "Image to &Clipboard"; this.SpriteImageToClipboardMenuItem.Text = "Image to &Clipboard";
this.imageToClipboardToolStripMenuItem.Click += new System.EventHandler(this.imageToClipboardToolStripMenuItem_Click); this.SpriteImageToClipboardMenuItem.Click += new System.EventHandler(this.CopySpriteToClipboardMenuItem_Click);
// //
// refreshToolStripMenuItem2 // SpriteRefreshMenuItem
// //
this.refreshToolStripMenuItem2.Name = "refreshToolStripMenuItem2"; this.SpriteRefreshMenuItem.Name = "SpriteRefreshMenuItem";
this.refreshToolStripMenuItem2.Size = new System.Drawing.Size(176, 22); this.SpriteRefreshMenuItem.Size = new System.Drawing.Size(176, 22);
this.refreshToolStripMenuItem2.Text = "&Refresh"; this.SpriteRefreshMenuItem.Text = "&Refresh";
this.refreshToolStripMenuItem2.Click += new System.EventHandler(this.refreshToolStripMenuItem2_Click); this.SpriteRefreshMenuItem.Click += new System.EventHandler(this.SpriteRefreshMenuItem_Click);
// //
// txtScanline // txtScanline
// //
@ -405,7 +407,7 @@
this.txtScanline.Size = new System.Drawing.Size(60, 20); this.txtScanline.Size = new System.Drawing.Size(60, 20);
this.txtScanline.TabIndex = 6; this.txtScanline.TabIndex = 6;
this.txtScanline.Text = "0"; this.txtScanline.Text = "0";
this.txtScanline.TextChanged += new System.EventHandler(this.txtScanline_TextChanged); this.txtScanline.TextChanged += new System.EventHandler(this.ScanlineTextbox_TextChanged);
// //
// groupBox1 // groupBox1
// //
@ -460,278 +462,297 @@
this.RefreshRate.TickFrequency = 8; this.RefreshRate.TickFrequency = 8;
this.RefreshRate.Value = 1; this.RefreshRate.Value = 1;
// //
// menuStrip1 // NesPPUMenu
// //
this.menuStrip1.ClickThrough = true; this.NesPPUMenu.ClickThrough = true;
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NesPPUMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem, this.FileSubMenu,
this.patternToolStripMenuItem, this.PatternSubMenu,
this.settingsToolStripMenuItem}); this.SettingsSubMenu});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.NesPPUMenu.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.NesPPUMenu.Name = "NesPPUMenu";
this.menuStrip1.Size = new System.Drawing.Size(574, 24); this.NesPPUMenu.Size = new System.Drawing.Size(574, 24);
this.menuStrip1.TabIndex = 10; this.NesPPUMenu.TabIndex = 10;
this.menuStrip1.Text = "menuStrip1"; this.NesPPUMenu.Text = "menuStrip1";
// //
// fileToolStripMenuItem // FileSubMenu
// //
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.savePaletteScreenshotToolStripMenuItem, this.SavePaletteScreenshotMenuItem,
this.savePatternScreenshotToolStripMenuItem, this.SavePatternScreenshotMenuItem,
this.saveSpriteScreenshotToolStripMenuItem, this.SaveSpriteScreenshotMenuItem,
this.toolStripSeparator1, this.toolStripSeparator1,
this.savePaletteToClipboardToolStripMenuItem, this.CopyPaletteToClipboardMenuItem,
this.copyPatternToClipboardToolStripMenuItem, this.CopyPatternToClipboardMenuItem,
this.copySpriteToClipboardToolStripMenuItem, this.CopySpriteToClipboardMenuItem,
this.toolStripSeparator2, this.toolStripSeparator2,
this.exitToolStripMenuItem}); this.ExitMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.FileSubMenu.Name = "FileSubMenu";
this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.FileSubMenu.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Text = "&File"; this.FileSubMenu.Text = "&File";
// //
// savePaletteScreenshotToolStripMenuItem // SavePaletteScreenshotMenuItem
// //
this.savePaletteScreenshotToolStripMenuItem.Name = "savePaletteScreenshotToolStripMenuItem"; this.SavePaletteScreenshotMenuItem.Name = "SavePaletteScreenshotMenuItem";
this.savePaletteScreenshotToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.SavePaletteScreenshotMenuItem.Size = new System.Drawing.Size(212, 22);
this.savePaletteScreenshotToolStripMenuItem.Text = "Save Palette Screenshot..."; this.SavePaletteScreenshotMenuItem.Text = "Save Palette Screenshot...";
this.savePaletteScreenshotToolStripMenuItem.Click += new System.EventHandler(this.savePaletteScreenshotToolStripMenuItem_Click); this.SavePaletteScreenshotMenuItem.Click += new System.EventHandler(this.SavePaletteScreenshotMenuItem_Click);
// //
// savePatternScreenshotToolStripMenuItem // SavePatternScreenshotMenuItem
// //
this.savePatternScreenshotToolStripMenuItem.Name = "savePatternScreenshotToolStripMenuItem"; this.SavePatternScreenshotMenuItem.Name = "SavePatternScreenshotMenuItem";
this.savePatternScreenshotToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.SavePatternScreenshotMenuItem.Size = new System.Drawing.Size(212, 22);
this.savePatternScreenshotToolStripMenuItem.Text = "Save Pattern Screenshot..."; this.SavePatternScreenshotMenuItem.Text = "Save Pattern Screenshot...";
this.SavePatternScreenshotMenuItem.Click += new System.EventHandler(this.SavePatternScreenshotMenuItem_Click);
// //
// saveSpriteScreenshotToolStripMenuItem // SaveSpriteScreenshotMenuItem
// //
this.saveSpriteScreenshotToolStripMenuItem.Name = "saveSpriteScreenshotToolStripMenuItem"; this.SaveSpriteScreenshotMenuItem.Name = "SaveSpriteScreenshotMenuItem";
this.saveSpriteScreenshotToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.SaveSpriteScreenshotMenuItem.Size = new System.Drawing.Size(212, 22);
this.saveSpriteScreenshotToolStripMenuItem.Text = "Save Sprite Screenshot..."; this.SaveSpriteScreenshotMenuItem.Text = "Save Sprite Screenshot...";
this.SaveSpriteScreenshotMenuItem.Click += new System.EventHandler(this.SaveSpriteScreenshotMenuItem_Click);
// //
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(209, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(209, 6);
// //
// savePaletteToClipboardToolStripMenuItem // CopyPaletteToClipboardMenuItem
// //
this.savePaletteToClipboardToolStripMenuItem.Name = "savePaletteToClipboardToolStripMenuItem"; this.CopyPaletteToClipboardMenuItem.Name = "CopyPaletteToClipboardMenuItem";
this.savePaletteToClipboardToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.CopyPaletteToClipboardMenuItem.Size = new System.Drawing.Size(212, 22);
this.savePaletteToClipboardToolStripMenuItem.Text = "Copy Palette to Clipboard"; this.CopyPaletteToClipboardMenuItem.Text = "Copy Palette to Clipboard";
this.savePaletteToClipboardToolStripMenuItem.Click += new System.EventHandler(this.savePaletteToClipboardToolStripMenuItem_Click); this.CopyPaletteToClipboardMenuItem.Click += new System.EventHandler(this.CopyPaletteToClipboardMenuItem_Click);
// //
// copyPatternToClipboardToolStripMenuItem // CopyPatternToClipboardMenuItem
// //
this.copyPatternToClipboardToolStripMenuItem.Name = "copyPatternToClipboardToolStripMenuItem"; this.CopyPatternToClipboardMenuItem.Name = "CopyPatternToClipboardMenuItem";
this.copyPatternToClipboardToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.CopyPatternToClipboardMenuItem.Size = new System.Drawing.Size(212, 22);
this.copyPatternToClipboardToolStripMenuItem.Text = "Copy Pattern to Clipboard"; this.CopyPatternToClipboardMenuItem.Text = "Copy Pattern to Clipboard";
this.copyPatternToClipboardToolStripMenuItem.Click += new System.EventHandler(this.copyPatternToClipboardToolStripMenuItem_Click); this.CopyPatternToClipboardMenuItem.Click += new System.EventHandler(this.CopyPatternToClipboardMenuItem_Click);
// //
// copySpriteToClipboardToolStripMenuItem // CopySpriteToClipboardMenuItem
// //
this.copySpriteToClipboardToolStripMenuItem.Name = "copySpriteToClipboardToolStripMenuItem"; this.CopySpriteToClipboardMenuItem.Name = "CopySpriteToClipboardMenuItem";
this.copySpriteToClipboardToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.CopySpriteToClipboardMenuItem.Size = new System.Drawing.Size(212, 22);
this.copySpriteToClipboardToolStripMenuItem.Text = "Copy Sprite to Clipboard"; this.CopySpriteToClipboardMenuItem.Text = "Copy Sprite to Clipboard";
this.copySpriteToClipboardToolStripMenuItem.Click += new System.EventHandler(this.copySpriteToClipboardToolStripMenuItem_Click); this.CopySpriteToClipboardMenuItem.Click += new System.EventHandler(this.CopySpriteToClipboardMenuItem_Click);
// //
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(209, 6); this.toolStripSeparator2.Size = new System.Drawing.Size(209, 6);
// //
// exitToolStripMenuItem // ExitMenuItem
// //
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.ExitMenuItem.Name = "ExitMenuItem";
this.exitToolStripMenuItem.Size = new System.Drawing.Size(212, 22); this.ExitMenuItem.Size = new System.Drawing.Size(212, 22);
this.exitToolStripMenuItem.Text = "E&xit"; this.ExitMenuItem.Text = "E&xit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click);
// //
// patternToolStripMenuItem // PatternSubMenu
// //
this.patternToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.PatternSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.table0PaletteToolStripMenuItem, this.Table0PaletteSubMenu,
this.table1PaletteToolStripMenuItem1}); this.Table1PaletteSubMenu});
this.patternToolStripMenuItem.Name = "patternToolStripMenuItem"; this.PatternSubMenu.Name = "PatternSubMenu";
this.patternToolStripMenuItem.Size = new System.Drawing.Size(57, 20); this.PatternSubMenu.Size = new System.Drawing.Size(57, 20);
this.patternToolStripMenuItem.Text = "&Pattern"; this.PatternSubMenu.Text = "&Pattern";
this.patternToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolStripDropDownButton2_DropDownOpened);
// //
// table0PaletteToolStripMenuItem // Table0PaletteSubMenu
// //
this.table0PaletteToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Table0PaletteSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.Table0P0, this.Table0P0MenuItem,
this.Table0P1, this.Table0P1MenuItem,
this.Table0P2, this.Table0P2MenuItem,
this.Table0P3, this.Table0P3MenuItem,
this.Table0P4, this.Table0P4MenuItem,
this.Table0P5, this.Table0P5MenuItem,
this.Table0P6, this.Table0P6MenuItem,
this.Table0P7}); this.Table0P7MenuItem});
this.table0PaletteToolStripMenuItem.Name = "table0PaletteToolStripMenuItem"; this.Table0PaletteSubMenu.Name = "Table0PaletteSubMenu";
this.table0PaletteToolStripMenuItem.Size = new System.Drawing.Size(151, 22); this.Table0PaletteSubMenu.Size = new System.Drawing.Size(151, 22);
this.table0PaletteToolStripMenuItem.Text = "Table 0 Palette"; this.Table0PaletteSubMenu.Text = "Table 0 Palette";
this.Table0PaletteSubMenu.DropDownOpened += new System.EventHandler(this.Table0PaletteSubMenu_DropDownOpened);
// //
// Table0P0 // Table0P0MenuItem
// //
this.Table0P0.Name = "Table0P0"; this.Table0P0MenuItem.Name = "Table0P0MenuItem";
this.Table0P0.Size = new System.Drawing.Size(80, 22); this.Table0P0MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table0P0.Text = "0"; this.Table0P0MenuItem.Text = "0";
this.Table0P0.Click += new System.EventHandler(this.Palette_Click); this.Table0P0MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table0P1 // Table0P1MenuItem
// //
this.Table0P1.Name = "Table0P1"; this.Table0P1MenuItem.Name = "Table0P1MenuItem";
this.Table0P1.Size = new System.Drawing.Size(80, 22); this.Table0P1MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table0P1.Text = "1"; this.Table0P1MenuItem.Text = "1";
this.Table0P1.Click += new System.EventHandler(this.Palette_Click); this.Table0P1MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table0P2 // Table0P2MenuItem
// //
this.Table0P2.Name = "Table0P2"; this.Table0P2MenuItem.Name = "Table0P2MenuItem";
this.Table0P2.Size = new System.Drawing.Size(80, 22); this.Table0P2MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table0P2.Text = "2"; this.Table0P2MenuItem.Text = "2";
this.Table0P2.Click += new System.EventHandler(this.Palette_Click); this.Table0P2MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table0P3 // Table0P3MenuItem
// //
this.Table0P3.Name = "Table0P3"; this.Table0P3MenuItem.Name = "Table0P3MenuItem";
this.Table0P3.Size = new System.Drawing.Size(80, 22); this.Table0P3MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table0P3.Text = "3"; this.Table0P3MenuItem.Text = "3";
this.Table0P3.Click += new System.EventHandler(this.Palette_Click); this.Table0P3MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table0P4 // Table0P4MenuItem
// //
this.Table0P4.Name = "Table0P4"; this.Table0P4MenuItem.Name = "Table0P4MenuItem";
this.Table0P4.Size = new System.Drawing.Size(80, 22); this.Table0P4MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table0P4.Text = "4"; this.Table0P4MenuItem.Text = "4";
this.Table0P4.Click += new System.EventHandler(this.Palette_Click); this.Table0P4MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table0P5 // Table0P5MenuItem
// //
this.Table0P5.Name = "Table0P5"; this.Table0P5MenuItem.Name = "Table0P5MenuItem";
this.Table0P5.Size = new System.Drawing.Size(80, 22); this.Table0P5MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table0P5.Text = "5"; this.Table0P5MenuItem.Text = "5";
this.Table0P5.Click += new System.EventHandler(this.Palette_Click); this.Table0P5MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table0P6 // Table0P6MenuItem
// //
this.Table0P6.Name = "Table0P6"; this.Table0P6MenuItem.Name = "Table0P6MenuItem";
this.Table0P6.Size = new System.Drawing.Size(80, 22); this.Table0P6MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table0P6.Text = "6"; this.Table0P6MenuItem.Text = "6";
this.Table0P6.Click += new System.EventHandler(this.Palette_Click); this.Table0P6MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table0P7 // Table0P7MenuItem
// //
this.Table0P7.Name = "Table0P7"; this.Table0P7MenuItem.Name = "Table0P7MenuItem";
this.Table0P7.Size = new System.Drawing.Size(80, 22); this.Table0P7MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table0P7.Text = "7"; this.Table0P7MenuItem.Text = "7";
this.Table0P7.Click += new System.EventHandler(this.Palette_Click); this.Table0P7MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// table1PaletteToolStripMenuItem1 // Table1PaletteSubMenu
// //
this.table1PaletteToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.Table1PaletteSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.Table1P0, this.Table1P0MenuItem,
this.Table1P1, this.Table1P1MenuItem,
this.Table1P2, this.Table1P2MenuItem,
this.Table1P3, this.Table1P3MenuItem,
this.Table1P4, this.Table1P4MenuItem,
this.Table1P5, this.Table1P5MenuItem,
this.Table1P6, this.Table1P6MenuItem,
this.Table1P7}); this.Table1P7MenuItem});
this.table1PaletteToolStripMenuItem1.Name = "table1PaletteToolStripMenuItem1"; this.Table1PaletteSubMenu.Name = "Table1PaletteSubMenu";
this.table1PaletteToolStripMenuItem1.Size = new System.Drawing.Size(151, 22); this.Table1PaletteSubMenu.Size = new System.Drawing.Size(151, 22);
this.table1PaletteToolStripMenuItem1.Text = "Table 1 Palette"; this.Table1PaletteSubMenu.Text = "Table 1 Palette";
this.Table1PaletteSubMenu.DropDownOpened += new System.EventHandler(this.Table1PaletteSubMenu_DropDownOpened);
// //
// Table1P0 // Table1P0MenuItem
// //
this.Table1P0.Name = "Table1P0"; this.Table1P0MenuItem.Name = "Table1P0MenuItem";
this.Table1P0.Size = new System.Drawing.Size(80, 22); this.Table1P0MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table1P0.Text = "0"; this.Table1P0MenuItem.Text = "0";
this.Table1P0.Click += new System.EventHandler(this.Palette_Click); this.Table1P0MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table1P1 // Table1P1MenuItem
// //
this.Table1P1.Name = "Table1P1"; this.Table1P1MenuItem.Name = "Table1P1MenuItem";
this.Table1P1.Size = new System.Drawing.Size(80, 22); this.Table1P1MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table1P1.Text = "1"; this.Table1P1MenuItem.Text = "1";
this.Table1P1.Click += new System.EventHandler(this.Palette_Click); this.Table1P1MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table1P2 // Table1P2MenuItem
// //
this.Table1P2.Name = "Table1P2"; this.Table1P2MenuItem.Name = "Table1P2MenuItem";
this.Table1P2.Size = new System.Drawing.Size(80, 22); this.Table1P2MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table1P2.Text = "2"; this.Table1P2MenuItem.Text = "2";
this.Table1P2.Click += new System.EventHandler(this.Palette_Click); this.Table1P2MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table1P3 // Table1P3MenuItem
// //
this.Table1P3.Name = "Table1P3"; this.Table1P3MenuItem.Name = "Table1P3MenuItem";
this.Table1P3.Size = new System.Drawing.Size(80, 22); this.Table1P3MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table1P3.Text = "3"; this.Table1P3MenuItem.Text = "3";
this.Table1P3.Click += new System.EventHandler(this.Palette_Click); this.Table1P3MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table1P4 // Table1P4MenuItem
// //
this.Table1P4.Name = "Table1P4"; this.Table1P4MenuItem.Name = "Table1P4MenuItem";
this.Table1P4.Size = new System.Drawing.Size(80, 22); this.Table1P4MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table1P4.Text = "4"; this.Table1P4MenuItem.Text = "4";
this.Table1P4.Click += new System.EventHandler(this.Palette_Click); this.Table1P4MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table1P5 // Table1P5MenuItem
// //
this.Table1P5.Name = "Table1P5"; this.Table1P5MenuItem.Name = "Table1P5MenuItem";
this.Table1P5.Size = new System.Drawing.Size(80, 22); this.Table1P5MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table1P5.Text = "5"; this.Table1P5MenuItem.Text = "5";
this.Table1P5.Click += new System.EventHandler(this.Palette_Click); this.Table1P5MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table1P6 // Table1P6MenuItem
// //
this.Table1P6.Name = "Table1P6"; this.Table1P6MenuItem.Name = "Table1P6MenuItem";
this.Table1P6.Size = new System.Drawing.Size(80, 22); this.Table1P6MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table1P6.Text = "6"; this.Table1P6MenuItem.Text = "6";
this.Table1P6.Click += new System.EventHandler(this.Palette_Click); this.Table1P6MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// Table1P7 // Table1P7MenuItem
// //
this.Table1P7.Name = "Table1P7"; this.Table1P7MenuItem.Name = "Table1P7MenuItem";
this.Table1P7.Size = new System.Drawing.Size(80, 22); this.Table1P7MenuItem.Size = new System.Drawing.Size(80, 22);
this.Table1P7.Text = "7"; this.Table1P7MenuItem.Text = "7";
this.Table1P7.Click += new System.EventHandler(this.Palette_Click); this.Table1P7MenuItem.Click += new System.EventHandler(this.Palette_Click);
// //
// settingsToolStripMenuItem // SettingsSubMenu
// //
this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SettingsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.autoLoadToolStripMenuItem1, this.AutoLoadMenuItem,
this.saveWindowPositionToolStripMenuItem1}); this.SaveWindowPositionMenuItem,
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; this.AlwaysOnTopMenuItem,
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); this.FloatingWindowMenuItem});
this.settingsToolStripMenuItem.Text = "&Settings"; this.SettingsSubMenu.Name = "SettingsSubMenu";
this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.toolStripDropDownButton1_DropDownOpened); this.SettingsSubMenu.Size = new System.Drawing.Size(61, 20);
this.SettingsSubMenu.Text = "&Settings";
this.SettingsSubMenu.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened);
// //
// autoLoadToolStripMenuItem1 // AutoLoadMenuItem
// //
this.autoLoadToolStripMenuItem1.Name = "autoLoadToolStripMenuItem1"; this.AutoLoadMenuItem.Name = "AutoLoadMenuItem";
this.autoLoadToolStripMenuItem1.Size = new System.Drawing.Size(191, 22); this.AutoLoadMenuItem.Size = new System.Drawing.Size(191, 22);
this.autoLoadToolStripMenuItem1.Text = "Autoload"; this.AutoLoadMenuItem.Text = "Autoload";
this.autoLoadToolStripMenuItem1.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click); this.AutoLoadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click);
// //
// saveWindowPositionToolStripMenuItem1 // SaveWindowPositionMenuItem
// //
this.saveWindowPositionToolStripMenuItem1.Name = "saveWindowPositionToolStripMenuItem1"; this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem";
this.saveWindowPositionToolStripMenuItem1.Size = new System.Drawing.Size(191, 22); this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(191, 22);
this.saveWindowPositionToolStripMenuItem1.Text = "Save Window Position"; this.SaveWindowPositionMenuItem.Text = "Save Window Position";
this.saveWindowPositionToolStripMenuItem1.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click);
// //
// statusStrip1 // AlwaysOnTopMenuItem
// //
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem";
this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(191, 22);
this.AlwaysOnTopMenuItem.Text = "Always On Top";
this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click);
//
// FloatingWindowMenuItem
//
this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem";
this.FloatingWindowMenuItem.Size = new System.Drawing.Size(191, 22);
this.FloatingWindowMenuItem.Text = "Floating Window";
this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click);
//
// NesPPUStatusBar
//
this.NesPPUStatusBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripStatusLabel1}); this.toolStripStatusLabel1});
this.statusStrip1.Location = new System.Drawing.Point(0, 349); this.NesPPUStatusBar.Location = new System.Drawing.Point(0, 349);
this.statusStrip1.Name = "statusStrip1"; this.NesPPUStatusBar.Name = "NesPPUStatusBar";
this.statusStrip1.Size = new System.Drawing.Size(574, 22); this.NesPPUStatusBar.Size = new System.Drawing.Size(574, 22);
this.statusStrip1.SizingGrip = false; this.NesPPUStatusBar.SizingGrip = false;
this.statusStrip1.TabIndex = 11; this.NesPPUStatusBar.TabIndex = 11;
this.statusStrip1.Text = "statusStrip1"; this.NesPPUStatusBar.Text = "statusStrip1";
// //
// toolStripStatusLabel1 // toolStripStatusLabel1
// //
@ -739,36 +760,36 @@
this.toolStripStatusLabel1.Size = new System.Drawing.Size(348, 17); this.toolStripStatusLabel1.Size = new System.Drawing.Size(348, 17);
this.toolStripStatusLabel1.Text = "Use CTRL+C to copy the pane under the mouse to the clipboard."; this.toolStripStatusLabel1.Text = "Use CTRL+C to copy the pane under the mouse to the clipboard.";
// //
// messagetimer // Messagetimer
// //
this.messagetimer.Interval = 5000; this.Messagetimer.Interval = 5000;
this.messagetimer.Tick += new System.EventHandler(this.messagetimer_Tick); this.Messagetimer.Tick += new System.EventHandler(this.MessageTimer_Tick);
// //
// NESPPU // NesPPU
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(574, 371); this.ClientSize = new System.Drawing.Size(574, 371);
this.Controls.Add(this.statusStrip1); this.Controls.Add(this.NesPPUStatusBar);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Controls.Add(this.SpriteViewerBox); this.Controls.Add(this.SpriteViewerBox);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.NesPPUMenu);
this.Controls.Add(this.DetailsBox); this.Controls.Add(this.DetailsBox);
this.Controls.Add(this.PalettesGroup); this.Controls.Add(this.PalettesGroup);
this.Controls.Add(this.PatternGroup); this.Controls.Add(this.PatternGroup);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.KeyPreview = true; this.KeyPreview = true;
this.MainMenuStrip = this.menuStrip1; this.MainMenuStrip = this.NesPPUMenu;
this.MinimumSize = new System.Drawing.Size(580, 370); this.MinimumSize = new System.Drawing.Size(580, 370);
this.Name = "NESPPU"; this.Name = "NesPPU";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "NES PPU Viewer"; this.Text = "NES PPU Viewer";
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.NESPPU_FormClosed); this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.NesPPU_FormClosed);
this.Load += new System.EventHandler(this.NESPPU_Load); this.Load += new System.EventHandler(this.NesPPU_Load);
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.NESPPU_KeyDown); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.NesPPU_KeyDown);
this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.NESPPU_MouseClick); this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.NesPPU_MouseClick);
this.PatternGroup.ResumeLayout(false); this.PatternGroup.ResumeLayout(false);
this.PatternGroup.PerformLayout(); this.PatternGroup.PerformLayout();
this.PatternContext.ResumeLayout(false); this.PatternContext.ResumeLayout(false);
@ -784,10 +805,10 @@
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout(); this.groupBox2.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.RefreshRate)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RefreshRate)).EndInit();
this.menuStrip1.ResumeLayout(false); this.NesPPUMenu.ResumeLayout(false);
this.menuStrip1.PerformLayout(); this.NesPPUMenu.PerformLayout();
this.statusStrip1.ResumeLayout(false); this.NesPPUStatusBar.ResumeLayout(false);
this.statusStrip1.PerformLayout(); this.NesPPUStatusBar.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
@ -819,53 +840,55 @@
private System.Windows.Forms.TrackBar RefreshRate; private System.Windows.Forms.TrackBar RefreshRate;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private MenuStripEx menuStrip1; private MenuStripEx NesPPUMenu;
private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SettingsSubMenu;
private System.Windows.Forms.ToolStripMenuItem autoLoadToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem AutoLoadMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveWindowPositionToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem SaveWindowPositionMenuItem;
private System.Windows.Forms.ToolStripMenuItem patternToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem PatternSubMenu;
private System.Windows.Forms.ToolStripMenuItem table0PaletteToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem Table0PaletteSubMenu;
private System.Windows.Forms.ToolStripMenuItem Table0P0; private System.Windows.Forms.ToolStripMenuItem Table0P0MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table0P1; private System.Windows.Forms.ToolStripMenuItem Table0P1MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table0P2; private System.Windows.Forms.ToolStripMenuItem Table0P2MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table0P3; private System.Windows.Forms.ToolStripMenuItem Table0P3MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table0P4; private System.Windows.Forms.ToolStripMenuItem Table0P4MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table0P5; private System.Windows.Forms.ToolStripMenuItem Table0P5MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table0P6; private System.Windows.Forms.ToolStripMenuItem Table0P6MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table0P7; private System.Windows.Forms.ToolStripMenuItem Table0P7MenuItem;
private System.Windows.Forms.ToolStripMenuItem table1PaletteToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem Table1PaletteSubMenu;
private System.Windows.Forms.ToolStripMenuItem Table1P0; private System.Windows.Forms.ToolStripMenuItem Table1P0MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table1P1; private System.Windows.Forms.ToolStripMenuItem Table1P1MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table1P2; private System.Windows.Forms.ToolStripMenuItem Table1P2MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table1P3; private System.Windows.Forms.ToolStripMenuItem Table1P3MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table1P4; private System.Windows.Forms.ToolStripMenuItem Table1P4MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table1P5; private System.Windows.Forms.ToolStripMenuItem Table1P5MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table1P6; private System.Windows.Forms.ToolStripMenuItem Table1P6MenuItem;
private System.Windows.Forms.ToolStripMenuItem Table1P7; private System.Windows.Forms.ToolStripMenuItem Table1P7MenuItem;
private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem FileSubMenu;
private System.Windows.Forms.ToolStripMenuItem savePaletteScreenshotToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SavePaletteScreenshotMenuItem;
private System.Windows.Forms.ToolStripMenuItem savePatternScreenshotToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SavePatternScreenshotMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveSpriteScreenshotToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SaveSpriteScreenshotMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem ExitMenuItem;
private System.Windows.Forms.ContextMenuStrip PaletteContext; private System.Windows.Forms.ContextMenuStrip PaletteContext;
private System.Windows.Forms.ToolStripMenuItem saveImageToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem PaletteSaveImageMenuItem;
private System.Windows.Forms.ToolStripMenuItem refreshToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem PaletteRefreshMenuItem;
private System.Windows.Forms.ContextMenuStrip PatternContext; private System.Windows.Forms.ContextMenuStrip PatternContext;
private System.Windows.Forms.ToolStripMenuItem saveImageToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem PatternSaveImageMenuItem;
private System.Windows.Forms.ToolStripMenuItem refreshToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem PatternRefreshMenuItem;
private System.Windows.Forms.ContextMenuStrip SpriteContext; private System.Windows.Forms.ContextMenuStrip SpriteContext;
private System.Windows.Forms.ToolStripMenuItem saveImageToolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem SpriteSaveImageMenuItem;
private System.Windows.Forms.ToolStripMenuItem refreshToolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem SpriteRefreshMenuItem;
private System.Windows.Forms.ToolStripMenuItem imageToClipboardToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SpriteImageToClipboardMenuItem;
private System.Windows.Forms.ToolStripMenuItem imageToClipboardToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem PatternImageToClipboardMenuItem;
private System.Windows.Forms.ToolStripMenuItem imageToClipboardToolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem PaletteImageToClipboardMenuItem;
private System.Windows.Forms.ToolStripMenuItem savePaletteToClipboardToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem CopyPaletteToClipboardMenuItem;
private System.Windows.Forms.ToolStripMenuItem copyPatternToClipboardToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem CopyPatternToClipboardMenuItem;
private System.Windows.Forms.ToolStripMenuItem copySpriteToClipboardToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem CopySpriteToClipboardMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.StatusStrip NesPPUStatusBar;
private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1; private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabel1;
private System.Windows.Forms.Timer messagetimer; private System.Windows.Forms.Timer Messagetimer;
private System.Windows.Forms.ToolStripMenuItem AlwaysOnTopMenuItem;
private System.Windows.Forms.ToolStripMenuItem FloatingWindowMenuItem;
} }
} }

File diff suppressed because it is too large Load Diff

View File

@ -126,13 +126,13 @@
<metadata name="SpriteContext.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="SpriteContext.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>475, 17</value> <value>475, 17</value>
</metadata> </metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="NesPPUMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>116, 17</value> <value>116, 17</value>
</metadata> </metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="NesPPUStatusBar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>594, 17</value> <value>594, 17</value>
</metadata> </metadata>
<metadata name="messagetimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="Messagetimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>704, 17</value> <value>704, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

View File

@ -140,7 +140,7 @@ namespace BizHawk.Client.EmuHawk
private void NesPPUToolbarItem_Click(object sender, EventArgs e) private void NesPPUToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<NESPPU>(); GlobalWin.Tools.Load<NesPPU>();
} }
private void NesDebuggerToolbarItem_Click(object sender, EventArgs e) private void NesDebuggerToolbarItem_Click(object sender, EventArgs e)