diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj index 775c322a34..f98e635e9c 100644 --- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj +++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj @@ -472,6 +472,7 @@ + diff --git a/BizHawk.MultiClient/Properties/Resources.Designer.cs b/BizHawk.MultiClient/Properties/Resources.Designer.cs index d4cca70e80..dfdbe86fe9 100644 --- a/BizHawk.MultiClient/Properties/Resources.Designer.cs +++ b/BizHawk.MultiClient/Properties/Resources.Designer.cs @@ -81,6 +81,13 @@ namespace BizHawk.MultiClient.Properties { } } + internal static System.Drawing.Bitmap calculator { + get { + object obj = ResourceManager.GetObject("calculator", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap cheat { get { object obj = ResourceManager.GetObject("cheat", resourceCulture); diff --git a/BizHawk.MultiClient/Properties/Resources.resx b/BizHawk.MultiClient/Properties/Resources.resx index 261cfe8a3b..6ea33800bb 100644 --- a/BizHawk.MultiClient/Properties/Resources.resx +++ b/BizHawk.MultiClient/Properties/Resources.resx @@ -636,6 +636,9 @@ ..\images\whiteTriRight.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\images\calculator.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\images\Lua.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/BizHawk.MultiClient/tools/ToolBox.Designer.cs b/BizHawk.MultiClient/tools/ToolBox.Designer.cs index 887c171182..9eb4c608aa 100644 --- a/BizHawk.MultiClient/tools/ToolBox.Designer.cs +++ b/BizHawk.MultiClient/tools/ToolBox.Designer.cs @@ -36,6 +36,11 @@ this.toolStripButton4 = new System.Windows.Forms.ToolStripButton(); this.HexEditor = new System.Windows.Forms.ToolStripButton(); this.toolStripButton5 = 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.toolStripButton6 = new System.Windows.Forms.ToolStripButton(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -48,11 +53,16 @@ this.toolStripButton3, this.toolStripButton4, this.HexEditor, - this.toolStripButton5}); + this.toolStripButton5, + this.NESDebugger, + this.NESPPU, + this.NESNameTable, + this.NESGameGenie, + this.toolStripButton6}); this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Table; this.toolStrip1.Location = new System.Drawing.Point(9, 27); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(86, 138); + this.toolStrip1.Size = new System.Drawing.Size(86, 272); this.toolStrip1.TabIndex = 0; this.toolStrip1.TabStop = true; // @@ -110,6 +120,51 @@ this.toolStripButton5.Text = "Lua Console"; this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click); // + // NESDebugger + // + this.NESDebugger.Image = ((System.Drawing.Image)(resources.GetObject("NESDebugger.Image"))); + this.NESDebugger.ImageTransparentColor = System.Drawing.Color.Magenta; + this.NESDebugger.Name = "NESDebugger"; + this.NESDebugger.Size = new System.Drawing.Size(74, 20); + this.NESDebugger.Text = "Debugger"; + this.NESDebugger.Click += new System.EventHandler(this.NESDebugger_Click); + // + // NESPPU + // + this.NESPPU.Image = ((System.Drawing.Image)(resources.GetObject("NESPPU.Image"))); + this.NESPPU.ImageTransparentColor = System.Drawing.Color.Magenta; + this.NESPPU.Name = "NESPPU"; + this.NESPPU.Size = new System.Drawing.Size(46, 20); + this.NESPPU.Text = "PPU"; + this.NESPPU.Click += new System.EventHandler(this.NESPPU_Click); + // + // NESNameTable + // + this.NESNameTable.Image = ((System.Drawing.Image)(resources.GetObject("NESNameTable.Image"))); + this.NESNameTable.ImageTransparentColor = System.Drawing.Color.Magenta; + this.NESNameTable.Name = "NESNameTable"; + this.NESNameTable.Size = new System.Drawing.Size(78, 20); + this.NESNameTable.Text = "Nametable"; + this.NESNameTable.Click += new System.EventHandler(this.NESNameTable_Click); + // + // NESGameGenie + // + this.NESGameGenie.Image = ((System.Drawing.Image)(resources.GetObject("NESGameGenie.Image"))); + this.NESGameGenie.ImageTransparentColor = System.Drawing.Color.Magenta; + this.NESGameGenie.Name = "NESGameGenie"; + this.NESGameGenie.Size = new System.Drawing.Size(84, 20); + this.NESGameGenie.Text = "Game Genie"; + this.NESGameGenie.Click += new System.EventHandler(this.NESGameGenie_Click); + // + // toolStripButton6 + // + this.toolStripButton6.Image = global::BizHawk.MultiClient.Properties.Resources.calculator; + this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton6.Name = "toolStripButton6"; + this.toolStripButton6.Size = new System.Drawing.Size(63, 20); + this.toolStripButton6.Text = "Keypad"; + this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click); + // // ToolBox // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -136,6 +191,11 @@ private System.Windows.Forms.ToolStripButton toolStripButton4; private System.Windows.Forms.ToolStripButton HexEditor; private System.Windows.Forms.ToolStripButton toolStripButton5; + private System.Windows.Forms.ToolStripButton NESPPU; + private System.Windows.Forms.ToolStripButton NESDebugger; + private System.Windows.Forms.ToolStripButton NESGameGenie; + private System.Windows.Forms.ToolStripButton NESNameTable; + private System.Windows.Forms.ToolStripButton toolStripButton6; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/ToolBox.cs b/BizHawk.MultiClient/tools/ToolBox.cs index 22bf7f9d8c..92f612e177 100644 --- a/BizHawk.MultiClient/tools/ToolBox.cs +++ b/BizHawk.MultiClient/tools/ToolBox.cs @@ -6,6 +6,8 @@ using System.Drawing; using System.Linq; using System.Text; using System.Windows.Forms; +using BizHawk.Emulation.Consoles.Nintendo; +using BizHawk.Emulation.Consoles.Calculator; namespace BizHawk.MultiClient { @@ -21,6 +23,28 @@ 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; + NESDebugger.Visible = true; + NESGameGenie.Visible = true; + NESNameTable.Visible = true; + } + else + { + NESPPU.Visible = false; + NESDebugger.Visible = false; + NESGameGenie.Visible = false; + NESNameTable.Visible = false; + } + if (Global.Emulator is TI83) + { + + } + else + { + + } } private void toolStripButton1_Click(object sender, EventArgs e) @@ -54,5 +78,32 @@ namespace BizHawk.MultiClient var window = new BizHawk.MultiClient.tools.LuaWindow(); window.Show(); } + + private void NESPPU_Click(object sender, EventArgs e) + { + Global.MainForm.LoadNESPPU(); + } + + private void NESDebugger_Click(object sender, EventArgs e) + { + Global.MainForm.LoadNESDebugger(); + } + + private void NESGameGenie_Click(object sender, EventArgs e) + { + Global.MainForm.LoadGameGenieEC(); + } + + private void NESNameTable_Click(object sender, EventArgs e) + { + Global.MainForm.LoadNESNameTable(); + } + + private void toolStripButton6_Click(object sender, EventArgs e) + { + if (!(Global.Emulator is TI83)) + return; + Global.MainForm.LoadTI83KeyPad(); + } } } diff --git a/BizHawk.MultiClient/tools/ToolBox.resx b/BizHawk.MultiClient/tools/ToolBox.resx index 0644bcb60d..3d47b01f1a 100644 --- a/BizHawk.MultiClient/tools/ToolBox.resx +++ b/BizHawk.MultiClient/tools/ToolBox.resx @@ -121,6 +121,66 @@ 17, 17 + + + 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