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

cleanups in Bookmarks and Marker Controls

This commit is contained in:
adelikat 2019-11-26 14:10:54 -06:00
parent 9a54a461b5
commit ea6b67ac39
3 changed files with 79 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
View File

@ -30,25 +30,10 @@ namespace BizHawk.Client.EmuHawk
public Action<int> LoadedCallback { get; set; }
private void CallLoadedCallback(int index)
{
LoadedCallback?.Invoke(index);
}
public Action<int> SavedCallback { get; set; }
private void CallSavedCallback(int index)
{
SavedCallback?.Invoke(index);
}
public Action<int> RemovedCallback { get; set; }
private void CallRemovedCallback(int index)
{
RemovedCallback?.Invoke(index);
}
public TAStudio Tastudio { get; set; }
public int HoverInterval
@ -234,7 +219,7 @@ namespace BizHawk.Client.EmuHawk
private void AddBranchToolStripMenuItem_Click(object sender, EventArgs e)
{
Branch();
CallSavedCallback(Movie.Branches.Count - 1);
SavedCallback?.Invoke(Movie.Branches.Count - 1);
GlobalWin.OSD.AddMessage($"Added branch {Movie.CurrentBranch}");
}
@ -242,7 +227,7 @@ namespace BizHawk.Client.EmuHawk
{
Branch();
EditBranchTextPopUp(Movie.CurrentBranch);
CallSavedCallback(Movie.Branches.Count - 1);
SavedCallback?.Invoke(Movie.Branches.Count - 1);
GlobalWin.OSD.AddMessage($"Added branch {Movie.CurrentBranch}");
}
@ -265,92 +250,100 @@ namespace BizHawk.Client.EmuHawk
if (BranchView.AnyRowsSelected)
{
LoadSelectedBranch();
CallLoadedCallback(BranchView.SelectedRows.First());
LoadedCallback?.Invoke(BranchView.SelectedRows.First());
}
}
private void UpdateBranchToolStripMenuItem_Click(object sender, EventArgs e)
{
if (SelectedBranch != null)
if (SelectedBranch == null)
{
Movie.CurrentBranch = BranchView.SelectedRows.First();
_backupBranch = SelectedBranch.Clone();
UndoBranchToolStripMenuItem.Enabled = UndoBranchButton.Enabled = true;
UndoBranchToolStripMenuItem.Text = "Undo Branch Update";
toolTip1.SetToolTip(UndoBranchButton, "Undo Branch Update");
_branchUndo = BranchUndo.Update;
UpdateBranch(SelectedBranch);
CallSavedCallback(Movie.CurrentBranch);
GlobalWin.OSD.AddMessage($"Saved branch {Movie.CurrentBranch}");
return;
}
Movie.CurrentBranch = BranchView.SelectedRows.First();
_backupBranch = SelectedBranch.Clone();
UndoBranchToolStripMenuItem.Enabled = UndoBranchButton.Enabled = true;
UndoBranchToolStripMenuItem.Text = "Undo Branch Update";
toolTip1.SetToolTip(UndoBranchButton, "Undo Branch Update");
_branchUndo = BranchUndo.Update;
UpdateBranch(SelectedBranch);
SavedCallback?.Invoke(Movie.CurrentBranch);
GlobalWin.OSD.AddMessage($"Saved branch {Movie.CurrentBranch}");
}
private void EditBranchTextToolStripMenuItem_Click(object sender, EventArgs e)
{
if (SelectedBranch != null)
if (SelectedBranch == null)
{
int index = BranchView.SelectedRows.First();
string oldText = SelectedBranch.UserText;
return;
}
if (EditBranchTextPopUp(index))
{
_backupBranch = SelectedBranch.Clone();
_backupBranch.UserText = oldText;
UndoBranchToolStripMenuItem.Enabled = UndoBranchButton.Enabled = true;
UndoBranchToolStripMenuItem.Text = "Undo Branch Text Edit";
toolTip1.SetToolTip(UndoBranchButton, "Undo Branch Text Edit");
_branchUndo = BranchUndo.Text;
int index = BranchView.SelectedRows.First();
string oldText = SelectedBranch.UserText;
GlobalWin.OSD.AddMessage($"Edited branch {index}");
}
if (EditBranchTextPopUp(index))
{
_backupBranch = SelectedBranch.Clone();
_backupBranch.UserText = oldText;
UndoBranchToolStripMenuItem.Enabled = UndoBranchButton.Enabled = true;
UndoBranchToolStripMenuItem.Text = "Undo Branch Text Edit";
toolTip1.SetToolTip(UndoBranchButton, "Undo Branch Text Edit");
_branchUndo = BranchUndo.Text;
GlobalWin.OSD.AddMessage($"Edited branch {index}");
}
}
private void JumpToBranchToolStripMenuItem_Click(object sender, EventArgs e)
{
if (SelectedBranch != null)
if (SelectedBranch == null)
{
int index = BranchView.SelectedRows.First();
TasBranch branch = Movie.GetBranch(index);
Tastudio.GoToFrame(branch.Frame);
return;
}
int index = BranchView.SelectedRows.First();
TasBranch branch = Movie.GetBranch(index);
Tastudio.GoToFrame(branch.Frame);
}
private void RemoveBranchToolStripMenuItem_Click(object sender, EventArgs e)
{
if (SelectedBranch != null)
if (SelectedBranch == null)
{
int index = BranchView.SelectedRows.First();
if (index == Movie.CurrentBranch)
{
Movie.CurrentBranch = -1;
}
else if (index < Movie.CurrentBranch)
{
Movie.CurrentBranch--;
}
_backupBranch = SelectedBranch.Clone();
UndoBranchToolStripMenuItem.Enabled = UndoBranchButton.Enabled = true;
UndoBranchToolStripMenuItem.Text = "Undo Branch Removal";
toolTip1.SetToolTip(UndoBranchButton, "Undo Branch Removal");
_branchUndo = BranchUndo.Remove;
Movie.RemoveBranch(SelectedBranch);
BranchView.RowCount = Movie.Branches.Count;
if (index == Movie.Branches.Count)
{
BranchView.ClearSelectedRows();
Select(Movie.Branches.Count - 1, true);
}
CallRemovedCallback(index);
Tastudio.RefreshDialog();
GlobalWin.OSD.AddMessage($"Removed branch {index}");
return;
}
int index = BranchView.SelectedRows.First();
if (index == Movie.CurrentBranch)
{
Movie.CurrentBranch = -1;
}
else if (index < Movie.CurrentBranch)
{
Movie.CurrentBranch--;
}
_backupBranch = SelectedBranch.Clone();
UndoBranchToolStripMenuItem.Enabled = UndoBranchButton.Enabled = true;
UndoBranchToolStripMenuItem.Text = "Undo Branch Removal";
toolTip1.SetToolTip(UndoBranchButton, "Undo Branch Removal");
_branchUndo = BranchUndo.Remove;
Movie.RemoveBranch(SelectedBranch);
BranchView.RowCount = Movie.Branches.Count;
if (index == Movie.Branches.Count)
{
BranchView.ClearSelectedRows();
Select(Movie.Branches.Count - 1, true);
}
RemovedCallback?.Invoke(index);
Tastudio.RefreshDialog();
GlobalWin.OSD.AddMessage($"Removed branch {index}");
}
private void UndoBranchToolStripMenuItem_Click(object sender, EventArgs e)
@ -358,13 +351,13 @@ namespace BizHawk.Client.EmuHawk
if (_branchUndo == BranchUndo.Load)
{
LoadBranch(_backupBranch);
CallLoadedCallback(Movie.Branches.IndexOf(_backupBranch));
LoadedCallback?.Invoke(Movie.Branches.IndexOf(_backupBranch));
GlobalWin.OSD.AddMessage("Branch Load canceled");
}
else if (_branchUndo == BranchUndo.Update)
{
Movie.UpdateBranch(Movie.GetBranch(_backupBranch.UniqueIdentifier), _backupBranch);
CallSavedCallback(Movie.Branches.IndexOf(_backupBranch));
SavedCallback?.Invoke(Movie.Branches.IndexOf(_backupBranch));
GlobalWin.OSD.AddMessage("Branch Update canceled");
}
else if (_branchUndo == BranchUndo.Text)
@ -376,7 +369,7 @@ namespace BizHawk.Client.EmuHawk
{
Movie.AddBranch(_backupBranch);
BranchView.RowCount = Movie.Branches.Count;
CallSavedCallback(Movie.Branches.IndexOf(_backupBranch));
SavedCallback?.Invoke(Movie.Branches.IndexOf(_backupBranch));
GlobalWin.OSD.AddMessage("Branch Removal canceled");
}
@ -643,7 +636,7 @@ namespace BizHawk.Client.EmuHawk
private void BranchView_CellDropped(object sender, InputRoll.CellEventArgs e)
{
if (e.NewCell != null && e.NewCell.IsDataCell && e.OldCell.RowIndex.Value < Movie.Branches.Count)
if (e.NewCell != null && e.NewCell.IsDataCell && e.OldCell.RowIndex < Movie.Branches.Count)
{
var guid = Movie.BranchGuidByIndex(Movie.CurrentBranch);
Movie.SwapBranches(e.OldCell.RowIndex.Value, e.NewCell.RowIndex.Value);
@ -673,7 +666,7 @@ namespace BizHawk.Client.EmuHawk
}
_screenshot.UpdateValues(branch, location, width, height,
(int)Graphics.FromHwnd(this.Handle).MeasureString(
(int)Graphics.FromHwnd(Handle).MeasureString(
branch.UserText, _screenshot.Font, width).Height);
_screenshot.FadeIn();

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

@ -238,7 +238,6 @@
this.Controls.Add(this.MarkersGroupBox);
this.Name = "MarkerControl";
this.Size = new System.Drawing.Size(198, 278);
this.Load += new System.EventHandler(this.MarkerControl_Load);
this.MarkerContextMenu.ResumeLayout(false);
this.MarkersGroupBox.ResumeLayout(false);
this.ResumeLayout(false);

19
BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -39,10 +39,6 @@ namespace BizHawk.Client.EmuHawk
MarkerView.QueryItemText += MarkerView_QueryItemText;
}
private void MarkerControl_Load(object sender, EventArgs e)
{
}
public InputRoll MarkerInputRoll => MarkerView;
private void MarkerView_QueryItemBkColor(int index, RollColumn column, ref Color color)
@ -259,16 +255,11 @@ namespace BizHawk.Client.EmuHawk
MarkerInputRoll.AnyRowsSelected;
}
private List<TasMovieMarker> SelectedMarkers
{
get
{
return MarkerView
.SelectedRows
.Select(index => Markers[index])
.ToList();
}
}
private List<TasMovieMarker> SelectedMarkers => MarkerView
.SelectedRows
.Select(index => Markers[index])
.ToList();
// SuuperW: Marker renaming can be done with a right-click.
// A much more useful feature would be to easily jump to it.