ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Toolbox - some code cleanup

This commit is contained in:
adelikat 2013-12-21 21:37:00 +00:00
parent 3a1933b1a6
commit 720a19c2ad
3 changed files with 273 additions and 306 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

356
BizHawk.Client.EmuHawk/tools/ToolBox.Designer.cs generated
View File

@ -29,200 +29,200 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ToolBox)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ToolBox));
this.toolStrip1 = new ToolStripEx(); this.ToolBoxStrip = new ToolStripEx();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.CheatsToolBarItem = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.RamWatchToolbarItem = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton(); this.RamSearchToolbarItem = new System.Windows.Forms.ToolStripButton();
this.HexEditor = new System.Windows.Forms.ToolStripButton(); this.HexEditorToolbarItem = new System.Windows.Forms.ToolStripButton();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.LuaConsoleToolbarItem = new System.Windows.Forms.ToolStripButton();
this.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.TAStudioToolbarItem = new System.Windows.Forms.ToolStripButton();
this.TAStudioButton = new System.Windows.Forms.ToolStripButton(); this.VirtualpadToolbarItem = new System.Windows.Forms.ToolStripButton();
this.NESDebugger = new System.Windows.Forms.ToolStripButton(); this.NesDebuggerToolbarItem = new System.Windows.Forms.ToolStripButton();
this.NESPPU = new System.Windows.Forms.ToolStripButton(); this.NesPPUToolbarItem = new System.Windows.Forms.ToolStripButton();
this.NESNameTable = new System.Windows.Forms.ToolStripButton(); this.NesNameTableToolbarItem = new System.Windows.Forms.ToolStripButton();
this.NESGameGenie = new System.Windows.Forms.ToolStripButton(); this.NesGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
this.KeypadTool = new System.Windows.Forms.ToolStripButton(); this.TI83KeypadToolbarItem = new System.Windows.Forms.ToolStripButton();
this.SNESGraphicsDebuggerButton = new System.Windows.Forms.ToolStripButton(); this.SNESGraphicsDebuggerToolbarItem = new System.Windows.Forms.ToolStripButton();
this.SNESGameGenie = new System.Windows.Forms.ToolStripButton(); this.SNESGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
this.GGGameGenie = new System.Windows.Forms.ToolStripButton(); this.GGGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
this.GBGameGenie = new System.Windows.Forms.ToolStripButton(); this.GBGameGenieToolbarItem = new System.Windows.Forms.ToolStripButton();
this.GameboyDebuggerTool = new System.Windows.Forms.ToolStripButton(); this.GameboyDebuggerTool = new System.Windows.Forms.ToolStripButton();
this.toolStrip1.SuspendLayout(); this.ToolBoxStrip.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// toolStrip1 // ToolBoxStrip
// //
this.toolStrip1.BackColor = System.Drawing.SystemColors.Control; this.ToolBoxStrip.BackColor = System.Drawing.SystemColors.Control;
this.toolStrip1.ClickThrough = true; this.ToolBoxStrip.ClickThrough = true;
this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; this.ToolBoxStrip.Dock = System.Windows.Forms.DockStyle.None;
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ToolBoxStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton1, this.CheatsToolBarItem,
this.toolStripButton2, this.RamWatchToolbarItem,
this.toolStripButton3, this.RamSearchToolbarItem,
this.HexEditor, this.HexEditorToolbarItem,
this.toolStripButton5, this.LuaConsoleToolbarItem,
this.toolStripButton6, this.TAStudioToolbarItem,
this.TAStudioButton, this.VirtualpadToolbarItem,
this.NESDebugger, this.NesDebuggerToolbarItem,
this.NESPPU, this.NesPPUToolbarItem,
this.NESNameTable, this.NesNameTableToolbarItem,
this.NESGameGenie, this.NesGameGenieToolbarItem,
this.KeypadTool, this.TI83KeypadToolbarItem,
this.SNESGraphicsDebuggerButton, this.SNESGraphicsDebuggerToolbarItem,
this.SNESGameGenie, this.SNESGameGenieToolbarItem,
this.GGGameGenie, this.GGGameGenieToolbarItem,
this.GBGameGenie, this.GBGameGenieToolbarItem,
this.GameboyDebuggerTool}); this.GameboyDebuggerTool});
this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Table; this.ToolBoxStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Table;
this.toolStrip1.Location = new System.Drawing.Point(9, 11); this.ToolBoxStrip.Location = new System.Drawing.Point(9, 11);
this.toolStrip1.Name = "toolStrip1"; this.ToolBoxStrip.Name = "ToolBoxStrip";
this.toolStrip1.Size = new System.Drawing.Size(100, 375); this.ToolBoxStrip.Size = new System.Drawing.Size(100, 394);
this.toolStrip1.TabIndex = 0; this.ToolBoxStrip.TabIndex = 0;
this.toolStrip1.TabStop = true; this.ToolBoxStrip.TabStop = true;
// //
// toolStripButton1 // CheatsToolBarItem
// //
this.toolStripButton1.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze; this.CheatsToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.CheatsToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1"; this.CheatsToolBarItem.Name = "CheatsToolBarItem";
this.toolStripButton1.Size = new System.Drawing.Size(63, 20); this.CheatsToolBarItem.Size = new System.Drawing.Size(63, 20);
this.toolStripButton1.Text = "Cheats"; this.CheatsToolBarItem.Text = "Cheats";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); this.CheatsToolBarItem.Click += new System.EventHandler(this.CheatsToolBarItem_Click);
// //
// toolStripButton2 // RamWatchToolbarItem
// //
this.toolStripButton2.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS; this.RamWatchToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS;
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; this.RamWatchToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2"; this.RamWatchToolbarItem.Name = "RamWatchToolbarItem";
this.toolStripButton2.Size = new System.Drawing.Size(88, 20); this.RamWatchToolbarItem.Size = new System.Drawing.Size(88, 20);
this.toolStripButton2.Text = "Ram Watch"; this.RamWatchToolbarItem.Text = "Ram Watch";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); this.RamWatchToolbarItem.Click += new System.EventHandler(this.RamWatchToolbarItem_Click);
// //
// toolStripButton3 // RamSearchToolbarItem
// //
this.toolStripButton3.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search; this.RamSearchToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search;
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta; this.RamSearchToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3"; this.RamSearchToolbarItem.Name = "RamSearchToolbarItem";
this.toolStripButton3.Size = new System.Drawing.Size(89, 20); this.RamSearchToolbarItem.Size = new System.Drawing.Size(89, 20);
this.toolStripButton3.Text = "Ram Search"; this.RamSearchToolbarItem.Text = "Ram Search";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click); this.RamSearchToolbarItem.Click += new System.EventHandler(this.RamSearchToolbarItem_Click);
// //
// HexEditor // HexEditorToolbarItem
// //
this.HexEditor.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke; this.HexEditorToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.HexEditor.ImageTransparentColor = System.Drawing.Color.Magenta; this.HexEditorToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.HexEditor.Name = "HexEditor"; this.HexEditorToolbarItem.Name = "HexEditorToolbarItem";
this.HexEditor.Size = new System.Drawing.Size(81, 20); this.HexEditorToolbarItem.Size = new System.Drawing.Size(81, 20);
this.HexEditor.Text = "Hex Editor"; this.HexEditorToolbarItem.Text = "Hex Editor";
this.HexEditor.Click += new System.EventHandler(this.HexEditor_Click); this.HexEditorToolbarItem.Click += new System.EventHandler(this.HexEditorToolbarItem_Click);
// //
// toolStripButton5 // LuaConsoleToolbarItem
// //
this.toolStripButton5.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.textdoc; this.LuaConsoleToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.textdoc;
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta; this.LuaConsoleToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5"; this.LuaConsoleToolbarItem.Name = "LuaConsoleToolbarItem";
this.toolStripButton5.Size = new System.Drawing.Size(92, 20); this.LuaConsoleToolbarItem.Size = new System.Drawing.Size(92, 20);
this.toolStripButton5.Text = "Lua Console"; this.LuaConsoleToolbarItem.Text = "Lua Console";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); this.LuaConsoleToolbarItem.Click += new System.EventHandler(this.LuaConsoleToolbarItem_Click);
// //
// toolStripButton6 // TAStudioToolbarItem
// //
this.toolStripButton6.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; this.TAStudioToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio;
this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; this.TAStudioToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton6.Name = "toolStripButton6"; this.TAStudioToolbarItem.Name = "TAStudioToolbarItem";
this.toolStripButton6.Size = new System.Drawing.Size(76, 20); this.TAStudioToolbarItem.Size = new System.Drawing.Size(76, 20);
this.toolStripButton6.Text = "TAStudio"; this.TAStudioToolbarItem.Text = "TAStudio";
this.toolStripButton6.Click += new System.EventHandler(this.TAStudioButton_Click); this.TAStudioToolbarItem.Click += new System.EventHandler(this.TAStudioToolbarItem_Click);
// //
// TAStudioButton // VirtualpadToolbarItem
// //
this.TAStudioButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController; this.VirtualpadToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
this.TAStudioButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.VirtualpadToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.TAStudioButton.Name = "TAStudioButton"; this.VirtualpadToolbarItem.Name = "VirtualpadToolbarItem";
this.TAStudioButton.Size = new System.Drawing.Size(86, 20); this.VirtualpadToolbarItem.Size = new System.Drawing.Size(86, 20);
this.TAStudioButton.Text = "VirtualPads"; this.VirtualpadToolbarItem.Text = "VirtualPads";
this.TAStudioButton.Click += new System.EventHandler(this.VirtualPadButton_Click); this.VirtualpadToolbarItem.Click += new System.EventHandler(this.VirtualpadToolbarItem_Click);
// //
// NESDebugger // NesDebuggerToolbarItem
// //
this.NESDebugger.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon; this.NesDebuggerToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon;
this.NESDebugger.ImageTransparentColor = System.Drawing.Color.Magenta; this.NesDebuggerToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NESDebugger.Name = "NESDebugger"; this.NesDebuggerToolbarItem.Name = "NesDebuggerToolbarItem";
this.NESDebugger.Size = new System.Drawing.Size(79, 20); this.NesDebuggerToolbarItem.Size = new System.Drawing.Size(79, 20);
this.NESDebugger.Text = "Debugger"; this.NesDebuggerToolbarItem.Text = "Debugger";
this.NESDebugger.Click += new System.EventHandler(this.NESDebugger_Click); this.NesDebuggerToolbarItem.Click += new System.EventHandler(this.NesDebuggerToolbarItem_Click);
// //
// NESPPU // NesPPUToolbarItem
// //
this.NESPPU.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon; this.NesPPUToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon;
this.NESPPU.ImageTransparentColor = System.Drawing.Color.Magenta; this.NesPPUToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NESPPU.Name = "NESPPU"; this.NesPPUToolbarItem.Name = "NesPPUToolbarItem";
this.NESPPU.Size = new System.Drawing.Size(49, 20); this.NesPPUToolbarItem.Size = new System.Drawing.Size(49, 20);
this.NESPPU.Text = "PPU"; this.NesPPUToolbarItem.Text = "PPU";
this.NESPPU.Click += new System.EventHandler(this.NESPPU_Click); this.NesPPUToolbarItem.Click += new System.EventHandler(this.NesPPUToolbarItem_Click);
// //
// NESNameTable // NesNameTableToolbarItem
// //
this.NESNameTable.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon; this.NesNameTableToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon;
this.NESNameTable.ImageTransparentColor = System.Drawing.Color.Magenta; this.NesNameTableToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NESNameTable.Name = "NESNameTable"; this.NesNameTableToolbarItem.Name = "NesNameTableToolbarItem";
this.NESNameTable.Size = new System.Drawing.Size(85, 20); this.NesNameTableToolbarItem.Size = new System.Drawing.Size(85, 20);
this.NESNameTable.Text = "Nametable"; this.NesNameTableToolbarItem.Text = "Nametable";
this.NESNameTable.Click += new System.EventHandler(this.NESNameTable_Click); this.NesNameTableToolbarItem.Click += new System.EventHandler(this.NesNameTableToolbarItem_Click);
// //
// NESGameGenie // NesGameGenieToolbarItem
// //
this.NESGameGenie.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon; this.NesGameGenieToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.NESControllerIcon;
this.NESGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta; this.NesGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NESGameGenie.Name = "NESGameGenie"; this.NesGameGenieToolbarItem.Name = "NesGameGenieToolbarItem";
this.NESGameGenie.Size = new System.Drawing.Size(91, 20); this.NesGameGenieToolbarItem.Size = new System.Drawing.Size(91, 20);
this.NESGameGenie.Text = "Game Genie"; this.NesGameGenieToolbarItem.Text = "Game Genie";
this.NESGameGenie.Click += new System.EventHandler(this.NESGameGenie_Click); this.NesGameGenieToolbarItem.Click += new System.EventHandler(this.NesGameGenieToolbarItem_Click);
// //
// KeypadTool // TI83KeypadToolbarItem
// //
this.KeypadTool.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator; this.TI83KeypadToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.calculator;
this.KeypadTool.ImageTransparentColor = System.Drawing.Color.Magenta; this.TI83KeypadToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.KeypadTool.Name = "KeypadTool"; this.TI83KeypadToolbarItem.Name = "TI83KeypadToolbarItem";
this.KeypadTool.Size = new System.Drawing.Size(66, 20); this.TI83KeypadToolbarItem.Size = new System.Drawing.Size(66, 20);
this.KeypadTool.Text = "Keypad"; this.TI83KeypadToolbarItem.Text = "Keypad";
this.KeypadTool.Click += new System.EventHandler(this.KeyPadTool_Click); this.TI83KeypadToolbarItem.Click += new System.EventHandler(this.TI83KeypadToolbarItem_Click);
// //
// SNESGraphicsDebuggerButton // SNESGraphicsDebuggerToolbarItem
// //
this.SNESGraphicsDebuggerButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SNESControllerIcon; this.SNESGraphicsDebuggerToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SNESControllerIcon;
this.SNESGraphicsDebuggerButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.SNESGraphicsDebuggerToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.SNESGraphicsDebuggerButton.Name = "SNESGraphicsDebuggerButton"; this.SNESGraphicsDebuggerToolbarItem.Name = "SNESGraphicsDebuggerToolbarItem";
this.SNESGraphicsDebuggerButton.Size = new System.Drawing.Size(99, 20); this.SNESGraphicsDebuggerToolbarItem.Size = new System.Drawing.Size(99, 20);
this.SNESGraphicsDebuggerButton.Text = "Gfx Debugger"; this.SNESGraphicsDebuggerToolbarItem.Text = "Gfx Debugger";
this.SNESGraphicsDebuggerButton.Click += new System.EventHandler(this.SNESGraphicsDebuggerButton_Click); this.SNESGraphicsDebuggerToolbarItem.Click += new System.EventHandler(this.SNESGraphicsDebuggerToolbarItem_Click);
// //
// SNESGameGenie // SNESGameGenieToolbarItem
// //
this.SNESGameGenie.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SNESControllerIcon; this.SNESGameGenieToolbarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SNESControllerIcon;
this.SNESGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta; this.SNESGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.SNESGameGenie.Name = "SNESGameGenie"; this.SNESGameGenieToolbarItem.Name = "SNESGameGenieToolbarItem";
this.SNESGameGenie.Size = new System.Drawing.Size(91, 20); this.SNESGameGenieToolbarItem.Size = new System.Drawing.Size(91, 20);
this.SNESGameGenie.Text = "Game Genie"; this.SNESGameGenieToolbarItem.Text = "Game Genie";
this.SNESGameGenie.Click += new System.EventHandler(this.SNESGameGenie_Click); this.SNESGameGenieToolbarItem.Click += new System.EventHandler(this.SNESGameGenieToolbarItem_Click);
// //
// GGGameGenie // GGGameGenieToolbarItem
// //
this.GGGameGenie.Image = ((System.Drawing.Image)(resources.GetObject("GGGameGenie.Image"))); this.GGGameGenieToolbarItem.Image = ((System.Drawing.Image)(resources.GetObject("GGGameGenieToolbarItem.Image")));
this.GGGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta; this.GGGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.GGGameGenie.Name = "GGGameGenie"; this.GGGameGenieToolbarItem.Name = "GGGameGenieToolbarItem";
this.GGGameGenie.Size = new System.Drawing.Size(91, 20); this.GGGameGenieToolbarItem.Size = new System.Drawing.Size(91, 20);
this.GGGameGenie.Text = "Game Genie"; this.GGGameGenieToolbarItem.Text = "Game Genie";
this.GGGameGenie.Click += new System.EventHandler(this.GGGameGenie_Click); this.GGGameGenieToolbarItem.Click += new System.EventHandler(this.GGGameGenieToolbarItem_Click);
// //
// GBGameGenie // GBGameGenieToolbarItem
// //
this.GBGameGenie.Image = ((System.Drawing.Image)(resources.GetObject("GBGameGenie.Image"))); this.GBGameGenieToolbarItem.Image = ((System.Drawing.Image)(resources.GetObject("GBGameGenieToolbarItem.Image")));
this.GBGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta; this.GBGameGenieToolbarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.GBGameGenie.Name = "GBGameGenie"; this.GBGameGenieToolbarItem.Name = "GBGameGenieToolbarItem";
this.GBGameGenie.Size = new System.Drawing.Size(91, 20); this.GBGameGenieToolbarItem.Size = new System.Drawing.Size(91, 20);
this.GBGameGenie.Text = "Game Genie"; this.GBGameGenieToolbarItem.Text = "Game Genie";
this.GBGameGenie.Click += new System.EventHandler(this.GBGameGenie_Click); this.GBGameGenieToolbarItem.Click += new System.EventHandler(this.GBGameGenieToolbarItem_Click);
// //
// GameboyDebuggerTool // GameboyDebuggerTool
// //
@ -233,16 +233,16 @@
// //
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(160, 449); this.ClientSize = new System.Drawing.Size(171, 449);
this.Controls.Add(this.toolStrip1); this.Controls.Add(this.ToolBoxStrip);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(129, 62); this.MinimumSize = new System.Drawing.Size(129, 62);
this.Name = "ToolBox"; this.Name = "ToolBox";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Tool Box"; this.Text = "Tool Box";
this.Load += new System.EventHandler(this.ToolBox_Load); this.Load += new System.EventHandler(this.ToolBox_Load);
this.toolStrip1.ResumeLayout(false); this.ToolBoxStrip.ResumeLayout(false);
this.toolStrip1.PerformLayout(); this.ToolBoxStrip.PerformLayout();
this.ResumeLayout(false); this.ResumeLayout(false);
this.PerformLayout(); this.PerformLayout();
@ -250,24 +250,24 @@
#endregion #endregion
private ToolStripEx toolStrip1; private ToolStripEx ToolBoxStrip;
private System.Windows.Forms.ToolStripButton toolStripButton1; private System.Windows.Forms.ToolStripButton CheatsToolBarItem;
private System.Windows.Forms.ToolStripButton toolStripButton2; private System.Windows.Forms.ToolStripButton RamWatchToolbarItem;
private System.Windows.Forms.ToolStripButton toolStripButton3; private System.Windows.Forms.ToolStripButton RamSearchToolbarItem;
private System.Windows.Forms.ToolStripButton HexEditor; private System.Windows.Forms.ToolStripButton HexEditorToolbarItem;
private System.Windows.Forms.ToolStripButton toolStripButton5; private System.Windows.Forms.ToolStripButton LuaConsoleToolbarItem;
private System.Windows.Forms.ToolStripButton NESPPU; private System.Windows.Forms.ToolStripButton NesPPUToolbarItem;
private System.Windows.Forms.ToolStripButton NESDebugger; private System.Windows.Forms.ToolStripButton NesDebuggerToolbarItem;
private System.Windows.Forms.ToolStripButton NESGameGenie; private System.Windows.Forms.ToolStripButton NesGameGenieToolbarItem;
private System.Windows.Forms.ToolStripButton NESNameTable; private System.Windows.Forms.ToolStripButton NesNameTableToolbarItem;
private System.Windows.Forms.ToolStripButton KeypadTool; private System.Windows.Forms.ToolStripButton TI83KeypadToolbarItem;
private System.Windows.Forms.ToolStripButton TAStudioButton; private System.Windows.Forms.ToolStripButton VirtualpadToolbarItem;
private System.Windows.Forms.ToolStripButton GameboyDebuggerTool; private System.Windows.Forms.ToolStripButton GameboyDebuggerTool;
private System.Windows.Forms.ToolStripButton SNESGraphicsDebuggerButton; private System.Windows.Forms.ToolStripButton SNESGraphicsDebuggerToolbarItem;
private System.Windows.Forms.ToolStripButton SNESGameGenie; private System.Windows.Forms.ToolStripButton SNESGameGenieToolbarItem;
private System.Windows.Forms.ToolStripButton toolStripButton6; private System.Windows.Forms.ToolStripButton TAStudioToolbarItem;
private System.Windows.Forms.ToolStripButton GGGameGenie; private System.Windows.Forms.ToolStripButton GGGameGenieToolbarItem;
private System.Windows.Forms.ToolStripButton GBGameGenie; private System.Windows.Forms.ToolStripButton GBGameGenieToolbarItem;
} }
} }

113
BizHawk.Client.EmuHawk/tools/ToolBox.cs
View File

@ -18,15 +18,18 @@ namespace BizHawk.Client.EmuHawk
private void ToolBox_Load(object sender, EventArgs e) private void ToolBox_Load(object sender, EventArgs e)
{ {
int x = GlobalWin.MainForm.Location.X + GlobalWin.MainForm.Size.Width; Location = new Point(
int y = GlobalWin.MainForm.Location.Y; GlobalWin.MainForm.Location.X + GlobalWin.MainForm.Size.Width,
Location = new Point(x, y); GlobalWin.MainForm.Location.Y
);
HideShowIcons(); HideShowIcons();
} }
public bool AskSave() { return true; } public bool AskSave() { return true; }
public bool UpdateBefore { get { return false; } } public bool UpdateBefore { get { return false; } }
public void UpdateValues() { } public void UpdateValues() { }
public void Restart() public void Restart()
{ {
HideShowIcons(); HideShowIcons();
@ -34,106 +37,72 @@ namespace BizHawk.Client.EmuHawk
private void HideShowIcons() private void HideShowIcons()
{ {
if (Global.Emulator is NES) NesPPUToolbarItem.Visible =
{ NesDebuggerToolbarItem.Visible =
NESPPU.Visible = true; NesGameGenieToolbarItem.Visible =
NESDebugger.Visible = true; NesNameTableToolbarItem.Visible =
NESGameGenie.Visible = true; Global.Emulator is NES;
NESNameTable.Visible = true;
} TI83KeypadToolbarItem.Visible = Global.Emulator is TI83;
else
{ SNESGraphicsDebuggerToolbarItem.Visible =
NESPPU.Visible = false; SNESGameGenieToolbarItem.Visible =
NESDebugger.Visible = false; Global.Emulator is LibsnesCore;
NESGameGenie.Visible = false;
NESNameTable.Visible = false; GGGameGenieToolbarItem.Visible =
Global.Game.System == "GG";
GBGameGenieToolbarItem.Visible = Global.Game.System == "GB";
Size = new Size(Size.Width, ToolBoxStrip.Size.Height + 50);
} }
if (Global.Emulator is TI83) private void CheatsToolBarItem_Click(object sender, EventArgs e)
{
KeypadTool.Visible = true;
}
else
{
KeypadTool.Visible = false;
}
if (Global.Emulator is LibsnesCore)
{
SNESGraphicsDebuggerButton.Visible = true;
SNESGameGenie.Visible = true;
}
else
{
SNESGraphicsDebuggerButton.Visible = false;
SNESGameGenie.Visible = false;
}
if (Global.Game.System == "GG")
{
GGGameGenie.Visible = true;
}
else
{
GGGameGenie.Visible = false;
}
if (Global.Game.System == "GB")
{
GBGameGenie.Visible = true;
}
else
{
GBGameGenie.Visible = false;
}
Size = new Size(Size.Width, toolStrip1.Size.Height + 50);
}
private void toolStripButton1_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<Cheats>(); GlobalWin.Tools.Load<Cheats>();
} }
private void toolStripButton2_Click(object sender, EventArgs e) private void RamWatchToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.LoadRamWatch(true); GlobalWin.Tools.LoadRamWatch(true);
} }
private void toolStripButton3_Click(object sender, EventArgs e) private void RamSearchToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<RamSearch>(); GlobalWin.Tools.Load<RamSearch>();
} }
private void HexEditor_Click(object sender, EventArgs e) private void HexEditorToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<HexEditor>(); GlobalWin.Tools.Load<HexEditor>();
} }
private void toolStripButton5_Click(object sender, EventArgs e) private void LuaConsoleToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.MainForm.OpenLuaConsole(); GlobalWin.MainForm.OpenLuaConsole();
} }
private void NESPPU_Click(object sender, EventArgs e) private void NesPPUToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<NESPPU>(); GlobalWin.Tools.Load<NESPPU>();
} }
private void NESDebugger_Click(object sender, EventArgs e) private void NesDebuggerToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<NESDebugger>(); GlobalWin.Tools.Load<NESDebugger>();
} }
private void NESGameGenie_Click(object sender, EventArgs e) private void NesGameGenieToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.MainForm.LoadGameGenieEc(); GlobalWin.MainForm.LoadGameGenieEc();
} }
private void NESNameTable_Click(object sender, EventArgs e) private void NesNameTableToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<NESNameTableViewer>(); GlobalWin.Tools.Load<NESNameTableViewer>();
} }
private void KeyPadTool_Click(object sender, EventArgs e) private void TI83KeypadToolbarItem_Click(object sender, EventArgs e)
{ {
if (Global.Emulator is TI83) if (Global.Emulator is TI83)
{ {
@ -141,12 +110,12 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void TAStudioButton_Click(object sender, EventArgs e) private void TAStudioToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.MainForm.LoadTAStudio(); GlobalWin.MainForm.LoadTAStudio();
} }
private void SNESGraphicsDebuggerButton_Click(object sender, EventArgs e) private void SNESGraphicsDebuggerToolbarItem_Click(object sender, EventArgs e)
{ {
if (Global.Emulator is LibsnesCore) if (Global.Emulator is LibsnesCore)
{ {
@ -154,26 +123,24 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void VirtualPadButton_Click(object sender, EventArgs e) private void VirtualpadToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.Tools.Load<VirtualPadForm>(); GlobalWin.Tools.Load<VirtualPadForm>();
} }
private void SNESGameGenie_Click(object sender, EventArgs e) private void SNESGameGenieToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.MainForm.LoadGameGenieEc(); GlobalWin.MainForm.LoadGameGenieEc();
} }
private void GGGameGenie_Click(object sender, EventArgs e) private void GGGameGenieToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.MainForm.LoadGameGenieEc(); GlobalWin.MainForm.LoadGameGenieEc();
} }
private void GBGameGenie_Click(object sender, EventArgs e) private void GBGameGenieToolbarItem_Click(object sender, EventArgs e)
{ {
GlobalWin.MainForm.LoadGameGenieEc(); GlobalWin.MainForm.LoadGameGenieEc();
} }
} }
} }

6
BizHawk.Client.EmuHawk/tools/ToolBox.resx
View File

@ -117,11 +117,11 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="ToolBoxStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value> <value>17, 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" />
<data name="GGGameGenie.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="GGGameGenieToolbarItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJTSURBVFhH7VQ9a1RBFB1YMIXY6uIPSAo7LbJpAhEhYKNg YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJTSURBVFhH7VQ9a1RBFB1YMIXY6uIPSAo7LbJpAhEhYKNg
@ -137,7 +137,7 @@
WXFLks3nAXUgWBS2qRsoo4wyTDj3B3uOB2ePDD1gAAAAAElFTkSuQmCC WXFLks3nAXUgWBS2qRsoo4wyTDj3B3uOB2ePDD1gAAAAAElFTkSuQmCC
</value> </value>
</data> </data>
<data name="GBGameGenie.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="GBGameGenieToolbarItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEQSURBVFhH7ZXRDYMwDEQzC7OwArMwS2dhBXZKdQ4XOZAQ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEQSURBVFhH7ZXRDYMwDEQzC7OwArMwS2dhBXZKdQ4XOZAQ