diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 74ccb1628a..05bdd15291 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -629,6 +629,12 @@
LuaBox.cs
+
+ UserControl
+
+
+ MarkerControl.cs
+
UserControl
@@ -989,6 +995,9 @@
LuaBox.cs
+
+ MarkerControl.cs
+
MarkerControlsBox.cs
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
new file mode 100644
index 0000000000..5bccc8f3b3
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs
@@ -0,0 +1,72 @@
+namespace BizHawk.Client.EmuHawk.tools.TAStudio
+{
+ partial class MarkerControl
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
+
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Component Designer generated code
+
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.MarkerLabel = new System.Windows.Forms.Label();
+ this.MarkerBox = new System.Windows.Forms.TextBox();
+ this.SuspendLayout();
+ //
+ // MarkerLabel
+ //
+ this.MarkerLabel.AutoSize = true;
+ this.MarkerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.MarkerLabel.ForeColor = System.Drawing.Color.DeepSkyBlue;
+ this.MarkerLabel.Location = new System.Drawing.Point(0, 4);
+ this.MarkerLabel.Name = "MarkerLabel";
+ this.MarkerLabel.Size = new System.Drawing.Size(100, 16);
+ this.MarkerLabel.TabIndex = 5;
+ this.MarkerLabel.Text = "Marker 99999";
+ //
+ // MarkerBox
+ //
+ this.MarkerBox.Location = new System.Drawing.Point(103, 1);
+ this.MarkerBox.Name = "MarkerBox";
+ this.MarkerBox.Size = new System.Drawing.Size(188, 20);
+ this.MarkerBox.TabIndex = 5;
+ //
+ // MarkerControl
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.MarkerBox);
+ this.Controls.Add(this.MarkerLabel);
+ this.Name = "MarkerControl";
+ this.Size = new System.Drawing.Size(292, 24);
+ this.Load += new System.EventHandler(this.MarkerControl_Load);
+ this.ResumeLayout(false);
+ this.PerformLayout();
+
+ }
+
+ #endregion
+
+ private System.Windows.Forms.Label MarkerLabel;
+ private System.Windows.Forms.TextBox MarkerBox;
+ }
+}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
new file mode 100644
index 0000000000..168a534c38
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace BizHawk.Client.EmuHawk.tools.TAStudio
+{
+ public partial class MarkerControl : UserControl
+ {
+ private Marker _marker;
+ private int _markerIndex;
+
+ public MarkerControl()
+ {
+ InitializeComponent();
+ }
+
+ public void SetMarker(Marker marker, int index)
+ {
+ _marker = marker;
+ _markerIndex = index;
+ }
+
+ private void MarkerControl_Load(object sender, EventArgs e)
+ {
+ MarkerLabel.Text = "Marker " + _markerIndex;
+ MarkerBox.Text = _marker.Message;
+ }
+ }
+}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.resx b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.resx
new file mode 100644
index 0000000000..29dcb1b3a3
--- /dev/null
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
index 4b0cbcd31f..210c9121dc 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs
@@ -107,7 +107,6 @@ namespace BizHawk.Client.EmuHawk
this.Log = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.MarkerLabel = new System.Windows.Forms.Label();
this.MarkerDescriptionBox = new System.Windows.Forms.TextBox();
- this.TopMarkerBox = new System.Windows.Forms.TextBox();
this.TopMarkerLabel = new System.Windows.Forms.Label();
this.TASMenu.SuspendLayout();
this.SuspendLayout();
@@ -710,13 +709,6 @@ namespace BizHawk.Client.EmuHawk
this.MarkerDescriptionBox.Size = new System.Drawing.Size(185, 20);
this.MarkerDescriptionBox.TabIndex = 3;
//
- // TopMarkerBox
- //
- this.TopMarkerBox.Location = new System.Drawing.Point(115, 23);
- this.TopMarkerBox.Name = "TopMarkerBox";
- this.TopMarkerBox.Size = new System.Drawing.Size(188, 20);
- this.TopMarkerBox.TabIndex = 5;
- //
// TopMarkerLabel
//
this.TopMarkerLabel.AutoSize = true;
@@ -733,7 +725,6 @@ namespace BizHawk.Client.EmuHawk
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(530, 519);
- this.Controls.Add(this.TopMarkerBox);
this.Controls.Add(this.TopMarkerLabel);
this.Controls.Add(this.MarkerDescriptionBox);
this.Controls.Add(this.MarkerLabel);
@@ -827,7 +818,6 @@ namespace BizHawk.Client.EmuHawk
private System.Windows.Forms.ToolStripMenuItem RestoreDefaultSettingsMenuItem;
private System.Windows.Forms.Label MarkerLabel;
private System.Windows.Forms.TextBox MarkerDescriptionBox;
- private System.Windows.Forms.TextBox TopMarkerBox;
private System.Windows.Forms.Label TopMarkerLabel;
private System.Windows.Forms.ToolStripMenuItem AutoloadProjectMenuItem;
}