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

tastudio: bind autosave and screenshot popup timers to controls 

also annihilate _saveBackgroundWorker
This commit is contained in:
feos 2017-03-17 21:55:43 +03:00
parent edc3cea302
commit e99b52342c
5 changed files with 212 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,8 @@ namespace BizHawk.Client.EmuHawk
{
public partial class ScreenshotForm : Form
{
private Timer _showTimer = new Timer();
private Timer _hideTimer = new Timer();
private Timer _showTimer;
private Timer _hideTimer;
public TasBranch Branch { get; set; }
new public Font Font;
public FontStyle FontStyle;
@ -31,6 +31,9 @@ namespace BizHawk.Client.EmuHawk
{
InitializeComponent();
_showTimer = new Timer(components);
_hideTimer = new Timer(components);
Width = 320;
Height = 240;
FontSize = 10;

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

@ -212,13 +212,13 @@ namespace BizHawk.Client.EmuHawk
//
this.TASMenu.ClickThrough = true;
this.TASMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.FileSubMenu,
this.EditSubMenu,
this.ConfigSubMenu,
this.MetaSubMenu,
this.SettingsSubMenu,
this.ColumnsSubMenu,
this.HelpSubMenu});
this.FileSubMenu,
this.EditSubMenu,
this.ConfigSubMenu,
this.MetaSubMenu,
this.SettingsSubMenu,
this.ColumnsSubMenu,
this.HelpSubMenu});
this.TASMenu.Location = new System.Drawing.Point(0, 0);
this.TASMenu.Name = "TASMenu";
this.TASMenu.Size = new System.Drawing.Size(509, 24);
@ -230,22 +230,22 @@ namespace BizHawk.Client.EmuHawk
// FileSubMenu
//
this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NewTASMenuItem,
this.NewFromSubMenu,
this.OpenTASMenuItem,
this.SaveTASMenuItem,
this.SaveAsTASMenuItem,
this.SaveBackupMenuItem,
this.SaveBk2BackupMenuItem,
this.RecentSubMenu,
this.toolStripSeparator1,
this.saveSelectionToMacroToolStripMenuItem,
this.placeMacroAtSelectionToolStripMenuItem,
this.recentMacrosToolStripMenuItem,
this.toolStripSeparator20,
this.ToBk2MenuItem,
this.toolStripSeparator2,
this.ExitMenuItem});
this.NewTASMenuItem,
this.NewFromSubMenu,
this.OpenTASMenuItem,
this.SaveTASMenuItem,
this.SaveAsTASMenuItem,
this.SaveBackupMenuItem,
this.SaveBk2BackupMenuItem,
this.RecentSubMenu,
this.toolStripSeparator1,
this.saveSelectionToMacroToolStripMenuItem,
this.placeMacroAtSelectionToolStripMenuItem,
this.recentMacrosToolStripMenuItem,
this.toolStripSeparator20,
this.ToBk2MenuItem,
this.toolStripSeparator2,
this.ExitMenuItem});
this.FileSubMenu.Name = "FileSubMenu";
this.FileSubMenu.Size = new System.Drawing.Size(35, 20);
this.FileSubMenu.Text = "&File";
@ -262,8 +262,8 @@ namespace BizHawk.Client.EmuHawk
// NewFromSubMenu
//
this.NewFromSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.NewFromNowMenuItem,
this.NewFromCurrentSaveRamMenuItem});
this.NewFromNowMenuItem,
this.NewFromCurrentSaveRamMenuItem});
this.NewFromSubMenu.Name = "NewFromSubMenu";
this.NewFromSubMenu.Size = new System.Drawing.Size(201, 22);
this.NewFromSubMenu.Text = "New From";
@ -302,8 +302,8 @@ namespace BizHawk.Client.EmuHawk
// SaveAsTASMenuItem
//
this.SaveAsTASMenuItem.Name = "SaveAsTASMenuItem";
this.SaveAsTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S)));
this.SaveAsTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S)));
this.SaveAsTASMenuItem.Size = new System.Drawing.Size(201, 22);
this.SaveAsTASMenuItem.Text = "Save As";
this.SaveAsTASMenuItem.Click += new System.EventHandler(this.SaveAsTasMenuItem_Click);
@ -326,7 +326,7 @@ namespace BizHawk.Client.EmuHawk
// RecentSubMenu
//
this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator3});
this.toolStripSeparator3});
this.RecentSubMenu.Image = ((System.Drawing.Image)(resources.GetObject("RecentSubMenu.Image")));
this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(201, 22);
@ -360,7 +360,7 @@ namespace BizHawk.Client.EmuHawk
// recentMacrosToolStripMenuItem
//
this.recentMacrosToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator22});
this.toolStripSeparator22});
this.recentMacrosToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.recentMacrosToolStripMenuItem.Name = "recentMacrosToolStripMenuItem";
this.recentMacrosToolStripMenuItem.Size = new System.Drawing.Size(201, 22);
@ -400,32 +400,32 @@ namespace BizHawk.Client.EmuHawk
// EditSubMenu
//
this.EditSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.UndoMenuItem,
this.RedoMenuItem,
this.showUndoHistoryToolStripMenuItem,
this.SelectionUndoMenuItem,
this.SelectionRedoMenuItem,
this.toolStripSeparator5,
this.DeselectMenuItem,
this.SelectBetweenMarkersMenuItem,
this.SelectAllMenuItem,
this.ReselectClipboardMenuItem,
this.toolStripSeparator7,
this.CopyMenuItem,
this.PasteMenuItem,
this.PasteInsertMenuItem,
this.CutMenuItem,
this.toolStripSeparator8,
this.ClearFramesMenuItem,
this.InsertFrameMenuItem,
this.DeleteFramesMenuItem,
this.CloneFramesMenuItem,
this.InsertNumFramesMenuItem,
this.toolStripSeparator6,
this.TruncateMenuItem,
this.ClearGreenzoneMenuItem,
this.GreenzoneICheckSeparator,
this.StateHistoryIntegrityCheckMenuItem});
this.UndoMenuItem,
this.RedoMenuItem,
this.showUndoHistoryToolStripMenuItem,
this.SelectionUndoMenuItem,
this.SelectionRedoMenuItem,
this.toolStripSeparator5,
this.DeselectMenuItem,
this.SelectBetweenMarkersMenuItem,
this.SelectAllMenuItem,
this.ReselectClipboardMenuItem,
this.toolStripSeparator7,
this.CopyMenuItem,
this.PasteMenuItem,
this.PasteInsertMenuItem,
this.CutMenuItem,
this.toolStripSeparator8,
this.ClearFramesMenuItem,
this.InsertFrameMenuItem,
this.DeleteFramesMenuItem,
this.CloneFramesMenuItem,
this.InsertNumFramesMenuItem,
this.toolStripSeparator6,
this.TruncateMenuItem,
this.ClearGreenzoneMenuItem,
this.GreenzoneICheckSeparator,
this.StateHistoryIntegrityCheckMenuItem});
this.EditSubMenu.Name = "EditSubMenu";
this.EditSubMenu.Size = new System.Drawing.Size(37, 20);
this.EditSubMenu.Text = "&Edit";
@ -495,8 +495,8 @@ namespace BizHawk.Client.EmuHawk
//
this.SelectAllMenuItem.Name = "SelectAllMenuItem";
this.SelectAllMenuItem.ShortcutKeyDisplayString = "";
this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.A)));
this.SelectAllMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.A)));
this.SelectAllMenuItem.Size = new System.Drawing.Size(291, 22);
this.SelectAllMenuItem.Text = "Select &All";
this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click);
@ -533,8 +533,8 @@ namespace BizHawk.Client.EmuHawk
// PasteInsertMenuItem
//
this.PasteInsertMenuItem.Name = "PasteInsertMenuItem";
this.PasteInsertMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.V)));
this.PasteInsertMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.V)));
this.PasteInsertMenuItem.Size = new System.Drawing.Size(291, 22);
this.PasteInsertMenuItem.Text = "&Paste Insert";
this.PasteInsertMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click);
@ -585,8 +585,8 @@ namespace BizHawk.Client.EmuHawk
//
this.InsertNumFramesMenuItem.Name = "InsertNumFramesMenuItem";
this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = "";
this.InsertNumFramesMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.Insert)));
this.InsertNumFramesMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.Insert)));
this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(291, 22);
this.InsertNumFramesMenuItem.Text = "Insert # of Frames";
this.InsertNumFramesMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click);
@ -618,8 +618,8 @@ namespace BizHawk.Client.EmuHawk
// StateHistoryIntegrityCheckMenuItem
//
this.StateHistoryIntegrityCheckMenuItem.Name = "StateHistoryIntegrityCheckMenuItem";
this.StateHistoryIntegrityCheckMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.I)));
this.StateHistoryIntegrityCheckMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.I)));
this.StateHistoryIntegrityCheckMenuItem.Size = new System.Drawing.Size(291, 22);
this.StateHistoryIntegrityCheckMenuItem.Text = "State History Integrity Check";
this.StateHistoryIntegrityCheckMenuItem.Click += new System.EventHandler(this.StateHistoryIntegrityCheckMenuItem_Click);
@ -627,30 +627,30 @@ namespace BizHawk.Client.EmuHawk
// ConfigSubMenu
//
this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.SetMaxUndoLevelsMenuItem,
this.SetBranchCellHoverIntervalMenuItem,
this.SetSeekingCutoffIntervalMenuItem,
this.toolStripSeparator26,
this.autosaveToolStripMenuItem,
this.BackupPerFileSaveMenuItem,
this.toolStripSeparator9,
this.AutoRestoreOnMouseUpOnlyMenuItem,
this.AutoadjustInputMenuItem,
this.DrawInputByDraggingMenuItem,
this.applyPatternToPaintedInputToolStripMenuItem,
this.onlyOnAutoFireColumnsToolStripMenuItem,
this.SingleClickFloatEditMenuItem,
this.UseInputKeysItem,
this.toolStripSeparator4,
this.BindMarkersToInputMenuItem,
this.EmptyNewMarkerNotesMenuItem,
this.toolStripSeparator13,
this.BranchesRestoreEntireMovieMenuItem,
this.OsdInBranchScreenshotsMenuItem,
this.toolStripSeparator14,
this.AutopauseAtEndOfMovieMenuItem,
this.sepToolStripMenuItem,
this.autoHoldFireToolStripMenuItem});
this.SetMaxUndoLevelsMenuItem,
this.SetBranchCellHoverIntervalMenuItem,
this.SetSeekingCutoffIntervalMenuItem,
this.toolStripSeparator26,
this.autosaveToolStripMenuItem,
this.BackupPerFileSaveMenuItem,
this.toolStripSeparator9,
this.AutoRestoreOnMouseUpOnlyMenuItem,
this.AutoadjustInputMenuItem,
this.DrawInputByDraggingMenuItem,
this.applyPatternToPaintedInputToolStripMenuItem,
this.onlyOnAutoFireColumnsToolStripMenuItem,
this.SingleClickFloatEditMenuItem,
this.UseInputKeysItem,
this.toolStripSeparator4,
this.BindMarkersToInputMenuItem,
this.EmptyNewMarkerNotesMenuItem,
this.toolStripSeparator13,
this.BranchesRestoreEntireMovieMenuItem,
this.OsdInBranchScreenshotsMenuItem,
this.toolStripSeparator14,
this.AutopauseAtEndOfMovieMenuItem,
this.sepToolStripMenuItem,
this.autoHoldFireToolStripMenuItem});
this.ConfigSubMenu.Name = "ConfigSubMenu";
this.ConfigSubMenu.Size = new System.Drawing.Size(50, 20);
this.ConfigSubMenu.Text = "&Config";
@ -686,9 +686,9 @@ namespace BizHawk.Client.EmuHawk
// autosaveToolStripMenuItem
//
this.autosaveToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.SetAutosaveIntervalMenuItem,
this.AutosaveAsBk2MenuItem,
this.AutosaveAsBackupFileMenuItem});
this.SetAutosaveIntervalMenuItem,
this.AutosaveAsBk2MenuItem,
this.AutosaveAsBackupFileMenuItem});
this.autosaveToolStripMenuItem.Name = "autosaveToolStripMenuItem";
this.autosaveToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.autosaveToolStripMenuItem.Text = "Autosave";
@ -841,13 +841,13 @@ namespace BizHawk.Client.EmuHawk
// autoHoldFireToolStripMenuItem
//
this.autoHoldFireToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.keepSetPatternsToolStripMenuItem,
this.sepToolStripMenuItem1,
this.autoHoldToolStripMenuItem,
this.autoFireToolStripMenuItem,
this.customPatternToolStripMenuItem,
this.setpToolStripMenuItem,
this.setCustomsToolStripMenuItem});
this.keepSetPatternsToolStripMenuItem,
this.sepToolStripMenuItem1,
this.autoHoldToolStripMenuItem,
this.autoFireToolStripMenuItem,
this.customPatternToolStripMenuItem,
this.setpToolStripMenuItem,
this.setCustomsToolStripMenuItem});
this.autoHoldFireToolStripMenuItem.Name = "autoHoldFireToolStripMenuItem";
this.autoHoldFireToolStripMenuItem.Size = new System.Drawing.Size(255, 22);
this.autoHoldFireToolStripMenuItem.Text = "Auto Hold/Fire";
@ -905,12 +905,12 @@ namespace BizHawk.Client.EmuHawk
// MetaSubMenu
//
this.MetaSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.HeaderMenuItem,
this.StateHistorySettingsMenuItem,
this.CommentsMenuItem,
this.SubtitlesMenuItem,
this.toolStripSeparator21,
this.DefaultStateSettingsMenuItem});
this.HeaderMenuItem,
this.StateHistorySettingsMenuItem,
this.CommentsMenuItem,
this.SubtitlesMenuItem,
this.toolStripSeparator21,
this.DefaultStateSettingsMenuItem});
this.MetaSubMenu.Name = "MetaSubMenu";
this.MetaSubMenu.Size = new System.Drawing.Size(65, 20);
this.MetaSubMenu.Text = "&Metadata";
@ -958,13 +958,13 @@ namespace BizHawk.Client.EmuHawk
// SettingsSubMenu
//
this.SettingsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.RotateMenuItem,
this.HideLagFramesSubMenu,
this.iconsToolStripMenuItem,
this.toolStripSeparator23,
this.followCursorToolStripMenuItem,
this.toolStripSeparator25,
this.wheelScrollSpeedToolStripMenuItem});
this.RotateMenuItem,
this.HideLagFramesSubMenu,
this.iconsToolStripMenuItem,
this.toolStripSeparator23,
this.followCursorToolStripMenuItem,
this.toolStripSeparator25,
this.wheelScrollSpeedToolStripMenuItem});
this.SettingsSubMenu.Name = "SettingsSubMenu";
this.SettingsSubMenu.Size = new System.Drawing.Size(58, 20);
this.SettingsSubMenu.Text = "&Settings";
@ -980,12 +980,12 @@ namespace BizHawk.Client.EmuHawk
// HideLagFramesSubMenu
//
this.HideLagFramesSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.HideLagFrames0,
this.HideLagFrames1,
this.HideLagFrames2,
this.HideLagFrames3,
this.toolStripSeparator12,
this.hideWasLagFramesToolStripMenuItem});
this.HideLagFrames0,
this.HideLagFrames1,
this.HideLagFrames2,
this.HideLagFrames3,
this.toolStripSeparator12,
this.hideWasLagFramesToolStripMenuItem});
this.HideLagFramesSubMenu.Name = "HideLagFramesSubMenu";
this.HideLagFramesSubMenu.Size = new System.Drawing.Size(188, 22);
this.HideLagFramesSubMenu.Text = "Hide Lag Frames";
@ -1044,10 +1044,10 @@ namespace BizHawk.Client.EmuHawk
// iconsToolStripMenuItem
//
this.iconsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.DenoteStatesWithIconsToolStripMenuItem,
this.DenoteStatesWithBGColorToolStripMenuItem,
this.DenoteMarkersWithIconsToolStripMenuItem,
this.DenoteMarkersWithBGColorToolStripMenuItem});
this.DenoteStatesWithIconsToolStripMenuItem,
this.DenoteStatesWithBGColorToolStripMenuItem,
this.DenoteMarkersWithIconsToolStripMenuItem,
this.DenoteMarkersWithBGColorToolStripMenuItem});
this.iconsToolStripMenuItem.Name = "iconsToolStripMenuItem";
this.iconsToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.iconsToolStripMenuItem.Text = "Icons";
@ -1093,12 +1093,12 @@ namespace BizHawk.Client.EmuHawk
// followCursorToolStripMenuItem
//
this.followCursorToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.alwaysScrollToolStripMenuItem,
this.toolStripSeparator24,
this.scrollToViewToolStripMenuItem,
this.scrollToTopToolStripMenuItem,
this.scrollToBottomToolStripMenuItem,
this.scrollToCenterToolStripMenuItem});
this.alwaysScrollToolStripMenuItem,
this.toolStripSeparator24,
this.scrollToViewToolStripMenuItem,
this.scrollToTopToolStripMenuItem,
this.scrollToBottomToolStripMenuItem,
this.scrollToCenterToolStripMenuItem});
this.followCursorToolStripMenuItem.Name = "followCursorToolStripMenuItem";
this.followCursorToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.followCursorToolStripMenuItem.Text = "Follow Cursor";
@ -1166,7 +1166,7 @@ namespace BizHawk.Client.EmuHawk
// ColumnsSubMenu
//
this.ColumnsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator19});
this.toolStripSeparator19});
this.ColumnsSubMenu.Name = "ColumnsSubMenu";
this.ColumnsSubMenu.Size = new System.Drawing.Size(59, 20);
this.ColumnsSubMenu.Text = "&Columns";
@ -1179,11 +1179,11 @@ namespace BizHawk.Client.EmuHawk
// HelpSubMenu
//
this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.TASEditorManualOnlineMenuItem,
this.ForumThreadMenuItem,
this.aboutToolStripMenuItem,
this.toolStripSeparator10,
this.EnableTooltipsMenuItem});
this.TASEditorManualOnlineMenuItem,
this.ForumThreadMenuItem,
this.aboutToolStripMenuItem,
this.toolStripSeparator10,
this.EnableTooltipsMenuItem});
this.HelpSubMenu.Name = "HelpSubMenu";
this.HelpSubMenu.Size = new System.Drawing.Size(40, 20);
this.HelpSubMenu.Text = "&Help";
@ -1229,9 +1229,9 @@ namespace BizHawk.Client.EmuHawk
this.TasView.AllowColumnResize = false;
this.TasView.allowRightClickSelecton = false;
this.TasView.AlwaysScroll = false;
this.TasView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TasView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TasView.CellHeightPadding = 0;
this.TasView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.TasView.FullRowSelect = true;
@ -1267,10 +1267,10 @@ namespace BizHawk.Client.EmuHawk
//
this.TasStatusStrip.ClickThrough = true;
this.TasStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.MessageStatusLabel,
this.SavingProgressBar,
this.toolStripStatusLabel2,
this.SplicerStatusLabel});
this.MessageStatusLabel,
this.SavingProgressBar,
this.toolStripStatusLabel2,
this.SplicerStatusLabel});
this.TasStatusStrip.Location = new System.Drawing.Point(0, 554);
this.TasStatusStrip.Name = "TasStatusStrip";
this.TasStatusStrip.Size = new System.Drawing.Size(509, 22);
@ -1291,19 +1291,19 @@ namespace BizHawk.Client.EmuHawk
// toolStripStatusLabel2
//
this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
this.toolStripStatusLabel2.Size = new System.Drawing.Size(134, 17);
this.toolStripStatusLabel2.Size = new System.Drawing.Size(277, 17);
this.toolStripStatusLabel2.Spring = true;
//
// SplicerStatusLabel
//
this.SplicerStatusLabel.Name = "SplicerStatusLabel";
this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0);
this.SplicerStatusLabel.Size = new System.Drawing.Size(163, 17);
this.SplicerStatusLabel.Size = new System.Drawing.Size(20, 17);
//
// TasPlaybackBox
//
this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TasPlaybackBox.Location = new System.Drawing.Point(3, 4);
this.TasPlaybackBox.Name = "TasPlaybackBox";
this.TasPlaybackBox.Size = new System.Drawing.Size(204, 111);
@ -1312,9 +1312,9 @@ namespace BizHawk.Client.EmuHawk
//
// MarkerControl
//
this.MarkerControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.MarkerControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.MarkerControl.Location = new System.Drawing.Point(2, 16);
this.MarkerControl.Name = "MarkerControl";
this.MarkerControl.Size = new System.Drawing.Size(194, 193);
@ -1324,32 +1324,32 @@ namespace BizHawk.Client.EmuHawk
// RightClickMenu
//
this.RightClickMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.SetMarkersContextMenuItem,
this.SetMarkerWithTextContextMenuItem,
this.RemoveMarkersContextMenuItem,
this.toolStripSeparator15,
this.DeselectContextMenuItem,
this.SelectBetweenMarkersContextMenuItem,
this.toolStripSeparator16,
this.UngreenzoneContextMenuItem,
this.CancelSeekContextMenuItem,
this.toolStripSeparator17,
this.copyToolStripMenuItem,
this.pasteToolStripMenuItem,
this.pasteInsertToolStripMenuItem,
this.cutToolStripMenuItem,
this.separateToolStripMenuItem,
this.ClearContextMenuItem,
this.InsertFrameContextMenuItem,
this.DeleteFramesContextMenuItem,
this.CloneContextMenuItem,
this.InsertNumFramesContextMenuItem,
this.toolStripSeparator18,
this.TruncateContextMenuItem,
this.BranchContextMenuItem,
this.StartFromNowSeparator,
this.StartNewProjectFromNowMenuItem,
this.StartANewProjectFromSaveRamMenuItem});
this.SetMarkersContextMenuItem,
this.SetMarkerWithTextContextMenuItem,
this.RemoveMarkersContextMenuItem,
this.toolStripSeparator15,
this.DeselectContextMenuItem,
this.SelectBetweenMarkersContextMenuItem,
this.toolStripSeparator16,
this.UngreenzoneContextMenuItem,
this.CancelSeekContextMenuItem,
this.toolStripSeparator17,
this.copyToolStripMenuItem,
this.pasteToolStripMenuItem,
this.pasteInsertToolStripMenuItem,
this.cutToolStripMenuItem,
this.separateToolStripMenuItem,
this.ClearContextMenuItem,
this.InsertFrameContextMenuItem,
this.DeleteFramesContextMenuItem,
this.CloneContextMenuItem,
this.InsertNumFramesContextMenuItem,
this.toolStripSeparator18,
this.TruncateContextMenuItem,
this.BranchContextMenuItem,
this.StartFromNowSeparator,
this.StartNewProjectFromNowMenuItem,
this.StartANewProjectFromSaveRamMenuItem});
this.RightClickMenu.Name = "RightClickMenu";
this.RightClickMenu.Size = new System.Drawing.Size(249, 480);
this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened);
@ -1491,8 +1491,8 @@ namespace BizHawk.Client.EmuHawk
// InsertNumFramesContextMenuItem
//
this.InsertNumFramesContextMenuItem.Name = "InsertNumFramesContextMenuItem";
this.InsertNumFramesContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.Insert)));
this.InsertNumFramesContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.Insert)));
this.InsertNumFramesContextMenuItem.Size = new System.Drawing.Size(248, 22);
this.InsertNumFramesContextMenuItem.Text = "Insert # of Frames";
this.InsertNumFramesContextMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click);
@ -1537,9 +1537,9 @@ namespace BizHawk.Client.EmuHawk
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox1.Controls.Add(this.MarkerControl);
this.groupBox1.Location = new System.Drawing.Point(-2, 3);
this.groupBox1.Name = "groupBox1";
@ -1550,9 +1550,9 @@ namespace BizHawk.Client.EmuHawk
//
// BookMarkControl
//
this.BookMarkControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.BookMarkControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.BookMarkControl.HoverInterval = 1;
this.BookMarkControl.Location = new System.Drawing.Point(-2, 5);
this.BookMarkControl.Name = "BookMarkControl";
@ -1562,9 +1562,9 @@ namespace BizHawk.Client.EmuHawk
//
// BranchesMarkersSplit
//
this.BranchesMarkersSplit.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.BranchesMarkersSplit.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.BranchesMarkersSplit.Location = new System.Drawing.Point(3, 121);
this.BranchesMarkersSplit.Name = "BranchesMarkersSplit";
this.BranchesMarkersSplit.Orientation = System.Windows.Forms.Orientation.Horizontal;
@ -1583,9 +1583,9 @@ namespace BizHawk.Client.EmuHawk
//
// MainVertialSplit
//
this.MainVertialSplit.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.MainVertialSplit.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.MainVertialSplit.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.MainVertialSplit.Location = new System.Drawing.Point(2, 23);
this.MainVertialSplit.Name = "MainVertialSplit";

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

@ -33,9 +33,7 @@ namespace BizHawk.Client.EmuHawk
_floatEditRow = value;
TasView.suspendHotkeys = FloatEditingMode;
} }
public bool FloatEditingMode { get {
return _floatEditRow != -1;
} }
public bool FloatEditingMode { get { return _floatEditRow != -1; } }
private List<int> _extraFloatRows = new List<int>();
// Right-click dragging
@ -45,16 +43,13 @@ namespace BizHawk.Client.EmuHawk
private int _rightClickLastFrame = -1;
private bool _rightClickShift, _rightClickControl, _rightClickAlt;
private bool _leftButtonHeld = false;
private bool mouseButtonHeld { get {
return _rightClickFrame != -1 || _leftButtonHeld;
} }
private bool mouseButtonHeld { get { return _rightClickFrame != -1 || _leftButtonHeld; } }
private bool _triggerAutoRestore; // If true, autorestore will be called on mouse up
private bool? _autoRestorePaused = null;
private int? _seekStartFrame = null;
private bool _shouldUnpauseFromRewind = false;
private Emulation.Common.ControllerDefinition controllerType { get {
return Global.MovieSession.MovieControllerAdapter.Definition;
} }
return Global.MovieSession.MovieControllerAdapter.Definition; } }
public bool WasRecording = false;
public AutoPatternBool[] BoolPatterns;
public AutoPatternFloat[] FloatPatterns;

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

@ -26,10 +26,6 @@ namespace BizHawk.Client.EmuHawk
!string.IsNullOrWhiteSpace(CurrentTasMovie.Filename) &&
(CurrentTasMovie.Filename != DefaultTasProjName());
SaveTASMenuItem.Enabled =
SaveAsTASMenuItem.Enabled =
!_saveBackgroundWorker.IsBusy;
}
private void RecentSubMenu_DropDownOpened(object sender, EventArgs e)

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

@ -20,37 +20,18 @@ namespace BizHawk.Client.EmuHawk
public partial class TAStudio : ToolFormBase, IToolFormAutoConfig, IControlMainform
{
// TODO: UI flow that conveniently allows to start from savestate
public TasMovie CurrentTasMovie { get { return Global.MovieSession.Movie as TasMovie; } }
public MainForm Mainform { get { return GlobalWin.MainForm; } }
public bool IsInMenuLoop { get; private set; }
public string statesPath { get {
return PathManager.MakeAbsolutePath(Global.Config.PathEntries["Global", "TAStudio states"].Path, null); } }
private readonly List<TasClipboardEntry> _tasClipboard = new List<TasClipboardEntry>();
private const string CursorColumnName = "CursorColumn";
private const string FrameColumnName = "FrameColumn";
private BackgroundWorker _saveBackgroundWorker;
private BackgroundWorker _seekBackgroundWorker;
private MovieEndAction _originalEndAction; // The movie end behavior selected by the user (that is overridden by TAStudio)
private UndoHistoryForm _undoForm;
private Timer _autosaveTimer = new Timer();
private readonly List<TasClipboardEntry> _tasClipboard = new List<TasClipboardEntry>();
private Dictionary<string, string> GenerateColumnNames()
{
var lg = Global.MovieSession.LogGeneratorInstance();
lg.SetSource(Global.MovieSession.MovieControllerAdapter);
return (lg as Bk2LogEntryGenerator).Map();
}
public bool IsInMenuLoop { get; private set; }
public string statesPath
{
get { return PathManager.MakeAbsolutePath(Global.Config.PathEntries["Global", "TAStudio states"].Path, null); }
}
public TasMovie CurrentTasMovie
{
get { return Global.MovieSession.Movie as TasMovie; }
}
public MainForm Mainform
{
get { return GlobalWin.MainForm; }
}
private Timer _autosaveTimer;
/// <summary>
/// Separates "restore last position" logic from seeking caused by navigation.
@ -58,6 +39,13 @@ namespace BizHawk.Client.EmuHawk
/// </summary>
public int LastPositionFrame { get; set; }
private Dictionary<string, string> GenerateColumnNames()
{
var lg = Global.MovieSession.LogGeneratorInstance();
lg.SetSource(Global.MovieSession.MovieControllerAdapter);
return (lg as Bk2LogEntryGenerator).Map();
}
[ConfigPersist]
public TAStudioSettings Settings { get; set; }
@ -118,13 +106,11 @@ namespace BizHawk.Client.EmuHawk
{
Settings = new TAStudioSettings();
InitializeComponent();
InitializeSeekWorker();
// TODO: show this at all times or hide it when saving is done?
this.SavingProgressBar.Visible = false;
InitializeSaveWorker();
InitializeSeekWorker();
WantsToControlStopMovie = true;
WantsToControlRestartMovie = true;
TasPlaybackBox.Tastudio = this;
@ -165,40 +151,6 @@ namespace BizHawk.Client.EmuHawk
}
}
private void InitializeSaveWorker()
{
if (_saveBackgroundWorker != null)
{
_saveBackgroundWorker.Dispose();
_saveBackgroundWorker = null; // Idk if this line is even useful.
}
_saveBackgroundWorker = new BackgroundWorker();
_saveBackgroundWorker.WorkerReportsProgress = true;
_saveBackgroundWorker.DoWork += (s, e) =>
{
this.Invoke(() => this.MessageStatusLabel.Text = "Saving " + Path.GetFileName(CurrentTasMovie.Filename) + "...");
this.Invoke(() => this.SavingProgressBar.Visible = true);
CurrentTasMovie.Save();
};
_saveBackgroundWorker.ProgressChanged += (s, e) =>
{
SavingProgressBar.Value = e.ProgressPercentage;
};
_saveBackgroundWorker.RunWorkerCompleted += (s, e) =>
{
this.Invoke(() => this.MessageStatusLabel.Text = Path.GetFileName(CurrentTasMovie.Filename) + " saved.");
this.Invoke(() => this.SavingProgressBar.Visible = false);
InitializeSaveWorker(); // Required, or it will error when trying to report progress again.
};
if (CurrentTasMovie != null) // Again required. TasMovie has a separate reference.
CurrentTasMovie.NewBGWorker(_saveBackgroundWorker);
}
private void InitializeSeekWorker()
{
if (_seekBackgroundWorker != null)
@ -282,6 +234,7 @@ namespace BizHawk.Client.EmuHawk
TasView.SeekingCutoffInterval = Settings.SeekingCutoffInterval;
BookMarkControl.HoverInterval = Settings.BranchCellHoverInterval;
_autosaveTimer = new Timer(components);
_autosaveTimer.Tick += AutosaveTimerEventProcessor;
if (Settings.AutosaveInterval > 0)
{
@ -316,8 +269,6 @@ namespace BizHawk.Client.EmuHawk
BranchesMarkersSplit.SplitterDistance = Settings.BranchMarkerSplitDistance;
}
////////////////
RefreshDialog();
_initialized = true;
}
@ -555,7 +506,7 @@ namespace BizHawk.Client.EmuHawk
return false;
}
TasMovie newMovie = new TasMovie(startsFromSavestate, _saveBackgroundWorker);
TasMovie newMovie = new TasMovie(startsFromSavestate, _seekBackgroundWorker);
newMovie.TasStateManager.InvalidateCallback = GreenzoneInvalidated;
newMovie.Filename = file.FullName;
@ -593,7 +544,7 @@ namespace BizHawk.Client.EmuHawk
{
if (AskSaveChanges())
{
Global.MovieSession.Movie = new TasMovie(false, _saveBackgroundWorker);
Global.MovieSession.Movie = new TasMovie(false, _seekBackgroundWorker);
var stateManager = (Global.MovieSession.Movie as TasMovie).TasStateManager;
stateManager.MountWriteAccess();
stateManager.InvalidateCallback = GreenzoneInvalidated;