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

New Ram Watch - fix incorrectly labeling a file as having changes

This commit is contained in:
adelikat 2013-09-09 22:03:02 +00:00
parent d7c6d79148
commit ea9fb1f85d
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/MainForm.cs
View File

@ -4197,7 +4197,7 @@ namespace BizHawk.MultiClient
NewRamWatch1 = new NewRamWatch(); NewRamWatch1 = new NewRamWatch();
if (Global.Config.RecentWatches.AutoLoad && !Global.Config.RecentWatches.Empty) if (Global.Config.RecentWatches.AutoLoad && !Global.Config.RecentWatches.Empty)
{ {
NewRamWatch1.LoadWatchFromRecent(Global.Config.RecentWatches[0]); NewRamWatch1.LoadFileFromRecent(Global.Config.RecentWatches[0]);
} }
if (load_dialog) if (load_dialog)
{ {

39
BizHawk.MultiClient/tools/Watch/NewRamWatch.cs
View File

@ -292,13 +292,13 @@ namespace BizHawk.MultiClient
Watches.Clear(); Watches.Clear();
DisplayWatches(); DisplayWatches();
UpdateWatchCount(); UpdateWatchCount();
MessageLabel.Text = ""; UpdateMessageLabel();
_sortReverse = false; _sortReverse = false;
_sortedColumn = ""; _sortedColumn = String.Empty;
} }
} }
public void LoadWatchFromRecent(string path) public void LoadFileFromRecent(string path)
{ {
bool ask_result = true; bool ask_result = true;
if (Watches.Changes) if (Watches.Changes)
@ -318,12 +318,30 @@ namespace BizHawk.MultiClient
Global.Config.RecentWatches.Add(path); Global.Config.RecentWatches.Add(path);
DisplayWatches(); DisplayWatches();
UpdateWatchCount(); UpdateWatchCount();
MessageLabel.Text = Path.GetFileName(Watches.CurrentFileName) + " *"; UpdateMessageLabel();
Watches.Changes = false; Watches.Changes = false;
} }
} }
} }
private void UpdateMessageLabel(bool saved = false)
{
string message = String.Empty;
if (!String.IsNullOrWhiteSpace(Watches.CurrentFileName))
{
if (saved)
{
message = Path.GetFileName(Watches.CurrentFileName) + " saved.";
}
else
{
message = Path.GetFileName(Watches.CurrentFileName) + (Watches.Changes ? " *" : String.Empty);
}
}
MessageLabel.Text = message;
}
private void SetMemoryDomain(int pos) private void SetMemoryDomain(int pos)
{ {
if (pos < Global.Emulator.MemoryDomains.Count) //Sanity check if (pos < Global.Emulator.MemoryDomains.Count) //Sanity check
@ -344,7 +362,7 @@ namespace BizHawk.MultiClient
private void Changes() private void Changes()
{ {
Watches.Changes = true; Watches.Changes = true;
MessageLabel.Text = Path.GetFileName(Watches.CurrentFileName) + " *"; UpdateMessageLabel();
} }
private void MoveUp() private void MoveUp()
@ -791,7 +809,7 @@ namespace BizHawk.MultiClient
{ {
Watches.Load(file.FullName, true, append); Watches.Load(file.FullName, true, append);
DisplayWatches(); DisplayWatches();
MessageLabel.Text = Path.GetFileNameWithoutExtension(Watches.CurrentFileName) + (Watches.Changes ? " *" : String.Empty); UpdateMessageLabel();
UpdateWatchCount(); UpdateWatchCount();
Global.Config.RecentWatches.Add(Watches.CurrentFileName); Global.Config.RecentWatches.Add(Watches.CurrentFileName);
SetMemoryDomain(WatchCommon.GetDomainPos(Watches.Domain.ToString())); SetMemoryDomain(WatchCommon.GetDomainPos(Watches.Domain.ToString()));
@ -801,10 +819,9 @@ namespace BizHawk.MultiClient
private void saveToolStripMenuItem_Click(object sender, EventArgs e) private void saveToolStripMenuItem_Click(object sender, EventArgs e)
{ {
bool result = Watches.Save(); if (Watches.Save())
if (result)
{ {
MessageLabel.Text = Path.GetFileName(Watches.CurrentFileName) + " saved."; UpdateMessageLabel(saved: true);
} }
} }
@ -813,7 +830,7 @@ namespace BizHawk.MultiClient
bool result = Watches.SaveAs(); bool result = Watches.SaveAs();
if (result) if (result)
{ {
MessageLabel.Text = Path.GetFileName(Watches.CurrentFileName) + " saved."; UpdateMessageLabel(saved: true);
Global.Config.RecentWatches.Add(Watches.CurrentFileName); Global.Config.RecentWatches.Add(Watches.CurrentFileName);
} }
} }
@ -821,7 +838,7 @@ namespace BizHawk.MultiClient
private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e) private void recentToolStripMenuItem_DropDownOpened(object sender, EventArgs e)
{ {
recentToolStripMenuItem.DropDownItems.Clear(); recentToolStripMenuItem.DropDownItems.Clear();
recentToolStripMenuItem.DropDownItems.AddRange(Global.Config.RecentWatches.GenerateRecentMenu(LoadWatchFromRecent)); recentToolStripMenuItem.DropDownItems.AddRange(Global.Config.RecentWatches.GenerateRecentMenu(LoadFileFromRecent));
recentToolStripMenuItem.DropDownItems.Add(Global.Config.RecentWatches.GenerateAutoLoadItem()); recentToolStripMenuItem.DropDownItems.Add(Global.Config.RecentWatches.GenerateAutoLoadItem());
} }