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

Ram Watch - better default column widths and fix restore default settings column widths. Fix reseting of Prev column when changing prev definitions

This commit is contained in:
adelikat 2012-07-05 03:21:39 +00:00
parent af9690baec
commit d65bd2bb0c
2 changed files with 118 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
BizHawk.MultiClient/tools/RamWatch.Designer.cs generated
View File

@ -71,13 +71,6 @@
this.saveWindowPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.WatchListView = new BizHawk.VirtualListView();
this.Address = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Value = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Prev = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.ChangeCounts = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Diff = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Notes = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.removeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@ -93,6 +86,9 @@
this.showChangeCountsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.showPreviousValueToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.showDifferenceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.WatchCountLabel = new System.Windows.Forms.Label();
this.MessageLabel = new System.Windows.Forms.Label();
this.MemDomainLabel = new System.Windows.Forms.Label();
this.toolStrip1 = new ToolStripEx();
this.newToolStripButton = new System.Windows.Forms.ToolStripButton();
this.openToolStripButton = new System.Windows.Forms.ToolStripButton();
@ -109,9 +105,13 @@
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.MoveUpStripButton1 = new System.Windows.Forms.ToolStripButton();
this.MoveDownStripButton1 = new System.Windows.Forms.ToolStripButton();
this.WatchCountLabel = new System.Windows.Forms.Label();
this.MessageLabel = new System.Windows.Forms.Label();
this.MemDomainLabel = new System.Windows.Forms.Label();
this.WatchListView = new BizHawk.VirtualListView();
this.Address = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Value = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Prev = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.ChangeCounts = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Diff = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.Notes = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
this.menuStrip1.SuspendLayout();
this.contextMenuStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
@ -471,74 +471,6 @@
this.restoreWindowSizeToolStripMenuItem.Text = "Restore Default Settings";
this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click);
//
// WatchListView
//
this.WatchListView.AllowColumnReorder = true;
this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.WatchListView.AutoArrange = false;
this.WatchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.Address,
this.Value,
this.Prev,
this.ChangeCounts,
this.Diff,
this.Notes});
this.WatchListView.ContextMenuStrip = this.contextMenuStrip1;
this.WatchListView.FullRowSelect = true;
this.WatchListView.GridLines = true;
this.WatchListView.HideSelection = false;
this.WatchListView.ItemCount = 0;
this.WatchListView.LabelEdit = true;
this.WatchListView.Location = new System.Drawing.Point(16, 76);
this.WatchListView.Name = "WatchListView";
this.WatchListView.selectedItem = -1;
this.WatchListView.Size = new System.Drawing.Size(306, 281);
this.WatchListView.TabIndex = 1;
this.WatchListView.UseCompatibleStateImageBehavior = false;
this.WatchListView.View = System.Windows.Forms.View.Details;
this.WatchListView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.WatchListView_AfterLabelEdit);
this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick);
this.WatchListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.ColumnReorder);
this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick);
//
// Address
//
this.Address.Text = "Address";
//
// Value
//
this.Value.Text = "Value";
this.Value.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.Value.Width = 59;
//
// Prev
//
this.Prev.Text = "Prev";
this.Prev.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.Prev.Width = 0;
//
// ChangeCounts
//
this.ChangeCounts.Text = "Changes";
this.ChangeCounts.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.ChangeCounts.Width = 54;
//
// Diff
//
this.Diff.DisplayIndex = 5;
this.Diff.Text = "Diff";
this.Diff.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.Diff.Width = 59;
//
// Notes
//
this.Notes.DisplayIndex = 4;
this.Notes.Text = "Notes";
this.Notes.Width = 160;
//
// contextMenuStrip1
//
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -564,7 +496,7 @@
//
this.editToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.CutHS;
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
this.editToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.editToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.editToolStripMenuItem.Text = "&Edit";
this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click);
//
@ -572,7 +504,7 @@
//
this.removeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Delete;
this.removeToolStripMenuItem.Name = "removeToolStripMenuItem";
this.removeToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.removeToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.removeToolStripMenuItem.Text = "&Remove";
this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeToolStripMenuItem_Click);
//
@ -580,7 +512,7 @@
//
this.duplicateToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Duplicate;
this.duplicateToolStripMenuItem.Name = "duplicateToolStripMenuItem";
this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.duplicateToolStripMenuItem.Text = "&Duplicate";
this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.duplicateToolStripMenuItem_Click);
//
@ -588,7 +520,7 @@
//
this.pokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.pokeToolStripMenuItem.Name = "pokeToolStripMenuItem";
this.pokeToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.pokeToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.pokeToolStripMenuItem.Text = "&Poke";
this.pokeToolStripMenuItem.Click += new System.EventHandler(this.pokeToolStripMenuItem_Click);
//
@ -596,27 +528,27 @@
//
this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.freezeToolStripMenuItem.Name = "freezeToolStripMenuItem";
this.freezeToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.freezeToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.freezeToolStripMenuItem.Text = "&Freeze";
this.freezeToolStripMenuItem.Click += new System.EventHandler(this.freezeToolStripMenuItem_Click);
//
// viewInHexEditorToolStripMenuItem
//
this.viewInHexEditorToolStripMenuItem.Name = "viewInHexEditorToolStripMenuItem";
this.viewInHexEditorToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.viewInHexEditorToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.viewInHexEditorToolStripMenuItem.Text = "View in Hex Editor";
this.viewInHexEditorToolStripMenuItem.Click += new System.EventHandler(this.viewInHexEditorToolStripMenuItem_Click);
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(227, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(185, 6);
//
// insertSeperatorToolStripMenuItem
//
this.insertSeperatorToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.InsertSeparator;
this.insertSeperatorToolStripMenuItem.Name = "insertSeperatorToolStripMenuItem";
this.insertSeperatorToolStripMenuItem.Size = new System.Drawing.Size(230, 22);
this.insertSeperatorToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.insertSeperatorToolStripMenuItem.Text = "&Insert Separator";
this.insertSeperatorToolStripMenuItem.Click += new System.EventHandler(this.insertSeperatorToolStripMenuItem_Click);
//
@ -624,7 +556,7 @@
//
this.moveUpToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.MoveUp;
this.moveUpToolStripMenuItem1.Name = "moveUpToolStripMenuItem1";
this.moveUpToolStripMenuItem1.Size = new System.Drawing.Size(230, 22);
this.moveUpToolStripMenuItem1.Size = new System.Drawing.Size(188, 22);
this.moveUpToolStripMenuItem1.Text = "Move &Up";
this.moveUpToolStripMenuItem1.Click += new System.EventHandler(this.moveUpToolStripMenuItem1_Click);
//
@ -632,26 +564,26 @@
//
this.moveDownToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.MoveDown;
this.moveDownToolStripMenuItem1.Name = "moveDownToolStripMenuItem1";
this.moveDownToolStripMenuItem1.Size = new System.Drawing.Size(230, 22);
this.moveDownToolStripMenuItem1.Size = new System.Drawing.Size(188, 22);
this.moveDownToolStripMenuItem1.Text = "Move &Down";
this.moveDownToolStripMenuItem1.Click += new System.EventHandler(this.moveDownToolStripMenuItem1_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(227, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(185, 6);
//
// showChangeCountsToolStripMenuItem1
//
this.showChangeCountsToolStripMenuItem1.Name = "showChangeCountsToolStripMenuItem1";
this.showChangeCountsToolStripMenuItem1.Size = new System.Drawing.Size(230, 22);
this.showChangeCountsToolStripMenuItem1.Size = new System.Drawing.Size(188, 22);
this.showChangeCountsToolStripMenuItem1.Text = "Show Change Counts";
this.showChangeCountsToolStripMenuItem1.Click += new System.EventHandler(this.showChangeCountsToolStripMenuItem_Click);
//
// showPreviousValueToolStripMenuItem1
//
this.showPreviousValueToolStripMenuItem1.Name = "showPreviousValueToolStripMenuItem1";
this.showPreviousValueToolStripMenuItem1.Size = new System.Drawing.Size(230, 22);
this.showPreviousValueToolStripMenuItem1.Size = new System.Drawing.Size(188, 22);
this.showPreviousValueToolStripMenuItem1.Text = "Show Previous Value";
this.showPreviousValueToolStripMenuItem1.Click += new System.EventHandler(this.showPreviousValueToolStripMenuItem_Click);
//
@ -662,6 +594,33 @@
this.showDifferenceToolStripMenuItem.Text = "Show Difference";
this.showDifferenceToolStripMenuItem.Click += new System.EventHandler(this.showDifferenceToolStripMenuItem_Click);
//
// WatchCountLabel
//
this.WatchCountLabel.AutoSize = true;
this.WatchCountLabel.Location = new System.Drawing.Point(16, 57);
this.WatchCountLabel.Name = "WatchCountLabel";
this.WatchCountLabel.Size = new System.Drawing.Size(56, 13);
this.WatchCountLabel.TabIndex = 4;
this.WatchCountLabel.Text = "0 watches";
//
// MessageLabel
//
this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.MessageLabel.AutoSize = true;
this.MessageLabel.Location = new System.Drawing.Point(18, 362);
this.MessageLabel.Name = "MessageLabel";
this.MessageLabel.Size = new System.Drawing.Size(187, 13);
this.MessageLabel.TabIndex = 5;
this.MessageLabel.Text = " ";
//
// MemDomainLabel
//
this.MemDomainLabel.AutoSize = true;
this.MemDomainLabel.Location = new System.Drawing.Point(147, 57);
this.MemDomainLabel.Name = "MemDomainLabel";
this.MemDomainLabel.Size = new System.Drawing.Size(0, 13);
this.MemDomainLabel.TabIndex = 6;
//
// toolStrip1
//
this.toolStrip1.ClickThrough = true;
@ -833,32 +792,73 @@
this.MoveDownStripButton1.Text = "Move Down";
this.MoveDownStripButton1.Click += new System.EventHandler(this.MoveDownStripButton1_Click);
//
// WatchCountLabel
// WatchListView
//
this.WatchCountLabel.AutoSize = true;
this.WatchCountLabel.Location = new System.Drawing.Point(16, 57);
this.WatchCountLabel.Name = "WatchCountLabel";
this.WatchCountLabel.Size = new System.Drawing.Size(56, 13);
this.WatchCountLabel.TabIndex = 4;
this.WatchCountLabel.Text = "0 watches";
this.WatchListView.AllowColumnReorder = true;
this.WatchListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.WatchListView.AutoArrange = false;
this.WatchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.Address,
this.Value,
this.Prev,
this.ChangeCounts,
this.Diff,
this.Notes});
this.WatchListView.ContextMenuStrip = this.contextMenuStrip1;
this.WatchListView.FullRowSelect = true;
this.WatchListView.GridLines = true;
this.WatchListView.HideSelection = false;
this.WatchListView.ItemCount = 0;
this.WatchListView.LabelEdit = true;
this.WatchListView.Location = new System.Drawing.Point(16, 76);
this.WatchListView.Name = "WatchListView";
this.WatchListView.selectedItem = -1;
this.WatchListView.Size = new System.Drawing.Size(306, 281);
this.WatchListView.TabIndex = 1;
this.WatchListView.UseCompatibleStateImageBehavior = false;
this.WatchListView.View = System.Windows.Forms.View.Details;
this.WatchListView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.WatchListView_AfterLabelEdit);
this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick);
this.WatchListView.ColumnReordered += new System.Windows.Forms.ColumnReorderedEventHandler(this.ColumnReorder);
this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
this.WatchListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.WatchListView_MouseDoubleClick);
//
// MessageLabel
// Address
//
this.MessageLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.MessageLabel.AutoSize = true;
this.MessageLabel.Location = new System.Drawing.Point(18, 362);
this.MessageLabel.Name = "MessageLabel";
this.MessageLabel.Size = new System.Drawing.Size(187, 13);
this.MessageLabel.TabIndex = 5;
this.MessageLabel.Text = " ";
this.Address.Text = "Address";
//
// MemDomainLabel
// Value
//
this.MemDomainLabel.AutoSize = true;
this.MemDomainLabel.Location = new System.Drawing.Point(147, 57);
this.MemDomainLabel.Name = "MemDomainLabel";
this.MemDomainLabel.Size = new System.Drawing.Size(0, 13);
this.MemDomainLabel.TabIndex = 6;
this.Value.Text = "Value";
this.Value.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.Value.Width = 59;
//
// Prev
//
this.Prev.Text = "Prev";
this.Prev.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.Prev.Width = 0;
//
// ChangeCounts
//
this.ChangeCounts.Text = "Changes";
this.ChangeCounts.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.ChangeCounts.Width = 54;
//
// Diff
//
this.Diff.DisplayIndex = 5;
this.Diff.Text = "Diff";
this.Diff.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.Diff.Width = 59;
//
// Notes
//
this.Notes.DisplayIndex = 4;
this.Notes.Text = "Notes";
this.Notes.Width = 128;
//
// RamWatch
//

12
BizHawk.MultiClient/tools/RamWatch.cs
View File

@ -755,12 +755,12 @@ namespace BizHawk.MultiClient
showChangeCountsToolStripMenuItem.Checked = true;
Global.Config.RamWatchShowChangeColumn = true;
Global.Config.RamWatchShowDiffColumn = false;
WatchListView.Columns[0].Width = defaultAddressWidth;
WatchListView.Columns[1].Width = defaultValueWidth;
WatchListView.Columns[0].Width = 60;
WatchListView.Columns[1].Width = 59;
WatchListView.Columns[2].Width = 0;
WatchListView.Columns[3].Width = defaultChangeWidth;
WatchListView.Columns[3].Width = 55;
WatchListView.Columns[4].Width = 0;
WatchListView.Columns[5].Width = NotesWidth;
WatchListView.Columns[5].Width = 128;
Global.Config.DisplayRamWatch = false;
Global.Config.RamWatchSaveWindowPosition = false;
}
@ -1472,13 +1472,13 @@ namespace BizHawk.MultiClient
private void previousFrameToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.RamWatchPrev_Type = 1;
UpdateValues();
WatchListView.Refresh();
}
private void lastChangeToolStripMenuItem_Click(object sender, EventArgs e)
{
Global.Config.RamWatchPrev_Type = 2;
UpdateValues();
WatchListView.Refresh();
}
private void definePreviousValueAsToolStripMenuItem_DropDownOpened(object sender, EventArgs e)