ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TAStudio - use MarkerControl user control, doesn't do anything yet though

This commit is contained in:
adelikat 2013-12-16 03:23:28 +00:00
parent a6cbd85930
commit 68f522c5c9
4 changed files with 92 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.Designer.cs generated
View File

@ -1,4 +1,4 @@
namespace BizHawk.Client.EmuHawk.tools.TAStudio
namespace BizHawk.Client.EmuHawk
{
partial class MarkerControl
{
@ -45,6 +45,8 @@
//
// MarkerBox
//
this.MarkerBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.MarkerBox.Location = new System.Drawing.Point(103, 1);
this.MarkerBox.Name = "MarkerBox";
this.MarkerBox.Size = new System.Drawing.Size(188, 20);

11
BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -7,12 +7,12 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace BizHawk.Client.EmuHawk.tools.TAStudio
namespace BizHawk.Client.EmuHawk
{
public partial class MarkerControl : UserControl
{
private Marker _marker;
private int _markerIndex;
private Marker _marker = new Marker(0);
private int _markerIndex = 0;
public MarkerControl()
{
@ -23,12 +23,13 @@ namespace BizHawk.Client.EmuHawk.tools.TAStudio
{
_marker = marker;
_markerIndex = index;
MarkerLabel.Text = "Marker " + _markerIndex;
MarkerBox.Text = _marker.Message;
}
private void MarkerControl_Load(object sender, EventArgs e)
{
MarkerLabel.Text = "Marker " + _markerIndex;
MarkerBox.Text = _marker.Message;
}
}
}

62
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs generated
View File

@ -105,9 +105,8 @@ namespace BizHawk.Client.EmuHawk
this.TASView = new BizHawk.Client.EmuHawk.TasListView();
this.Frame = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
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.TopMarkerLabel = new System.Windows.Forms.Label();
this.PreviousMarkerFromFrameControl = new BizHawk.Client.EmuHawk.MarkerControl();
this.PreviousMarkerFromSelectionControl = new BizHawk.Client.EmuHawk.MarkerControl();
this.TASMenu.SuspendLayout();
this.SuspendLayout();
//
@ -181,7 +180,7 @@ namespace BizHawk.Client.EmuHawk
//
this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator3});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Image = ((System.Drawing.Image)(resources.GetObject("RecentSubMenu.Image")));
this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(186, 22);
this.RecentSubMenu.Text = "Recent";
@ -670,10 +669,10 @@ namespace BizHawk.Client.EmuHawk
this.TASView.GridLines = true;
this.TASView.InputPaintingMode = false;
this.TASView.ItemCount = 0;
this.TASView.Location = new System.Drawing.Point(12, 43);
this.TASView.Location = new System.Drawing.Point(12, 49);
this.TASView.Name = "TASView";
this.TASView.selectedItem = -1;
this.TASView.Size = new System.Drawing.Size(291, 452);
this.TASView.Size = new System.Drawing.Size(291, 444);
this.TASView.TabIndex = 1;
this.TASView.UseCompatibleStateImageBehavior = false;
this.TASView.View = System.Windows.Forms.View.Details;
@ -689,45 +688,31 @@ namespace BizHawk.Client.EmuHawk
this.Log.Text = "Log";
this.Log.Width = 222;
//
// MarkerLabel
// PreviousMarkerFromFrameControl
//
this.MarkerLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
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(12, 496);
this.MarkerLabel.Name = "MarkerLabel";
this.MarkerLabel.Size = new System.Drawing.Size(100, 16);
this.MarkerLabel.TabIndex = 2;
this.MarkerLabel.Text = "Marker 99999";
this.PreviousMarkerFromFrameControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.PreviousMarkerFromFrameControl.Location = new System.Drawing.Point(12, 25);
this.PreviousMarkerFromFrameControl.Name = "PreviousMarkerFromFrameControl";
this.PreviousMarkerFromFrameControl.Size = new System.Drawing.Size(292, 24);
this.PreviousMarkerFromFrameControl.TabIndex = 2;
//
// MarkerDescriptionBox
// PreviousMarkerFromSelectionControl
//
this.MarkerDescriptionBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.MarkerDescriptionBox.Location = new System.Drawing.Point(118, 495);
this.MarkerDescriptionBox.Name = "MarkerDescriptionBox";
this.MarkerDescriptionBox.Size = new System.Drawing.Size(185, 20);
this.MarkerDescriptionBox.TabIndex = 3;
//
// TopMarkerLabel
//
this.TopMarkerLabel.AutoSize = true;
this.TopMarkerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.TopMarkerLabel.ForeColor = System.Drawing.Color.DeepSkyBlue;
this.TopMarkerLabel.Location = new System.Drawing.Point(9, 24);
this.TopMarkerLabel.Name = "TopMarkerLabel";
this.TopMarkerLabel.Size = new System.Drawing.Size(100, 16);
this.TopMarkerLabel.TabIndex = 4;
this.TopMarkerLabel.Text = "Marker 99999";
this.PreviousMarkerFromSelectionControl.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.PreviousMarkerFromSelectionControl.Location = new System.Drawing.Point(11, 493);
this.PreviousMarkerFromSelectionControl.Name = "PreviousMarkerFromSelectionControl";
this.PreviousMarkerFromSelectionControl.Size = new System.Drawing.Size(292, 24);
this.PreviousMarkerFromSelectionControl.TabIndex = 3;
//
// TAStudio
//
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.TopMarkerLabel);
this.Controls.Add(this.MarkerDescriptionBox);
this.Controls.Add(this.MarkerLabel);
this.Controls.Add(this.PreviousMarkerFromSelectionControl);
this.Controls.Add(this.PreviousMarkerFromFrameControl);
this.Controls.Add(this.TASMenu);
this.Controls.Add(this.TASView);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@ -816,9 +801,8 @@ namespace BizHawk.Client.EmuHawk
private System.Windows.Forms.ToolStripMenuItem AlwaysOnTopMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
private System.Windows.Forms.ToolStripMenuItem RestoreDefaultSettingsMenuItem;
private System.Windows.Forms.Label MarkerLabel;
private System.Windows.Forms.TextBox MarkerDescriptionBox;
private System.Windows.Forms.Label TopMarkerLabel;
private System.Windows.Forms.ToolStripMenuItem AutoloadProjectMenuItem;
private MarkerControl PreviousMarkerFromFrameControl;
private MarkerControl PreviousMarkerFromSelectionControl;
}
}

60
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.resx
View File

@ -121,6 +121,66 @@
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="RecentSubMenu.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp
bGUAAEjHnZZ3VFTXFofPvXd6oc0wAlKG3rvAANJ7k15FYZgZYCgDDjM0sSGiAhFFRJoiSFDEgNFQJFZE
sRAUVLAHJAgoMRhFVCxvRtaLrqy89/Ly++Osb+2z97n77L3PWhcAkqcvl5cGSwGQyhPwgzyc6RGRUXTs
AIABHmCAKQBMVka6X7B7CBDJy82FniFyAl8EAfB6WLwCcNPQM4BOB/+fpFnpfIHomAARm7M5GSwRF4g4
JUuQLrbPipgalyxmGCVmvihBEcuJOWGRDT77LLKjmNmpPLaIxTmns1PZYu4V8bZMIUfEiK+ICzO5nCwR
3xKxRoowlSviN+LYVA4zAwAUSWwXcFiJIjYRMYkfEuQi4uUA4EgJX3HcVyzgZAvEl3JJS8/hcxMSBXQd
li7d1NqaQffkZKVwBALDACYrmcln013SUtOZvBwAFu/8WTLi2tJFRbY0tba0NDQzMv2qUP91829K3NtF
ehn4uWcQrf+L7a/80hoAYMyJarPziy2uCoDOLQDI3fti0zgAgKSobx3Xv7oPTTwviQJBuo2xcVZWlhGX
wzISF/QP/U+Hv6GvvmckPu6P8tBdOfFMYYqALq4bKy0lTcinZ6QzWRy64Z+H+B8H/nUeBkGceA6fwxNF
hImmjMtLELWbx+YKuGk8Opf3n5r4D8P+pMW5FonS+BFQY4yA1HUqQH7tBygKESDR+8Vd/6NvvvgwIH55
4SqTi3P/7zf9Z8Gl4iWDm/A5ziUohM4S8jMX98TPEqABAUgCKpAHykAd6ABDYAasgC1wBG7AG/iDEBAJ
VgMWSASpgA+yQB7YBApBMdgJ9oBqUAcaQTNoBcdBJzgFzoNL4Bq4AW6D+2AUTIBnYBa8BgsQBGEhMkSB
5CEVSBPSh8wgBmQPuUG+UBAUCcVCCRAPEkJ50GaoGCqDqqF6qBn6HjoJnYeuQIPQXWgMmoZ+h97BCEyC
qbASrAUbwwzYCfaBQ+BVcAK8Bs6FC+AdcCXcAB+FO+Dz8DX4NjwKP4PnEIAQERqiihgiDMQF8UeikHiE
j6xHipAKpAFpRbqRPuQmMorMIG9RGBQFRUcZomxRnqhQFAu1BrUeVYKqRh1GdaB6UTdRY6hZ1Ec0Ga2I
1kfboL3QEegEdBa6EF2BbkK3oy+ib6Mn0K8xGAwNo42xwnhiIjFJmLWYEsw+TBvmHGYQM46Zw2Kx8lh9
rB3WH8vECrCF2CrsUexZ7BB2AvsGR8Sp4Mxw7rgoHA+Xj6vAHcGdwQ3hJnELeCm8Jt4G749n43PwpfhG
fDf+On4Cv0CQJmgT7AghhCTCJkIloZVwkfCA8JJIJKoRrYmBRC5xI7GSeIx4mThGfEuSIemRXEjRJCFp
B+kQ6RzpLuklmUzWIjuSo8gC8g5yM/kC+RH5jQRFwkjCS4ItsUGiRqJDYkjiuSReUlPSSXK1ZK5kheQJ
yeuSM1J4KS0pFymm1HqpGqmTUiNSc9IUaVNpf+lU6RLpI9JXpKdksDJaMm4ybJkCmYMyF2TGKQhFneJC
YVE2UxopFykTVAxVm+pFTaIWU7+jDlBnZWVkl8mGyWbL1sielh2lITQtmhcthVZKO04bpr1borTEaQln
yfYlrUuGlszLLZVzlOPIFcm1yd2WeydPl3eTT5bfJd8p/1ABpaCnEKiQpbBf4aLCzFLqUtulrKVFS48v
vacIK+opBimuVTyo2K84p6Ss5KGUrlSldEFpRpmm7KicpFyufEZ5WoWiYq/CVSlXOavylC5Ld6Kn0Cvp
vfRZVUVVT1Whar3qgOqCmrZaqFq+WpvaQ3WCOkM9Xr1cvUd9VkNFw08jT6NF454mXpOhmai5V7NPc15L
Wytca6tWp9aUtpy2l3audov2Ax2yjoPOGp0GnVu6GF2GbrLuPt0berCehV6iXo3edX1Y31Kfq79Pf9AA
bWBtwDNoMBgxJBk6GWYathiOGdGMfI3yjTqNnhtrGEcZ7zLuM/5oYmGSYtJoct9UxtTbNN+02/R3Mz0z
llmN2S1zsrm7+QbzLvMXy/SXcZbtX3bHgmLhZ7HVosfig6WVJd+y1XLaSsMq1qrWaoRBZQQwShiXrdHW
ztYbrE9Zv7WxtBHYHLf5zdbQNtn2iO3Ucu3lnOWNy8ft1OyYdvV2o/Z0+1j7A/ajDqoOTIcGh8eO6o5s
xybHSSddpySno07PnU2c+c7tzvMuNi7rXM65Iq4erkWuA24ybqFu1W6P3NXcE9xb3Gc9LDzWepzzRHv6
eO7yHPFS8mJ5NXvNelt5r/Pu9SH5BPtU+zz21fPl+3b7wX7efrv9HqzQXMFb0ekP/L38d/s/DNAOWBPw
YyAmMCCwJvBJkGlQXlBfMCU4JvhI8OsQ55DSkPuhOqHC0J4wybDosOaw+XDX8LLw0QjjiHUR1yIVIrmR
XVHYqLCopqi5lW4r96yciLaILoweXqW9KnvVldUKq1NWn46RjGHGnIhFx4bHHol9z/RnNjDn4rziauNm
WS6svaxnbEd2OXuaY8cp40zG28WXxU8l2CXsTphOdEisSJzhunCruS+SPJPqkuaT/ZMPJX9KCU9pS8Wl
xqae5Mnwknm9acpp2WmD6frphemja2zW7Fkzy/fhN2VAGasyugRU0c9Uv1BHuEU4lmmfWZP5Jiss60S2
dDYvuz9HL2d7zmSue+63a1FrWWt78lTzNuWNrXNaV78eWh+3vmeD+oaCDRMbPTYe3kTYlLzpp3yT/LL8
V5vDN3cXKBVsLBjf4rGlpVCikF84stV2a9021DbutoHt5turtn8sYhddLTYprih+X8IqufqN6TeV33za
Eb9joNSydP9OzE7ezuFdDrsOl0mX5ZaN7/bb3VFOLy8qf7UnZs+VimUVdXsJe4V7Ryt9K7uqNKp2Vr2v
Tqy+XeNc01arWLu9dn4fe9/Qfsf9rXVKdcV17w5wD9yp96jvaNBqqDiIOZh58EljWGPft4xvm5sUmoqb
PhziHRo9HHS4t9mqufmI4pHSFrhF2DJ9NProje9cv+tqNWytb6O1FR8Dx4THnn4f+/3wcZ/jPScYJ1p/
0Pyhtp3SXtQBdeR0zHYmdo52RXYNnvQ+2dNt293+o9GPh06pnqo5LXu69AzhTMGZT2dzz86dSz83cz7h
/HhPTM/9CxEXbvUG9g5c9Ll4+ZL7pQt9Tn1nL9tdPnXF5srJq4yrndcsr3X0W/S3/2TxU/uA5UDHdavr
XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEQAACxEBf2RfkQAAAk1JREFUOE+VkktvUlEU
hVsfsdHoREcOHJr4C/RPONHoXzBxoOlAJybOlAZtkdSa2piYNsjjFiiX8qY8ChYL+ECB2lKB8rq0k5bE
miiRbtc+6b2B6MTBR/ZZa+919j3tEBH9RbudHD6E63/2qAwctreT58BVRVnWl8vBbLEg7wNC/QPaMrwb
4GT/jFa024mzQLe56c9GwjM7klXXlcw6ksyPSbLoKByc/lUq+TbQMwrODARAGAF3SxtexSMbf8vOCVp9
ZyK+/euaW9TO+SfksOlprSjvoteAjU5rAYqSuFyvR1PR8EwvGJii8rcAoYFSb+d4gDAgNI/8jGTHOFUr
oT3410QAHuk4Am4Vi/KOzz2JGxfFcLMZI3wK5T7ZqaXEhcYbWU2PKJM2H7Ra8XE14AQO91dTpk4k9JLq
9YgYHghoxcWZPa/bSCH/C2o0orPaBo1GbDQee9VJxF+zoYFPwtpGWgpN0/uMRWgcyiG1WsSkBhxFwG0E
7AV8z2lrKyxuYvgBs2kLr4z1XcLj4SA2gD+nBhxB8p1sxtKZt4xR/otTDNdqS1oQw7ezx2/AfxVok1oA
mh+WSt7v/MKLLgOtr3tEQD+sseeyPyX0dqHdVAOGq9XQPazX/JyzH9itY+SQ9LSSnKV8fkHANWvsoYc/
JYaZERHAPzicBw9AoZBf+BnwTZEN/4G2N4egZg1eDz05cIHntACmUgmeAtdhRsvlwH6x6Dr4+EESoO5B
68JLo+eSOjMQwKDpGLgCJtDoBysgBXzQDOBifz8zcPh/aOgP7nYTiVA2JaoAAAAASUVORK5CYII=
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA