diff --git a/BizHawk.Client.EmuHawk/IControlMainform.cs b/BizHawk.Client.EmuHawk/IControlMainform.cs index d66dba5655..965b93320f 100644 --- a/BizHawk.Client.EmuHawk/IControlMainform.cs +++ b/BizHawk.Client.EmuHawk/IControlMainform.cs @@ -3,9 +3,20 @@ public interface IControlMainform { bool WantsToControlReadOnly { get; } + /// + /// Function that is called by Mainform instead of using its own code + /// when a Tool sets WantsToControlReadOnly. + /// Should not be called directly. + /// void ToggleReadOnly(); - bool WantsToCOntrolStopMovie { get; } + bool WantsToControlStopMovie { get; } + /// + /// Function that is called by Mainform instead of using its own code + /// when a Tool sets WantsToControlStopMovie. + /// Should not be called directly. + /// Like MainForm's StopMovie(), saving the movie is part of this function's responsibility. + /// void StopMovie(); } } diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs index 66c404032c..e1a7697d9f 100644 --- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs +++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs @@ -75,18 +75,5 @@ namespace BizHawk.Client.EmuHawk GlobalWin.OSD.AddMessage("Replaying movie file in read-only mode"); } } - - public void StopMovie(bool saveChanges = true) - { - if (IsSlave && _master.WantsToCOntrolStopMovie) - { - _master.StopMovie(); - } - else - { - Global.MovieSession.StopMovie(saveChanges); - SetMainformMovieInfo(); - } - } } } diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs index 006853b837..73d687dd9f 100644 --- a/BizHawk.Client.EmuHawk/MainForm.cs +++ b/BizHawk.Client.EmuHawk/MainForm.cs @@ -1966,26 +1966,6 @@ namespace BizHawk.Client.EmuHawk Global.Config.DisplayInput ^= true; } - private void ToggleReadOnly() - { - if (IsSlave && _master.WantsToControlReadOnly) - { - _master.ToggleReadOnly(); - } - else - { - if (Global.MovieSession.Movie.IsActive) - { - Global.MovieSession.ReadOnly ^= true; - GlobalWin.OSD.AddMessage(Global.MovieSession.ReadOnly ? "Movie read-only mode" : "Movie read+write mode"); - } - else - { - GlobalWin.OSD.AddMessage("No movie active"); - } - } - } - private static void VolumeUp() { Global.Config.SoundVolume += 10; @@ -3085,7 +3065,7 @@ namespace BizHawk.Client.EmuHawk // Still needs a good bit of refactoring public bool LoadRom(string path, bool? deterministicemulation = null) { - // If deterministic emulation is passed in, respect that value regardless, else determine a good value (currently that simply means movies require detemrinistic emulaton) + // If deterministic emulation is passed in, respect that value regardless, else determine a good value (currently that simply means movies require deterministic emulaton) bool deterministic = deterministicemulation.HasValue ? deterministicemulation.Value : Global.MovieSession.Movie.IsActive; @@ -3372,26 +3352,64 @@ namespace BizHawk.Client.EmuHawk #endregion - // TODO: move me - private IControlMainform _master; + #region Tool Control API + + // TODO: move me + public IControlMainform master { get; private set; } public void RelinquishControl(IControlMainform master) { - _master = master; + this.master = master; } + private void ToggleReadOnly() + { + if (IsSlave && master.WantsToControlReadOnly) + { + master.ToggleReadOnly(); + } + else + { + if (Global.MovieSession.Movie.IsActive) + { + Global.MovieSession.ReadOnly ^= true; + GlobalWin.OSD.AddMessage(Global.MovieSession.ReadOnly ? "Movie read-only mode" : "Movie read+write mode"); + } + else + { + GlobalWin.OSD.AddMessage("No movie active"); + } + } + } + + public void StopMovie(bool saveChanges = true) + { + if (IsSlave && master.WantsToControlStopMovie) + { + master.StopMovie(); + } + else + { + Global.MovieSession.StopMovie(saveChanges); + SetMainformMovieInfo(); + UpdateStatusSlots(); + } + } + private bool IsSlave { - get { return _master != null; } + get { return master != null; } } - public void TakeControl() + public void TakeBackControl() { - _master = null; + master = null; } private void GBAcoresettingsToolStripMenuItem1_Click(object sender, EventArgs e) { GenericCoreConfig.DoDialog(this, "Gameboy Advance Settings"); - } - } + } + + #endregion + } } diff --git a/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs b/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs index c09f8a3d96..ba6805a7c4 100644 --- a/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs +++ b/BizHawk.Client.EmuHawk/config/NES/NESSoundConfig.cs @@ -11,7 +11,7 @@ namespace BizHawk.Client.EmuHawk private NES.NESSettings _oldSettings; private NES.NESSettings _settings; - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return false; } } public void UpdateValues() { diff --git a/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.cs b/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.cs index 5a47f7cc2d..08e6411864 100644 --- a/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.cs +++ b/BizHawk.Client.EmuHawk/tools/Atari2600/Atari2600Debugger.cs @@ -154,7 +154,7 @@ namespace BizHawk.Client.EmuHawk // TODO } - public bool AskSave() + public bool AskSaveChanges() { return true; } diff --git a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs index f774f163f2..df15df3eda 100644 --- a/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs +++ b/BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs @@ -52,7 +52,7 @@ namespace BizHawk.Client.EmuHawk InitializeComponent(); Closing += (o, e) => { - if (AskSave()) + if (AskSaveChanges()) { SaveConfigSettings(); } @@ -99,7 +99,7 @@ namespace BizHawk.Client.EmuHawk public void LoadFileFromRecent(string path) { - var askResult = !Global.CheatList.Changes || AskSave(); + var askResult = !Global.CheatList.Changes || AskSaveChanges(); if (askResult) { var loadResult = Global.CheatList.Load(path, append: false); @@ -123,7 +123,7 @@ namespace BizHawk.Client.EmuHawk : Path.GetFileName(Global.CheatList.CurrentFileName) + (Global.CheatList.Changes ? " *" : string.Empty); } - public bool AskSave() + public bool AskSaveChanges() { if (Global.CheatList.Changes) { @@ -155,7 +155,7 @@ namespace BizHawk.Client.EmuHawk var result = true; if (Global.CheatList.Changes) { - result = AskSave(); + result = AskSaveChanges(); } if (result) @@ -433,7 +433,7 @@ namespace BizHawk.Client.EmuHawk private void StartNewList() { - var result = !Global.CheatList.Changes || AskSave(); + var result = !Global.CheatList.Changes || AskSaveChanges(); if (result) { Global.CheatList.NewList(ToolManager.GenerateDefaultCheatFilename()); @@ -445,7 +445,7 @@ namespace BizHawk.Client.EmuHawk private void NewList() { - var result = !Global.CheatList.Changes || AskSave(); + var result = !Global.CheatList.Changes || AskSaveChanges(); if (result) { StartNewList(); diff --git a/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs index 6932a5ba35..fe092ba047 100644 --- a/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs +++ b/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs @@ -53,7 +53,7 @@ namespace BizHawk.Client.EmuHawk } } - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return true; } } public GBGPUView() diff --git a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs index db9c42b242..3df605a67d 100644 --- a/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs +++ b/BizHawk.Client.EmuHawk/tools/GB/GBGameGenie.cs @@ -15,7 +15,7 @@ namespace BizHawk.Client.EmuHawk #region Public - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return false; } } diff --git a/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs b/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs index 358bd06a86..4f3575df1f 100644 --- a/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs +++ b/BizHawk.Client.EmuHawk/tools/GBA/GBAGPUView.cs @@ -25,7 +25,7 @@ namespace BizHawk.Client.EmuHawk MobileDetailView memory; - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return true; } } public GBAGPUView() diff --git a/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs index 5c5e5d847f..3fd6f5d453 100644 --- a/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs +++ b/BizHawk.Client.EmuHawk/tools/Genesis/GenGameGenie.cs @@ -60,7 +60,7 @@ namespace BizHawk.Client.EmuHawk #region Public API - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return false; } } diff --git a/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs b/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs index 5579d081f0..765885316a 100644 --- a/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/Genesis/VDPViewer.cs @@ -145,7 +145,7 @@ namespace BizHawk.Client.EmuHawk UpdateValues(); } - public bool AskSave() + public bool AskSaveChanges() { return true; } diff --git a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs index 63350d0e40..d8c6953d6e 100644 --- a/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs +++ b/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs @@ -96,7 +96,7 @@ namespace BizHawk.Client.EmuHawk get { return false; } } - public bool AskSave() + public bool AskSaveChanges() { return true; } diff --git a/BizHawk.Client.EmuHawk/tools/IToolForm.cs b/BizHawk.Client.EmuHawk/tools/IToolForm.cs index 04f5490898..b67fc77c8a 100644 --- a/BizHawk.Client.EmuHawk/tools/IToolForm.cs +++ b/BizHawk.Client.EmuHawk/tools/IToolForm.cs @@ -26,7 +26,7 @@ /// Return false to tell the client to back out of an action (such as closing the emulator) /// /// - bool AskSave(); + bool AskSaveChanges(); /// diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs index 7d424492bf..9d61c2a5a3 100644 --- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs +++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs @@ -38,7 +38,7 @@ namespace BizHawk.Client.EmuHawk LuaImp = new EmuLuaLibrary(this); Closing += (o, e) => { - if (AskSave()) + if (AskSaveChanges()) { SaveConfigSettings(); GlobalWin.DisplayManager.ClearLuaSurfaces(); @@ -500,7 +500,7 @@ namespace BizHawk.Client.EmuHawk var doload = true; if (_luaList.Changes) { - doload = AskSave(); + doload = AskSaveChanges(); } if (doload) @@ -518,7 +518,7 @@ namespace BizHawk.Client.EmuHawk } } - public bool AskSave() + public bool AskSaveChanges() { if (_luaList.Changes) { @@ -587,7 +587,7 @@ namespace BizHawk.Client.EmuHawk private void NewSessionMenuItem_Click(object sender, EventArgs e) { - var result = !_luaList.Changes || AskSave(); + var result = !_luaList.Changes || AskSaveChanges(); if (result) { diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.cs b/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.cs index db18a57aab..fe5385b68c 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/NESDebugger.cs @@ -26,7 +26,7 @@ namespace BizHawk.Client.EmuHawk public DisasmOp(int s, string m) { size = s; mnemonic = m; } } - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return true; } } public NESDebugger() diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs index d50348500e..f5be5d3d11 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/NESGameGenie.cs @@ -37,7 +37,7 @@ namespace BizHawk.Client.EmuHawk public int? Value { get { return _value; } } public int? Compare { get { return _compare; } } - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return false; } } public void Restart() { diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs b/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs index 3ba1e41d6d..d97b2d35d2 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/NESNameTableViewer.cs @@ -42,7 +42,7 @@ namespace BizHawk.Client.EmuHawk #region Public API - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return true; } } public void Restart() diff --git a/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs b/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs index 8eefba1ad3..71e7087254 100644 --- a/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs +++ b/BizHawk.Client.EmuHawk/tools/NES/NESPPU.cs @@ -52,7 +52,7 @@ namespace BizHawk.Client.EmuHawk #region Public API - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return true; } } public void UpdateValues() diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs index 3ecb4902dd..a5016a9394 100644 --- a/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/PCE/PCEBGViewer.cs @@ -52,7 +52,7 @@ namespace BizHawk.Client.EmuHawk #region Public API - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return true; } } public unsafe void Generate() diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs index 3fe08f81fb..8db47173a4 100644 --- a/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs +++ b/BizHawk.Client.EmuHawk/tools/PCE/PCECDL.cs @@ -105,7 +105,7 @@ namespace BizHawk.Client.EmuHawk CdlTextbox.Lines = lines.ToArray(); } - public bool AskSave() + public bool AskSaveChanges() { return true; } diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs index e927cf66c4..fbde34e884 100644 --- a/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs +++ b/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs @@ -169,7 +169,7 @@ namespace BizHawk.Client.EmuHawk { } - public bool AskSave() + public bool AskSaveChanges() { return true; } diff --git a/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs b/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs index 80f3ca05d3..0899245bdb 100644 --- a/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/PCE/PCETileViewer.cs @@ -168,7 +168,7 @@ namespace BizHawk.Client.EmuHawk checkBoxVDC2_CheckedChanged(null, null); } - public bool AskSave() + public bool AskSaveChanges() { return true; } diff --git a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs index 5224d8f5f6..9105897061 100644 --- a/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs +++ b/BizHawk.Client.EmuHawk/tools/SMS/VDPViewer.cs @@ -167,7 +167,7 @@ namespace BizHawk.Client.EmuHawk UpdateValues(); } - public bool AskSave() + public bool AskSaveChanges() { return true; } diff --git a/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs index b8f3e437ec..846ff12197 100644 --- a/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs +++ b/BizHawk.Client.EmuHawk/tools/SNES/SNESGameGenie.cs @@ -59,7 +59,7 @@ namespace BizHawk.Client.EmuHawk #region Public API - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return false; } } public void Restart() { diff --git a/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs b/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs index f78860dbaa..fc76acfb76 100644 --- a/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs +++ b/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs @@ -44,7 +44,7 @@ namespace BizHawk.Client.EmuHawk List displayTypeItems = new List(); public bool UpdateBefore { get { return false; } } - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public void Restart() { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index efd061b057..65653139b6 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -30,107 +30,107 @@ namespace BizHawk.Client.EmuHawk /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TAStudio)); - this.TASMenu = new MenuStripEx(); - this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.NewTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OpenTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveAsTASMenuItem = 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(); - this.ToBk2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EditSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.UndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RedoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectionUndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectionRedoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); - this.DeselectMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SelectBetweenMarkersMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ReselectClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); - this.CopyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PasteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PasteInsertMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CutMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); - this.ClearMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DeleteFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CloneMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InsertFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.InsertNumFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); - this.TruncateMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.SetMaxUndoLevelsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.AutofirePatternSkipsLagMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); - this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CombineConsecutiveRecordingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.UseInputKeysItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.BindMarkersToInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.EmptyNewMarkerNotesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); - this.BranchesRestoreEntireMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OsdInBranchScreenshotsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); - this.AutopauseAtEndOfMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MetaSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.HeaderMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.GreenzoneSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.CommentsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SettingsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AutoloadProjectMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); - this.RestoreDefaultSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.EnableTooltipsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); - this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TasView = new BizHawk.Client.EmuHawk.TasListView(); - this.Frame = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.Log = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.TasStatusStrip = new StatusStripEx(); - this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox(); - this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl(); - this.TASMenu.SuspendLayout(); - this.TasStatusStrip.SuspendLayout(); - this.SuspendLayout(); - // - // TASMenu - // - this.TASMenu.ClickThrough = true; - this.TASMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TAStudio)); + this.TASMenu = new MenuStripEx(); + this.FileSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.NewTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OpenTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveTASMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveAsTASMenuItem = 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(); + this.ToBk2MenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.EditSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.UndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RedoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectionUndoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectionRedoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); + this.DeselectMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectAllMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SelectBetweenMarkersMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ReselectClipboardMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); + this.CopyMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PasteMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PasteInsertMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CutMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); + this.ClearMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DeleteFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CloneMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.InsertFrameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.InsertNumFramesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); + this.TruncateMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ConfigSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.SetMaxUndoLevelsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); + this.AutofirePatternSkipsLagMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AutoadjustInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator11 = new System.Windows.Forms.ToolStripSeparator(); + this.DrawInputByDraggingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CombineConsecutiveRecordingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.UseInputKeysItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.BindMarkersToInputMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.EmptyNewMarkerNotesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator(); + this.BranchesRestoreEntireMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OsdInBranchScreenshotsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator(); + this.AutopauseAtEndOfMovieMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MetaSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.HeaderMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.GreenzoneSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.CommentsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SubtitlesMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SettingsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AutoloadProjectMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator(); + this.RestoreDefaultSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.HelpSubMenu = new System.Windows.Forms.ToolStripMenuItem(); + this.EnableTooltipsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); + this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.TasView = new BizHawk.Client.EmuHawk.TasListView(); + this.Frame = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.Log = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.TasStatusStrip = new StatusStripEx(); + this.MessageStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.SplicerStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.TasPlaybackBox = new BizHawk.Client.EmuHawk.PlaybackBox(); + this.MarkerControl = new BizHawk.Client.EmuHawk.MarkerControl(); + this.TASMenu.SuspendLayout(); + this.TasStatusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // TASMenu + // + this.TASMenu.ClickThrough = true; + this.TASMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FileSubMenu, this.EditSubMenu, this.ConfigSubMenu, this.MetaSubMenu, this.SettingsSubMenu, this.HelpSubMenu}); - this.TASMenu.Location = new System.Drawing.Point(0, 0); - this.TASMenu.Name = "TASMenu"; - this.TASMenu.Size = new System.Drawing.Size(506, 24); - this.TASMenu.TabIndex = 0; - this.TASMenu.Text = "menuStrip1"; - // - // FileSubMenu - // - this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.TASMenu.Location = new System.Drawing.Point(0, 0); + this.TASMenu.Name = "TASMenu"; + this.TASMenu.Size = new System.Drawing.Size(506, 24); + this.TASMenu.TabIndex = 0; + this.TASMenu.Text = "menuStrip1"; + // + // FileSubMenu + // + this.FileSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.NewTASMenuItem, this.OpenTASMenuItem, this.SaveTASMenuItem, @@ -140,87 +140,87 @@ namespace BizHawk.Client.EmuHawk this.ToBk2MenuItem, this.toolStripSeparator2, this.ExitMenuItem}); - this.FileSubMenu.Name = "FileSubMenu"; - this.FileSubMenu.Size = new System.Drawing.Size(37, 20); - this.FileSubMenu.Text = "&File"; - this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); - // - // NewTASMenuItem - // - 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(186, 22); - this.NewTASMenuItem.Text = "&New"; - this.NewTASMenuItem.Click += new System.EventHandler(this.NewTasMenuItem_Click); - // - // OpenTASMenuItem - // - 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(186, 22); - this.OpenTASMenuItem.Text = "&Open"; - this.OpenTASMenuItem.Click += new System.EventHandler(this.OpenTasMenuItem_Click); - // - // SaveTASMenuItem - // - 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(186, 22); - this.SaveTASMenuItem.Text = "&Save"; - this.SaveTASMenuItem.Click += new System.EventHandler(this.SaveTasMenuItem_Click); - // - // SaveAsTASMenuItem - // - this.SaveAsTASMenuItem.Name = "SaveAsTASMenuItem"; - this.SaveAsTASMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.FileSubMenu.Name = "FileSubMenu"; + this.FileSubMenu.Size = new System.Drawing.Size(37, 20); + this.FileSubMenu.Text = "&File"; + this.FileSubMenu.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened); + // + // NewTASMenuItem + // + 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(186, 22); + this.NewTASMenuItem.Text = "&New"; + this.NewTASMenuItem.Click += new System.EventHandler(this.NewTasMenuItem_Click); + // + // OpenTASMenuItem + // + 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(186, 22); + this.OpenTASMenuItem.Text = "&Open"; + this.OpenTASMenuItem.Click += new System.EventHandler(this.OpenTasMenuItem_Click); + // + // SaveTASMenuItem + // + 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(186, 22); + this.SaveTASMenuItem.Text = "&Save"; + this.SaveTASMenuItem.Click += new System.EventHandler(this.SaveTasMenuItem_Click); + // + // 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.Size = new System.Drawing.Size(186, 22); - this.SaveAsTASMenuItem.Text = "Save As"; - this.SaveAsTASMenuItem.Click += new System.EventHandler(this.SaveAsTasMenuItem_Click); - // - // RecentSubMenu - // - this.RecentSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SaveAsTASMenuItem.Size = new System.Drawing.Size(186, 22); + this.SaveAsTASMenuItem.Text = "Save As"; + this.SaveAsTASMenuItem.Click += new System.EventHandler(this.SaveAsTasMenuItem_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(186, 22); - this.RecentSubMenu.Text = "Recent"; - this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(183, 6); - // - // ToBk2MenuItem - // - this.ToBk2MenuItem.Name = "ToBk2MenuItem"; - this.ToBk2MenuItem.Size = new System.Drawing.Size(186, 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(183, 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(186, 22); - this.ExitMenuItem.Text = "E&xit"; - this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); - // - // EditSubMenu - // - this.EditSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.RecentSubMenu.Image = ((System.Drawing.Image)(resources.GetObject("RecentSubMenu.Image"))); + this.RecentSubMenu.Name = "RecentSubMenu"; + this.RecentSubMenu.Size = new System.Drawing.Size(186, 22); + this.RecentSubMenu.Text = "Recent"; + this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(57, 6); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(183, 6); + // + // ToBk2MenuItem + // + this.ToBk2MenuItem.Name = "ToBk2MenuItem"; + this.ToBk2MenuItem.Size = new System.Drawing.Size(186, 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(183, 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(186, 22); + this.ExitMenuItem.Text = "E&xit"; + this.ExitMenuItem.Click += new System.EventHandler(this.ExitMenuItem_Click); + // + // EditSubMenu + // + this.EditSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.UndoMenuItem, this.RedoMenuItem, this.SelectionUndoMenuItem, @@ -243,180 +243,180 @@ namespace BizHawk.Client.EmuHawk this.InsertNumFramesMenuItem, this.toolStripSeparator6, this.TruncateMenuItem}); - this.EditSubMenu.Name = "EditSubMenu"; - this.EditSubMenu.Size = new System.Drawing.Size(39, 20); - this.EditSubMenu.Text = "&Edit"; - this.EditSubMenu.DropDownOpened += new System.EventHandler(this.EditSubMenu_DropDownOpened); - // - // UndoMenuItem - // - this.UndoMenuItem.Enabled = false; - 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(272, 22); - this.UndoMenuItem.Text = "&Undo"; - // - // RedoMenuItem - // - 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(272, 22); - this.RedoMenuItem.Text = "&Redo"; - // - // SelectionUndoMenuItem - // - 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(272, 22); - this.SelectionUndoMenuItem.Text = "Selection Undo"; - // - // SelectionRedoMenuItem - // - 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(272, 22); - this.SelectionRedoMenuItem.Text = "Selection Redo"; - // - // toolStripSeparator5 - // - this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(269, 6); - // - // DeselectMenuItem - // - this.DeselectMenuItem.Name = "DeselectMenuItem"; - this.DeselectMenuItem.Size = new System.Drawing.Size(272, 22); - this.DeselectMenuItem.Text = "Deselect"; - this.DeselectMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click); - // - // SelectAllMenuItem - // - this.SelectAllMenuItem.Name = "SelectAllMenuItem"; - this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; - this.SelectAllMenuItem.Size = new System.Drawing.Size(272, 22); - this.SelectAllMenuItem.Text = "Select &All"; - this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); - // - // SelectBetweenMarkersMenuItem - // - this.SelectBetweenMarkersMenuItem.Name = "SelectBetweenMarkersMenuItem"; - this.SelectBetweenMarkersMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.EditSubMenu.Name = "EditSubMenu"; + this.EditSubMenu.Size = new System.Drawing.Size(39, 20); + this.EditSubMenu.Text = "&Edit"; + this.EditSubMenu.DropDownOpened += new System.EventHandler(this.EditSubMenu_DropDownOpened); + // + // UndoMenuItem + // + this.UndoMenuItem.Enabled = false; + 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(272, 22); + this.UndoMenuItem.Text = "&Undo"; + // + // RedoMenuItem + // + 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(272, 22); + this.RedoMenuItem.Text = "&Redo"; + // + // SelectionUndoMenuItem + // + 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(272, 22); + this.SelectionUndoMenuItem.Text = "Selection Undo"; + // + // SelectionRedoMenuItem + // + 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(272, 22); + this.SelectionRedoMenuItem.Text = "Selection Redo"; + // + // toolStripSeparator5 + // + this.toolStripSeparator5.Name = "toolStripSeparator5"; + this.toolStripSeparator5.Size = new System.Drawing.Size(269, 6); + // + // DeselectMenuItem + // + this.DeselectMenuItem.Name = "DeselectMenuItem"; + this.DeselectMenuItem.Size = new System.Drawing.Size(272, 22); + this.DeselectMenuItem.Text = "Deselect"; + this.DeselectMenuItem.Click += new System.EventHandler(this.DeselectMenuItem_Click); + // + // SelectAllMenuItem + // + this.SelectAllMenuItem.Name = "SelectAllMenuItem"; + this.SelectAllMenuItem.ShortcutKeyDisplayString = "Ctrl+A"; + this.SelectAllMenuItem.Size = new System.Drawing.Size(272, 22); + this.SelectAllMenuItem.Text = "Select &All"; + this.SelectAllMenuItem.Click += new System.EventHandler(this.SelectAllMenuItem_Click); + // + // SelectBetweenMarkersMenuItem + // + this.SelectBetweenMarkersMenuItem.Name = "SelectBetweenMarkersMenuItem"; + this.SelectBetweenMarkersMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.A))); - this.SelectBetweenMarkersMenuItem.Size = new System.Drawing.Size(272, 22); - this.SelectBetweenMarkersMenuItem.Text = "Select between Markers"; - this.SelectBetweenMarkersMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click); - // - // ReselectClipboardMenuItem - // - 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(272, 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(269, 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(272, 22); - this.CopyMenuItem.Text = "Copy"; - this.CopyMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click); - // - // PasteMenuItem - // - 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(272, 22); - this.PasteMenuItem.Text = "&Paste"; - this.PasteMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click); - // - // PasteInsertMenuItem - // - this.PasteInsertMenuItem.Name = "PasteInsertMenuItem"; - this.PasteInsertMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.SelectBetweenMarkersMenuItem.Size = new System.Drawing.Size(272, 22); + this.SelectBetweenMarkersMenuItem.Text = "Select between Markers"; + this.SelectBetweenMarkersMenuItem.Click += new System.EventHandler(this.SelectBetweenMarkersMenuItem_Click); + // + // ReselectClipboardMenuItem + // + 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(272, 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(269, 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(272, 22); + this.CopyMenuItem.Text = "Copy"; + this.CopyMenuItem.Click += new System.EventHandler(this.CopyMenuItem_Click); + // + // PasteMenuItem + // + 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(272, 22); + this.PasteMenuItem.Text = "&Paste"; + this.PasteMenuItem.Click += new System.EventHandler(this.PasteMenuItem_Click); + // + // 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.Size = new System.Drawing.Size(272, 22); - this.PasteInsertMenuItem.Text = "&Paste Insert"; - this.PasteInsertMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click); - // - // CutMenuItem - // - 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(272, 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(269, 6); - // - // ClearMenuItem - // - this.ClearMenuItem.Name = "ClearMenuItem"; - this.ClearMenuItem.ShortcutKeyDisplayString = ""; - this.ClearMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); - this.ClearMenuItem.Size = new System.Drawing.Size(272, 22); - this.ClearMenuItem.Text = "Clear"; - this.ClearMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click); - // - // DeleteFramesMenuItem - // - this.DeleteFramesMenuItem.Name = "DeleteFramesMenuItem"; - this.DeleteFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; - this.DeleteFramesMenuItem.Size = new System.Drawing.Size(272, 22); - this.DeleteFramesMenuItem.Text = "&Delete"; - this.DeleteFramesMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); - // - // CloneMenuItem - // - 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(272, 22); - this.CloneMenuItem.Text = "&Clone"; - this.CloneMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click); - // - // InsertFrameMenuItem - // - this.InsertFrameMenuItem.Name = "InsertFrameMenuItem"; - this.InsertFrameMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) + this.PasteInsertMenuItem.Size = new System.Drawing.Size(272, 22); + this.PasteInsertMenuItem.Text = "&Paste Insert"; + this.PasteInsertMenuItem.Click += new System.EventHandler(this.PasteInsertMenuItem_Click); + // + // CutMenuItem + // + 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(272, 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(269, 6); + // + // ClearMenuItem + // + this.ClearMenuItem.Name = "ClearMenuItem"; + this.ClearMenuItem.ShortcutKeyDisplayString = ""; + this.ClearMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); + this.ClearMenuItem.Size = new System.Drawing.Size(272, 22); + this.ClearMenuItem.Text = "Clear"; + this.ClearMenuItem.Click += new System.EventHandler(this.ClearMenuItem_Click); + // + // DeleteFramesMenuItem + // + this.DeleteFramesMenuItem.Name = "DeleteFramesMenuItem"; + this.DeleteFramesMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; + this.DeleteFramesMenuItem.Size = new System.Drawing.Size(272, 22); + this.DeleteFramesMenuItem.Text = "&Delete"; + this.DeleteFramesMenuItem.Click += new System.EventHandler(this.DeleteFramesMenuItem_Click); + // + // CloneMenuItem + // + 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(272, 22); + this.CloneMenuItem.Text = "&Clone"; + this.CloneMenuItem.Click += new System.EventHandler(this.CloneMenuItem_Click); + // + // InsertFrameMenuItem + // + this.InsertFrameMenuItem.Name = "InsertFrameMenuItem"; + this.InsertFrameMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.Insert))); - this.InsertFrameMenuItem.Size = new System.Drawing.Size(272, 22); - this.InsertFrameMenuItem.Text = "&Insert"; - this.InsertFrameMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); - // - // InsertNumFramesMenuItem - // - this.InsertNumFramesMenuItem.Name = "InsertNumFramesMenuItem"; - this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = "Ins"; - this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(272, 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(269, 6); - // - // TruncateMenuItem - // - this.TruncateMenuItem.Name = "TruncateMenuItem"; - this.TruncateMenuItem.Size = new System.Drawing.Size(272, 22); - this.TruncateMenuItem.Text = "&Truncate Movie"; - this.TruncateMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); - // - // ConfigSubMenu - // - this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.InsertFrameMenuItem.Size = new System.Drawing.Size(272, 22); + this.InsertFrameMenuItem.Text = "&Insert"; + this.InsertFrameMenuItem.Click += new System.EventHandler(this.InsertFrameMenuItem_Click); + // + // InsertNumFramesMenuItem + // + this.InsertNumFramesMenuItem.Name = "InsertNumFramesMenuItem"; + this.InsertNumFramesMenuItem.ShortcutKeyDisplayString = "Ins"; + this.InsertNumFramesMenuItem.Size = new System.Drawing.Size(272, 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(269, 6); + // + // TruncateMenuItem + // + this.TruncateMenuItem.Name = "TruncateMenuItem"; + this.TruncateMenuItem.Size = new System.Drawing.Size(272, 22); + this.TruncateMenuItem.Text = "&Truncate Movie"; + this.TruncateMenuItem.Click += new System.EventHandler(this.TruncateMenuItem_Click); + // + // ConfigSubMenu + // + this.ConfigSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.SetMaxUndoLevelsMenuItem, this.toolStripSeparator9, this.AutofirePatternSkipsLagMenuItem, @@ -433,155 +433,155 @@ namespace BizHawk.Client.EmuHawk this.OsdInBranchScreenshotsMenuItem, this.toolStripSeparator14, this.AutopauseAtEndOfMovieMenuItem}); - this.ConfigSubMenu.Name = "ConfigSubMenu"; - this.ConfigSubMenu.Size = new System.Drawing.Size(55, 20); - this.ConfigSubMenu.Text = "&Config"; - this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened); - // - // SetMaxUndoLevelsMenuItem - // - this.SetMaxUndoLevelsMenuItem.Enabled = false; - this.SetMaxUndoLevelsMenuItem.Name = "SetMaxUndoLevelsMenuItem"; - this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(288, 22); - this.SetMaxUndoLevelsMenuItem.Text = "Set max Undo Levels"; - // - // toolStripSeparator9 - // - this.toolStripSeparator9.Name = "toolStripSeparator9"; - this.toolStripSeparator9.Size = new System.Drawing.Size(285, 6); - // - // AutofirePatternSkipsLagMenuItem - // - this.AutofirePatternSkipsLagMenuItem.Enabled = false; - this.AutofirePatternSkipsLagMenuItem.Name = "AutofirePatternSkipsLagMenuItem"; - this.AutofirePatternSkipsLagMenuItem.Size = new System.Drawing.Size(288, 22); - this.AutofirePatternSkipsLagMenuItem.Text = "Autofire Pattern skips Lag"; - // - // AutoadjustInputMenuItem - // - this.AutoadjustInputMenuItem.Enabled = false; - this.AutoadjustInputMenuItem.Name = "AutoadjustInputMenuItem"; - this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(288, 22); - this.AutoadjustInputMenuItem.Text = "Auto-adjust Input according to Lag"; - // - // toolStripSeparator11 - // - this.toolStripSeparator11.Name = "toolStripSeparator11"; - this.toolStripSeparator11.Size = new System.Drawing.Size(285, 6); - // - // DrawInputByDraggingMenuItem - // - this.DrawInputByDraggingMenuItem.Name = "DrawInputByDraggingMenuItem"; - this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(288, 22); - this.DrawInputByDraggingMenuItem.Text = "Draw Input by dragging"; - this.DrawInputByDraggingMenuItem.Click += new System.EventHandler(this.DrawInputByDraggingMenuItem_Click); - // - // CombineConsecutiveRecordingsMenuItem - // - this.CombineConsecutiveRecordingsMenuItem.Enabled = false; - this.CombineConsecutiveRecordingsMenuItem.Name = "CombineConsecutiveRecordingsMenuItem"; - this.CombineConsecutiveRecordingsMenuItem.Size = new System.Drawing.Size(288, 22); - this.CombineConsecutiveRecordingsMenuItem.Text = "Combine consecutive Recordings/Draws"; - // - // UseInputKeysItem - // - this.UseInputKeysItem.Enabled = false; - this.UseInputKeysItem.Name = "UseInputKeysItem"; - this.UseInputKeysItem.Size = new System.Drawing.Size(288, 22); - this.UseInputKeysItem.Text = "Use Input keys for Column Set"; - // - // toolStripSeparator4 - // - this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(285, 6); - // - // BindMarkersToInputMenuItem - // - this.BindMarkersToInputMenuItem.Enabled = false; - this.BindMarkersToInputMenuItem.Name = "BindMarkersToInputMenuItem"; - this.BindMarkersToInputMenuItem.Size = new System.Drawing.Size(288, 22); - this.BindMarkersToInputMenuItem.Text = "Bind Markers to Input"; - // - // EmptyNewMarkerNotesMenuItem - // - this.EmptyNewMarkerNotesMenuItem.Enabled = false; - this.EmptyNewMarkerNotesMenuItem.Name = "EmptyNewMarkerNotesMenuItem"; - this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(288, 22); - this.EmptyNewMarkerNotesMenuItem.Text = "Empty new Marker Notes"; - // - // toolStripSeparator13 - // - this.toolStripSeparator13.Name = "toolStripSeparator13"; - this.toolStripSeparator13.Size = new System.Drawing.Size(285, 6); - // - // BranchesRestoreEntireMovieMenuItem - // - this.BranchesRestoreEntireMovieMenuItem.Enabled = false; - this.BranchesRestoreEntireMovieMenuItem.Name = "BranchesRestoreEntireMovieMenuItem"; - this.BranchesRestoreEntireMovieMenuItem.Size = new System.Drawing.Size(288, 22); - this.BranchesRestoreEntireMovieMenuItem.Text = "Branches restore entire Movie"; - // - // OsdInBranchScreenshotsMenuItem - // - this.OsdInBranchScreenshotsMenuItem.Enabled = false; - this.OsdInBranchScreenshotsMenuItem.Name = "OsdInBranchScreenshotsMenuItem"; - this.OsdInBranchScreenshotsMenuItem.Size = new System.Drawing.Size(288, 22); - this.OsdInBranchScreenshotsMenuItem.Text = "OSD in Branch screenshots"; - // - // toolStripSeparator14 - // - this.toolStripSeparator14.Name = "toolStripSeparator14"; - this.toolStripSeparator14.Size = new System.Drawing.Size(285, 6); - // - // AutopauseAtEndOfMovieMenuItem - // - this.AutopauseAtEndOfMovieMenuItem.Enabled = false; - this.AutopauseAtEndOfMovieMenuItem.Name = "AutopauseAtEndOfMovieMenuItem"; - this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(288, 22); - this.AutopauseAtEndOfMovieMenuItem.Text = "Autopause at end of Movie"; - // - // MetaSubMenu - // - this.MetaSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.ConfigSubMenu.Name = "ConfigSubMenu"; + this.ConfigSubMenu.Size = new System.Drawing.Size(55, 20); + this.ConfigSubMenu.Text = "&Config"; + this.ConfigSubMenu.DropDownOpened += new System.EventHandler(this.ConfigSubMenu_DropDownOpened); + // + // SetMaxUndoLevelsMenuItem + // + this.SetMaxUndoLevelsMenuItem.Enabled = false; + this.SetMaxUndoLevelsMenuItem.Name = "SetMaxUndoLevelsMenuItem"; + this.SetMaxUndoLevelsMenuItem.Size = new System.Drawing.Size(288, 22); + this.SetMaxUndoLevelsMenuItem.Text = "Set max Undo Levels"; + // + // toolStripSeparator9 + // + this.toolStripSeparator9.Name = "toolStripSeparator9"; + this.toolStripSeparator9.Size = new System.Drawing.Size(285, 6); + // + // AutofirePatternSkipsLagMenuItem + // + this.AutofirePatternSkipsLagMenuItem.Enabled = false; + this.AutofirePatternSkipsLagMenuItem.Name = "AutofirePatternSkipsLagMenuItem"; + this.AutofirePatternSkipsLagMenuItem.Size = new System.Drawing.Size(288, 22); + this.AutofirePatternSkipsLagMenuItem.Text = "Autofire Pattern skips Lag"; + // + // AutoadjustInputMenuItem + // + this.AutoadjustInputMenuItem.Enabled = false; + this.AutoadjustInputMenuItem.Name = "AutoadjustInputMenuItem"; + this.AutoadjustInputMenuItem.Size = new System.Drawing.Size(288, 22); + this.AutoadjustInputMenuItem.Text = "Auto-adjust Input according to Lag"; + // + // toolStripSeparator11 + // + this.toolStripSeparator11.Name = "toolStripSeparator11"; + this.toolStripSeparator11.Size = new System.Drawing.Size(285, 6); + // + // DrawInputByDraggingMenuItem + // + this.DrawInputByDraggingMenuItem.Name = "DrawInputByDraggingMenuItem"; + this.DrawInputByDraggingMenuItem.Size = new System.Drawing.Size(288, 22); + this.DrawInputByDraggingMenuItem.Text = "Draw Input by dragging"; + this.DrawInputByDraggingMenuItem.Click += new System.EventHandler(this.DrawInputByDraggingMenuItem_Click); + // + // CombineConsecutiveRecordingsMenuItem + // + this.CombineConsecutiveRecordingsMenuItem.Enabled = false; + this.CombineConsecutiveRecordingsMenuItem.Name = "CombineConsecutiveRecordingsMenuItem"; + this.CombineConsecutiveRecordingsMenuItem.Size = new System.Drawing.Size(288, 22); + this.CombineConsecutiveRecordingsMenuItem.Text = "Combine consecutive Recordings/Draws"; + // + // UseInputKeysItem + // + this.UseInputKeysItem.Enabled = false; + this.UseInputKeysItem.Name = "UseInputKeysItem"; + this.UseInputKeysItem.Size = new System.Drawing.Size(288, 22); + this.UseInputKeysItem.Text = "Use Input keys for Column Set"; + // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(285, 6); + // + // BindMarkersToInputMenuItem + // + this.BindMarkersToInputMenuItem.Enabled = false; + this.BindMarkersToInputMenuItem.Name = "BindMarkersToInputMenuItem"; + this.BindMarkersToInputMenuItem.Size = new System.Drawing.Size(288, 22); + this.BindMarkersToInputMenuItem.Text = "Bind Markers to Input"; + // + // EmptyNewMarkerNotesMenuItem + // + this.EmptyNewMarkerNotesMenuItem.Enabled = false; + this.EmptyNewMarkerNotesMenuItem.Name = "EmptyNewMarkerNotesMenuItem"; + this.EmptyNewMarkerNotesMenuItem.Size = new System.Drawing.Size(288, 22); + this.EmptyNewMarkerNotesMenuItem.Text = "Empty new Marker Notes"; + // + // toolStripSeparator13 + // + this.toolStripSeparator13.Name = "toolStripSeparator13"; + this.toolStripSeparator13.Size = new System.Drawing.Size(285, 6); + // + // BranchesRestoreEntireMovieMenuItem + // + this.BranchesRestoreEntireMovieMenuItem.Enabled = false; + this.BranchesRestoreEntireMovieMenuItem.Name = "BranchesRestoreEntireMovieMenuItem"; + this.BranchesRestoreEntireMovieMenuItem.Size = new System.Drawing.Size(288, 22); + this.BranchesRestoreEntireMovieMenuItem.Text = "Branches restore entire Movie"; + // + // OsdInBranchScreenshotsMenuItem + // + this.OsdInBranchScreenshotsMenuItem.Enabled = false; + this.OsdInBranchScreenshotsMenuItem.Name = "OsdInBranchScreenshotsMenuItem"; + this.OsdInBranchScreenshotsMenuItem.Size = new System.Drawing.Size(288, 22); + this.OsdInBranchScreenshotsMenuItem.Text = "OSD in Branch screenshots"; + // + // toolStripSeparator14 + // + this.toolStripSeparator14.Name = "toolStripSeparator14"; + this.toolStripSeparator14.Size = new System.Drawing.Size(285, 6); + // + // AutopauseAtEndOfMovieMenuItem + // + this.AutopauseAtEndOfMovieMenuItem.Enabled = false; + this.AutopauseAtEndOfMovieMenuItem.Name = "AutopauseAtEndOfMovieMenuItem"; + this.AutopauseAtEndOfMovieMenuItem.Size = new System.Drawing.Size(288, 22); + this.AutopauseAtEndOfMovieMenuItem.Text = "Autopause at end of Movie"; + // + // MetaSubMenu + // + this.MetaSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.HeaderMenuItem, this.GreenzoneSettingsMenuItem, this.CommentsMenuItem, this.SubtitlesMenuItem}); - this.MetaSubMenu.Name = "MetaSubMenu"; - this.MetaSubMenu.Size = new System.Drawing.Size(69, 20); - this.MetaSubMenu.Text = "&Metadata"; - // - // HeaderMenuItem - // - this.HeaderMenuItem.Name = "HeaderMenuItem"; - this.HeaderMenuItem.Size = new System.Drawing.Size(184, 22); - this.HeaderMenuItem.Text = "&Header..."; - this.HeaderMenuItem.Click += new System.EventHandler(this.HeaderMenuItem_Click); - // - // GreenzoneSettingsMenuItem - // - this.GreenzoneSettingsMenuItem.Name = "GreenzoneSettingsMenuItem"; - this.GreenzoneSettingsMenuItem.Size = new System.Drawing.Size(184, 22); - this.GreenzoneSettingsMenuItem.Text = "&Greenzone Settings..."; - this.GreenzoneSettingsMenuItem.Click += new System.EventHandler(this.GreenzoneSettingsMenuItem_Click); - // - // CommentsMenuItem - // - this.CommentsMenuItem.Name = "CommentsMenuItem"; - this.CommentsMenuItem.Size = new System.Drawing.Size(184, 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(184, 22); - this.SubtitlesMenuItem.Text = "&Subtitles..."; - this.SubtitlesMenuItem.Click += new System.EventHandler(this.SubtitlesMenuItem_Click); - // - // SettingsSubMenu - // - this.SettingsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.MetaSubMenu.Name = "MetaSubMenu"; + this.MetaSubMenu.Size = new System.Drawing.Size(69, 20); + this.MetaSubMenu.Text = "&Metadata"; + // + // HeaderMenuItem + // + this.HeaderMenuItem.Name = "HeaderMenuItem"; + this.HeaderMenuItem.Size = new System.Drawing.Size(184, 22); + this.HeaderMenuItem.Text = "&Header..."; + this.HeaderMenuItem.Click += new System.EventHandler(this.HeaderMenuItem_Click); + // + // GreenzoneSettingsMenuItem + // + this.GreenzoneSettingsMenuItem.Name = "GreenzoneSettingsMenuItem"; + this.GreenzoneSettingsMenuItem.Size = new System.Drawing.Size(184, 22); + this.GreenzoneSettingsMenuItem.Text = "&Greenzone Settings..."; + this.GreenzoneSettingsMenuItem.Click += new System.EventHandler(this.GreenzoneSettingsMenuItem_Click); + // + // CommentsMenuItem + // + this.CommentsMenuItem.Name = "CommentsMenuItem"; + this.CommentsMenuItem.Size = new System.Drawing.Size(184, 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(184, 22); + this.SubtitlesMenuItem.Text = "&Subtitles..."; + this.SubtitlesMenuItem.Click += new System.EventHandler(this.SubtitlesMenuItem_Click); + // + // SettingsSubMenu + // + this.SettingsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.AutoloadMenuItem, this.AutoloadProjectMenuItem, this.SaveWindowPositionMenuItem, @@ -589,194 +589,196 @@ namespace BizHawk.Client.EmuHawk this.FloatingWindowMenuItem, this.toolStripSeparator12, this.RestoreDefaultSettingsMenuItem}); - this.SettingsSubMenu.Name = "SettingsSubMenu"; - this.SettingsSubMenu.Size = new System.Drawing.Size(61, 20); - this.SettingsSubMenu.Text = "&Settings"; - this.SettingsSubMenu.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened); - // - // AutoloadMenuItem - // - this.AutoloadMenuItem.Name = "AutoloadMenuItem"; - this.AutoloadMenuItem.Size = new System.Drawing.Size(199, 22); - this.AutoloadMenuItem.Text = "Autoload"; - this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click); - // - // AutoloadProjectMenuItem - // - this.AutoloadProjectMenuItem.Name = "AutoloadProjectMenuItem"; - this.AutoloadProjectMenuItem.Size = new System.Drawing.Size(199, 22); - this.AutoloadProjectMenuItem.Text = "Autload &Project"; - this.AutoloadProjectMenuItem.Click += new System.EventHandler(this.AutoloadProjectMenuItem_Click); - // - // SaveWindowPositionMenuItem - // - this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22); - this.SaveWindowPositionMenuItem.Text = "Save Window Position"; - this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); - // - // AlwaysOnTopMenuItem - // - this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; - this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(199, 22); - this.AlwaysOnTopMenuItem.Text = "Always On Top"; - this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); - // - // FloatingWindowMenuItem - // - this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; - this.FloatingWindowMenuItem.Size = new System.Drawing.Size(199, 22); - this.FloatingWindowMenuItem.Text = "Floating Window"; - this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); - // - // toolStripSeparator12 - // - this.toolStripSeparator12.Name = "toolStripSeparator12"; - this.toolStripSeparator12.Size = new System.Drawing.Size(196, 6); - // - // RestoreDefaultSettingsMenuItem - // - this.RestoreDefaultSettingsMenuItem.Name = "RestoreDefaultSettingsMenuItem"; - this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(199, 22); - this.RestoreDefaultSettingsMenuItem.Text = "Restore Default Settings"; - this.RestoreDefaultSettingsMenuItem.Click += new System.EventHandler(this.RestoreDefaultSettingsMenuItem_Click); - // - // HelpSubMenu - // - this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SettingsSubMenu.Name = "SettingsSubMenu"; + this.SettingsSubMenu.Size = new System.Drawing.Size(61, 20); + this.SettingsSubMenu.Text = "&Settings"; + this.SettingsSubMenu.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened); + // + // AutoloadMenuItem + // + this.AutoloadMenuItem.Name = "AutoloadMenuItem"; + this.AutoloadMenuItem.Size = new System.Drawing.Size(199, 22); + this.AutoloadMenuItem.Text = "Autoload"; + this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click); + // + // AutoloadProjectMenuItem + // + this.AutoloadProjectMenuItem.Name = "AutoloadProjectMenuItem"; + this.AutoloadProjectMenuItem.Size = new System.Drawing.Size(199, 22); + this.AutoloadProjectMenuItem.Text = "Autload &Project"; + this.AutoloadProjectMenuItem.Click += new System.EventHandler(this.AutoloadProjectMenuItem_Click); + // + // SaveWindowPositionMenuItem + // + this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; + this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22); + this.SaveWindowPositionMenuItem.Text = "Save Window Position"; + this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); + // + // AlwaysOnTopMenuItem + // + this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; + this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(199, 22); + this.AlwaysOnTopMenuItem.Text = "Always On Top"; + this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); + // + // FloatingWindowMenuItem + // + this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; + this.FloatingWindowMenuItem.Size = new System.Drawing.Size(199, 22); + this.FloatingWindowMenuItem.Text = "Floating Window"; + this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); + // + // toolStripSeparator12 + // + this.toolStripSeparator12.Name = "toolStripSeparator12"; + this.toolStripSeparator12.Size = new System.Drawing.Size(196, 6); + // + // RestoreDefaultSettingsMenuItem + // + this.RestoreDefaultSettingsMenuItem.Name = "RestoreDefaultSettingsMenuItem"; + this.RestoreDefaultSettingsMenuItem.Size = new System.Drawing.Size(199, 22); + this.RestoreDefaultSettingsMenuItem.Text = "Restore Default Settings"; + this.RestoreDefaultSettingsMenuItem.Click += new System.EventHandler(this.RestoreDefaultSettingsMenuItem_Click); + // + // HelpSubMenu + // + this.HelpSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.EnableTooltipsMenuItem, this.toolStripSeparator10, this.aboutToolStripMenuItem}); - this.HelpSubMenu.Name = "HelpSubMenu"; - this.HelpSubMenu.Size = new System.Drawing.Size(44, 20); - this.HelpSubMenu.Text = "&Help"; - // - // EnableTooltipsMenuItem - // - this.EnableTooltipsMenuItem.Enabled = false; - this.EnableTooltipsMenuItem.Name = "EnableTooltipsMenuItem"; - this.EnableTooltipsMenuItem.Size = new System.Drawing.Size(155, 22); - this.EnableTooltipsMenuItem.Text = "&Enable Tooltips"; - // - // toolStripSeparator10 - // - this.toolStripSeparator10.Name = "toolStripSeparator10"; - this.toolStripSeparator10.Size = new System.Drawing.Size(152, 6); - // - // aboutToolStripMenuItem - // - this.aboutToolStripMenuItem.Enabled = false; - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(155, 22); - this.aboutToolStripMenuItem.Text = "&About"; - // - // TasView - // - this.TasView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + this.HelpSubMenu.Name = "HelpSubMenu"; + this.HelpSubMenu.Size = new System.Drawing.Size(44, 20); + this.HelpSubMenu.Text = "&Help"; + // + // EnableTooltipsMenuItem + // + this.EnableTooltipsMenuItem.Enabled = false; + this.EnableTooltipsMenuItem.Name = "EnableTooltipsMenuItem"; + this.EnableTooltipsMenuItem.Size = new System.Drawing.Size(155, 22); + this.EnableTooltipsMenuItem.Text = "&Enable Tooltips"; + // + // toolStripSeparator10 + // + this.toolStripSeparator10.Name = "toolStripSeparator10"; + this.toolStripSeparator10.Size = new System.Drawing.Size(152, 6); + // + // aboutToolStripMenuItem + // + this.aboutToolStripMenuItem.Enabled = false; + this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + this.aboutToolStripMenuItem.Size = new System.Drawing.Size(155, 22); + this.aboutToolStripMenuItem.Text = "&About"; + // + // TasView + // + 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.BlazingFast = false; - this.TasView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { + this.TasView.BlazingFast = false; + this.TasView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.Frame, this.Log}); - 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; - this.TasView.GridLines = true; - this.TasView.InputPaintingMode = false; - this.TasView.ItemCount = 0; - this.TasView.Location = new System.Drawing.Point(8, 27); - this.TasView.Name = "TasView"; - this.TasView.RightButtonHeld = false; - this.TasView.SelectAllInProgress = false; - this.TasView.selectedItem = -1; - this.TasView.Size = new System.Drawing.Size(288, 471); - this.TasView.TabIndex = 1; - this.TasView.UseCompatibleStateImageBehavior = false; - this.TasView.View = System.Windows.Forms.View.Details; - this.TasView.RightMouseScrolled += new BizHawk.Client.EmuHawk.TasListView.RightMouseScrollEventHandler(this.TasView_MouseWheel); - this.TasView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.TasView_ColumnClick); - this.TasView.SelectedIndexChanged += new System.EventHandler(this.TasView_SelectedIndexChanged); - this.TasView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TasView_KeyDown); - this.TasView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDoubleClick); - this.TasView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDown); - this.TasView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseUp); - // - // Frame - // - this.Frame.Text = "Frame"; - // - // Log - // - this.Log.Text = "Log"; - this.Log.Width = 222; - // - // TasStatusStrip - // - this.TasStatusStrip.ClickThrough = true; - this.TasStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + 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; + this.TasView.GridLines = true; + this.TasView.InputPaintingMode = false; + this.TasView.ItemCount = 0; + this.TasView.Location = new System.Drawing.Point(8, 27); + this.TasView.Name = "TasView"; + this.TasView.RightButtonHeld = false; + this.TasView.SelectAllInProgress = false; + this.TasView.selectedItem = -1; + this.TasView.Size = new System.Drawing.Size(288, 471); + this.TasView.TabIndex = 1; + this.TasView.UseCompatibleStateImageBehavior = false; + this.TasView.UseCustomBackground = true; + this.TasView.View = System.Windows.Forms.View.Details; + this.TasView.RightMouseScrolled += new BizHawk.Client.EmuHawk.TasListView.RightMouseScrollEventHandler(this.TasView_MouseWheel); + this.TasView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.TasView_ColumnClick); + this.TasView.SelectedIndexChanged += new System.EventHandler(this.TasView_SelectedIndexChanged); + this.TasView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.TasView_KeyDown); + this.TasView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDoubleClick); + this.TasView.MouseDown += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseDown); + this.TasView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.TasView_MouseUp); + // + // Frame + // + this.Frame.Text = "Frame"; + // + // Log + // + this.Log.Text = "Log"; + this.Log.Width = 222; + // + // TasStatusStrip + // + this.TasStatusStrip.ClickThrough = true; + this.TasStatusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MessageStatusLabel, this.SplicerStatusLabel}); - this.TasStatusStrip.Location = new System.Drawing.Point(0, 497); - this.TasStatusStrip.Name = "TasStatusStrip"; - this.TasStatusStrip.Size = new System.Drawing.Size(506, 22); - this.TasStatusStrip.TabIndex = 4; - this.TasStatusStrip.Text = "statusStrip1"; - // - // MessageStatusLabel - // - this.MessageStatusLabel.Name = "MessageStatusLabel"; - this.MessageStatusLabel.Size = new System.Drawing.Size(105, 17); - this.MessageStatusLabel.Text = "TAStudio engaged"; - // - // SplicerStatusLabel - // - this.SplicerStatusLabel.Name = "SplicerStatusLabel"; - this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0); - this.SplicerStatusLabel.Size = new System.Drawing.Size(175, 17); - this.SplicerStatusLabel.Text = "0 selected, clipboard: empty"; - // - // TasPlaybackBox - // - this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.TasPlaybackBox.Location = new System.Drawing.Point(302, 25); - this.TasPlaybackBox.Name = "TasPlaybackBox"; - this.TasPlaybackBox.Size = new System.Drawing.Size(204, 98); - this.TasPlaybackBox.TabIndex = 5; - this.TasPlaybackBox.Tastudio = null; - // - // MarkerControl - // - this.MarkerControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.MarkerControl.Location = new System.Drawing.Point(302, 129); - this.MarkerControl.Markers = null; - this.MarkerControl.Name = "MarkerControl"; - this.MarkerControl.Size = new System.Drawing.Size(204, 215); - this.MarkerControl.TabIndex = 6; - this.MarkerControl.Tastudio = null; - // - // TAStudio - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(506, 519); - this.Controls.Add(this.MarkerControl); - this.Controls.Add(this.TasPlaybackBox); - this.Controls.Add(this.TasStatusStrip); - this.Controls.Add(this.TASMenu); - this.Controls.Add(this.TasView); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.TASMenu; - this.MinimumSize = new System.Drawing.Size(437, 148); - this.Name = "TAStudio"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "TAStudio"; - this.Load += new System.EventHandler(this.Tastudio_Load); - this.TASMenu.ResumeLayout(false); - this.TASMenu.PerformLayout(); - this.TasStatusStrip.ResumeLayout(false); - this.TasStatusStrip.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + this.TasStatusStrip.Location = new System.Drawing.Point(0, 497); + this.TasStatusStrip.Name = "TasStatusStrip"; + this.TasStatusStrip.Size = new System.Drawing.Size(506, 22); + this.TasStatusStrip.TabIndex = 4; + this.TasStatusStrip.Text = "statusStrip1"; + // + // MessageStatusLabel + // + this.MessageStatusLabel.Name = "MessageStatusLabel"; + this.MessageStatusLabel.Size = new System.Drawing.Size(105, 17); + this.MessageStatusLabel.Text = "TAStudio engaged"; + // + // SplicerStatusLabel + // + this.SplicerStatusLabel.Name = "SplicerStatusLabel"; + this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0); + this.SplicerStatusLabel.Size = new System.Drawing.Size(175, 17); + this.SplicerStatusLabel.Text = "0 selected, clipboard: empty"; + // + // TasPlaybackBox + // + this.TasPlaybackBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.TasPlaybackBox.Location = new System.Drawing.Point(302, 25); + this.TasPlaybackBox.Name = "TasPlaybackBox"; + this.TasPlaybackBox.Size = new System.Drawing.Size(204, 98); + this.TasPlaybackBox.TabIndex = 5; + this.TasPlaybackBox.Tastudio = null; + // + // MarkerControl + // + this.MarkerControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.MarkerControl.Location = new System.Drawing.Point(302, 129); + this.MarkerControl.Markers = null; + this.MarkerControl.Name = "MarkerControl"; + this.MarkerControl.Size = new System.Drawing.Size(204, 215); + this.MarkerControl.TabIndex = 6; + this.MarkerControl.Tastudio = null; + // + // TAStudio + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(506, 519); + this.Controls.Add(this.MarkerControl); + this.Controls.Add(this.TasPlaybackBox); + this.Controls.Add(this.TasStatusStrip); + this.Controls.Add(this.TASMenu); + this.Controls.Add(this.TasView); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MainMenuStrip = this.TASMenu; + this.MinimumSize = new System.Drawing.Size(437, 148); + this.Name = "TAStudio"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "TAStudio"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Tastudio_Closing); + this.Load += new System.EventHandler(this.Tastudio_Load); + this.TASMenu.ResumeLayout(false); + this.TASMenu.PerformLayout(); + this.TasStatusStrip.ResumeLayout(false); + this.TasStatusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs index 316896fd06..5fd80709df 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs @@ -8,7 +8,7 @@ GlobalWin.OSD.AddMessage("TAStudio does not allow manual readonly toggle"); } - public bool WantsToCOntrolStopMovie { get { return true; } } + public bool WantsToControlStopMovie { get { return true; } } public void StopMovie() { this.Focus(); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs index b67ab2336e..da516494d0 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs @@ -5,8 +5,6 @@ namespace BizHawk.Client.EmuHawk { public partial class TAStudio : IToolForm { - public bool UpdateBefore { get { return false; } } - public void UpdateValues() { if (!IsHandleCreated || IsDisposed) @@ -15,9 +13,9 @@ namespace BizHawk.Client.EmuHawk } RefreshDialog(); - if (_tas.IsRecording) + if (_currentTasMovie.IsRecording) { - TasView.ensureVisible(_tas.InputLogLength - 1); + TasView.ensureVisible(_currentTasMovie.InputLogLength - 1); } else { @@ -37,15 +35,16 @@ namespace BizHawk.Client.EmuHawk return; } - if (_tas != null) + if (_currentTasMovie != null) { RefreshDialog(); } } - public bool AskSave() + + public bool AskSaveChanges() { - if (_tas != null && _tas.Changes) + if (_currentTasMovie != null && _currentTasMovie.Changes) { GlobalWin.Sound.StopSound(); var result = MessageBox.Show( @@ -62,7 +61,7 @@ namespace BizHawk.Client.EmuHawk } else if (result == DialogResult.No) { - _tas.ClearChanges(); + _currentTasMovie.ClearChanges(); return true; } else if (result == DialogResult.Cancel) @@ -73,5 +72,7 @@ namespace BizHawk.Client.EmuHawk return true; } + + public bool UpdateBefore { get { return false; } } } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 4469fafb07..cf4eb78b7b 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -49,7 +49,7 @@ namespace BizHawk.Client.EmuHawk } // "pending" frame logic - if (index == Global.Emulator.Frame && index == _tas.InputLogLength) + if (index == Global.Emulator.Frame && index == _currentTasMovie.InputLogLength) { if (columnName == FrameColumnName) { @@ -61,7 +61,7 @@ namespace BizHawk.Client.EmuHawk return; } - var record = _tas[index]; + var record = _currentTasMovie[index]; if (columnName == FrameColumnName) { @@ -69,7 +69,7 @@ namespace BizHawk.Client.EmuHawk { color = CurrentFrame_FrameCol; } - else if (_tas.Markers.IsMarker(index)) + else if (_currentTasMovie.Markers.IsMarker(index)) { color = Marker_FrameCol; } @@ -135,11 +135,11 @@ namespace BizHawk.Client.EmuHawk } else { - if (index < _tas.InputLogLength) + if (index < _currentTasMovie.InputLogLength) { - text = _tas.DisplayValue(index, columnName); + text = _currentTasMovie.DisplayValue(index, columnName); } - else if (Global.Emulator.Frame == _tas.InputLogLength) // In this situation we have a "pending" frame for the user to click + else if (Global.Emulator.Frame == _currentTasMovie.InputLogLength) // In this situation we have a "pending" frame for the user to click { text = TasMovie.CreateDisplayValueForButton( Global.ClickyVirtualPadController, @@ -213,12 +213,12 @@ namespace BizHawk.Client.EmuHawk TasView.Refresh(); _startBoolDrawColumn = TasView.PointedCell.Column; - _boolPaintState = _tas.BoolIsPressed(frame, buttonName); + _boolPaintState = _currentTasMovie.BoolIsPressed(frame, buttonName); } else { _startFloatDrawColumn = TasView.PointedCell.Column; - _floatPaintState = _tas.GetFloatValue(frame, buttonName); + _floatPaintState = _currentTasMovie.GetFloatValue(frame, buttonName); } } } @@ -309,9 +309,9 @@ namespace BizHawk.Client.EmuHawk { for (var i = startVal; i < endVal; i++) { - if (i < _tas.InputLogLength) // TODO: how do we really want to handle the user setting the float state of the pending frame? + if (i < _currentTasMovie.InputLogLength) // TODO: how do we really want to handle the user setting the float state of the pending frame? { - _tas.SetFloatState(i, _startFloatDrawColumn, _floatPaintState); // Notice it uses new row, old column, you can only paint across a single column + _currentTasMovie.SetFloatState(i, _startFloatDrawColumn, _floatPaintState); // Notice it uses new row, old column, you can only paint across a single column GoToLastEmulatedFrameIfNecessary(TasView.PointedCell.Row.Value); } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 710ca84d50..dcde0b09b2 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -24,7 +24,7 @@ namespace BizHawk.Client.EmuHawk private int _defaultWidth; private int _defaultHeight; - private TasMovie _tas; + private TasMovie _currentTasMovie; private bool _originalRewindStatus; // The client rewind status before TAStudio was engaged (used to restore when disengaged) private MovieEndAction _originalEndAction; // The movie end behavior selected by the user (that is overridden by TAStudio) @@ -60,7 +60,7 @@ namespace BizHawk.Client.EmuHawk public TasMovie CurrentMovie { - get { return _tas; } + get { return _currentTasMovie; } } private void TastudioToStopMovie() @@ -77,68 +77,12 @@ namespace BizHawk.Client.EmuHawk TasView.QueryItemText += TasView_QueryItemText; TasView.QueryItemBkColor += TasView_QueryItemBkColor; TasView.VirtualMode = true; - Closing += (o, e) => - { - if (AskSave()) - { - SaveConfigSettings(); - TastudioToStopMovie(); - DisengageTastudio(); - } - else - { - e.Cancel = true; - } - }; TopMost = Global.Config.TAStudioSettings.TopMost; TasView.InputPaintingMode = Global.Config.TAStudioDrawInput; TasView.PointedCellChanged += TasView_PointedCellChanged; } - private void Tastudio_Load(object sender, EventArgs e) - { - // Start Scenario 1: A regular movie is active - if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie)) - { - var result = MessageBox.Show("In order to use Tastudio, a new project must be created from the current movie\nThe current movie will be saved and closed, and a new project file will be created\nProceed?", "Convert movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question); - if (result == DialogResult.OK) - { - ConvertCurrentMovieToTasproj(); - } - else - { - Close(); - return; - } - } - - // Start Scenario 2: A tasproj is already active - else if (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie) - { - // Nothing to do - } - - // Start Scenario 3: No movie, but user wants to autload their last project - else if (Global.Config.AutoloadTAStudioProject && !string.IsNullOrEmpty(Global.Config.RecentTas.MostRecent)) - { - LoadProject(Global.Config.RecentTas.MostRecent); - } - - // Start Scenario 4: No movie, default behavior of engaging tastudio with a new default project - else - { - NewTasMovie(); - GlobalWin.MainForm.StartNewMovie(_tas, record: true); - _tas.CaptureCurrentState(); - } - - EngageTastudio(); - SetUpColumns(); - LoadConfigSettings(); - RefreshDialog(); - } - private void ConvertCurrentMovieToTasproj() { Global.MovieSession.Movie.Save(); @@ -150,12 +94,12 @@ namespace BizHawk.Client.EmuHawk { GlobalWin.MainForm.PauseOnFrame = null; GlobalWin.OSD.AddMessage("TAStudio engaged"); - _tas = Global.MovieSession.Movie as TasMovie; + _currentTasMovie = Global.MovieSession.Movie as TasMovie; GlobalWin.MainForm.PauseEmulator(); GlobalWin.MainForm.RelinquishControl(this); _originalRewindStatus = Global.Rewinder.RewindActive; _originalEndAction = Global.Config.MovieEndAction; - MarkerControl.Markers = _tas.Markers; + MarkerControl.Markers = _currentTasMovie.Markers; GlobalWin.MainForm.EnableRewind(false); Global.Config.MovieEndAction = MovieEndAction.Record; GlobalWin.MainForm.SetMainformMovieInfo(); @@ -166,7 +110,7 @@ namespace BizHawk.Client.EmuHawk GlobalWin.MainForm.PauseOnFrame = null; GlobalWin.OSD.AddMessage("TAStudio disengaged"); Global.MovieSession.Movie = MovieService.DefaultInstance; - GlobalWin.MainForm.TakeControl(); + GlobalWin.MainForm.TakeBackControl(); GlobalWin.MainForm.EnableRewind(_originalRewindStatus); Global.Config.MovieEndAction = _originalEndAction; GlobalWin.MainForm.SetMainformMovieInfo(); @@ -175,10 +119,10 @@ namespace BizHawk.Client.EmuHawk private void NewTasMovie() { Global.MovieSession.Movie = new TasMovie(); - _tas = Global.MovieSession.Movie as TasMovie; - _tas.Filename = DefaultTasProjName(); // TODO don't do this, take over any mainform actions that can crash without a filename - _tas.PopulateWithDefaultHeaderValues(); - _tas.ClearChanges(); + _currentTasMovie = Global.MovieSession.Movie as TasMovie; + _currentTasMovie.Filename = DefaultTasProjName(); // TODO don't do this, take over any mainform actions that can crash without a filename + _currentTasMovie.PopulateWithDefaultHeaderValues(); + _currentTasMovie.ClearChanges(); } private static string DefaultTasProjName() @@ -190,17 +134,17 @@ namespace BizHawk.Client.EmuHawk private void StartNewTasMovie() { - if (AskSave()) + if (AskSaveChanges()) { NewTasMovie(); - GlobalWin.MainForm.StartNewMovie(_tas, record: true); + GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record: true); RefreshDialog(); } } public void LoadProject(string path) { - if (AskSave()) + if (AskSaveChanges()) { var movie = new TasMovie { @@ -214,7 +158,7 @@ namespace BizHawk.Client.EmuHawk } GlobalWin.MainForm.StartNewMovie(movie, record: false); - _tas = Global.MovieSession.Movie as TasMovie; + _currentTasMovie = Global.MovieSession.Movie as TasMovie; Global.Config.RecentTas.Add(path); RefreshDialog(); } @@ -223,7 +167,7 @@ namespace BizHawk.Client.EmuHawk public void RefreshDialog() { TasView.BlazingFast = true; - TasView.ItemCount = _tas.InputLogLength + 1; + TasView.ItemCount = _currentTasMovie.InputLogLength + 1; TasView.BlazingFast = false; if (MarkerControl != null) { @@ -236,7 +180,7 @@ namespace BizHawk.Client.EmuHawk { if (frame != Global.Emulator.Frame) // Don't go to a frame if you are already on it! { - if (frame <= _tas.LastEmulatedFrame) + if (frame <= _currentTasMovie.LastEmulatedFrame) { GoToFrame(frame); } @@ -307,16 +251,16 @@ namespace BizHawk.Client.EmuHawk // If near a greenzone item, load and emulate // Do capturing and recording as needed - if (frame < _tas.InputLogLength) + if (frame < _currentTasMovie.InputLogLength) { if (frame < Global.Emulator.Frame) // We are rewinding { var goToFrame = frame == 0 ? 0 : frame - 1; - if (_tas[goToFrame].HasState) // Go back 1 frame and emulate + if (_currentTasMovie[goToFrame].HasState) // Go back 1 frame and emulate { - _tas.SwitchToPlay(); - Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_tas[goToFrame].State.ToArray()))); + _currentTasMovie.SwitchToPlay(); + Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_currentTasMovie[goToFrame].State.ToArray()))); if (goToFrame > 0) // We can't emulate up to frame 0! { @@ -329,8 +273,8 @@ namespace BizHawk.Client.EmuHawk } else { - _tas.SwitchToPlay(); - Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_tas[_tas.LastEmulatedFrame].State.ToArray()))); + _currentTasMovie.SwitchToPlay(); + Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_currentTasMovie[_currentTasMovie.LastEmulatedFrame].State.ToArray()))); GlobalWin.MainForm.UnpauseEmulator(); GlobalWin.MainForm.PauseOnFrame = frame; } @@ -338,10 +282,10 @@ namespace BizHawk.Client.EmuHawk else // We are going foward { var goToFrame = frame - 1; - if (_tas[goToFrame].HasState) // Can we go directly there? + if (_currentTasMovie[goToFrame].HasState) // Can we go directly there? { - _tas.SwitchToPlay(); - Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_tas[goToFrame].State.ToArray()))); + _currentTasMovie.SwitchToPlay(); + Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_currentTasMovie[goToFrame].State.ToArray()))); Global.Emulator.FrameAdvance(true); GlobalWin.DisplayManager.NeedsToPaint = true; TasView.ensureVisible(frame); @@ -349,8 +293,8 @@ namespace BizHawk.Client.EmuHawk } else // TODO: this assume that there are no "gaps", instead of last emulated frame, we should do last frame from X { - _tas.SwitchToPlay(); - Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_tas[_tas.LastEmulatedFrame].State.ToArray()))); + _currentTasMovie.SwitchToPlay(); + Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_currentTasMovie[_currentTasMovie.LastEmulatedFrame].State.ToArray()))); GlobalWin.MainForm.UnpauseEmulator(); GlobalWin.MainForm.PauseOnFrame = frame; } @@ -359,8 +303,8 @@ namespace BizHawk.Client.EmuHawk else // Emulate to a future frame { // TODO: get the last greenzone frame and go there - _tas.SwitchToPlay(); // TODO: stop copy/pasting this logic - Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_tas[_tas.LastEmulatedFrame].State.ToArray()))); + _currentTasMovie.SwitchToPlay(); // TODO: stop copy/pasting this logic + Global.Emulator.LoadStateBinary(new BinaryReader(new MemoryStream(_currentTasMovie[_currentTasMovie.LastEmulatedFrame].State.ToArray()))); GlobalWin.MainForm.UnpauseEmulator(); GlobalWin.MainForm.PauseOnFrame = frame; } @@ -374,7 +318,7 @@ namespace BizHawk.Client.EmuHawk { if (Global.Emulator.Frame > 0) { - var prevMarker = _tas.Markers.Previous(Global.Emulator.Frame); + var prevMarker = _currentTasMovie.Markers.Previous(Global.Emulator.Frame); var prev = prevMarker != null ? prevMarker.Frame : 0; GoToFrame(prev); } @@ -400,8 +344,8 @@ namespace BizHawk.Client.EmuHawk public void GoToNextMarker() { - var nextMarker = _tas.Markers.Next(Global.Emulator.Frame); - var next = nextMarker != null ? nextMarker.Frame : _tas.InputLogLength - 1; + var nextMarker = _currentTasMovie.Markers.Next(Global.Emulator.Frame); + var next = nextMarker != null ? nextMarker.Frame : _currentTasMovie.InputLogLength - 1; GoToFrame(next); } @@ -447,7 +391,7 @@ namespace BizHawk.Client.EmuHawk if (result == DialogResult.OK) { - _tas.Markers.Add(markerFrame, i.PromptText); + _currentTasMovie.Markers.Add(markerFrame, i.PromptText); MarkerControl.Refresh(); } @@ -463,11 +407,11 @@ namespace BizHawk.Client.EmuHawk // Sets either the pending frame or the tas input log private void ToggleBoolState(int frame, string buttonName) { - if (frame < _tas.InputLogLength) + if (frame < _currentTasMovie.InputLogLength) { - _tas.ToggleBoolState(frame, buttonName); + _currentTasMovie.ToggleBoolState(frame, buttonName); } - else if (frame == Global.Emulator.Frame && frame == _tas.InputLogLength) + else if (frame == Global.Emulator.Frame && frame == _currentTasMovie.InputLogLength) { Global.ClickyVirtualPadController.Toggle(buttonName); } @@ -477,11 +421,11 @@ namespace BizHawk.Client.EmuHawk // Sets either the pending frame or the tas input log private void SetBoolState(int frame, string buttonName, bool value) { - if (frame < _tas.InputLogLength) + if (frame < _currentTasMovie.InputLogLength) { - _tas.SetBoolState(frame, buttonName, value); + _currentTasMovie.SetBoolState(frame, buttonName, value); } - else if (frame == Global.Emulator.Frame && frame == _tas.InputLogLength) + else if (frame == Global.Emulator.Frame && frame == _currentTasMovie.InputLogLength) { Global.ClickyVirtualPadController.SetBool(buttonName, value); } @@ -495,7 +439,7 @@ namespace BizHawk.Client.EmuHawk { ToBk2MenuItem.Enabled = SaveTASMenuItem.Enabled = - !string.IsNullOrWhiteSpace(_tas.Filename); + !string.IsNullOrWhiteSpace(_currentTasMovie.Filename); } private void RecentSubMenu_DropDownOpened(object sender, EventArgs e) @@ -513,49 +457,49 @@ namespace BizHawk.Client.EmuHawk private void OpenTasMenuItem_Click(object sender, EventArgs e) { - if (AskSave()) + if (AskSaveChanges()) { - var file = ToolHelpers.GetTasProjFileFromUser(_tas.Filename); + var file = ToolHelpers.GetTasProjFileFromUser(_currentTasMovie.Filename); if (file != null) { - _tas.Filename = file.FullName; - _tas.Load(); - Global.Config.RecentTas.Add(_tas.Filename); + _currentTasMovie.Filename = file.FullName; + _currentTasMovie.Load(); + Global.Config.RecentTas.Add(_currentTasMovie.Filename); RefreshDialog(); - MessageStatusLabel.Text = Path.GetFileName(_tas.Filename) + " loaded."; + MessageStatusLabel.Text = Path.GetFileName(_currentTasMovie.Filename) + " loaded."; } } } private void SaveTasMenuItem_Click(object sender, EventArgs e) { - if (string.IsNullOrEmpty(_tas.Filename)) + if (string.IsNullOrEmpty(_currentTasMovie.Filename)) { SaveAsTasMenuItem_Click(sender, e); } else { - _tas.Save(); - MessageStatusLabel.Text = Path.GetFileName(_tas.Filename) + " saved."; - Global.Config.RecentTas.Add(_tas.Filename); + _currentTasMovie.Save(); + MessageStatusLabel.Text = Path.GetFileName(_currentTasMovie.Filename) + " saved."; + Global.Config.RecentTas.Add(_currentTasMovie.Filename); } } private void SaveAsTasMenuItem_Click(object sender, EventArgs e) { - var file = ToolHelpers.GetTasProjSaveFileFromUser(_tas.Filename); + var file = ToolHelpers.GetTasProjSaveFileFromUser(_currentTasMovie.Filename); if (file != null) { - _tas.Filename = file.FullName; - _tas.Save(); - Global.Config.RecentTas.Add(_tas.Filename); - MessageStatusLabel.Text = Path.GetFileName(_tas.Filename) + " saved."; + _currentTasMovie.Filename = file.FullName; + _currentTasMovie.Save(); + Global.Config.RecentTas.Add(_currentTasMovie.Filename); + MessageStatusLabel.Text = Path.GetFileName(_currentTasMovie.Filename) + " saved."; } } private void ToBk2MenuItem_Click(object sender, EventArgs e) { - var bk2 = _tas.ToBk2(); + var bk2 = _currentTasMovie.ToBk2(); bk2.Save(); MessageStatusLabel.Text = Path.GetFileName(bk2.Filename) + " created."; @@ -581,7 +525,6 @@ namespace BizHawk.Client.EmuHawk CloneMenuItem.Enabled = TruncateMenuItem.Enabled = TasView.SelectedIndices().Any(); - ReselectClipboardMenuItem.Enabled = PasteMenuItem.Enabled = PasteInsertMenuItem.Enabled = @@ -602,11 +545,11 @@ namespace BizHawk.Client.EmuHawk { if (TasView.SelectedIndices().Any()) { - var prevMarker = _tas.Markers.PreviousOrCurrent(LastSelectedIndex); - var nextMarker = _tas.Markers.Next(LastSelectedIndex); + var prevMarker = _currentTasMovie.Markers.PreviousOrCurrent(LastSelectedIndex); + var nextMarker = _currentTasMovie.Markers.Next(LastSelectedIndex); int prev = prevMarker != null ? prevMarker.Frame : 0; - int next = nextMarker != null ? nextMarker.Frame : _tas.InputLogLength; + int next = nextMarker != null ? nextMarker.Frame : _currentTasMovie.InputLogLength; for (int i = prev; i < next; i++) { @@ -633,10 +576,9 @@ namespace BizHawk.Client.EmuHawk var sb = new StringBuilder(); for (var i = 0; i < list.Count; i++) { - var input = _tas.GetInputState(list[i]); + var input = _currentTasMovie.GetInputState(list[i]); _tasClipboard.Add(new TasClipboardEntry(list[i], input)); - var lg = _tas.LogGeneratorInstance(); - lg.SetSource(input); + var lg = _currentTasMovie.LogGeneratorInstance(); sb.AppendLine(lg.GenerateLogEntry()); } @@ -654,7 +596,7 @@ namespace BizHawk.Client.EmuHawk { var needsToRollback = !(FirstSelectedIndex > Global.Emulator.Frame); - _tas.CopyOverInput(FirstSelectedIndex, _tasClipboard.Select(x => x.ControllerState)); + _currentTasMovie.CopyOverInput(FirstSelectedIndex, _tasClipboard.Select(x => x.ControllerState)); if (needsToRollback) { @@ -673,7 +615,7 @@ namespace BizHawk.Client.EmuHawk { var needsToRollback = !(FirstSelectedIndex > Global.Emulator.Frame); - _tas.InsertInput(FirstSelectedIndex, _tasClipboard.Select(x => x.ControllerState)); + _currentTasMovie.InsertInput(FirstSelectedIndex, _tasClipboard.Select(x => x.ControllerState)); if (needsToRollback) { @@ -698,15 +640,15 @@ namespace BizHawk.Client.EmuHawk var sb = new StringBuilder(); for (var i = 0; i < list.Length; i++) { - var input = _tas.GetInputState(i); + var input = _currentTasMovie.GetInputState(i); _tasClipboard.Add(new TasClipboardEntry(list[i], input)); - var lg = _tas.LogGeneratorInstance(); + var lg = _currentTasMovie.LogGeneratorInstance(); lg.SetSource(input); sb.AppendLine(lg.GenerateLogEntry()); } Clipboard.SetDataObject(sb.ToString()); - _tas.RemoveFrames(list); + _currentTasMovie.RemoveFrames(list); SetSplicer(); TasView.DeselectAll(); @@ -730,7 +672,7 @@ namespace BizHawk.Client.EmuHawk foreach (var frame in TasView.SelectedIndices()) { - _tas.ClearFrame(frame); + _currentTasMovie.ClearFrame(frame); } if (needsToRollback) @@ -752,7 +694,7 @@ namespace BizHawk.Client.EmuHawk var rollBackFrame = FirstSelectedIndex; _tasClipboard.Clear(); - _tas.RemoveFrames(TasView.SelectedIndices().ToArray()); + _currentTasMovie.RemoveFrames(TasView.SelectedIndices().ToArray()); SetSplicer(); TasView.DeselectAll(); @@ -778,10 +720,10 @@ namespace BizHawk.Client.EmuHawk foreach (var frame in framesToInsert) { - inputLog.Add(_tas.GetInputLogEntry(frame)); + inputLog.Add(_currentTasMovie.GetInputLogEntry(frame)); } - _tas.InsertInput(insertionFrame, inputLog); + _currentTasMovie.InsertInput(insertionFrame, inputLog); if (needsToRollback) { @@ -799,7 +741,7 @@ namespace BizHawk.Client.EmuHawk var insertionFrame = TasView.SelectedIndices().Any() ? LastSelectedIndex + 1 : 0; var needsToRollback = !(insertionFrame > Global.Emulator.Frame); - _tas.InsertEmptyFrame(insertionFrame); + _currentTasMovie.InsertEmptyFrame(insertionFrame); if (needsToRollback) { @@ -820,7 +762,7 @@ namespace BizHawk.Client.EmuHawk var result = framesPrompt.ShowDialog(); if (result == DialogResult.OK) { - _tas.InsertEmptyFrame(insertionFrame, framesPrompt.Frames); + _currentTasMovie.InsertEmptyFrame(insertionFrame, framesPrompt.Frames); } if (needsToRollback) @@ -840,7 +782,7 @@ namespace BizHawk.Client.EmuHawk var rollbackFrame = LastSelectedIndex + 1; var needsToRollback = !(rollbackFrame > Global.Emulator.Frame); - _tas.Truncate(LastSelectedIndex + 1); + _currentTasMovie.Truncate(LastSelectedIndex + 1); if (needsToRollback) { @@ -873,21 +815,21 @@ namespace BizHawk.Client.EmuHawk private void HeaderMenuItem_Click(object sender, EventArgs e) { - new MovieHeaderEditor(_tas).Show(); + new MovieHeaderEditor(_currentTasMovie).Show(); UpdateChangesIndicator(); } private void GreenzoneSettingsMenuItem_Click(object sender, EventArgs e) { - new GreenzoneSettings(_tas.GreenzoneSettings).Show(); + new GreenzoneSettings(_currentTasMovie.GreenzoneSettings).Show(); UpdateChangesIndicator(); } private void CommentsMenuItem_Click(object sender, EventArgs e) { var form = new EditCommentsForm(); - form.GetMovie(_tas); + form.GetMovie(_currentTasMovie); form.ShowDialog(); } @@ -958,8 +900,66 @@ namespace BizHawk.Client.EmuHawk base.OnShown(e); } + private void Tastudio_Load(object sender, EventArgs e) + { + // Start Scenario 1: A regular movie is active + if (Global.MovieSession.Movie.IsActive && !(Global.MovieSession.Movie is TasMovie)) + { + var result = MessageBox.Show("In order to use Tastudio, a new project must be created from the current movie\nThe current movie will be saved and closed, and a new project file will be created\nProceed?", "Convert movie", MessageBoxButtons.OKCancel, MessageBoxIcon.Question); + if (result == DialogResult.OK) + { + ConvertCurrentMovieToTasproj(); + } + else + { + Close(); + return; + } + } + + // Start Scenario 2: A tasproj is already active + else if (Global.MovieSession.Movie.IsActive && Global.MovieSession.Movie is TasMovie) + { + // Nothing to do + } + + // Start Scenario 3: No movie, but user wants to autload their last project + else if (Global.Config.AutoloadTAStudioProject && !string.IsNullOrEmpty(Global.Config.RecentTas.MostRecent)) + { + LoadProject(Global.Config.RecentTas.MostRecent); + } + + // Start Scenario 4: No movie, default behavior of engaging tastudio with a new default project + else + { + NewTasMovie(); + GlobalWin.MainForm.StartNewMovie(_currentTasMovie, record: true); + _currentTasMovie.CaptureCurrentState(); + } + + EngageTastudio(); + SetUpColumns(); + LoadConfigSettings(); + RefreshDialog(); + } + + private void Tastudio_Closing(object sender, FormClosingEventArgs e) + { + if (AskSaveChanges()) + { + SaveConfigSettings(); + GlobalWin.MainForm.StopMovie(saveChanges: false); + DisengageTastudio(); + } + else + { + e.Cancel = true; + } + } + #endregion + #endregion } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.cs index d991d751b6..c63e7977ad 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.cs @@ -42,7 +42,7 @@ namespace BizHawk.Client.EmuHawk } - public bool AskSave() + public bool AskSaveChanges() { return true; } diff --git a/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs b/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs index d9ecb2f47f..c2649c6f1f 100644 --- a/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs +++ b/BizHawk.Client.EmuHawk/tools/TI83/TI83KeyPad.cs @@ -34,7 +34,7 @@ namespace BizHawk.Client.EmuHawk #region Public API - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return false; } } public void UpdateValues() diff --git a/BizHawk.Client.EmuHawk/tools/ToolBox.cs b/BizHawk.Client.EmuHawk/tools/ToolBox.cs index 9904d843b2..994862e05b 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolBox.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolBox.cs @@ -35,7 +35,7 @@ namespace BizHawk.Client.EmuHawk ToolBoxItems.First().Select(); } - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return false; } } public void UpdateValues() { } diff --git a/BizHawk.Client.EmuHawk/tools/ToolManager.cs b/BizHawk.Client.EmuHawk/tools/ToolManager.cs index ac11bf0548..60923cc3c2 100644 --- a/BizHawk.Client.EmuHawk/tools/ToolManager.cs +++ b/BizHawk.Client.EmuHawk/tools/ToolManager.cs @@ -158,7 +158,7 @@ namespace BizHawk.Client.EmuHawk } return _tools - .Select(tool => tool.AskSave()) + .Select(tool => tool.AskSaveChanges()) .All(result => result); } @@ -176,7 +176,7 @@ namespace BizHawk.Client.EmuHawk var tool = _tools.FirstOrDefault(x => x is T); if (tool != null) { - return tool.AskSave(); + return tool.AskSaveChanges(); } else { diff --git a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs index 7a7cfc34a5..588ddb273d 100644 --- a/BizHawk.Client.EmuHawk/tools/TraceLogger.cs +++ b/BizHawk.Client.EmuHawk/tools/TraceLogger.cs @@ -37,7 +37,7 @@ namespace BizHawk.Client.EmuHawk get { return false; } } - public bool AskSave() + public bool AskSaveChanges() { return true; } diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs index f604dcfd15..888205ab7b 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualpadsTool.cs @@ -160,7 +160,7 @@ namespace BizHawk.Client.EmuHawk #region IToolForm Implementation - public bool AskSave() { return true; } + public bool AskSaveChanges() { return true; } public bool UpdateBefore { get { return false; } } public void Restart() diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs index 97e7ac4e9a..4fa7283583 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs @@ -50,7 +50,7 @@ namespace BizHawk.Client.EmuHawk public const int MaxDetailedSize = 1024 * 1024; // 1mb, semi-arbituary decision, sets the size to check for and automatically switch to fast mode for the user public const int MaxSupportedSize = 1024 * 1024 * 64; // 64mb, semi-arbituary decision, sets the maximum size ram search will support (as it will crash beyond this) - public bool AskSave() + public bool AskSaveChanges() { return true; } diff --git a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs index 53a2df4f25..8f7940d46f 100644 --- a/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs +++ b/BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs @@ -42,7 +42,7 @@ namespace BizHawk.Client.EmuHawk WatchListView.VirtualMode = true; Closing += (o, e) => { - if (AskSave()) + if (AskSaveChanges()) { SaveConfigSettings(); } @@ -101,7 +101,7 @@ namespace BizHawk.Client.EmuHawk Changes(); } - public bool AskSave() + public bool AskSaveChanges() { if (_watches.Changes) { @@ -138,7 +138,7 @@ namespace BizHawk.Client.EmuHawk var ask_result = true; if (_watches.Changes) { - ask_result = AskSave(); + ask_result = AskSaveChanges(); } if (ask_result) @@ -166,7 +166,7 @@ namespace BizHawk.Client.EmuHawk var result = true; if (_watches.Changes) { - result = AskSave(); + result = AskSaveChanges(); } if (result) @@ -461,7 +461,7 @@ namespace BizHawk.Client.EmuHawk var result = true; if (_watches.Changes) { - result = AskSave(); + result = AskSaveChanges(); } if (result || suppressAsk)