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

Tastudio - cancel seek context menu item

This commit is contained in:
adelikat 2014-10-23 23:18:42 +00:00
parent 5c4a876d2d
commit d5aad8d0e2
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,6 +123,7 @@ namespace BizHawk.Client.EmuHawk
this.SelectBetweenMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SelectBetweenMarkersContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
this.UngreenzoneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.UngreenzoneContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.CancelSeekContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.ClearContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ClearContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DeleteFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DeleteFramesContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -841,6 +842,7 @@ namespace BizHawk.Client.EmuHawk
this.SelectBetweenMarkersContextMenuItem, this.SelectBetweenMarkersContextMenuItem,
this.toolStripSeparator16, this.toolStripSeparator16,
this.UngreenzoneContextMenuItem, this.UngreenzoneContextMenuItem,
this.CancelSeekContextMenuItem,
this.toolStripSeparator17, this.toolStripSeparator17,
this.ClearContextMenuItem, this.ClearContextMenuItem,
this.DeleteFramesContextMenuItem, this.DeleteFramesContextMenuItem,
@ -850,7 +852,7 @@ namespace BizHawk.Client.EmuHawk
this.toolStripSeparator18, this.toolStripSeparator18,
this.TruncateContextMenuItem}); this.TruncateContextMenuItem});
this.RightClickMenu.Name = "RightClickMenu"; this.RightClickMenu.Name = "RightClickMenu";
this.RightClickMenu.Size = new System.Drawing.Size(273, 270); this.RightClickMenu.Size = new System.Drawing.Size(273, 292);
this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened); this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened);
// //
// SetMarkersContextMenuItem // SetMarkersContextMenuItem
@ -900,6 +902,13 @@ namespace BizHawk.Client.EmuHawk
this.UngreenzoneContextMenuItem.Text = "Clear Greenzone"; this.UngreenzoneContextMenuItem.Text = "Clear Greenzone";
this.UngreenzoneContextMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click); this.UngreenzoneContextMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click);
// //
// CancelSeekContextMenuItem
//
this.CancelSeekContextMenuItem.Name = "CancelSeekContextMenuItem";
this.CancelSeekContextMenuItem.Size = new System.Drawing.Size(272, 22);
this.CancelSeekContextMenuItem.Text = "Cancel Seek";
this.CancelSeekContextMenuItem.Click += new System.EventHandler(this.CancelSeekContextMenuItem_Click);
//
// toolStripSeparator17 // toolStripSeparator17
// //
this.toolStripSeparator17.Name = "toolStripSeparator17"; this.toolStripSeparator17.Name = "toolStripSeparator17";
@ -1105,5 +1114,6 @@ namespace BizHawk.Client.EmuHawk
private System.Windows.Forms.ToolStripSeparator toolStripSeparator21; private System.Windows.Forms.ToolStripSeparator toolStripSeparator21;
private System.Windows.Forms.ToolStripMenuItem DefaultStateSettingsMenuItem; private System.Windows.Forms.ToolStripMenuItem DefaultStateSettingsMenuItem;
private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.ToolStripMenuItem CancelSeekContextMenuItem;
} }
} }

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

@ -691,5 +691,15 @@ namespace BizHawk.Client.EmuHawk
} }
#endregion #endregion
#region Context Menu
private void CancelSeekContextMenuItem_Click(object sender, EventArgs e)
{
GlobalWin.MainForm.PauseOnFrame = null;
TasView.Refresh();
}
#endregion
} }
} }

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

@ -613,6 +613,8 @@ namespace BizHawk.Client.EmuHawk
TasView.SelectedRows.Any(); TasView.SelectedRows.Any();
RemoveMarkersContextMenuItem.Enabled = CurrentTasMovie.Markers.Any(m => TasView.SelectedRows.Contains(m.Frame)); // Disable the option to remove markers if no markers are selected (FCEUX does this). RemoveMarkersContextMenuItem.Enabled = CurrentTasMovie.Markers.Any(m => TasView.SelectedRows.Contains(m.Frame)); // Disable the option to remove markers if no markers are selected (FCEUX does this).
CancelSeekContextMenuItem.Enabled = GlobalWin.MainForm.PauseOnFrame.HasValue;
} }
private void TAStudio_DragEnter(object sender, DragEventArgs e) private void TAStudio_DragEnter(object sender, DragEventArgs e)