diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index cf68080ac5..c1d9a90591 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -580,8 +580,7 @@ // this.InsertNumFramesMenuItem.Name = "InsertNumFramesMenuItem"; this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = ""; - this.InsertNumFramesMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.Insert))); + this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = "Ctrl+Shift+Ins"; this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(280, 22); this.InsertNumFramesMenuItem.Text = "Insert # of Frames"; this.InsertNumFramesMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click); @@ -1451,7 +1450,6 @@ // ClearContextMenuItem // this.ClearContextMenuItem.Name = "ClearContextMenuItem"; - this.ClearContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; this.ClearContextMenuItem.Size = new System.Drawing.Size(242, 22); this.ClearContextMenuItem.Text = "Clear"; this.ClearContextMenuItem.Click += new System.EventHandler(this.ClearFramesMenuItem_Click); @@ -1459,7 +1457,6 @@ // InsertFrameContextMenuItem // this.InsertFrameContextMenuItem.Name = "InsertFrameContextMenuItem"; - this.InsertFrameContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert; this.InsertFrameContextMenuItem.Size = new System.Drawing.Size(242, 22); this.InsertFrameContextMenuItem.Text = "Insert"; this.InsertFrameContextMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); @@ -1467,7 +1464,6 @@ // DeleteFramesContextMenuItem // this.DeleteFramesContextMenuItem.Name = "DeleteFramesContextMenuItem"; - this.DeleteFramesContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); this.DeleteFramesContextMenuItem.Size = new System.Drawing.Size(242, 22); this.DeleteFramesContextMenuItem.Text = "Delete"; this.DeleteFramesContextMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); @@ -1475,7 +1471,6 @@ // CloneContextMenuItem // this.CloneContextMenuItem.Name = "CloneContextMenuItem"; - this.CloneContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert))); this.CloneContextMenuItem.Size = new System.Drawing.Size(242, 22); this.CloneContextMenuItem.Text = "Clone"; this.CloneContextMenuItem.Click += new System.EventHandler(this.CloneFramesMenuItem_Click); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 93b52dffcb..01ea3e0f06 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -1454,6 +1454,11 @@ namespace BizHawk.Client.EmuHawk RemoveMarkersContextMenuItem.Enabled = CurrentTasMovie.Markers.Any(m => TasView.SelectedRows.Contains(m.Frame)); // Disable the option to remove markers if no markers are selected (FCEUX does this). CancelSeekContextMenuItem.Enabled = Mainform.PauseOnFrame.HasValue; BranchContextMenuItem.Visible = TasView.CurrentCell.RowIndex == Emulator.Frame; + + ClearContextMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Clear Frames"].Bindings; + InsertFrameContextMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Insert Frame"].Bindings; + DeleteFramesContextMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Delete Frames"].Bindings; + CloneContextMenuItem.ShortcutKeyDisplayString = Global.Config.HotkeyBindings["Clone Frames"].Bindings; } private void CancelSeekContextMenuItem_Click(object sender, EventArgs e)