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

ugh

This commit is contained in:
adelikat 2014-07-16 02:20:14 +00:00
parent d8216ae0fc
commit 1a4168d14d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,11 +15,10 @@ namespace BizHawk.Client.EmuHawk
{
public TasMovieMarkerList Markers {get; set; }
private readonly TAStudio _tastudio;
public TAStudio Tastudio { get; set; }
public MarkerControl(TAStudio tastudio)
public MarkerControl()
{
_tastudio = tastudio;
InitializeComponent();
MarkerView.QueryItemBkColor += MarkerView_QueryItemBkColor;
MarkerView.QueryItemText += MarkerView_QueryItemText;
@ -64,7 +63,7 @@ namespace BizHawk.Client.EmuHawk
private void AddBtn_Click(object sender, EventArgs e)
{
_tastudio.CallAddMarkerPopUp();
Tastudio.CallAddMarkerPopUp();
}
public new void Refresh()
@ -85,7 +84,7 @@ namespace BizHawk.Client.EmuHawk
private void RemoveBtn_Click(object sender, EventArgs e)
{
SelectedMarkers.ForEach(i => Markers.Remove(i));
_tastudio.RefreshDialog();
Tastudio.RefreshDialog();
}
private IEnumerable<int> SelectedIndices

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

@ -107,7 +107,7 @@ namespace BizHawk.Client.EmuHawk
this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox();
this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl(this);
this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl();
this.TASMenu.SuspendLayout();
this.TasStatusStrip.SuspendLayout();
this.SuspendLayout();

1
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -68,6 +68,7 @@ namespace BizHawk.Client.EmuHawk
public TAStudio()
{
InitializeComponent();
MarkerControl.Tastudio = this;
TasView.QueryItemText += TasView_QueryItemText;
TasView.QueryItemBkColor += TasView_QueryItemBkColor;
TasView.VirtualMode = true;