From 8d284c1250d48e51ed53e6022cba393fcc3ede07 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Thu, 28 Apr 2011 02:12:35 +0000 Subject: [PATCH] TI83 Keypad - ability to turn on/off the hotkey tooltips --- BizHawk.MultiClient/Config.cs | 1 + .../TI83tools/TI83KeyPad.Designer.cs | 16 ++++++++++++-- BizHawk.MultiClient/TI83tools/TI83KeyPad.cs | 21 ++++++++++++++++++- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 7347b0b68b..f21fb66b81 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -156,6 +156,7 @@ public bool TI83KeypadSaveWindowPosition = true; public int TI83KeyPadWndx = -1; public int TI83KeyPadWndy = -1; + public bool TI83ToolTips = true; // Client Hotkey Bindings public string HardResetBinding = "LeftShift+Tab"; //TODO: This needs to be Ctrl+R but how? diff --git a/BizHawk.MultiClient/TI83tools/TI83KeyPad.Designer.cs b/BizHawk.MultiClient/TI83tools/TI83KeyPad.Designer.cs index f7a6dbcb0c..97602b3acb 100644 --- a/BizHawk.MultiClient/TI83tools/TI83KeyPad.Designer.cs +++ b/BizHawk.MultiClient/TI83tools/TI83KeyPad.Designer.cs @@ -163,6 +163,7 @@ this.DOWN = new System.Windows.Forms.Button(); this.UP = new System.Windows.Forms.Button(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); + this.showHotkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -195,14 +196,15 @@ // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(143, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.exitToolStripMenuItem.Text = "E&xit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // // optionsToolStripMenuItem // this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveWindowPositionToolStripMenuItem}); + this.saveWindowPositionToolStripMenuItem, + this.showHotkToolStripMenuItem}); this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); this.optionsToolStripMenuItem.Text = "&Options"; @@ -1700,6 +1702,15 @@ this.UP.UseVisualStyleBackColor = false; this.UP.Click += new System.EventHandler(this.button50_Click); // + // showHotkToolStripMenuItem + // + this.showHotkToolStripMenuItem.Checked = true; + this.showHotkToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; + this.showHotkToolStripMenuItem.Name = "showHotkToolStripMenuItem"; + this.showHotkToolStripMenuItem.Size = new System.Drawing.Size(190, 22); + this.showHotkToolStripMenuItem.Text = "Show Hotkeys"; + this.showHotkToolStripMenuItem.Click += new System.EventHandler(this.showHotkToolStripMenuItem_Click); + // // TI83KeyPad // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1980,5 +1991,6 @@ private System.Windows.Forms.Button DOWN; private System.Windows.Forms.Button UP; private System.Windows.Forms.ToolTip toolTip1; + private System.Windows.Forms.ToolStripMenuItem showHotkToolStripMenuItem; } } \ No newline at end of file diff --git a/BizHawk.MultiClient/TI83tools/TI83KeyPad.cs b/BizHawk.MultiClient/TI83tools/TI83KeyPad.cs index 0e75960d21..8b90b8032f 100644 --- a/BizHawk.MultiClient/TI83tools/TI83KeyPad.cs +++ b/BizHawk.MultiClient/TI83tools/TI83KeyPad.cs @@ -24,7 +24,12 @@ namespace BizHawk.MultiClient { if (Global.Config.TI83KeypadSaveWindowPosition && Global.Config.TI83KeyPadWndx >= 0 && Global.Config.TI83KeyPadWndy >= 0) Location = new Point(Global.Config.TI83KeyPadWndx, Global.Config.TI83KeyPadWndy); + if (Global.Config.TI83ToolTips) + SetToolTips(); + } + private void SetToolTips() + { //Set button hotkey mapping into tooltips toolTip1.SetToolTip(ZERO, Global.Config.TI83Controller[0]._0); toolTip1.SetToolTip(ONE, Global.Config.TI83Controller[0]._1); @@ -76,7 +81,11 @@ namespace BizHawk.MultiClient toolTip1.SetToolTip(DEL, Global.Config.TI83Controller[0].DEL); toolTip1.SetToolTip(COMMA, Global.Config.TI83Controller[0].COMMA); toolTip1.SetToolTip(SIN, Global.Config.TI83Controller[0].SIN); + } + public void StopToolTips() + { + toolTip1.RemoveAll(); } public void UpdateValues() @@ -109,6 +118,7 @@ namespace BizHawk.MultiClient private void optionsToolStripMenuItem_DropDownOpened(object sender, EventArgs e) { saveWindowPositionToolStripMenuItem.Checked = Global.Config.TI83KeypadSaveWindowPosition; + showHotkToolStripMenuItem.Checked = Global.Config.TI83ToolTips; } private void button42_Click(object sender, EventArgs e) @@ -118,7 +128,7 @@ namespace BizHawk.MultiClient private void button43_Click(object sender, EventArgs e) { - + Global.Emulator.Controller.ForceButton("DASH"); } private void button39_Click(object sender, EventArgs e) @@ -355,5 +365,14 @@ namespace BizHawk.MultiClient { Global.Emulator.Controller.ForceButton("DOT"); } + + private void showHotkToolStripMenuItem_Click(object sender, EventArgs e) + { + Global.Config.TI83ToolTips ^= true; + if (Global.Config.TI83ToolTips == true) + SetToolTips(); + else + StopToolTips(); + } } }