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

Ram Watch - saving/loading column settings

This commit is contained in:
adelikat 2019-10-14 19:56:35 -05:00
parent 5b83b9e019
commit cfab768846
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
View File

@ -80,7 +80,7 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions
} }
} }
public static ToolStripMenuItem ToColumnsMenu(this InputRoll inputRoll) public static ToolStripMenuItem ToColumnsMenu(this InputRoll inputRoll, Action changeCallback)
{ {
var menu = new ToolStripMenuItem var menu = new ToolStripMenuItem
{ {
@ -105,7 +105,7 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions
var sender = (ToolStripMenuItem)o; var sender = (ToolStripMenuItem)o;
columns.Find(c => c.Name == (string)sender.Tag).Visible = sender.Checked; columns.Find(c => c.Name == (string)sender.Tag).Visible = sender.Checked;
columns.ColumnsChanged(); columns.ColumnsChanged();
changeCallback();
inputRoll.Refresh(); inputRoll.Refresh();
}; };

63
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -58,14 +58,19 @@ namespace BizHawk.Client.EmuHawk
_sortedColumn = ""; _sortedColumn = "";
_sortReverse = false; _sortReverse = false;
AddColumn(WatchList.ADDRESS, "Address", 100, InputRoll.RollColumn.InputType.Text);
AddColumn(WatchList.VALUE, "Value", 100, InputRoll.RollColumn.InputType.Text); SetColumns();
AddColumn(WatchList.PREV, "Prev", 59, InputRoll.RollColumn.InputType.Text); }
AddColumn(WatchList.CHANGES, "Changes", 54, InputRoll.RollColumn.InputType.Text);
AddColumn(WatchList.DIFF, "Diff", 59, InputRoll.RollColumn.InputType.Text); private void SetColumns()
AddColumn(WatchList.TYPE, "Type", 55, InputRoll.RollColumn.InputType.Text); {
AddColumn(WatchList.DOMAIN, "Domain", 55, InputRoll.RollColumn.InputType.Text); foreach (var column in Settings.Columns)
AddColumn(WatchList.NOTES, "Notes", 128, InputRoll.RollColumn.InputType.Text); {
if (WatchListView.AllColumns[column.Name] == null)
{
WatchListView.AllColumns.Add(column);
}
}
} }
public void AddColumn(string columnName, string columnText, int columnWidth, InputRoll.RollColumn.InputType columnType = InputRoll.RollColumn.InputType.Boolean) public void AddColumn(string columnName, string columnText, int columnWidth, InputRoll.RollColumn.InputType columnType = InputRoll.RollColumn.InputType.Boolean)
@ -91,20 +96,20 @@ namespace BizHawk.Client.EmuHawk
{ {
public RamWatchSettings() public RamWatchSettings()
{ {
Columns = new ColumnList Columns = new List<InputRoll.RollColumn>
{ {
new Column { Name = WatchList.ADDRESS, Visible = true, Index = 0, Width = 60 }, new InputRoll.RollColumn { Text = "Address", Name = WatchList.ADDRESS, Visible = true, Width = 60 },
new Column { Name = WatchList.VALUE, Visible = true, Index = 1, Width = 59 }, new InputRoll.RollColumn { Text = "Value", Name = WatchList.VALUE, Visible = true, Width = 59 },
new Column { Name = WatchList.PREV, Visible = false, Index = 2, Width = 59 }, new InputRoll.RollColumn { Text = "Prev", Name = WatchList.PREV, Visible = false, Width = 59 },
new Column { Name = WatchList.CHANGES, Visible = true, Index = 3, Width = 55 }, new InputRoll.RollColumn { Text = "Changes", Name = WatchList.CHANGES, Visible = true, Width = 55 },
new Column { Name = WatchList.DIFF, Visible = false, Index = 4, Width = 59 }, new InputRoll.RollColumn { Text = "Diff", Name = WatchList.DIFF, Visible = false, Width = 59 },
new Column { Name = WatchList.TYPE, Visible = false, Index = 5, Width = 55 }, new InputRoll.RollColumn { Text = "Type", Name = WatchList.TYPE, Visible = false, Width = 55 },
new Column { Name = WatchList.DOMAIN, Visible = true, Index = 6, Width = 55 }, new InputRoll.RollColumn { Text = "Domain", Name = WatchList.DOMAIN, Visible = true, Width = 55 },
new Column { Name = WatchList.NOTES, Visible = true, Index = 7, Width = 128 }, new InputRoll.RollColumn { Text = "Notes", Name = WatchList.NOTES, Visible = true, Width = 128 },
}; };
} }
public ColumnList Columns { get; set; } public List<InputRoll.RollColumn> Columns { get; set; }
} }
private IEnumerable<int> SelectedIndices => WatchListView.SelectedRows; private IEnumerable<int> SelectedIndices => WatchListView.SelectedRows;
@ -537,8 +542,8 @@ namespace BizHawk.Client.EmuHawk
Size = Settings.WindowSize; Size = Settings.WindowSize;
} }
// InputRoll TODO WatchListView.AllColumns.Clear();
//LoadColumnInfo(WatchListView, Settings.Columns); SetColumns();
} }
private void NewWatchList(bool suppressAsk) private void NewWatchList(bool suppressAsk)
@ -593,10 +598,7 @@ namespace BizHawk.Client.EmuHawk
private void SaveConfigSettings() private void SaveConfigSettings()
{ {
// Inputroll TODO Settings.Columns = WatchListView.AllColumns;
////WatchListView.UserSettingsSerialized()
////SaveColumnInfo(WatchListView, Settings.Columns);
if (WindowState == FormWindowState.Normal) if (WindowState == FormWindowState.Normal)
{ {
@ -1100,13 +1102,14 @@ namespace BizHawk.Client.EmuHawk
.OfType<ToolStripMenuItem>() .OfType<ToolStripMenuItem>()
.First(x => x.Name == "GeneratedColumnsSubMenu")); .First(x => x.Name == "GeneratedColumnsSubMenu"));
RamWatchMenu.Items.Add(WatchListView.ToColumnsMenu()); RamWatchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback));
Global.Config.DisplayRamWatch = false; Global.Config.DisplayRamWatch = false;
RefreshFloatingWindowControl(Settings.FloatingWindow); RefreshFloatingWindowControl(Settings.FloatingWindow);
// InputRoll TODO
//LoadColumnInfo(WatchListView, Settings.Columns); WatchListView.AllColumns.Clear();
SetColumns();
} }
#endregion #endregion
@ -1118,7 +1121,7 @@ namespace BizHawk.Client.EmuHawk
TopMost = Settings.TopMost; TopMost = Settings.TopMost;
_watches = new WatchList(MemoryDomains, Emu.SystemId); _watches = new WatchList(MemoryDomains, Emu.SystemId);
LoadConfigSettings(); LoadConfigSettings();
RamWatchMenu.Items.Add(WatchListView.ToColumnsMenu()); RamWatchMenu.Items.Add(WatchListView.ToColumnsMenu(ColumnToggleCallback));
UpdateStatusBar(); UpdateStatusBar();
PokeAddressToolBarItem.Enabled = PokeAddressToolBarItem.Enabled =
@ -1129,9 +1132,7 @@ namespace BizHawk.Client.EmuHawk
private void ColumnToggleCallback() private void ColumnToggleCallback()
{ {
//Input Roll TODO Settings.Columns = WatchListView.AllColumns;
//SaveColumnInfo(WatchListView, Settings.Columns);
//LoadColumnInfo(WatchListView, Settings.Columns);
} }
private void NewRamWatch_Activated(object sender, EventArgs e) private void NewRamWatch_Activated(object sender, EventArgs e)