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

Ram Watch/Search - disable poke and freeze toolbar items based on writability of a domain, also smarter enabling/disabling of them in general

This commit is contained in:
adelikat 2015-01-25 16:07:15 +00:00
parent 4a39b5a619
commit e51ffd95d8
4 changed files with 65 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,8 +425,14 @@ namespace BizHawk.Client.EmuHawk
DoSearchToolButton.Enabled =
CopyValueToPrevToolBarItem.Enabled =
_searches.Count > 0;
UpdateUndoToolBarButtons();
OutOfRangeCheck();
PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() &&
_searches.Domain.CanPoke();
}
private int? CompareToValue
@ -1690,9 +1696,12 @@ namespace BizHawk.Client.EmuHawk
{
RemoveToolBarItem.Enabled =
AddToRamWatchToolBarItem.Enabled =
PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any();
PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() &&
_searches.Domain.CanPoke();
}
private void WatchListView_Enter(object sender, EventArgs e)

53
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.Designer.cs generated
View File

@ -57,8 +57,8 @@
this.cutToolStripButton = new System.Windows.Forms.ToolStripButton();
this.clearChangeCountsToolStripButton = new System.Windows.Forms.ToolStripButton();
this.duplicateWatchToolStripButton = new System.Windows.Forms.ToolStripButton();
this.pokeToolStripButton = new System.Windows.Forms.ToolStripButton();
this.freezeToolStripButton = new System.Windows.Forms.ToolStripButton();
this.PokeAddressToolBarItem = new System.Windows.Forms.ToolStripButton();
this.FreezeAddressToolBarItem = new System.Windows.Forms.ToolStripButton();
this.seperatorToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.moveUpToolStripButton = new System.Windows.Forms.ToolStripButton();
@ -290,8 +290,8 @@
this.cutToolStripButton,
this.clearChangeCountsToolStripButton,
this.duplicateWatchToolStripButton,
this.pokeToolStripButton,
this.freezeToolStripButton,
this.PokeAddressToolBarItem,
this.FreezeAddressToolBarItem,
this.seperatorToolStripButton,
this.toolStripSeparator6,
this.moveUpToolStripButton,
@ -393,26 +393,26 @@
this.duplicateWatchToolStripButton.Text = "Duplicate Watch";
this.duplicateWatchToolStripButton.Click += new System.EventHandler(this.DuplicateWatchMenuItem_Click);
//
// pokeToolStripButton
// PokeAddressToolBarItem
//
this.pokeToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.pokeToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.pokeToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.pokeToolStripButton.Name = "pokeToolStripButton";
this.pokeToolStripButton.Size = new System.Drawing.Size(23, 22);
this.pokeToolStripButton.Text = "toolStripButton2";
this.pokeToolStripButton.ToolTipText = "Poke address";
this.pokeToolStripButton.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
this.PokeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.PokeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.PokeAddressToolBarItem.Name = "PokeAddressToolBarItem";
this.PokeAddressToolBarItem.Size = new System.Drawing.Size(23, 22);
this.PokeAddressToolBarItem.Text = "toolStripButton2";
this.PokeAddressToolBarItem.ToolTipText = "Poke address";
this.PokeAddressToolBarItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
//
// freezeToolStripButton
// FreezeAddressToolBarItem
//
this.freezeToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.freezeToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.freezeToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.freezeToolStripButton.Name = "freezeToolStripButton";
this.freezeToolStripButton.Size = new System.Drawing.Size(23, 22);
this.freezeToolStripButton.Text = "Freeze Address";
this.freezeToolStripButton.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
this.FreezeAddressToolBarItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.FreezeAddressToolBarItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeAddressToolBarItem.ImageTransparentColor = System.Drawing.Color.Magenta;
this.FreezeAddressToolBarItem.Name = "FreezeAddressToolBarItem";
this.FreezeAddressToolBarItem.Size = new System.Drawing.Size(23, 22);
this.FreezeAddressToolBarItem.Text = "Freeze Address";
this.FreezeAddressToolBarItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
//
// seperatorToolStripButton
//
@ -461,11 +461,11 @@
this.pauseToolStripButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Pause;
this.pauseToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.pauseToolStripButton.Name = "pauseToolStripButton";
this.pauseToolStripButton.Size = new System.Drawing.Size(23, 22);
this.pauseToolStripButton.Size = new System.Drawing.Size(23, 20);
this.pauseToolStripButton.Text = "Pause";
this.pauseToolStripButton.Click += new System.EventHandler(this.PauseMenuItem_Click);
//
// menuStrip1
// RamWatchMenu
//
this.RamWatchMenu.ClickThrough = true;
this.RamWatchMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@ -473,7 +473,7 @@
this.WatchesSubMenu,
this.OptionsSubMenu});
this.RamWatchMenu.Location = new System.Drawing.Point(0, 0);
this.RamWatchMenu.Name = "menuStrip1";
this.RamWatchMenu.Name = "RamWatchMenu";
this.RamWatchMenu.Size = new System.Drawing.Size(364, 24);
this.RamWatchMenu.TabIndex = 3;
this.RamWatchMenu.Text = "menuStrip1";
@ -843,6 +843,7 @@
this.WatchListView.UseCustomBackground = true;
this.WatchListView.View = System.Windows.Forms.View.Details;
this.WatchListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.WatchListView_ColumnClick);
this.WatchListView.SelectedIndexChanged += new System.EventHandler(this.WatchListView_SelectedIndexChanged);
this.WatchListView.DragDrop += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragDrop);
this.WatchListView.DragEnter += new System.Windows.Forms.DragEventHandler(this.NewRamWatch_DragEnter);
this.WatchListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.WatchListView_KeyDown);
@ -979,8 +980,8 @@
private System.Windows.Forms.ToolStripButton cutToolStripButton;
private System.Windows.Forms.ToolStripButton clearChangeCountsToolStripButton;
private System.Windows.Forms.ToolStripButton duplicateWatchToolStripButton;
private System.Windows.Forms.ToolStripButton pokeToolStripButton;
private System.Windows.Forms.ToolStripButton freezeToolStripButton;
private System.Windows.Forms.ToolStripButton PokeAddressToolBarItem;
private System.Windows.Forms.ToolStripButton FreezeAddressToolBarItem;
private System.Windows.Forms.ToolStripButton seperatorToolStripButton;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripButton moveUpToolStripButton;

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

@ -197,6 +197,11 @@ namespace BizHawk.Client.EmuHawk
Global.Config.RecentWatches.Add(_watches.CurrentFileName);
SetMemoryDomain(_watches.Domain.ToString());
UpdateStatusBar();
PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() &&
SelectedWatches.All(w => w.Domain.CanPoke());
}
}
}
@ -469,6 +474,11 @@ namespace BizHawk.Client.EmuHawk
UpdateStatusBar();
_sortReverse = false;
_sortedColumn = string.Empty;
PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() &&
SelectedWatches.All(w => w.Domain.CanPoke());
}
}
@ -962,6 +972,11 @@ namespace BizHawk.Client.EmuHawk
LoadConfigSettings();
RamWatchMenu.Items.Add(Settings.Columns.GenerateColumnsMenu(ColumnToggleCallback));
UpdateStatusBar();
PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() &&
SelectedWatches.All(w => w.Domain.CanPoke());
}
private void ColumnToggleCallback()
@ -1073,6 +1088,14 @@ namespace BizHawk.Client.EmuHawk
}
}
private void WatchListView_SelectedIndexChanged(object sender, EventArgs e)
{
PokeAddressToolBarItem.Enabled =
FreezeAddressToolBarItem.Enabled =
SelectedIndices.Any() &&
SelectedWatches.All(w => w.Domain.CanPoke());
}
private void WatchListView_MouseDoubleClick(object sender, MouseEventArgs e)
{
EditWatch();

8
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.resx
View File

@ -118,13 +118,13 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="ListViewContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>336, 17</value>
<value>264, 17</value>
</metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>506, 17</value>
<value>434, 17</value>
</metadata>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>231, 17</value>
<value>159, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="newToolStripButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -212,7 +212,7 @@
FF7bIVJVZ0N/soPK421UHGstlFvYd/hWecF/Qqf7CR0A5wwgSQA2AAAAAElFTkSuQmCC
</value>
</data>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<metadata name="RamWatchMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">