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

New Cheat list - some settings, and UI cleanup

This commit is contained in:
adelikat 2013-10-05 23:16:35 +00:00
parent 0d278bb67f
commit ab26bbecfc
5 changed files with 102 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.MultiClient/Config.cs
View File

@ -446,7 +446,7 @@ namespace BizHawk.MultiClient
{ "AddressColumn", true },
{ "ValueColumn", true },
{ "CompareColumn", true },
{ "OnColumn", true },
{ "OnColumn", false },
{ "DomainColumn", true },
{ "SizeColumn", true },
{ "EndianColumn", false },

95
BizHawk.MultiClient/tools/Cheats/CheatEdit.Designer.cs generated
View File

@ -33,10 +33,8 @@
this.AddressLabel = new System.Windows.Forms.Label();
this.AddressHexIndLabel = new System.Windows.Forms.Label();
this.AddressBox = new BizHawk.HexTextBox();
this.ValueBox = new BizHawk.MultiClient.WatchValueBox();
this.ValueHexIndLabel = new System.Windows.Forms.Label();
this.ValueLabel = new System.Windows.Forms.Label();
this.CompareBox = new BizHawk.MultiClient.WatchValueBox();
this.CompareHexIndLabel = new System.Windows.Forms.Label();
this.CompareLabel = new System.Windows.Forms.Label();
this.DomainLabel = new System.Windows.Forms.Label();
@ -48,11 +46,13 @@
this.BigEndianCheckBox = new System.Windows.Forms.CheckBox();
this.AddButton = new System.Windows.Forms.Button();
this.EditButton = new System.Windows.Forms.Button();
this.CompareBox = new BizHawk.MultiClient.WatchValueBox();
this.ValueBox = new BizHawk.MultiClient.WatchValueBox();
this.SuspendLayout();
//
// NameBox
//
this.NameBox.Location = new System.Drawing.Point(70, 15);
this.NameBox.Location = new System.Drawing.Point(70, 12);
this.NameBox.Name = "NameBox";
this.NameBox.Size = new System.Drawing.Size(108, 20);
this.NameBox.TabIndex = 5;
@ -60,7 +60,7 @@
// NameLabel
//
this.NameLabel.AutoSize = true;
this.NameLabel.Location = new System.Drawing.Point(12, 18);
this.NameLabel.Location = new System.Drawing.Point(32, 16);
this.NameLabel.Name = "NameLabel";
this.NameLabel.Size = new System.Drawing.Size(35, 13);
this.NameLabel.TabIndex = 4;
@ -69,7 +69,7 @@
// AddressLabel
//
this.AddressLabel.AutoSize = true;
this.AddressLabel.Location = new System.Drawing.Point(38, 45);
this.AddressLabel.Location = new System.Drawing.Point(22, 43);
this.AddressLabel.Name = "AddressLabel";
this.AddressLabel.Size = new System.Drawing.Size(45, 13);
this.AddressLabel.TabIndex = 6;
@ -78,7 +78,7 @@
// AddressHexIndLabel
//
this.AddressHexIndLabel.AutoSize = true;
this.AddressHexIndLabel.Location = new System.Drawing.Point(89, 45);
this.AddressHexIndLabel.Location = new System.Drawing.Point(92, 43);
this.AddressHexIndLabel.Name = "AddressHexIndLabel";
this.AddressHexIndLabel.Size = new System.Drawing.Size(18, 13);
this.AddressHexIndLabel.TabIndex = 8;
@ -87,27 +87,17 @@
// AddressBox
//
this.AddressBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.AddressBox.Location = new System.Drawing.Point(113, 42);
this.AddressBox.Location = new System.Drawing.Point(113, 39);
this.AddressBox.MaxLength = 8;
this.AddressBox.Name = "AddressBox";
this.AddressBox.Nullable = true;
this.AddressBox.Size = new System.Drawing.Size(65, 20);
this.AddressBox.TabIndex = 9;
//
// ValueBox
//
this.ValueBox.ByteSize = BizHawk.MultiClient.Watch.WatchSize.Byte;
this.ValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.ValueBox.Location = new System.Drawing.Point(113, 68);
this.ValueBox.MaxLength = 2;
this.ValueBox.Name = "ValueBox";
this.ValueBox.Size = new System.Drawing.Size(65, 20);
this.ValueBox.TabIndex = 12;
this.ValueBox.Type = BizHawk.MultiClient.Watch.DisplayType.Hex;
//
// ValueHexIndLabel
//
this.ValueHexIndLabel.AutoSize = true;
this.ValueHexIndLabel.Location = new System.Drawing.Point(89, 71);
this.ValueHexIndLabel.Location = new System.Drawing.Point(92, 69);
this.ValueHexIndLabel.Name = "ValueHexIndLabel";
this.ValueHexIndLabel.Size = new System.Drawing.Size(18, 13);
this.ValueHexIndLabel.TabIndex = 11;
@ -116,27 +106,16 @@
// ValueLabel
//
this.ValueLabel.AutoSize = true;
this.ValueLabel.Location = new System.Drawing.Point(38, 71);
this.ValueLabel.Location = new System.Drawing.Point(33, 69);
this.ValueLabel.Name = "ValueLabel";
this.ValueLabel.Size = new System.Drawing.Size(34, 13);
this.ValueLabel.TabIndex = 10;
this.ValueLabel.Text = "Value";
//
// CompareBox
//
this.CompareBox.ByteSize = BizHawk.MultiClient.Watch.WatchSize.Byte;
this.CompareBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.CompareBox.Location = new System.Drawing.Point(113, 94);
this.CompareBox.MaxLength = 2;
this.CompareBox.Name = "CompareBox";
this.CompareBox.Size = new System.Drawing.Size(65, 20);
this.CompareBox.TabIndex = 15;
this.CompareBox.Type = BizHawk.MultiClient.Watch.DisplayType.Hex;
//
// CompareHexIndLabel
//
this.CompareHexIndLabel.AutoSize = true;
this.CompareHexIndLabel.Location = new System.Drawing.Point(89, 97);
this.CompareHexIndLabel.Location = new System.Drawing.Point(92, 95);
this.CompareHexIndLabel.Name = "CompareHexIndLabel";
this.CompareHexIndLabel.Size = new System.Drawing.Size(18, 13);
this.CompareHexIndLabel.TabIndex = 14;
@ -145,7 +124,7 @@
// CompareLabel
//
this.CompareLabel.AutoSize = true;
this.CompareLabel.Location = new System.Drawing.Point(38, 97);
this.CompareLabel.Location = new System.Drawing.Point(18, 95);
this.CompareLabel.Name = "CompareLabel";
this.CompareLabel.Size = new System.Drawing.Size(49, 13);
this.CompareLabel.TabIndex = 13;
@ -154,7 +133,7 @@
// DomainLabel
//
this.DomainLabel.AutoSize = true;
this.DomainLabel.Location = new System.Drawing.Point(12, 124);
this.DomainLabel.Location = new System.Drawing.Point(24, 124);
this.DomainLabel.Name = "DomainLabel";
this.DomainLabel.Size = new System.Drawing.Size(43, 13);
this.DomainLabel.TabIndex = 16;
@ -164,7 +143,7 @@
//
this.DomainDropDown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.DomainDropDown.FormattingEnabled = true;
this.DomainDropDown.Location = new System.Drawing.Point(78, 121);
this.DomainDropDown.Location = new System.Drawing.Point(78, 118);
this.DomainDropDown.Name = "DomainDropDown";
this.DomainDropDown.Size = new System.Drawing.Size(100, 21);
this.DomainDropDown.TabIndex = 17;
@ -173,7 +152,7 @@
// SizeLabel
//
this.SizeLabel.AutoSize = true;
this.SizeLabel.Location = new System.Drawing.Point(20, 150);
this.SizeLabel.Location = new System.Drawing.Point(40, 150);
this.SizeLabel.Name = "SizeLabel";
this.SizeLabel.Size = new System.Drawing.Size(27, 13);
this.SizeLabel.TabIndex = 18;
@ -187,7 +166,7 @@
"1 Byte",
"2 Byte",
"4 Byte"});
this.SizeDropDown.Location = new System.Drawing.Point(78, 147);
this.SizeDropDown.Location = new System.Drawing.Point(78, 144);
this.SizeDropDown.Name = "SizeDropDown";
this.SizeDropDown.Size = new System.Drawing.Size(100, 21);
this.SizeDropDown.TabIndex = 19;
@ -196,11 +175,11 @@
// DisplayTypeLael
//
this.DisplayTypeLael.AutoSize = true;
this.DisplayTypeLael.Location = new System.Drawing.Point(4, 174);
this.DisplayTypeLael.Location = new System.Drawing.Point(11, 174);
this.DisplayTypeLael.Name = "DisplayTypeLael";
this.DisplayTypeLael.Size = new System.Drawing.Size(68, 13);
this.DisplayTypeLael.Size = new System.Drawing.Size(56, 13);
this.DisplayTypeLael.TabIndex = 20;
this.DisplayTypeLael.Text = "Display Type";
this.DisplayTypeLael.Text = "Display As";
//
// DisplayTypeDropDown
//
@ -210,7 +189,7 @@
"1 Byte",
"2 Byte",
"4 Byte"});
this.DisplayTypeDropDown.Location = new System.Drawing.Point(78, 171);
this.DisplayTypeDropDown.Location = new System.Drawing.Point(78, 168);
this.DisplayTypeDropDown.Name = "DisplayTypeDropDown";
this.DisplayTypeDropDown.Size = new System.Drawing.Size(100, 21);
this.DisplayTypeDropDown.TabIndex = 21;
@ -219,7 +198,7 @@
// BigEndianCheckBox
//
this.BigEndianCheckBox.AutoSize = true;
this.BigEndianCheckBox.Location = new System.Drawing.Point(101, 198);
this.BigEndianCheckBox.Location = new System.Drawing.Point(101, 195);
this.BigEndianCheckBox.Name = "BigEndianCheckBox";
this.BigEndianCheckBox.Size = new System.Drawing.Size(77, 17);
this.BigEndianCheckBox.TabIndex = 22;
@ -230,7 +209,7 @@
//
this.AddButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.AddButton.Enabled = false;
this.AddButton.Location = new System.Drawing.Point(7, 226);
this.AddButton.Location = new System.Drawing.Point(7, 220);
this.AddButton.Name = "AddButton";
this.AddButton.Size = new System.Drawing.Size(65, 23);
this.AddButton.TabIndex = 23;
@ -242,7 +221,7 @@
//
this.EditButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.EditButton.Enabled = false;
this.EditButton.Location = new System.Drawing.Point(113, 226);
this.EditButton.Location = new System.Drawing.Point(113, 220);
this.EditButton.Name = "EditButton";
this.EditButton.Size = new System.Drawing.Size(65, 23);
this.EditButton.TabIndex = 24;
@ -250,6 +229,32 @@
this.EditButton.UseVisualStyleBackColor = true;
this.EditButton.Click += new System.EventHandler(this.EditButton_Click);
//
// CompareBox
//
this.CompareBox.ByteSize = BizHawk.MultiClient.Watch.WatchSize.Byte;
this.CompareBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.CompareBox.Location = new System.Drawing.Point(113, 91);
this.CompareBox.MaxLength = 2;
this.CompareBox.Name = "CompareBox";
this.CompareBox.Nullable = true;
this.CompareBox.Size = new System.Drawing.Size(65, 20);
this.CompareBox.TabIndex = 15;
this.CompareBox.Text = "00";
this.CompareBox.Type = BizHawk.MultiClient.Watch.DisplayType.Hex;
//
// ValueBox
//
this.ValueBox.ByteSize = BizHawk.MultiClient.Watch.WatchSize.Byte;
this.ValueBox.CharacterCasing = System.Windows.Forms.CharacterCasing.Upper;
this.ValueBox.Location = new System.Drawing.Point(113, 65);
this.ValueBox.MaxLength = 2;
this.ValueBox.Name = "ValueBox";
this.ValueBox.Nullable = true;
this.ValueBox.Size = new System.Drawing.Size(65, 20);
this.ValueBox.TabIndex = 12;
this.ValueBox.Text = "00";
this.ValueBox.Type = BizHawk.MultiClient.Watch.DisplayType.Hex;
//
// CheatEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -275,7 +280,7 @@
this.Controls.Add(this.NameBox);
this.Controls.Add(this.NameLabel);
this.Name = "CheatEdit";
this.Size = new System.Drawing.Size(200, 266);
this.Size = new System.Drawing.Size(191, 253);
this.Load += new System.EventHandler(this.CheatEdit_Load);
this.ResumeLayout(false);
this.PerformLayout();

3
BizHawk.MultiClient/tools/Cheats/CheatEdit.cs
View File

@ -254,8 +254,9 @@ namespace BizHawk.MultiClient
public void ClearForm()
{
SetFormToDefault();
_cheat = NewCheat.Separator;
_editmode = false;
SetFormToDefault();
}
public NewCheat Cheat

54
BizHawk.MultiClient/tools/Cheats/NewCheatForm.Designer.cs generated
View File

@ -66,8 +66,8 @@
this.GameGenieSeparator = new System.Windows.Forms.ToolStripSeparator();
this.OpenGameGenieEncoderDecoderMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem();
this.LoadCheatFileByGameMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SaveCheatsOnCloseMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AlwaysLoadCheatsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AutoSaveCheatsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.DisableCheatsOnLoadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -100,6 +100,7 @@
this.TotalLabel = new System.Windows.Forms.Label();
this.MessageLabel = new System.Windows.Forms.Label();
this.CheatGroupBox = new System.Windows.Forms.GroupBox();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.CheatEditor = new BizHawk.MultiClient.CheatEdit();
this.contextMenuStrip1.SuspendLayout();
this.CheatsMenu.SuspendLayout();
@ -421,9 +422,10 @@
// OptionsSubMenu
//
this.OptionsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.LoadCheatFileByGameMenuItem,
this.SaveCheatsOnCloseMenuItem,
this.AlwaysLoadCheatsMenuItem,
this.AutoSaveCheatsMenuItem,
this.DisableCheatsOnLoadMenuItem,
this.toolStripSeparator7,
this.AutoloadMenuItem,
this.SaveWindowPositionMenuItem,
this.AlwaysOnTopMenuItem,
@ -434,57 +436,57 @@
this.OptionsSubMenu.Text = "&Options";
this.OptionsSubMenu.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened);
//
// LoadCheatFileByGameMenuItem
// AlwaysLoadCheatsMenuItem
//
this.LoadCheatFileByGameMenuItem.Enabled = false;
this.LoadCheatFileByGameMenuItem.Name = "LoadCheatFileByGameMenuItem";
this.LoadCheatFileByGameMenuItem.Size = new System.Drawing.Size(205, 22);
this.LoadCheatFileByGameMenuItem.Text = "Load Cheat File by Game";
this.AlwaysLoadCheatsMenuItem.Name = "AlwaysLoadCheatsMenuItem";
this.AlwaysLoadCheatsMenuItem.Size = new System.Drawing.Size(199, 22);
this.AlwaysLoadCheatsMenuItem.Text = "Always load cheats";
this.AlwaysLoadCheatsMenuItem.Click += new System.EventHandler(this.AlwaysLoadCheatsMenuItem_Click);
//
// SaveCheatsOnCloseMenuItem
// AutoSaveCheatsMenuItem
//
this.SaveCheatsOnCloseMenuItem.Enabled = false;
this.SaveCheatsOnCloseMenuItem.Name = "SaveCheatsOnCloseMenuItem";
this.SaveCheatsOnCloseMenuItem.Size = new System.Drawing.Size(205, 22);
this.SaveCheatsOnCloseMenuItem.Text = "Save Cheats on Close";
this.AutoSaveCheatsMenuItem.Name = "AutoSaveCheatsMenuItem";
this.AutoSaveCheatsMenuItem.Size = new System.Drawing.Size(199, 22);
this.AutoSaveCheatsMenuItem.Text = "Autosave cheats";
this.AutoSaveCheatsMenuItem.Click += new System.EventHandler(this.AutoSaveCheatsMenuItem_Click);
//
// DisableCheatsOnLoadMenuItem
//
this.DisableCheatsOnLoadMenuItem.Name = "DisableCheatsOnLoadMenuItem";
this.DisableCheatsOnLoadMenuItem.Size = new System.Drawing.Size(205, 22);
this.DisableCheatsOnLoadMenuItem.Size = new System.Drawing.Size(199, 22);
this.DisableCheatsOnLoadMenuItem.Text = "Disable Cheats on Load";
this.DisableCheatsOnLoadMenuItem.Click += new System.EventHandler(this.CheatsOnOffLoadMenuItem_Click);
//
// AutoloadMenuItem
//
this.AutoloadMenuItem.Name = "AutoloadMenuItem";
this.AutoloadMenuItem.Size = new System.Drawing.Size(205, 22);
this.AutoloadMenuItem.Size = new System.Drawing.Size(199, 22);
this.AutoloadMenuItem.Text = "Autoload";
this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click);
//
// SaveWindowPositionMenuItem
//
this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem";
this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(205, 22);
this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22);
this.SaveWindowPositionMenuItem.Text = "Save Window Position";
this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click);
//
// AlwaysOnTopMenuItem
//
this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem";
this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(205, 22);
this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(199, 22);
this.AlwaysOnTopMenuItem.Text = "Always on &Top";
this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(202, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(196, 6);
//
// RestoreWindowSizeMenuItem
//
this.RestoreWindowSizeMenuItem.Name = "RestoreWindowSizeMenuItem";
this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(205, 22);
this.RestoreWindowSizeMenuItem.Size = new System.Drawing.Size(199, 22);
this.RestoreWindowSizeMenuItem.Text = "Restore Default Settings";
this.RestoreWindowSizeMenuItem.Click += new System.EventHandler(this.RestoreWindowSizeMenuItem_Click);
//
@ -725,7 +727,12 @@
this.CheatGroupBox.Size = new System.Drawing.Size(202, 284);
this.CheatGroupBox.TabIndex = 8;
this.CheatGroupBox.TabStop = false;
this.CheatGroupBox.Text = "Cheat";
this.CheatGroupBox.Text = "New Cheat";
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(196, 6);
//
// CheatEditor
//
@ -799,8 +806,8 @@
private System.Windows.Forms.ToolStripSeparator GameGenieSeparator;
private System.Windows.Forms.ToolStripMenuItem OpenGameGenieEncoderDecoderMenuItem;
private System.Windows.Forms.ToolStripMenuItem OptionsSubMenu;
private System.Windows.Forms.ToolStripMenuItem LoadCheatFileByGameMenuItem;
private System.Windows.Forms.ToolStripMenuItem SaveCheatsOnCloseMenuItem;
private System.Windows.Forms.ToolStripMenuItem AlwaysLoadCheatsMenuItem;
private System.Windows.Forms.ToolStripMenuItem AutoSaveCheatsMenuItem;
private System.Windows.Forms.ToolStripMenuItem DisableCheatsOnLoadMenuItem;
private System.Windows.Forms.ToolStripMenuItem AutoloadMenuItem;
private System.Windows.Forms.ToolStripMenuItem SaveWindowPositionMenuItem;
@ -839,5 +846,6 @@
private System.Windows.Forms.ToolStripMenuItem disableAllCheatsToolStripMenuItem;
private System.Windows.Forms.GroupBox CheatGroupBox;
private CheatEdit CheatEditor;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator7;
}
}

21
BizHawk.MultiClient/tools/Cheats/NewCheatForm.cs
View File

@ -491,13 +491,16 @@ namespace BizHawk.MultiClient
private void DoSelectedIndexChange()
{
if (SelectedIndices.Any())
if (SelectedCheats.Any())
{
CheatEditor.SetCheat(Global.CheatList2[SelectedIndices[0]]);
var cheat = SelectedCheats[0];
CheatEditor.SetCheat(cheat);
CheatGroupBox.Text = "Editing Cheat " + cheat.Name + " - " + cheat.AddressStr;
}
else
{
CheatEditor.ClearForm();
CheatGroupBox.Text = "New Cheat";
}
}
@ -663,12 +666,24 @@ namespace BizHawk.MultiClient
private void OptionsSubMenu_DropDownOpened(object sender, EventArgs e)
{
AlwaysLoadCheatsMenuItem.Checked = Global.Config.LoadCheatFileByGame;
AutoSaveCheatsMenuItem.Checked = Global.Config.CheatsAutoSaveOnClose;
DisableCheatsOnLoadMenuItem.Checked = Global.Config.DisableCheatsOnLoad;
AutoloadMenuItem.Checked = Global.Config.RecentCheats.AutoLoad;
SaveWindowPositionMenuItem.Checked = Global.Config.CheatsSaveWindowPosition;
AlwaysOnTopMenuItem.Checked = Global.Config.CheatsAlwaysOnTop;
}
private void AlwaysLoadCheatsMenuItem_Click(object sender, EventArgs e)
{
Global.Config.LoadCheatFileByGame ^= true;
}
private void AutoSaveCheatsMenuItem_Click(object sender, EventArgs e)
{
Global.Config.CheatsAutoSaveOnClose ^= true;
}
private void CheatsOnOffLoadMenuItem_Click(object sender, EventArgs e)
{
Global.Config.DisableCheatsOnLoad ^= true;
@ -727,7 +742,7 @@ namespace BizHawk.MultiClient
{ "AddressColumn", true },
{ "ValueColumn", true },
{ "CompareColumn", true },
{ "OnColumn", true },
{ "OnColumn", false },
{ "DomainColumn", true },
{ "SizeColumn", true },
{ "EndianColumn", false },