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

Add SNES Graphics config to the Toolbox dialog

This commit is contained in:
adelikat 2012-09-29 16:25:28 +00:00
parent 7e34e7f88b
commit 92411aae7c
8 changed files with 76 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/BizHawk.MultiClient.csproj
View File

@ -869,9 +869,11 @@
<None Include="config\ControllerImages\NES_Controller.png" />
<None Include="config\ControllerImages\SNES_Controller.png" />
<None Include="config\ControllerImages\TI83_Controller.png" />
<None Include="images\GenesisControllerIcon.png" />
<Content Include="images\logo.ico" />
<None Include="images\Paste.png" />
<None Include="images\reboot.png" />
<None Include="images\SNESControllerIcon.png" />
<Content Include="output\gamedb_sega_md.txt" />
<Content Include="output\gamedb.txt" />
<Content Include="output\gamedb_neshomebrew.txt" />

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

@ -298,6 +298,13 @@ namespace BizHawk.MultiClient.Properties {
}
}
internal static System.Drawing.Bitmap GenesisControllerIcon {
get {
object obj = ResourceManager.GetObject("GenesisControllerIcon", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap GreenCheck {
get {
object obj = ResourceManager.GetObject("GreenCheck", resourceCulture);
@ -605,6 +612,13 @@ namespace BizHawk.MultiClient.Properties {
}
}
internal static System.Drawing.Bitmap SNESControllerIcon {
get {
object obj = ResourceManager.GetObject("SNESControllerIcon", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
internal static System.Drawing.Bitmap Stop {
get {
object obj = ResourceManager.GetObject("Stop", resourceCulture);

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

@ -828,4 +828,10 @@
<data name="reboot" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\reboot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="GenesisControllerIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\GenesisControllerIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="SNESControllerIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\images\SNESControllerIcon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 735 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 614 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 529 B

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

@ -43,6 +43,7 @@
this.NESGameGenie = new System.Windows.Forms.ToolStripButton();
this.KeypadTool = new System.Windows.Forms.ToolStripButton();
this.GameboyDebuggerTool = new System.Windows.Forms.ToolStripButton();
this.SNESGraphicsDebuggerButton = new System.Windows.Forms.ToolStripButton();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
@ -63,11 +64,12 @@
this.NESNameTable,
this.NESGameGenie,
this.KeypadTool,
this.GameboyDebuggerTool});
this.GameboyDebuggerTool,
this.SNESGraphicsDebuggerButton});
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(91, 318);
this.toolStrip1.Size = new System.Drawing.Size(100, 306);
this.toolStrip1.TabIndex = 0;
this.toolStrip1.TabStop = true;
//
@ -76,7 +78,7 @@
this.toolStripButton1.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(61, 20);
this.toolStripButton1.Size = new System.Drawing.Size(63, 20);
this.toolStripButton1.Text = "Cheats";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
@ -85,7 +87,7 @@
this.toolStripButton2.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(82, 20);
this.toolStripButton2.Size = new System.Drawing.Size(88, 20);
this.toolStripButton2.Text = "Ram Watch";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
@ -94,7 +96,7 @@
this.toolStripButton3.Image = global::BizHawk.MultiClient.Properties.Resources.search;
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(84, 20);
this.toolStripButton3.Size = new System.Drawing.Size(89, 20);
this.toolStripButton3.Text = "Ram Search";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
@ -103,7 +105,7 @@
this.toolStripButton4.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(74, 20);
this.toolStripButton4.Size = new System.Drawing.Size(80, 20);
this.toolStripButton4.Text = "Ram Poke";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
@ -112,7 +114,7 @@
this.HexEditor.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.HexEditor.ImageTransparentColor = System.Drawing.Color.Magenta;
this.HexEditor.Name = "HexEditor";
this.HexEditor.Size = new System.Drawing.Size(77, 20);
this.HexEditor.Size = new System.Drawing.Size(81, 20);
this.HexEditor.Text = "Hex Editor";
this.HexEditor.Click += new System.EventHandler(this.HexEditor_Click);
//
@ -121,7 +123,7 @@
this.toolStripButton5.Image = global::BizHawk.MultiClient.Properties.Resources.textdoc;
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5";
this.toolStripButton5.Size = new System.Drawing.Size(85, 20);
this.toolStripButton5.Size = new System.Drawing.Size(92, 20);
this.toolStripButton5.Text = "Lua Console";
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
//
@ -130,7 +132,7 @@
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.Size = new System.Drawing.Size(76, 20);
this.TAStudioButton.Text = "TAStudio";
this.TAStudioButton.Click += new System.EventHandler(this.TAStudioButton_Click);
//
@ -139,7 +141,7 @@
this.NESDebugger.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon;
this.NESDebugger.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NESDebugger.Name = "NESDebugger";
this.NESDebugger.Size = new System.Drawing.Size(74, 20);
this.NESDebugger.Size = new System.Drawing.Size(79, 20);
this.NESDebugger.Text = "Debugger";
this.NESDebugger.Click += new System.EventHandler(this.NESDebugger_Click);
//
@ -148,7 +150,7 @@
this.NESPPU.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon;
this.NESPPU.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NESPPU.Name = "NESPPU";
this.NESPPU.Size = new System.Drawing.Size(46, 20);
this.NESPPU.Size = new System.Drawing.Size(49, 20);
this.NESPPU.Text = "PPU";
this.NESPPU.Click += new System.EventHandler(this.NESPPU_Click);
//
@ -157,7 +159,7 @@
this.NESNameTable.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon;
this.NESNameTable.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NESNameTable.Name = "NESNameTable";
this.NESNameTable.Size = new System.Drawing.Size(78, 20);
this.NESNameTable.Size = new System.Drawing.Size(85, 20);
this.NESNameTable.Text = "Nametable";
this.NESNameTable.Click += new System.EventHandler(this.NESNameTable_Click);
//
@ -166,7 +168,7 @@
this.NESGameGenie.Image = global::BizHawk.MultiClient.Properties.Resources.NESControllerIcon;
this.NESGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NESGameGenie.Name = "NESGameGenie";
this.NESGameGenie.Size = new System.Drawing.Size(84, 20);
this.NESGameGenie.Size = new System.Drawing.Size(91, 20);
this.NESGameGenie.Text = "Game Genie";
this.NESGameGenie.Click += new System.EventHandler(this.NESGameGenie_Click);
//
@ -175,16 +177,29 @@
this.KeypadTool.Image = global::BizHawk.MultiClient.Properties.Resources.calculator;
this.KeypadTool.ImageTransparentColor = System.Drawing.Color.Magenta;
this.KeypadTool.Name = "KeypadTool";
this.KeypadTool.Size = new System.Drawing.Size(63, 20);
this.KeypadTool.Size = new System.Drawing.Size(66, 20);
this.KeypadTool.Text = "Keypad";
this.KeypadTool.Click += new System.EventHandler(this.KeyPadTool_Click);
//
// GameboyDebuggerTool
//
this.GameboyDebuggerTool.Name = "GameboyDebuggerTool";
this.GameboyDebuggerTool.Size = new System.Drawing.Size(23, 4);
//
// SNESGraphicsDebuggerButton
//
this.SNESGraphicsDebuggerButton.Image = global::BizHawk.MultiClient.Properties.Resources.SNESControllerIcon;
this.SNESGraphicsDebuggerButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.SNESGraphicsDebuggerButton.Name = "SNESGraphicsDebuggerButton";
this.SNESGraphicsDebuggerButton.Size = new System.Drawing.Size(99, 20);
this.SNESGraphicsDebuggerButton.Text = "Gfx Debugger";
this.SNESGraphicsDebuggerButton.Click += new System.EventHandler(this.SNESGraphicsDebuggerButton_Click);
//
// ToolBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(122, 334);
this.ClientSize = new System.Drawing.Size(116, 321);
this.Controls.Add(this.toolStrip1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.MinimumSize = new System.Drawing.Size(130, 64);
@ -214,6 +229,7 @@
private System.Windows.Forms.ToolStripButton KeypadTool;
private System.Windows.Forms.ToolStripButton TAStudioButton;
private System.Windows.Forms.ToolStripButton GameboyDebuggerTool;
private System.Windows.Forms.ToolStripButton SNESGraphicsDebuggerButton;
}
}

25
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.Nintendo.SNES;
namespace BizHawk.MultiClient
{
@ -56,6 +57,15 @@ namespace BizHawk.MultiClient
{
KeypadTool.Visible = false;
}
if (Global.Emulator is LibsnesCore)
{
SNESGraphicsDebuggerButton.Visible = true;
}
else
{
SNESGraphicsDebuggerButton.Visible = false;
}
}
private void toolStripButton1_Click(object sender, EventArgs e)
@ -111,14 +121,23 @@ namespace BizHawk.MultiClient
private void KeyPadTool_Click(object sender, EventArgs e)
{
if (!(Global.Emulator is TI83))
return;
Global.MainForm.LoadTI83KeyPad();
if (Global.Emulator is TI83)
{
Global.MainForm.LoadTI83KeyPad();
}
}
private void TAStudioButton_Click(object sender, EventArgs e)
{
Global.MainForm.LoadTAStudio();
}
private void SNESGraphicsDebuggerButton_Click(object sender, EventArgs e)
{
if (Global.Emulator is LibsnesCore)
{
Global.MainForm.LoadSNESGraphicsDebugger();
}
}
}
}