From 346c4e56b3c52a3da63700a7ca807e01a9e8b576 Mon Sep 17 00:00:00 2001 From: feos Date: Sun, 12 Jun 2016 16:41:27 +0300 Subject: [PATCH] tastudio autosave: - switch to appropriate method for backups - option to save backup per file save - menu command to save backup --- .../movie/bk2/Bk2Movie.IO.cs | 7 +- .../conversions/MovieConversionExtensions.cs | 6 +- .../movie/tasproj/TasMovie.IO.cs | 5 +- .../tools/TAStudio/TAStudio.Designer.cs | 383 ++++++++++-------- .../tools/TAStudio/TAStudio.IToolForm.cs | 2 +- .../tools/TAStudio/TAStudio.MenuItems.cs | 203 ++++++---- .../tools/TAStudio/TAStudio.cs | 24 +- 7 files changed, 352 insertions(+), 278 deletions(-) diff --git a/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs b/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs index e9e0b1bc83..e2f0b36048 100644 --- a/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs +++ b/BizHawk.Client.Common/movie/bk2/Bk2Movie.IO.cs @@ -29,7 +29,7 @@ namespace BizHawk.Client.Common Directory.CreateDirectory(directory_info.FullName); } - Write(backupName); + Write(backupName, backup: true); } public virtual bool Load(bool preload) @@ -168,7 +168,7 @@ namespace BizHawk.Client.Common return Load(true); } - protected virtual void Write(string fn) + protected virtual void Write(string fn, bool backup = false) { var file = new FileInfo(fn); if (!file.Directory.Exists) @@ -207,7 +207,8 @@ namespace BizHawk.Client.Common } } - Changes = false; + if (!backup) + Changes = false; } protected void ClearBeforeLoad() diff --git a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs index e663b24c85..b10a6ab1e7 100644 --- a/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs +++ b/BizHawk.Client.Common/movie/conversions/MovieConversionExtensions.cs @@ -75,7 +75,7 @@ namespace BizHawk.Client.Common.MovieConversionExtensions return tas; } - public static Bk2Movie ToBk2(this IMovie old, bool copy = false) + public static Bk2Movie ToBk2(this IMovie old, bool copy = false, bool backup = false) { var bk2 = new Bk2Movie(old.Filename.Replace(old.PreferredExtension, Bk2Movie.Extension)); @@ -114,7 +114,9 @@ namespace BizHawk.Client.Common.MovieConversionExtensions bk2.BinarySavestate = old.BinarySavestate; bk2.SaveRam = old.SaveRam; - bk2.Save(); + if (!backup) + bk2.Save(); + return bk2; } diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs index 8338415819..41baa15c1a 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.IO.cs @@ -17,7 +17,7 @@ namespace BizHawk.Client.Common public Func ClientSettingsForSave { get; set; } public Action GetClientSettingsOnLoad { get; set; } - protected override void Write(string fn) + protected override void Write(string fn, bool backup = false) { var file = new FileInfo(fn); if (!file.Directory.Exists) @@ -83,7 +83,8 @@ namespace BizHawk.Client.Common bs.PutLump(BinaryStateLump.Session, tw => tw.WriteLine(Session.ToString())); } - Changes = false; + if (!backup) + Changes = false; } public override bool Load(bool preload) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 7cd303381b..3b11d2695a 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -41,6 +41,8 @@ namespace BizHawk.Client.EmuHawk this.OpenTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveAsTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveBackupMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveBk2BackupMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.RecentSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); @@ -84,12 +86,13 @@ namespace BizHawk.Client.EmuHawk this.SetBranchCellHoverIntervalMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SetSeekingCutoffIntervalMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator26 = new System.Windows.Forms.ToolStripSeparator(); - this.setAutosaveIntervalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.autosaveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SetAutosaveIntervalMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.AutosaveAsBk2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AppendBackupToFilenameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AutosaveAsBackupFileMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.BackupPerFileSaveMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.applyPatternToPaintedInputToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.onlyOnAutoFireColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -146,9 +149,10 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator(); this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.TASEditorManualOnlineMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EnableTooltipsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); + this.ForumThreadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); + this.EnableTooltipsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TasView = new BizHawk.Client.EmuHawk.InputRoll(); this.TasStatusStrip = new StatusStripEx(); this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -188,7 +192,6 @@ namespace BizHawk.Client.EmuHawk this.BookMarkControl = new BizHawk.Client.EmuHawk.BookmarksBranchesBox(); this.BranchesMarkersSplit = new System.Windows.Forms.SplitContainer(); this.MainVertialSplit = new System.Windows.Forms.SplitContainer(); - this.ForumThreadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TASMenu.SuspendLayout(); this.TasStatusStrip.SuspendLayout(); this.RightClickMenu.SuspendLayout(); @@ -230,6 +233,8 @@ namespace BizHawk.Client.EmuHawk this.OpenTASMenuItem, this.SaveTASMenuItem, this.SaveAsTASMenuItem, + this.SaveBackupMenuItem, + this.SaveBk2BackupMenuItem, this.RecentSubMenu, this.toolStripSeparator1, this.saveSelectionToMacroToolStripMenuItem, @@ -248,7 +253,7 @@ namespace BizHawk.Client.EmuHawk // this.NewTASMenuItem.Name = "NewTASMenuItem"; this.NewTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.NewTASMenuItem.Size = new System.Drawing.Size(196, 22); + this.NewTASMenuItem.Size = new System.Drawing.Size(201, 22); this.NewTASMenuItem.Text = "&New"; this.NewTASMenuItem.Click += new System.EventHandler(this.NewTasMenuItem_Click); // @@ -258,21 +263,21 @@ namespace BizHawk.Client.EmuHawk this.NewFromNowMenuItem, this.NewFromCurrentSaveRamMenuItem}); this.NewFromSubMenu.Name = "NewFromSubMenu"; - this.NewFromSubMenu.Size = new System.Drawing.Size(196, 22); + this.NewFromSubMenu.Size = new System.Drawing.Size(201, 22); this.NewFromSubMenu.Text = "New From"; this.NewFromSubMenu.DropDownOpened += new System.EventHandler(this.NewFromSubMenu_DropDownOpened); // // NewFromNowMenuItem // this.NewFromNowMenuItem.Name = "NewFromNowMenuItem"; - this.NewFromNowMenuItem.Size = new System.Drawing.Size(165, 22); + this.NewFromNowMenuItem.Size = new System.Drawing.Size(170, 22); this.NewFromNowMenuItem.Text = "&Now"; this.NewFromNowMenuItem.Click += new System.EventHandler(this.StartNewProjectFromNowMenuItem_Click); // // NewFromCurrentSaveRamMenuItem // this.NewFromCurrentSaveRamMenuItem.Name = "NewFromCurrentSaveRamMenuItem"; - this.NewFromCurrentSaveRamMenuItem.Size = new System.Drawing.Size(165, 22); + this.NewFromCurrentSaveRamMenuItem.Size = new System.Drawing.Size(170, 22); this.NewFromCurrentSaveRamMenuItem.Text = "&Current SaveRam"; this.NewFromCurrentSaveRamMenuItem.Click += new System.EventHandler(this.StartANewProjectFromSaveRamMenuItem_Click); // @@ -280,7 +285,7 @@ namespace BizHawk.Client.EmuHawk // this.OpenTASMenuItem.Name = "OpenTASMenuItem"; this.OpenTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.OpenTASMenuItem.Size = new System.Drawing.Size(196, 22); + this.OpenTASMenuItem.Size = new System.Drawing.Size(201, 22); this.OpenTASMenuItem.Text = "&Open"; this.OpenTASMenuItem.Click += new System.EventHandler(this.OpenTasMenuItem_Click); // @@ -288,7 +293,7 @@ namespace BizHawk.Client.EmuHawk // this.SaveTASMenuItem.Name = "SaveTASMenuItem"; this.SaveTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.SaveTASMenuItem.Size = new System.Drawing.Size(196, 22); + this.SaveTASMenuItem.Size = new System.Drawing.Size(201, 22); this.SaveTASMenuItem.Text = "&Save"; this.SaveTASMenuItem.Click += new System.EventHandler(this.SaveTasMenuItem_Click); // @@ -297,17 +302,32 @@ namespace BizHawk.Client.EmuHawk 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.Size = new System.Drawing.Size(196, 22); + this.SaveAsTASMenuItem.Size = new System.Drawing.Size(201, 22); this.SaveAsTASMenuItem.Text = "Save As"; this.SaveAsTASMenuItem.Click += new System.EventHandler(this.SaveAsTasMenuItem_Click); // + // SaveBackupMenuItem + // + this.SaveBackupMenuItem.Name = "SaveBackupMenuItem"; + this.SaveBackupMenuItem.Size = new System.Drawing.Size(201, 22); + this.SaveBackupMenuItem.Text = "Save Backup"; + this.SaveBackupMenuItem.Click += new System.EventHandler(this.SaveBackupMenuItem_Click); + // + // SaveBk2BackupMenuItem + // + this.SaveBk2BackupMenuItem.Name = "SaveBk2BackupMenuItem"; + this.SaveBk2BackupMenuItem.Size = new System.Drawing.Size(201, 22); + this.SaveBk2BackupMenuItem.Text = "Save Bk2 Backup"; + this.SaveBk2BackupMenuItem.Visible = false; + this.SaveBk2BackupMenuItem.Click += new System.EventHandler(this.SaveBk2BackupMenuItem_Click); + // // RecentSubMenu // this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripSeparator3}); this.RecentSubMenu.Image = ((System.Drawing.Image)(resources.GetObject("RecentSubMenu.Image"))); this.RecentSubMenu.Name = "RecentSubMenu"; - this.RecentSubMenu.Size = new System.Drawing.Size(196, 22); + this.RecentSubMenu.Size = new System.Drawing.Size(201, 22); this.RecentSubMenu.Text = "Recent"; this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); // @@ -319,19 +339,19 @@ namespace BizHawk.Client.EmuHawk // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(193, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(198, 6); // // saveSelectionToMacroToolStripMenuItem // this.saveSelectionToMacroToolStripMenuItem.Name = "saveSelectionToMacroToolStripMenuItem"; - this.saveSelectionToMacroToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.saveSelectionToMacroToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.saveSelectionToMacroToolStripMenuItem.Text = "Save Selection to Macro"; this.saveSelectionToMacroToolStripMenuItem.Click += new System.EventHandler(this.saveSelectionToMacroToolStripMenuItem_Click); // // placeMacroAtSelectionToolStripMenuItem // this.placeMacroAtSelectionToolStripMenuItem.Name = "placeMacroAtSelectionToolStripMenuItem"; - this.placeMacroAtSelectionToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.placeMacroAtSelectionToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.placeMacroAtSelectionToolStripMenuItem.Text = "Place Macro at Selection"; this.placeMacroAtSelectionToolStripMenuItem.Click += new System.EventHandler(this.placeMacroAtSelectionToolStripMenuItem_Click); // @@ -341,7 +361,7 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator22}); this.recentMacrosToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent; this.recentMacrosToolStripMenuItem.Name = "recentMacrosToolStripMenuItem"; - this.recentMacrosToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.recentMacrosToolStripMenuItem.Size = new System.Drawing.Size(201, 22); this.recentMacrosToolStripMenuItem.Text = "Recent Macros"; this.recentMacrosToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentMacrosToolStripMenuItem_DropDownOpened); // @@ -353,25 +373,25 @@ namespace BizHawk.Client.EmuHawk // toolStripSeparator20 // this.toolStripSeparator20.Name = "toolStripSeparator20"; - this.toolStripSeparator20.Size = new System.Drawing.Size(193, 6); + this.toolStripSeparator20.Size = new System.Drawing.Size(198, 6); // // ToBk2MenuItem // this.ToBk2MenuItem.Name = "ToBk2MenuItem"; - this.ToBk2MenuItem.Size = new System.Drawing.Size(196, 22); + this.ToBk2MenuItem.Size = new System.Drawing.Size(201, 22); this.ToBk2MenuItem.Text = "&Export to Bk2"; this.ToBk2MenuItem.Click += new System.EventHandler(this.ToBk2MenuItem_Click); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(193, 6); + this.toolStripSeparator2.Size = new System.Drawing.Size(198, 6); // // ExitMenuItem // this.ExitMenuItem.Name = "ExitMenuItem"; this.ExitMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.ExitMenuItem.Size = new System.Drawing.Size(196, 22); + this.ExitMenuItem.Size = new System.Drawing.Size(201, 22); this.ExitMenuItem.Text = "E&xit"; this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); // @@ -413,7 +433,7 @@ namespace BizHawk.Client.EmuHawk // this.UndoMenuItem.Name = "UndoMenuItem"; this.UndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z))); - this.UndoMenuItem.Size = new System.Drawing.Size(286, 22); + this.UndoMenuItem.Size = new System.Drawing.Size(291, 22); this.UndoMenuItem.Text = "&Undo"; this.UndoMenuItem.Click += new System.EventHandler(this.UndoMenuItem_Click); // @@ -422,14 +442,14 @@ namespace BizHawk.Client.EmuHawk this.RedoMenuItem.Enabled = false; this.RedoMenuItem.Name = "RedoMenuItem"; this.RedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.RedoMenuItem.Size = new System.Drawing.Size(286, 22); + this.RedoMenuItem.Size = new System.Drawing.Size(291, 22); this.RedoMenuItem.Text = "&Redo"; this.RedoMenuItem.Click += new System.EventHandler(this.RedoMenuItem_Click); // // showUndoHistoryToolStripMenuItem // this.showUndoHistoryToolStripMenuItem.Name = "showUndoHistoryToolStripMenuItem"; - this.showUndoHistoryToolStripMenuItem.Size = new System.Drawing.Size(286, 22); + this.showUndoHistoryToolStripMenuItem.Size = new System.Drawing.Size(291, 22); this.showUndoHistoryToolStripMenuItem.Text = "Show Undo History"; this.showUndoHistoryToolStripMenuItem.Click += new System.EventHandler(this.showUndoHistoryToolStripMenuItem_Click); // @@ -438,7 +458,7 @@ namespace BizHawk.Client.EmuHawk this.SelectionUndoMenuItem.Enabled = false; this.SelectionUndoMenuItem.Name = "SelectionUndoMenuItem"; this.SelectionUndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Q))); - this.SelectionUndoMenuItem.Size = new System.Drawing.Size(286, 22); + this.SelectionUndoMenuItem.Size = new System.Drawing.Size(291, 22); this.SelectionUndoMenuItem.Text = "Selection Undo"; // // SelectionRedoMenuItem @@ -446,18 +466,18 @@ namespace BizHawk.Client.EmuHawk this.SelectionRedoMenuItem.Enabled = false; this.SelectionRedoMenuItem.Name = "SelectionRedoMenuItem"; this.SelectionRedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); - this.SelectionRedoMenuItem.Size = new System.Drawing.Size(286, 22); + this.SelectionRedoMenuItem.Size = new System.Drawing.Size(291, 22); this.SelectionRedoMenuItem.Text = "Selection Redo"; // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(283, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(288, 6); // // DeselectMenuItem // this.DeselectMenuItem.Name = "DeselectMenuItem"; - this.DeselectMenuItem.Size = new System.Drawing.Size(286, 22); + this.DeselectMenuItem.Size = new System.Drawing.Size(291, 22); this.DeselectMenuItem.Text = "Deselect"; this.DeselectMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click); // @@ -465,7 +485,7 @@ namespace BizHawk.Client.EmuHawk // this.SelectBetweenMarkersMenuItem.Name = "SelectBetweenMarkersMenuItem"; this.SelectBetweenMarkersMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.SelectBetweenMarkersMenuItem.Size = new System.Drawing.Size(286, 22); + this.SelectBetweenMarkersMenuItem.Size = new System.Drawing.Size(291, 22); this.SelectBetweenMarkersMenuItem.Text = "Select between Markers"; this.SelectBetweenMarkersMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click); // @@ -475,7 +495,7 @@ namespace BizHawk.Client.EmuHawk 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.Size = new System.Drawing.Size(286, 22); + this.SelectAllMenuItem.Size = new System.Drawing.Size(291, 22); this.SelectAllMenuItem.Text = "Select &All"; this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); // @@ -483,20 +503,20 @@ namespace BizHawk.Client.EmuHawk // this.ReselectClipboardMenuItem.Name = "ReselectClipboardMenuItem"; this.ReselectClipboardMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B))); - this.ReselectClipboardMenuItem.Size = new System.Drawing.Size(286, 22); + this.ReselectClipboardMenuItem.Size = new System.Drawing.Size(291, 22); this.ReselectClipboardMenuItem.Text = "Reselect Clipboard"; this.ReselectClipboardMenuItem.Click += new System.EventHandler(this.ReselectClipboardMenuItem_Click); // // toolStripSeparator7 // this.toolStripSeparator7.Name = "toolStripSeparator7"; - this.toolStripSeparator7.Size = new System.Drawing.Size(283, 6); + this.toolStripSeparator7.Size = new System.Drawing.Size(288, 6); // // CopyMenuItem // this.CopyMenuItem.Name = "CopyMenuItem"; this.CopyMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.CopyMenuItem.Size = new System.Drawing.Size(286, 22); + this.CopyMenuItem.Size = new System.Drawing.Size(291, 22); this.CopyMenuItem.Text = "Copy"; this.CopyMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click); // @@ -504,7 +524,7 @@ namespace BizHawk.Client.EmuHawk // this.PasteMenuItem.Name = "PasteMenuItem"; this.PasteMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.PasteMenuItem.Size = new System.Drawing.Size(286, 22); + this.PasteMenuItem.Size = new System.Drawing.Size(291, 22); this.PasteMenuItem.Text = "&Paste"; this.PasteMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click); // @@ -513,7 +533,7 @@ namespace BizHawk.Client.EmuHawk 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.Size = new System.Drawing.Size(286, 22); + this.PasteInsertMenuItem.Size = new System.Drawing.Size(291, 22); this.PasteInsertMenuItem.Text = "&Paste Insert"; this.PasteInsertMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click); // @@ -521,21 +541,21 @@ namespace BizHawk.Client.EmuHawk // this.CutMenuItem.Name = "CutMenuItem"; this.CutMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); - this.CutMenuItem.Size = new System.Drawing.Size(286, 22); + this.CutMenuItem.Size = new System.Drawing.Size(291, 22); this.CutMenuItem.Text = "&Cut"; this.CutMenuItem.Click += new System.EventHandler(this.CutMenuItem_Click); // // toolStripSeparator8 // this.toolStripSeparator8.Name = "toolStripSeparator8"; - this.toolStripSeparator8.Size = new System.Drawing.Size(283, 6); + this.toolStripSeparator8.Size = new System.Drawing.Size(288, 6); // // ClearMenuItem // this.ClearMenuItem.Name = "ClearMenuItem"; this.ClearMenuItem.ShortcutKeyDisplayString = ""; this.ClearMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.ClearMenuItem.Size = new System.Drawing.Size(286, 22); + this.ClearMenuItem.Size = new System.Drawing.Size(291, 22); this.ClearMenuItem.Text = "Clear"; this.ClearMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click); // @@ -543,7 +563,7 @@ namespace BizHawk.Client.EmuHawk // this.InsertFrameMenuItem.Name = "InsertFrameMenuItem"; this.InsertFrameMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert; - this.InsertFrameMenuItem.Size = new System.Drawing.Size(286, 22); + this.InsertFrameMenuItem.Size = new System.Drawing.Size(291, 22); this.InsertFrameMenuItem.Text = "&Insert"; this.InsertFrameMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); // @@ -551,7 +571,7 @@ namespace BizHawk.Client.EmuHawk // this.DeleteFramesMenuItem.Name = "DeleteFramesMenuItem"; this.DeleteFramesMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); - this.DeleteFramesMenuItem.Size = new System.Drawing.Size(286, 22); + this.DeleteFramesMenuItem.Size = new System.Drawing.Size(291, 22); this.DeleteFramesMenuItem.Text = "&Delete"; this.DeleteFramesMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); // @@ -559,7 +579,7 @@ namespace BizHawk.Client.EmuHawk // this.CloneMenuItem.Name = "CloneMenuItem"; this.CloneMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert))); - this.CloneMenuItem.Size = new System.Drawing.Size(286, 22); + this.CloneMenuItem.Size = new System.Drawing.Size(291, 22); this.CloneMenuItem.Text = "&Clone"; this.CloneMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click); // @@ -569,40 +589,40 @@ namespace BizHawk.Client.EmuHawk 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.Size = new System.Drawing.Size(286, 22); + this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(291, 22); this.InsertNumFramesMenuItem.Text = "Insert # of Frames"; this.InsertNumFramesMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(283, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(288, 6); // // TruncateMenuItem // this.TruncateMenuItem.Name = "TruncateMenuItem"; - this.TruncateMenuItem.Size = new System.Drawing.Size(286, 22); + this.TruncateMenuItem.Size = new System.Drawing.Size(291, 22); this.TruncateMenuItem.Text = "&Truncate Movie"; this.TruncateMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); // // ClearGreenzoneMenuItem // this.ClearGreenzoneMenuItem.Name = "ClearGreenzoneMenuItem"; - this.ClearGreenzoneMenuItem.Size = new System.Drawing.Size(286, 22); + this.ClearGreenzoneMenuItem.Size = new System.Drawing.Size(291, 22); this.ClearGreenzoneMenuItem.Text = "&Clear Savestate History"; this.ClearGreenzoneMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click); // // GreenzoneICheckSeparator // this.GreenzoneICheckSeparator.Name = "GreenzoneICheckSeparator"; - this.GreenzoneICheckSeparator.Size = new System.Drawing.Size(283, 6); + this.GreenzoneICheckSeparator.Size = new System.Drawing.Size(288, 6); // // 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.Size = new System.Drawing.Size(286, 22); + 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); // @@ -613,12 +633,10 @@ namespace BizHawk.Client.EmuHawk this.SetBranchCellHoverIntervalMenuItem, this.SetSeekingCutoffIntervalMenuItem, this.toolStripSeparator26, - this.setAutosaveIntervalToolStripMenuItem, - this.AutosaveAsBk2MenuItem, - this.AppendBackupToFilenameMenuItem, + this.autosaveToolStripMenuItem, + this.BackupPerFileSaveMenuItem, this.toolStripSeparator9, this.AutoadjustInputMenuItem, - this.toolStripSeparator11, this.DrawInputByDraggingMenuItem, this.applyPatternToPaintedInputToolStripMenuItem, this.onlyOnAutoFireColumnsToolStripMenuItem, @@ -641,21 +659,21 @@ namespace BizHawk.Client.EmuHawk // SetMaxUndoLevelsMenuItem // this.SetMaxUndoLevelsMenuItem.Name = "SetMaxUndoLevelsMenuItem"; - this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(253, 22); this.SetMaxUndoLevelsMenuItem.Text = "Set max Undo Levels"; this.SetMaxUndoLevelsMenuItem.Click += new System.EventHandler(this.SetMaxUndoLevelsMenuItem_Click); // // SetBranchCellHoverIntervalMenuItem // this.SetBranchCellHoverIntervalMenuItem.Name = "SetBranchCellHoverIntervalMenuItem"; - this.SetBranchCellHoverIntervalMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetBranchCellHoverIntervalMenuItem.Size = new System.Drawing.Size(253, 22); this.SetBranchCellHoverIntervalMenuItem.Text = "Set Branch Cell Hover Interval"; this.SetBranchCellHoverIntervalMenuItem.Click += new System.EventHandler(this.SetBranchCellHoverIntervalMenuItem_Click); // // SetSeekingCutoffIntervalMenuItem // this.SetSeekingCutoffIntervalMenuItem.Name = "SetSeekingCutoffIntervalMenuItem"; - this.SetSeekingCutoffIntervalMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetSeekingCutoffIntervalMenuItem.Size = new System.Drawing.Size(253, 22); this.SetSeekingCutoffIntervalMenuItem.Text = "Set Seeking Cutoff Interval"; this.SetSeekingCutoffIntervalMenuItem.Visible = false; this.SetSeekingCutoffIntervalMenuItem.Click += new System.EventHandler(this.SetSeekingCutoffIntervalMenuItem_Click); @@ -663,50 +681,62 @@ namespace BizHawk.Client.EmuHawk // toolStripSeparator26 // this.toolStripSeparator26.Name = "toolStripSeparator26"; - this.toolStripSeparator26.Size = new System.Drawing.Size(245, 6); + this.toolStripSeparator26.Size = new System.Drawing.Size(250, 6); // - // setAutosaveIntervalToolStripMenuItem + // autosaveToolStripMenuItem // - this.setAutosaveIntervalToolStripMenuItem.Name = "setAutosaveIntervalToolStripMenuItem"; - this.setAutosaveIntervalToolStripMenuItem.Size = new System.Drawing.Size(248, 22); - this.setAutosaveIntervalToolStripMenuItem.Text = "Set Autosave Interval"; - this.setAutosaveIntervalToolStripMenuItem.Click += new System.EventHandler(this.SetAutosaveIntervalMenuItem_Click); + this.autosaveToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SetAutosaveIntervalMenuItem, + this.AutosaveAsBk2MenuItem, + this.AutosaveAsBackupFileMenuItem}); + this.autosaveToolStripMenuItem.Name = "autosaveToolStripMenuItem"; + this.autosaveToolStripMenuItem.Size = new System.Drawing.Size(253, 22); + this.autosaveToolStripMenuItem.Text = "Autosave"; + // + // SetAutosaveIntervalMenuItem + // + this.SetAutosaveIntervalMenuItem.Name = "SetAutosaveIntervalMenuItem"; + this.SetAutosaveIntervalMenuItem.Size = new System.Drawing.Size(202, 22); + this.SetAutosaveIntervalMenuItem.Text = "Set Autosave Interval"; + this.SetAutosaveIntervalMenuItem.Click += new System.EventHandler(this.SetAutosaveIntervalMenuItem_Click); // // AutosaveAsBk2MenuItem // this.AutosaveAsBk2MenuItem.Name = "AutosaveAsBk2MenuItem"; - this.AutosaveAsBk2MenuItem.Size = new System.Drawing.Size(248, 22); + this.AutosaveAsBk2MenuItem.Size = new System.Drawing.Size(202, 22); this.AutosaveAsBk2MenuItem.Text = "Autosave As Bk2"; this.AutosaveAsBk2MenuItem.Click += new System.EventHandler(this.AutosaveAsBk2MenuItem_Click); // - // AppendBackupToFilenameMenuItem + // AutosaveAsBackupFileMenuItem // - this.AppendBackupToFilenameMenuItem.Name = "AppendBackupToFilenameMenuItem"; - this.AppendBackupToFilenameMenuItem.Size = new System.Drawing.Size(248, 22); - this.AppendBackupToFilenameMenuItem.Text = "Append \"backup\" to Filename"; - this.AppendBackupToFilenameMenuItem.Click += new System.EventHandler(this.AppendBackupToFilenameMenuItem_Click); + this.AutosaveAsBackupFileMenuItem.Name = "AutosaveAsBackupFileMenuItem"; + this.AutosaveAsBackupFileMenuItem.Size = new System.Drawing.Size(202, 22); + this.AutosaveAsBackupFileMenuItem.Text = "Autosave As Backup File"; + this.AutosaveAsBackupFileMenuItem.Click += new System.EventHandler(this.AutosaveAsBackupFileMenuItem_Click); + // + // BackupPerFileSaveMenuItem + // + this.BackupPerFileSaveMenuItem.Name = "BackupPerFileSaveMenuItem"; + this.BackupPerFileSaveMenuItem.Size = new System.Drawing.Size(253, 22); + this.BackupPerFileSaveMenuItem.Text = "Backup Per File Save"; + this.BackupPerFileSaveMenuItem.Click += new System.EventHandler(this.BackupPerFileSaveMenuItem_Click); // // toolStripSeparator9 // this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(245, 6); + this.toolStripSeparator9.Size = new System.Drawing.Size(250, 6); // // AutoadjustInputMenuItem // this.AutoadjustInputMenuItem.CheckOnClick = true; this.AutoadjustInputMenuItem.Name = "AutoadjustInputMenuItem"; - this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(248, 22); + this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(253, 22); this.AutoadjustInputMenuItem.Text = "Auto-adjust Input according to Lag"; // - // toolStripSeparator11 - // - this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(245, 6); - // // DrawInputByDraggingMenuItem // this.DrawInputByDraggingMenuItem.Name = "DrawInputByDraggingMenuItem"; - this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(248, 22); + this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(253, 22); this.DrawInputByDraggingMenuItem.Text = "Draw Input by dragging"; this.DrawInputByDraggingMenuItem.Click += new System.EventHandler(this.DrawInputByDraggingMenuItem_Click); // @@ -714,7 +744,7 @@ namespace BizHawk.Client.EmuHawk // this.applyPatternToPaintedInputToolStripMenuItem.CheckOnClick = true; this.applyPatternToPaintedInputToolStripMenuItem.Name = "applyPatternToPaintedInputToolStripMenuItem"; - this.applyPatternToPaintedInputToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.applyPatternToPaintedInputToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.applyPatternToPaintedInputToolStripMenuItem.Text = "Apply Pattern to painted input"; this.applyPatternToPaintedInputToolStripMenuItem.CheckedChanged += new System.EventHandler(this.applyPatternToPaintedInputToolStripMenuItem_CheckedChanged); // @@ -725,20 +755,20 @@ namespace BizHawk.Client.EmuHawk this.onlyOnAutoFireColumnsToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.onlyOnAutoFireColumnsToolStripMenuItem.Enabled = false; this.onlyOnAutoFireColumnsToolStripMenuItem.Name = "onlyOnAutoFireColumnsToolStripMenuItem"; - this.onlyOnAutoFireColumnsToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.onlyOnAutoFireColumnsToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.onlyOnAutoFireColumnsToolStripMenuItem.Text = "Only on Auto-Fire columns"; // // UseInputKeysItem // this.UseInputKeysItem.Enabled = false; this.UseInputKeysItem.Name = "UseInputKeysItem"; - this.UseInputKeysItem.Size = new System.Drawing.Size(248, 22); + this.UseInputKeysItem.Size = new System.Drawing.Size(253, 22); this.UseInputKeysItem.Text = "Use Input keys for Column Set"; // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(245, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(250, 6); // // BindMarkersToInputMenuItem // @@ -746,52 +776,52 @@ namespace BizHawk.Client.EmuHawk this.BindMarkersToInputMenuItem.CheckOnClick = true; this.BindMarkersToInputMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.BindMarkersToInputMenuItem.Name = "BindMarkersToInputMenuItem"; - this.BindMarkersToInputMenuItem.Size = new System.Drawing.Size(248, 22); + this.BindMarkersToInputMenuItem.Size = new System.Drawing.Size(253, 22); this.BindMarkersToInputMenuItem.Text = "Bind Markers to Input"; this.BindMarkersToInputMenuItem.Click += new System.EventHandler(this.BindMarkersToInputMenuItem_Click); // // EmptyNewMarkerNotesMenuItem // this.EmptyNewMarkerNotesMenuItem.Name = "EmptyNewMarkerNotesMenuItem"; - this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(248, 22); + this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(253, 22); this.EmptyNewMarkerNotesMenuItem.Text = "Empty new Marker Notes"; this.EmptyNewMarkerNotesMenuItem.Click += new System.EventHandler(this.EmptyNewMarkerNotesMenuItem_Click); // // toolStripSeparator13 // this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(245, 6); + this.toolStripSeparator13.Size = new System.Drawing.Size(250, 6); // // BranchesRestoreEntireMovieMenuItem // this.BranchesRestoreEntireMovieMenuItem.Enabled = false; this.BranchesRestoreEntireMovieMenuItem.Name = "BranchesRestoreEntireMovieMenuItem"; - this.BranchesRestoreEntireMovieMenuItem.Size = new System.Drawing.Size(248, 22); + this.BranchesRestoreEntireMovieMenuItem.Size = new System.Drawing.Size(253, 22); this.BranchesRestoreEntireMovieMenuItem.Text = "Branches restore entire Movie"; // // OsdInBranchScreenshotsMenuItem // this.OsdInBranchScreenshotsMenuItem.Enabled = false; this.OsdInBranchScreenshotsMenuItem.Name = "OsdInBranchScreenshotsMenuItem"; - this.OsdInBranchScreenshotsMenuItem.Size = new System.Drawing.Size(248, 22); + this.OsdInBranchScreenshotsMenuItem.Size = new System.Drawing.Size(253, 22); this.OsdInBranchScreenshotsMenuItem.Text = "OSD in Branch screenshots"; // // toolStripSeparator14 // this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(245, 6); + this.toolStripSeparator14.Size = new System.Drawing.Size(250, 6); // // AutopauseAtEndOfMovieMenuItem // this.AutopauseAtEndOfMovieMenuItem.Name = "AutopauseAtEndOfMovieMenuItem"; - this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(248, 22); + this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(253, 22); this.AutopauseAtEndOfMovieMenuItem.Text = "Autopause at end of Movie"; this.AutopauseAtEndOfMovieMenuItem.Click += new System.EventHandler(this.AutopauseAtEndMenuItem_Click); // // sepToolStripMenuItem // this.sepToolStripMenuItem.Name = "sepToolStripMenuItem"; - this.sepToolStripMenuItem.Size = new System.Drawing.Size(245, 6); + this.sepToolStripMenuItem.Size = new System.Drawing.Size(250, 6); // // autoHoldFireToolStripMenuItem // @@ -804,20 +834,20 @@ namespace BizHawk.Client.EmuHawk this.setpToolStripMenuItem, this.setCustomsToolStripMenuItem}); this.autoHoldFireToolStripMenuItem.Name = "autoHoldFireToolStripMenuItem"; - this.autoHoldFireToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.autoHoldFireToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.autoHoldFireToolStripMenuItem.Text = "Auto Hold/Fire"; // // keepSetPatternsToolStripMenuItem // this.keepSetPatternsToolStripMenuItem.CheckOnClick = true; this.keepSetPatternsToolStripMenuItem.Name = "keepSetPatternsToolStripMenuItem"; - this.keepSetPatternsToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.keepSetPatternsToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.keepSetPatternsToolStripMenuItem.Text = "Keep set patterns"; // // sepToolStripMenuItem1 // this.sepToolStripMenuItem1.Name = "sepToolStripMenuItem1"; - this.sepToolStripMenuItem1.Size = new System.Drawing.Size(163, 6); + this.sepToolStripMenuItem1.Size = new System.Drawing.Size(168, 6); // // autoHoldToolStripMenuItem // @@ -825,7 +855,7 @@ namespace BizHawk.Client.EmuHawk this.autoHoldToolStripMenuItem.CheckOnClick = true; this.autoHoldToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.autoHoldToolStripMenuItem.Name = "autoHoldToolStripMenuItem"; - this.autoHoldToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.autoHoldToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.autoHoldToolStripMenuItem.Text = "Auto-Hold"; this.autoHoldToolStripMenuItem.CheckedChanged += new System.EventHandler(this.autoHoldToolStripMenuItem_CheckedChanged); // @@ -833,7 +863,7 @@ namespace BizHawk.Client.EmuHawk // this.autoFireToolStripMenuItem.CheckOnClick = true; this.autoFireToolStripMenuItem.Name = "autoFireToolStripMenuItem"; - this.autoFireToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.autoFireToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.autoFireToolStripMenuItem.Text = "Auto-Fire"; this.autoFireToolStripMenuItem.CheckedChanged += new System.EventHandler(this.autoFireToolStripMenuItem_CheckedChanged); // @@ -841,19 +871,19 @@ namespace BizHawk.Client.EmuHawk // this.customPatternToolStripMenuItem.CheckOnClick = true; this.customPatternToolStripMenuItem.Name = "customPatternToolStripMenuItem"; - this.customPatternToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.customPatternToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.customPatternToolStripMenuItem.Text = "Custom Pattern"; this.customPatternToolStripMenuItem.CheckedChanged += new System.EventHandler(this.customPatternToolStripMenuItem_CheckedChanged); // // setpToolStripMenuItem // this.setpToolStripMenuItem.Name = "setpToolStripMenuItem"; - this.setpToolStripMenuItem.Size = new System.Drawing.Size(163, 6); + this.setpToolStripMenuItem.Size = new System.Drawing.Size(168, 6); // // setCustomsToolStripMenuItem // this.setCustomsToolStripMenuItem.Name = "setCustomsToolStripMenuItem"; - this.setCustomsToolStripMenuItem.Size = new System.Drawing.Size(166, 22); + this.setCustomsToolStripMenuItem.Size = new System.Drawing.Size(171, 22); this.setCustomsToolStripMenuItem.Text = "Set Customs..."; this.setCustomsToolStripMenuItem.Click += new System.EventHandler(this.setCustomsToolStripMenuItem_Click); // @@ -873,40 +903,40 @@ namespace BizHawk.Client.EmuHawk // HeaderMenuItem // this.HeaderMenuItem.Name = "HeaderMenuItem"; - this.HeaderMenuItem.Size = new System.Drawing.Size(235, 22); + this.HeaderMenuItem.Size = new System.Drawing.Size(240, 22); this.HeaderMenuItem.Text = "&Header..."; this.HeaderMenuItem.Click += new System.EventHandler(this.HeaderMenuItem_Click); // // StateHistorySettingsMenuItem // this.StateHistorySettingsMenuItem.Name = "StateHistorySettingsMenuItem"; - this.StateHistorySettingsMenuItem.Size = new System.Drawing.Size(235, 22); + this.StateHistorySettingsMenuItem.Size = new System.Drawing.Size(240, 22); this.StateHistorySettingsMenuItem.Text = "&Savestate History Settings..."; this.StateHistorySettingsMenuItem.Click += new System.EventHandler(this.StateHistorySettingsMenuItem_Click); // // CommentsMenuItem // this.CommentsMenuItem.Name = "CommentsMenuItem"; - this.CommentsMenuItem.Size = new System.Drawing.Size(235, 22); + this.CommentsMenuItem.Size = new System.Drawing.Size(240, 22); this.CommentsMenuItem.Text = "&Comments..."; this.CommentsMenuItem.Click += new System.EventHandler(this.CommentsMenuItem_Click); // // SubtitlesMenuItem // this.SubtitlesMenuItem.Name = "SubtitlesMenuItem"; - this.SubtitlesMenuItem.Size = new System.Drawing.Size(235, 22); + this.SubtitlesMenuItem.Size = new System.Drawing.Size(240, 22); this.SubtitlesMenuItem.Text = "&Subtitles..."; this.SubtitlesMenuItem.Click += new System.EventHandler(this.SubtitlesMenuItem_Click); // // toolStripSeparator21 // this.toolStripSeparator21.Name = "toolStripSeparator21"; - this.toolStripSeparator21.Size = new System.Drawing.Size(232, 6); + this.toolStripSeparator21.Size = new System.Drawing.Size(237, 6); // // DefaultStateSettingsMenuItem // this.DefaultStateSettingsMenuItem.Name = "DefaultStateSettingsMenuItem"; - this.DefaultStateSettingsMenuItem.Size = new System.Drawing.Size(235, 22); + this.DefaultStateSettingsMenuItem.Size = new System.Drawing.Size(240, 22); this.DefaultStateSettingsMenuItem.Text = "&Default State History Settings..."; this.DefaultStateSettingsMenuItem.Click += new System.EventHandler(this.DefaultStateSettingsMenuItem_Click); // @@ -928,7 +958,7 @@ namespace BizHawk.Client.EmuHawk // RotateMenuItem // this.RotateMenuItem.Name = "RotateMenuItem"; - this.RotateMenuItem.Size = new System.Drawing.Size(183, 22); + this.RotateMenuItem.Size = new System.Drawing.Size(188, 22); this.RotateMenuItem.Text = "Rotate"; this.RotateMenuItem.Click += new System.EventHandler(this.RotateMenuItem_Click); // @@ -942,7 +972,7 @@ namespace BizHawk.Client.EmuHawk this.toolStripSeparator12, this.hideWasLagFramesToolStripMenuItem}); this.HideLagFramesSubMenu.Name = "HideLagFramesSubMenu"; - this.HideLagFramesSubMenu.Size = new System.Drawing.Size(183, 22); + this.HideLagFramesSubMenu.Size = new System.Drawing.Size(188, 22); this.HideLagFramesSubMenu.Text = "Hide Lag Frames"; this.HideLagFramesSubMenu.DropDownOpened += new System.EventHandler(this.HideLagFramesSubMenu_DropDownOpened); // @@ -952,7 +982,7 @@ namespace BizHawk.Client.EmuHawk this.HideLagFrames0.CheckOnClick = true; this.HideLagFrames0.CheckState = System.Windows.Forms.CheckState.Checked; this.HideLagFrames0.Name = "HideLagFrames0"; - this.HideLagFrames0.Size = new System.Drawing.Size(180, 22); + this.HideLagFrames0.Size = new System.Drawing.Size(185, 22); this.HideLagFrames0.Tag = 0; this.HideLagFrames0.Text = "Don\'t Hide"; this.HideLagFrames0.Click += new System.EventHandler(this.HideLagFramesX_Click); @@ -961,7 +991,7 @@ namespace BizHawk.Client.EmuHawk // this.HideLagFrames1.CheckOnClick = true; this.HideLagFrames1.Name = "HideLagFrames1"; - this.HideLagFrames1.Size = new System.Drawing.Size(180, 22); + this.HideLagFrames1.Size = new System.Drawing.Size(185, 22); this.HideLagFrames1.Tag = 1; this.HideLagFrames1.Text = "1 (30 fps)"; this.HideLagFrames1.Click += new System.EventHandler(this.HideLagFramesX_Click); @@ -969,7 +999,7 @@ namespace BizHawk.Client.EmuHawk // HideLagFrames2 // this.HideLagFrames2.Name = "HideLagFrames2"; - this.HideLagFrames2.Size = new System.Drawing.Size(180, 22); + this.HideLagFrames2.Size = new System.Drawing.Size(185, 22); this.HideLagFrames2.Tag = 2; this.HideLagFrames2.Text = "2 (20 fps)"; this.HideLagFrames2.Click += new System.EventHandler(this.HideLagFramesX_Click); @@ -978,7 +1008,7 @@ namespace BizHawk.Client.EmuHawk // this.HideLagFrames3.CheckOnClick = true; this.HideLagFrames3.Name = "HideLagFrames3"; - this.HideLagFrames3.Size = new System.Drawing.Size(180, 22); + this.HideLagFrames3.Size = new System.Drawing.Size(185, 22); this.HideLagFrames3.Tag = 3; this.HideLagFrames3.Text = "3 (15fps)"; this.HideLagFrames3.Click += new System.EventHandler(this.HideLagFramesX_Click); @@ -986,13 +1016,13 @@ namespace BizHawk.Client.EmuHawk // toolStripSeparator12 // this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6); + this.toolStripSeparator12.Size = new System.Drawing.Size(182, 6); // // hideWasLagFramesToolStripMenuItem // this.hideWasLagFramesToolStripMenuItem.CheckOnClick = true; this.hideWasLagFramesToolStripMenuItem.Name = "hideWasLagFramesToolStripMenuItem"; - this.hideWasLagFramesToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.hideWasLagFramesToolStripMenuItem.Size = new System.Drawing.Size(185, 22); this.hideWasLagFramesToolStripMenuItem.Text = "Hide WasLag Frames"; this.hideWasLagFramesToolStripMenuItem.Click += new System.EventHandler(this.hideWasLagFramesToolStripMenuItem_Click); // @@ -1004,7 +1034,7 @@ namespace BizHawk.Client.EmuHawk this.denoteMarkersWithIconsToolStripMenuItem, this.denoteMarkersWithBGColorToolStripMenuItem}); this.iconsToolStripMenuItem.Name = "iconsToolStripMenuItem"; - this.iconsToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.iconsToolStripMenuItem.Size = new System.Drawing.Size(188, 22); this.iconsToolStripMenuItem.Text = "Icons"; this.iconsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.iconsToolStripMenuItem_DropDownOpened); // @@ -1012,7 +1042,7 @@ namespace BizHawk.Client.EmuHawk // this.denoteStatesWithIconsToolStripMenuItem.CheckOnClick = true; this.denoteStatesWithIconsToolStripMenuItem.Name = "denoteStatesWithIconsToolStripMenuItem"; - this.denoteStatesWithIconsToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.denoteStatesWithIconsToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.denoteStatesWithIconsToolStripMenuItem.Text = "Denote States With Icons"; this.denoteStatesWithIconsToolStripMenuItem.Click += new System.EventHandler(this.denoteStatesWithIconsToolStripMenuItem_Click); // @@ -1020,7 +1050,7 @@ namespace BizHawk.Client.EmuHawk // this.denoteStatesWithBGColorToolStripMenuItem.CheckOnClick = true; this.denoteStatesWithBGColorToolStripMenuItem.Name = "denoteStatesWithBGColorToolStripMenuItem"; - this.denoteStatesWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.denoteStatesWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.denoteStatesWithBGColorToolStripMenuItem.Text = "Denote States With BG Color"; this.denoteStatesWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.denoteStatesWithBGColorToolStripMenuItem_Click); // @@ -1028,7 +1058,7 @@ namespace BizHawk.Client.EmuHawk // this.denoteMarkersWithIconsToolStripMenuItem.CheckOnClick = true; this.denoteMarkersWithIconsToolStripMenuItem.Name = "denoteMarkersWithIconsToolStripMenuItem"; - this.denoteMarkersWithIconsToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.denoteMarkersWithIconsToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.denoteMarkersWithIconsToolStripMenuItem.Text = "Denote Markers With Icons"; this.denoteMarkersWithIconsToolStripMenuItem.Click += new System.EventHandler(this.denoteMarkersWithIconsToolStripMenuItem_Click); // @@ -1036,14 +1066,14 @@ namespace BizHawk.Client.EmuHawk // this.denoteMarkersWithBGColorToolStripMenuItem.CheckOnClick = true; this.denoteMarkersWithBGColorToolStripMenuItem.Name = "denoteMarkersWithBGColorToolStripMenuItem"; - this.denoteMarkersWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(225, 22); + this.denoteMarkersWithBGColorToolStripMenuItem.Size = new System.Drawing.Size(230, 22); this.denoteMarkersWithBGColorToolStripMenuItem.Text = "Denote Markers With BG Color"; this.denoteMarkersWithBGColorToolStripMenuItem.Click += new System.EventHandler(this.denoteMarkersWithBGColorToolStripMenuItem_Click); // // toolStripSeparator23 // this.toolStripSeparator23.Name = "toolStripSeparator23"; - this.toolStripSeparator23.Size = new System.Drawing.Size(180, 6); + this.toolStripSeparator23.Size = new System.Drawing.Size(185, 6); // // followCursorToolStripMenuItem // @@ -1055,7 +1085,7 @@ namespace BizHawk.Client.EmuHawk this.scrollToBottomToolStripMenuItem, this.scrollToCenterToolStripMenuItem}); this.followCursorToolStripMenuItem.Name = "followCursorToolStripMenuItem"; - this.followCursorToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.followCursorToolStripMenuItem.Size = new System.Drawing.Size(188, 22); this.followCursorToolStripMenuItem.Text = "Follow Cursor"; this.followCursorToolStripMenuItem.DropDownOpened += new System.EventHandler(this.followCursorToolStripMenuItem_DropDownOpened); // @@ -1063,14 +1093,14 @@ namespace BizHawk.Client.EmuHawk // this.alwaysScrollToolStripMenuItem.CheckOnClick = true; this.alwaysScrollToolStripMenuItem.Name = "alwaysScrollToolStripMenuItem"; - this.alwaysScrollToolStripMenuItem.Size = new System.Drawing.Size(155, 22); + this.alwaysScrollToolStripMenuItem.Size = new System.Drawing.Size(160, 22); this.alwaysScrollToolStripMenuItem.Text = "Always Scroll"; this.alwaysScrollToolStripMenuItem.Click += new System.EventHandler(this.alwaysScrollToolStripMenuItem_Click); // // toolStripSeparator24 // this.toolStripSeparator24.Name = "toolStripSeparator24"; - this.toolStripSeparator24.Size = new System.Drawing.Size(152, 6); + this.toolStripSeparator24.Size = new System.Drawing.Size(157, 6); // // scrollToViewToolStripMenuItem // @@ -1078,7 +1108,7 @@ namespace BizHawk.Client.EmuHawk this.scrollToViewToolStripMenuItem.CheckOnClick = true; this.scrollToViewToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.scrollToViewToolStripMenuItem.Name = "scrollToViewToolStripMenuItem"; - this.scrollToViewToolStripMenuItem.Size = new System.Drawing.Size(155, 22); + this.scrollToViewToolStripMenuItem.Size = new System.Drawing.Size(160, 22); this.scrollToViewToolStripMenuItem.Text = "Scroll to View"; this.scrollToViewToolStripMenuItem.Click += new System.EventHandler(this.scrollToViewToolStripMenuItem_Click); // @@ -1086,7 +1116,7 @@ namespace BizHawk.Client.EmuHawk // this.scrollToTopToolStripMenuItem.CheckOnClick = true; this.scrollToTopToolStripMenuItem.Name = "scrollToTopToolStripMenuItem"; - this.scrollToTopToolStripMenuItem.Size = new System.Drawing.Size(155, 22); + this.scrollToTopToolStripMenuItem.Size = new System.Drawing.Size(160, 22); this.scrollToTopToolStripMenuItem.Text = "Scroll to Top"; this.scrollToTopToolStripMenuItem.Click += new System.EventHandler(this.scrollToTopToolStripMenuItem_Click); // @@ -1094,7 +1124,7 @@ namespace BizHawk.Client.EmuHawk // this.scrollToBottomToolStripMenuItem.CheckOnClick = true; this.scrollToBottomToolStripMenuItem.Name = "scrollToBottomToolStripMenuItem"; - this.scrollToBottomToolStripMenuItem.Size = new System.Drawing.Size(155, 22); + this.scrollToBottomToolStripMenuItem.Size = new System.Drawing.Size(160, 22); this.scrollToBottomToolStripMenuItem.Text = "Scroll to Bottom"; this.scrollToBottomToolStripMenuItem.Click += new System.EventHandler(this.scrollToBottomToolStripMenuItem_Click); // @@ -1102,19 +1132,19 @@ namespace BizHawk.Client.EmuHawk // this.scrollToCenterToolStripMenuItem.CheckOnClick = true; this.scrollToCenterToolStripMenuItem.Name = "scrollToCenterToolStripMenuItem"; - this.scrollToCenterToolStripMenuItem.Size = new System.Drawing.Size(155, 22); + this.scrollToCenterToolStripMenuItem.Size = new System.Drawing.Size(160, 22); this.scrollToCenterToolStripMenuItem.Text = "Scroll to Center"; this.scrollToCenterToolStripMenuItem.Click += new System.EventHandler(this.scrollToCenterToolStripMenuItem_Click); // // toolStripSeparator25 // this.toolStripSeparator25.Name = "toolStripSeparator25"; - this.toolStripSeparator25.Size = new System.Drawing.Size(180, 6); + this.toolStripSeparator25.Size = new System.Drawing.Size(185, 6); // // wheelScrollSpeedToolStripMenuItem // this.wheelScrollSpeedToolStripMenuItem.Name = "wheelScrollSpeedToolStripMenuItem"; - this.wheelScrollSpeedToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.wheelScrollSpeedToolStripMenuItem.Size = new System.Drawing.Size(188, 22); this.wheelScrollSpeedToolStripMenuItem.Text = "Wheel Scroll Speed..."; this.wheelScrollSpeedToolStripMenuItem.Click += new System.EventHandler(this.wheelScrollSpeedToolStripMenuItem_Click); // @@ -1147,29 +1177,37 @@ namespace BizHawk.Client.EmuHawk // this.TASEditorManualOnlineMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Help; this.TASEditorManualOnlineMenuItem.Name = "TASEditorManualOnlineMenuItem"; - this.TASEditorManualOnlineMenuItem.Size = new System.Drawing.Size(209, 22); + this.TASEditorManualOnlineMenuItem.Size = new System.Drawing.Size(214, 22); this.TASEditorManualOnlineMenuItem.Text = "TASEditor Manual Online..."; this.TASEditorManualOnlineMenuItem.Click += new System.EventHandler(this.TASEditorManualOnlineMenuItem_Click); // - // EnableTooltipsMenuItem + // ForumThreadMenuItem // - this.EnableTooltipsMenuItem.Enabled = false; - this.EnableTooltipsMenuItem.Name = "EnableTooltipsMenuItem"; - this.EnableTooltipsMenuItem.Size = new System.Drawing.Size(209, 22); - this.EnableTooltipsMenuItem.Text = "&Enable Tooltips"; - // - // toolStripSeparator10 - // - this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(206, 6); + this.ForumThreadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; + this.ForumThreadMenuItem.Name = "ForumThreadMenuItem"; + this.ForumThreadMenuItem.Size = new System.Drawing.Size(214, 22); + this.ForumThreadMenuItem.Text = "Forum Thread..."; + this.ForumThreadMenuItem.Click += new System.EventHandler(this.ForumThreadMenuItem_Click); // // aboutToolStripMenuItem // this.aboutToolStripMenuItem.Enabled = false; this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(209, 22); + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(214, 22); this.aboutToolStripMenuItem.Text = "&About"; // + // toolStripSeparator10 + // + this.toolStripSeparator10.Name = "toolStripSeparator10"; + this.toolStripSeparator10.Size = new System.Drawing.Size(211, 6); + // + // EnableTooltipsMenuItem + // + this.EnableTooltipsMenuItem.Enabled = false; + this.EnableTooltipsMenuItem.Name = "EnableTooltipsMenuItem"; + this.EnableTooltipsMenuItem.Size = new System.Drawing.Size(214, 22); + this.EnableTooltipsMenuItem.Text = "&Enable Tooltips"; + // // TasView // this.TasView.AllowColumnReorder = false; @@ -1303,39 +1341,39 @@ namespace BizHawk.Client.EmuHawk this.StartNewProjectFromNowMenuItem, this.StartANewProjectFromSaveRamMenuItem}); this.RightClickMenu.Name = "RightClickMenu"; - this.RightClickMenu.Size = new System.Drawing.Size(243, 480); + this.RightClickMenu.Size = new System.Drawing.Size(254, 480); this.RightClickMenu.Opened += new System.EventHandler(this.RightClickMenu_Opened); // // SetMarkersContextMenuItem // this.SetMarkersContextMenuItem.Name = "SetMarkersContextMenuItem"; - this.SetMarkersContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.SetMarkersContextMenuItem.Size = new System.Drawing.Size(253, 22); this.SetMarkersContextMenuItem.Text = "Set Markers"; this.SetMarkersContextMenuItem.Click += new System.EventHandler(this.SetMarkersMenuItem_Click); // // SetMarkerWithTextContextMenuItem // this.SetMarkerWithTextContextMenuItem.Name = "SetMarkerWithTextContextMenuItem"; - this.SetMarkerWithTextContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.SetMarkerWithTextContextMenuItem.Size = new System.Drawing.Size(253, 22); this.SetMarkerWithTextContextMenuItem.Text = "Set Marker with Text"; this.SetMarkerWithTextContextMenuItem.Click += new System.EventHandler(this.SetMarkerWithTextMenuItem_Click); // // RemoveMarkersContextMenuItem // this.RemoveMarkersContextMenuItem.Name = "RemoveMarkersContextMenuItem"; - this.RemoveMarkersContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.RemoveMarkersContextMenuItem.Size = new System.Drawing.Size(253, 22); this.RemoveMarkersContextMenuItem.Text = "Remove Markers"; this.RemoveMarkersContextMenuItem.Click += new System.EventHandler(this.RemoveMarkersMenuItem_Click); // // toolStripSeparator15 // this.toolStripSeparator15.Name = "toolStripSeparator15"; - this.toolStripSeparator15.Size = new System.Drawing.Size(239, 6); + this.toolStripSeparator15.Size = new System.Drawing.Size(250, 6); // // DeselectContextMenuItem // this.DeselectContextMenuItem.Name = "DeselectContextMenuItem"; - this.DeselectContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.DeselectContextMenuItem.Size = new System.Drawing.Size(253, 22); this.DeselectContextMenuItem.Text = "Deselect"; this.DeselectContextMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click); // @@ -1343,39 +1381,39 @@ namespace BizHawk.Client.EmuHawk // this.SelectBetweenMarkersContextMenuItem.Name = "SelectBetweenMarkersContextMenuItem"; this.SelectBetweenMarkersContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A))); - this.SelectBetweenMarkersContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.SelectBetweenMarkersContextMenuItem.Size = new System.Drawing.Size(253, 22); this.SelectBetweenMarkersContextMenuItem.Text = "Select between Markers"; this.SelectBetweenMarkersContextMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click); // // toolStripSeparator16 // this.toolStripSeparator16.Name = "toolStripSeparator16"; - this.toolStripSeparator16.Size = new System.Drawing.Size(239, 6); + this.toolStripSeparator16.Size = new System.Drawing.Size(250, 6); // // UngreenzoneContextMenuItem // this.UngreenzoneContextMenuItem.Name = "UngreenzoneContextMenuItem"; - this.UngreenzoneContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.UngreenzoneContextMenuItem.Size = new System.Drawing.Size(253, 22); this.UngreenzoneContextMenuItem.Text = "Clear Greenzone"; this.UngreenzoneContextMenuItem.Click += new System.EventHandler(this.ClearGreenzoneMenuItem_Click); // // CancelSeekContextMenuItem // this.CancelSeekContextMenuItem.Name = "CancelSeekContextMenuItem"; - this.CancelSeekContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.CancelSeekContextMenuItem.Size = new System.Drawing.Size(253, 22); this.CancelSeekContextMenuItem.Text = "Cancel Seek"; this.CancelSeekContextMenuItem.Click += new System.EventHandler(this.CancelSeekContextMenuItem_Click); // // toolStripSeparator17 // this.toolStripSeparator17.Name = "toolStripSeparator17"; - this.toolStripSeparator17.Size = new System.Drawing.Size(239, 6); + this.toolStripSeparator17.Size = new System.Drawing.Size(250, 6); // // copyToolStripMenuItem // this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; this.copyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C"; - this.copyToolStripMenuItem.Size = new System.Drawing.Size(242, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.copyToolStripMenuItem.Text = "Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click); // @@ -1383,7 +1421,7 @@ namespace BizHawk.Client.EmuHawk // this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; this.pasteToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V"; - this.pasteToolStripMenuItem.Size = new System.Drawing.Size(242, 22); + this.pasteToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.pasteToolStripMenuItem.Text = "Paste"; this.pasteToolStripMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click); // @@ -1391,7 +1429,7 @@ namespace BizHawk.Client.EmuHawk // this.pasteInsertToolStripMenuItem.Name = "pasteInsertToolStripMenuItem"; this.pasteInsertToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Shift+V"; - this.pasteInsertToolStripMenuItem.Size = new System.Drawing.Size(242, 22); + this.pasteInsertToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.pasteInsertToolStripMenuItem.Text = "Paste Insert"; this.pasteInsertToolStripMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click); // @@ -1399,20 +1437,20 @@ namespace BizHawk.Client.EmuHawk // this.cutToolStripMenuItem.Name = "cutToolStripMenuItem"; this.cutToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+X"; - this.cutToolStripMenuItem.Size = new System.Drawing.Size(242, 22); + this.cutToolStripMenuItem.Size = new System.Drawing.Size(253, 22); this.cutToolStripMenuItem.Text = "Cut"; this.cutToolStripMenuItem.Click += new System.EventHandler(this.CutMenuItem_Click); // // separateToolStripMenuItem // this.separateToolStripMenuItem.Name = "separateToolStripMenuItem"; - this.separateToolStripMenuItem.Size = new System.Drawing.Size(239, 6); + this.separateToolStripMenuItem.Size = new System.Drawing.Size(250, 6); // // ClearContextMenuItem // this.ClearContextMenuItem.Name = "ClearContextMenuItem"; this.ClearContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.ClearContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.ClearContextMenuItem.Size = new System.Drawing.Size(253, 22); this.ClearContextMenuItem.Text = "Clear"; this.ClearContextMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click); // @@ -1420,7 +1458,7 @@ namespace BizHawk.Client.EmuHawk // this.InsertFrameContextMenuItem.Name = "InsertFrameContextMenuItem"; this.InsertFrameContextMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Insert; - this.InsertFrameContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.InsertFrameContextMenuItem.Size = new System.Drawing.Size(253, 22); this.InsertFrameContextMenuItem.Text = "Insert"; this.InsertFrameContextMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); // @@ -1428,7 +1466,7 @@ namespace BizHawk.Client.EmuHawk // this.DeleteFramesContextMenuItem.Name = "DeleteFramesContextMenuItem"; this.DeleteFramesContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); - this.DeleteFramesContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.DeleteFramesContextMenuItem.Size = new System.Drawing.Size(253, 22); this.DeleteFramesContextMenuItem.Text = "Delete"; this.DeleteFramesContextMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); // @@ -1436,7 +1474,7 @@ namespace BizHawk.Client.EmuHawk // this.CloneContextMenuItem.Name = "CloneContextMenuItem"; this.CloneContextMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert))); - this.CloneContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.CloneContextMenuItem.Size = new System.Drawing.Size(253, 22); this.CloneContextMenuItem.Text = "Clone"; this.CloneContextMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click); // @@ -1445,45 +1483,45 @@ namespace BizHawk.Client.EmuHawk 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.Size = new System.Drawing.Size(242, 22); + this.InsertNumFramesContextMenuItem.Size = new System.Drawing.Size(253, 22); this.InsertNumFramesContextMenuItem.Text = "Insert # of Frames"; this.InsertNumFramesContextMenuItem.Click += new System.EventHandler(this.InsertNumFramesMenuItem_Click); // // toolStripSeparator18 // this.toolStripSeparator18.Name = "toolStripSeparator18"; - this.toolStripSeparator18.Size = new System.Drawing.Size(239, 6); + this.toolStripSeparator18.Size = new System.Drawing.Size(250, 6); // // TruncateContextMenuItem // this.TruncateContextMenuItem.Name = "TruncateContextMenuItem"; - this.TruncateContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.TruncateContextMenuItem.Size = new System.Drawing.Size(253, 22); this.TruncateContextMenuItem.Text = "Truncate Movie"; this.TruncateContextMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); // // BranchContextMenuItem // this.BranchContextMenuItem.Name = "BranchContextMenuItem"; - this.BranchContextMenuItem.Size = new System.Drawing.Size(242, 22); + this.BranchContextMenuItem.Size = new System.Drawing.Size(253, 22); this.BranchContextMenuItem.Text = "&Branch"; this.BranchContextMenuItem.Click += new System.EventHandler(this.BranchContextMenuItem_Click); // // StartFromNowSeparator // this.StartFromNowSeparator.Name = "StartFromNowSeparator"; - this.StartFromNowSeparator.Size = new System.Drawing.Size(239, 6); + this.StartFromNowSeparator.Size = new System.Drawing.Size(250, 6); // // StartNewProjectFromNowMenuItem // this.StartNewProjectFromNowMenuItem.Name = "StartNewProjectFromNowMenuItem"; - this.StartNewProjectFromNowMenuItem.Size = new System.Drawing.Size(242, 22); + this.StartNewProjectFromNowMenuItem.Size = new System.Drawing.Size(253, 22); this.StartNewProjectFromNowMenuItem.Text = "Start a new project from Now"; this.StartNewProjectFromNowMenuItem.Click += new System.EventHandler(this.StartNewProjectFromNowMenuItem_Click); // // StartANewProjectFromSaveRamMenuItem // this.StartANewProjectFromSaveRamMenuItem.Name = "StartANewProjectFromSaveRamMenuItem"; - this.StartANewProjectFromSaveRamMenuItem.Size = new System.Drawing.Size(242, 22); + this.StartANewProjectFromSaveRamMenuItem.Size = new System.Drawing.Size(253, 22); this.StartANewProjectFromSaveRamMenuItem.Text = "Start a new project from SaveRam"; this.StartANewProjectFromSaveRamMenuItem.Click += new System.EventHandler(this.StartANewProjectFromSaveRamMenuItem_Click); // @@ -1555,14 +1593,6 @@ namespace BizHawk.Client.EmuHawk this.MainVertialSplit.TabIndex = 10; this.MainVertialSplit.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.MainVertialSplit_SplitterMoved); // - // ForumThreadMenuItem - // - this.ForumThreadMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TAStudio; - this.ForumThreadMenuItem.Name = "ForumThreadMenuItem"; - this.ForumThreadMenuItem.Size = new System.Drawing.Size(209, 22); - this.ForumThreadMenuItem.Text = "Forum Thread..."; - this.ForumThreadMenuItem.Click += new System.EventHandler(this.ForumThreadMenuItem_Click); - // // TAStudio // this.AllowDrop = true; @@ -1650,7 +1680,6 @@ namespace BizHawk.Client.EmuHawk private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem SetMaxUndoLevelsMenuItem; private System.Windows.Forms.ToolStripMenuItem AutoadjustInputMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator11; private System.Windows.Forms.ToolStripMenuItem DrawInputByDraggingMenuItem; private System.Windows.Forms.ToolStripMenuItem UseInputKeysItem; private System.Windows.Forms.ToolStripMenuItem BindMarkersToInputMenuItem; @@ -1757,11 +1786,15 @@ namespace BizHawk.Client.EmuHawk private System.Windows.Forms.ToolStripMenuItem SetBranchCellHoverIntervalMenuItem; private System.Windows.Forms.ToolStripMenuItem SetMarkerWithTextContextMenuItem; private System.Windows.Forms.ToolStripMenuItem SetSeekingCutoffIntervalMenuItem; - private System.Windows.Forms.ToolStripMenuItem setAutosaveIntervalToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem AutosaveAsBk2MenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator26; - private System.Windows.Forms.ToolStripMenuItem AppendBackupToFilenameMenuItem; private System.Windows.Forms.ToolStripMenuItem TASEditorManualOnlineMenuItem; private System.Windows.Forms.ToolStripMenuItem ForumThreadMenuItem; + private System.Windows.Forms.ToolStripMenuItem autosaveToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem SetAutosaveIntervalMenuItem; + private System.Windows.Forms.ToolStripMenuItem AutosaveAsBk2MenuItem; + private System.Windows.Forms.ToolStripMenuItem AutosaveAsBackupFileMenuItem; + private System.Windows.Forms.ToolStripMenuItem BackupPerFileSaveMenuItem; + private System.Windows.Forms.ToolStripMenuItem SaveBackupMenuItem; + private System.Windows.Forms.ToolStripMenuItem SaveBk2BackupMenuItem; } } \ No newline at end of file diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs index 4eb586e791..e361238f0a 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs @@ -112,7 +112,7 @@ namespace BizHawk.Client.EmuHawk if (result == DialogResult.Yes) { _exiting = true; // Asking to save changes should only ever be called when closing something - SaveTasMenuItem_Click(null, null); + SaveTas(null, null); } else if (result == DialogResult.No) { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 608284d92e..2aee7880f8 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -76,12 +76,12 @@ namespace BizHawk.Client.EmuHawk private bool _exiting = false; - private void SaveTasMenuItem_Click(object sender, EventArgs e) + private void SaveTas(object sender, EventArgs e) { if (string.IsNullOrEmpty(CurrentTasMovie.Filename) || CurrentTasMovie.Filename == DefaultTasProjName()) { - SaveAsTasMenuItem_Click(sender, e); + SaveAsTas(sender, e); } else { @@ -89,34 +89,24 @@ namespace BizHawk.Client.EmuHawk MessageStatusLabel.Text = "Saving..."; this.Cursor = Cursors.WaitCursor; Update(); - if (_autosaveAppendFilenamePending) - { - // temp filename - var ext = CurrentTasMovie.PreferredExtension; - CurrentTasMovie.Filename = CurrentTasMovie.Filename.Replace(ext, "backup." + ext); - } CurrentTasMovie.Save(); if (Settings.AutosaveInterval > 0) _autosaveTimer.Start(); MessageStatusLabel.Text = CurrentTasMovie.Name + " saved."; - if (_autosaveAppendFilenamePending) - { - // switch back to original - CurrentTasMovie.Filename = CurrentTasMovie.Filename.Replace("backup.", ""); - // we should only arrive here if changes were true - // and saving to a different file clears changes - // so assuming the original file remains unsaved, keep changes flagged - CurrentTasMovie.FlagChanges(); - } - else - { - Settings.RecentTas.Add(CurrentTasMovie.Filename); - } + Settings.RecentTas.Add(CurrentTasMovie.Filename); this.Cursor = Cursors.Default; } } - private void SaveAsTasMenuItem_Click(object sender, EventArgs e) + // call this one from the menu only + private void SaveTasMenuItem_Click(object sender, EventArgs e) + { + SaveTas(sender, e); + if (Settings.BackupPerFileSave) + SaveBackupMenuItem_Click(sender, e); + } + + private void SaveAsTas(object sender, EventArgs e) { _autosaveTimer.Stop(); var filename = CurrentTasMovie.Filename; @@ -148,6 +138,50 @@ namespace BizHawk.Client.EmuHawk _autosaveTimer.Start(); } + // call this one from the menu only + private void SaveAsTasMenuItem_Click(object sender, EventArgs e) + { + SaveAsTas(sender, e); + if (Settings.BackupPerFileSave) + SaveBackupMenuItem_Click(sender, e); + } + + private void SaveBackupMenuItem_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(CurrentTasMovie.Filename) || + CurrentTasMovie.Filename == DefaultTasProjName()) + { + SaveAsTas(sender, e); + } + else + { + _autosaveTimer.Stop(); + MessageStatusLabel.Text = "Saving..."; + this.Cursor = Cursors.WaitCursor; + Update(); + CurrentTasMovie.SaveBackup(); + if (Settings.AutosaveInterval > 0) + _autosaveTimer.Start(); + MessageStatusLabel.Text = "Backup .tasproj saved to \"Movie backups\" path."; + Settings.RecentTas.Add(CurrentTasMovie.Filename); + this.Cursor = Cursors.Default; + } + } + + private void SaveBk2BackupMenuItem_Click(object sender, EventArgs e) + { + _autosaveTimer.Stop(); + var bk2 = CurrentTasMovie.ToBk2(copy: true, backup: true); + MessageStatusLabel.Text = "Exporting to .bk2..."; + this.Cursor = Cursors.WaitCursor; + Update(); + bk2.SaveBackup(); + if (Settings.AutosaveInterval > 0) + _autosaveTimer.Start(); + MessageStatusLabel.Text = "Backup .bk2 saved to \"Movie backups\" path."; + this.Cursor = Cursors.Default; + } + private void saveSelectionToMacroToolStripMenuItem_Click(object sender, EventArgs e) { if (TasView.LastSelectedIndex == CurrentTasMovie.InputLogLength) @@ -186,11 +220,6 @@ namespace BizHawk.Client.EmuHawk MessageStatusLabel.Text = "Exporting to .bk2..."; this.Cursor = Cursors.WaitCursor; Update(); - if (_autosaveAppendFilenamePending) - { - var ext = bk2.PreferredExtension; - bk2.Filename = bk2.Filename.Replace(ext, "backup." + ext); - } bk2.Save(); if (Settings.AutosaveInterval > 0) _autosaveTimer.Start(); @@ -207,6 +236,30 @@ namespace BizHawk.Client.EmuHawk #region Edit + private void EditSubMenu_DropDownOpened(object sender, EventArgs e) + { + DeselectMenuItem.Enabled = + SelectBetweenMarkersMenuItem.Enabled = + CopyMenuItem.Enabled = + CutMenuItem.Enabled = + ClearMenuItem.Enabled = + DeleteFramesMenuItem.Enabled = + CloneMenuItem.Enabled = + TruncateMenuItem.Enabled = + TasView.AnyRowsSelected; + ReselectClipboardMenuItem.Enabled = + PasteMenuItem.Enabled = + PasteInsertMenuItem.Enabled = + _tasClipboard.Any(); + + ClearGreenzoneMenuItem.Enabled = + CurrentTasMovie != null && CurrentTasMovie.TasStateManager.Any(); + + GreenzoneICheckSeparator.Visible = + StateHistoryIntegrityCheckMenuItem.Visible = + VersionInfo.DeveloperBuild; + } + private void UndoMenuItem_Click(object sender, EventArgs e) { if (CurrentTasMovie.ChangeLog.Undo() < Emulator.Frame) @@ -238,30 +291,6 @@ namespace BizHawk.Client.EmuHawk _undoForm.UpdateValues(); } - private void EditSubMenu_DropDownOpened(object sender, EventArgs e) - { - DeselectMenuItem.Enabled = - SelectBetweenMarkersMenuItem.Enabled = - CopyMenuItem.Enabled = - CutMenuItem.Enabled = - ClearMenuItem.Enabled = - DeleteFramesMenuItem.Enabled = - CloneMenuItem.Enabled = - TruncateMenuItem.Enabled = - TasView.AnyRowsSelected; - ReselectClipboardMenuItem.Enabled = - PasteMenuItem.Enabled = - PasteInsertMenuItem.Enabled = - _tasClipboard.Any(); - - ClearGreenzoneMenuItem.Enabled = - CurrentTasMovie != null && CurrentTasMovie.TasStateManager.Any(); - - GreenzoneICheckSeparator.Visible = - StateHistoryIntegrityCheckMenuItem.Visible = - VersionInfo.DeveloperBuild; - } - private void DeselectMenuItem_Click(object sender, EventArgs e) { TasView.DeselectAll(); @@ -689,6 +718,16 @@ namespace BizHawk.Client.EmuHawk #region Config + private void ConfigSubMenu_DropDownOpened(object sender, EventArgs e) + { + DrawInputByDraggingMenuItem.Checked = Settings.DrawInput; + AutopauseAtEndOfMovieMenuItem.Checked = Settings.AutoPause; + EmptyNewMarkerNotesMenuItem.Checked = Settings.EmptyMarkers; + AutosaveAsBk2MenuItem.Checked = Settings.AutosaveAsBk2; + AutosaveAsBackupFileMenuItem.Checked = Settings.AutosaveAsBackupFile; + BackupPerFileSaveMenuItem.Checked = Settings.BackupPerFileSave; + } + private void SetMaxUndoLevelsMenuItem_Click(object sender, EventArgs e) { using (var prompt = new InputPrompt @@ -780,18 +819,14 @@ namespace BizHawk.Client.EmuHawk Settings.AutosaveAsBk2 ^= true; } - private void AppendBackupToFilenameMenuItem_Click(object sender, EventArgs e) + private void AutosaveAsBackupFileMenuItem_Click(object sender, EventArgs e) { - Settings.AppendBackupToFilename ^= true; + Settings.AutosaveAsBackupFile ^= true; } - private void ConfigSubMenu_DropDownOpened(object sender, EventArgs e) + private void BackupPerFileSaveMenuItem_Click(object sender, EventArgs e) { - DrawInputByDraggingMenuItem.Checked = Settings.DrawInput; - AutopauseAtEndOfMovieMenuItem.Checked = Settings.AutoPause; - EmptyNewMarkerNotesMenuItem.Checked = Settings.EmptyMarkers; - AutosaveAsBk2MenuItem.Checked = Settings.AutosaveAsBk2; - AppendBackupToFilenameMenuItem.Checked = Settings.AppendBackupToFilename; + Settings.BackupPerFileSave ^= true; } private void DrawInputByDraggingMenuItem_Click(object sender, EventArgs e) @@ -928,6 +963,31 @@ namespace BizHawk.Client.EmuHawk hideWasLagFramesToolStripMenuItem.Checked = TasView.HideWasLagFrames; } + private void iconsToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + denoteStatesWithIconsToolStripMenuItem.Checked = Settings.denoteStatesWithIcons; + denoteStatesWithBGColorToolStripMenuItem.Checked = Settings.denoteStatesWithBGColor; + denoteMarkersWithIconsToolStripMenuItem.Checked = Settings.denoteMarkersWithIcons; + denoteMarkersWithBGColorToolStripMenuItem.Checked = Settings.denoteMarkersWithBGColor; + } + + private void followCursorToolStripMenuItem_DropDownOpened(object sender, EventArgs e) + { + alwaysScrollToolStripMenuItem.Checked = Settings.FollowCursorAlwaysScroll; + scrollToViewToolStripMenuItem.Checked = false; + scrollToTopToolStripMenuItem.Checked = false; + scrollToBottomToolStripMenuItem.Checked = false; + scrollToCenterToolStripMenuItem.Checked = false; + if (TasView.ScrollMethod == "near") + scrollToViewToolStripMenuItem.Checked = true; + else if (TasView.ScrollMethod == "top") + scrollToTopToolStripMenuItem.Checked = true; + else if (TasView.ScrollMethod == "bottom") + scrollToBottomToolStripMenuItem.Checked = true; + else + scrollToCenterToolStripMenuItem.Checked = true; + } + private void RotateMenuItem_Click(object sender, EventArgs e) { TasView.HorizontalOrientation ^= true; @@ -971,14 +1031,6 @@ namespace BizHawk.Client.EmuHawk TasView.ScrollMethod = Settings.FollowCursorScrollMethod = "center"; } - private void iconsToolStripMenuItem_DropDownOpened(object sender, EventArgs e) - { - denoteStatesWithIconsToolStripMenuItem.Checked = Settings.denoteStatesWithIcons; - denoteStatesWithBGColorToolStripMenuItem.Checked = Settings.denoteStatesWithBGColor; - denoteMarkersWithIconsToolStripMenuItem.Checked = Settings.denoteMarkersWithIcons; - denoteMarkersWithBGColorToolStripMenuItem.Checked = Settings.denoteMarkersWithBGColor; - } - private void denoteStatesWithIconsToolStripMenuItem_Click(object sender, EventArgs e) { TasView.denoteStatesWithIcons = Settings.denoteStatesWithIcons = denoteStatesWithIconsToolStripMenuItem.Checked; @@ -1003,23 +1055,6 @@ namespace BizHawk.Client.EmuHawk RefreshDialog(); } - private void followCursorToolStripMenuItem_DropDownOpened(object sender, EventArgs e) - { - alwaysScrollToolStripMenuItem.Checked = Settings.FollowCursorAlwaysScroll; - scrollToViewToolStripMenuItem.Checked = false; - scrollToTopToolStripMenuItem.Checked = false; - scrollToBottomToolStripMenuItem.Checked = false; - scrollToCenterToolStripMenuItem.Checked = false; - if (TasView.ScrollMethod == "near") - scrollToViewToolStripMenuItem.Checked = true; - else if (TasView.ScrollMethod == "top") - scrollToTopToolStripMenuItem.Checked = true; - else if (TasView.ScrollMethod == "bottom") - scrollToBottomToolStripMenuItem.Checked = true; - else - scrollToCenterToolStripMenuItem.Checked = true; - } - private void wheelScrollSpeedToolStripMenuItem_Click(object sender, EventArgs e) { InputPrompt inputpromt = new InputPrompt(); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index b9959e8ca7..767833a819 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -38,7 +38,6 @@ namespace BizHawk.Client.EmuHawk private UndoHistoryForm _undoForm; private Timer _autosaveTimer = new Timer(); - private bool _autosaveAppendFilenamePending = false; public ScreenshotPopupControl ScreenshotControl = new ScreenshotPopupControl { @@ -71,7 +70,8 @@ namespace BizHawk.Client.EmuHawk SeekingCutoffInterval = 2; // unused, relying on VisibleRows is smarter AutosaveInterval = 120000; AutosaveAsBk2 = false; - AppendBackupToFilename = false; + AutosaveAsBackupFile = false; + BackupPerFileSave = false; // default to taseditor fashion denoteStatesWithIcons = false; denoteStatesWithBGColor = true; @@ -92,7 +92,8 @@ namespace BizHawk.Client.EmuHawk public int SeekingCutoffInterval { get; set; } public uint AutosaveInterval { get; set; } public bool AutosaveAsBk2 { get; set; } - public bool AppendBackupToFilename { get; set; } + public bool AutosaveAsBackupFile { get; set; } + public bool BackupPerFileSave { get; set; } public bool denoteStatesWithIcons { get; set; } public bool denoteStatesWithBGColor { get; set; } @@ -166,19 +167,20 @@ namespace BizHawk.Client.EmuHawk if (!CurrentTasMovie.Changes || Settings.AutosaveInterval == 0) return; - if (Settings.AppendBackupToFilename) - _autosaveAppendFilenamePending = true; - - if (Settings.AutosaveAsBk2) + if (Settings.AutosaveAsBackupFile) { - ToBk2MenuItem_Click(sender, e); + if (Settings.AutosaveAsBk2) + SaveBk2BackupMenuItem_Click(sender, e); + else + SaveBackupMenuItem_Click(sender, e); } else { - SaveTasMenuItem_Click(sender, e); + if (Settings.AutosaveAsBk2) + ToBk2MenuItem_Click(sender, e); + else + SaveTas(sender, e); } - - _autosaveAppendFilenamePending = false; } private void InitializeSaveWorker()