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

tastudio: fix and tweak clipboard and selection display

This commit is contained in:
feos 2017-01-26 20:21:48 +03:00
parent f7638e8352
commit 37a44c2b17
3 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1299,7 +1299,6 @@ namespace BizHawk.Client.EmuHawk
this.SplicerStatusLabel.Name = "SplicerStatusLabel"; this.SplicerStatusLabel.Name = "SplicerStatusLabel";
this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0); this.SplicerStatusLabel.Padding = new System.Windows.Forms.Padding(20, 0, 0, 0);
this.SplicerStatusLabel.Size = new System.Drawing.Size(163, 17); this.SplicerStatusLabel.Size = new System.Drawing.Size(163, 17);
this.SplicerStatusLabel.Text = "0 selected, clipboard: empty";
// //
// TasPlaybackBox // TasPlaybackBox
// //

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

@ -369,8 +369,8 @@ namespace BizHawk.Client.EmuHawk
{ {
if (TasView.AnyRowsSelected) if (TasView.AnyRowsSelected)
{ {
//_tasClipboard.Clear(); _tasClipboard.Clear();
var list = TasView.SelectedRows.ToList(); var list = TasView.SelectedRows.ToArray();
var sb = new StringBuilder(); var sb = new StringBuilder();
foreach (var index in list) foreach (var index in list)
@ -378,7 +378,7 @@ namespace BizHawk.Client.EmuHawk
var input = CurrentTasMovie.GetInputState(index); var input = CurrentTasMovie.GetInputState(index);
if (input == null) if (input == null)
break; break;
//_tasClipboard.Add(new TasClipboardEntry(index, input)); _tasClipboard.Add(new TasClipboardEntry(index, input));
var lg = CurrentTasMovie.LogGeneratorInstance(); var lg = CurrentTasMovie.LogGeneratorInstance();
lg.SetSource(input); lg.SetSource(input);
sb.AppendLine(lg.GenerateLogEntry()); sb.AppendLine(lg.GenerateLogEntry());
@ -480,7 +480,7 @@ namespace BizHawk.Client.EmuHawk
var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame; var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame;
var rollBackFrame = TasView.FirstSelectedIndex.Value; var rollBackFrame = TasView.FirstSelectedIndex.Value;
//_tasClipboard.Clear(); _tasClipboard.Clear();
var list = TasView.SelectedRows.ToArray(); var list = TasView.SelectedRows.ToArray();
var sb = new StringBuilder(); var sb = new StringBuilder();
@ -489,7 +489,7 @@ namespace BizHawk.Client.EmuHawk
var input = CurrentTasMovie.GetInputState(index); var input = CurrentTasMovie.GetInputState(index);
if (input == null) if (input == null)
break; break;
//_tasClipboard.Add(new TasClipboardEntry(index, input)); _tasClipboard.Add(new TasClipboardEntry(index, input));
var lg = CurrentTasMovie.LogGeneratorInstance(); var lg = CurrentTasMovie.LogGeneratorInstance();
lg.SetSource(input); lg.SetSource(input);
sb.AppendLine(lg.GenerateLogEntry()); sb.AppendLine(lg.GenerateLogEntry());

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

@ -497,6 +497,7 @@ namespace BizHawk.Client.EmuHawk
Global.Config.MovieEndAction = MovieEndAction.Record; Global.Config.MovieEndAction = MovieEndAction.Record;
Mainform.SetMainformMovieInfo(); Mainform.SetMainformMovieInfo();
Global.MovieSession.ReadOnly = true; Global.MovieSession.ReadOnly = true;
SetSplicer();
} }
#endregion #endregion
@ -852,23 +853,12 @@ namespace BizHawk.Client.EmuHawk
private void SetSplicer() private void SetSplicer()
{ {
// TODO: columns selected // TODO: columns selected?
// TODO: clipboard SplicerStatusLabel.Text =
var list = TasView.SelectedRows; "Selected: " + TasView.SelectedRows.Count() + " frame" +
string message = "Selected: "; (TasView.SelectedRows.Count() == 1 ? "" : "s") +
", Clipboard: " + (_tasClipboard.Any() ? _tasClipboard.Count + " frame" +
if (list.Any()) (_tasClipboard.Count == 1 ? "" : "s") : "empty");
{
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;
} }
private void UpdateChangesIndicator() private void UpdateChangesIndicator()