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

Tastudio - implement the "Empty new Marker notes" menu item

This commit is contained in:
adelikat 2014-10-15 16:09:14 +00:00
parent 5436a7d24e
commit b87177a0b5
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/config/Config.cs
View File

@ -532,6 +532,7 @@ namespace BizHawk.Client.Common
public bool TAStudioAutoPause = true; public bool TAStudioAutoPause = true;
public bool TAStudioAutoRestoreLastPosition = false; public bool TAStudioAutoRestoreLastPosition = false;
public bool TAStudioFollowCursor = true; public bool TAStudioFollowCursor = true;
public bool TAStudioEmptyMarkers = false;
// VirtualPad Dialog // VirtualPad Dialog
public ToolDialogSettings VirtualPadSettings = new ToolDialogSettings(); public ToolDialogSettings VirtualPadSettings = new ToolDialogSettings();

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

@ -73,7 +73,6 @@ namespace BizHawk.Client.EmuHawk
this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.SetMaxUndoLevelsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SetMaxUndoLevelsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.AutofirePatternSkipsLagMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator();
this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -101,6 +100,7 @@ namespace BizHawk.Client.EmuHawk
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.RestoreDefaultSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.RestoreDefaultSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ColumnsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.ColumnsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.EnableTooltipsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.EnableTooltipsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
@ -127,7 +127,6 @@ namespace BizHawk.Client.EmuHawk
this.InsertNumFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.InsertNumFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator18 = new System.Windows.Forms.ToolStripSeparator();
this.TruncateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TruncateContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
this.TASMenu.SuspendLayout(); this.TASMenu.SuspendLayout();
this.TasStatusStrip.SuspendLayout(); this.TasStatusStrip.SuspendLayout();
this.RightClickMenu.SuspendLayout(); this.RightClickMenu.SuspendLayout();
@ -467,7 +466,6 @@ namespace BizHawk.Client.EmuHawk
this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.SetMaxUndoLevelsMenuItem, this.SetMaxUndoLevelsMenuItem,
this.toolStripSeparator9, this.toolStripSeparator9,
this.AutofirePatternSkipsLagMenuItem,
this.AutoadjustInputMenuItem, this.AutoadjustInputMenuItem,
this.toolStripSeparator11, this.toolStripSeparator11,
this.DrawInputByDraggingMenuItem, this.DrawInputByDraggingMenuItem,
@ -498,13 +496,6 @@ namespace BizHawk.Client.EmuHawk
this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(285, 6); this.toolStripSeparator9.Size = new System.Drawing.Size(285, 6);
// //
// AutofirePatternSkipsLagMenuItem
//
this.AutofirePatternSkipsLagMenuItem.Enabled = false;
this.AutofirePatternSkipsLagMenuItem.Name = "AutofirePatternSkipsLagMenuItem";
this.AutofirePatternSkipsLagMenuItem.Size = new System.Drawing.Size(288, 22);
this.AutofirePatternSkipsLagMenuItem.Text = "Autofire Pattern skips Lag";
//
// AutoadjustInputMenuItem // AutoadjustInputMenuItem
// //
this.AutoadjustInputMenuItem.Enabled = false; this.AutoadjustInputMenuItem.Enabled = false;
@ -552,10 +543,10 @@ namespace BizHawk.Client.EmuHawk
// //
// EmptyNewMarkerNotesMenuItem // EmptyNewMarkerNotesMenuItem
// //
this.EmptyNewMarkerNotesMenuItem.Enabled = false;
this.EmptyNewMarkerNotesMenuItem.Name = "EmptyNewMarkerNotesMenuItem"; this.EmptyNewMarkerNotesMenuItem.Name = "EmptyNewMarkerNotesMenuItem";
this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(288, 22); this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(288, 22);
this.EmptyNewMarkerNotesMenuItem.Text = "Empty new Marker Notes"; this.EmptyNewMarkerNotesMenuItem.Text = "Empty new Marker Notes";
this.EmptyNewMarkerNotesMenuItem.Click += new System.EventHandler(this.EmptyNewMarkerNotesMenuItem_Click);
// //
// toolStripSeparator13 // toolStripSeparator13
// //
@ -698,6 +689,11 @@ namespace BizHawk.Client.EmuHawk
this.ColumnsSubMenu.Text = "&Columns"; this.ColumnsSubMenu.Text = "&Columns";
this.ColumnsSubMenu.DropDownOpened += new System.EventHandler(this.ColumnsSubMenu_DropDownOpened); this.ColumnsSubMenu.DropDownOpened += new System.EventHandler(this.ColumnsSubMenu_DropDownOpened);
// //
// toolStripSeparator19
//
this.toolStripSeparator19.Name = "toolStripSeparator19";
this.toolStripSeparator19.Size = new System.Drawing.Size(57, 6);
//
// HelpSubMenu // HelpSubMenu
// //
this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -745,8 +741,8 @@ namespace BizHawk.Client.EmuHawk
this.TasView.RowCount = 0; this.TasView.RowCount = 0;
this.TasView.Size = new System.Drawing.Size(288, 471); this.TasView.Size = new System.Drawing.Size(288, 471);
this.TasView.TabIndex = 1; this.TasView.TabIndex = 1;
this.TasView.ColumnClick += new InputRoll.ColumnClickEventHandler(this.TasView_ColumnClick); this.TasView.ColumnClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnClick);
this.TasView.ColumnRightClick += new InputRoll.ColumnClickEventHandler(this.TasView_ColumnRightClick); this.TasView.ColumnRightClick += new BizHawk.Client.EmuHawk.InputRoll.ColumnClickEventHandler(this.TasView_ColumnRightClick);
this.TasView.SelectedIndexChanged += new System.EventHandler(this.TasView_SelectedIndexChanged); this.TasView.SelectedIndexChanged += new System.EventHandler(this.TasView_SelectedIndexChanged);
this.TasView.RightMouseScrolled += new BizHawk.Client.EmuHawk.InputRoll.RightMouseScrollEventHandler(this.TasView_MouseWheel); this.TasView.RightMouseScrolled += new BizHawk.Client.EmuHawk.InputRoll.RightMouseScrollEventHandler(this.TasView_MouseWheel);
this.TasView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TasView_KeyDown); this.TasView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TasView_KeyDown);
@ -925,11 +921,6 @@ namespace BizHawk.Client.EmuHawk
this.TruncateContextMenuItem.Text = "Truncate Movie"; this.TruncateContextMenuItem.Text = "Truncate Movie";
this.TruncateContextMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); this.TruncateContextMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click);
// //
// toolStripSeparator19
//
this.toolStripSeparator19.Name = "toolStripSeparator19";
this.toolStripSeparator19.Size = new System.Drawing.Size(149, 6);
//
// TAStudio // TAStudio
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -1004,7 +995,6 @@ namespace BizHawk.Client.EmuHawk
private System.Windows.Forms.ToolStripSeparator toolStripSeparator10; private System.Windows.Forms.ToolStripSeparator toolStripSeparator10;
private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem SetMaxUndoLevelsMenuItem; private System.Windows.Forms.ToolStripMenuItem SetMaxUndoLevelsMenuItem;
private System.Windows.Forms.ToolStripMenuItem AutofirePatternSkipsLagMenuItem;
private System.Windows.Forms.ToolStripMenuItem AutoadjustInputMenuItem; private System.Windows.Forms.ToolStripMenuItem AutoadjustInputMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; private System.Windows.Forms.ToolStripSeparator toolStripSeparator11;
private System.Windows.Forms.ToolStripMenuItem DrawInputByDraggingMenuItem; private System.Windows.Forms.ToolStripMenuItem DrawInputByDraggingMenuItem;

10
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -319,7 +319,15 @@ namespace BizHawk.Client.EmuHawk
TasView.CurrentCell.Column.Name == FrameColumnName && TasView.CurrentCell.Column.Name == FrameColumnName &&
e.Button == MouseButtons.Left) e.Button == MouseButtons.Left)
{ {
CallAddMarkerPopUp(TasView.CurrentCell.RowIndex.Value); if (Global.Config.TAStudioEmptyMarkers)
{
_currentTasMovie.Markers.Add(TasView.CurrentCell.RowIndex.Value, string.Empty);
RefreshDialog();
}
else
{
CallAddMarkerPopUp(TasView.CurrentCell.RowIndex.Value);
}
} }
} }

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

@ -974,6 +974,7 @@ namespace BizHawk.Client.EmuHawk
{ {
DrawInputByDraggingMenuItem.Checked = Global.Config.TAStudioDrawInput; DrawInputByDraggingMenuItem.Checked = Global.Config.TAStudioDrawInput;
AutopauseAtEndOfMovieMenuItem.Checked = Global.Config.TAStudioAutoPause; AutopauseAtEndOfMovieMenuItem.Checked = Global.Config.TAStudioAutoPause;
EmptyNewMarkerNotesMenuItem.Checked = Global.Config.TAStudioEmptyMarkers;
} }
private void DrawInputByDraggingMenuItem_Click(object sender, EventArgs e) private void DrawInputByDraggingMenuItem_Click(object sender, EventArgs e)
@ -982,6 +983,12 @@ namespace BizHawk.Client.EmuHawk
TasView.InputPaintingMode = Global.Config.TAStudioDrawInput ^= true; TasView.InputPaintingMode = Global.Config.TAStudioDrawInput ^= true;
} }
private void EmptyNewMarkerNotesMenuItem_Click(object sender, EventArgs e)
{
Global.Config.TAStudioEmptyMarkers ^= true;
}
private void AutopauseAtEndMenuItem_Click(object sender, EventArgs e) private void AutopauseAtEndMenuItem_Click(object sender, EventArgs e)
{ {
Global.Config.TAStudioAutoPause ^= true; Global.Config.TAStudioAutoPause ^= true;