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

add FloatingWindow concept to RamSearch tool, which lets you control how it sorts along with the main emuhawk window. it's not entirely ordinary for this to be controllable, but it should certainly be appreciated

This commit is contained in:
zeromus 2014-01-20 05:14:36 +00:00
parent 7a07a910f8
commit 3ab8e60d1b
3 changed files with 109 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Client.Common/config/Config.cs
View File

@ -237,6 +237,7 @@ namespace BizHawk.Client.Common
public int RamSearchChangesIndex = 3;
public bool RamSearchFastMode = false;
public bool RamSearchAlwaysOnTop = false;
public bool RamSearchFloatingWindow = true; //default to the old behaviour
public Dictionary<string, int> RamSearchColumnWidths = new Dictionary<string, int>
{

171
BizHawk.Client.EmuHawk/tools/Watch/RamSearch.Designer.cs generated
View File

@ -157,6 +157,7 @@
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.DisplayTypeDropdown = new System.Windows.Forms.ComboBox();
this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem();
SearchMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ListViewContextMenu.SuspendLayout();
this.menuStrip1.SuspendLayout();
@ -169,7 +170,7 @@
//
SearchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search;
SearchMenuItem.Name = "SearchMenuItem";
SearchMenuItem.Size = new System.Drawing.Size(215, 22);
SearchMenuItem.Size = new System.Drawing.Size(203, 22);
SearchMenuItem.Text = "&Search";
SearchMenuItem.Click += new System.EventHandler(this.SearchMenuItem_Click);
//
@ -189,6 +190,7 @@
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.BlazingFast = false;
this.WatchListView.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
this.AddressColumn,
this.ValueColumn,
@ -257,14 +259,14 @@
this.ContextMenuSeparator3,
this.ClearPreviewContextMenuItem});
this.ListViewContextMenu.Name = "contextMenuStrip1";
this.ListViewContextMenu.Size = new System.Drawing.Size(216, 242);
this.ListViewContextMenu.Size = new System.Drawing.Size(204, 220);
this.ListViewContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.ListViewContextMenu_Opening);
//
// DoSearchContextMenuItem
//
this.DoSearchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.search;
this.DoSearchContextMenuItem.Name = "DoSearchContextMenuItem";
this.DoSearchContextMenuItem.Size = new System.Drawing.Size(215, 22);
this.DoSearchContextMenuItem.Size = new System.Drawing.Size(203, 22);
this.DoSearchContextMenuItem.Text = "&Search";
this.DoSearchContextMenuItem.Click += new System.EventHandler(this.SearchMenuItem_Click);
//
@ -272,21 +274,21 @@
//
this.NewSearchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
this.NewSearchContextMenuItem.Name = "NewSearchContextMenuItem";
this.NewSearchContextMenuItem.Size = new System.Drawing.Size(215, 22);
this.NewSearchContextMenuItem.Size = new System.Drawing.Size(203, 22);
this.NewSearchContextMenuItem.Text = "&Start New Search";
this.NewSearchContextMenuItem.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click);
//
// ContextMenuSeparator1
//
this.ContextMenuSeparator1.Name = "ContextMenuSeparator1";
this.ContextMenuSeparator1.Size = new System.Drawing.Size(212, 6);
this.ContextMenuSeparator1.Size = new System.Drawing.Size(200, 6);
//
// RemoveContextMenuItem
//
this.RemoveContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveContextMenuItem.Name = "RemoveContextMenuItem";
this.RemoveContextMenuItem.ShortcutKeyDisplayString = "Del";
this.RemoveContextMenuItem.Size = new System.Drawing.Size(215, 22);
this.RemoveContextMenuItem.Size = new System.Drawing.Size(203, 22);
this.RemoveContextMenuItem.Text = "Remove Selected";
this.RemoveContextMenuItem.Click += new System.EventHandler(this.RemoveMenuItem_Click);
//
@ -295,7 +297,7 @@
this.AddToRamWatchContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS;
this.AddToRamWatchContextMenuItem.Name = "AddToRamWatchContextMenuItem";
this.AddToRamWatchContextMenuItem.ShortcutKeyDisplayString = "Ctrl+R";
this.AddToRamWatchContextMenuItem.Size = new System.Drawing.Size(215, 22);
this.AddToRamWatchContextMenuItem.Size = new System.Drawing.Size(203, 22);
this.AddToRamWatchContextMenuItem.Text = "Add to Ram Watch";
this.AddToRamWatchContextMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click);
//
@ -304,7 +306,7 @@
this.PokeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeContextMenuItem.Name = "PokeContextMenuItem";
this.PokeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+P";
this.PokeContextMenuItem.Size = new System.Drawing.Size(215, 22);
this.PokeContextMenuItem.Size = new System.Drawing.Size(203, 22);
this.PokeContextMenuItem.Text = "Poke Address";
this.PokeContextMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
//
@ -313,7 +315,7 @@
this.FreezeContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeContextMenuItem.Name = "FreezeContextMenuItem";
this.FreezeContextMenuItem.ShortcutKeyDisplayString = "Ctrl+F";
this.FreezeContextMenuItem.Size = new System.Drawing.Size(215, 22);
this.FreezeContextMenuItem.Size = new System.Drawing.Size(203, 22);
this.FreezeContextMenuItem.Text = "Freeze Address";
this.FreezeContextMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
//
@ -321,31 +323,31 @@
//
this.UnfreezeAllContextMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Unfreeze;
this.UnfreezeAllContextMenuItem.Name = "UnfreezeAllContextMenuItem";
this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(215, 22);
this.UnfreezeAllContextMenuItem.Size = new System.Drawing.Size(203, 22);
this.UnfreezeAllContextMenuItem.Text = "Unfreeze &All";
this.UnfreezeAllContextMenuItem.Click += new System.EventHandler(this.UnfreezeAllContextMenuItem_Click);
//
// ContextMenuSeparator2
//
this.ContextMenuSeparator2.Name = "ContextMenuSeparator2";
this.ContextMenuSeparator2.Size = new System.Drawing.Size(212, 6);
this.ContextMenuSeparator2.Size = new System.Drawing.Size(200, 6);
//
// ViewInHexEditorContextMenuItem
//
this.ViewInHexEditorContextMenuItem.Name = "ViewInHexEditorContextMenuItem";
this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(215, 22);
this.ViewInHexEditorContextMenuItem.Size = new System.Drawing.Size(203, 22);
this.ViewInHexEditorContextMenuItem.Text = "View in Hex Editor";
this.ViewInHexEditorContextMenuItem.Click += new System.EventHandler(this.ViewInHexEditorContextMenuItem_Click);
//
// ContextMenuSeparator3
//
this.ContextMenuSeparator3.Name = "ContextMenuSeparator3";
this.ContextMenuSeparator3.Size = new System.Drawing.Size(212, 6);
this.ContextMenuSeparator3.Size = new System.Drawing.Size(200, 6);
//
// ClearPreviewContextMenuItem
//
this.ClearPreviewContextMenuItem.Name = "ClearPreviewContextMenuItem";
this.ClearPreviewContextMenuItem.Size = new System.Drawing.Size(215, 22);
this.ClearPreviewContextMenuItem.Size = new System.Drawing.Size(203, 22);
this.ClearPreviewContextMenuItem.Text = "&Clear Preview";
this.ClearPreviewContextMenuItem.Click += new System.EventHandler(this.ClearPreviewContextMenuItem_Click);
//
@ -376,7 +378,7 @@
this.toolStripSeparator4,
this.exitToolStripMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
this.fileToolStripMenuItem.Text = "&File";
this.fileToolStripMenuItem.DropDownOpened += new System.EventHandler(this.FileSubMenu_DropDownOpened);
//
@ -385,7 +387,7 @@
this.OpenMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.OpenFile;
this.OpenMenuItem.Name = "OpenMenuItem";
this.OpenMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));
this.OpenMenuItem.Size = new System.Drawing.Size(195, 22);
this.OpenMenuItem.Size = new System.Drawing.Size(193, 22);
this.OpenMenuItem.Text = "&Open...";
this.OpenMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
//
@ -394,7 +396,7 @@
this.SaveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.SaveAs;
this.SaveMenuItem.Name = "SaveMenuItem";
this.SaveMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
this.SaveMenuItem.Size = new System.Drawing.Size(195, 22);
this.SaveMenuItem.Size = new System.Drawing.Size(193, 22);
this.SaveMenuItem.Text = "&Save";
this.SaveMenuItem.Click += new System.EventHandler(this.SaveMenuItem_Click);
//
@ -403,14 +405,14 @@
this.SaveAsMenuItem.Name = "SaveAsMenuItem";
this.SaveAsMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S)));
this.SaveAsMenuItem.Size = new System.Drawing.Size(195, 22);
this.SaveAsMenuItem.Size = new System.Drawing.Size(193, 22);
this.SaveAsMenuItem.Text = "Save As...";
this.SaveAsMenuItem.Click += new System.EventHandler(this.SaveAsMenuItem_Click);
//
// AppendFileMenuItem
//
this.AppendFileMenuItem.Name = "AppendFileMenuItem";
this.AppendFileMenuItem.Size = new System.Drawing.Size(195, 22);
this.AppendFileMenuItem.Size = new System.Drawing.Size(193, 22);
this.AppendFileMenuItem.Text = "&Append File...";
this.AppendFileMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
//
@ -418,7 +420,7 @@
//
this.TruncateFromFileMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.TruncateFromFile;
this.TruncateFromFileMenuItem.Name = "TruncateFromFileMenuItem";
this.TruncateFromFileMenuItem.Size = new System.Drawing.Size(195, 22);
this.TruncateFromFileMenuItem.Size = new System.Drawing.Size(193, 22);
this.TruncateFromFileMenuItem.Text = "&Truncate from File...";
this.TruncateFromFileMenuItem.Click += new System.EventHandler(this.OpenMenuItem_Click);
//
@ -428,7 +430,7 @@
this.toolStripSeparator2});
this.RecentSubMenu.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Recent;
this.RecentSubMenu.Name = "RecentSubMenu";
this.RecentSubMenu.Size = new System.Drawing.Size(195, 22);
this.RecentSubMenu.Size = new System.Drawing.Size(193, 22);
this.RecentSubMenu.Text = "Recent";
this.RecentSubMenu.DropDownOpened += new System.EventHandler(this.RecentSubMenu_DropDownOpened);
//
@ -440,13 +442,13 @@
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(192, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(190, 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(195, 22);
this.exitToolStripMenuItem.Size = new System.Drawing.Size(193, 22);
this.exitToolStripMenuItem.Text = "&Close";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.CloseMenuItem_Click);
//
@ -462,7 +464,7 @@
this.DisplayTypeSubMenu,
this.DefinePreviousValueSubMenu});
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(58, 20);
this.settingsToolStripMenuItem.Text = "&Settings";
this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.SettingsSubMenu_DropDownOpened);
//
@ -472,21 +474,21 @@
this.DetailedMenuItem,
this.FastMenuItem});
this.modeToolStripMenuItem.Name = "modeToolStripMenuItem";
this.modeToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.modeToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
this.modeToolStripMenuItem.Text = "&Mode";
this.modeToolStripMenuItem.DropDownOpened += new System.EventHandler(this.ModeSubMenu_DropDownOpened);
//
// DetailedMenuItem
//
this.DetailedMenuItem.Name = "DetailedMenuItem";
this.DetailedMenuItem.Size = new System.Drawing.Size(117, 22);
this.DetailedMenuItem.Size = new System.Drawing.Size(113, 22);
this.DetailedMenuItem.Text = "&Detailed";
this.DetailedMenuItem.Click += new System.EventHandler(this.DetailedMenuItem_Click);
//
// FastMenuItem
//
this.FastMenuItem.Name = "FastMenuItem";
this.FastMenuItem.Size = new System.Drawing.Size(117, 22);
this.FastMenuItem.Size = new System.Drawing.Size(113, 22);
this.FastMenuItem.Text = "&Fast";
this.FastMenuItem.Click += new System.EventHandler(this.FastMenuItem_Click);
//
@ -495,7 +497,7 @@
this.MemoryDomainsSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator6});
this.MemoryDomainsSubMenu.Name = "MemoryDomainsSubMenu";
this.MemoryDomainsSubMenu.Size = new System.Drawing.Size(188, 22);
this.MemoryDomainsSubMenu.Size = new System.Drawing.Size(178, 22);
this.MemoryDomainsSubMenu.Text = "&Memory Domains";
this.MemoryDomainsSubMenu.DropDownOpened += new System.EventHandler(this.MemoryDomainsSubMenu_DropDownOpened);
//
@ -511,47 +513,47 @@
this.WordMenuItem,
this.DWordMenuItem});
this.sizeToolStripMenuItem.Name = "sizeToolStripMenuItem";
this.sizeToolStripMenuItem.Size = new System.Drawing.Size(188, 22);
this.sizeToolStripMenuItem.Size = new System.Drawing.Size(178, 22);
this.sizeToolStripMenuItem.Text = "&Size";
this.sizeToolStripMenuItem.DropDownOpened += new System.EventHandler(this.SizeSubMenu_DropDownOpened);
//
// ByteMenuItem
//
this.ByteMenuItem.Name = "ByteMenuItem";
this.ByteMenuItem.Size = new System.Drawing.Size(152, 22);
this.ByteMenuItem.Size = new System.Drawing.Size(105, 22);
this.ByteMenuItem.Text = "&1 Byte";
this.ByteMenuItem.Click += new System.EventHandler(this.ByteMenuItem_Click);
//
// WordMenuItem
//
this.WordMenuItem.Name = "WordMenuItem";
this.WordMenuItem.Size = new System.Drawing.Size(152, 22);
this.WordMenuItem.Size = new System.Drawing.Size(105, 22);
this.WordMenuItem.Text = "&2 Byte";
this.WordMenuItem.Click += new System.EventHandler(this.WordMenuItem_Click);
//
// DWordMenuItem
//
this.DWordMenuItem.Name = "DWordMenuItem";
this.DWordMenuItem.Size = new System.Drawing.Size(152, 22);
this.DWordMenuItem.Size = new System.Drawing.Size(105, 22);
this.DWordMenuItem.Text = "&4 Byte";
this.DWordMenuItem.Click += new System.EventHandler(this.DWordMenuItem_Click_Click);
//
// CheckMisalignedMenuItem
//
this.CheckMisalignedMenuItem.Name = "CheckMisalignedMenuItem";
this.CheckMisalignedMenuItem.Size = new System.Drawing.Size(188, 22);
this.CheckMisalignedMenuItem.Size = new System.Drawing.Size(178, 22);
this.CheckMisalignedMenuItem.Text = "Check Mis-aligned";
this.CheckMisalignedMenuItem.Click += new System.EventHandler(this.CheckMisalignedMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(185, 6);
this.toolStripSeparator8.Size = new System.Drawing.Size(175, 6);
//
// BigEndianMenuItem
//
this.BigEndianMenuItem.Name = "BigEndianMenuItem";
this.BigEndianMenuItem.Size = new System.Drawing.Size(188, 22);
this.BigEndianMenuItem.Size = new System.Drawing.Size(178, 22);
this.BigEndianMenuItem.Text = "&Big Endian";
this.BigEndianMenuItem.Click += new System.EventHandler(this.BigEndianMenuItem_Click);
//
@ -560,7 +562,7 @@
this.DisplayTypeSubMenu.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripSeparator1});
this.DisplayTypeSubMenu.Name = "DisplayTypeSubMenu";
this.DisplayTypeSubMenu.Size = new System.Drawing.Size(188, 22);
this.DisplayTypeSubMenu.Size = new System.Drawing.Size(178, 22);
this.DisplayTypeSubMenu.Text = "&Display Type";
this.DisplayTypeSubMenu.DropDownOpened += new System.EventHandler(this.DisplayTypeSubMenu_DropDownOpened);
//
@ -576,28 +578,28 @@
this.PreviousFrameMenuItem,
this.Previous_OriginalMenuItem});
this.DefinePreviousValueSubMenu.Name = "DefinePreviousValueSubMenu";
this.DefinePreviousValueSubMenu.Size = new System.Drawing.Size(188, 22);
this.DefinePreviousValueSubMenu.Size = new System.Drawing.Size(178, 22);
this.DefinePreviousValueSubMenu.Text = "Define Previous Value";
this.DefinePreviousValueSubMenu.DropDownOpened += new System.EventHandler(this.DefinePreviousValueSubMenu_DropDownOpened);
//
// Previous_LastSearchMenuItem
//
this.Previous_LastSearchMenuItem.Name = "Previous_LastSearchMenuItem";
this.Previous_LastSearchMenuItem.Size = new System.Drawing.Size(155, 22);
this.Previous_LastSearchMenuItem.Size = new System.Drawing.Size(148, 22);
this.Previous_LastSearchMenuItem.Text = "Last &Search";
this.Previous_LastSearchMenuItem.Click += new System.EventHandler(this.Previous_LastSearchMenuItem_Click);
//
// PreviousFrameMenuItem
//
this.PreviousFrameMenuItem.Name = "PreviousFrameMenuItem";
this.PreviousFrameMenuItem.Size = new System.Drawing.Size(155, 22);
this.PreviousFrameMenuItem.Size = new System.Drawing.Size(148, 22);
this.PreviousFrameMenuItem.Text = "&Previous Frame";
this.PreviousFrameMenuItem.Click += new System.EventHandler(this.Previous_LastFrameMenuItem_Click);
//
// Previous_OriginalMenuItem
//
this.Previous_OriginalMenuItem.Name = "Previous_OriginalMenuItem";
this.Previous_OriginalMenuItem.Size = new System.Drawing.Size(155, 22);
this.Previous_OriginalMenuItem.Size = new System.Drawing.Size(148, 22);
this.Previous_OriginalMenuItem.Text = "&Original";
this.Previous_OriginalMenuItem.Click += new System.EventHandler(this.Previous_OriginalMenuItem_Click);
//
@ -620,7 +622,7 @@
this.toolStripSeparator13,
this.ClearUndoMenuItem});
this.searchToolStripMenuItem.Name = "searchToolStripMenuItem";
this.searchToolStripMenuItem.Size = new System.Drawing.Size(54, 20);
this.searchToolStripMenuItem.Size = new System.Drawing.Size(52, 20);
this.searchToolStripMenuItem.Text = "&Search";
this.searchToolStripMenuItem.DropDownOpened += new System.EventHandler(this.SearchSubMenu_DropDownOpened);
//
@ -628,21 +630,21 @@
//
this.newSearchToolStripMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
this.newSearchToolStripMenuItem.Name = "newSearchToolStripMenuItem";
this.newSearchToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
this.newSearchToolStripMenuItem.Size = new System.Drawing.Size(203, 22);
this.newSearchToolStripMenuItem.Text = "&New Search";
this.newSearchToolStripMenuItem.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(212, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(200, 6);
//
// UndoMenuItem
//
this.UndoMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.undo;
this.UndoMenuItem.Name = "UndoMenuItem";
this.UndoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
this.UndoMenuItem.Size = new System.Drawing.Size(215, 22);
this.UndoMenuItem.Size = new System.Drawing.Size(203, 22);
this.UndoMenuItem.Text = "&Undo";
this.UndoMenuItem.Click += new System.EventHandler(this.UndoMenuItem_Click);
//
@ -652,7 +654,7 @@
this.RedoMenuItem.Name = "RedoMenuItem";
this.RedoMenuItem.ShortcutKeyDisplayString = "";
this.RedoMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
this.RedoMenuItem.Size = new System.Drawing.Size(215, 22);
this.RedoMenuItem.Size = new System.Drawing.Size(203, 22);
this.RedoMenuItem.Text = "&Redo";
this.RedoMenuItem.Click += new System.EventHandler(this.RedoMenuItem_Click);
//
@ -660,14 +662,14 @@
//
this.CopyValueToPrevMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Previous;
this.CopyValueToPrevMenuItem.Name = "CopyValueToPrevMenuItem";
this.CopyValueToPrevMenuItem.Size = new System.Drawing.Size(215, 22);
this.CopyValueToPrevMenuItem.Size = new System.Drawing.Size(203, 22);
this.CopyValueToPrevMenuItem.Text = "Copy Value to Prev";
this.CopyValueToPrevMenuItem.Click += new System.EventHandler(this.CopyValueToPrevMenuItem_Click);
//
// ClearChangeCountsMenuItem
//
this.ClearChangeCountsMenuItem.Name = "ClearChangeCountsMenuItem";
this.ClearChangeCountsMenuItem.Size = new System.Drawing.Size(215, 22);
this.ClearChangeCountsMenuItem.Size = new System.Drawing.Size(203, 22);
this.ClearChangeCountsMenuItem.Text = "&Clear Change Counts";
this.ClearChangeCountsMenuItem.Click += new System.EventHandler(this.ClearChangeCountsMenuItem_Click);
//
@ -676,20 +678,20 @@
this.RemoveMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Delete;
this.RemoveMenuItem.Name = "RemoveMenuItem";
this.RemoveMenuItem.ShortcutKeyDisplayString = "Delete";
this.RemoveMenuItem.Size = new System.Drawing.Size(215, 22);
this.RemoveMenuItem.Size = new System.Drawing.Size(203, 22);
this.RemoveMenuItem.Text = "&Remove selected";
this.RemoveMenuItem.Click += new System.EventHandler(this.RemoveMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(212, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(200, 6);
//
// GoToAddressMenuItem
//
this.GoToAddressMenuItem.Name = "GoToAddressMenuItem";
this.GoToAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G)));
this.GoToAddressMenuItem.Size = new System.Drawing.Size(215, 22);
this.GoToAddressMenuItem.Size = new System.Drawing.Size(203, 22);
this.GoToAddressMenuItem.Text = "&Go to Address...";
this.GoToAddressMenuItem.Click += new System.EventHandler(this.GoToAddressMenuItem_Click);
//
@ -698,7 +700,7 @@
this.AddToRamWatchMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.FindHS;
this.AddToRamWatchMenuItem.Name = "AddToRamWatchMenuItem";
this.AddToRamWatchMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R)));
this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(215, 22);
this.AddToRamWatchMenuItem.Size = new System.Drawing.Size(203, 22);
this.AddToRamWatchMenuItem.Text = "&Add to Ram Watch";
this.AddToRamWatchMenuItem.Click += new System.EventHandler(this.AddToRamWatchMenuItem_Click);
//
@ -707,7 +709,7 @@
this.PokeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.poke;
this.PokeAddressMenuItem.Name = "PokeAddressMenuItem";
this.PokeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P)));
this.PokeAddressMenuItem.Size = new System.Drawing.Size(215, 22);
this.PokeAddressMenuItem.Size = new System.Drawing.Size(203, 22);
this.PokeAddressMenuItem.Text = "&Poke Address";
this.PokeAddressMenuItem.Click += new System.EventHandler(this.PokeAddressMenuItem_Click);
//
@ -716,19 +718,19 @@
this.FreezeAddressMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.Freeze;
this.FreezeAddressMenuItem.Name = "FreezeAddressMenuItem";
this.FreezeAddressMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.F)));
this.FreezeAddressMenuItem.Size = new System.Drawing.Size(215, 22);
this.FreezeAddressMenuItem.Size = new System.Drawing.Size(203, 22);
this.FreezeAddressMenuItem.Text = "Freeze Address";
this.FreezeAddressMenuItem.Click += new System.EventHandler(this.FreezeAddressMenuItem_Click);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(212, 6);
this.toolStripSeparator13.Size = new System.Drawing.Size(200, 6);
//
// ClearUndoMenuItem
//
this.ClearUndoMenuItem.Name = "ClearUndoMenuItem";
this.ClearUndoMenuItem.Size = new System.Drawing.Size(215, 22);
this.ClearUndoMenuItem.Size = new System.Drawing.Size(203, 22);
this.ClearUndoMenuItem.Text = "Clear Undo History";
this.ClearUndoMenuItem.Click += new System.EventHandler(this.ClearUndoMenuItem_Click);
//
@ -744,82 +746,83 @@
this.AutoloadDialogMenuItem,
this.SaveWinPositionMenuItem,
this.AlwaysOnTopMenuItem,
this.FloatingWindowMenuItem,
this.toolStripSeparator3,
this.RestoreDefaultsMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20);
this.optionsToolStripMenuItem.Text = "&Options";
this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.OptionsSubMenu_DropDownOpened);
//
// PreviewModeMenuItem
//
this.PreviewModeMenuItem.Name = "PreviewModeMenuItem";
this.PreviewModeMenuItem.Size = new System.Drawing.Size(240, 22);
this.PreviewModeMenuItem.Text = "Preview Mode";
this.PreviewModeMenuItem.Size = new System.Drawing.Size(227, 22);
this.PreviewModeMenuItem.Text = "&Preview Mode";
this.PreviewModeMenuItem.Click += new System.EventHandler(this.PreviewModeMenuItem_Click);
//
// AutoSearchMenuItem
//
this.AutoSearchMenuItem.Name = "AutoSearchMenuItem";
this.AutoSearchMenuItem.Size = new System.Drawing.Size(240, 22);
this.AutoSearchMenuItem.Text = "Auto-Search";
this.AutoSearchMenuItem.Size = new System.Drawing.Size(227, 22);
this.AutoSearchMenuItem.Text = "&Auto-Search";
this.AutoSearchMenuItem.Click += new System.EventHandler(this.AutoSearchMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(237, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(224, 6);
//
// ExcludeRamWatchMenuItem
//
this.ExcludeRamWatchMenuItem.Name = "ExcludeRamWatchMenuItem";
this.ExcludeRamWatchMenuItem.Size = new System.Drawing.Size(240, 22);
this.ExcludeRamWatchMenuItem.Text = "Always Exclude Ram Search List";
this.ExcludeRamWatchMenuItem.Size = new System.Drawing.Size(227, 22);
this.ExcludeRamWatchMenuItem.Text = "Always E&xclude Ram Search List";
this.ExcludeRamWatchMenuItem.Click += new System.EventHandler(this.ExcludeRamWatchMenuItem_Click);
//
// UseUndoHistoryMenuItem
//
this.UseUndoHistoryMenuItem.Name = "UseUndoHistoryMenuItem";
this.UseUndoHistoryMenuItem.Size = new System.Drawing.Size(240, 22);
this.UseUndoHistoryMenuItem.Size = new System.Drawing.Size(227, 22);
this.UseUndoHistoryMenuItem.Text = "&Use Undo History";
this.UseUndoHistoryMenuItem.Click += new System.EventHandler(this.UseUndoHistoryMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(237, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(224, 6);
//
// AutoloadDialogMenuItem
//
this.AutoloadDialogMenuItem.Name = "AutoloadDialogMenuItem";
this.AutoloadDialogMenuItem.Size = new System.Drawing.Size(240, 22);
this.AutoloadDialogMenuItem.Text = "Autoload";
this.AutoloadDialogMenuItem.Size = new System.Drawing.Size(227, 22);
this.AutoloadDialogMenuItem.Text = "Auto&load";
this.AutoloadDialogMenuItem.Click += new System.EventHandler(this.AutoloadDialogMenuItem_Click);
//
// SaveWinPositionMenuItem
//
this.SaveWinPositionMenuItem.Name = "SaveWinPositionMenuItem";
this.SaveWinPositionMenuItem.Size = new System.Drawing.Size(240, 22);
this.SaveWinPositionMenuItem.Text = "Save Window Position";
this.SaveWinPositionMenuItem.Size = new System.Drawing.Size(227, 22);
this.SaveWinPositionMenuItem.Text = "&Save Window Position";
this.SaveWinPositionMenuItem.Click += new System.EventHandler(this.SaveWinPositionMenuItem_Click);
//
// AlwaysOnTopMenuItem
//
this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem";
this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(240, 22);
this.AlwaysOnTopMenuItem.Text = "Always On Top";
this.AlwaysOnTopMenuItem.Size = new System.Drawing.Size(227, 22);
this.AlwaysOnTopMenuItem.Text = "Always On &Top";
this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(237, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(224, 6);
//
// RestoreDefaultsMenuItem
//
this.RestoreDefaultsMenuItem.Name = "RestoreDefaultsMenuItem";
this.RestoreDefaultsMenuItem.Size = new System.Drawing.Size(240, 22);
this.RestoreDefaultsMenuItem.Text = "Restore Default Settings";
this.RestoreDefaultsMenuItem.Size = new System.Drawing.Size(227, 22);
this.RestoreDefaultsMenuItem.Text = "&Restore Default Settings";
this.RestoreDefaultsMenuItem.Click += new System.EventHandler(this.RestoreDefaultsMenuItem_Click);
//
// ColumnsMenuItem
@ -829,28 +832,28 @@
this.ShowChangesMenuItem,
this.ShowDiffMenuItem});
this.ColumnsMenuItem.Name = "ColumnsMenuItem";
this.ColumnsMenuItem.Size = new System.Drawing.Size(67, 20);
this.ColumnsMenuItem.Size = new System.Drawing.Size(59, 20);
this.ColumnsMenuItem.Text = "&Columns";
this.ColumnsMenuItem.DropDownOpened += new System.EventHandler(this.ColumnsMenuItem_DropDownOpened);
//
// ShowPreviousMenuItem
//
this.ShowPreviousMenuItem.Name = "ShowPreviousMenuItem";
this.ShowPreviousMenuItem.Size = new System.Drawing.Size(156, 22);
this.ShowPreviousMenuItem.Size = new System.Drawing.Size(148, 22);
this.ShowPreviousMenuItem.Text = "&Previous Value";
this.ShowPreviousMenuItem.Click += new System.EventHandler(this.ShowPreviousMenuItem_Click);
//
// ShowChangesMenuItem
//
this.ShowChangesMenuItem.Name = "ShowChangesMenuItem";
this.ShowChangesMenuItem.Size = new System.Drawing.Size(156, 22);
this.ShowChangesMenuItem.Size = new System.Drawing.Size(148, 22);
this.ShowChangesMenuItem.Text = "&Change Counts";
this.ShowChangesMenuItem.Click += new System.EventHandler(this.ShowChangesMenuItem_Click);
//
// ShowDiffMenuItem
//
this.ShowDiffMenuItem.Name = "ShowDiffMenuItem";
this.ShowDiffMenuItem.Size = new System.Drawing.Size(156, 22);
this.ShowDiffMenuItem.Size = new System.Drawing.Size(148, 22);
this.ShowDiffMenuItem.Text = "&Difference";
this.ShowDiffMenuItem.Click += new System.EventHandler(this.ShowDiffMenuItem_Click);
//
@ -1055,7 +1058,7 @@
this.DoSearchToolButton.Image = ((System.Drawing.Image)(resources.GetObject("DoSearchToolButton.Image")));
this.DoSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.DoSearchToolButton.Name = "DoSearchToolButton";
this.DoSearchToolButton.Size = new System.Drawing.Size(65, 22);
this.DoSearchToolButton.Size = new System.Drawing.Size(63, 22);
this.DoSearchToolButton.Text = "Search ";
this.DoSearchToolButton.Click += new System.EventHandler(this.SearchMenuItem_Click);
//
@ -1069,7 +1072,7 @@
this.NewSearchToolButton.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.restart;
this.NewSearchToolButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NewSearchToolButton.Name = "NewSearchToolButton";
this.NewSearchToolButton.Size = new System.Drawing.Size(51, 22);
this.NewSearchToolButton.Size = new System.Drawing.Size(48, 22);
this.NewSearchToolButton.Text = "New";
this.NewSearchToolButton.Click += new System.EventHandler(this.NewSearchMenuMenuItem_Click);
//
@ -1365,6 +1368,13 @@
this.DisplayTypeDropdown.TabIndex = 95;
this.DisplayTypeDropdown.SelectedIndexChanged += new System.EventHandler(this.DisplayTypeDropdown_SelectedIndexChanged);
//
// FloatingWindowMenuItem
//
this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem";
this.FloatingWindowMenuItem.Size = new System.Drawing.Size(227, 22);
this.FloatingWindowMenuItem.Text = "&Floating Window";
this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click);
//
// RamSearch
//
this.AllowDrop = true;
@ -1537,5 +1547,6 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox DisplayTypeDropdown;
private System.Windows.Forms.ToolStripMenuItem GoToAddressMenuItem;
private System.Windows.Forms.ToolStripMenuItem FloatingWindowMenuItem;
}
}

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

@ -351,6 +351,11 @@ namespace BizHawk.Client.EmuHawk
#region Private
void RefreshFloatingWindowControl()
{
this.Owner = Global.Config.RamSearchFloatingWindow ? null : GlobalWin.MainForm;
}
private void ToggleSearchDependentToolBarItems()
{
DoSearchToolButton.Enabled =
@ -1195,6 +1200,7 @@ namespace BizHawk.Client.EmuHawk
UseUndoHistoryMenuItem.Checked = _searches.UndoEnabled;
PreviewModeMenuItem.Checked = Global.Config.RamSearchPreviewMode;
AlwaysOnTopMenuItem.Checked = Global.Config.RamSearchAlwaysOnTop;
FloatingWindowMenuItem.Checked = Global.Config.RamSearchFloatingWindow;
AutoSearchMenuItem.Checked = _autoSearch;
}
@ -1238,6 +1244,12 @@ namespace BizHawk.Client.EmuHawk
TopMost = Global.Config.RamSearchAlwaysOnTop;
}
private void FloatingWindowMenuItem_Click(object sender, EventArgs e)
{
Global.Config.RamSearchFloatingWindow ^= true;
RefreshFloatingWindowControl();
}
private void RestoreDefaultsMenuItem_Click(object sender, EventArgs e)
{
Size = new Size(_defaultWidth, _defaultHeight);
@ -1690,6 +1702,11 @@ namespace BizHawk.Client.EmuHawk
}
}
protected override void OnShown(EventArgs e)
{
RefreshFloatingWindowControl();
}
#endregion
#endregion