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

Debugger icon, add to gameboy debugger menu item, add gameboy debugger to toolbox (conditional on gb emulation)

This commit is contained in:
andres.delikat 2012-01-10 02:02:11 +00:00
parent ee440f140f
commit c871eedbbc
9 changed files with 1934 additions and 1888 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -668,6 +668,7 @@
<None Include="images\Unfreeze.png" />
<None Include="images\AutoSearch.png" />
<None Include="images\Lightning.png" />
<None Include="images\Bug.png" />
<Content Include="images\logo.ico" />
<Content Include="output\gamedb.txt" />
<Content Include="output\gamedb_neshomebrew.txt" />

3737
BizHawk.MultiClient/MainForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

6
BizHawk.MultiClient/MainForm.MenuItems.cs
View File

@ -1024,11 +1024,7 @@ namespace BizHawk.MultiClient
private void debuggerToolStripMenuItem1_Click(object sender, EventArgs e)
{
if (Global.Emulator is Gameboy)
{
Debugger gbDebugger = new Debugger(Global.Emulator as Gameboy);
gbDebugger.Show();
}
Global.MainForm.OpenGameboyDebugger();
}
private void tAStudioToolStripMenuItem_Click(object sender, EventArgs e)

9
BizHawk.MultiClient/MainForm.cs
View File

@ -2463,5 +2463,14 @@ namespace BizHawk.MultiClient
LuaConsole l = new LuaConsole();
l.Show();
}
public void OpenGameboyDebugger()
{
if (Global.Emulator is Gameboy)
{
Debugger gbDebugger = new Debugger(Global.Emulator as Gameboy);
gbDebugger.Show();
}
}
}
}

9
BizHawk.MultiClient/Properties/Resources.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.225
// Runtime Version:4.0.30319.239
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -116,6 +116,13 @@ namespace BizHawk.MultiClient.Properties {
}
}
internal static System.Drawing.Bitmap Bug {
get {
object obj = ResourceManager.GetObject("Bug", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap calculator {
get {
object obj = ResourceManager.GetObject("calculator", resourceCulture);

9
BizHawk.MultiClient/Properties/Resources.resx
View File

@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.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>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="FindHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\FindHS.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@ -801,4 +801,7 @@
<data name="logo" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\logo.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Bug" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\Bug.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

BIN
BizHawk.MultiClient/images/Bug.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

34
BizHawk.MultiClient/tools/ToolBox.Designer.cs generated
View File

@ -36,12 +36,13 @@
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.HexEditor = new System.Windows.Forms.ToolStripButton();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
this.TAStudioButton = new System.Windows.Forms.ToolStripButton();
this.NESDebugger = new System.Windows.Forms.ToolStripButton();
this.NESPPU = new System.Windows.Forms.ToolStripButton();
this.NESNameTable = new System.Windows.Forms.ToolStripButton();
this.NESGameGenie = new System.Windows.Forms.ToolStripButton();
this.KeypadTool = new System.Windows.Forms.ToolStripButton();
this.TAStudioButton = new System.Windows.Forms.ToolStripButton();
this.GameboyDebuggerTool = new System.Windows.Forms.ToolStripButton();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
@ -61,11 +62,12 @@
this.NESPPU,
this.NESNameTable,
this.NESGameGenie,
this.KeypadTool});
this.KeypadTool,
this.GameboyDebuggerTool});
this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Table;
this.toolStrip1.Location = new System.Drawing.Point(9, 11);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(86, 295);
this.toolStrip1.Size = new System.Drawing.Size(91, 318);
this.toolStrip1.TabIndex = 0;
this.toolStrip1.TabStop = true;
//
@ -123,6 +125,15 @@
this.toolStripButton5.Text = "Lua Console";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
//
// TAStudioButton
//
this.TAStudioButton.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
this.TAStudioButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.TAStudioButton.Name = "TAStudioButton";
this.TAStudioButton.Size = new System.Drawing.Size(70, 20);
this.TAStudioButton.Text = "TAStudio";
this.TAStudioButton.Click += new System.EventHandler(this.TAStudioButton_Click);
//
// NESDebugger
//
this.NESDebugger.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon;
@ -168,20 +179,20 @@
this.KeypadTool.Text = "Keypad";
this.KeypadTool.Click += new System.EventHandler(this.KeyPadTool_Click);
//
// TAStudioButton
// GameboyDebuggerTool
//
this.TAStudioButton.Image = global::BizHawk.MultiClient.Properties.Resources.TAStudio;
this.TAStudioButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.TAStudioButton.Name = "TAStudioButton";
this.TAStudioButton.Size = new System.Drawing.Size(70, 20);
this.TAStudioButton.Text = "TAStudio";
this.TAStudioButton.Click += new System.EventHandler(this.TAStudioButton_Click);
this.GameboyDebuggerTool.Image = global::BizHawk.MultiClient.Properties.Resources.Bug;
this.GameboyDebuggerTool.ImageTransparentColor = System.Drawing.Color.Magenta;
this.GameboyDebuggerTool.Name = "GameboyDebuggerTool";
this.GameboyDebuggerTool.Size = new System.Drawing.Size(90, 20);
this.GameboyDebuggerTool.Text = "GB Debugger";
this.GameboyDebuggerTool.Click += new System.EventHandler(this.toolStripButton6_Click);
//
// ToolBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(122, 311);
this.ClientSize = new System.Drawing.Size(122, 334);
this.Controls.Add(this.toolStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(130, 64);
@ -210,6 +221,7 @@
private System.Windows.Forms.ToolStripButton NESNameTable;
private System.Windows.Forms.ToolStripButton KeypadTool;
private System.Windows.Forms.ToolStripButton TAStudioButton;
private System.Windows.Forms.ToolStripButton GameboyDebuggerTool;
}
}

17
BizHawk.MultiClient/tools/ToolBox.cs
View File

@ -8,6 +8,7 @@ using System.Text;
using System.Windows.Forms;
using BizHawk.Emulation.Consoles.Nintendo;
using BizHawk.Emulation.Consoles.Calculator;
using BizHawk.Emulation.Consoles.Gameboy;
namespace BizHawk.MultiClient
{
@ -23,6 +24,7 @@ namespace BizHawk.MultiClient
int x = Global.MainForm.Location.X + Global.MainForm.Size.Width;
int y = Global.MainForm.Location.Y;
Location = new Point(x, y);
if (Global.Emulator is NES)
{
NESPPU.Visible = true;
@ -37,6 +39,7 @@ namespace BizHawk.MultiClient
NESGameGenie.Visible = false;
NESNameTable.Visible = false;
}
if (Global.Emulator is TI83)
{
KeypadTool.Visible = true;
@ -45,6 +48,15 @@ namespace BizHawk.MultiClient
{
KeypadTool.Visible = false;
}
if (Global.Emulator is Gameboy)
{
GameboyDebuggerTool.Visible = true;
}
else
{
GameboyDebuggerTool.Visible = false;
}
}
private void toolStripButton1_Click(object sender, EventArgs e)
@ -109,5 +121,10 @@ namespace BizHawk.MultiClient
{
Global.MainForm.LoadTAStudio();
}
private void toolStripButton6_Click(object sender, EventArgs e)
{
Global.MainForm.OpenGameboyDebugger();
}
}
}