From c6cb0c2c06d9b306da0aff7212baeda6dfe65554 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Thu, 17 Jul 2014 19:57:44 +0000
Subject: [PATCH] TAStudio - Ctrl+Left/Right to navigate between markers

---
 .../tools/TAStudio/TAStudio.Designer.cs              |  3 ++-
 .../tools/TAStudio/TAStudio.ListView.cs              | 12 ++++++++++++
 BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs    |  9 ---------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index 2d9194469d..99fb77f757 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -693,6 +693,7 @@ namespace BizHawk.Client.EmuHawk
 			this.TasView.UseCompatibleStateImageBehavior = false;
 			this.TasView.View = System.Windows.Forms.View.Details;
 			this.TasView.SelectedIndexChanged += new System.EventHandler(this.TasView_SelectedIndexChanged);
+			this.TasView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TasView_KeyDown);
 			this.TasView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDoubleClick);
 			this.TasView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDown);
 			this.TasView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseUp);
@@ -739,6 +740,7 @@ namespace BizHawk.Client.EmuHawk
 			this.TasPlaybackBox.Name = "TasPlaybackBox";
 			this.TasPlaybackBox.Size = new System.Drawing.Size(204, 120);
 			this.TasPlaybackBox.TabIndex = 5;
+			this.TasPlaybackBox.Tastudio = null;
 			// 
 			// MarkerControl
 			// 
@@ -767,7 +769,6 @@ namespace BizHawk.Client.EmuHawk
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
 			this.Text = "TAStudio";
 			this.Load += new System.EventHandler(this.Tastudio_Load);
-			this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TAStudio_KeyDown);
 			this.TASMenu.ResumeLayout(false);
 			this.TASMenu.PerformLayout();
 			this.TasStatusStrip.ResumeLayout(false);
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index ff31d6b4cd..1f71138b62 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -330,6 +330,18 @@ namespace BizHawk.Client.EmuHawk
 			SetSplicer();
 		}
 
+		private void TasView_KeyDown(object sender, KeyEventArgs e)
+		{
+			if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Left) // Ctrl + Left
+			{
+				GoToPreviousMarker();
+			}
+			else if (e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Right) // Ctrl + Left
+			{
+				GoToNextMarker();
+			}
+		}
+
 		#endregion
 	}
 }
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index ffb2588d55..d75ba5cc0e 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -679,7 +679,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-
 		#endregion
 
 		#region Config
@@ -779,14 +778,6 @@ namespace BizHawk.Client.EmuHawk
 
 		#region Dialog Events
 
-		private void TAStudio_KeyDown(object sender, KeyEventArgs e)
-		{
-			if (!e.Control && !e.Shift && !e.Alt && e.KeyCode == Keys.Delete)
-			{
-				DeleteFramesMenuItem_Click(null, null);
-			}
-		}
-
 		protected override void OnShown(EventArgs e)
 		{
 			RefreshFloatingWindowControl();