diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index 6cc40e1eb8..e2eebd1ae2 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -1299,7 +1299,6 @@ namespace BizHawk.Client.EmuHawk this.SplicerStatusLabel.Name = "SplicerStatusLabel"; this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0); this.SplicerStatusLabel.Size = new System.Drawing.Size(163, 17); - this.SplicerStatusLabel.Text = "0 selected, clipboard: empty"; // // TasPlaybackBox // diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 8edc03fd6e..473e89ea2a 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -369,8 +369,8 @@ namespace BizHawk.Client.EmuHawk { if (TasView.AnyRowsSelected) { - //_tasClipboard.Clear(); - var list = TasView.SelectedRows.ToList(); + _tasClipboard.Clear(); + var list = TasView.SelectedRows.ToArray(); var sb = new StringBuilder(); foreach (var index in list) @@ -378,7 +378,7 @@ namespace BizHawk.Client.EmuHawk var input = CurrentTasMovie.GetInputState(index); if (input == null) break; - //_tasClipboard.Add(new TasClipboardEntry(index, input)); + _tasClipboard.Add(new TasClipboardEntry(index, input)); var lg = CurrentTasMovie.LogGeneratorInstance(); lg.SetSource(input); sb.AppendLine(lg.GenerateLogEntry()); @@ -480,7 +480,7 @@ namespace BizHawk.Client.EmuHawk var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame; var rollBackFrame = TasView.FirstSelectedIndex.Value; - //_tasClipboard.Clear(); + _tasClipboard.Clear(); var list = TasView.SelectedRows.ToArray(); var sb = new StringBuilder(); @@ -489,7 +489,7 @@ namespace BizHawk.Client.EmuHawk var input = CurrentTasMovie.GetInputState(index); if (input == null) break; - //_tasClipboard.Add(new TasClipboardEntry(index, input)); + _tasClipboard.Add(new TasClipboardEntry(index, input)); var lg = CurrentTasMovie.LogGeneratorInstance(); lg.SetSource(input); sb.AppendLine(lg.GenerateLogEntry()); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index 9c17f2c9b7..203d79ed8d 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -497,6 +497,7 @@ namespace BizHawk.Client.EmuHawk Global.Config.MovieEndAction = MovieEndAction.Record; Mainform.SetMainformMovieInfo(); Global.MovieSession.ReadOnly = true; + SetSplicer(); } #endregion @@ -852,23 +853,12 @@ namespace BizHawk.Client.EmuHawk private void SetSplicer() { - // TODO: columns selected - // TODO: clipboard - var list = TasView.SelectedRows; - string message = "Selected: "; - - if (list.Any()) - { - message += list.Count() + " rows 0 col, Clipboard: "; - } - else - { - message += list.Count() + " none, Clipboard: "; - } - - message += _tasClipboard.Any() ? _tasClipboard.Count + " rows 0 col" : "empty"; - - SplicerStatusLabel.Text = message; + // TODO: columns selected? + SplicerStatusLabel.Text = + "Selected: " + TasView.SelectedRows.Count() + " frame" + + (TasView.SelectedRows.Count() == 1 ? "" : "s") + + ", Clipboard: " + (_tasClipboard.Any() ? _tasClipboard.Count + " frame" + + (_tasClipboard.Count == 1 ? "" : "s") : "empty"); } private void UpdateChangesIndicator()