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

Similar fixups to Ram Search and Cheats

This commit is contained in:
adelikat 2014-06-20 18:09:53 +00:00
parent c5518440c1
commit 70fbbd5817
3 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,6 @@
this.CheatListView.UseCompatibleStateImageBehavior = false;
this.CheatListView.View = System.Windows.Forms.View.Details;
this.CheatListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.CheatListView_ColumnClick);
this.CheatListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.CheatListView_ColumnReordered);
this.CheatListView.SelectedIndexChanged += new System.EventHandler(this.CheatListView_SelectedIndexChanged);
this.CheatListView.Click += new System.EventHandler(this.CheatListView_Click);
this.CheatListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewCheatForm_DragDrop);

30
BizHawk.Client.EmuHawk/tools/Cheats/Cheats.cs
View File

@ -707,19 +707,6 @@ namespace BizHawk.Client.EmuHawk
{ "DisplayTypeColumn", 8 },
};
Global.Config.CheatsColumnIndices = new Dictionary<string, int>
{
{ "NamesColumn", 0 },
{ "AddressColumn", 1 },
{ "ValueColumn", 2 },
{ "CompareColumn", 3 },
{ "OnColumn", 4 },
{ "DomainColumn", 5 },
{ "SizeColumn", 6 },
{ "EndianColumn", 7 },
{ "DisplayTypeColumn", 8 },
};
Global.Config.CheatsColumnShow = new Dictionary<string, bool>
{
{ "NamesColumn", true },
@ -733,8 +720,10 @@ namespace BizHawk.Client.EmuHawk
{ "DisplayTypeColumn", false },
};
LoadColumnInfo();
RefreshFloatingWindowControl();
ColumnPositions();
LoadColumnInfo();
}
#endregion
@ -808,19 +797,6 @@ namespace BizHawk.Client.EmuHawk
DoSelectedIndexChange();
}
private void CheatListView_ColumnReordered(object sender, ColumnReorderedEventArgs e)
{
Global.Config.CheatsColumnIndices[NAME] = CheatListView.Columns[NAME].DisplayIndex;
Global.Config.CheatsColumnIndices[ADDRESS] = CheatListView.Columns[ADDRESS].DisplayIndex;
Global.Config.CheatsColumnIndices[VALUE] = CheatListView.Columns[VALUE].DisplayIndex;
Global.Config.CheatsColumnIndices[COMPARE] = CheatListView.Columns[COMPARE].DisplayIndex;
Global.Config.CheatsColumnIndices[ON] = CheatListView.Columns[ON].DisplayIndex;
Global.Config.CheatsColumnIndices[DOMAIN] = CheatListView.Columns[DOMAIN].DisplayIndex;
Global.Config.CheatsColumnIndices[SIZE] = CheatListView.Columns[SIZE].DisplayIndex;
Global.Config.CheatsColumnIndices[ENDIAN] = CheatListView.Columns[ENDIAN].DisplayIndex;
Global.Config.CheatsColumnIndices[TYPE] = CheatListView.Columns[TYPE].DisplayIndex;
}
private void CheatListView_DoubleClick(object sender, EventArgs e)
{
ToggleMenuItem_Click(sender, e);

31
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.cs
View File

@ -1300,16 +1300,23 @@ namespace BizHawk.Client.EmuHawk
{
Size = new Size(_defaultWidth, _defaultHeight);
Global.Config.RamSearchColumnWidths = new Dictionary<string, int>
{
{ "AddressColumn", -1 },
{ "ValueColumn", -1 },
{ "PrevColumn", -1 },
{ "ChangesColumn", -1 },
{ "DiffColumn", -1 },
};
Global.Config.RamSearchColumnIndexes = new Dictionary<string, int>
{
{ "AddressColumn", 0 },
{ "ValueColumn", 1 },
{ "PrevColumn", 2 },
{ "ChangesColumn", 3 },
{ "DiffColumn", 4 },
{ "DomainColumn", 5 },
{ "NotesColumn", 6 },
};
{ "AddressColumn", 0 },
{ "ValueColumn", 1 },
{ "PrevColumn", 2 },
{ "ChangesColumn", 3 },
{ "DiffColumn", 4 },
};
ColumnPositions();
@ -1317,10 +1324,6 @@ namespace BizHawk.Client.EmuHawk
Global.Config.RamSearchShowPrevColumn = true;
Global.Config.RamSearchShowDiffColumn = false;
WatchListView.Columns[WatchList.ADDRESS].Width = _defaultColumnWidths[WatchList.ADDRESS];
WatchListView.Columns[WatchList.VALUE].Width = _defaultColumnWidths[WatchList.VALUE];
WatchListView.Columns[WatchList.CHANGES].Width = _defaultColumnWidths[WatchList.CHANGES];
Global.Config.RamSearchSettings.SaveWindowPosition = true;
Global.Config.RamSearchSettings.TopMost = TopMost = false;
Global.Config.RamSearchSettings.FloatingWindow = false;
@ -1334,7 +1337,7 @@ namespace BizHawk.Client.EmuHawk
{ "DiffColumn", -1 },
};
LoadColumnInfo();
_settings = new RamSearchEngine.Settings();
if (_settings.Mode == RamSearchEngine.Settings.SearchMode.Fast)
@ -1343,6 +1346,8 @@ namespace BizHawk.Client.EmuHawk
}
RefreshFloatingWindowControl();
ColumnPositions();
LoadColumnInfo();
}
#endregion