diff --git a/BizHawk.Client.Common/config/Binding.cs b/BizHawk.Client.Common/config/Binding.cs index adf8f20f5a..8ca5012022 100644 --- a/BizHawk.Client.Common/config/Binding.cs +++ b/BizHawk.Client.Common/config/Binding.cs @@ -221,6 +221,9 @@ namespace BizHawk.Client.Common Bind("TAStudio", "Add Branch", "Alt+Insert"), Bind("TAStudio", "Delete Branch", "Alt+Delete"), + Bind("TAStudio", "Toggle Follow Cursor", "Shift+F"), + Bind("TAStudio", "Toggle Auto-Restore", "Shift+R"), + Bind("TAStudio", "Toggle Turbo Seek", "Shift+S"), Bind("SNES", "Toggle BG 1"), Bind("SNES", "Toggle BG 2"), diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs index 9e838d02f1..9bdc5e1a1c 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs @@ -353,6 +353,15 @@ namespace BizHawk.Client.EmuHawk case "Delete Branch": GlobalWin.Tools.TAStudio.RemoveBranchExtrenal(); break; + case "Toggle Follow Cursor": + GlobalWin.Tools.TAStudio.TasPlaybackBox.FollowCursor ^= true; + break; + case "Toggle Auto-Restore": + GlobalWin.Tools.TAStudio.TasPlaybackBox.AutoRestore ^= true; + break; + case "Toggle Turbo Seek": + GlobalWin.Tools.TAStudio.TasPlaybackBox.TurboSeek ^= true; + break; // SNES case "Toggle BG 1": diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs index 9eff7e6ec9..1aa03bfda3 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk public TAStudio Tastudio { get; set; } - [Browsable(false)] + [Browsable(true)] [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)] public bool TurboSeek { @@ -28,11 +28,11 @@ namespace BizHawk.Client.EmuHawk set { - TurboSeekCheckbox.Checked = Global.Config.TurboSeek = value; + TurboSeekCheckbox.Checked = value; } } - [Browsable(false)] + [Browsable(true)] [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)] public bool AutoRestore { @@ -43,11 +43,11 @@ namespace BizHawk.Client.EmuHawk set { - AutoRestoreCheckbox.Checked = Tastudio.Settings.AutoRestoreLastPosition = value; + AutoRestoreCheckbox.Checked = value; } } - [Browsable(false)] + [Browsable(true)] [DesignerSerializationVisibilityAttribute(DesignerSerializationVisibility.Hidden)] public bool FollowCursor { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index eaee88aedc..37632aaa04 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -1692,7 +1692,7 @@ namespace BizHawk.Client.EmuHawk private System.Windows.Forms.ToolStripMenuItem SettingsSubMenu; private StatusStripEx TasStatusStrip; private System.Windows.Forms.ToolStripStatusLabel MessageStatusLabel; - private PlaybackBox TasPlaybackBox; + public PlaybackBox TasPlaybackBox; private System.Windows.Forms.ToolStripStatusLabel SplicerStatusLabel; private System.Windows.Forms.ToolStripMenuItem MetaSubMenu; private System.Windows.Forms.ToolStripMenuItem HeaderMenuItem; diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 767833a819..6bb5be42db 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -993,8 +993,8 @@ namespace BizHawk.Client.EmuHawk private void TAStudio_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.F) - TasPlaybackBox.FollowCursor ^= true; + //if (e.KeyCode == Keys.F) + // TasPlaybackBox.FollowCursor ^= true; } private void MainVertialSplit_SplitterMoved(object sender, SplitterEventArgs e)