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

tastudio: Clone() for branches. fixes UserText cancellation 

also cancel backup and osd message if text edit was canceled
This commit is contained in:
feos 2017-03-15 19:17:47 +03:00
parent d254ad01d8
commit 6e99227c72
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.Common/movie/tasproj/TasBranch.cs
View File

@ -20,6 +20,11 @@ namespace BizHawk.Client.Common
public TasMovieMarkerList Markers { get; set; }
public Guid UniqueIdentifier { get; set; }
public string UserText { get; set; }
public TasBranch Clone()
{
return (TasBranch)MemberwiseClone();
}
}
public class TasBranchCollection : List<TasBranch>

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

@ -243,7 +243,7 @@ namespace BizHawk.Client.EmuHawk
{
Movie.CurrentBranch = BranchView.SelectedRows.First();
BackupBranch = SelectedBranch;
BackupBranch = SelectedBranch.Clone();
UndoBranchToolStripMenuItem.Enabled = UndoBranchButton.Enabled = true;
UndoBranchToolStripMenuItem.Text = "Undo Branch Update";
toolTip1.SetToolTip(UndoBranchButton, "Undo Branch Update");
@ -259,15 +259,19 @@ namespace BizHawk.Client.EmuHawk
if (SelectedBranch != null)
{
int index = BranchView.SelectedRows.First();
string oldText = SelectedBranch.UserText;
BackupBranch = SelectedBranch;
UndoBranchToolStripMenuItem.Enabled = UndoBranchButton.Enabled = true;
UndoBranchToolStripMenuItem.Text = "Undo Branch Text Edit";
toolTip1.SetToolTip(UndoBranchButton, "Undo Branch Text Edit");
_branchUndo = BranchUndo.Text;
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;
EditBranchTextPopUp(index);
GlobalWin.OSD.AddMessage("Edited branch " + index.ToString());
GlobalWin.OSD.AddMessage("Edited branch " + index.ToString());
}
}
}
@ -295,7 +299,7 @@ namespace BizHawk.Client.EmuHawk
Movie.CurrentBranch--;
}
BackupBranch = SelectedBranch;
BackupBranch = SelectedBranch.Clone();
UndoBranchToolStripMenuItem.Enabled = UndoBranchButton.Enabled = true;
UndoBranchToolStripMenuItem.Text = "Undo Branch Removal";
toolTip1.SetToolTip(UndoBranchButton, "Undo Branch Removal");
@ -331,6 +335,7 @@ namespace BizHawk.Client.EmuHawk
else if (_branchUndo == BranchUndo.Text)
{
Movie.GetBranch(BackupBranch.UniqueIdentifier).UserText = BackupBranch.UserText;
GlobalWin.OSD.AddMessage("Branch Text Edit canceled");
}
else if (_branchUndo == BranchUndo.Remove)
{
@ -459,11 +464,11 @@ namespace BizHawk.Client.EmuHawk
BranchView.Refresh();
}
public void EditBranchTextPopUp(int index)
public bool EditBranchTextPopUp(int index)
{
TasBranch branch = Movie.GetBranch(index);
if (branch == null)
return;
return false;
InputPrompt i = new InputPrompt
{
@ -474,12 +479,13 @@ namespace BizHawk.Client.EmuHawk
};
var result = i.ShowHawkDialog();
if (result == DialogResult.OK)
{
branch.UserText = i.PromptText;
UpdateValues();
return true;
}
return false;
}
#endregion