diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 9a3cdc3fef..14b529fcaa 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -203,6 +203,12 @@ public int CheatsValueWidth = -1; public int CheatsDomainWidth = -1; public int CheatsOnWidth = -1; + public int CheatsNameIndex = 0; + public int CheatsAddressIndex = 1; + public int CheatsValueIndex = 2; + public int CheatsDomainIndex = 3; + public int CheatsOnIndex = 4; + // TAStudio Dialog public bool TAStudioSaveWindowPosition = true; diff --git a/BizHawk.MultiClient/tools/Cheats.Designer.cs b/BizHawk.MultiClient/tools/Cheats.Designer.cs index c38b8c1259..c483278d51 100644 --- a/BizHawk.MultiClient/tools/Cheats.Designer.cs +++ b/BizHawk.MultiClient/tools/Cheats.Designer.cs @@ -127,7 +127,7 @@ this.toolStripSeparator1, this.exitToolStripMenuItem}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); + this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.fileToolStripMenuItem_DropDownOpened); // @@ -135,7 +135,7 @@ // this.newToolStripMenuItem.Name = "newToolStripMenuItem"; this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.newToolStripMenuItem.Text = "&New"; this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); // @@ -143,7 +143,7 @@ // this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.openToolStripMenuItem.Text = "&Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); // @@ -151,7 +151,7 @@ // this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.saveToolStripMenuItem.Text = "&Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // @@ -160,14 +160,14 @@ this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) | System.Windows.Forms.Keys.S))); - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.saveAsToolStripMenuItem.Text = "Save &As..."; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveAsToolStripMenuItem_Click); // // appendFileToolStripMenuItem // this.appendFileToolStripMenuItem.Name = "appendFileToolStripMenuItem"; - this.appendFileToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.appendFileToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.appendFileToolStripMenuItem.Text = "Append File"; this.appendFileToolStripMenuItem.Click += new System.EventHandler(this.appendFileToolStripMenuItem_Click); // @@ -178,37 +178,37 @@ this.toolStripSeparator4, this.clearToolStripMenuItem}); this.recentToolStripMenuItem.Name = "recentToolStripMenuItem"; - this.recentToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.recentToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.recentToolStripMenuItem.Text = "Recent"; this.recentToolStripMenuItem.DropDownOpened += new System.EventHandler(this.recentToolStripMenuItem_DropDownOpened); // // noneToolStripMenuItem // this.noneToolStripMenuItem.Name = "noneToolStripMenuItem"; - this.noneToolStripMenuItem.Size = new System.Drawing.Size(110, 22); + this.noneToolStripMenuItem.Size = new System.Drawing.Size(103, 22); this.noneToolStripMenuItem.Text = "None"; // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(107, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(100, 6); // // clearToolStripMenuItem // this.clearToolStripMenuItem.Name = "clearToolStripMenuItem"; - this.clearToolStripMenuItem.Size = new System.Drawing.Size(110, 22); + this.clearToolStripMenuItem.Size = new System.Drawing.Size(103, 22); this.clearToolStripMenuItem.Text = "Clear"; // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(201, 6); + this.toolStripSeparator1.Size = new System.Drawing.Size(192, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(195, 22); this.exitToolStripMenuItem.Text = "E&xit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -225,13 +225,13 @@ this.toolStripSeparator6, this.disableAllCheatsToolStripMenuItem}); this.cheatsToolStripMenuItem.Name = "cheatsToolStripMenuItem"; - this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(53, 20); + this.cheatsToolStripMenuItem.Size = new System.Drawing.Size(55, 20); this.cheatsToolStripMenuItem.Text = "&Cheats"; // // addCheatToolStripMenuItem // this.addCheatToolStripMenuItem.Name = "addCheatToolStripMenuItem"; - this.addCheatToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.addCheatToolStripMenuItem.Size = new System.Drawing.Size(193, 22); this.addCheatToolStripMenuItem.Text = "&Add Cheat"; this.addCheatToolStripMenuItem.Click += new System.EventHandler(this.addCheatToolStripMenuItem_Click); // @@ -239,7 +239,7 @@ // this.removeCheatToolStripMenuItem.Name = "removeCheatToolStripMenuItem"; this.removeCheatToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); - this.removeCheatToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.removeCheatToolStripMenuItem.Size = new System.Drawing.Size(193, 22); this.removeCheatToolStripMenuItem.Text = "&Remove Cheat"; this.removeCheatToolStripMenuItem.Click += new System.EventHandler(this.removeCheatToolStripMenuItem_Click); // @@ -247,7 +247,7 @@ // this.duplicateToolStripMenuItem.Name = "duplicateToolStripMenuItem"; this.duplicateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(193, 22); this.duplicateToolStripMenuItem.Text = "&Duplicate"; this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.duplicateToolStripMenuItem_Click); // @@ -255,20 +255,20 @@ // this.insertSeparatorToolStripMenuItem.Name = "insertSeparatorToolStripMenuItem"; this.insertSeparatorToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); - this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.insertSeparatorToolStripMenuItem.Size = new System.Drawing.Size(193, 22); this.insertSeparatorToolStripMenuItem.Text = "Insert Separator"; this.insertSeparatorToolStripMenuItem.Click += new System.EventHandler(this.insertSeparatorToolStripMenuItem_Click); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(198, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(190, 6); // // moveUpToolStripMenuItem // this.moveUpToolStripMenuItem.Name = "moveUpToolStripMenuItem"; this.moveUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U))); - this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.moveUpToolStripMenuItem.Size = new System.Drawing.Size(193, 22); this.moveUpToolStripMenuItem.Text = "Move &Up"; this.moveUpToolStripMenuItem.Click += new System.EventHandler(this.moveUpToolStripMenuItem_Click); // @@ -276,19 +276,19 @@ // this.moveDownToolStripMenuItem.Name = "moveDownToolStripMenuItem"; this.moveDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D))); - this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.moveDownToolStripMenuItem.Size = new System.Drawing.Size(193, 22); this.moveDownToolStripMenuItem.Text = "Move &Down"; this.moveDownToolStripMenuItem.Click += new System.EventHandler(this.moveDownToolStripMenuItem_Click); // // toolStripSeparator6 // this.toolStripSeparator6.Name = "toolStripSeparator6"; - this.toolStripSeparator6.Size = new System.Drawing.Size(198, 6); + this.toolStripSeparator6.Size = new System.Drawing.Size(190, 6); // // disableAllCheatsToolStripMenuItem // this.disableAllCheatsToolStripMenuItem.Name = "disableAllCheatsToolStripMenuItem"; - this.disableAllCheatsToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.disableAllCheatsToolStripMenuItem.Size = new System.Drawing.Size(193, 22); this.disableAllCheatsToolStripMenuItem.Text = "Disable all Cheats"; this.disableAllCheatsToolStripMenuItem.Click += new System.EventHandler(this.disableAllCheatsToolStripMenuItem_Click); // @@ -303,54 +303,54 @@ this.toolStripSeparator5, this.restoreWindowSizeToolStripMenuItem}); this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20); this.optionsToolStripMenuItem.Text = "&Options"; this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); // // LoadCheatFileByGameToolStripMenuItem // this.LoadCheatFileByGameToolStripMenuItem.Name = "LoadCheatFileByGameToolStripMenuItem"; - this.LoadCheatFileByGameToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.LoadCheatFileByGameToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.LoadCheatFileByGameToolStripMenuItem.Text = "Load Cheat File by Game"; this.LoadCheatFileByGameToolStripMenuItem.Click += new System.EventHandler(this.LoadCheatFileByGameToolStripMenuItem_Click); // // saveCheatsOnCloseToolStripMenuItem // this.saveCheatsOnCloseToolStripMenuItem.Name = "saveCheatsOnCloseToolStripMenuItem"; - this.saveCheatsOnCloseToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.saveCheatsOnCloseToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.saveCheatsOnCloseToolStripMenuItem.Text = "Save Cheats on Close"; this.saveCheatsOnCloseToolStripMenuItem.Click += new System.EventHandler(this.saveCheatsOnCloseToolStripMenuItem_Click); // // CheatsOnOffLoadToolStripMenuItem // this.CheatsOnOffLoadToolStripMenuItem.Name = "CheatsOnOffLoadToolStripMenuItem"; - this.CheatsOnOffLoadToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.CheatsOnOffLoadToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.CheatsOnOffLoadToolStripMenuItem.Text = "Disable Cheats on Load"; this.CheatsOnOffLoadToolStripMenuItem.Click += new System.EventHandler(this.CheatsOnOffLoadToolStripMenuItem_Click); // // autoloadDialogToolStripMenuItem // this.autoloadDialogToolStripMenuItem.Name = "autoloadDialogToolStripMenuItem"; - this.autoloadDialogToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.autoloadDialogToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.autoloadDialogToolStripMenuItem.Text = "Auto-load Dialog"; this.autoloadDialogToolStripMenuItem.Click += new System.EventHandler(this.autoloadDialogToolStripMenuItem_Click); // // saveWindowPositionToolStripMenuItem // this.saveWindowPositionToolStripMenuItem.Name = "saveWindowPositionToolStripMenuItem"; - this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.saveWindowPositionToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.saveWindowPositionToolStripMenuItem.Text = "Save Window Position"; this.saveWindowPositionToolStripMenuItem.Click += new System.EventHandler(this.saveWindowPositionToolStripMenuItem_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(201, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(202, 6); // // restoreWindowSizeToolStripMenuItem // this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; - this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(204, 22); + this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(205, 22); this.restoreWindowSizeToolStripMenuItem.Text = "Restore Default Settings"; this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); // @@ -643,6 +643,7 @@ this.CheatListView.TabIndex = 0; this.CheatListView.UseCompatibleStateImageBehavior = false; this.CheatListView.View = System.Windows.Forms.View.Details; + this.CheatListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.ColumnReorder); this.CheatListView.Click += new System.EventHandler(this.CheatListView_Click); this.CheatListView.SelectedIndexChanged += new System.EventHandler(this.CheatListView_SelectedIndexChanged); this.CheatListView.DoubleClick += new System.EventHandler(this.CheatListView_DoubleClick); @@ -680,26 +681,26 @@ this.removeSelectedToolStripMenuItem, this.disableAllCheatsToolStripMenuItem1}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(171, 70); + this.contextMenuStrip1.Size = new System.Drawing.Size(169, 70); // // toggleToolStripMenuItem // this.toggleToolStripMenuItem.Name = "toggleToolStripMenuItem"; - this.toggleToolStripMenuItem.Size = new System.Drawing.Size(170, 22); + this.toggleToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.toggleToolStripMenuItem.Text = "Toggle"; this.toggleToolStripMenuItem.Click += new System.EventHandler(this.toggleToolStripMenuItem_Click); // // removeSelectedToolStripMenuItem // this.removeSelectedToolStripMenuItem.Name = "removeSelectedToolStripMenuItem"; - this.removeSelectedToolStripMenuItem.Size = new System.Drawing.Size(170, 22); + this.removeSelectedToolStripMenuItem.Size = new System.Drawing.Size(168, 22); this.removeSelectedToolStripMenuItem.Text = "Remove Selected"; this.removeSelectedToolStripMenuItem.Click += new System.EventHandler(this.removeSelectedToolStripMenuItem_Click); // // disableAllCheatsToolStripMenuItem1 // this.disableAllCheatsToolStripMenuItem1.Name = "disableAllCheatsToolStripMenuItem1"; - this.disableAllCheatsToolStripMenuItem1.Size = new System.Drawing.Size(170, 22); + this.disableAllCheatsToolStripMenuItem1.Size = new System.Drawing.Size(168, 22); this.disableAllCheatsToolStripMenuItem1.Text = "Disable All Cheats"; this.disableAllCheatsToolStripMenuItem1.Click += new System.EventHandler(this.disableAllCheatsToolStripMenuItem1_Click); // diff --git a/BizHawk.MultiClient/tools/Cheats.cs b/BizHawk.MultiClient/tools/Cheats.cs index e16e39fac3..701011747e 100644 --- a/BizHawk.MultiClient/tools/Cheats.cs +++ b/BizHawk.MultiClient/tools/Cheats.cs @@ -223,13 +223,15 @@ namespace BizHawk.MultiClient private void LoadConfigSettings() { + ColumnPositionSet(); + defaultWidth = Size.Width; //Save these first so that the user can restore to its original size defaultHeight = Size.Height; - defaultNameWidth = CheatListView.Columns[0].Width; - defaultAddressWidth = CheatListView.Columns[1].Width; - defaultValueWidth = CheatListView.Columns[2].Width; - defaultDomainWidth = CheatListView.Columns[3].Width; - defaultOnWidth = CheatListView.Columns[4].Width; + defaultNameWidth = CheatListView.Columns[Global.Config.CheatsNameIndex].Width; + defaultAddressWidth = CheatListView.Columns[Global.Config.CheatsAddressIndex].Width; + defaultValueWidth = CheatListView.Columns[Global.Config.CheatsValueIndex].Width; + defaultDomainWidth = CheatListView.Columns[Global.Config.CheatsDomainIndex].Width; + defaultOnWidth = CheatListView.Columns[Global.Config.CheatsOnIndex].Width; if (Global.Config.CheatsSaveWindowPosition && Global.Config.CheatsWndx >= 0 && Global.Config.CheatsWndy >= 0) Location = new Point(Global.Config.CheatsWndx, Global.Config.CheatsWndy); @@ -240,29 +242,30 @@ namespace BizHawk.MultiClient } if (Global.Config.CheatsNameWidth > 0) - CheatListView.Columns[0].Width = Global.Config.CheatsNameWidth; + CheatListView.Columns[Global.Config.CheatsNameIndex].Width = Global.Config.CheatsNameWidth; if (Global.Config.CheatsAddressWidth > 0) - CheatListView.Columns[1].Width = Global.Config.CheatsAddressWidth; + CheatListView.Columns[Global.Config.CheatsAddressIndex].Width = Global.Config.CheatsAddressWidth; if (Global.Config.CheatsValueWidth > 0) - CheatListView.Columns[2].Width = Global.Config.CheatsValueWidth; + CheatListView.Columns[Global.Config.CheatsValueIndex].Width = Global.Config.CheatsValueWidth; if (Global.Config.CheatsDomainWidth > 0) - CheatListView.Columns[3].Width = Global.Config.CheatsDomainWidth; + CheatListView.Columns[Global.Config.CheatsDomainIndex].Width = Global.Config.CheatsDomainWidth; if (Global.Config.CheatsOnWidth > 0) - CheatListView.Columns[4].Width = Global.Config.CheatsOnWidth; + CheatListView.Columns[Global.Config.CheatsOnIndex].Width = Global.Config.CheatsOnWidth; } public void SaveConfigSettings() { + ColumnPositionSet(); Global.Config.CheatsWndx = this.Location.X; Global.Config.CheatsWndy = this.Location.Y; Global.Config.CheatsWidth = this.Right - this.Left; Global.Config.CheatsHeight = this.Bottom - this.Top; - Global.Config.CheatsNameWidth = CheatListView.Columns[0].Width; - Global.Config.CheatsAddressWidth = CheatListView.Columns[1].Width; - Global.Config.CheatsValueWidth = CheatListView.Columns[2].Width; - Global.Config.CheatsDomainWidth = CheatListView.Columns[3].Width; - Global.Config.CheatsOnWidth = CheatListView.Columns[4].Width; + Global.Config.CheatsNameWidth = CheatListView.Columns[Global.Config.CheatsNameIndex].Width; + Global.Config.CheatsAddressWidth = CheatListView.Columns[Global.Config.CheatsAddressIndex].Width; + Global.Config.CheatsValueWidth = CheatListView.Columns[Global.Config.CheatsValueIndex].Width; + Global.Config.CheatsDomainWidth = CheatListView.Columns[Global.Config.CheatsDomainIndex].Width; + Global.Config.CheatsOnWidth = CheatListView.Columns[Global.Config.CheatsOnIndex].Width; if (Global.Config.CheatsAutoSaveOnClose) { @@ -861,6 +864,12 @@ namespace BizHawk.MultiClient private void restoreWindowSizeToolStripMenuItem_Click(object sender, EventArgs e) { this.Size = new System.Drawing.Size(defaultWidth, defaultHeight); + Global.Config.CheatsNameIndex = 0; + Global.Config.CheatsAddressIndex = 1; + Global.Config.CheatsValueIndex = 2; + Global.Config.CheatsDomainIndex = 3; + Global.Config.CheatsOnIndex = 4; + ColumnPositionSet(); CheatListView.Columns[0].Width = defaultNameWidth; CheatListView.Columns[1].Width = defaultAddressWidth; CheatListView.Columns[2].Width = defaultValueWidth; @@ -953,5 +962,87 @@ namespace BizHawk.MultiClient { Global.Config.CheatsAutoSaveOnClose ^= true; } + + private void ColumnReorder(object sender, ColumnReorderedEventArgs e) + { + ColumnHeader header = e.Header; + + int lowIndex = 0; + int highIndex = 0; + int changeIndex = 0; + if (e.NewDisplayIndex > e.OldDisplayIndex) + { + changeIndex = -1; + highIndex = e.NewDisplayIndex; + lowIndex = e.OldDisplayIndex; + } + else + { + changeIndex = 1; + highIndex = e.OldDisplayIndex; + lowIndex = e.NewDisplayIndex; + } + + + if (Global.Config.CheatsNameIndex >= lowIndex && Global.Config.CheatsNameIndex <= highIndex) + Global.Config.CheatsNameIndex += changeIndex; + if (Global.Config.CheatsAddressIndex >= lowIndex && Global.Config.CheatsAddressIndex <= highIndex) + Global.Config.CheatsAddressIndex += changeIndex; + if (Global.Config.CheatsValueIndex >= lowIndex && Global.Config.CheatsValueIndex <= highIndex) + Global.Config.CheatsValueIndex += changeIndex; + if (Global.Config.CheatsDomainIndex >= lowIndex && Global.Config.CheatsDomainIndex <= highIndex) + Global.Config.CheatsDomainIndex += changeIndex; + if (Global.Config.CheatsOnIndex >= lowIndex && Global.Config.CheatsOnIndex <= highIndex) + Global.Config.CheatsOnIndex += changeIndex; + + if (header.Text == "Name") + Global.Config.CheatsNameIndex = e.NewDisplayIndex; + else if (header.Text == "Address") + Global.Config.CheatsAddressIndex = e.NewDisplayIndex; + else if (header.Text == "Value") + Global.Config.CheatsValueIndex = e.NewDisplayIndex; + else if (header.Text == "Domain") + Global.Config.CheatsDomainIndex = e.NewDisplayIndex; + else if (header.Text == "On") + Global.Config.CheatsOnIndex = e.NewDisplayIndex; + } + + private void ColumnPositionSet() + { + List columnHeaders = new List(); + int i = 0; + for (i = 0; i < CheatListView.Columns.Count; i++) + columnHeaders.Add(CheatListView.Columns[i]); + + CheatListView.Columns.Clear(); + + i = 0; + do + { + string column = ""; + if (Global.Config.CheatsNameIndex == i) + column = "Name"; + else if (Global.Config.CheatsAddressIndex == i) + column = "Address"; + else if (Global.Config.CheatsValueIndex == i) + column = "Value"; + else if (Global.Config.CheatsDomainIndex == i) + column = "Domain"; + else if (Global.Config.CheatsOnIndex == i) + column = "On"; + + for (int k = 0; k < columnHeaders.Count(); k++) + { + if (columnHeaders[k].Text == column) + { + CheatListView.Columns.Add(columnHeaders[k]); + columnHeaders.Remove(columnHeaders[k]); + break; + + } + } + i++; + } while (columnHeaders.Count() > 0); + } } } diff --git a/BizHawk.MultiClient/tools/Cheats.resx b/BizHawk.MultiClient/tools/Cheats.resx index 8354236fa1..8a606c5df6 100644 --- a/BizHawk.MultiClient/tools/Cheats.resx +++ b/BizHawk.MultiClient/tools/Cheats.resx @@ -127,60 +127,58 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAQ9JREFUOE+t09lq - wkAUBmBfyr5DfY32jaReSOmFCyKCgkKLFrVUBZeKiEbshqRuaNw1xiXmLxMJBJ0Zc+GBw9zMfDPnHMZm - u1ZE35s4zXCqjmC8Al+sgHLjD9y7yGFWPIbecOO45yORtMAEHnxxJHL1IyKI9JeEXqtMwOl50Q8bSS0l - 8PzBBPbqAQQxICrgjeapgKZpkJUdBmNZB+y3d/QSnsIZKrDdqZjMFYj9OR9wB1NngHrQsJC36EkrfIkT - PuDyJ84AZbOHNF2j1Z2h9i3xAVKfOUjjZssN2oMFmq0xSkLfOmBu3E97iurnENlKxzpgbpzwO0Kh1kOy - KFoDjHmzVuYYjRmTDZfyWh9Yd/4B2Mz2w1z7EGUAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEPSURBVDhPrdPZasJAFAZgX8q+Q32N9o2kXkjphQsigoJC + ixa1VAWXiohG7IakbmjcNcYl5i8TCQSdGXPhgcPczHwz5xzGZrtWRN+bOM1wqo5gvAJfrIBy4w/cu8hh + VjyG3nDjuOcjkbTABB58cSRy9SMiiPSXhF6rTMDpedEPG0ktJfD8wQT26gEEMSAq4I3mqYCmaZCVHQZj + WQfst3f0Ep7CGSqw3amYzBWI/TkfcAdTZ4B60LCQt+hJK3yJEz7g8ifOAGWzhzRdo9WdofYt8QFSnzlI + 42bLDdqDBZqtMUpC3zpgbtxPe4rq5xDZSsc6YG6c8DtCodZDsihaA4x5s1bmGI0Zkw2X8lofWHf+AdjM + 9sNc+xBlAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I - k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC - TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p - AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0 - BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr - UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG - CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5 - F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS - rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt - NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp - 59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W - AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJQSURBVDhPlZNdSNNRGMb/F110ZZEVhVBgeeHNICiiuggp + olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdPKMgr7kApFItTUkWZqVhSVYmao5Nev/xyoQ4k88Nyc + 8z6/93nP4QjCfy6lwc4ltZVso4P/tMyXRcmMHqZ0EeY6jZQVInzuf0e1Tb9Ina3P/tkpLD6XkNg8BJe5 + u93C+HDVrP4M2ZkcMOOw5tLZ9nxJyJE4HSExBoKkBQhVpTrGhso9zNPfiph0JlB+U01ZcRbmwnRMeWlc + 08opUCV6QissGsZ+WOY6z4hmuuXglC6pRYBbJSp+fzXNxnaZ66o1s3rkyKHWruJuWRYOcwZ2kxKr8TI3 + DCkU6+QYNUnuNGWmLEY+5uOK3degoKZcx3SfEvozPfVB3OtNhi4ZvI2nrTIc23U9gtmYwa8eNXzScq8i + l6bHWnfRwhHeREJzGFONgYw/CeB9qQSZNNR9FyUGBT87lfQ3plJj1zLTq4COGDegLVo0HmeqKZjx+gOM + PNzDYPU2lLF+4jhyN6BIl8pgexK3bRpaXopJuhJEwGloiWDmVSgTLw4xWreXoZrtfK/wp/nKak4E+s6/ + hDFHTkd9GndsOdCTBq1i3NdHmWgIYvRpAMO1OxlwSPhi2YpT641CuoWzsSfnAfnZiVRZ1Tjvx9GsF+bU + pF1BvWolD9JXUZmyDnOiD1cvbCZiYXfXCPrMi+gVZ8hOiiL53DHORwdzKnw/hw/uYt9uCTskfvj7+rBp + 41rWr/Fig7fX8j/Tsn/fcgx/ARfG3ml6M3rzAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAixJREFUOE+tk91L - k3EUx/cvdN9N0EW3NTWGa7EaPOUcyqphWBG9PZEv5dJlmqhYmUYtXyBb4dJJy+kknFT4BqZIjaFMJUsz - V7TEoabYRDD49ju/6Pm1Mi+iH5zLz+c855zvo1L9j/fsaRRUvvZltHmX8Ni9gMaGCO47ZlBb8wn22yHc - KJ9CackECgteIy93FBfOB6H0JrC3B6ipXsVGb2V1Dca0XhxOe8JLEXhbF7mgsuLLX3mCIwsr2G1+DrVa - huWQRwjcj+a5oLTk87qCn/D78CLiTD4UXJ7GAXOTEDjrZ7ngku3dH4Jf4ZHJCLZJXlhzxpGa4hSCurth - LsjOGo0R/A4PBsPYrHdDlgMwmRxCUF31kQvkMwFFsB7c4/+ATYkNOHL0BZKSaoXgZuU0urvATgkcP/kK - lmMDfNu0MJqZPps6/4D7cNDSCUmyC8HVskl0+MAyADS5vrG7f0X59Tm+VFoYzZyZEVTg5NR2GAwVQnCl - cByeZuChc40FJwpjek5MmU/YkH6uiHdOTmHwfg/0+jIhsOWNMRiouhPlnUnAQoI4rYSht7MYm5qDnHsN - e41tHNbucUGnKxICiqXjHpTPJgHBZ/Nv4U1oHqGZJVwstiNe72JwI+J3PYA2MV8IMjOG2dzLfOatBg+2 - 7JDQ0tEPX9cguvv8GHg5hH0mC9S6eiQweLumDhqNVQgo06dP9fN4UsIoJHRnOhVtmxZGM1NXKoJ3JmTH - Cv71r/4OTrQ4xWMwWlcAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIsSURBVDhPrZPdS5NxFMf3L3TfTdBFtzU1hmuxGjzlHMqq + YVgRvT2RL+XSZZqoWJlGLV8gW+HSScvpJJxU+AamSI2hTCVLM1e0xKGm2EQw+PY7v+j5tTIvoh+cy8/n + POec76NS/Y/37GkUVL72ZbR5l/DYvYDGhgjuO2ZQW/MJ9tsh3CifQmnJBAoLXiMvdxQXzgeh9Cawtweo + qV7FRm9ldQ3GtF4cTnvCSxF4Wxe5oLLiy195giMLK9htfg61WoblkEcI3I/muaC05PO6gp/w+/Ai4kw+ + FFyexgFzkxA462e54JLt3R+CX+GRyQi2SV5Yc8aRmuIUgrq7YS7IzhqNEfwODwbD2Kx3Q5YDMJkcQlBd + 9ZEL5DMBRbAe3OP/gE2JDThy9AWSkmqF4GblNLq7wE4JHD/5CpZjA3zbtDCamT6bOv+A+3DQ0glJsgvB + 1bJJdPjAMgA0ub6xu39F+fU5vlRaGM2cmRFU4OTUdhgMFUJwpXAcnmbgoXONBScKY3pOTJlP2JB+roh3 + Tk5h8H4P9PoyIbDljTEYqLoT5Z1JwEKCOK2EobezGJuag5x7DXuNbRzW7nFBpysSAoql4x6UzyYBwWfz + b+FNaB6hmSVcLLYjXu9icCPidz2ANjFfCDIzhtncy3zmrQYPtuyQ0NLRD1/XILr7/Bh4OYR9JgvUunok + MHi7pg4ajVUIKNOnT/XzeFLCKCR0ZzoVbZsWRjNTVyqCdyZkxwr+9a/+Dk60OMVjMFpXAAAAAElFTkSu + QmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAeJJREFUOE+lk9FP - klEYxv1TSsecde0f0FpZrTbbal7URVvZuuJCr7pq2WzLNWy0iSHNwtIB9qG0ltLSYRJpBomUgZPMGSyU - 8SmJIOiv7zssCdrAzXd77s77e5/nnPdUVR20HBPfUCWNB4QsI176HB8IL/9iX2y1ubTMwx6utz0nuLhc - GWIfCxT153Z26ep/g9Md4FJLZ2WIZdQnAM4QSJ/BH5Z5aH6NNCljm0hgdSV4MppAPxQXCq5kil31OTx7 - DjLbOeSNNJFYUgBKq31glfpmN76F9QLEZHOJc73ubXQjMreln7Q+DdP/du0/QIsxhmNK5mjTMJ/m43mI - Qcmr5t5MZVlNpFiKrPM1vIbpVVQAOqSckF+ZekUX5UjTS+ouDFLb+CwPUPNupbN7k7WmEDcMX3hgXSpy - IP/OsrCyhXtuA6M0g+bc4wJATqaZ/x7DF4zg8f9g/OMibb355701kERriHL5fojzd2aFjNI0mjPdBUD9 - 6auUqlU/KwBZJV4skWUuvMmYV8b+Ls6jQQ81DfryO3KtfUoA/p3810G37T3VJ3TlARdvukhldjANeemx - z2B8MS0mq80GyySHj98rD2jQOpXbtgrVNprRnO2h5lQX1Sc7leYODh27W3nN9/WZDnroDx0A5wwhdtmt - AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHiSURBVDhPpZPRT5JRGMb9U0rHnHXtH9BaWa0222pe1EVb + 2briQq+6atlsyzVstIkhzcLSAfahtJbS0mESaQaJlIGTzBkslPEpiSDor+87LAnawM13e+7O+3uf55z3 + VFUdtBwT31AljQeELCNe+hwfCC//Yl9stbm0zMMerrc9J7i4XBliHwsU9ed2dunqf4PTHeBSS2dliGXU + JwDOEEifwR+WeWh+jTQpY5tIYHUleDKaQD8UFwquZIpd9Tk8ew4y2znkjTSRWFIASqt9YJX6Zje+hfUC + xGRziXO97m10IzK3pZ+0Pg3T/3btP0CLMYZjSuZo0zCf5uN5iEHJq+beTGVZTaRYiqzzNbyG6VVUADqk + nJBfmXpFF+VI00vqLgxS2/gsD1DzbqWze5O1phA3DF94YF0qciD/zrKwsoV7bgOjNIPm3OMCQE6mmf8e + wxeM4PH/YPzjIm29+ee9NZBEa4hy+X6I83dmhYzSNJoz3QVA/emrlKpVPysAWSVeLJFlLrzJmFfG/i7O + o0EPNQ368jtyrX1KAP6d/NdBt+091Sd05QEXb7pIZXYwDXnpsc9gfDEtJqvNBsskh4/fKw9o0DqV27YK + 1Taa0ZztoeZUF9UnO5XmDg4du1t5zff1mQ566A8dAOcMIXbZrQAAAABJRU5ErkJggg== diff --git a/BizHawk.MultiClient/tools/RamWatch.cs b/BizHawk.MultiClient/tools/RamWatch.cs index 56b47cc793..fdacf73e74 100644 --- a/BizHawk.MultiClient/tools/RamWatch.cs +++ b/BizHawk.MultiClient/tools/RamWatch.cs @@ -112,6 +112,7 @@ namespace BizHawk.MultiClient public void SaveConfigSettings() { + ColumnPositionSet(); Global.Config.RamWatchAddressWidth = WatchListView.Columns[Global.Config.RamWatchAddressIndex].Width; Global.Config.RamWatchValueWidth = WatchListView.Columns[Global.Config.RamWatchValueIndex].Width; Global.Config.RamWatchPrevWidth = WatchListView.Columns[Global.Config.RamWatchPrevIndex].Width; @@ -818,7 +819,9 @@ namespace BizHawk.MultiClient ColumnPositionSet(); showPreviousValueToolStripMenuItem.Checked = false; + Global.Config.RamWatchShowPrevColumn = false; showChangeCountsToolStripMenuItem.Checked = true; + Global.Config.RamWatchShowChangeColumn = true; WatchListView.Columns[0].Width = defaultAddressWidth; WatchListView.Columns[1].Width = defaultValueWidth; WatchListView.Columns[2].Width = 0; @@ -1292,17 +1295,33 @@ namespace BizHawk.MultiClient private void ColumnReorder(object sender, ColumnReorderedEventArgs e) { ColumnHeader header = e.Header; + + int lowIndex = 0; + int highIndex = 0; + int changeIndex = 0; + if (e.NewDisplayIndex > e.OldDisplayIndex) + { + changeIndex = -1; + highIndex = e.NewDisplayIndex; + lowIndex = e.OldDisplayIndex; + } + else + { + changeIndex = 1; + highIndex = e.OldDisplayIndex; + lowIndex = e.NewDisplayIndex; + } - if (Global.Config.RamWatchAddressIndex >= e.NewDisplayIndex && Global.Config.RamWatchAddressIndex < e.OldDisplayIndex) - Global.Config.RamWatchAddressIndex++; - if (Global.Config.RamWatchValueIndex >= e.NewDisplayIndex && Global.Config.RamWatchValueIndex < e.OldDisplayIndex) - Global.Config.RamWatchValueIndex++; - if (Global.Config.RamWatchPrevIndex >= e.NewDisplayIndex && Global.Config.RamWatchPrevIndex < e.OldDisplayIndex) - Global.Config.RamWatchPrevIndex++; - if (Global.Config.RamWatchChangeIndex >= e.NewDisplayIndex && Global.Config.RamWatchChangeIndex < e.OldDisplayIndex) - Global.Config.RamWatchChangeIndex++; - if (Global.Config.RamWatchNotesIndex >= e.NewDisplayIndex && Global.Config.RamWatchNotesIndex < e.OldDisplayIndex) - Global.Config.RamWatchNotesIndex++; + if (Global.Config.RamWatchAddressIndex >= lowIndex && Global.Config.RamWatchAddressIndex <= highIndex) + Global.Config.RamWatchAddressIndex += changeIndex; + if (Global.Config.RamWatchValueIndex >= lowIndex && Global.Config.RamWatchValueIndex <= highIndex) + Global.Config.RamWatchValueIndex += changeIndex; + if (Global.Config.RamWatchPrevIndex >= lowIndex && Global.Config.RamWatchPrevIndex <= highIndex) + Global.Config.RamWatchPrevIndex += changeIndex; + if (Global.Config.RamWatchChangeIndex >= lowIndex && Global.Config.RamWatchChangeIndex <= highIndex) + Global.Config.RamWatchChangeIndex += changeIndex; + if (Global.Config.RamWatchNotesIndex >= lowIndex && Global.Config.RamWatchNotesIndex <= highIndex) + Global.Config.RamWatchNotesIndex += changeIndex; if(header.Text == "Address") Global.Config.RamWatchAddressIndex = e.NewDisplayIndex;