diff --git a/src/BizHawk.Client.Common/config/Binding.cs b/src/BizHawk.Client.Common/config/Binding.cs index fe33b59e8d..054fb83ffa 100644 --- a/src/BizHawk.Client.Common/config/Binding.cs +++ b/src/BizHawk.Client.Common/config/Binding.cs @@ -140,9 +140,9 @@ namespace BizHawk.Client.Common Bind("TAStudio", "Select All", "Ctrl+Shift+A"); Bind("TAStudio", "Reselect Clip.", "Ctrl+B"); Bind("TAStudio", "Clear Frames", "Delete"); + Bind("TAStudio", "Delete Frames", "Ctrl+Delete"); Bind("TAStudio", "Insert Frame", "Insert"); Bind("TAStudio", "Insert # Frames", "Ctrl+Shift+Insert"); - Bind("TAStudio", "Delete Frames", "Ctrl+Delete"); Bind("TAStudio", "Clone Frames", "Ctrl+Insert"); Bind("TAStudio", "Analog Increment", "Up"); Bind("TAStudio", "Analog Decrement", "Down"); diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index f08812e911..a93cb8ebde 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -344,11 +344,11 @@ namespace BizHawk.Client.EmuHawk this.CutMenuItem, this.toolStripSeparator8, this.ClearFramesMenuItem, - this.InsertFrameMenuItem, this.DeleteFramesMenuItem, + this.InsertFrameMenuItem, + this.InsertNumFramesMenuItem, this.CloneFramesMenuItem, this.CloneFramesXTimesMenuItem, - this.InsertNumFramesMenuItem, this.toolStripSeparator6, this.TruncateMenuItem, this.ClearGreenzoneMenuItem, @@ -1006,11 +1006,11 @@ namespace BizHawk.Client.EmuHawk this.cutToolStripMenuItem, this.separateToolStripMenuItem, this.ClearContextMenuItem, - this.InsertFrameContextMenuItem, this.DeleteFramesContextMenuItem, + this.InsertFrameContextMenuItem, + this.InsertNumFramesContextMenuItem, this.CloneContextMenuItem, this.CloneXTimesContextMenuItem, - this.InsertNumFramesContextMenuItem, this.toolStripSeparator18, this.TruncateContextMenuItem, this.BranchContextMenuItem, @@ -1018,7 +1018,7 @@ namespace BizHawk.Client.EmuHawk this.StartNewProjectFromNowMenuItem, this.StartANewProjectFromSaveRamMenuItem}); this.RightClickMenu.Name = "RightClickMenu"; - this.RightClickMenu.Size = new System.Drawing.Size(253, 502); + this.RightClickMenu.Size = new System.Drawing.Size(253, 524); this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened); // // SetMarkersContextMenuItem diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 7304fb8d4a..c5f3ec60eb 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -308,9 +308,9 @@ namespace BizHawk.Client.EmuHawk SelectAllMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Select All"]; ReselectClipboardMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Reselect Clip."]; ClearFramesMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Clear Frames"]; + DeleteFramesMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Delete Frames"]; InsertFrameMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Insert Frame"]; InsertNumFramesMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Insert # Frames"]; - DeleteFramesMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Delete Frames"]; CloneFramesMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Clone Frames"]; } @@ -1361,10 +1361,10 @@ namespace BizHawk.Client.EmuHawk BranchContextMenuItem.Visible = TasView.CurrentCell?.RowIndex == Emulator.Frame; SelectBetweenMarkersContextMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Sel. bet. Markers"]; - InsertNumFramesContextMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Insert # Frames"]; ClearContextMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Clear Frames"]; - InsertFrameContextMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Insert Frame"]; DeleteFramesContextMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Delete Frames"]; + InsertFrameContextMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Insert Frame"]; + InsertNumFramesContextMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Insert # Frames"]; CloneContextMenuItem.ShortcutKeyDisplayString = Config.HotkeyBindings["Clone Frames"]; }