From 79e5a399f7fa66ad0cf7151d463a043e6064bc50 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Sat, 10 Sep 2011 21:48:27 +0000 Subject: [PATCH] Toolbox - resize slightly, set minimum size, change bg color of toolstrip, make ti83 keypad visible only if ti83 is loaded --- BizHawk.MultiClient/tools/ToolBox.Designer.cs | 28 +-- BizHawk.MultiClient/tools/ToolBox.cs | 166 +++++++++--------- BizHawk.MultiClient/tools/ToolBox.resx | 8 +- 3 files changed, 102 insertions(+), 100 deletions(-) diff --git a/BizHawk.MultiClient/tools/ToolBox.Designer.cs b/BizHawk.MultiClient/tools/ToolBox.Designer.cs index 261d37bee4..9d2b6d149a 100644 --- a/BizHawk.MultiClient/tools/ToolBox.Designer.cs +++ b/BizHawk.MultiClient/tools/ToolBox.Designer.cs @@ -40,12 +40,13 @@ 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.KeypadTool = new System.Windows.Forms.ToolStripButton(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // // toolStrip1 // + this.toolStrip1.BackColor = System.Drawing.SystemColors.Control; this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None; this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripButton1, @@ -58,11 +59,11 @@ this.NESPPU, this.NESNameTable, this.NESGameGenie, - this.toolStripButton6}); + this.KeypadTool}); this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Table; - this.toolStrip1.Location = new System.Drawing.Point(9, 27); + this.toolStrip1.Location = new System.Drawing.Point(9, 11); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(86, 272); + this.toolStrip1.Size = new System.Drawing.Size(86, 253); this.toolStrip1.TabIndex = 0; this.toolStrip1.TabStop = true; // @@ -156,22 +157,23 @@ this.NESGameGenie.Text = "Game Genie"; this.NESGameGenie.Click += new System.EventHandler(this.NESGameGenie_Click); // - // toolStripButton6 + // KeypadTool // - 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); + 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.Text = "Keypad"; + this.KeypadTool.Click += new System.EventHandler(this.KeyPadTool_Click); // // ToolBox // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(123, 297); + this.ClientSize = new System.Drawing.Size(122, 274); this.Controls.Add(this.toolStrip1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MinimumSize = new System.Drawing.Size(130, 64); this.Name = "ToolBox"; this.Text = "Tool Box"; this.Load += new System.EventHandler(this.ToolBox_Load); @@ -195,7 +197,7 @@ private System.Windows.Forms.ToolStripButton NESDebugger; private System.Windows.Forms.ToolStripButton NESGameGenie; private System.Windows.Forms.ToolStripButton NESNameTable; - private System.Windows.Forms.ToolStripButton toolStripButton6; + private System.Windows.Forms.ToolStripButton KeypadTool; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/tools/ToolBox.cs b/BizHawk.MultiClient/tools/ToolBox.cs index 92f612e177..34dcb62ae5 100644 --- a/BizHawk.MultiClient/tools/ToolBox.cs +++ b/BizHawk.MultiClient/tools/ToolBox.cs @@ -11,99 +11,99 @@ using BizHawk.Emulation.Consoles.Calculator; namespace BizHawk.MultiClient { - public partial class ToolBox : Form - { - public ToolBox() - { - InitializeComponent(); - } + public partial class ToolBox : Form + { + public ToolBox() + { + InitializeComponent(); + } - private void ToolBox_Load(object sender, EventArgs e) - { - 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) - { + private void ToolBox_Load(object sender, EventArgs e) + { + 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) + { + KeypadTool.Visible = true; + } + else + { + KeypadTool.Visible = false; + } + } - } - else - { + private void toolStripButton1_Click(object sender, EventArgs e) + { + Global.MainForm.LoadCheatsWindow(); + } - } - } + private void toolStripButton2_Click(object sender, EventArgs e) + { + Global.MainForm.LoadRamWatch(); + } - private void toolStripButton1_Click(object sender, EventArgs e) - { - Global.MainForm.LoadCheatsWindow(); - } + private void toolStripButton3_Click(object sender, EventArgs e) + { + Global.MainForm.LoadRamSearch(); + } - private void toolStripButton2_Click(object sender, EventArgs e) - { - Global.MainForm.LoadRamWatch(); - } + private void toolStripButton4_Click(object sender, EventArgs e) + { + RamPoke r = new RamPoke(); + r.Show(); + } - private void toolStripButton3_Click(object sender, EventArgs e) - { - Global.MainForm.LoadRamSearch(); - } + private void HexEditor_Click(object sender, EventArgs e) + { + Global.MainForm.LoadHexEditor(); + } - private void toolStripButton4_Click(object sender, EventArgs e) - { - RamPoke r = new RamPoke(); - r.Show(); - } + private void toolStripButton5_Click(object sender, EventArgs e) + { + var window = new BizHawk.MultiClient.tools.LuaWindow(); + window.Show(); + } - private void HexEditor_Click(object sender, EventArgs e) - { - Global.MainForm.LoadHexEditor(); - } + private void NESPPU_Click(object sender, EventArgs e) + { + Global.MainForm.LoadNESPPU(); + } - private void toolStripButton5_Click(object sender, EventArgs e) - { - var window = new BizHawk.MultiClient.tools.LuaWindow(); - window.Show(); - } + private void NESDebugger_Click(object sender, EventArgs e) + { + Global.MainForm.LoadNESDebugger(); + } - private void NESPPU_Click(object sender, EventArgs e) - { - Global.MainForm.LoadNESPPU(); - } + private void NESGameGenie_Click(object sender, EventArgs e) + { + Global.MainForm.LoadGameGenieEC(); + } - private void NESDebugger_Click(object sender, EventArgs e) - { - Global.MainForm.LoadNESDebugger(); - } + private void NESNameTable_Click(object sender, EventArgs e) + { + Global.MainForm.LoadNESNameTable(); + } - 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(); - } - } + private void KeyPadTool_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..8d4010551f 100644 --- a/BizHawk.MultiClient/tools/ToolBox.resx +++ b/BizHawk.MultiClient/tools/ToolBox.resx @@ -112,15 +112,15 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 17, 17 - + AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAA